X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfig.c;h=b6c386b6e56dc7c0ee9d31ed8ea909860ca903c1;hb=4c274aa94a53d8850ed363e64c5863970fe629a4;hp=f41533c5b13b858f27bf70d4f929c38211a76319;hpb=15054b0f11409cfc68102560fe4ab5a4e2bf4ea0;p=citadel.git

diff --git a/citadel/config.c b/citadel/config.c
index f41533c5b..b6c386b6e 100644
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -259,7 +259,7 @@ void initialize_config_system(void) {
 	memset(&lconfig, 0, sizeof(struct legacy_config));
 	cfp = fopen(file_citadel_config, "rb");
 	if (cfp != NULL) {
-		if (CtdlGetConfigLong("c_config_created_or_migrated") <= 0) {
+		if (CtdlGetConfigLong("c_config_created_or_migrated") > 0) {
 			fprintf(stderr, "Citadel Server found BOTH legacy and new configurations present.\n");
 			fprintf(stderr, "Exiting to prevent data corruption.\n");
 			exit(CTDLEXIT_CONFIG);
@@ -415,7 +415,7 @@ char *CtdlGetConfigStr(char *key)
 	/* First look in memory */
 	if (GetHash(ctdlconfig, key, key_len, (void *)&value))
 	{
-		syslog(LOG_DEBUG, "\033[32mGET CONFIG: '%s' = '%s'\033[0m", key, value);
+		if (strcmp(key, "c_min_workers")) syslog(LOG_DEBUG, "\033[32mGET CONFIG: '%s' = '%s'\033[0m", key, value);
 		return value;
 	}
 
@@ -502,7 +502,7 @@ char *CtdlGetSysConfig(char *sysconfname) {
 		conf = NULL;
 	}
 	else {
-		msg = CtdlFetchMessage(msgnum, 1);
+		msg = CtdlFetchMessage(msgnum, 1, 1);
 		if (msg != NULL) {
 			conf = strdup(msg->cm_fields[eMesageText]);
 			CM_Free(msg);