]> code.citadel.org Git - citadel.git/blobdiff - citadel/setup.c
* Backed out r7276 through r7278. This is too large a change to make during a featur...
[citadel.git] / citadel / setup.c
index 7c6e6f121781cb0f762801f703f3be3bf84789a7..05e6eacb1cad17aa975cccdf7034a16e57a6feb7 100644 (file)
 #include <limits.h>
 #include <pwd.h>
 #include <time.h>
 #include <limits.h>
 #include <pwd.h>
 #include <time.h>
-
+#include <libcitadel.h>
 #include "citadel.h"
 #include "axdefs.h"
 #include "sysdep.h"
 #include "config.h"
 #include "citadel.h"
 #include "axdefs.h"
 #include "sysdep.h"
 #include "config.h"
-#include "tools.h"
 #include "citadel_dirs.h"
 #include "citadel_dirs.h"
-
-#ifdef HAVE_NEWT
-#include <newt.h>
+#if HAVE_BACKTRACE
+#include <execinfo.h>
 #endif
 
 
 #endif
 
 
-#define MAXSETUP 4     /* How many setup questions to ask */
+#define MAXSETUP 6     /* How many setup questions to ask */
 
 #define UI_TEXT                0       /* Default setup type -- text only */
 #define UI_DIALOG      2       /* Use the 'dialog' program */
 #define UI_SILENT      3       /* Silent running, for use in scripts */
 
 #define UI_TEXT                0       /* Default setup type -- text only */
 #define UI_DIALOG      2       /* Use the 'dialog' program */
 #define UI_SILENT      3       /* Silent running, for use in scripts */
-#define UI_NEWT                4       /* Use the "newt" window library */
 
 #define SERVICE_NAME   "citadel"
 #define PROTO_NAME     "tcp"
 #define NSSCONF                "/etc/nsswitch.conf"
 
 int setup_type;
 
 #define SERVICE_NAME   "citadel"
 #define PROTO_NAME     "tcp"
 #define NSSCONF                "/etc/nsswitch.conf"
 
 int setup_type;
-char setup_directory[SIZ];
-char citserver_init_entry[SIZ];
+char setup_directory[PATH_MAX];
 int using_web_installer = 0;
 int enable_home = 1;
 int using_web_installer = 0;
 int enable_home = 1;
-
-/**
- *     We will set have_sysv_init to nonzero if the host operating system
- *     has a System V style init driven by /etc/inittab.  This will cause
- *     setup to offer to automatically start and stop the Citadel service.
- */
-int have_sysv_init = 0;
-
-#ifdef HAVE_LDAP
-void contemplate_ldap(void);
-#endif
+char admin_pass[SIZ];
+char admin_cmd[SIZ];
 
 char *setup_titles[] =
 {
        "Citadel Home Directory",
        "System Administrator",
 
 char *setup_titles[] =
 {
        "Citadel Home Directory",
        "System Administrator",
+       "Administrator Password",
        "Citadel User ID",
        "Server IP address",
        "Server port number",
        "Citadel User ID",
        "Server IP address",
        "Server port number",
+       "Authentication mode"
 };
 
 };
 
+/**
+ * \brief print the actual stack frame.
+ */
+void cit_backtrace(void)
+{
+#ifdef HAVE_BACKTRACE
+       void *stack_frames[50];
+       size_t size, i;
+       char **strings;
+
+
+       size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
+       strings = backtrace_symbols(stack_frames, size);
+       for (i = 0; i < size; i++) {
+               if (strings != NULL)
+                       fprintf(stderr, "%s\n", strings[i]);
+               else
+                       fprintf(stderr, "%p\n", stack_frames[i]);
+       }
+       free(strings);
+#endif
+}
 
 struct config config;
 
 
 struct config config;
 
@@ -96,6 +107,10 @@ char *setup_text[] = {
 "you).  When an account is created with this name, it will\n"
 "automatically be given administrator-level access.\n",
 
 "you).  When an account is created with this name, it will\n"
 "automatically be given administrator-level access.\n",
 
+"Enter a password for the system administrator. When setup\n"
+"completes it will attempt to create the administrator user\n"
+"and set the password specified here.\n",
+
 "Citadel needs to run under its own user ID.  This would\n"
 "typically be called \"citadel\", but if you are running Citadel\n"
 "as a public BBS, you might also call it \"bbs\" or \"guest\".\n"
 "Citadel needs to run under its own user ID.  This would\n"
 "typically be called \"citadel\", but if you are running Citadel\n"
 "as a public BBS, you might also call it \"bbs\" or \"guest\".\n"
@@ -115,142 +130,26 @@ char *setup_text[] = {
 "of Citadel on the same computer and there is something else\n"
 "already using port 504.\n",
 
 "of Citadel on the same computer and there is something else\n"
 "already using port 504.\n",
 
+"Normally, a Citadel system uses a \"black box\" authentication mode.\n"
+"This means that users do not have accounts or home directories on\n"
+"the underlying host system -- Citadel manages its own user database.\n"
+"However, if you wish to override this behavior, you can enable the\n"
+"host based authentication mode which is traditional for Unix systems.\n"
+"WARNING: do *not* change this setting once your system is installed.\n"
+"\n"
+"(Answer \"no\" unless you completely understand this option)\n"
+"Do you want to enable host based authentication mode?\n"
+
 };
 
 struct config config;
 int direction;
 
 };
 
 struct config config;
 int direction;
 
-/*
- * Set an entry in inittab to the desired state
- */
-void set_init_entry(char *which_entry, char *new_state) {
-       char *inittab = NULL;
-       FILE *fp;
-       char buf[SIZ];
-       char entry[SIZ];
-       char levels[SIZ];
-       char state[SIZ];
-       char prog[SIZ];
-
-       if (which_entry == NULL) return;
-       if (strlen(which_entry) == 0) return;
-
-       inittab = strdup("");
-       if (inittab == NULL) return;
-
-       fp = fopen("/etc/inittab", "r");
-       if (fp == NULL) return;
-
-       while(fgets(buf, sizeof buf, fp) != NULL) {
-
-               if (num_tokens(buf, ':') == 4) {
-                       extract_token(entry, buf, 0, ':', sizeof entry);
-                       extract_token(levels, buf, 1, ':', sizeof levels);
-                       extract_token(state, buf, 2, ':', sizeof state);
-                       extract_token(prog, buf, 3, ':', sizeof prog); /* includes 0x0a LF */
-
-                       if (!strcmp(entry, which_entry)) {
-                               strcpy(state, new_state);
-                               sprintf(buf, "%s:%s:%s:%s",
-                                       entry, levels, state, prog);
-                       }
-               }
-
-               inittab = realloc(inittab, strlen(inittab) + strlen(buf) + 2);
-               if (inittab == NULL) {
-                       fclose(fp);
-                       return;
-               }
-               
-               strcat(inittab, buf);
-       }
-       fclose(fp);
-       fp = fopen("/etc/inittab", "w");
-       if (fp != NULL) {
-               fwrite(inittab, strlen(inittab), 1, fp);
-               fclose(fp);
-               kill(1, SIGHUP);        /* Tell init to re-read /etc/inittab */
-       }
-       free(inittab);
-}
-
-
-/*
- * Locate the name of an inittab entry for a specific program
- */
-void locate_init_entry(char *init_entry, char *looking_for) {
-
-       FILE *infp;
-       char buf[SIZ];
-       int have_entry = 0;
-       char entry[SIZ];
-       char prog[SIZ];
-
-       strcpy(init_entry, "");
-
-       /* Pound through /etc/inittab line by line.  Set have_entry to 1 if
-        * an entry is found which we believe starts the specified program.
-        */
-       infp = fopen("/etc/inittab", "r");
-       if (infp == NULL) {
-               return;
-       } else {
-               while (fgets(buf, sizeof buf, infp) != NULL) {
-                       buf[strlen(buf) - 1] = 0;
-                       extract_token(entry, buf, 0, ':', sizeof entry);
-                       extract_token(prog, buf, 3, ':', sizeof prog);
-                       if (!strncasecmp(prog, looking_for,
-                          strlen(looking_for))) {
-                               ++have_entry;
-                               strcpy(init_entry, entry);
-                       }
-               }
-               fclose(infp);
-       }
-
-}
-
-
-/* 
- * Shut down the Citadel service if necessary, during setup.
- */
-void shutdown_citserver(void) {
-       char looking_for[SIZ];
-
-       snprintf(looking_for, 
-                        sizeof looking_for,
-                        "%s/citserver", 
-#ifndef HAVE_RUN_DIR
-                        setup_directory
-#else
-                        CTDLDIR
-#endif
-                        );
-       locate_init_entry(citserver_init_entry, looking_for);
-       if (strlen(citserver_init_entry) > 0) {
-               set_init_entry(citserver_init_entry, "off");
-       }
-}
-
-
-/*
- * Start the Citadel service.
- */
-void start_citserver(void) {
-       if (strlen(citserver_init_entry) > 0) {
-               set_init_entry(citserver_init_entry, "respawn");
-       }
-}
-
-
 
 void cleanup(int exitcode)
 {
 
 void cleanup(int exitcode)
 {
-#ifdef HAVE_NEWT
-       newtCls();
-       newtRefresh();
-       newtFinished();
-#endif
+//     printf("Exitcode: %d\n", exitcode);
+//     cit_backtrace();
        exit(exitcode);
 }
 
        exit(exitcode);
 }
 
