EV: expose current event queue state to the RWHO command

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 42208a7da3d4bee36a9274d6619a316f181010ce..d91b976b059bc003bc3a4bd2cc06dde4fc0602b0 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -65,11 +65,6 @@
 #include "euidindex.h"
 #include "context.h"
 #include "svn_revision.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
 #include "ctdl_module.h"
 
 char *unique_session_numbers;
@@ -216,7 +211,7 @@ void master_cleanup(int exitcode) {
        struct CleanupFunctionHook *fcn;
        static int already_cleaning_up = 0;
 
-       if (already_cleaning_up) while(1) usleep(1000);
+       if (already_cleaning_up) while(1) usleep(1000000);
        already_cleaning_up = 1;
 
        /* Run any cleanup routines registered by loadable modules */
@@ -284,7 +279,9 @@ void cmd_info(char *cmdbuf) {
        cprintf("0\n"); /* 1 = no, this server is not LDAP-enabled */
 #endif
 
-       if (config.c_auth_mode == AUTHMODE_NATIVE) {
+       if ((config.c_auth_mode == AUTHMODE_NATIVE) &&
+           (config.c_disable_newu == 0))
+       {
                cprintf("%d\n", config.c_disable_newu);
        }
        else {
@@ -425,7 +422,7 @@ int is_public_client(void)
                                        }
                                }
                        }
-               fclose(fp);
+               if (fp != NULL) fclose(fp);
                pc_timestamp = time(NULL);
                end_critical_section(S_PUBLIC_CLIENTS);
        }