* Backed out r7276 through r7278. This is too large a change to make during a featur...

[citadel.git] / citadel / setup.c

diff --git a/citadel/setup.c b/citadel/setup.c
index 6b9cbc82037923902bcc3cbc54a8b9d2f31fdbb2..05e6eacb1cad17aa975cccdf7034a16e57a6feb7 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -21,15 +21,18 @@
 #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"

+#if HAVE_BACKTRACE
+#include <execinfo.h>
+#endif

 
 

-#define MAXSETUP 5     /* 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_TEXT                0       /* Default setup type -- text only */
 #define UI_DIALOG      2       /* Use the 'dialog' program */


@@ -43,17 +46,42 @@ int setup_type;
 char setup_directory[PATH_MAX];
 int using_web_installer = 0;
 int enable_home = 1;
 char setup_directory[PATH_MAX];
 int using_web_installer = 0;
 int enable_home = 1;

+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",
        "Authentication mode"
 };
 
        "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;
 


@@ -79,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"


@@ -116,6 +148,8 @@ int direction;
 
 void cleanup(int exitcode)
 {
 
 void cleanup(int exitcode)
 {

+//     printf("Exitcode: %d\n", exitcode);
+//     cit_backtrace();

        exit(exitcode);
 }
 
        exit(exitcode);
 }
 


@@ -168,6 +202,8 @@ int yesno(char *question, int default_value)
                        answer = 0;
                }
                break;
                        answer = 0;
                }
                break;

+       case UI_SILENT:
+               break;

 
        }
        return (answer);
 
        }
        return (answer);


@@ -193,6 +229,9 @@ void important_message(char *title, char *msgtext)
                        msgtext);
                system(buf);
                break;
                        msgtext);
                system(buf);
                break;

+       case UI_SILENT:
+               fprintf(stderr, "%s\n", msgtext);
+               break;

        }
 }
 
        }
 }
 


@@ -263,6 +302,8 @@ void progress(char *text, long int curr, long int cmax)
                        }
                }
                break;
                        }
                }
                break;

+       case UI_SILENT:
+               break;

 
        }
 }
 
        }
 }


@@ -292,7 +333,6 @@ void check_services_entry(void)
                                        fclose(sfp);
                                }
                        }
                                        fclose(sfp);
                                }
                        }

-                       sleep(1);

                }
        }
 }
                }
        }
 }


@@ -315,14 +355,10 @@ void delete_inittab_entry(void)
 
        /* 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
-        );
+                sizeof looking_for,
+                "%s/citserver", 
+                ctdl_sbin_dir
+                );

 
        /* Now tweak /etc/inittab */
        infp = fopen("/etc/inittab", "r");
 
        /* Now tweak /etc/inittab */
        infp = fopen("/etc/inittab", "r");


@@ -379,13 +415,36 @@ void delete_inittab_entry(void)
  */
 void install_init_scripts(void)
 {
  */
 void install_init_scripts(void)
 {

+       struct stat etcinitd;

        FILE *fp;
        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;
+               }
+               fclose(fp);
+               
+       }

 
        if (yesno("Would you like to automatically start Citadel at boot?\n", 1) == 0) {
                return;
        }
 
 
        if (yesno("Would you like to automatically start Citadel at boot?\n", 1) == 0) {
                return;
        }
 

-       fp = fopen("/etc/init.d/citadel", "w");
+       fp = fopen(initfile, "w");

        if (fp == NULL) {
                display_error("Cannot create /etc/init.d/citadel");
                return;
        if (fp == NULL) {
                display_error("Cannot create /etc/init.d/citadel");
                return;


@@ -429,9 +488,12 @@ void install_init_scripts(void)
                                setup_directory
                        );
        fprintf(fp,     "               ;;\n"
                                setup_directory
                        );
        fprintf(fp,     "               ;;\n"

-                       "restart)       $0 stop\n"
-                       "               $0 start\n"
-                       "               ;;\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"
                        "*)             echo \"Usage: $0 {start|stop|restart}\"\n"
                        "               exit 1\n"
                        "               ;;\n"


@@ -439,12 +501,14 @@ void install_init_scripts(void)
        );
 
        fclose(fp);
        );
 
        fclose(fp);

-       chmod("/etc/init.d/citadel", 0755);
+       chmod(initfile, 0755);

 
        /* Set up the run levels. */
        system("/bin/rm -f /etc/rc?.d/[SK]??citadel 2>/dev/null");
 
        /* Set up the run levels. */
        system("/bin/rm -f /etc/rc?.d/[SK]??citadel 2>/dev/null");