@@ -265,14 +164,8 @@ void title(char *text)
 
 
 
 
 
 
-int yesno(char *question)
+int yesno(char *question, int default_value)
 {
 {
-#ifdef HAVE_NEWT
-       newtComponent form = NULL;
-       newtComponent yesbutton = NULL;
-       newtComponent nobutton = NULL;
-       int prompt_window_height = 0;
-#endif
        int i = 0;
        int answer = 0;
        char buf[SIZ];
        int i = 0;
        int answer = 0;
        char buf[SIZ];
@@ -281,10 +174,15 @@ int yesno(char *question)
 
        case UI_TEXT:
                do {
 
        case UI_TEXT:
                do {
-                       printf("%s\nYes/No --> ", question);
+                       printf("%s\nYes/No [%s] --> ",
+                               question,
+                               ( default_value ? "Yes" : "No" )
+                       );
                        fgets(buf, sizeof buf, stdin);
                        answer = tolower(buf[0]);
                        fgets(buf, sizeof buf, stdin);
                        answer = tolower(buf[0]);
-                       if (answer == 'y')
+                       if ((buf[0]==0) || (buf[0]==13) || (buf[0]==10))
+                               answer = default_value;
+                       else if (answer == 'y')
                                answer = 1;
                        else if (answer == 'n')
                                answer = 0;
                                answer = 1;
                        else if (answer == 'n')
                                answer = 0;
@@ -292,8 +190,9 @@ int yesno(char *question)
                break;
 
        case UI_DIALOG:
                break;
 
        case UI_DIALOG:
-               sprintf(buf, "exec %s --yesno '%s' 10 72",
+               sprintf(buf, "exec %s %s --yesno '%s' 15 75",
                        getenv("CTDL_DIALOG"),
                        getenv("CTDL_DIALOG"),
+                       ( default_value ? "" : "--defaultno" ),
                        question);
                i = system(buf);
                if (i == 0) {
                        question);
                i = system(buf);
                if (i == 0) {
@@ -303,31 +202,8 @@ int yesno(char *question)
                        answer = 0;
                }
                break;
                        answer = 0;
                }
                break;
-
-#ifdef HAVE_NEWT
-       case UI_NEWT:
-               prompt_window_height = num_tokens(question, '\n') + 5;
-               newtCenteredWindow(76, prompt_window_height, "Question");
-               form = newtForm(NULL, NULL, 0);
-               for (i=0; i<num_tokens(question, '\n'); ++i) {
-                       extract_token(buf, question, i, '\n', sizeof buf);
-                       newtFormAddComponent(form, newtLabel(1, 1+i, buf));
-               }
-               yesbutton = newtButton(10, (prompt_window_height - 4), "Yes");
-               nobutton = newtButton(60, (prompt_window_height - 4), "No");
-               newtFormAddComponent(form, yesbutton);
-               newtFormAddComponent(form, nobutton);
-               if (newtRunForm(form) == yesbutton) {
-                       answer = 1;
-               }
-               else {
-                       answer = 0;
-               }
-               newtPopWindow();
-               newtFormDestroy(form);  
-
+       case UI_SILENT:
                break;
                break;
-#endif
 
        }
        return (answer);
 
        }
        return (answer);
@@ -336,10 +212,6 @@ int yesno(char *question)
 
 void important_message(char *title, char *msgtext)
 {
 
 void important_message(char *title, char *msgtext)
 {
-#ifdef HAVE_NEWT
-       newtComponent form = NULL;
-       int i = 0;
-#endif
        char buf[SIZ];
 
        switch (setup_type) {
        char buf[SIZ];
 
        switch (setup_type) {
@@ -357,22 +229,9 @@ void important_message(char *title, char *msgtext)
                        msgtext);
                system(buf);
                break;
                        msgtext);
                system(buf);
                break;
-
-#ifdef HAVE_NEWT
-       case UI_NEWT:
-               newtCenteredWindow(76, 10, title);
-               form = newtForm(NULL, NULL, 0);
-               for (i=0; i<num_tokens(msgtext, '\n'); ++i) {
-                       extract_token(buf, msgtext, i, '\n', sizeof buf);
-                       newtFormAddComponent(form, newtLabel(1, 1+i, buf));
-               }
-               newtFormAddComponent(form, newtButton(35, 5, "OK"));
-               newtRunForm(form);
-               newtPopWindow();
-               newtFormDestroy(form);  
+       case UI_SILENT:
+               fprintf(stderr, "%s\n", msgtext);
                break;
                break;
-#endif
-
        }
 }
 
        }
 }
 
@@ -388,16 +247,6 @@ void display_error(char *error_message)
 
 void progress(char *text, long int curr, long int cmax)
 {
 
 void progress(char *text, long int curr, long int cmax)
 {
-#ifdef HAVE_NEWT
-
-       /* These variables are static because progress() gets called
-        * multiple times during the course of whatever operation is
-        * being performed.  This makes setup non-threadsafe, but who
-        * cares?
-        */
-       static newtComponent form = NULL;
-       static newtComponent scale = NULL;
-#endif
        static long dots_printed = 0L;
        long a = 0;
        static FILE *fp = NULL;
        static long dots_printed = 0L;
        long a = 0;
        static FILE *fp = NULL;
@@ -453,28 +302,8 @@ void progress(char *text, long int curr, long int cmax)
                        }
                }
                break;
                        }
                }
                break;
-
-#ifdef HAVE_NEWT
-       case UI_NEWT:
-               if (curr == 0) {
-                       newtCenteredWindow(76, 8, text);
-                       form = newtForm(NULL, NULL, 0);
-                       scale = newtScale(1, 3, 74, cmax);
-                       newtFormAddComponent(form, scale);
-                       newtDrawForm(form);
-                       newtRefresh();
-               }
-               if ((curr > 0) && (curr <= cmax)) {
-                       newtScaleSet(scale, curr);
-                       newtRefresh();
-               }
-               if (curr == cmax) {
-                       newtFormDestroy(form);  
-                       newtPopWindow();
-                       newtRefresh();
-               }
+       case UI_SILENT:
                break;
                break;
