X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfig.c;h=f3357d9d7b1bbc771879d007213a7a8f583e76d2;hb=f614f64351a5df98ebc837c973772cebb8171bd4;hp=025b511d46c133d01126359b3ed588508386c199;hpb=3266c188546fc12ace3731baaad99f8c1425bd5a;p=citadel.git

diff --git a/citadel/config.c b/citadel/config.c
index 025b511d4..f3357d9d7 100644
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -1,7 +1,7 @@
 /*
  * Read and write the citadel.config file
  *
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2021 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -57,7 +57,6 @@ void validate_config(void) {
 	config_warn_if_empty("c_aideroom");
 	config_warn_if_empty("c_twitroom");
 	config_warn_if_empty("c_nodename");
-	config_warn_if_empty("c_default_cal_zone");
 
 	/*
 	 * Sanity check for port bindings
@@ -71,7 +70,6 @@ void validate_config(void) {
 	config_warn_if_port_unset("c_pop3s_port",	995);
 	config_warn_if_port_unset("c_imaps_port",	993);
 	config_warn_if_port_unset("c_pftcpdict_port",	-1);
-	config_warn_if_port_unset("c_managesieve_port",	2020);
 	config_warn_if_port_unset("c_xmpp_c2s_port",	5222);
 	config_warn_if_port_unset("c_xmpp_s2s_port",	5269);
 	config_warn_if_port_unset("c_nntp_port",	119);
@@ -130,7 +128,6 @@ void brand_new_installation_set_defaults(void) {
 	CtdlSetConfigInt("c_pop3s_port",	995);
 	CtdlSetConfigInt("c_imaps_port",	993);
 	CtdlSetConfigInt("c_pftcpdict_port",	-1);
-	CtdlSetConfigInt("c_managesieve_port",	2020);
 	CtdlSetConfigInt("c_xmpp_c2s_port",	5222);
 	CtdlSetConfigInt("c_xmpp_s2s_port",	5269);
 	CtdlSetConfigInt("c_nntp_port",		119);
@@ -203,11 +200,8 @@ void migrate_legacy_config(struct legacy_config *lconfig)
 	CtdlSetConfigStr(	"c_journal_dest"	,	lconfig->c_journal_dest		);
 	CtdlSetConfigStr(	"c_default_cal_zone"	,	lconfig->c_default_cal_zone	);
 	CtdlSetConfigInt(	"c_pftcpdict_port"	,	lconfig->c_pftcpdict_port	);
-	CtdlSetConfigInt(	"c_managesieve_port"	,	lconfig->c_managesieve_port	);
 	CtdlSetConfigInt(	"c_auth_mode"		,	lconfig->c_auth_mode		);
 	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		);
 	CtdlSetConfigStr(	"c_pager_program"	,	lconfig->c_pager_program	);
 	CtdlSetConfigInt(	"c_imap_keep_from"	,	lconfig->c_imap_keep_from	);
 	CtdlSetConfigInt(	"c_xmpp_c2s_port"	,	lconfig->c_xmpp_c2s_port	);
@@ -238,15 +232,6 @@ void initialize_config_system(void) {
 		exit(CTDLEXIT_LIBCITADEL);
 	}
 
-	if (chdir(ctdl_bbsbase_dir) != 0) {
-		fprintf(stderr,
-			"This program could not be started.\nUnable to change directory to %s\nError: %s\n",
-			ctdl_bbsbase_dir,
-			strerror(errno)
-		);
-		exit(CTDLEXIT_HOME);
-	}
-
 	memset(&lconfig, 0, sizeof(struct legacy_config));
 	cfp = fopen(file_citadel_config, "rb");
 	if (cfp != NULL) {
@@ -491,7 +476,7 @@ char *CtdlGetSysConfig(char *sysconfname) {
 		conf = NULL;
 	}
 	else {
-		msg = CtdlFetchMessage(msgnum, 1, 1);
+		msg = CtdlFetchMessage(msgnum, 1);
 		if (msg != NULL) {
 			conf = strdup(msg->cm_fields[eMesageText]);
 			CM_Free(msg);