X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fupgrade%2Fserv_upgrade.c;h=60b364850c913be28a94a7c0d850806878c23eee;hb=08981f1caa60e4f1ae0d430c01b859c286d6ddae;hp=0b09d9f57675f3c896742487db278f0710774bc5;hpb=8154090751bc44a627f258219239a1a4805315e8;p=citadel.git

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index 0b09d9f57..60b364850 100644
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -251,6 +251,17 @@ void update_config(void) {
 		config.c_xmpp_s2s_port = 5269;
 	}
 
+	/* Erase LDAP config that might be left over from the old connector
+	 * which served a different purpose.
+	 */
+	if (CitControl.version < 760) {
+		strcpy(config.c_ldap_host, "");
+		config.c_ldap_port = 389;
+		strcpy(config.c_ldap_base_dn, "");
+		strcpy(config.c_ldap_bind_dn, "");
+		strcpy(config.c_ldap_bind_pw, "");
+	}
+
 	if (IsEmptyStr(config.c_default_cal_zone)) {
 		guess_time_zone();
 	}