X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfig.c;h=d9eee63e739b40a00d8880986c7c933c07d22944;hb=6cd4b62a62098566ed73d7662d22e29fc509b9f3;hp=9cc1b3a3db3a9f203425614dfe618015e44135a4;hpb=5c39ca8a3c875df98163fed8923c258f21bb3f66;p=citadel.git

diff --git a/citadel/config.c b/citadel/config.c
index 9cc1b3a3d..d9eee63e7 100644
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -207,10 +207,6 @@ void migrate_legacy_config(struct legacy_config *lconfig)
 	CtdlSetConfigInt(	"c_pftcpdict_port"	,	lconfig->c_pftcpdict_port	);
 	CtdlSetConfigInt(	"c_managesieve_port"	,	lconfig->c_managesieve_port	);
 	CtdlSetConfigInt(	"c_auth_mode"		,	lconfig->c_auth_mode		);
-	CtdlSetConfigStr(	"c_funambol_host"	,	lconfig->c_funambol_host	);
-	CtdlSetConfigInt(	"c_funambol_port"	,	lconfig->c_funambol_port	);
-	CtdlSetConfigStr(	"c_funambol_source"	,	lconfig->c_funambol_source	);
-	CtdlSetConfigStr(	"c_funambol_auth"	,	lconfig->c_funambol_auth	);
 	CtdlSetConfigInt(	"c_rbl_at_greeting"	,	lconfig->c_rbl_at_greeting	);
 	CtdlSetConfigStr(	"c_master_user"		,	lconfig->c_master_user		);
 	CtdlSetConfigStr(	"c_master_pass"		,	lconfig->c_master_pass		);
@@ -486,8 +482,7 @@ char *CtdlGetSysConfig(char *sysconfname) {
 	/* We want the last (and probably only) config in this room */
 	begin_critical_section(S_CONFIG);
 	config_msgnum = (-1L);
-	CtdlForEachMessage(MSGS_LAST, 1, NULL, sysconfname, NULL,
-			   CtdlGetSysConfigBackend, NULL);
+	CtdlForEachMessage(MSGS_LAST, 1, NULL, sysconfname, NULL, CtdlGetSysConfigBackend, NULL);
 	msgnum = config_msgnum;
 	end_critical_section(S_CONFIG);
 
@@ -507,10 +502,12 @@ char *CtdlGetSysConfig(char *sysconfname) {
 
 	CtdlGetRoom(&CC->room, hold_rm);
 
-	if (conf != NULL) do {
+	if (conf != NULL) {
+		do {
 			extract_token(buf, conf, 0, '\n', sizeof buf);
 			strcpy(conf, &conf[strlen(buf)+1]);
 		} while ( (!IsEmptyStr(conf)) && (!IsEmptyStr(buf)) );
+	}
 
 	return(conf);
 }