-#endif
 
        }
 }
 
        }
 }
@@ -489,116 +318,205 @@ void check_services_entry(void)
 {
        int i;
        FILE *sfp;
 {
        int i;
        FILE *sfp;
+       char errmsg[256];
 
        if (getservbyname(SERVICE_NAME, PROTO_NAME) == NULL) {
 
        if (getservbyname(SERVICE_NAME, PROTO_NAME) == NULL) {
-               for (i=0; i<=3; ++i) {
-                       progress("Adding service entry...", i, 3);
+               for (i=0; i<=2; ++i) {
+                       progress("Adding service entry...", i, 2);
                        if (i == 0) {
                                sfp = fopen("/etc/services", "a");
                                if (sfp == NULL) {
                        if (i == 0) {
                                sfp = fopen("/etc/services", "a");
                                if (sfp == NULL) {
-                                       display_error(strerror(errno));
+                                       sprintf(errmsg, "Cannot open /etc/services: %s", strerror(errno));
+                                       display_error(errmsg);
                                } else {
                                } else {
-                                       fprintf(sfp, "%s                504/tcp\n",
-                                               SERVICE_NAME);
+                                       fprintf(sfp, "%s                504/tcp\n", SERVICE_NAME);
                                        fclose(sfp);
                                }
                        }
                                        fclose(sfp);
                                }
                        }
-                       sleep(1);
                }
        }
 }
 
 
                }
        }
 }
 
 
-/*
- * Generate a unique entry name for a new inittab entry
- */
-void generate_entry_name(char *entryname) {
-       char buf[SIZ];
-
-       snprintf(entryname, sizeof entryname, "c0");
-       do {
-               ++entryname[1];
-               if (entryname[1] > '9') {
-                       entryname[1] = 0;
-                       ++entryname[0];
-                       if (entryname[0] > 'z') {
-                               display_error(
-                                  "Can't generate a unique entry name");
-                               return;
-                       }
-               }
-               snprintf(buf, sizeof buf,
-                    "grep %s: /etc/inittab >/dev/null 2>&1", entryname);
-       } while (system(buf) == 0);
-}
-
 
 
 /*
 
 
 /*
- * check_inittab_entry()  -- Make sure "citadel" is in /etc/inittab
+ * delete_inittab_entry()  -- Remove obsolete /etc/inittab entry for Citadel
  *
  */
  *
  */
-void check_inittab_entry(void)
+void delete_inittab_entry(void)
 {
        FILE *infp;
 {
        FILE *infp;
-       char looking_for[SIZ];
-       char question[SIZ];
-       char entryname[5];
+       FILE *outfp;
+       char looking_for[256];
+       char buf[1024];
+       char outfilename[32];
+       int changes_made = 0;
 
        /* Determine the fully qualified path name of citserver */
        snprintf(looking_for, 
 
        /* Determine the fully qualified path name of citserver */
        snprintf(looking_for, 
-                        sizeof looking_for,
-                        "%s/citserver", 
-#ifndef HAVE_RUN_DIR
-                        setup_directory
-#else
-                        CTDLDIR
-#endif
-                        );
-       locate_init_entry(citserver_init_entry, looking_for);
+                sizeof looking_for,
+                "%s/citserver", 
+                ctdl_sbin_dir
+                );
 
 
-       /* If there's already an entry, then we have nothing left to do. */
-       if (strlen(citserver_init_entry) > 0) {
+       /* Now tweak /etc/inittab */
+       infp = fopen("/etc/inittab", "r");
+       if (infp == NULL) {
+
+               /* If /etc/inittab does not exist, return quietly.
+                * Not all host platforms have it.
+                */
+               if (errno == ENOENT) {
+                       return;
+               }
+
+               /* Other errors might mean something really did go wrong.
+                */
+               sprintf(buf, "Cannot open /etc/inittab: %s", strerror(errno));
+               display_error(buf);
                return;
        }
 
                return;
        }
 
-       /* Otherwise, prompt the user to create an entry. */
-       if (getenv("CREATE_INITTAB_ENTRY") != NULL) {
-               if (strcasecmp(getenv("CREATE_INITTAB_ENTRY"), "yes")) {
-                       return;
+       strcpy(outfilename, "/tmp/ctdlsetup.XXXXXX");
+       outfp = fdopen(mkstemp(outfilename), "w+");
+       if (outfp == NULL) {
+               sprintf(buf, "Cannot open %s: %s", outfilename, strerror(errno));
+               display_error(buf);
+               fclose(infp);
+               return;
+       }
+
+       while (fgets(buf, sizeof buf, infp) != NULL) {
+               if (strstr(buf, looking_for) != NULL) {
+                       fwrite("#", 1, 1, outfp);
+                       ++changes_made;
                }
                }
+               fwrite(buf, strlen(buf), 1, outfp);
+       }
+
+       fclose(infp);
+       fclose(outfp);
+
+       if (changes_made) {
+               sprintf(buf, "/bin/mv -f %s /etc/inittab 2>/dev/null", outfilename);
+               system(buf);
+               system("/sbin/init q 2>/dev/null");
        }
        else {
        }
        else {
-               snprintf(question, sizeof question,
-                       "Do you want this computer configured to start the Citadel\n"
-                       "service automatically?  (If you answer yes, an entry in\n"
-                       "/etc/inittab pointing to %s will be added.)\n",
-                       looking_for);
-               if (yesno(question) == 0) {
+               unlink(outfilename);
+       }
+}
+
+
+/*
+ * install_init_scripts()  -- Try to configure to start Citadel at boot
+ *
+ */
+void install_init_scripts(void)
+{
+       struct stat etcinitd;
+       FILE *fp;
+       char *initfile = "/etc/init.d/citadel";
+       char command[SIZ];
+
+       if ((stat("/etc/init.d/", &etcinitd) == -1) && 
+           (errno == ENOENT))
+       {
+               if ((stat("/etc/rc.d/init.d/", &etcinitd) == -1) &&
+                   (errno == ENOENT))
+                       initfile = CTDLDIR"/citadel.init";
+               else
+                       initfile = "/etc/rc.d/init.d/citadel";
+       }
+
+       fp = fopen(initfile, "r");
+       if (fp != NULL) {
+               if (yesno("Citadel already appears to be configured to start at boot.\n"
+                  "Would you like to keep your boot configuration as is?\n", 1) == 1) {
                        return;
                }
                        return;
                }
+               fclose(fp);
+               
        }
 
        }
 
-       /* Generate a unique entry name for /etc/inittab */
-       generate_entry_name(entryname);
+       if (yesno("Would you like to automatically start Citadel at boot?\n", 1) == 0) {
+               return;
+       }
 
 
-       /* Now write it out to /etc/inittab */
-       infp = fopen("/etc/inittab", "a");
-       if (infp == NULL) {
-               display_error(strerror(errno));
-       } else {
-               fprintf(infp, "# Start the Citadel server...\n");
-               fprintf(infp, "%s:2345:respawn:%s %s%s -llocal4\n",
-                               entryname, 
-                               looking_for, 
-                               (enable_home)?"-h":"", 
-                               (enable_home)?setup_directory:"");
-               fclose(infp);
-               strcpy(citserver_init_entry, entryname);
+       fp = fopen(initfile, "w");
+       if (fp == NULL) {
+               display_error("Cannot create /etc/init.d/citadel");
+               return;
        }
        }
+
+       fprintf(fp,     "#!/bin/sh\n"
+                       "#\n"
+                       "# Init file for Citadel\n"
+                       "#\n"
+                       "# chkconfig: - 79 30\n"
+                       "# description: Citadel service\n"
+                       "# processname: citserver\n"
+                       "# pidfile: %s/citadel.pid\n"
+                       "\n"
+                       "CITADEL_DIR=%s\n"
+                       ,
+                               setup_directory,
+                               setup_directory
+                       );
+       fprintf(fp,     "\n"
+                       "test -d /var/run || exit 0\n"
+                       "\n"
+                       "case \"$1\" in\n"
+                       "\n"
+                       "start)         echo -n \"Starting Citadel... \"\n"
+                       "               if $CITADEL_DIR/citserver -d -h$CITADEL_DIR\n"
+                       "               then\n"
+                       "                       echo \"ok\"\n"
+                       "               else\n"
+                       "                       echo \"failed\"\n"
+                       "               fi\n");
+       fprintf(fp,     "               ;;\n"
+                       "stop)          echo -n \"Stopping Citadel... \"\n"
+                       "               if $CITADEL_DIR/sendcommand DOWN >/dev/null 2>&1 ; then\n"
+                       "                       echo \"ok\"\n"
+                       "               else\n"
+                       "                       echo \"failed\"\n"
+                       "               fi\n"
+                       "               rm -f %s/citadel.pid 2>/dev/null\n"
+                       ,
+                               setup_directory
+                       );
+       fprintf(fp,     "               ;;\n"
+                       "restart)       if $CITADEL_DIR/sendcommand DOWN 1 >/dev/null 2>&1 ; then\n"
+                       "                       echo \"ok\"\n"
+                       "               else\n"
+                       "                       echo \"failed\"\n"
+                       "               fi\n"
+                       "               ;;\n"
+                       "*)             echo \"Usage: $0 {start|stop|restart}\"\n"
+                       "               exit 1\n"
+                       "               ;;\n"
+                       "esac\n"
+       );
+
+       fclose(fp);
+       chmod(initfile, 0755);
+
+       /* Set up the run levels. */
+       system("/bin/rm -f /etc/rc?.d/[SK]??citadel 2>/dev/null");
+       snprintf(command, sizeof(command), "for x in 2 3 4 5 ; do [ -d /etc/rc$x.d ] && ln -s %s /etc/rc$x.d/S79citadel ; done 2>/dev/null", initfile);
+       system(command);
+       snprintf(command, sizeof(command),"for x in 0 6 S; do [ -d /etc/rc$x.d ] && ln -s %s /etc/rc$x.d/K30citadel ; done 2>/dev/null", initfile);
+       system(command);
+
 }
 
 
 }
 
 
