From 8f1f36df44c42e28e2c5a62f2798689e3eb5445c Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sun, 6 Nov 2005 03:56:58 +0000 Subject: [PATCH] more changes to batch mode setup --- citadel/ChangeLog | 3 +++ citadel/setup.c | 11 ++++++++--- citadel/techdoc/package-setup.txt | 4 +++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index f232ac5ee..84d2f6dd1 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,5 +1,8 @@ $Id$ +Sat Nov 5 22:56:30 EST 2005 ajc +* More changes to batch mode setup + Thu Nov 3 23:02:01 EST 2005 ajc * Updated setup to allow more batch mode control of it; see techdoc/package-setup.txt diff --git a/citadel/setup.c b/citadel/setup.c index d8a634c28..2cf235005 100644 --- a/citadel/setup.c +++ b/citadel/setup.c @@ -640,8 +640,8 @@ void disable_other_mta(char *mta) { /* Offer to replace other MTA with the vastly superior Citadel :) */ - if (getenv("DISABLE_OTHER_MTA")) { - if (strcasecmp(getenv("DISABLE_OTHER_MTA"), "yes")) { + if (getenv("ACT_AS_MTA")) { + if (strcasecmp(getenv("ACT_AS_MTA"), "yes")) { return; } } @@ -827,7 +827,12 @@ void edit_value(int curr) switch (curr) { case 1: - set_str_val(curr, config.c_sysadm); + if (getenv("SYSADMIN_NAME")) { + strcpy(config.c_sysadm, getenv("SYSADMIN_NAME")); + } + else { + set_str_val(curr, config.c_sysadm); + } break; case 2: diff --git a/citadel/techdoc/package-setup.txt b/citadel/techdoc/package-setup.txt index 7f54888a5..88362ac76 100644 --- a/citadel/techdoc/package-setup.txt +++ b/citadel/techdoc/package-setup.txt @@ -17,7 +17,7 @@ SUPPORT Location of libraries, etc. (optional) CTDL_DIALOG Location of the 'dialog' program (optional) -DISABLE_OTHER_MTA When other MTA's (Postfix, etc.) are found, setup +ACT_AS_MTA When other MTA's (Postfix, etc.) are found, setup will offer to disable them in order to keep them from interfering with Citadel. Set this variable to "yes" to always disable the other MTA without asking, @@ -28,3 +28,5 @@ CREATE_INITTAB_ENTRY Set to "yes" to automatically create an entry in CREATE_XINETD_ENTRY Set to "yes" to automatically configure xinetd to route telnet connections into a Citadel client, if needed. + +SYSADMIN_NAME Name of system administrator. -- 2.39.2