more changes to batch mode setup

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index f232ac5ee4895885b956200cb883846f09873ff3..84d2f6dd1a75838ba7e91234f7f2681968e9853e 100644 (file)
--- 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 d8a634c2869e521195d83b59e0d710d2dadde446..2cf23500528dec6f04d6e24ca7fe7cdc16ed3e4a 100644 (file)
--- 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 7f54888a5faa32aea0144d3a6da443f35ae305e5..88362ac76677c074d1f55bb7c7bebda574a21829 100644 (file)
--- 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.