fix all the <time.h> vs. <sys/time.h> issues, hopefully

[citadel.git] / citadel / serv_inetcfg.c

diff --git a/citadel/serv_inetcfg.c b/citadel/serv_inetcfg.c
index 7d7c54aeceb26fb83ca15ef25e6a972fcab19abb..c9dbd2d7af5ba9f7e9e8d54468bed59b70dec240 100644 (file)
--- a/citadel/serv_inetcfg.c
+++ b/citadel/serv_inetcfg.c
@@ -1,7 +1,11 @@
-/* $Id$ 
+/*
+ * $Id$ 
  *
  * This module handles the loading/saving and maintenance of the
- * system's Internet configuration.
+ * system's Internet configuration.  It's not an optional component; I
+ * wrote it as a module merely to keep things as clean and loosely coupled
+ * as possible.
+ *
  */
 
 #include "sysdep.h"
@@ -13,13 +17,23 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
@@ -35,6 +49,24 @@
 #include "genstamp.h"
 #include "domain.h"
 
+void inetcfg_setTo(struct CtdlMessage *msg) {
+       char *conf;
+       char buf[SIZ];
+
+       if (msg->cm_fields['M']==NULL) return;
+       conf = strdoop(msg->cm_fields['M']);
+
+       if (conf != NULL) {
+               do {
+                       extract_token(buf, conf, 0, '\n');
+                       strcpy(conf, &conf[strlen(buf)+1]);
+               } while ( (strlen(conf)>0) && (strlen(buf)>0) );
+
+               if (inetcfg != NULL) phree(inetcfg);
+               inetcfg = conf;
+       }
+}
+
 
 /*
  * This handler detects changes being made to the system's Internet
@@ -61,7 +93,7 @@ int inetcfg_aftersave(struct CtdlMessage *msg) {
                   strlen(INTERNETCFG) )) ) {
                        /* Bingo!  The user is changing configs.
                         */
-                       lprintf(9, "Internet configuration changed FIX\n");
+                       inetcfg_setTo(msg);
                }
 
                ptr = strchr((char *)ptr, '\n');
@@ -72,6 +104,25 @@ int inetcfg_aftersave(struct CtdlMessage *msg) {
 }
 
 
+void inetcfg_init_backend(long msgnum, void *userdata) {
+       struct CtdlMessage *msg;
+
+               msg = CtdlFetchMessage(msgnum);
+               if (msg != NULL) {
+               inetcfg_setTo(msg);
+                       CtdlFreeMessage(msg);
+       }
+}
+
+
+void inetcfg_init(void) {
+       if (getroom(&CC->quickroom, SYSCONFIGROOM) != 0) return;
+       CtdlForEachMessage(MSGS_LAST, 1, (-127), INTERNETCFG, NULL,
+               inetcfg_init_backend, NULL);
+}
+
+
+
 
 /*****************************************************************************/
 /*                      MODULE INITIALIZATION STUFF                          */
@@ -81,6 +132,7 @@ int inetcfg_aftersave(struct CtdlMessage *msg) {
 char *Dynamic_Module_Init(void)
 {
        CtdlRegisterMessageHook(inetcfg_aftersave, EVT_AFTERSAVE);
+       inetcfg_init();
        return "$Id$";
 }