]> code.citadel.org Git - citadel.git/blobdiff - citadel/setup.c
arrgh
[citadel.git] / citadel / setup.c
index b0a1e202d0ff203db081b4ae544d6452a8618ebf..9083fb8d48d77ed85d7808f161f2192c2ae2c69b 100644 (file)
@@ -1,10 +1,18 @@
 /*
- * $Id$
- *
  * Citadel setup utility
  *
+ * Copyright (c) 1987-2021 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
+#define SHOW_ME_VAPPEND_PRINTF
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/utsname.h>
 #include <sys/wait.h>
 #include <signal.h>
 #include <netdb.h>
 #include <errno.h>
 #include <limits.h>
 #include <pwd.h>
-
+#include <time.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <assert.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "axdefs.h"
 #include "sysdep.h"
-#include "config.h"
-#include "tools.h"
+#include "citadel_dirs.h"
 
-#ifdef HAVE_NEWT
-#include <newt.h>
+#ifdef ENABLE_NLS
+#ifdef HAVE_XLOCALE_H
+#include <xlocale.h>
+#endif
+#include <libintl.h>
+#include <locale.h>
+#define _(string)      gettext(string)
+#else
+#define _(string)      (string)
 #endif
-
-
-#define MAXSETUP 4     /* 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_NEWT                4       /* Use the "newt" window library */
 
 #define SERVICE_NAME   "citadel"
 #define PROTO_NAME     "tcp"
-
-int setup_type;
-char setup_directory[SIZ];
-char citserver_init_entry[SIZ];
-int using_web_installer = 0;
-
-#ifdef HAVE_LDAP
-void contemplate_ldap(void);
-#endif
-
-char *setup_titles[] =
-{
-       "Citadel Home Directory",
-       "System Administrator",
-       "Citadel User ID",
-       "Server IP address",
-       "Server port number",
-};
-
-
-char *setup_text[] =
-{
-"Enter the full pathname of the directory in which the Citadel installation\n"
-"you are creating or updating resides.  If you specify a directory other\n"
-"than the default, you will need to specify the -h flag to the server when\n"
-"you start it up.\n",
-
-"Enter the name of the system administrator (which is probably you).\n"
-"When an account is created with this name, it will automatically be\n"
-"assigned the highest access level.\n",
-
-"Citadel needs to run under its own user ID.  This would typically be\n"
-"called \"citadel\", but if you are running Citadel as a public BBS, you\n"
-"might also call it \"bbs\" or \"guest\".  The server will run under this\n"
-"user ID.  Please specify that user ID here.  You may specify either a\n"
-"user name or a numeric UID.\n",
-
-"Specify the IP address on which your server will run.  If you leave this\n"
-"blank, or if you specify 0.0.0.0, Citadel will listen on all addresses.\n"
-"You can usually skip this unless you are running multiple instances of\n"
-"Citadel on the same computer.\n",
-
-"Specify the TCP port number on which your server will run.  Normally, this\n"
-"will be port 504, which is the official port assigned by the IANA for\n"
-"Citadel servers.  You will only need to specify a different port number if\n"
-"you run multiple instances of Citadel on the same computer and there is\n"
-"something else already using port 504.\n",
-
+#define NSSCONF                "/etc/nsswitch.conf"
+
+typedef enum _SetupStep {
+       eCitadelHomeDir = 0,
+       eSysAdminName = 1,
+       eSysAdminPW = 2,
+       eUID = 3,
+       eIP_ADDR = 4,
+       eCTDL_Port = 5,
+       eAuthType = 6,
+       eLDAP_Host = 7,
+       eLDAP_Port = 8,
+       eLDAP_Base_DN = 9,
+       eLDAP_Bind_DN = 10,
+       eLDAP_Bind_PW = 11,
+       eMaxQuestions = 12
+} eSetupStep;
+
+///"CREATE_XINETD_ENTRY";
+/* Environment variables, don't translate! */
+const char *EnvNames [eMaxQuestions] = {
+        "HOME_DIRECTORY",
+       "SYSADMIN_NAME",
+       "SYSADMIN_PW",
+       "CITADEL_UID",
+       "IP_ADDR",
+       "CITADEL_PORT",
+       "ENABLE_UNIX_AUTH",
+       "LDAP_HOST",
+       "LDAP_PORT",
+       "LDAP_BASE_DN",
+       "LDAP_BIND_DN",
+       "LDAP_BIND_PW"
 };
 
-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];
+int setup_type = (-1);
+int enable_home = 1;
+char admin_name[SIZ];
+char admin_pass[SIZ];
+char admin_cmd[SIZ];
+int serv_sock = (-1) ;
 
-       if (which_entry == NULL) return;
-       if (strlen(which_entry) == 0) return;
+const char *setup_titles[eMaxQuestions];
+const char *setup_text[eMaxQuestions];
 
-       inittab = strdup("");
-       if (inittab == NULL) return;
+char *program_title;
 
-       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, ':');
-                       extract_token(levels, buf, 1, ':');
-                       extract_token(state, buf, 2, ':');
-                       extract_token(prog, buf, 3, ':'); /* includes 0x0a LF */
+void SetTitles(void)
+{
+       int have_run_dir;
+#ifndef HAVE_RUN_DIR
+       have_run_dir = 1;
+#else
+       have_run_dir = 0;
+#endif
 
-                       if (!strcmp(entry, which_entry)) {
-                               strcpy(state, new_state);
-                               sprintf(buf, "%s:%s:%s:%s",
-                                       entry, levels, state, prog);
-                       }
-               }
+#ifdef ENABLE_NLS
+       setlocale(LC_MESSAGES, getenv("LANG"));
+       bindtextdomain("citadel-setup", LOCALEDIR"/locale");
+       textdomain("citadel-setup");
+       bind_textdomain_codeset("citadel-setup","UTF8");
+#endif
 
