Aggregation of remote POP3 accounts is now working.

[citadel.git] / citadel / control.c

diff --git a/citadel/control.c b/citadel/control.c
index a6d61f82d4fbf44591f93c604da6033fddf914b2..710c38d63035bc9d13039b480725f121fbc9cd54 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"
@@ -57,11 +56,12 @@ FILE *control_fp = NULL;
  */
 void lock_control(void)
 {
-#ifndef BSD_GETPWUID
+#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");
@@ -508,7 +508,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
@@ -540,8 +540,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);
        }