* During setup, the default LDAP port number is now 389 instead of 0.

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 43adab030721f81580a34d019b336ce569898029..054bf50687b3e14fc9ad213bb6cb3c273f943a8d 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -1043,12 +1043,11 @@ void do_command_loop(void) {
        }
 
        /* Log the server command, but don't show passwords... */
-       if ( (strncasecmp(cmdbuf, "PASS", 4))
-          && (strncasecmp(cmdbuf, "SETP", 4)) ) {
+       if ( (strncasecmp(cmdbuf, "PASS", 4)) && (strncasecmp(cmdbuf, "SETP", 4)) ) {
                CtdlLogPrintf(CTDL_INFO, "%s\n", cmdbuf);
        }
        else {
-               CtdlLogPrintf(CTDL_INFO, "<password command sent>\n");
+               CtdlLogPrintf(CTDL_INFO, "<password command hidden from log>\n");
        }
 
        buffer_output();

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index 5af5c4bf46d2ec9aa9b6f03460d2db483cb6bcd0..61e415ddb3e6ac578ef422dbbd3ab115d27696cf 100644 (file)
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -925,6 +925,9 @@ void edit_value(int curr)
                }
                else
                {
+                       if (config.c_ldap_port == 0) {
+                               config.c_ldap_port = 389;
+                       }
                        set_int_val(curr, &config.c_ldap_port);
                }
                break;