-               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 */
+       setup_titles[eCitadelHomeDir] = _("Citadel Home Directory");
+       if (have_run_dir)
+               setup_text[eCitadelHomeDir] = _(
+"Enter the full pathname of the directory in which the Citadel\n"
+"installation you are creating or updating resides.  If you\n"
+"specify a directory other than the default, you will need to\n"
+"specify the -h flag to the server when you start it up.\n");
+       else
+               setup_text[eCitadelHomeDir] = _(
+"Enter the subdirectory name for an alternate installation of "
+"Citadel. To do a default installation just leave it blank."
+"If you specify a directory other than the default, you will need to\n"
+"specify the -h flag to the server when you start it up.\n"
+"note that it may not have a leading /");
+
+       setup_titles[eSysAdminName] = _("Citadel administrator username:");
+       setup_text[eSysAdminName] = _(
+"Please enter the name of the Citadel user account that should be granted "
+"administrative privileges once created. If using internal authentication "
+"this user account will be created if it does not exist. For external "
+"authentication this user account has to exist.");
+
+       setup_titles[eSysAdminPW] = _("Administrator password:");
+       setup_text[eSysAdminPW] = _(
+"Enter a password for the system administrator. When setup\n"
+"completes it will attempt to create the administrator user\n"
+"and set the password specified here.\n");
+
+       setup_titles[eUID] = _("Citadel User ID:");
+       setup_text[eUID] = _(
+"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 site, you might also call it \"bbs\" or \"guest\".\n"
+"The server will run under this user ID.  Please specify that\n"
+"user ID here.  You may specify either a user name or a numeric\n"
+"UID.\n");
+
+       setup_titles[eIP_ADDR] = _("Listening address for the Citadel server:");
+       setup_text[eIP_ADDR] = _(
+"Please specify the IP address which the server should be listening to. "
+"You can name a specific IPv4 or IPv6 address, or you can specify\n"
+"\"*\" for \"any address\", \"::\" for \"any IPv6 address\", or \"0.0.0.0\"\n"
+"for \"any IPv4 address\". If you leave this blank, Citadel will\n"
+"listen on all addresses. "
+"This can usually be left to the default unless multiple instances of Citadel "
+"are running on the same computer.");
+
+       setup_titles[eCTDL_Port] = _("Server port number:");
+       setup_text[eCTDL_Port] = _(
+"Specify the TCP port number on which your server will run.\n"
+"Normally, this will be port 504, which is the official port\n"
+"assigned by the IANA for Citadel servers.  You will only need\n"
+"to specify a different port number if you run multiple instances\n"
+"of Citadel on the same computer and there is something else\n"
+"already using port 504.\n");
+
+       setup_titles[eAuthType] = _("Authentication method to use:");
+       setup_text[eAuthType] = _(
+"Please choose the user authentication mode. By default Citadel will use its "
+"own internal user accounts database. If you choose Host, Citadel users will "
+"have accounts on the host system, authenticated via /etc/passwd or a PAM "
+"source. LDAP chooses an RFC 2307 compliant directory server, the last option "
+"chooses the nonstandard MS Active Directory LDAP scheme."
+"\n"
+"Do not change this option unless you are sure it is required, since changing "
+"back requires a full reinstall of Citadel."
+"\n"
+" 0. Self contained authentication\n"
+" 1. Host system integrated authentication\n"
+" 2. External LDAP - RFC 2307 POSIX schema\n"
+" 3. External LDAP - MS Active Directory schema\n"
+"\n"
+"For help: http://www.citadel.org/doku.php/faq:installation:authmodes\n"
+"\n"
+"ANSWER \"0\" UNLESS YOU COMPLETELY UNDERSTAND THIS OPTION.\n");
+
+       setup_titles[eLDAP_Host] = _("LDAP host:");
+       setup_text[eLDAP_Host] = _(
+"Please enter the host name or IP address of your LDAP server.\n");
+
+       setup_titles[eLDAP_Port] = _("LDAP port number:");
+       setup_text[eLDAP_Port] = _(
+"Please enter the port number of the LDAP service (usually 389).\n");
+
+       setup_titles[eLDAP_Base_DN] = _("LDAP base DN:");
+       setup_text[eLDAP_Base_DN] = _(
+"Please enter the Base DN to search for authentication\n"
+"(for example: dc=example,dc=com)\n");
+
+       setup_titles[eLDAP_Bind_DN] = _("LDAP bind DN:");
+       setup_text[eLDAP_Bind_DN] = _(
+"Please enter the DN of an account to use for binding to the LDAP server for "
+"performing queries. The account does not require any other privileges. If "
+"your LDAP server allows anonymous queries, you can leave this blank.\n");
+
+       setup_titles[eLDAP_Bind_PW] = _("LDAP bind password:");
+       setup_text[eLDAP_Bind_PW] = _(
+"If you entered a Bind DN in the previous question, you must now enter\n"
+"the password associated with that account.  Otherwise, you can leave this\n"
+"blank.\n");
+
+#if 0
+// Debug loading of locales... Strace does a better job though.
+       printf("Message catalog directory: %s\n", bindtextdomain("citadel-setup", LOCALEDIR"/locale"));
+       printf("Text domain: %s\n", textdomain("citadel-setup"));
+       printf("Text domain Charset: %s\n", bind_textdomain_codeset("citadel-setup","UTF8"));
+       {
+               int i;
+               for (i = 0; i < eMaxQuestions; i++)
+                       printf("%s - %s\n", setup_titles[i], _(setup_titles[i]));
+               exit(0);
        }
-       free(inittab);
+#endif
 }
 
 
