Solution to bug no. 258 (forging of from headers with IMAP move)

[citadel.git] / citadel / control.c

diff --git a/citadel/control.c b/citadel/control.c
index 91731ce5e84a95916966122221550767b3aa35c4..fe625d0512cf2570cdbb1ef4e0bb446fc9f75411 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -32,7 +32,6 @@
 #include "citadel.h"
 #include "server.h"
 #include "control.h"
-#include "serv_extensions.h"
 #include "sysdep_decls.h"
 #include "support.h"
 #include "config.h"
@@ -40,6 +39,8 @@
 #include "citserver.h"
 #include "tools.h"
 #include "room_ops.h"
+#include "user_ops.h"
+#include "database.h"
 
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
@@ -48,7 +49,7 @@
 struct CitControl CitControl;
 extern struct config config;
 FILE *control_fp = NULL;
-
+long control_highest_user = 0;
 
 
 /*
@@ -57,11 +58,67 @@ FILE *control_fp = NULL;
  */
 void lock_control(void)
 {
+#ifdef HAVE_FLOCK
+/*
+ * TODO: solaris manpages describe this function, but the headers
+ * don't show it! 
+ */
+
        if (flock(fileno(control_fp), (LOCK_EX | LOCK_NB))) {
                lprintf(CTDL_EMERG, "citserver: unable to lock %s.\n", file_citadel_control);
                lprintf(CTDL_EMERG, "Is another citserver already running?\n");
                exit(CTDLEXIT_CONTROL);
        }
+#endif
+}
+
+/*
+ * callback to get highest room number when rebuilding control file
+ */
+void control_find_highest(struct ctdlroom *qrbuf, void *data)
+{
+       struct ctdlroom room;
+       struct cdbdata *cdbfr;
+       long *msglist;
+       int num_msgs=0;
+       int c;
+       
+       
+       if (qrbuf->QRnumber > CitControl.MMnextroom)
+               CitControl.MMnextroom = qrbuf->QRnumber;
+               
+       getroom (&room, qrbuf->QRname);
+       
+       /* Load the message list */
+       cdbfr = cdb_fetch(CDB_MSGLISTS, &room.QRnumber, sizeof(long));
+       if (cdbfr != NULL) {
+               msglist = (long *) cdbfr->ptr;
+               num_msgs = cdbfr->len / sizeof(long);
+       } else {
+               return; /* No messages at all?  No further action. */
+       }
+
+       if (num_msgs>0)
+       {
+               for (c=0; c<num_msgs; c++)
+               {
+                       if (msglist[c] > CitControl.MMhighest)
+                               CitControl.MMhighest = msglist[c];
+               }
+       }
+       cdb_free(cdbfr);
+       return;
+}
+
+
+/*
+ * Callback to get highest user number.
+ */
+ 
+void control_find_user (struct ctdluser *EachUser, void *out_data)
+{
+       if (EachUser->usernum > CitControl.MMnextuser)
+               CitControl.MMnextuser = EachUser->usernum;
 }
 
 
@@ -70,6 +127,14 @@ void lock_control(void)
  */
 void get_control(void)
 {
+       static int already_have_control = 0;
+
+       /*
+        * If we already have the control record in memory, there's no point
+        * in reading it from disk again.
+        */
+       if (already_have_control) return;
+
        /* Zero it out.  If the control record on disk is missing or short,
         * the system functions with all control record fields initialized
         * to zero.
@@ -88,6 +153,9 @@ void get_control(void)
                        lock_control();
                        fchown(fileno(control_fp), config.c_ctdluid, -1);
                        memset(&CitControl, 0, sizeof(struct CitControl));
+                       // Find highest room number and message number.
+                       ForEachRoom(control_find_highest, NULL);
+                       ForEachUser(control_find_user, NULL);
                        fwrite(&CitControl, sizeof(struct CitControl),
                               1, control_fp);
                        rewind(control_fp);
@@ -102,6 +170,7 @@ void get_control(void)
 
        rewind(control_fp);
        fread(&CitControl, sizeof(struct CitControl), 1, control_fp);
+       already_have_control = 1;
 }
 
 /*
@@ -256,6 +325,11 @@ void cmd_conf(char *argbuf)
                cprintf("%d\n", config.c_funambol_port);
                cprintf("%s\n", config.c_funambol_source);
                cprintf("%s\n", config.c_funambol_auth);
+               cprintf("%d\n", config.c_rbl_at_greeting);
+               cprintf("%s\n", config.c_master_user);
+               cprintf("%s\n", config.c_master_pass);
+               cprintf("%s\n", config.c_pager_program);
+               cprintf("%d\n", config.c_imap_keep_from);
                cprintf("000\n");
        }
 
@@ -480,6 +554,23 @@ void cmd_conf(char *argbuf)
                                        buf,
                                        sizeof config.c_funambol_auth);
                                break;
+                       case 57:
+                               config.c_rbl_at_greeting = atoi(buf);
+                               break;
+                       case 58:
+                               safestrncpy(config.c_master_user, buf, sizeof config.c_master_user);
+                               break;
+                       case 59:
+                               safestrncpy(config.c_master_pass, buf, sizeof config.c_master_pass);
+                               break;
+                       case 60:
+                               safestrncpy(config.c_pager_program,
+                                       buf,
+                                       sizeof config.c_pager_program);
+                               break;
+                       case 61:
+                               config.c_imap_keep_from = atoi(buf);
+                               break;
                        }
                        ++a;
                }
@@ -489,7 +580,7 @@ void cmd_conf(char *argbuf)
                         CC->curr_user);
                aide_message(buf,"Citadel Configuration Manager Message");
 
-               if (strlen(config.c_logpages) > 0)
+               if (!IsEmptyStr(config.c_logpages))
                        create_room(config.c_logpages, 3, "", 0, 1, 1, VIEW_BBS);
 
                /* If full text indexing has been disabled, invalidate the
@@ -521,8 +612,7 @@ void cmd_conf(char *argbuf)
                extract_token(confname, argbuf, 1, '|', sizeof confname);
                unbuffer_output();
                cprintf("%d %s\n", SEND_LISTING, confname);
-               confptr = CtdlReadMessageBody("000",
-                               config.c_maxmsglen, NULL, 0);
+               confptr = CtdlReadMessageBody("000", config.c_maxmsglen, NULL, 0, 0);
                CtdlPutSysConfig(confname, confptr);
                free(confptr);
        }