Removed the remaining code where LDAP was optional.

[citadel.git] / citadel / modules / ctdlproto / serv_session.c

diff --git a/citadel/modules/ctdlproto/serv_session.c b/citadel/modules/ctdlproto/serv_session.c
index fa8186635381a62e51bccfd064165f57d6c4ee66..697cc93716f820f392dab20518410a512a8d4d7e 100644 (file)
--- a/citadel/modules/ctdlproto/serv_session.c
+++ b/citadel/modules/ctdlproto/serv_session.c
@@ -1,7 +1,7 @@
 /* 
  * Server functions which perform operations on user objects.
  *
- * Copyright (c) 1987-2019 by the citadel.org team
+ * Copyright (c) 1987-2020 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License, version 3.
@@ -64,14 +64,9 @@ void cmd_info(char *cmdbuf) {
        cprintf("%s\n", CtdlGetConfigStr("c_moreprompt"));
        cprintf("1\n"); /* 1 = yes, this system supports floors */
        cprintf("1\n"); /* 1 = we support the extended paging options */
-       cprintf("\n");  /* nonce no longer supported */
+       cprintf("\n");  /* no longer used */
        cprintf("1\n"); /* 1 = yes, this system supports the QNOP command */
-
-#ifdef HAVE_LDAP
        cprintf("1\n"); /* 1 = yes, this server is LDAP-enabled */
-#else
-       cprintf("0\n"); /* 1 = no, this server is not LDAP-enabled */
-#endif
 
        if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_NATIVE) && (CtdlGetConfigInt("c_disable_newu") == 0))
        {
@@ -83,10 +78,10 @@ void cmd_info(char *cmdbuf) {
 
        cprintf("%s\n", CtdlGetConfigStr("c_default_cal_zone"));
 
-       cprintf("0\n");         /* load average         (no longer used) */
-       cprintf("0\n");         /* worker average       (no longer used) */
-       cprintf("0\n");         /* thread count         (no longer used) */
-       cprintf("1\n");         /* yes, Sieve mail filtering is supported */
+       cprintf("0\n"); /* no longer used */
+       cprintf("0\n"); /* no longer used */
+       cprintf("0\n"); /* no longer used */
+       cprintf("0\n"); /* no longer used */
 
        cprintf("%d\n", CtdlGetConfigInt("c_enable_fulltext"));
        cprintf("%s\n", svn_revision());
@@ -152,7 +147,7 @@ void cmd_iden(char *argbuf)
        CC->cs_clientname[31] = 0;
 
        /* For local sockets, allow the client to supply the user's origin address */
-       if (CC->is_local_socket) {
+       if ((CC->is_local_client) || (!IsEmptyStr(CC->cs_addr) && (!strcmp(CC->cs_addr, "127.0.0.1")) || (!strcmp(CC->cs_addr, "::1")))) {
                safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host);
                CC->cs_host[sizeof CC->cs_host - 1] = 0;
                CC->cs_addr[0] = 0;