+
+
+
+
 /*
  * On systems which use xinetd, see if we can offer to install Citadel as
  * the default telnet target.
 /*
  * On systems which use xinetd, see if we can offer to install Citadel as
  * the default telnet target.
@@ -630,7 +548,7 @@ void check_xinetd_entry(void) {
                        "connect incoming telnet sessions to Citadel, bypassing the\n"
                        "host system login: prompt.  Would you like to do this?\n"
                );
                        "connect incoming telnet sessions to Citadel, bypassing the\n"
                        "host system login: prompt.  Would you like to do this?\n"
                );
-               if (yesno(buf) == 0) {
+               if (yesno(buf, 1) == 0) {
                        return;
                }
        }
                        return;
                }
        }
@@ -649,12 +567,7 @@ void check_xinetd_entry(void) {
                "       server_args     = -h -L %s/citadel\n"
                "       log_on_failure  += USERID\n"
                "}\n",
                "       server_args     = -h -L %s/citadel\n"
                "       log_on_failure  += USERID\n"
                "}\n",
-#ifndef HAVE_RUN_DIR
-                       setup_directory
-#else
-                       RUN_DIR
-#endif
-                       );
+               ctdl_bin_dir);
        fclose(fp);
 
        /* Now try to restart the service */
        fclose(fp);
 
        /* Now try to restart the service */
