* If running 7.60 code for the first time, serv_upgrade erases any existing LDAP...

diff --git a/citadel/ctdlmigrate.c b/citadel/ctdlmigrate.c
index 3abb06760bb795a461ce2cdf01cf84b9717093d0..ad50ea9d9dfec03bdced89ef60b2b306985b3d09 100644 (file)
--- a/citadel/ctdlmigrate.c
+++ b/citadel/ctdlmigrate.c
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
        calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
        CtdlMakeTempFileName(socket_path, sizeof socket_path);
 
-       system("clear");
+       cmdexit = system("clear");
        printf( "-------------------------------------------\n"
                "Over-the-wire migration utility for Citadel\n"
                "-------------------------------------------\n"

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index 0b09d9f57675f3c896742487db278f0710774bc5..60b364850c913be28a94a7c0d850806878c23eee 100644 (file)
--- 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();
        }