Applied matt's latest patch set

[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 2646009c3dcefe0da675005529f15cdf54ae39c5..2158897ae40dc112fabe564dd7521e5b42a0a969 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -184,8 +184,10 @@ void update_config(void) {
        if (CitControl.version < 725) {
                config.c_xmpp_c2s_port = 5222;
                config.c_xmpp_s2s_port = 5269;
+               /* Wipe config.c_funambol_auth as support for previous
+                * module is deprecated */
+                strcpy(config.c_funambol_auth, " ");
        }
-
        put_config();
 }