libical, expat, and libsieve are now *required*.

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index bcb3989b6223b415953c00a4b792d3388d1c37de..6dba619936c800ab85004676a4f547c02d10d46d 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -70,7 +70,6 @@ struct CitContext *ContextList = NULL;
 struct CitContext* next_session = NULL;
 char *unique_session_numbers;
 int ScheduledShutdown = 0;
-int do_defrag = 0;
 time_t server_startup_time;
 int panic_fd;
 
@@ -140,10 +139,6 @@ void master_startup(void) {
        
        CtdlThreadAllocTSD();
        
-       if (do_defrag) {
-               defrag_databases();
-       }
-
        check_ref_counts();
 
        lprintf(CTDL_INFO, "Creating base rooms (if necessary)\n");
@@ -158,6 +153,12 @@ void master_startup(void) {
                 lputroom(&qrbuf);
         }
 
+       /* Aide needs to be public postable, else we're not RFC conformant. */
+        if (lgetroom(&qrbuf, AIDEROOM) == 0) {
+                qrbuf.QRflags2 |= QR2_SMTP_PUBLIC;
+                lputroom(&qrbuf);
+        }
+
        lprintf(CTDL_INFO, "Seeding the pseudo-random number generator...\n");
        urandom = fopen("/dev/urandom", "r");
        if (urandom != NULL) {
@@ -307,12 +308,8 @@ void cmd_info(void) {
        cprintf("%f\n", CtdlThreadWorkerAvg);
        cprintf("%d\n", CtdlThreadGetCount());
 
-       /* Does this server support Sieve mail filtering? */
-#ifdef HAVE_LIBSIEVE
-       cprintf("1\n");         /* yes */
-#else
-       cprintf("0\n");         /* no */
-#endif
+       cprintf("1\n");         /* yes, Sieve mail filtering is supported */
+       cprintf("%d\n", config.c_enable_fulltext);
        
        cprintf("000\n");
 }
@@ -1424,6 +1421,10 @@ void do_command_loop(void) {
                cmd_isme(&cmdbuf[5]);
        }
 
+       else if (!strncasecmp(cmdbuf, "RENU", 4)) {
+               cmd_renu(&cmdbuf[5]);
+       }
+
        else if (!DLoader_Exec_Cmd(cmdbuf)) {
                cprintf("%d Unrecognized or unsupported command.\n", ERROR + CMD_NOT_SUPPORTED);
        }