X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futils%2Fsetup.c;h=6eaa957d3d4829c46262adbb39ab49ae186a8bc7;hb=168a379df5e834ab2f27bc7f0b0d2122d9a59cb2;hp=5eb2ae9d00016884b5b3233cc3e636e3e506a5ea;hpb=01ac23062c565ac60b45e761076a96d266b552e2;p=citadel.git

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index 5eb2ae9d0..6eaa957d3 100644
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -1,7 +1,7 @@
 /*
  * Citadel setup utility
  *
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2016 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.
@@ -21,7 +21,6 @@
 #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>
@@ -74,7 +73,7 @@ typedef enum _SetupStep {
 	eLDAP_Bind_DN = 10,
 	eLDAP_Bind_PW = 11,
 	eMaxQuestions = 12
-} eSteupStep;
+} eSetupStep;
 
 ///"CREATE_XINETD_ENTRY";
 /* Environment variables, don't translate! */
@@ -94,16 +93,16 @@ const char *EnvNames [eMaxQuestions] = {
 };
 
 int setup_type = (-1);
-int using_web_installer = 0;
 int enable_home = 1;
+char admin_name[SIZ];
 char admin_pass[SIZ];
 char admin_cmd[SIZ];
 int serv_sock = (-1) ;
-char configs[NUM_CONFIGS][1024];
 
 const char *setup_titles[eMaxQuestions];
 const char *setup_text[eMaxQuestions];
 
+char *program_title;
 
 void SetTitles(void)
 {
@@ -239,30 +238,6 @@ void SetTitles(void)
 #endif
 }
 
-/*
- * Print the stack frame for a backtrace
- */
-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
-}
-
-int direction;
-
 
 
 void title(const char *text)
@@ -306,8 +281,9 @@ int yesno(const char *question, int default_value)
 		break;
 
 	case UI_DIALOG:
-		sprintf(buf, "exec %s %s --yesno '%s' 15 75",
+		snprintf(buf, sizeof buf, "exec %s --backtitle '%s' %s --yesno '%s' 15 75",
 			getenv("CTDL_DIALOG"),
+			program_title,
 			( default_value ? "" : "--defaultno" ),
 			question);
 		i = system(buf);
@@ -335,12 +311,14 @@ void important_message(const char *title, const char *msgtext)
 		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));
+		if (fgets(buf, sizeof buf, stdin))
+		{;}
 		break;
 
 	case UI_DIALOG:
