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

[citadel.git] / citadel / modules / upgrade / serv_upgrade.c

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index df2c197aae0af8f8ed802d89b000d2a03ff43802..60b364850c913be28a94a7c0d850806878c23eee 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -195,6 +195,27 @@ void convert_ctdluid_to_minusone(void) {
        return;
 }
 
+
+/*
+ * Attempt to guess the name of the time zone currently in use
+ * on the underlying host system.
+ */
+void guess_time_zone(void) {
+       FILE *fp;
+       char buf[PATH_MAX];
+
+       fp = popen(file_guesstimezone, "r");
+       if (fp) {
+               if (fgets(buf, sizeof buf, fp) && (strlen(buf) > 2)) {
+                       buf[strlen(buf)-1] = 0;
+                       safestrncpy(config.c_default_cal_zone, buf, sizeof config.c_default_cal_zone);
+                       CtdlLogPrintf(CTDL_INFO, "Configuring timezone: %s\n", config.c_default_cal_zone);
+               }
+               fclose(fp);
+       }
+}
+
+
 /*
  * Do various things to our configuration file
  */
@@ -230,6 +251,21 @@ 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();
+       }
+
        put_config();
 }
 
@@ -283,7 +319,6 @@ void check_server_upgrades(void) {
 CTDL_MODULE_UPGRADE(upgrade)
 {
        check_server_upgrades();
-       rebuild_usersbynumber();                // FIXME take this out
        
        /* return our Subversion id for the Log */
        return "$Id$";