-/*
- * Locate the name of an inittab entry for a specific program
- */
-void locate_init_entry(char *init_entry, char *program) {
+void title(const char *text) {
+       printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n<%s>\n", text);
+}
 
-       FILE *infp;
-       char buf[SIZ];
-       int have_entry = 0;
-       char looking_for[SIZ];
-       char entry[SIZ];
-       char prog[SIZ];
 
-       strcpy(init_entry, "");
+int yesno(const char *question, int default_value) {
+       int answer = 0;
+       char buf[SIZ];
 
-       /* 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, ':');      
-                       extract_token(prog, buf, 3, ':');
-                       if (!strncasecmp(prog, looking_for,
-                          strlen(looking_for))) {
-                               ++have_entry;
-                               strcpy(init_entry, entry);
+       do {
+               printf("%s\n%s [%s] --> ", question, _("Yes/No"), ( default_value ? _("Yes") : _("No") ));
+               if (fgets(buf, sizeof buf, stdin)) {
+                       answer = tolower(buf[0]);
+                       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;
                        }
                }
-               fclose(infp);
-       }
-
+       } while ((answer < 0) || (answer > 1));
+       return (answer);
 }
 
 
-/* 
- * Shut down the Citadel service if necessary, during setup.
- */
-void shutdown_citserver(void) {
-       char looking_for[SIZ];
+void important_message(const char *title, const char *msgtext) {
+       char buf[SIZ];
 
-       snprintf(looking_for, sizeof looking_for, "%s/citserver", BBSDIR);
-       locate_init_entry(citserver_init_entry, looking_for);
-       if (strlen(citserver_init_entry) > 0) {
-               set_init_entry(citserver_init_entry, "off");
+       printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
+       printf("       %s \n\n%s\n\n", title, msgtext);
+       printf("%s", _("Press return to continue..."));
+       if (fgets(buf, sizeof buf, stdin)) {
+               ;
        }
 }
 
 
-/*
- * Start the Citadel service.
- */
-void start_citserver(void) {
-       if (strlen(citserver_init_entry) > 0) {
-               set_init_entry(citserver_init_entry, "respawn");
-       }
+void important_msgnum(int msgnum) {
+       important_message(_("Important Message"), setup_text[msgnum]);
 }
 
 
+void display_error(char *error_message_format, ...) {
+       StrBuf *Msg;
+       va_list arg_ptr;
 
-void cleanup(int exitcode)
-{
-#ifdef HAVE_NEWT
-       newtCls();
-       newtRefresh();
-       newtFinished();
-#endif
-       exit(exitcode);
+       Msg = NewStrBuf();
+       va_start(arg_ptr, error_message_format);
+       StrBufVAppendPrintf(Msg, error_message_format, arg_ptr);
+       va_end(arg_ptr);
+
+       important_message(_("Error"), ChrPtr(Msg));
+       FreeStrBuf(&Msg);
 }
 
 
+void progress(char *text, long int curr, long int cmax) {
+       static long dots_printed = 0L;
+       long a = 0;
 
-void title(char *text)
-{
-       if (setup_type == UI_TEXT) {
-               printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n<%s>\n", text);
+       if (curr == 0) {
+               printf("%s\n", text);
+               printf("....................................................");
+               printf("..........................\r");
+               dots_printed = 0;
+       } else if (curr == cmax) {
+               printf("\r%79s\n", "");
+       } else {
+               a = (curr * 100) / cmax;
+               a = a * 78;
+               a = a / 100;
+               while (dots_printed < a) {
+                       printf("*");
+                       ++dots_printed;
+               }
        }
+       fflush(stdout);
 }
 
 
+int uds_connectsock(char *sockpath) {
+       int s;
+       struct sockaddr_un addr;
 
-int yesno(char *question)
-{
-#ifdef HAVE_NEWT
-       newtComponent form = NULL;
-       newtComponent yesbutton = NULL;
-       newtComponent nobutton = NULL;
-       int i = 0;
-       int prompt_window_height = 0;
-#endif
-       int answer = 0;
-       char buf[SIZ];
+       memset(&addr, 0, sizeof(addr));
+       addr.sun_family = AF_UNIX;
+       strcpy(addr.sun_path, sockpath);
 
-       switch (setup_type) {
+       s = socket(AF_UNIX, SOCK_STREAM, 0);
+       if (s < 0) {
+               return(-1);
+       }
 
-       case UI_TEXT:
-               do {
-                       printf("%s\nYes/No --> ", question);
-                       fgets(buf, sizeof buf, stdin);
-                       answer = tolower(buf[0]);
-                       if (answer == 'y')
-                               answer = 1;
-                       else if (answer == 'n')
-                               answer = 0;
-               } while ((answer < 0) || (answer > 1));
-               break;
+       if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+               close(s);
+               return(-1);
+       }
 
-       case UI_DIALOG:
-               sprintf(buf, "%s --yesno '%s' 0 0",
-                       getenv("CTDL_DIALOG"),
-                       question);
-               i = system(buf);
-               if (buf == 0)
-                       answer = 1;
-               else
-                       answer = 0;
-               break;
+       return s;
+}
 
-#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');
-                       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);  
 
-               break;
-#endif
+/*
+ * input binary data from socket
+ */
+void serv_read(char *buf, int bytes) {
+       int len, rlen;
 
+       len = 0;
+       while (len < bytes) {
+               rlen = read(serv_sock, &buf[len], bytes - len);
+               if (rlen < 1) {
+                       return;
+               }
+               len = len + rlen;
        }
-       return (answer);
 }
 
 
-void important_message(char *title, char *msgtext)
-{
-#ifdef HAVE_NEWT
-       newtComponent form = NULL;
-       int i = 0;
-#endif
-       char buf[SIZ];
-
-       switch (setup_type) {
-
-       case UI_TEXT:
-               printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
-               printf("       %s \n\n%s\n\n", title, msgtext);
-               printf("Press return to continue...");
-               fgets(buf, sizeof buf, stdin);
-               break;
-
-       case UI_DIALOG:
-               sprintf(buf, "%s --backtitle '%s' --msgbox '%s' 0 0",
-                       getenv("CTDL_DIALOG"),
-                       title,
-                       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');
-                       newtFormAddComponent(form, newtLabel(1, 1+i, buf));
+/*
+ * send binary to server
+ */
+void serv_write(char *buf, int nbytes) {
+       int bytes_written = 0;
+       int retval;
+       while (bytes_written < nbytes) {
+               retval = write(serv_sock, &buf[bytes_written], nbytes - bytes_written);
+               if (retval < 1) {
+                       return;
                }
-               newtFormAddComponent(form, newtButton(35, 5, "OK"));
-               newtRunForm(form);
-               newtPopWindow();
-               newtFormDestroy(form);  
-               break;
-#endif
-
+               bytes_written = bytes_written + retval;
        }
 }
 
-void important_msgnum(int msgnum)
-{
-       important_message("Important Message", setup_text[msgnum]);
-}
-
-void display_error(char *error_message)
-{
-       important_message("Error", error_message);
-}
 
-void progress(char *text, long int curr, long int cmax)
-{
-#ifdef HAVE_NEWT
+/*
+ * input string from socket - implemented in terms of serv_read()
+ */
+void serv_gets(char *buf) {
+       int i;
 
-       /* 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?
+       /* Read one character at a time.
         */
-       static newtComponent form = NULL;
-       static newtComponent scale = NULL;
-#endif
-       static long dots_printed = 0L;
-       long a = 0;
-       static FILE *fp = NULL;
-       char buf[SIZ];
+       for (i = 0;; i++) {
+               serv_read(&buf[i], 1);
+               if (buf[i] == '\n' || i == (SIZ-1))
+                       break;
+       }
 
-       switch (setup_type) {
-
-       case UI_TEXT:
-               if (curr == 0) {
-                       printf("%s\n", text);
-                       printf("..........................");
-                       printf("..........................");
-                       printf("..........................\r");
-                       fflush(stdout);
-                       dots_printed = 0;
-               } else if (curr == cmax) {
-                       printf("\r%79s\n", "");
-               } else {
-                       a = (curr * 100) / cmax;
-                       a = a * 78;
-                       a = a / 100;
-                       while (dots_printed < a) {
-                               printf("*");
-                               ++dots_printed;
-                               fflush(stdout);
-                       }
+       /* If we got a long line, discard characters until the newline.
+        */
+       if (i == (SIZ-1)) {
+               while (buf[i] != '\n') {
+                       serv_read(&buf[i], 1);
                }
-               break;
+       }
 
-       case UI_DIALOG:
-               if (curr == 0) {
-                       sprintf(buf, "%s --gauge '%s' 10 72",
-                               getenv("CTDL_DIALOG"),
-                               text);
-                       fp = popen(buf, "w");
-                       if (fp != NULL) {
-                               fprintf(fp, "0\n");
-                       }
-               } 
-               else if (curr == cmax) {
-                       if (fp != NULL) {
-                               fprintf(fp, "100\n");
-                               pclose(fp);
-                               fp = NULL;
-                       }
-               }
-               else {
-                       a = (curr * 100) / cmax;
-                       if (fp != NULL) {
-                               fprintf(fp, "%ld\n", a);
-                               fflush(fp);
-                       }
-               }
-               break;
+       /* Strip all trailing nonprintables (crlf)
+        */
+       buf[i] = 0;
+}
 
-#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();
-               }
-               break;
-#endif
 
-       }
+/*
+ * send line to server - implemented in terms of serv_write()
+ */
+void serv_puts(char *buf) {
+       serv_write(buf, strlen(buf));
+       serv_write("\n", 1);
 }
 
 
-
 /*
- * check_services_entry()  -- Make sure "citadel" is in /etc/services
- *
+ * Convenience functions to get/set system configuration entries
  */
-void check_services_entry(void)
-{
-       int i;
-       FILE *sfp;
-
-       if (getservbyname(SERVICE_NAME, PROTO_NAME) == NULL) {
-               for (i=0; i<3; ++i) {
-                       progress("Adding service entry...", i, 3);
-                       if (i == 0) {
-                               sfp = fopen("/etc/services", "a");
-                               if (sfp == NULL) {
-                                       display_error(strerror(errno));
-                               } else {
-                                       fprintf(sfp, "%s                504/tcp\n",
-                                               SERVICE_NAME);
-                                       fclose(sfp);
-                               }
-                       }
-                       sleep(1);
-               }
+void getconf_str(char *buf, char *key) {
+       char cmd[SIZ];
+       char ret[SIZ];
+
+       sprintf(cmd, "CONF GETVAL|%s", key);
+       serv_puts(cmd);
+       serv_gets(ret);
+       if (ret[0] == '2') {
+               extract_token(buf, &ret[4], 0, '|', SIZ);
+       }
+       else {
+               strcpy(buf, "");
        }
 }
 
 
-/*
- * Generate a unique entry name for a new inittab entry
- */
-void generate_entry_name(char *entryname) {
+int getconf_int(char *key) {
        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);
+       getconf_str(buf, key);
+       return atoi(buf);
 }
 
 
+void setconf_str(char *key, char *val) {
+       char buf[SIZ];
 
-/*
- * check_inittab_entry()  -- Make sure "citadel" is in /etc/inittab
- *
- */
-void check_inittab_entry(void)
-{
-       FILE *infp;
-       char looking_for[SIZ];
-       char question[SIZ];
-       char entryname[5];
-
-       /* Determine the fully qualified path name of citserver */
-       snprintf(looking_for, sizeof looking_for, "%s/citserver", BBSDIR);
-       locate_init_entry(citserver_init_entry, looking_for);
-
-       /* If there's already an entry, then we have nothing left to do. */
-       if (strlen(citserver_init_entry) > 0) {
-               return;
-       }
+       sprintf(buf, "CONF PUTVAL|%s|%s", key, val);
+       serv_puts(buf);
+       serv_gets(buf);
+}
 
-       /* Otherwise, prompt the user to create an entry. */
-       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)
-               return;
-
-       /* Generate a unique entry name for /etc/inittab */
-       generate_entry_name(entryname);
-
-       /* 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 -h%s -x3 -llocal4\n",
-                       entryname, looking_for, setup_directory);
-               fclose(infp);
-               strcpy(citserver_init_entry, entryname);
-       }
+
+void setconf_int(char *key, int val) {
+       char buf[SIZ];
+
+       sprintf(buf, "CONF PUTVAL|%s|%d", key, val);
+       serv_puts(buf);
+       serv_gets(buf);
 }
 
 
@@ -549,29 +452,42 @@ void check_inittab_entry(void)
  * On systems which use xinetd, see if we can offer to install Citadel as
  * the default telnet target.
  */
-void check_xinetd_entry(void) {
+void check_xinetd_entry(void)
+{
        char *filename = "/etc/xinetd.d/telnet";
        FILE *fp;
        char buf[SIZ];
        int already_citadel = 0;
+       int rv;
 
        fp = fopen(filename, "r+");
        if (fp == NULL) return;         /* Not there.  Oh well... */
 
        while (fgets(buf, sizeof buf, fp) != NULL) {
-               if (strstr(buf, setup_directory) != NULL) already_citadel = 1;
+               if (strstr(buf, "/citadel") != NULL) {
+                       already_citadel = 1;
+               }
        }
        fclose(fp);
        if (already_citadel) return;    /* Already set up this way. */
 
        /* Otherwise, prompt the user to create an entry. */
-       snprintf(buf, sizeof buf,
-               "Setup can configure the \"xinetd\" service to automatically\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)
-               return;
+       if (getenv("CREATE_XINETD_ENTRY") != NULL) {
+               if (strcasecmp(getenv("CREATE_XINETD_ENTRY"), "yes")) {
+                       return;
+               }
+       }
+       else {
+               snprintf(buf, sizeof buf,
+                        _("Setup can configure the \"xinetd\" service to automatically\n"
+                          "connect incoming telnet sessions to Citadel, bypassing the\n"
+                          "host system login: prompt.  Would you like to do this?\n"
+                        )
+               );
+               if (yesno(buf, 1) == 0) {
+                       return;
+               }
+       }
 
        fp = fopen(filename, "w");
        fprintf(fp,
@@ -587,319 +503,208 @@ void check_xinetd_entry(void) {
                "       server_args     = -h -L %s/citadel\n"
                "       log_on_failure  += USERID\n"
                "}\n",
-               setup_directory
+               ctdl_bin_dir
        );
        fclose(fp);
 
-       /* Now try to restart the service */
-       system("/etc/init.d/xinetd restart >/dev/null 2>&1");
-}
-
-
-
-/*
- * Offer to disable other MTA's
- */
-void disable_other_mta(char *mta) {
-       char buf[SIZ];
-       FILE *fp;
-       int lines = 0;
-
-       sprintf(buf, "/bin/ls -l /etc/rc*.d/S*%s 2>/dev/null", mta);
-       fp = popen(buf, "r");
-       if (fp == NULL) return;
-
-       while (fgets(buf, sizeof buf, fp) != NULL) {
-               ++lines;
+       /* Now try to restart the service.  This will not have the intended effect on Solaris, but who uses Solaris anymore? */
+       rv = system("systemctl restart xinetd >/dev/null 2>&1");
+       if (rv != 0) {
+               rv = system("service xinetd restart >/dev/null 2>&1");
        }
-       fclose(fp);
-       if (lines == 0) return;         /* Nothing to do. */
-
-       /* Offer to replace other MTA with the vastly superior Citadel :)  */
-       snprintf(buf, sizeof buf,
-               "You appear to have the \"%s\" email program\n"
-               "running on your system.  Would you like to disable it,\n"
-               "allowing Citadel to handle your Internet mail instead?\n",
-               mta
-       );
-       if (yesno(buf) == 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, "/etc/init.d/%s stop >/dev/null 2>&1", mta);
-       system(buf);
-}
-
-
-
-
-/* 
- * Check to see if our server really works.  Returns 0 on success.
- */
-int test_server(void) {
-       char cmd[256];
-       char cookie[256];
-       FILE *fp;
-       char buf[4096];
-       int found_it = 0;
-
-       /* Generate a silly little cookie.  We're going to write it out
-        * to the server and try to get it back.  The cookie does not
-        * have to be secret ... just unique.
-        */
-       sprintf(cookie, "%ld.%d", time(NULL), getpid());
-
-       sprintf(cmd, "%s/sendcommand -h%s ECHO %s 2>&1",
-               setup_directory,
-               setup_directory,
-               cookie);
-
-       fp = popen(cmd, "r");
-       if (fp == NULL) return(errno);
-
-       while (fgets(buf, sizeof buf, fp) != NULL) {
-               if ( (buf[0]=='2')
-                  && (strstr(buf, cookie) != NULL) ) {
-                       ++found_it;
-               }
-       }
-       pclose(fp);
-
-       if (found_it) {
-               return(0);
+       if (rv != 0) {
+               display_error(_("failed to restart xinetd.\n"));
        }
-       return(-1);
 }
 
-void strprompt(char *prompt_title, char *prompt_text, char *str)
+
+void strprompt(const char *prompt_title, const char *prompt_text, char *Target, char *DefValue)
 {
-#ifdef HAVE_NEWT
-       newtComponent form;
-       char *result;
-       int i;
-       int prompt_window_height = 0;
-#endif
-       char buf[SIZ];
+       char buf[SIZ] = "";
        char setupmsg[SIZ];
-       char *dialog_result;
-       FILE *fp = NULL;
 
        strcpy(setupmsg, "");
 
-       switch (setup_type) {
-       case UI_TEXT:
-               title(prompt_title);
-               printf("\n%s\n", prompt_text);
-               printf("This is currently set to:\n%s\n", str);
-               printf("Enter new value or press return to leave unchanged:\n");
-               fgets(buf, sizeof buf, stdin);
+       title(prompt_title);
+       printf("\n%s\n", prompt_text);
+       printf("%s\n%s\n", _("This is currently set to:"), Target);
+       printf("%s\n", _("Enter new value or press return to leave unchanged:"));
+       if (fgets(buf, sizeof buf, stdin)) {
                buf[strlen(buf) - 1] = 0;
-               if (strlen(buf) != 0)
-                       strcpy(str, buf);
-               break;
-
-       case UI_DIALOG:
-               dialog_result = tmpnam(NULL);
-               sprintf(buf, "%s --backtitle '%s' --inputbox '%s' 0 0 '%s' 2>%s",
-                       getenv("CTDL_DIALOG"),
-                       prompt_title,
-                       prompt_text,
-                       str,
-                       dialog_result);
-               system(buf);
-               fp = fopen(dialog_result, "r");
-               if (fp != NULL) {
-                       fgets(str, sizeof buf, fp);
-                       if (str[strlen(str)-1] == 10) {
-                               str[strlen(str)-1] = 0;
-                       }
-                       fclose(fp);
-                       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');
-                       newtFormAddComponent(form, newtLabel(1, 1+i, buf));
-               }
-               newtFormAddComponent(form,
-                       newtEntry(1,
-                               (prompt_window_height - 2),
-                               str,
-                               74,
-                               &result,
-                               NEWT_FLAG_RETURNEXIT)
-               );
-               newtRunForm(form);
-               strcpy(str, result);
-
-               newtPopWindow();
-               newtFormDestroy(form);  
-
-#endif
+       }
+       if (!IsEmptyStr(buf)) {
+               strcpy(Target, buf);
        }
 }
 
-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];
-       snprintf(buf, sizeof buf, "%d", (int) *ip);
-       set_str_val(msgpos, buf);
-       *ip = atoi(buf);
+void set_bool_val(int msgpos, int *ip, char *DefValue) {
+       title(setup_titles[msgpos]);
+       *ip = yesno(setup_text[msgpos], *ip);
 }
 
 
-void set_char_val(int msgpos, char *ip)
+void set_str_val(int msgpos, char *Target, char *DefValue) 
 {
-       char buf[16];
-       snprintf(buf, sizeof buf, "%d", (int) *ip);
-       set_str_val(msgpos, buf);
-       *ip = (char) atoi(buf);
+       strprompt(setup_titles[msgpos], 
+                 setup_text[msgpos], 
+                 Target, 
+                 DefValue
+       );
 }
 
 
-void set_long_val(int msgpos, long int *ip)
+/* like set_str_val() but for numeric values */
+void set_int_val(int msgpos, int *target, char *default_value)
 {
-       char buf[16];
-       snprintf(buf, sizeof buf, "%ld", *ip);
-       set_str_val(msgpos, buf);
-       *ip = atol(buf);
+       char buf[32];
+       sprintf(buf, "%d", *target);
+       do {
+               set_str_val(msgpos, buf, default_value);
+       } while ( (strcmp(buf, "0")) && (atoi(buf) == 0) );
+       *target = atoi(buf);
 }
 
 
 void edit_value(int curr)
 {
-       int i;
-       struct passwd *pw;
-       char bbsuidname[SIZ];
+       struct passwd *pw = NULL;
+       char ctdluidname[256];
+       char buf[SIZ];
+       char *default_value = NULL;
+       int ctdluid = 0;
+       int portnum = 0;
+       int auth = 0;
+       int lportnum = 0;
+
+       if (default_value == NULL) {
+               default_value = "";
+       }
 
        switch (curr) {
 
-       case 1:
-               set_str_val(curr, config.c_sysadm);
+       case eSysAdminName:
+               getconf_str(admin_name, "c_sysadm");
+               set_str_val(curr, admin_name, default_value);
+               setconf_str("c_sysadm", admin_name);
                break;
 
-       case 2:
-#ifdef __CYGWIN__
-               config.c_bbsuid = 0;    /* XXX Windows hack, prob. insecure */
-#else
-               i = config.c_bbsuid;
-               pw = getpwuid(i);
+       case eSysAdminPW:
+               set_str_val(curr, admin_pass, default_value);
+               break;
+       
+       case eUID:
+               ctdluid = getconf_int("c_ctdluid");
+               pw = getpwuid(ctdluid);
                if (pw == NULL) {
-                       set_int_val(curr, &i);
-                       config.c_bbsuid = i;
+                       set_int_val(curr, &ctdluid, default_value);
                }
                else {
-                       strcpy(bbsuidname, pw->pw_name);
-                       set_str_val(curr, bbsuidname);
-                       pw = getpwnam(bbsuidname);
+                       strcpy(ctdluidname, pw->pw_name);
+                       set_str_val(curr, ctdluidname, default_value);
+                       pw = getpwnam(ctdluidname);
                        if (pw != NULL) {
-                               config.c_bbsuid = pw->pw_uid;
+                               ctdluid = pw->pw_uid;
                        }
-                       else if (atoi(bbsuidname) > 0) {
-                               config.c_bbsuid = atoi(bbsuidname);
+                       else if (atoi(ctdluidname) > 0) {
+                               ctdluid = atoi(ctdluidname);
                        }
                }
-#endif
+               setconf_int("c_ctdluid", ctdluid);
                break;
 
-       case 3:
-               set_str_val(curr, config.c_ip_addr);
+       case eIP_ADDR:
+               getconf_str(buf, "c_ip_addr");
+               set_str_val(curr, buf, default_value);
+               setconf_str("c_ip_addr", buf);
                break;
 
-       case 4:
-               set_int_val(curr, &config.c_port_number);
+       case eCTDL_Port:
+               portnum = getconf_int("c_port_number");
+               set_int_val(curr, &portnum, default_value);
+               setconf_int("c_port_number", portnum);
                break;
 
+       case eAuthType:
+               auth = getconf_int("c_auth_mode");
+               set_int_val(curr, &auth, default_value);
+               setconf_int("c_auth_mode", auth);
+               break;
 
-       }
-}
+       case eLDAP_Host:
+               getconf_str(buf, "c_ldap_host");
+               if (IsEmptyStr(buf)) {
+                       strcpy(buf, "localhost");
+               }
+               set_str_val(curr, buf, default_value);
+               setconf_str("c_ldap_host", buf);
+               break;
 
-/*
- * (re-)write the config data to disk
- */
-void write_config_to_disk(void)
-{
-       FILE *fp;
-       int fd;
+       case eLDAP_Port:
+               lportnum = getconf_int("c_ldap_port");
+               if (lportnum == 0) {
+                       lportnum = 389;
+               }
+               set_int_val(curr, &lportnum, default_value);
+               setconf_int("c_ldap_port", lportnum);
+               break;
 
-       if ((fd = creat("citadel.config", S_IRUSR | S_IWUSR)) == -1) {
-               display_error("setup: cannot open citadel.config");
-               cleanup(1);
-       }
-       fp = fdopen(fd, "wb");
-       if (fp == NULL) {
-               display_error("setup: cannot open citadel.config");
-               cleanup(1);
-       }
-       fwrite((char *) &config, sizeof(struct config), 1, fp);
-       fclose(fp);
-}
+       case eLDAP_Base_DN:
+               getconf_str(buf, "c_ldap_base_dn");
+               set_str_val(curr, buf, default_value);
+               setconf_str("c_ldap_base_dn", buf);
+               break;
 
+       case eLDAP_Bind_DN:
+               getconf_str(buf, "c_ldap_bind_dn");
+               set_str_val(curr, buf, default_value);
+               setconf_str("c_ldap_bind_dn", buf);
+               break;
 
+       case eLDAP_Bind_PW:
+               getconf_str(buf, "c_ldap_bind_pw");
+               set_str_val(curr, buf, default_value);
+               setconf_str("c_ldap_bind_pw", buf);
+               break;
+       }
+}
 
 
 /*
- * Figure out what type of user interface we're going to use
+ * Messages that are no longer in use.
+ * We keep them here so we don't lose the translations if we need them later.
  */
-int discover_ui(void)
-{
-
-       /* Use "dialog" if we have it */
-       if (getenv("CTDL_DIALOG") != NULL) {
-               return UI_DIALOG;
-       }
-               
-
-#ifdef HAVE_NEWT
-       newtInit();
-       newtCls();
-       newtDrawRootText(0, 0, "Citadel Setup");
-       return UI_NEWT;
+#if 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"));
+important_message(_("Setup failed"),
+_("Setup is finished, but the Citadel server failed to start.\n"
+"Go back and check your configuration.\n");
+important_message(_("Setup finished"),
+_("Setup is finished.  You may now start the server."));
 #endif
-       return UI_TEXT;
-}
-
-
-
 
 
 int main(int argc, char *argv[])
 {
-       int a;
+       int a, i;
        int curr;
+       char buf[1024]; 
        char aaa[128];
-       FILE *fp;
-       int old_setup_level = 0;
-       int info_only = 0;
-       struct utsname my_utsname;
+       char ctdldir[PATH_MAX]=CTDLDIR;
        struct passwd *pw;
-       struct hostent *he;
        gid_t gid;
+       char *activity = NULL;
+       
+       /* Keep a mild groove on */
+       program_title = _("Citadel setup program");
 
        /* set an invalid setup type */
        setup_type = (-1);
 
-        /* Check to see if we're running the web installer */
-       if (getenv("CITADEL_INSTALLER") != NULL) {
-               using_web_installer = 1;
-       }
-
        /* parse command line args */
        for (a = 0; a < argc; ++a) {
                if (!strncmp(argv[a], "-u", 2)) {
@@ -907,427 +712,196 @@ int main(int argc, char *argv[])
                        strcpy(aaa, &aaa[2]);
                        setup_type = atoi(aaa);
                }
-               if (!strcmp(argv[a], "-i")) {
-                       info_only = 1;
-               }
-               if (!strcmp(argv[a], "-q")) {
-                       setup_type = UI_SILENT;
+               else if (!strncmp(argv[a], "-h", 2)) {
+                       safestrncpy(ctdldir, &argv[a][2], sizeof ctdldir);
                }
        }
 
-
-       /* If a setup type was not specified, try to determine automatically
-        * the best one to use out of all available types.
-        */
-       if (setup_type < 0) {
-               setup_type = discover_ui();
-       }
-       if (info_only == 1) {
-               important_message("Citadel Setup", CITADEL);
-               cleanup(0);
-       }
-
-       /* Get started in a valid setup directory. */
-       strcpy(setup_directory, BBSDIR);
-       if ( (using_web_installer) && (getenv("CITADEL") != NULL) ) {
-               strcpy(setup_directory, getenv("CITADEL"));
-       }
-       else {
-               set_str_val(0, setup_directory);
-       }
-
-       if (chdir(setup_directory) != 0) {
-               important_message("Citadel Setup",
-                         "The directory you specified does not exist.");
-               cleanup(errno);
+       if (chdir(ctdldir) != 0) {
+               fprintf(stderr, "sendcommand: %s: %s\n", ctdldir, strerror(errno));
+               exit(errno);
        }
 
-       /* Determine our host name, in case we need to use it as a default */
-       uname(&my_utsname);
+       SetTitles();
 
-       /* 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();
+       /*
+        * Connect to the running Citadel server.
+        */
+       char *connectingmsg = _("Connecting to Citadel server");
+       for (i=0; ((i<30) && (serv_sock < 0)) ; ++i) {          /* wait for server to start up */
+               progress(connectingmsg, i, 30);
+               serv_sock = uds_connectsock(file_citadel_admin_socket);
                sleep(1);
        }
+       progress(connectingmsg, 30, 30);
 
-       /* 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);
+       if (serv_sock < 0) { 
+               display_error(
+                       "%s: %s %s\n", 
+                       _("Setup could not connect to a running Citadel server."),
+                       strerror(errno), file_citadel_admin_socket
+               );
+               exit(1);
        }
 
-       /* Now begin. */
-       switch (setup_type) {
-
-       case UI_TEXT:
-               printf("\n\n\n"
-                       "               *** Citadel setup program ***\n\n");
-               break;
-
+       /*
+        * read the server greeting
+        */
+       serv_gets(buf);
+       if (buf[0] != '2') {
+               display_error("%s\n", buf);
+               exit(2);
        }
 
        /*
-        * What we're going to try to do here is append a whole bunch of
-        * nulls to the citadel.config file, so we can keep the old config
-        * values if they exist, but if the file is missing or from an
-        * earlier version with a shorter config structure, when setup tries
-        * to read the old config parameters, they'll all come up zero.
-        * The length of the config file will be set to what it's supposed
-        * to be when we rewrite it, because we replace the old file with a
-        * completely new copy.
+        * Are we connected to the correct Citadel server?
         */
-
-       if ((a = open("citadel.config", O_WRONLY | O_CREAT | O_APPEND,
-                     S_IRUSR | S_IWUSR)) == -1) {
-               display_error("setup: cannot append citadel.config");
-               cleanup(errno);
-       }
-       fp = fdopen(a, "ab");
-       if (fp == NULL) {
-               display_error("setup: cannot append citadel.config");
-               cleanup(errno);
+       serv_puts("INFO");
+       serv_gets(buf);
+       if (buf[0] != '1') {
+               display_error("%s\n", buf);
+               exit(3);
+       }
+       a = 0;
+       while (serv_gets(buf), strcmp(buf, "000")) {
+               if (a == 5) {
+                       if (atoi(buf) != REV_LEVEL) {
+                               display_error("%s\n",
+                               _("Your setup program and Citadel server are from different versions.")
+                               );
+                               exit(4);
+                       }
+               }
+               ++a;
        }
-       for (a = 0; a < sizeof(struct config); ++a)
-               putc(0, fp);
-       fclose(fp);
 
-       /* now we re-open it, and read the old or blank configuration */
-       fp = fopen("citadel.config", "rb");
-       if (fp == NULL) {
-               display_error("setup: cannot open citadel.config");
-               cleanup(errno);
-       }
-       fread((char *) &config, sizeof(struct config), 1, fp);
-       fclose(fp);
+       printf("\n\n\n         *** %s ***\n\n", program_title);
 
-       /* set some sample/default values in place of blanks... */
-       if (strlen(config.c_nodename) == 0)
-               safestrncpy(config.c_nodename, my_utsname.nodename,
-                           sizeof config.c_nodename);
-       strtok(config.c_nodename, ".");
-       if (strlen(config.c_fqdn) == 0) {
-               if ((he = gethostbyname(my_utsname.nodename)) != NULL)
-                       safestrncpy(config.c_fqdn, he->h_name,
-                                   sizeof config.c_fqdn);
-               else
-                       safestrncpy(config.c_fqdn, my_utsname.nodename,
-                                   sizeof config.c_fqdn);
-       }
-       if (strlen(config.c_humannode) == 0)
-               strcpy(config.c_humannode, "My System");
-       if (strlen(config.c_phonenum) == 0)
-               strcpy(config.c_phonenum, "US 800 555 1212");
-       if (config.c_initax == 0) {
-               config.c_initax = 4;
-       }
-       if (strlen(config.c_moreprompt) == 0)
-               strcpy(config.c_moreprompt, "<more>");
-       if (strlen(config.c_twitroom) == 0)
-               strcpy(config.c_twitroom, "Trashcan");
-       if (strlen(config.c_baseroom) == 0)
-               strcpy(config.c_baseroom, "Lobby");
-       if (strlen(config.c_aideroom) == 0)
-               strcpy(config.c_aideroom, "Aide");
-       if (config.c_port_number == 0) {
-               config.c_port_number = 504;
-       }
-       if (config.c_sleeping == 0) {
-               config.c_sleeping = 900;
-       }
-       if (config.c_bbsuid == 0) {
-               pw = getpwnam("citadel");
-               if (pw != NULL)
-                       config.c_bbsuid = pw->pw_uid;
-       }
-       if (config.c_bbsuid == 0) {
-               pw = getpwnam("bbs");
-               if (pw != NULL)
-                       config.c_bbsuid = pw->pw_uid;
+       /* Go through a series of dialogs prompting for config info */
+       for (curr = 1; curr < eMaxQuestions; ++curr) {
+               edit_value(curr);
+
+               if (    (curr == eAuthType)
+                       && (getconf_int("c_auth_mode") != AUTHMODE_LDAP)
+                       && (getconf_int("c_auth_mode") != AUTHMODE_LDAP_AD)
+               ) {
+                       curr += 5;      /* skip LDAP questions if we're not authenticating against LDAP */
+               }
+
+               if (curr == eSysAdminName) {
+                       if (getconf_int("c_auth_mode") == AUTHMODE_NATIVE) {
+                                               /* for native auth mode, fetch the admin's existing pw */
+                               snprintf(buf, sizeof buf, "AGUP %s", admin_name);
+                               serv_puts(buf);
+                               serv_gets(buf);
+                               if (buf[0] == '2') {
+                                       extract_token(admin_pass, &buf[4], 1, '|', sizeof admin_pass);
+                               }
+                       }
+                       else {
+                               ++curr;         /* skip the password question for non-native auth modes */
+                       }
+               }
        }
-       if (config.c_bbsuid == 0) {
-               pw = getpwnam("guest");
-               if (pw != NULL)
-                       config.c_bbsuid = pw->pw_uid;
+
+       if ((pw = getpwuid( getconf_int("c_ctdluid") )) == NULL) {
+               gid = getgid();
+       } else {
+               gid = pw->pw_gid;
        }
-       if (config.c_createax == 0) {
-               config.c_createax = 3;
+
+       if (create_run_directories(getconf_int("c_ctdluid"), gid) != 0) {
+               display_error("%s\n", _("failed to create directories"));
        }
+               
+       activity = _("Reconfiguring Citadel server");
+       progress(activity, 0, 5);
+       sleep(1);                                       /* Let the message appear briefly */
+
        /*
-        * Negative values for maxsessions are not allowed.
+        * Create the administrator account.  It's ok if the command fails if this user already exists.
         */
-       if (config.c_maxsessions < 0) {
-               config.c_maxsessions = 0;
-       }
-       /* We need a system default message expiry policy, because this is
-        * the top level and there's no 'higher' policy to fall back on.
-        */
-       if (config.c_ep.expire_mode == 0) {
-               config.c_ep.expire_mode = EXPIRE_NUMMSGS;
-               config.c_ep.expire_value = 150;
+       if (getconf_int("c_auth_mode") == AUTHMODE_NATIVE) {
+               progress(activity, 1, 5);
+               snprintf(buf, sizeof buf, "CREU %s|%s", admin_name, admin_pass);
+               serv_puts(buf);
+               progress(activity, 2, 5);
+               serv_gets(buf);
        }
+       progress(activity, 3, 5);
 
        /*
-        * Default port numbers for various services
+        * Assign the desired password and access level to the administrator account.
         */
-       if (config.c_smtp_port == 0) config.c_smtp_port = 25;
-       if (config.c_pop3_port == 0) config.c_pop3_port = 110;
-       if (config.c_imap_port == 0) config.c_imap_port = 143;
-
-       /* Go through a series of dialogs prompting for config info */
-       if (setup_type != UI_SILENT) {
-               for (curr = 1; curr <= MAXSETUP; ++curr) {
-                       edit_value(curr);
+       if (getconf_int("c_auth_mode") == AUTHMODE_NATIVE) {
+               snprintf(buf, sizeof buf, "AGUP %s", admin_name);
+               serv_puts(buf);
+               progress(activity, 4, 5);
+               serv_gets(buf);
+               if (buf[0] == '2') {
+                       int admin_flags = extract_int(&buf[4], 2);
+                       int admin_times_called = extract_int(&buf[4], 3);
+                       int admin_msgs_posted = extract_int(&buf[4], 4);
+                       snprintf(buf, sizeof buf, "ASUP %s|%s|%d|%d|%d|6",
+                               admin_name, admin_pass, admin_flags, admin_times_called, admin_msgs_posted
+                       );
+                       serv_puts(buf);
+                       serv_gets(buf);
                }
        }
+       progress(activity, 5, 5);
+
+       check_xinetd_entry();   /* Check /etc/xinetd.d/telnet */
 
        /*
-          if (setuid(config.c_bbsuid) != 0) {
-          important_message("Citadel Setup",
-          "Failed to change the user ID to your Citadel user.");
-          cleanup(errno);
-          }
+        * Restart citserver
         */
+       activity = _("Restarting Citadel server to apply changes");
+       progress(activity, 0, 51);
 
-/***** begin version update section ***** */
-       /* take care of any updating that is necessary */
-
-       old_setup_level = config.c_setup_level;
-
-       if (old_setup_level == 0) {
-               goto NEW_INST;
-       }
+       serv_puts("TIME");
+       serv_gets(buf);
+       long original_start_time = extract_long(&buf[4], 3);
 
-       if (old_setup_level < 555) {
-               important_message("Citadel Setup",
-                                 "This Citadel installation is too old "
-                                 "to be upgraded.");
-               cleanup(1);
+       progress(activity, 1, 51);
+       serv_puts("DOWN 1");
+       progress(activity, 2, 51);
+       serv_gets(buf);
+       if (buf[0] != '2') {
+               display_error("%s\n", buf);
+               exit(6);
        }
-       write_config_to_disk();
-
-       old_setup_level = config.c_setup_level;
-
-       /* end of version update section */
-
-NEW_INST:
-       config.c_setup_level = REV_LEVEL;
-
-/******************************************/
-
-       write_config_to_disk();
-
-       mkdir("info", 0700);
-       chmod("info", 0700);
-       mkdir("bio", 0700);
-       chmod("bio", 0700);
-       mkdir("userpics", 0700);
-       chmod("userpics", 0700);
-       mkdir("messages", 0700);
-       chmod("messages", 0700);
-       mkdir("help", 0700);
-       chmod("help", 0700);
-       mkdir("images", 0700);
-       chmod("images", 0700);
-       mkdir("netconfigs", 0700);
-       chmod("netconfigs", 0700);
-
-       /* 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 */
-#ifndef __CYGWIN__
-       check_inittab_entry();  /* Check /etc/inittab */
-       check_xinetd_entry();   /* Check /etc/xinetd.d/telnet */
-
-       /* Offer to disable other MTA's on the system. */
-       disable_other_mta("sendmail");
-       disable_other_mta("postfix");
-       disable_other_mta("qmail");
-       disable_other_mta("cyrus");
-       disable_other_mta("cyrmaster");
-       disable_other_mta("saslauthd");
-       disable_other_mta("mta");
-       disable_other_mta("courier-imap");
-       disable_other_mta("courier-imap-ssl");
-       disable_other_mta("courier-authdaemon");
-       disable_other_mta("courier-pop3");
-       disable_other_mta("courier-pop3d");
-       disable_other_mta("courier-pop");
-       disable_other_mta("vmailmgrd");
-       disable_other_mta("imapd");
-       disable_other_mta("popd");
-       disable_other_mta("pop3d");
-       disable_other_mta("exim");
-#endif
-
-       if ((pw = getpwuid(config.c_bbsuid)) == NULL)
-               gid = getgid();
-       else
-               gid = pw->pw_gid;
 
-       progress("Setting file permissions", 0, 4);
-       chown(".", config.c_bbsuid, gid);
-       progress("Setting file permissions", 1, 4);
-       chown("citadel.config", config.c_bbsuid, gid);
-       progress("Setting file permissions", 2, 4);
-       snprintf(aaa, sizeof aaa,
-               "find . | grep -v chkpwd | xargs chown %ld:%ld 2>/dev/null",
-               (long)config.c_bbsuid, (long)gid);
-       system(aaa);
-       progress("Setting file permissions", 3, 4);
-       chmod("citadel.config", S_IRUSR | S_IWUSR);
-       progress("Setting file permissions", 4, 4);
-
-#ifdef HAVE_LDAP
-       /* Contemplate the possibility of auto-configuring OpenLDAP */
-       contemplate_ldap();
-#endif
+       close(serv_sock);
+       serv_sock = (-1);
 
-       /* See if we can start the Citadel service. */
-       if (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 (test_server() == 0) {
-                       important_message("Setup finished",
-                               "Setup is finished.  You may now log in.");
-               }
-               else {
-                       important_message("Setup finished",
-                               "Setup is finished, but the Citadel service "
-                               "failed to start.\n"
-                               "Go back and check your configuration.");
-               }
-       }
-       else {
-               important_message("Setup finished",
-                       "Setup is finished.  You may now start the server.");
+       for (i=3; i<=6; ++i) {                                  /* wait for server to shut down */
+               progress(activity, i, 51);
+               sleep(1);
        }
 
-       cleanup(0);
-       return 0;
-}
-
-
-#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 (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;
-
-       /* Otherwise, prompt the user to create an entry. */
-       snprintf(question, sizeof question,
-               "\n"
-               "Do you want this computer configured to start a standalone\n"
-               "LDAP service automatically?  (If you answer yes, a custom\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);
-
-       /* FIXME ... make the generated password harder to guess */
-       sprintf(config.c_ldap_bind_pw, "%d%ld", getpid(), 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;
+       for (i=7; ((i<=48) && (serv_sock < 0)) ; ++i) {         /* wait for server to start up */
+               progress(activity, i, 51);
+               serv_sock = uds_connectsock(file_citadel_admin_socket);
+               sleep(1);
        }
 
-       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");
+       progress(activity, 49, 51);
+       serv_gets(buf);
 
-       fclose(fp);
+       progress(activity, 50, 51);
+       serv_puts("TIME");
+       serv_gets(buf);
+       long new_start_time = extract_long(&buf[4], 3);
 
-       /* This is where our OpenLDAP server will keep its data. */
-       mkdir("openldap-data", 0700);
+       close(serv_sock);
+       progress(activity, 51, 51);
 
-       /* If inittab is already starting slapd, disable the old entry. */
-       locate_init_entry(slapd_init_entry, getenv("SLAPD_BINARY"));
-       if (strlen(slapd_init_entry) > 0) {
-               set_init_entry(slapd_init_entry, "off");
-       }
-
-       /* Generate a unique entry name for slapd */
-       generate_entry_name(slapd_init_entry);
-
-       /* 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);
+       if ((original_start_time == new_start_time) || (new_start_time <= 0)) {
+               display_error("%s\n", _("Setup failed to restart Citadel server.  Please restart it manually."));
+               exit(7);
        }
 
+       exit(0);
+       return 0;
 }
-#endif /* HAVE_LDAP */