* Cleanup and tuning of previous commit

[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 de3eb9ab5227d7e17566f40279dad05f084513bb..20497ded7e97eaa86ef0a91b88cb1334d1407834 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -3,7 +3,7 @@
  *
  * Transparently handle the upgrading of server data formats.
  *
- * Copyright (c) 1987-2009 by the citadel.org team
+ * Copyright (c) 1987-2010 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -93,7 +93,9 @@ void fix_sys_user_name(void)
        {
                if (strncmp(usbuf.fullname, "SYS_", 4))
                {       /** Delete any user 0 that doesn't start with SYS_ */
-                       makeuserkey(usernamekey, usbuf.fullname);
+                       makeuserkey(usernamekey, 
+                                   usbuf.fullname, 
+                                   cutuserkey(usbuf.fullname));
                        cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
                }
                else
@@ -249,7 +251,7 @@ void update_config(void) {
        }
 
        if (CitControl.version < 623) {
-               strcpy(config.c_ip_addr, "0.0.0.0");
+               strcpy(config.c_ip_addr, "*");
        }
 
        if (CitControl.version < 650) {
@@ -265,17 +267,6 @@ 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();
        }