X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontrol.c;h=ea0865d49fd5db46243e0427d70ff76783a466b9;hb=7e5d9e93cc7fdc560eac95647fe329d818444226;hp=5ef54287aee0154d3710c1543d70c5c940f606f3;hpb=61ced2537ea36d1ff269e4695c6bee4f45f06dc4;p=citadel.git

diff --git a/citadel/control.c b/citadel/control.c
index 5ef54287a..ea0865d49 100644
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -29,17 +29,19 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/file.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "control.h"
-#include "serv_extensions.h"
 #include "sysdep_decls.h"
 #include "support.h"
 #include "config.h"
 #include "msgbase.h"
 #include "citserver.h"
-#include "tools.h"
 #include "room_ops.h"
+#include "user_ops.h"
+#include "database.h"
+#include "threads.h"
 
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
@@ -48,7 +50,7 @@
 struct CitControl CitControl;
 extern struct config config;
 FILE *control_fp = NULL;
-
+long control_highest_user = 0;
 
 
 /*
@@ -57,11 +59,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");
+		CtdlLogPrintf(CTDL_EMERG, "citserver: unable to lock %s.\n", file_citadel_control);
+		CtdlLogPrintf(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;
 }
 
 
@@ -96,13 +154,16 @@ 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);
 		}
 	}
 	if (control_fp == NULL) {
-		lprintf(CTDL_ALERT, "ERROR opening %s: %s\n",
+		CtdlLogPrintf(CTDL_ALERT, "ERROR opening %s: %s\n",
 				file_citadel_control,
 				strerror(errno));
 		return;
@@ -266,6 +327,14 @@ void cmd_conf(char *argbuf)
 	        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("%d\n", config.c_xmpp_c2s_port);
+		cprintf("%d\n", config.c_xmpp_s2s_port);
+		cprintf("%ld\n", config.c_pop3_fetch);
+		cprintf("%ld\n", config.c_pop3_fastest);
 		cprintf("000\n");
 	}
 
@@ -273,7 +342,7 @@ void cmd_conf(char *argbuf)
 		unbuffer_output();
 		cprintf("%d Send configuration...\n", SEND_LISTING);
 		a = 0;
-		while (client_getln(buf, sizeof buf), strcmp(buf, "000")) {
+		while (client_getln(buf, sizeof buf) >= 0 && strcmp(buf, "000")) {
 			switch (a) {
 			case 0:
 				safestrncpy(config.c_nodename, buf,
@@ -493,6 +562,32 @@ void cmd_conf(char *argbuf)
 			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;
+			case 62:
+				config.c_xmpp_c2s_port = atoi(buf);
+				break;
+			case 63:
+				config.c_xmpp_s2s_port = atoi(buf);
+				break;
+			case 64:
+				config.c_pop3_fetch = atol(buf);
+				break;
+			case 65:
+				config.c_pop3_fastest = atol(buf);
+				break;
 			}
 			++a;
 		}
@@ -502,7 +597,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
@@ -534,8 +629,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);
 	}