From 1e7e3eaa507ff8a34af3aa031d8438b1b4d22423 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Wed, 17 Feb 2010 17:09:25 +0000
Subject: [PATCH] * During setup, the default LDAP port number is now 389
 instead of 0.

---
 citadel/citserver.c   | 5 ++---
 citadel/utils/setup.c | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 43adab030..054bf5068 100644
--- 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 5af5c4bf4..61e415ddb 100644
--- 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;
-- 
2.30.2