-       system("for x in 2 3 4 5 ; do [ -d /etc/rc$x.d ] && ln -s /etc/init.d/citadel /etc/rc$x.d/S79citadel ; done 2>/dev/null");
-       system("for x in 0 6 S; do [ -d /etc/rc$x.d ] && ln -s /etc/init.d/citadel /etc/rc$x.d/K30citadel ; done 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);

 
 }
 
 
 }
 


@@ -503,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 */


@@ -540,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, 1) == 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);


@@ -573,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;


@@ -586,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");


@@ -630,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;
 


@@ -652,7 +705,8 @@ void strprompt(char *prompt_title, char *prompt_text, char *str)
                        unlink(dialog_result);
                }
                break;
                        unlink(dialog_result);
                }
                break;

-
+       case UI_SILENT:
+               break;

        }
 }
 
        }
 }
 


@@ -701,8 +755,11 @@ void edit_value(int curr)
        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);


@@ -710,44 +767,85 @@ 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;
-                       }
-                       else if (atoi(ctdluidname) > 0) {
-                               config.c_ctdluid = atoi(ctdluidname);
-                       }
+                       set_str_val(curr, admin_pass);

                }
                }

-#endif

                break;
                break;

-
+       

        case 3:
        case 3:

-               set_str_val(curr, config.c_ip_addr);
+               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 {
+                               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
+               }

                break;
 
        case 4:
                break;
 
        case 4:

-               set_int_val(curr, &config.c_port_number);
+               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;
 
        case 5:
                break;
 
        case 5:

-               if (getenv("ENABLE_UNIX_AUTH")) {
-                       if (!strcasecmp(getenv("ENABLE_UNIX_AUTH"), "yes")) {
-                               config.c_auth_mode = 1;
+               if (setup_type == UI_SILENT)
+               {
+                       if (getenv("CITADEL_PORT")) {
+                               config.c_port_number = atoi(getenv("CITADEL_PORT"));

                        }
                        }

-                       else {
-                               config.c_auth_mode = 0;
+               }
+               else
+               {
+                       set_int_val(curr, &config.c_port_number);
+               }
+               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 {
                        }
                }
                else {


@@ -879,6 +977,7 @@ void fixnss(void) {
        if (yesno(question, 1)) {
                sprintf(buf, "/bin/mv -f %s %s", new_filename, NSSCONF);
                system(buf);
        if (yesno(question, 1)) {
                sprintf(buf, "/bin/mv -f %s %s", new_filename, NSSCONF);
                system(buf);

+               chmod(NSSCONF, 0644);

        }
        unlink(new_filename);
 }
        }
        unlink(new_filename);
 }


@@ -922,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.


@@ -943,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"));
        }


@@ -957,28 +1061,14 @@ 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);
-       }
+       enable_home = ( relh | home );

 
 

-       calc_dirs_n_files(relh, home, relhome, ctdldir);
-       
-       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 */
        }
 
        /* Determine our host name, in case we need to use it as a default */


@@ -990,7 +1080,7 @@ int main(int argc, char *argv[])
        }
 
        /* Make sure Citadel is not running. */
        }
 
        /* Make sure Citadel is not running. */

-       if (test_server() == 0) {
+       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 "
                important_message("Citadel Setup",
                        "The Citadel service is still running.\n"
                        "Please stop the service manually and run "


@@ -1042,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);


@@ -1054,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;


@@ -1120,12 +1210,12 @@ int main(int argc, char *argv[])
        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_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 ***** */


@@ -1192,44 +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__
        delete_inittab_entry(); /* Remove obsolete /etc/inittab entry */
        check_xinetd_entry();   /* Check /etc/xinetd.d/telnet */
 
 #ifndef __CYGWIN__
        delete_inittab_entry(); /* Remove obsolete /etc/inittab entry */
        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 */


@@ -1240,27 +1329,13 @@ 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);

 
        /* 
         * If we're running on SysV, install init scripts.
 
        /* 
         * If we're running on SysV, install init scripts.


@@ -1276,12 +1351,31 @@ NEW_INST:
                        sleep(3);
                }
 
                        sleep(3);
                }
 

-               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 (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 {
                        important_message("Setup failed",
                }
                else {
                        important_message("Setup failed",