@@ -686,26 +599,20 @@ void disable_other_mta(char *mta) {
 
        /* Offer to replace other MTA with the vastly superior Citadel :)  */
 
 
        /* Offer to replace other MTA with the vastly superior Citadel :)  */
 
-       if (getenv("ACT_AS_MTA")) {
-               if (strcasecmp(getenv("ACT_AS_MTA"), "yes")) {
-                       return;
-               }
-       }
-       else {
-               snprintf(buf, sizeof buf,
-                       "You appear to have the \"%s\" email program\n"
-                       "running on your system.  If you want Citadel mail\n"
-                       "connected with %s, you will have to manually integrate\n"
-                       "them.  It is preferable to disable %s, and use Citadel's\n"
-                       "SMTP, POP3, and IMAP services.\n\n"
-                       "May we disable %s so that Citadel has access to ports\n"
-                       "25, 110, and 143?\n",
-                       mta, mta, mta, mta
+       snprintf(buf, sizeof buf,
+                "You appear to have the \"%s\" email program\n"
+                "running on your system.  If you want Citadel mail\n"
+                "connected with %s, you will have to manually integrate\n"
+                "them.  It is preferable to disable %s, and use Citadel's\n"
+                "SMTP, POP3, and IMAP services.\n\n"
+                "May we disable %s so that Citadel has access to ports\n"
+                "25, 110, and 143?\n",
+                mta, mta, mta, mta
                );
                );
-               if (yesno(buf) == 0) {
-                       return;
-               }
+       if (yesno(buf, 1) == 0) {
+               return;
        }
        }
+       
 
        sprintf(buf, "for x in /etc/rc*.d/S*%s; do mv $x `echo $x |sed s/S/K/g`; done >/dev/null 2>&1", mta);
        system(buf);
 
        sprintf(buf, "for x in /etc/rc*.d/S*%s; do mv $x `echo $x |sed s/S/K/g`; done >/dev/null 2>&1", mta);
        system(buf);
@@ -719,7 +626,7 @@ void disable_other_mta(char *mta) {
 /* 
  * Check to see if our server really works.  Returns 0 on success.
  */
 /* 
  * Check to see if our server really works.  Returns 0 on success.
  */
-int test_server(void) {
+int test_server(char *setup_directory, char *relhomestr, int relhome) {
        char cmd[256];
        char cookie[256];
        FILE *fp;
        char cmd[256];
        char cookie[256];
        FILE *fp;
@@ -732,14 +639,14 @@ int test_server(void) {
         */
        sprintf(cookie, "--test--%d--", getpid());
 
         */
        sprintf(cookie, "--test--%d--", getpid());
 
-       sprintf(cmd, "%s/sendcommand %s%s ECHO %s 2>&1",
-#ifndef HAVE_RUN_DIR
-                       setup_directory,
-#else
-                       CTDLDIR,
-#endif
-                       (enable_home)?"-h":"", 
-                       (enable_home)?setup_directory:"",
+       if (relhome)
+               sprintf(cmd, "%s/sendcommand -h%s ECHO %s 2>&1",
+                       ctdl_sbin_dir,
+                       relhomestr,
+                       cookie);
+       else
+               sprintf(cmd, "%s/sendcommand ECHO %s 2>&1",
+                       ctdl_sbin_dir,
                        cookie);
 
        fp = popen(cmd, "r");
                        cookie);
 
        fp = popen(cmd, "r");
@@ -761,12 +668,6 @@ int test_server(void) {
 
 void strprompt(char *prompt_title, char *prompt_text, char *str)
 {
 
 void strprompt(char *prompt_title, char *prompt_text, char *str)
 {
-#ifdef HAVE_NEWT
-       newtComponent form;
-       char *result;
-       int i;
-       int prompt_window_height = 0;
-#endif
        char buf[SIZ];
        char setupmsg[SIZ];
        char dialog_result[PATH_MAX];
        char buf[SIZ];
        char setupmsg[SIZ];
        char dialog_result[PATH_MAX];
@@ -782,7 +683,7 @@ void strprompt(char *prompt_title, char *prompt_text, char *str)
                printf("Enter new value or press return to leave unchanged:\n");
                fgets(buf, sizeof buf, stdin);
                buf[strlen(buf) - 1] = 0;
                printf("Enter new value or press return to leave unchanged:\n");
                fgets(buf, sizeof buf, stdin);
                buf[strlen(buf) - 1] = 0;
-               if (strlen(buf) != 0)
+               if (!IsEmptyStr(buf))
                        strcpy(str, buf);
                break;
 
                        strcpy(str, buf);
                break;
 
@@ -804,43 +705,20 @@ void strprompt(char *prompt_title, char *prompt_text, char *str)
                        unlink(dialog_result);
                }
                break;
                        unlink(dialog_result);
                }
                break;
-
-#ifdef HAVE_NEWT
-       case UI_NEWT:
-
-               prompt_window_height = num_tokens(prompt_text, '\n') + 5 ;
-               newtCenteredWindow(76,
-                               prompt_window_height,
-                               prompt_title);
-               form = newtForm(NULL, NULL, 0);
-               for (i=0; i<num_tokens(prompt_text, '\n'); ++i) {
-                       extract_token(buf, prompt_text, i, '\n', sizeof buf);
-                       newtFormAddComponent(form, newtLabel(1, 1+i, buf));
-               }
-               newtFormAddComponent(form,
-                       newtEntry(1,
-                               (prompt_window_height - 2),
-                               str,
-                               74,
-                               (const char **) &result,
-                               NEWT_FLAG_RETURNEXIT)
-               );
-               newtRunForm(form);
-               strcpy(str, result);
-
-               newtPopWindow();
-               newtFormDestroy(form);  
-
-#endif
+       case UI_SILENT:
+               break;
        }
 }
 
        }
 }
 
+void set_bool_val(int msgpos, int *ip) {
+       title(setup_titles[msgpos]);
+       *ip = yesno(setup_text[msgpos], *ip);
+}
+
 void set_str_val(int msgpos, char *str) {
        strprompt(setup_titles[msgpos], setup_text[msgpos], str);
 }
 
 void set_str_val(int msgpos, char *str) {
        strprompt(setup_titles[msgpos], setup_text[msgpos], str);
 }
 
-
-
 void set_int_val(int msgpos, int *ip)
 {
        char buf[16];
 void set_int_val(int msgpos, int *ip)
 {
        char buf[16];
@@ -872,13 +750,16 @@ void edit_value(int curr)
 {
        int i;
        struct passwd *pw;
 {
        int i;
        struct passwd *pw;
-       char ctdluidname[SIZ];
+       char ctdluidname[256];
 
        switch (curr) {
 
        case 1:
 
        switch (curr) {
 
        case 1:
-               if (getenv("SYSADMIN_NAME")) {
-                       strcpy(config.c_sysadm, getenv("SYSADMIN_NAME"));
+               if (setup_type == UI_SILENT)
+               {
+                       if (getenv("SYSADMIN_NAME")) {
+                               strcpy(config.c_sysadm, getenv("SYSADMIN_NAME"));
+                       }
                }
                else {
                        set_str_val(curr, config.c_sysadm);
                }
                else {
                        set_str_val(curr, config.c_sysadm);
@@ -886,37 +767,91 @@ void edit_value(int curr)
                break;
 
        case 2:
                break;
 
        case 2:
-#ifdef __CYGWIN__
-               config.c_ctdluid = 0;   /* XXX Windows hack, prob. insecure */
-#else
-               i = config.c_ctdluid;
-               pw = getpwuid(i);
-               if (pw == NULL) {
-                       set_int_val(curr, &i);
-                       config.c_ctdluid = i;
+               if (setup_type == UI_SILENT)
+               {
+                       if (getenv("SYSADMIN_PW")) {
+                               strcpy(admin_pass, getenv("SYSADMIN_PW"));
+                       }
                }
                else {
                }
                else {
-                       strcpy(ctdluidname, pw->pw_name);
-                       set_str_val(curr, ctdluidname);
-                       pw = getpwnam(ctdluidname);
-                       if (pw != NULL) {
-                               config.c_ctdluid = pw->pw_uid;
+                       set_str_val(curr, admin_pass);
+               }
+               break;
+       
+       case 3:
+               if (setup_type == UI_SILENT)
+               {               
+                       if (getenv("CITADEL_UID")) {
+                               config.c_ctdluid = atoi(getenv("CITADEL_UID"));
+                       }                                       
+               }
+               else
+               {
+#ifdef __CYGWIN__
+                       config.c_ctdluid = 0;   /* XXX Windows hack, prob. insecure */
+#else
+                       i = config.c_ctdluid;
+                       pw = getpwuid(i);
+                       if (pw == NULL) {
+                               set_int_val(curr, &i);
+                               config.c_ctdluid = i;
                        }
                        }
-                       else if (atoi(ctdluidname) > 0) {
-                               config.c_ctdluid = atoi(ctdluidname);
+                       else {
+                               strcpy(ctdluidname, pw->pw_name);
+                               set_str_val(curr, ctdluidname);
+                               pw = getpwnam(ctdluidname);
+                               if (pw != NULL) {
+                                       config.c_ctdluid = pw->pw_uid;
+                               }
+                               else if (atoi(ctdluidname) > 0) {
+                                       config.c_ctdluid = atoi(ctdluidname);
+                               }
                        }
                        }
-               }
 #endif
 #endif
+               }
                break;
 
                break;
 
-       case 3:
-               set_str_val(curr, config.c_ip_addr);
+       case 4:
+               if (setup_type == UI_SILENT)
+               {
+                       if (getenv("IP_ADDR")) {
+                               strcpy(config.c_ip_addr, getenv("IP_ADDR"));
+                       }
+               }
+               else {
+                       set_str_val(curr, config.c_ip_addr);
+               }
                break;
 
                break;
 
-       case 4:
-               set_int_val(curr, &config.c_port_number);
+       case 5:
+               if (setup_type == UI_SILENT)
+               {
+                       if (getenv("CITADEL_PORT")) {
+                               config.c_port_number = atoi(getenv("CITADEL_PORT"));
+                       }
+               }
+               else
+               {
+                       set_int_val(curr, &config.c_port_number);
+               }
                break;
 
                break;
 
+       case 6:
+               if (setup_type == UI_SILENT)
+               {
+                       if (getenv("ENABLE_UNIX_AUTH")) {
+                               if (!strcasecmp(getenv("ENABLE_UNIX_AUTH"), "yes")) {
+                                       config.c_auth_mode = AUTHMODE_HOST;
+                               }
+                               else {
+                                       config.c_auth_mode = AUTHMODE_NATIVE;
+                               }
+                       }
+               }
+               else {
+                       set_bool_val(curr, &config.c_auth_mode);
+               }
+               break;
 
        }
 }
 
        }
 }
@@ -956,13 +891,6 @@ int discover_ui(void)
                return UI_DIALOG;
        }
                
                return UI_DIALOG;
        }
                
-
-#ifdef HAVE_NEWT
-       newtInit();
-       newtCls();
-       newtDrawRootText(0, 0, "Citadel Setup");
-       return UI_NEWT;
-#endif
        return UI_TEXT;
 }
 
        return UI_TEXT;
 }
 
@@ -1046,9 +974,10 @@ void fixnss(void) {
                "\n"
        );
 
                "\n"
        );
 
-       if (yesno(question)) {
+       if (yesno(question, 1)) {
                sprintf(buf, "/bin/mv -f %s %s", new_filename, NSSCONF);
                system(buf);
                sprintf(buf, "/bin/mv -f %s %s", new_filename, NSSCONF);
                system(buf);
+               chmod(NSSCONF, 0644);
        }
        unlink(new_filename);
 }
        }
        unlink(new_filename);
 }
