* Eliminate HAVE_FLOCK from the build system. Instead, test for the presence of...

[citadel.git] / citadel / control.c

diff --git a/citadel/control.c b/citadel/control.c
index 65a6d0fd62e9677fbbb67fcc23c98e31291a7579..e9725e3fa46433f3d5723ae9ef77dc0d8649a852 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -77,12 +77,7 @@ long control_highest_user = 0;
  */
 void lock_control(void)
 {
-#ifdef HAVE_FLOCK
-/*
- * TODO: solaris manpages describe this function, but the headers
- * don't show it! 
- */
-
+#if defined(LOCK_EX) && defined(LOCK_NB)
        if (flock(fileno(control_fp), (LOCK_EX | LOCK_NB))) {
                CtdlLogPrintf(CTDL_EMERG, "citserver: unable to lock %s.\n", file_citadel_control);
                CtdlLogPrintf(CTDL_EMERG, "Is another citserver already running?\n");
@@ -666,7 +661,7 @@ void cmd_conf(char *argbuf)
                snprintf(buf, sizeof buf,
                         "The global system configuration has been edited by %s.\n",
                         CC->curr_user);
-               aide_message(buf,"Citadel Configuration Manager Message");
+               CtdlAideMessage(buf,"Citadel Configuration Manager Message");
 
                if (!IsEmptyStr(config.c_logpages))
                        CtdlCreateRoom(config.c_logpages, 3, "", 0, 1, 1, VIEW_BBS);
@@ -700,7 +695,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, 0);
+               confptr = CtdlReadMessageBody(HKEY("000"), config.c_maxmsglen, NULL, 0, 0);
                CtdlPutSysConfig(confname, confptr);
                free(confptr);
        }
@@ -719,7 +714,9 @@ void cmd_conf(char *argbuf)
 
 CTDL_MODULE_INIT(control)
 {
-       CtdlRegisterProtoHook(cmd_conf, "CONF", "Autoconverted. TODO: document me.");
+       if (!threading) {
+               CtdlRegisterProtoHook(cmd_conf, "CONF", "get/set system configuration");
+       }
        /* return our Subversion id for the Log */
        return "$Id$";
 }