Prepared some of the authmode stuff for the imminent addition

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index e1b2135f7aec14d5cf1f14f82a13e727e8547fd5..fcce7d23912dda4a3d803c1f1a4eaa47354f28a8 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -293,11 +293,11 @@ void cmd_info(void) {
        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);
@@ -991,7 +991,7 @@ void citproto_begin_session() {
  */
 void do_command_loop(void) {
        char cmdbuf[SIZ];
-       char *old_name = NULL;
+       const char *old_name = NULL;
        
        old_name = CtdlThreadName("do_command_loop");