@@ -1080,13 +1009,6 @@ int main(int argc, char *argv[])
        /* set an invalid setup type */
        setup_type = (-1);
 
        /* set an invalid setup type */
        setup_type = (-1);
 
-       /* Learn whether to skip the auto-service-start questions */
-       fp = fopen("/etc/inittab", "r");
-       if (fp != NULL) {
-               have_sysv_init = 1;
-               fclose(fp);
-       }
-
        /* Check to see if we're running the web installer */
        if (getenv("CITADEL_INSTALLER") != NULL) {
                using_web_installer = 1;
        /* Check to see if we're running the web installer */
        if (getenv("CITADEL_INSTALLER") != NULL) {
                using_web_installer = 1;
@@ -1099,14 +1021,25 @@ int main(int argc, char *argv[])
                        strcpy(aaa, &aaa[2]);
                        setup_type = atoi(aaa);
                }
                        strcpy(aaa, &aaa[2]);
                        setup_type = atoi(aaa);
                }
-               if (!strcmp(argv[a], "-i")) {
+               else if (!strcmp(argv[a], "-i")) {
                        info_only = 1;
                }
                        info_only = 1;
                }
-               if (!strcmp(argv[a], "-q")) {
+               else if (!strcmp(argv[a], "-q")) {
                        setup_type = UI_SILENT;
                }
                        setup_type = UI_SILENT;
                }
+               else if (!strncmp(argv[a], "-h", 2)) {
+                       relh=argv[a][2]!='/';
+                       if (!relh) safestrncpy(ctdl_home_directory, &argv[a][2],
+                                                                  sizeof ctdl_home_directory);
+                       else
+                               safestrncpy(relhome, &argv[a][2],
+                                                       sizeof relhome);
+                       home = 1;
+               }
+
        }
 
        }
 
+       calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
 
        /* If a setup type was not specified, try to determine automatically
         * the best one to use out of all available types.
 
        /* If a setup type was not specified, try to determine automatically
         * the best one to use out of all available types.
@@ -1120,13 +1053,7 @@ int main(int argc, char *argv[])
        }
 
        /* Get started in a valid setup directory. */
        }
 
        /* Get started in a valid setup directory. */
-       strcpy(setup_directory, 
-#ifdef HAVE_RUN_DIR
-                  ""
-#else
-                  CTDLDIR
-#endif
-                  );
+       strcpy(setup_directory, ctdl_run_dir);
        if ( (using_web_installer) && (getenv("CITADEL") != NULL) ) {
                strcpy(setup_directory, getenv("CITADEL"));
        }
        if ( (using_web_installer) && (getenv("CITADEL") != NULL) ) {
                strcpy(setup_directory, getenv("CITADEL"));
        }
@@ -1134,49 +1061,31 @@ int main(int argc, char *argv[])
                set_str_val(0, setup_directory);
        }
 
                set_str_val(0, setup_directory);
        }
 
-       home=(setup_directory[1]!='\0');
-       relh=home&(setup_directory[1]!='/');
-       if (!relh) {
-               safestrncpy(ctdl_home_directory, setup_directory, sizeof ctdl_home_directory);
-       }
-       else {
-               safestrncpy(relhome, ctdl_home_directory, sizeof relhome);
-       }
-
-       calc_dirs_n_files(relh, home, relhome, ctdldir);
-       
-       enable_home=(relh|home);
+       enable_home = ( relh | home );
 
 
-       if (home) {
-               if (chdir(setup_directory) == 0) {
-                       strcpy(file_citadel_config, "./citadel.config");
-               }
-               else {
-                       important_message("Citadel Setup",
-                               "The directory you specified does not exist.");
-                       cleanup(errno);
-               }
+       if (chdir(setup_directory) != 0) {
+               char errmsg[SIZ];
+               sprintf(errmsg, "The directory you specified does not exist: [%s]\n", setup_directory);
+               
+               important_message("Citadel Setup", errmsg);
+               cleanup(errno);
        }
 
        /* Determine our host name, in case we need to use it as a default */
        uname(&my_utsname);
 
        }
 
        /* Determine our host name, in case we need to use it as a default */
        uname(&my_utsname);
 
-       if (have_sysv_init) {
-               /* See if we need to shut down the Citadel service. */
-               for (a=0; a<=3; ++a) {
-                       progress("Shutting down the Citadel service...", a, 3);
-                       if (a == 0) shutdown_citserver();
-                       sleep(1);
-               }
+       /* Try to stop Citadel if we can */
+       if (!access("/etc/init.d/citadel", X_OK)) {
+               system("/etc/init.d/citadel stop");
+       }
 
 
-               /* Make sure it's stopped. */
-               if (test_server() == 0) {
-                       important_message("Citadel Setup",
-                               "The Citadel service is still running.\n"
-                               "Please stop the service manually and run "
-                               "setup again.");
-                       cleanup(1);
-               }
+       /* Make sure Citadel is not running. */
+       if (test_server(setup_directory, relhome, enable_home) == 0) {
+               important_message("Citadel Setup",
+                       "The Citadel service is still running.\n"
+                       "Please stop the service manually and run "
+                       "setup again.");
+               cleanup(1);
        }
 
        /* Now begin. */
        }
 
        /* Now begin. */
@@ -1223,11 +1132,11 @@ int main(int argc, char *argv[])
        fclose(fp);
 
        /* set some sample/default values in place of blanks... */
        fclose(fp);
 
        /* set some sample/default values in place of blanks... */
-       if (strlen(config.c_nodename) == 0)
+       if (IsEmptyStr(config.c_nodename))
                safestrncpy(config.c_nodename, my_utsname.nodename,
                            sizeof config.c_nodename);
        strtok(config.c_nodename, ".");
                safestrncpy(config.c_nodename, my_utsname.nodename,
                            sizeof config.c_nodename);
        strtok(config.c_nodename, ".");
-       if (strlen(config.c_fqdn) == 0) {
+       if (IsEmptyStr(config.c_fqdn) ) {
                if ((he = gethostbyname(my_utsname.nodename)) != NULL)
                        safestrncpy(config.c_fqdn, he->h_name,
                                    sizeof config.c_fqdn);
                if ((he = gethostbyname(my_utsname.nodename)) != NULL)
                        safestrncpy(config.c_fqdn, he->h_name,
                                    sizeof config.c_fqdn);
@@ -1235,20 +1144,20 @@ int main(int argc, char *argv[])
                        safestrncpy(config.c_fqdn, my_utsname.nodename,
                                    sizeof config.c_fqdn);
        }
                        safestrncpy(config.c_fqdn, my_utsname.nodename,
                                    sizeof config.c_fqdn);
        }
-       if (strlen(config.c_humannode) == 0)
+       if (IsEmptyStr(config.c_humannode))
                strcpy(config.c_humannode, "My System");
                strcpy(config.c_humannode, "My System");
-       if (strlen(config.c_phonenum) == 0)
+       if (IsEmptyStr(config.c_phonenum))
                strcpy(config.c_phonenum, "US 800 555 1212");
        if (config.c_initax == 0) {
                config.c_initax = 4;
        }
                strcpy(config.c_phonenum, "US 800 555 1212");
        if (config.c_initax == 0) {
                config.c_initax = 4;
        }
-       if (strlen(config.c_moreprompt) == 0)
+       if (IsEmptyStr(config.c_moreprompt))
                strcpy(config.c_moreprompt, "<more>");
                strcpy(config.c_moreprompt, "<more>");
