#include "citadel.h"
#include "server.h"
#include "sysdep_decls.h"
+#include "threads.h"
#include "citserver.h"
#include "config.h"
#include "database.h"
/* Close the AdjRefCount queue file */
AdjRefCount(-1, 0);
+ /* Do system-dependent stuff */
+ sysdep_master_cleanup();
+
/* Close databases */
lprintf(CTDL_INFO, "Closing databases\n");
close_databases();
- /* Do system-dependent stuff */
- sysdep_master_cleanup();
-
#ifdef DEBUG_MEMORY_LEAKS
dump_heap();
#endif
cprintf("0\n"); /* 1 = no, this server is not LDAP-enabled */
#endif
- if (config.c_auth_mode == 1) {
- cprintf("1\n"); /* "create new user" never works with host auth */
+ if (config.c_auth_mode == AUTHMODE_NATIVE) {
+ cprintf("%d\n", config.c_disable_newu);
}
else {
- cprintf("%d\n", config.c_disable_newu); /* otherwise, site defined */
+ cprintf("1\n"); /* "create new user" does not work with non-native auth modes */
}
cprintf("%s\n", config.c_default_cal_zone);
*/
void do_command_loop(void) {
char cmdbuf[SIZ];
-
+ const char *old_name = NULL;
+
+ old_name = CtdlThreadName("do_command_loop");
+
time(&CC->lastcmd);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
lprintf(CTDL_ERR, "Client disconnected: ending session.\n");
CC->kill_me = 1;
+ CtdlThreadName(old_name);
return;
}
safestrncpy(CC->lastcmdname, cmdbuf, sizeof(CC->lastcmdname));
time(&CC->lastidle);
}
+
+ CtdlThreadName(cmdbuf);
if ((strncasecmp(cmdbuf, "ENT0", 4))
&& (strncasecmp(cmdbuf, "MESG", 4))
/* Run any after-each-command routines registered by modules */
PerformSessionHooks(EVT_CMD);
+ CtdlThreadName(old_name);
}