From 08981f1caa60e4f1ae0d430c01b859c286d6ddae Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 28 Apr 2009 04:22:54 +0000 Subject: [PATCH] * If running 7.60 code for the first time, serv_upgrade erases any existing LDAP configuration left behind by the old module. --- citadel/ctdlmigrate.c | 2 +- citadel/modules/upgrade/serv_upgrade.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/citadel/ctdlmigrate.c b/citadel/ctdlmigrate.c index 3abb06760..ad50ea9d9 100644 --- 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 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(); } -- 2.30.2