-       if (strlen(config.c_twitroom) == 0)
+       if (IsEmptyStr(config.c_twitroom))
                strcpy(config.c_twitroom, "Trashcan");
                strcpy(config.c_twitroom, "Trashcan");
-       if (strlen(config.c_baseroom) == 0)
+       if (IsEmptyStr(config.c_baseroom))
                strcpy(config.c_baseroom, BASEROOM);
                strcpy(config.c_baseroom, BASEROOM);
-       if (strlen(config.c_aideroom) == 0)
+       if (IsEmptyStr(config.c_aideroom))
                strcpy(config.c_aideroom, "Aide");
        if (config.c_port_number == 0) {
                config.c_port_number = 504;
                strcpy(config.c_aideroom, "Aide");
        if (config.c_port_number == 0) {
                config.c_port_number = 504;
@@ -1299,12 +1208,14 @@ int main(int argc, char *argv[])
        if (config.c_smtps_port == 0) config.c_smtps_port = 465;
        if (config.c_pop3s_port == 0) config.c_pop3s_port = 995;
        if (config.c_imaps_port == 0) config.c_imaps_port = 993;
        if (config.c_smtps_port == 0) config.c_smtps_port = 465;
        if (config.c_pop3s_port == 0) config.c_pop3s_port = 995;
        if (config.c_imaps_port == 0) config.c_imaps_port = 993;
+       if (config.c_pftcpdict_port == 0) config.c_pftcpdict_port = -1;
+       if (config.c_managesieve_port == 0) config.c_managesieve_port = 2020;
+       if (config.c_xmpp_c2s_port == 0) config.c_xmpp_c2s_port = 5222;
+       if (config.c_xmpp_s2s_port == 0) config.c_xmpp_s2s_port = 5269;
 
        /* Go through a series of dialogs prompting for config info */
 
        /* Go through a series of dialogs prompting for config info */
-       if (setup_type != UI_SILENT) {
-               for (curr = 1; curr <= MAXSETUP; ++curr) {
-                       edit_value(curr);
-               }
+       for (curr = 1; curr <= MAXSETUP; ++curr) {
+               edit_value(curr);
        }
 
 /***** begin version update section ***** */
        }
 
 /***** begin version update section ***** */
@@ -1371,46 +1282,43 @@ NEW_INST:
        chmod(ctdl_netcfg_dir, 0700);
        chown(ctdl_netcfg_dir, config.c_ctdluid, -1);
 
        chmod(ctdl_netcfg_dir, 0700);
        chown(ctdl_netcfg_dir, config.c_ctdluid, -1);
 
-       /* TODO: where to put this? */
-       mkdir("netconfigs", 0700);
-       chmod("netconfigs", 0700);
-       chown("netconfigs", config.c_ctdluid, -1);
-
        /* Delete files and directories used by older Citadel versions */
        system("exec /bin/rm -fr ./rooms ./chatpipes ./expressmsgs ./sessions 2>/dev/null");
        unlink("citadel.log");
        unlink("weekly");
 
        /* Delete files and directories used by older Citadel versions */
        system("exec /bin/rm -fr ./rooms ./chatpipes ./expressmsgs ./sessions 2>/dev/null");
        unlink("citadel.log");
        unlink("weekly");
 
-       check_services_entry(); /* Check /etc/services */
+       if (((setup_type == UI_SILENT) && (getenv("ALTER_ETC_SERVICES")!=NULL)) || 
+           (setup_type != UI_SILENT))
+               check_services_entry(); /* Check /etc/services */
 #ifndef __CYGWIN__
 #ifndef __CYGWIN__
-       if (have_sysv_init) {
-               check_inittab_entry();  /* Check /etc/inittab */
-       }
+       delete_inittab_entry(); /* Remove obsolete /etc/inittab entry */
        check_xinetd_entry();   /* Check /etc/xinetd.d/telnet */
 
        check_xinetd_entry();   /* Check /etc/xinetd.d/telnet */
 
-       /* Offer to disable other MTA's on the system. */
-       disable_other_mta("courier-authdaemon");
-       disable_other_mta("courier-imap");
-       disable_other_mta("courier-imap-ssl");
-       disable_other_mta("courier-pop");
-       disable_other_mta("courier-pop3");
-       disable_other_mta("courier-pop3d");
-       disable_other_mta("cyrmaster");
-       disable_other_mta("cyrus");
-       disable_other_mta("dovecot");
-       disable_other_mta("exim");
-       disable_other_mta("exim4");
-       disable_other_mta("hula");
-       disable_other_mta("imapd");
-       disable_other_mta("mta");
-       disable_other_mta("pop3d");
-       disable_other_mta("popd");
-       disable_other_mta("postfix");
-       disable_other_mta("qmail");
-       disable_other_mta("saslauthd");
-       disable_other_mta("sendmail");
-       disable_other_mta("vmailmgrd");
-       disable_other_mta("zimbra");
+       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. */
+               disable_other_mta("courier-authdaemon");
+               disable_other_mta("courier-imap");
+               disable_other_mta("courier-imap-ssl");
+               disable_other_mta("courier-pop");
+               disable_other_mta("courier-pop3");
+               disable_other_mta("courier-pop3d");
+               disable_other_mta("cyrmaster");
+               disable_other_mta("cyrus");
+               disable_other_mta("dovecot");
+               disable_other_mta("exim");
+               disable_other_mta("exim4");
+               disable_other_mta("imapd");
+               disable_other_mta("mta");
+               disable_other_mta("pop3d");
+               disable_other_mta("popd");
+               disable_other_mta("postfix");
+               disable_other_mta("qmail");
+               disable_other_mta("saslauthd");
+               disable_other_mta("sendmail");
+               disable_other_mta("vmailmgrd");
+       }
 #endif
 
        /* Check for the 'db' nss and offer to disable it */
 #endif
 
        /* Check for the 'db' nss and offer to disable it */
@@ -1421,54 +1329,63 @@ NEW_INST:
        else
                gid = pw->pw_gid;
 
        else
                gid = pw->pw_gid;
 
-       progress("Setting file permissions", 0, 4);
-       chown(".", config.c_ctdluid, gid);
-       sleep(1);
-       progress("Setting file permissions", 1, 4);
+       progress("Setting file permissions", 0, 3);
+       chown(ctdl_run_dir, config.c_ctdluid, gid);
+       progress("Setting file permissions", 1, 3);
        chown(file_citadel_config, config.c_ctdluid, gid);
        chown(file_citadel_config, config.c_ctdluid, gid);
-       sleep(1);
-       progress("Setting file permissions", 2, 4);
-
-       snprintf(aaa, sizeof aaa,
-                        "%schkpwd",
-                        ctdl_sbin_dir);
-       chown(aaa,0,0); /*  config.c_ctdluid, gid); chkpwd needs to be root owned*/
-       sleep(1);
-       progress("Setting file permissions", 3, 4);
-       chmod(aaa, 04755); 
-
-       sleep(1);
-       progress("Setting file permissions", 3, 4);
+       progress("Setting file permissions", 2, 3);
        chmod(file_citadel_config, S_IRUSR | S_IWUSR);
        chmod(file_citadel_config, S_IRUSR | S_IWUSR);
-       sleep(1);
-       progress("Setting file permissions", 4, 4);
+       progress("Setting file permissions", 3, 3);
 
 
-#ifdef HAVE_LDAP
-       /* Contemplate the possibility of auto-configuring OpenLDAP */
-       contemplate_ldap();
-#endif
+       /* 
+        * If we're running on SysV, install init scripts.
+        */
+       if (!access("/var/run", W_OK)) {
 
 
-       /* See if we can start the Citadel service. */
-       if ( (have_sysv_init) && (strlen(citserver_init_entry) > 0) ) {
-               for (a=0; a<=3; ++a) {
-                       progress("Starting the Citadel service...", a, 3);
-                       if (a == 0) start_citserver();
-                       sleep(1);
+               if (getenv("NO_INIT_SCRIPTS") == NULL) {
+                       install_init_scripts();
                }
                }
-               if (test_server() == 0) {
-                       important_message("Setup finished",
-                               "Setup of the Citadel server is complete.\n"
-                               "If you will be using WebCit, please run its\n"
-                               "setup program now; otherwise, run './citadel'\n"
-                               "to log in.\n");
+
+               if (!access("/etc/init.d/citadel", X_OK)) {
+                       system("/etc/init.d/citadel start");
+                       sleep(3);
+               }
+
+               if (test_server(setup_directory, relhome, enable_home) == 0) {
+                       char buf[SIZ];
+                       int found_it = 0;
+
+                       snprintf (admin_cmd, sizeof(admin_cmd), "%s/sendcommand \"CREU %s|%s\" 2>&1", 
+                                 ctdl_sbin_dir, config.c_sysadm, admin_pass);
+                       fp = popen(admin_cmd, "r");
+                       if (fp != NULL) {
+                               while (fgets(buf, sizeof buf, fp) != NULL) 
+                               {
+                                       if ((atol(buf) == 574) || (atol(buf) == 200))
+                                               ++found_it;
+                               }
+                               pclose(fp);
+                       }
+               
+                       if (found_it == 0)
+                               important_message("Error","Setup failed to create your admin user");
+
+                       if (setup_type != UI_SILENT)
+                               important_message("Setup finished",
+                                                 "Setup of the Citadel server is complete.\n"
+                                                 "If you will be using WebCit, please run its\n"
+                                                 "setup program now; otherwise, run './citadel'\n"
+                                                 "to log in.\n");
                }
                else {
                }
                else {
-                       important_message("Setup finished",
-                               "Setup is finished, but the Citadel service "
-                               "failed to start.\n"
-                               "Go back and check your configuration.");
+                       important_message("Setup failed",
+                               "Setup is finished, but the Citadel server failed to start.\n"
+                               "Go back and check your configuration.\n"
+                       );
                }
                }
+
        }
        }
+
        else {
                important_message("Setup finished",
                        "Setup is finished.  You may now start the server.");
        else {
                important_message("Setup finished",
                        "Setup is finished.  You may now start the server.");
@@ -1479,129 +1396,3 @@ NEW_INST:
 }
 
 
 }
 
 
-#ifdef HAVE_LDAP
-/*
- * If we're in the middle of an Easy Install, we might just be able to
- * auto-configure a standalone OpenLDAP server.
- */
-void contemplate_ldap(void) {
-       char question[SIZ];
-       char slapd_init_entry[SIZ];
-       FILE *fp;
-
-       /* If conditions are not ideal, give up on this idea... */
-       if (!have_sysv_init) return;
-       if (using_web_installer == 0) return;
-       if (getenv("LDAP_CONFIG") == NULL) return;
-       if (getenv("SUPPORT") == NULL) return;
-       if (getenv("SLAPD_BINARY") == NULL) return;
-       if (getenv("CITADEL") == NULL) return;
-
-       /* And if inittab is already starting slapd, bail out... */
-       locate_init_entry(slapd_init_entry, getenv("SLAPD_BINARY"));
-       if (strlen(slapd_init_entry) > 0) {
-               important_message("Citadel Setup",
-                       "You appear to already have a standalone LDAP "
-                       "service\nconfigured for use with Citadel.  No "
-                       "changes will be made.\n");
-               /* set_init_entry(slapd_init_entry, "off"); */
-               return;
-       }
-
-       /* Generate a unique entry name for slapd if we don't have one. */
-       else {
-               generate_entry_name(slapd_init_entry);
-       }
-
-       /* Ask the user if it's ok to set up slapd automatically. */
-       snprintf(question, sizeof question,
-               "\n"
-               "Do you want this computer configured to start a standalone\n"
-               "LDAP service automatically?  (If you answer yes, a new\n"
-               "slapd.conf will be written, and an /etc/inittab entry\n"
-               "pointing to %s will be added.)\n"
-               "\n",
-               getenv("SLAPD_BINARY")
-       );
-       if (yesno(question) == 0)
-               return;
-
-       strcpy(config.c_ldap_base_dn, "dc=example,dc=com");
-       strprompt("Base DN",
-               "\n"
-               "Please enter the Base DN for your directory.  This will\n"
-               "generally be something based on the primary DNS domain in\n"
-               "which you receive mail, but it does not have to be.  Your\n"
-               "LDAP tree will be built using this Distinguished Name.\n"
-               "\n",
-               config.c_ldap_base_dn
-       );
-
-       strcpy(config.c_ldap_host, "localhost");
-       config.c_ldap_port = 389;
-       sprintf(config.c_ldap_bind_dn, "cn=manager,%s", config.c_ldap_base_dn);
-
-       /*
-        * Generate a bind password.  If you're some grey hat hacker who
-        * is just dying to get some street cred on Bugtraq, and you think
-        * this password generation scheme is too weak, please submit a patch
-        * instead of just whining about it, ok?
-        */
-       sprintf(config.c_ldap_bind_pw, "%d%ld", getpid(), (long)time(NULL));
-
-       write_config_to_disk();
-
-       fp = fopen(getenv("LDAP_CONFIG"), "w");
-       if (fp == NULL) {
-               sprintf(question, "\nCannot create %s:\n%s\n\n"
-                               "Citadel will still function, but you will "
-                               "not have an LDAP service.\n\n",
-                               getenv("LDAP_CONFIG"),
-                               strerror(errno)
-               );
-               important_message("Error", question);
-               return;
-       }
-
-       fprintf(fp, "include    %s/citadel-openldap.schema\n",
-               getenv("CITADEL"));
-       fprintf(fp, "pidfile    %s/openldap-data/slapd.pid\n",
-               getenv("CITADEL"));
-       fprintf(fp, "argsfile   %s/openldap-data/slapd.args\n",
-               getenv("CITADEL"));
-       fprintf(fp,     "allow          bind_v2\n"
-                       "database       bdb\n"
-                       "schemacheck    off\n"
-       );
-       fprintf(fp,     "suffix         \"%s\"\n", config.c_ldap_base_dn);
-       fprintf(fp,     "rootdn         \"%s\"\n", config.c_ldap_bind_dn);
-       fprintf(fp,     "rootpw         %s\n", config.c_ldap_bind_pw);
-       fprintf(fp,     "directory      %s/openldap-data\n",
-               getenv("CITADEL"));
-       fprintf(fp,     "index          objectClass     eq\n");
-
-       fclose(fp);
-
-       /* This is where our OpenLDAP server will keep its data. */
-       mkdir("openldap-data", 0700);
-
-       /* Now write it out to /etc/inittab.
-        * FIXME make it run as some non-root user.
-        * The "-d 0" seems superfluous, but it's actually a way to make
-        * slapd run in the foreground without spewing messages to the console.
-        */
-       fp = fopen("/etc/inittab", "a");
-       if (fp == NULL) {
-               display_error(strerror(errno));
-       } else {
-               fprintf(fp, "# Start the OpenLDAP server for Citadel...\n");
-               fprintf(fp, "%s:2345:respawn:%s -d 0 -f %s\n",
-                       slapd_init_entry,
-                       getenv("SLAPD_BINARY"),
-                       getenv("LDAP_CONFIG")
-               );
-               fclose(fp);
-       }
-
-}
-#endif /* HAVE_LDAP */