* serv_calendar.c: allocate dynamic symbol at module startup, not during

  each session startup.  This error was causing crashes (of course).

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 3a58e33e9fd30496d6558dbc532b89a4ee3e084b..e795a50153f72ed3421facc0c28397b851263195 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 601.120  2003/01/19 05:55:59  ajc
+ * serv_calendar.c: allocate dynamic symbol at module startup, not during
+   each session startup.  This error was causing crashes (of course).
+
  Revision 601.119  2003/01/18 06:18:20  ajc
  * whobbs.c: line up the columns better
  * routines2.c: when doing <.ASI> command, entering a blank hostname causes
@@ -4424,4 +4428,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/serv_calendar.c b/citadel/serv_calendar.c
index 4d77cf32724390f18f257096278b45868815366c..6db1f958a91d05cd10d3ed312111889751c18883 100644 (file)
--- a/citadel/serv_calendar.c
+++ b/citadel/serv_calendar.c
@@ -1434,10 +1434,8 @@ int ical_obj_aftersave(struct CtdlMessage *msg)
 
 
 void ical_session_startup(void) {
-       SYM_CIT_ICAL = CtdlGetDynamicSymbol();
        CtdlAllocUserData(SYM_CIT_ICAL, sizeof(struct cit_ical));
        memset(CIT_ICAL, 0, sizeof(struct cit_ical));
-       
 }
 
 
@@ -1449,6 +1447,7 @@ void ical_session_startup(void) {
 char *serv_calendar_init(void)
 {
 #ifdef CITADEL_WITH_CALENDAR_SERVICE
+       SYM_CIT_ICAL = CtdlGetDynamicSymbol();
        CtdlRegisterMessageHook(ical_obj_beforesave, EVT_BEFORESAVE);
        CtdlRegisterMessageHook(ical_obj_aftersave, EVT_AFTERSAVE);
        CtdlRegisterSessionHook(ical_create_room, EVT_LOGIN);