Removed the 'master user' feature ... if we still need this we'll find another way

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index 025b511d46c133d01126359b3ed588508386c199..2507abfee037e042aee267c0ca7fc7a4c0277738 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -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
@@ -206,8 +205,6 @@ void migrate_legacy_config(struct legacy_config *lconfig)
        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        );