X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futils%2Fsetup.c;h=ae89d142b327f154ce20244d683ce53402319b8e;hb=4476063e3bc75a548fa3a96e518cc8cbeacc8935;hp=1cbc777417dee56b5904c6171802006723da7260;hpb=51834f3a61644b1f6f5a5f528cf36fbfbc73b2de;p=citadel.git

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index 1cbc77741..ae89d142b 100644
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -128,7 +128,6 @@ void SetTitles(void)
 "specify the -h flag to the server when you start it up.\n"
 "note that it may not have a leading /");
 
-
 	setup_titles[eSysAdminName] = _("Citadel administrator username:");
 	setup_text[eSysAdminName] = _(
 "Please enter the name of the Citadel user account that should be granted "
@@ -136,7 +135,6 @@ void SetTitles(void)
 "this user account will be created if it does not exist. For external "
 "authentication this user account has to exist.");
 
-
 	setup_titles[eSysAdminPW] = _("Administrator password:");
 	setup_text[eSysAdminPW] = _(
 "Enter a password for the system administrator. When setup\n"
@@ -520,15 +518,6 @@ void check_xinetd_entry(void)
 }
 
 
-void disable_other_mtas(void)
-{
-	if ((getenv("ACT_AS_MTA") == NULL) || (getenv("ACT_AS_MTA") && strcasecmp(getenv("ACT_AS_MTA"), "yes") == 0)) {
-		/* Offer to disable other MTA's on the system. */
-		/* FIXME this has to be rewritten to work in the new systemd-based world. */
-	}
-}
-
-
 void strprompt(const char *prompt_title, const char *prompt_text, char *Target, char *DefValue)
 {
 	char buf[SIZ] = "";
@@ -681,6 +670,7 @@ void edit_value(int curr)
 }
 
 
+#if 0
 /*
  * Strip "db" entries out of /etc/nsswitch.conf
  */
@@ -769,6 +759,7 @@ void fixnss(void) {
 	}
 	unlink(new_filename);
 }
+#endif
 
 
 /*
@@ -966,8 +957,6 @@ int main(int argc, char *argv[])
 	progress(activity, 5, 5);
 
 	check_xinetd_entry();	/* Check /etc/xinetd.d/telnet */
-	disable_other_mtas();   /* Offer to disable other MTAs */
-	fixnss();		/* Check for the 'db' nss and offer to disable it */
 
 	/*
 	 * Restart citserver