-		sprintf(buf, "exec %s --msgbox '%s' 19 72",
+		snprintf(buf, sizeof buf, "exec %s --backtitle '%s' --msgbox '%s' 19 72",
 			getenv("CTDL_DIALOG"),
+			program_title,
 			msgtext);
 		int rv = system(buf);
 		if (rv != 0) {
@@ -403,8 +381,9 @@ void progress(char *text, long int curr, long int cmax)
 
 	case UI_DIALOG:
 		if (curr == 0) {
-			sprintf(buf, "exec %s --gauge '%s' 7 72 0",
+			snprintf(buf, sizeof buf, "exec %s --backtitle '%s' --gauge '%s' 7 72 0",
 				getenv("CTDL_DIALOG"),
+				program_title,
 				text);
 			fp = popen(buf, "w");
 			if (fp != NULL) {
@@ -535,11 +514,61 @@ void serv_puts(char *buf)
 }
 
 
+/*
+ * Convenience functions to get/set system configuration entries
+ */
+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, "");
+	}
+}
+
+int getconf_int(char *key)
+{
+	char buf[SIZ];
+	getconf_str(buf, key);
+	return atoi(buf);
+}
+
+void setconf_str(char *key, char *val)
+{
+	char buf[SIZ];
+
+	sprintf(buf, "CONF PUTVAL|%s|%s", key, val);
+	serv_puts(buf);
+	serv_gets(buf);
+}
+
+
+void setconf_int(char *key, int val)
+{
+	char buf[SIZ];
+
+	sprintf(buf, "CONF PUTVAL|%s|%d", key, val);
+	serv_puts(buf);
+	serv_gets(buf);
+}
+
+
+
+
+
 /*
  * 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];
@@ -610,7 +639,7 @@ void disable_other_mta(const char *mta) {
 	int lines = 0;
 	int rv;
 
-	sprintf(buf,
+	snprintf(buf, sizeof buf,
 		"/bin/ls -l /etc/rc*.d/S*%s 2>/dev/null; "
 		"/bin/ls -l /etc/rc.d/rc*.d/S*%s 2>/dev/null",
 		mta, mta
@@ -649,12 +678,12 @@ void disable_other_mta(const char *mta) {
 	}
 	
 
-	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);
+	snprintf(buf, sizeof 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);
 	rv = system(buf);
 	if (rv != 0)
 		display_error("%s %s.\n", _("failed to disable other mta"), mta);
 
-	sprintf(buf, "/etc/init.d/%s stop >/dev/null 2>&1", mta);
+	snprintf(buf, sizeof buf, "/etc/init.d/%s stop >/dev/null 2>&1", mta);
 	rv = system(buf);
 	if (rv != 0)
 		display_error(" %s.\n", _("failed to disable other mta"), mta);
@@ -715,7 +744,7 @@ void strprompt(const char *prompt_title, const char *prompt_text, char *Target,
 		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)){
+		if (fgets(buf, sizeof buf, stdin)) {
 			buf[strlen(buf) - 1] = 0;
 		}
 		if (!IsEmptyStr(buf))
@@ -724,8 +753,9 @@ void strprompt(const char *prompt_title, const char *prompt_text, char *Target,
 
 	case UI_DIALOG:
 		CtdlMakeTempFileName(dialog_result, sizeof dialog_result);
-		sprintf(buf, "exec %s --nocancel --inputbox '%s' 19 72 '%s' 2>%s",
+		snprintf(buf, sizeof buf, "exec %s --backtitle '%s' --nocancel --inputbox '%s' 19 72 '%s' 2>%s",
 			getenv("CTDL_DIALOG"),
+			program_title,
 			prompt_text,
 			Target,
 			dialog_result);
@@ -767,136 +797,145 @@ void set_str_val(int msgpos, char *Target, char *DefValue)
 	);
 }
 
-/* like set_str_val() but make sure we ended up with a numeric value */
-void set_int_val(int msgpos, char *target, char *DefValue)
+/* like set_str_val() but for numeric values */
+void set_int_val(int msgpos, int *target, char *default_value)
 {
-	while(1) {
-		set_str_val(msgpos, target, DefValue);
-		if (!strcmp(target, "0")) return;
-		if (atoi(target) != 0) return;
-	}
+	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;
+	struct passwd *pw = NULL;
 	char ctdluidname[256];
-	char *Value = NULL;
+	char buf[SIZ];
+	char *default_value = NULL;
+	int ctdluid = 0;
+	int portnum = 0;
+	int auth = 0;
+	int lportnum = 0;
 
 	if (setup_type == UI_SILENT)
 	{
-		Value = getenv(EnvNames[curr]);
+		default_value = getenv(EnvNames[curr]);
 	}
-	if (Value == NULL) {
-		Value = "";
+	if (default_value == NULL) {
+		default_value = "";
 	}
 
 	switch (curr) {
 
 	case eSysAdminName:
-		set_str_val(curr, configs[13], Value);
+		getconf_str(admin_name, "c_sysadm");
+		set_str_val(curr, admin_name, default_value);
+		setconf_str("c_sysadm", admin_name);
 		break;
 
 	case eSysAdminPW:
-		set_str_val(curr, admin_pass, Value);
+		set_str_val(curr, admin_pass, default_value);
 		break;
 	
 	case eUID:
+
 		if (setup_type == UI_SILENT)
 		{		
-			if (Value) {
-				sprintf(configs[69], "%d", atoi(Value));
+			if (default_value) {
+				ctdluid = atoi(default_value);
 			}					
 		}
 		else
 		{
 #ifdef __CYGWIN__
-			strcpy(configs[69], "0");	/* work-around for Windows */
+			ctdluid = 0;	/* work-around for Windows */
 #else
-			i = atoi(configs[69]);
-			pw = getpwuid(i);
+			pw = getpwuid(ctdluid);
 			if (pw == NULL) {
-				set_int_val(curr, configs[69], Value);
-				sprintf(configs[69], "%d", i);
+				set_int_val(curr, &ctdluid, default_value);
 			}
 			else {
 				strcpy(ctdluidname, pw->pw_name);
-				set_str_val(curr, ctdluidname, Value);
+				set_str_val(curr, ctdluidname, default_value);
 				pw = getpwnam(ctdluidname);
 				if (pw != NULL) {
-					sprintf(configs[69], "%d", pw->pw_uid);
+					ctdluid = pw->pw_uid;
 				}
 				else if (atoi(ctdluidname) > 0) {
-					sprintf(configs[69], "%d", atoi(ctdluidname));
+					ctdluid = atoi(ctdluidname);
 				}
 			}
 #endif
 		}
+		setconf_int("c_ctdluid", ctdluid);
 		break;
 
 	case eIP_ADDR:
-		set_str_val(curr, configs[37], Value);
+		getconf_str(buf, "c_ip_addr");
+		set_str_val(curr, buf, default_value);
+		setconf_str("c_ip_addr", buf);
 		break;
 
 	case eCTDL_Port:
-		set_int_val(curr, configs[68], Value);
+		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");
 		if (setup_type == UI_SILENT)
 		{
-			const char *auth;
-			//config.c_auth_mode = AUTHMODE_NATIVE;
-			auth = Value;
-			if (auth != NULL)
-			{
-				if ((strcasecmp(auth, "yes") == 0) ||
-				    (strcasecmp(auth, "host") == 0))
-				{
-					//config.c_auth_mode = AUTHMODE_HOST;
-				}
-				else if (strcasecmp(auth, "ldap") == 0){
-					//config.c_auth_mode = AUTHMODE_LDAP;
-				}
-				else if ((strcasecmp(auth, "ldap_ad") == 0) ||
-					 (strcasecmp(auth, "active directory") == 0)){
-					//config.c_auth_mode = AUTHMODE_LDAP_AD;
-				}
-			}
+			if ( (default_value) && (!strcasecmp(default_value, "yes")) ) auth = AUTHMODE_HOST;
+			if ( (default_value) && (!strcasecmp(default_value, "host")) ) auth = AUTHMODE_HOST;
+			if ( (default_value) && (!strcasecmp(default_value, "ldap")) ) auth = AUTHMODE_LDAP;
+			if ( (default_value) && (!strcasecmp(default_value, "ldap_ad")) ) auth = AUTHMODE_LDAP_AD;
+			if ( (default_value) && (!strcasecmp(default_value, "active directory")) ) auth = AUTHMODE_LDAP_AD;
 		}
 		else {
-			set_int_val(curr, configs[52], Value);
+			set_int_val(curr, &auth, default_value);
 		}
+		setconf_int("c_auth_mode", auth);
 		break;
 
 	case eLDAP_Host:
-		if (IsEmptyStr(configs[32])) {
-			strcpy(configs[32], "localhost");
+		getconf_str(buf, "c_ldap_host");
+		if (IsEmptyStr(buf)) {
+			strcpy(buf, "localhost");
 		}
-		set_str_val(curr, configs[32], Value);
+		set_str_val(curr, buf, default_value);
+		setconf_str("c_ldap_host", buf);
 		break;
 
 	case eLDAP_Port:
-		if (atoi(configs[33]) == 0) {
-			strcpy(configs[33], "389");
+		lportnum = getconf_int("c_ldap_port");
+		if (lportnum == 0) {
+			lportnum = 389;
 		}
-		set_int_val(curr, configs[33], Value);
+		set_int_val(curr, &lportnum, default_value);
+		setconf_int("c_ldap_port", lportnum);
 		break;
 
 	case eLDAP_Base_DN:
-		set_str_val(curr, configs[34], Value);
+		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:
-		set_str_val(curr, configs[35], Value);
+		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:
-		set_str_val(curr, configs[36], Value);
+		getconf_str(buf, "c_ldap_bind_pw");
+		set_str_val(curr, buf, default_value);
+		setconf_str("c_ldap_bind_pw", buf);
 		break;
-
 	}
 }
 
@@ -946,9 +985,10 @@ void fixnss(void) {
 
 	while (fgets(buf, sizeof buf, fp_read) != NULL) {
 		strcpy(buf_nc, buf);
-		for (i=0; i<strlen(buf_nc); ++i) {
+		for (i=0; buf_nc[i]; ++i) {
 			if (buf_nc[i] == '#') {
 				buf_nc[i] = 0;
+				break;
 			}
 		}
 		for (i=0; i<strlen(buf_nc); ++i) {
@@ -966,7 +1006,8 @@ void fixnss(void) {
 				}
 			}
 		}
-		if (write(fd_write, buf, strlen(buf)) != strlen(buf)) {
+		long buflen = strlen(buf);
+		if (write(fd_write, buf, buflen) != buflen) {
 			fclose(fp_read);
 			close(fd_write);
 			unlink(new_filename);
@@ -995,7 +1036,7 @@ void fixnss(void) {
 	);
 
 	if (yesno(question, 1)) {
-		sprintf(buf, "/bin/mv -f %s %s", new_filename, NSSCONF);
+		snprintf(buf, sizeof buf, "/bin/mv -f %s %s", new_filename, NSSCONF);
 		rv = system(buf);
 		if (rv != 0) {
 			fprintf(stderr, "failed to edit %s.\n", NSSCONF);
@@ -1006,7 +1047,10 @@ void fixnss(void) {
 }
 
 
-
+/*
+ * Messages that are no longer in use.
+ * We keep them here so we don't lose the translations if we need them later.
+ */
 #if 0
 				important_message(_("Setup finished"),
 						  _("Setup of the Citadel server is complete.\n"
@@ -1022,132 +1066,6 @@ void fixnss(void) {
 
 
 
-#define GetDefaultVALINT(CFGNAME, DEFL) GetDefaultValInt(&config.CFGNAME, "CITADEL_"#CFGNAME, DEFL)
-void GetDefaultValInt(int *WhereTo, const char *VarName, int DefVal)
-{
-	const char *ch;
-	if (*WhereTo == 0) *WhereTo = DefVal;
-
-	if ((setup_type == UI_SILENT) &&
-	    (ch = getenv(VarName), ch != NULL))
-	{
-		*WhereTo = atoi(ch);
-	}
-}
-#define GetDefaultVALCHAR(CFGNAME, DEFL) GetDefaultValChar(&config.CFGNAME, "CITADEL_"#CFGNAME, DEFL)
-void GetDefaultValChar(char *WhereTo, const char *VarName, char DefVal)
-{
-	const char *ch;
-	if (*WhereTo == 0) *WhereTo = DefVal;
-
-	if ((setup_type == UI_SILENT) &&
-	    (ch = getenv(VarName), ch != NULL))
-	{
-		*WhereTo = atoi(ch);
-	}
-}
-#define GetDefaultVALSTR(CFGNAME, DEFL) GetDefaultValStr(&config.CFGNAME[0], sizeof(config.CFGNAME), "CITADEL_"#CFGNAME, DEFL)
-void GetDefaultValStr(char *WhereTo, size_t nMax, const char *VarName, const char *DefVal)
-{
-	const char *ch;
-	if (*WhereTo == '\0') 
-		safestrncpy(WhereTo, DefVal, nMax);
-
-	if ((setup_type == UI_SILENT) &&
-	    (ch = getenv(VarName), ch != NULL))
-	{
-		safestrncpy(WhereTo, ch, nMax);
-	}
-}
-
-
-void set_default_values(void)
-{
-#if 0
-	struct passwd *pw;
-	struct utsname my_utsname;
-	struct hostent *he;
-
-	/* Determine our host name, in case we need to use it as a default */
-	uname(&my_utsname);
-
-	/* set some sample/default values in place of blanks... */
-	GetDefaultVALSTR(c_nodename, my_utsname.nodename);
-	strtok(config.c_nodename, ".");
-	if (IsEmptyStr(config.c_fqdn) ) {
-		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);
-		}
-	}
-	GetDefaultVALSTR(c_humannode, _("My System"));
-	GetDefaultVALSTR(c_phonenum, _("US 800 555 1212"));
-
-	GetDefaultVALCHAR(c_initax, 4);
-
-	GetDefaultVALSTR(c_moreprompt, "<more>");
-	GetDefaultVALSTR(c_twitroom, "Trashcan");
-	GetDefaultVALSTR(c_baseroom, BASEROOM);
-	GetDefaultVALSTR(c_aideroom, "Aide");
-	GetDefaultVALINT(c_port_number, 504);
-	
-	GetDefaultVALINT(c_sleeping, 900);
-
-	if (config.c_ctdluid == 0) {
-		pw = getpwnam("citadel");
-		if (pw != NULL) {
-			config.c_ctdluid = pw->pw_uid;
-		}
-	}
-	if (config.c_ctdluid == 0) {
-		pw = getpwnam("bbs");
-		if (pw != NULL) {
-			config.c_ctdluid = pw->pw_uid;
-		}
-	}
-	if (config.c_ctdluid == 0) {
-		pw = getpwnam("guest");
-		if (pw != NULL) {
-			config.c_ctdluid = pw->pw_uid;
-		}
-	}
-	if (config.c_createax == 0) {
-		config.c_createax = 3;
-	}
-	/*
-	 * Negative values for maxsessions are not allowed.
-	 */
-	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.
-	 * By default, do not expire messages at all.
-	 */
-	if (config.c_ep.expire_mode == 0) {
-		config.c_ep.expire_mode = EXPIRE_MANUAL;
-		config.c_ep.expire_value = 0;
-	}
-
-	/*
-	 * Default port numbers for various services
-	 */
-	GetDefaultVALINT(c_smtp_port, 25);
-	GetDefaultVALINT(c_pop3_port, 110);
-	GetDefaultVALINT(c_imap_port, 143);
-	GetDefaultVALINT(c_msa_port, 587);
-	GetDefaultVALINT(c_smtps_port, 465);
-	GetDefaultVALINT(c_pop3s_port, 995);
-	GetDefaultVALINT(c_imaps_port, 993);
-	GetDefaultVALINT(c_pftcpdict_port, -1);
-	GetDefaultVALINT(c_managesieve_port, 2020);
-	GetDefaultVALINT(c_xmpp_c2s_port, 5222);
-	GetDefaultVALINT(c_xmpp_s2s_port, 5269);
-#endif
-}
-
-
 
 int main(int argc, char *argv[])
 {
@@ -1155,23 +1073,20 @@ int main(int argc, char *argv[])
 	int curr;
 	char buf[1024]; 
 	char aaa[128];
-	int info_only = 0;
-	int relh=0;
-	int home=0;
+	int relh = 0;
+	int home = 0;
 	char relhome[PATH_MAX]="";
 	char ctdldir[PATH_MAX]=CTDLDIR;
 	struct passwd *pw;
 	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)) {
@@ -1179,9 +1094,6 @@ int main(int argc, char *argv[])
 			strcpy(aaa, &aaa[2]);
 			setup_type = atoi(aaa);
 		}
-		else if (!strcmp(argv[a], "-i")) {
-			info_only = 1;
-		}
 		else if (!strcmp(argv[a], "-q")) {
 			setup_type = UI_SILENT;
 		}
@@ -1206,18 +1118,11 @@ int main(int argc, char *argv[])
 	if (setup_type < 0) {
 		setup_type = discover_ui();
 	}
-	if (info_only == 1) {
-		important_message(_("Citadel Setup"), CITADEL);
-		exit(0);
-	}
 
 	enable_home = ( relh | home );
 
 	if (chdir(ctdl_run_dir) != 0) {
-		display_error(_("Citadel Setup"), 
-			      "%s: [%s]\n", 
-			      _("The directory you specified does not exist"), 
-			      ctdl_run_dir);
+		display_error("%s: [%s]\n", _("The directory you specified does not exist"), ctdl_run_dir);
 		exit(errno);
 	}
 
@@ -1225,11 +1130,19 @@ int main(int argc, char *argv[])
 	/*
 	 * Connect to the running Citadel server.
 	 */
-        serv_sock = uds_connectsock(file_citadel_admin_socket);
+	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);
+
 	if (serv_sock < 0) { 
 		display_error(
-			"%s\n", 
-			_("Setup could not connect to a running Citadel server.")
+			"%s: %s %s\n", 
+			_("Setup could not connect to a running Citadel server."),
+			strerror(errno), file_citadel_admin_socket
 		);
 		exit(1);
 	}
@@ -1265,79 +1178,88 @@ int main(int argc, char *argv[])
 		++a;
 	}
 
-	/*
-	 * Load the server's configuration
-	 */
-	serv_puts("CONF GET");
-	serv_gets(buf);
-	if (buf[0] != '1') {
-		display_error("%s\n", buf);
-		exit(5);
-	}
-	memset(configs, 0, sizeof configs);
-	a = 0;
-	while (serv_gets(buf), strcmp(buf, "000")) {
-		if (a < NUM_CONFIGS) {
-			safestrncpy(configs[a], buf, sizeof(configs[a]));
-		}
-		++a;
-	}
-
-
 	/*
 	 * Now begin.
 	 */
 
-	/* _("Citadel Setup"),  */
 
 	if (setup_type == UI_TEXT) {
-		printf("\n\n\n"
-			"	       *** %s ***\n\n",
-			_("Citadel setup program")
-		);
+		printf("\n\n\n	       *** %s ***\n\n", program_title);
 	}
 
 	if (setup_type == UI_DIALOG) {
 		system("clear 2>/dev/null");
 	}
 
-	set_default_values();
-
 	/* Go through a series of dialogs prompting for config info */
 	for (curr = 1; curr < eMaxQuestions; ++curr) {
 		edit_value(curr);
-		if (	(curr == 6)
-			&& (atoi(configs[52]) != AUTHMODE_LDAP)
-			&& (atoi(configs[52]) != AUTHMODE_LDAP_AD)
+
+		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 */
 		}
-	}
 
-	//config.c_setup_level = REV_LEVEL;
+		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 ((pw = getpwuid(atoi(configs[69]))) == NULL) {
+	if ((pw = getpwuid( getconf_int("c_ctdluid") )) == NULL) {
 		gid = getgid();
 	} else {
 		gid = pw->pw_gid;
 	}
 
-	create_run_directories(atoi(configs[69]), gid);
-
+	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, NUM_CONFIGS+1);
+	progress(activity, 0, 5);
 	sleep(1);					/* Let the message appear briefly */
-	serv_puts("CONF SET");
+
+	/*
+	 * Create the administrator account.  It's ok if the command fails if this user already exists.
+	 */
+	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);
-	if (buf[0] == '4') {
-		for (i=0; i<NUM_CONFIGS; ++i) {
-			progress(activity, i+1, NUM_CONFIGS+1);
-			serv_puts(configs[i]);
-		}
-		serv_puts("000");
+	progress(activity, 3, 5);
+
+	/*
+	 * Assign the desired password and access level to the administrator account.
+	 */
+	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);
 	}
-	sleep(1);					/* Let the message appear briefly */
-	progress(activity, NUM_CONFIGS+1, NUM_CONFIGS+1);
+	progress(activity, 5, 5);
 
 #ifndef __CYGWIN__
 	check_xinetd_entry();	/* Check /etc/xinetd.d/telnet */
@@ -1345,13 +1267,6 @@ int main(int argc, char *argv[])
 	fixnss();		/* Check for the 'db' nss and offer to disable it */
 #endif
 
-	activity = _("Setting file permissions");
-	progress(activity, 0, 2);
-	//chown(file_citadel_config, config.c_ctdluid, gid);
-	progress(activity, 1, 2);
-	chmod(file_citadel_config, S_IRUSR | S_IWUSR);
-	progress(activity, 2, 2);
-
 	/*
 	 * Restart citserver
 	 */
@@ -1374,12 +1289,12 @@ int main(int argc, char *argv[])
 	close(serv_sock);
 	serv_sock = (-1);
 
-	for (i=3; i<=6; ++i) {
+	for (i=3; i<=6; ++i) {					/* wait for server to shut down */
 		progress(activity, i, 41);
 		sleep(1);
 	}
 
-	for (i=7; ((i<=38) && (serv_sock < 0)) ; ++i) {
+	for (i=7; ((i<=38) && (serv_sock < 0)) ; ++i) {		/* wait for server to start up */
 		progress(activity, i, 41);
         	serv_sock = uds_connectsock(file_citadel_admin_socket);
 		sleep(1);
@@ -1396,10 +1311,10 @@ int main(int argc, char *argv[])
 	close(serv_sock);
 	progress(activity, 41, 41);
 
-	if (original_start_time == new_start_time) {
-		display_error("%s\n",
-			_("Setup failed to restart Citadel server.  Please restart it manually.")
-		);
+	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);
 	}