X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Futils%2Fsetup.c;h=1cbc777417dee56b5904c6171802006723da7260;hp=eec27947fe5e7e5338c3d3ca8d67919540d382a6;hb=51834f3a61644b1f6f5a5f528cf36fbfbc73b2de;hpb=b768970c892b1d382fc9b2bf946757882e939214 diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c index eec27947f..1cbc77741 100644 --- a/citadel/utils/setup.c +++ b/citadel/utils/setup.c @@ -1,7 +1,7 @@ /* * Citadel setup utility * - * Copyright (c) 1987-2014 by the citadel.org team + * Copyright (c) 1987-2019 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. @@ -36,9 +36,6 @@ #include "axdefs.h" #include "sysdep.h" #include "citadel_dirs.h" -#if HAVE_BACKTRACE -#include -#endif #ifdef ENABLE_NLS #ifdef HAVE_XLOCALE_H @@ -51,10 +48,6 @@ #define _(string) (string) #endif -#define UI_TEXT 0 /* Default setup type -- text only */ -#define UI_DIALOG 2 /* Use the 'whiptail' or 'dialog' program */ -#define UI_SILENT 3 /* Silent running, for use in scripts */ - #define SERVICE_NAME "citadel" #define PROTO_NAME "tcp" #define NSSCONF "/etc/nsswitch.conf" @@ -73,7 +66,7 @@ typedef enum _SetupStep { eLDAP_Bind_DN = 10, eLDAP_Bind_PW = 11, eMaxQuestions = 12 -} eSteupStep; +} eSetupStep; ///"CREATE_XINETD_ENTRY"; /* Environment variables, don't translate! */ @@ -93,12 +86,11 @@ 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]; @@ -116,7 +108,6 @@ void SetTitles(void) #ifdef ENABLE_NLS setlocale(LC_MESSAGES, getenv("LANG")); - bindtextdomain("citadel-setup", LOCALEDIR"/locale"); textdomain("citadel-setup"); bind_textdomain_codeset("citadel-setup","UTF8"); @@ -193,8 +184,8 @@ void SetTitles(void) "\n" " 0. Self contained authentication\n" " 1. Host system integrated authentication\n" -" 2. External LDAP - RFC 2307 compliant directory\n" -" 3. External LDAP - nonstandard MS Active Directory\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" @@ -239,128 +230,53 @@ 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 -} - - -void title(const 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); - } +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); } - -int yesno(const char *question, int default_value) -{ - int i = 0; +int yesno(const char *question, int default_value) { int answer = 0; char buf[SIZ]; - switch (setup_type) { - - case UI_TEXT: - 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; - } + 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; } - } while ((answer < 0) || (answer > 1)); - break; - - case UI_DIALOG: - 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); - if (i == 0) { - answer = 1; - } - else { - answer = 0; } - break; - case UI_SILENT: - break; - } + } while ((answer < 0) || (answer > 1)); return (answer); } -void important_message(const char *title, const char *msgtext) -{ +void important_message(const char *title, const char *msgtext) { 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("%s", _("Press return to continue...")); - if (fgets(buf, sizeof buf, stdin)) - {;} - break; - - case UI_DIALOG: - 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) { - fprintf(stderr, _("failed to run the dialog command\n")); - } - break; - case UI_SILENT: - fprintf(stderr, "%s\n", msgtext); - break; + 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)) { + ; } } -void important_msgnum(int msgnum) -{ + +void important_msgnum(int msgnum) { important_message(_("Important Message"), setup_text[msgnum]); } -void display_error(char *error_message_format, ...) -{ + +void display_error(char *error_message_format, ...) { StrBuf *Msg; va_list arg_ptr; @@ -373,80 +289,38 @@ void display_error(char *error_message_format, ...) FreeStrBuf(&Msg); } -void progress(char *text, long int curr, long int cmax) -{ + +void progress(char *text, long int curr, long int cmax) { static long dots_printed = 0L; long a = 0; - static FILE *fp = NULL; - char buf[SIZ]; - - switch (setup_type) { - - case UI_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); - break; - case UI_DIALOG: - if (curr == 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) { - fprintf(fp, "0\n"); - fflush(fp); - } - } - 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); - } + 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; } - break; - case UI_SILENT: - break; - - default: - assert(1==0); /* If we got here then the developer is a moron */ } + fflush(stdout); } - -int uds_connectsock(char *sockpath) -{ +int uds_connectsock(char *sockpath) { int s; struct sockaddr_un addr; memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, sockpath, sizeof addr.sun_path); + strcpy(addr.sun_path, sockpath); s = socket(AF_UNIX, SOCK_STREAM, 0); if (s < 0) { @@ -465,8 +339,7 @@ int uds_connectsock(char *sockpath) /* * input binary data from socket */ -void serv_read(char *buf, int bytes) -{ +void serv_read(char *buf, int bytes) { int len, rlen; len = 0; @@ -483,8 +356,7 @@ void serv_read(char *buf, int bytes) /* * send binary to server */ -void serv_write(char *buf, int nbytes) -{ +void serv_write(char *buf, int nbytes) { int bytes_written = 0; int retval; while (bytes_written < nbytes) { @@ -497,12 +369,10 @@ void serv_write(char *buf, int nbytes) } - /* * input string from socket - implemented in terms of serv_read() */ -void serv_gets(char *buf) -{ +void serv_gets(char *buf) { int i; /* Read one character at a time. @@ -530,18 +400,62 @@ void serv_gets(char *buf) /* * send line to server - implemented in terms of serv_write() */ -void serv_puts(char *buf) -{ +void serv_puts(char *buf) { serv_write(buf, strlen(buf)); serv_write("\n", 1); } +/* + * 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]; @@ -591,176 +505,56 @@ void check_xinetd_entry(void) { " server_args = -h -L %s/citadel\n" " log_on_failure += USERID\n" "}\n", - ctdl_bin_dir); + ctdl_bin_dir + ); fclose(fp); - /* Now try to restart the service */ - rv = system("/etc/init.d/xinetd restart >/dev/null 2>&1"); + /* Now try to restart the service. This will not have the intended effect on Solaris, but who the hell uses Solaris anymore? */ + rv = system("systemctl restart xinetd >/dev/null 2>&1"); if (rv != 0) { - display_error(_("failed to restart xinetd.\n")); - } -} - - - -/* - * Offer to disable other MTA's - */ -void disable_other_mta(const char *mta) { - char buf[SIZ]; - FILE *fp; - int lines = 0; - int rv; - - 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 - ); - fp = popen(buf, "r"); - if (fp == NULL) return; - - while (fgets(buf, sizeof buf, fp) != NULL) { - ++lines; + 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, - "%s \"%s\" %s%s%s%s%s%s%s", - _("You appear to have the "), - mta, - _(" email program\n" - "running on your system. If you want Citadel mail\n" - "connected with "), - mta, - _(" you will have to manually integrate\n" - "them. It is preferable to disable "), - mta, - _(", and use Citadel's\n" - "SMTP, POP3, and IMAP services.\n\n" - "May we disable "), - mta, - _("so that Citadel has access to ports\n" - "25, 110, and 143?\n") - ); - if (yesno(buf, 1) == 0) { - return; + if (rv != 0) { + display_error(_("failed to restart xinetd.\n")); } - - - 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); - - 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); } -const char *other_mtas[] = { - "courier-authdaemon", - "courier-imap", - "courier-imap-ssl", - "courier-pop", - "courier-pop3", - "courier-pop3d", - "cyrmaster", - "cyrus", - "dovecot", - "exim", - "exim4", - "imapd", - "mta", - "pop3d", - "popd", - "postfix", - "qmail", - "saslauthd", - "sendmail", - "vmailmgrd", - "" -}; void disable_other_mtas(void) { - int i = 0; - if ((getenv("ACT_AS_MTA") == NULL) || - (getenv("ACT_AS_MTA") && - strcasecmp(getenv("ACT_AS_MTA"), "yes") == 0)) { + 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. */ - while (!IsEmptyStr(other_mtas[i])) - { - disable_other_mta(other_mtas[i]); - i++; - } + /* FIXME this has to be rewritten to work in the new systemd-based world. */ } } + void strprompt(const char *prompt_title, const char *prompt_text, char *Target, char *DefValue) { char buf[SIZ] = ""; char setupmsg[SIZ]; - char dialog_result[PATH_MAX]; - FILE *fp = NULL; - int rv; strcpy(setupmsg, ""); - switch (setup_type) { - case UI_TEXT: - 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 (!IsEmptyStr(buf)) - strcpy(Target, buf); - break; - - case UI_DIALOG: - CtdlMakeTempFileName(dialog_result, sizeof dialog_result); - 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); - rv = system(buf); - if (rv != 0) { - fprintf(stderr, "failed to run whiptail or dialog\n"); - } - - fp = fopen(dialog_result, "r"); - if (fp != NULL) { - if (fgets(Target, sizeof buf, fp)) { - if (Target[strlen(Target)-1] == 10) { - Target[strlen(Target)-1] = 0; - } - } - fclose(fp); - unlink(dialog_result); - } - break; - case UI_SILENT: - if (*DefValue != '\0') - strcpy(Target, DefValue); - break; + 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 (!IsEmptyStr(buf)) { + strcpy(Target, buf); } } -void set_bool_val(int msgpos, int *ip, char *DefValue) -{ + +void set_bool_val(int msgpos, int *ip, char *DefValue) { title(setup_titles[msgpos]); *ip = yesno(setup_text[msgpos], *ip); } + void set_str_val(int msgpos, char *Target, char *DefValue) { strprompt(setup_titles[msgpos], @@ -770,157 +564,123 @@ 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]); - } - 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)); - } + ctdluid = getconf_int("c_ctdluid"); + pw = getpwuid(ctdluid); + if (pw == NULL) { + set_int_val(curr, &ctdluid, default_value); } - else - { -#ifdef __CYGWIN__ - strcpy(configs[69], "0"); /* work-around for Windows */ -#else - i = atoi(configs[69]); - pw = getpwuid(i); - if (pw == NULL) { - set_int_val(curr, configs[69], Value); - sprintf(configs[69], "%d", i); + else { + strcpy(ctdluidname, pw->pw_name); + set_str_val(curr, ctdluidname, default_value); + pw = getpwnam(ctdluidname); + if (pw != NULL) { + ctdluid = pw->pw_uid; } - else { - strcpy(ctdluidname, pw->pw_name); - set_str_val(curr, ctdluidname, Value); - pw = getpwnam(ctdluidname); - if (pw != NULL) { - sprintf(configs[69], "%d", pw->pw_uid); - } - else if (atoi(ctdluidname) > 0) { - sprintf(configs[69], "%d", atoi(ctdluidname)); - } + else if (atoi(ctdluidname) > 0) { + 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: - 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; - } - } - } - else { - set_int_val(curr, configs[52], Value); - } + auth = getconf_int("c_auth_mode"); + 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; - - } -} - - - -/* - * Figure out what type of user interface we're going to use - */ -int discover_ui(void) -{ - - /* Use "whiptail" or "dialog" if we have it */ - if (getenv("CTDL_DIALOG") != NULL) { - return UI_DIALOG; } - - return UI_TEXT; } - /* * Strip "db" entries out of /etc/nsswitch.conf */ @@ -1011,72 +771,32 @@ 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" - "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.")); +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 - -#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); - } -} - - - int main(int argc, char *argv[]) { int a, i; int curr; char buf[1024]; char aaa[128]; - int info_only = 0; int relh = 0; int home = 0; - int nRetries = 0; char relhome[PATH_MAX]=""; char ctdldir[PATH_MAX]=CTDLDIR; struct passwd *pw; @@ -1089,11 +809,6 @@ int main(int argc, char *argv[]) /* 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)) { @@ -1101,12 +816,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; - } else if (!strncmp(argv[a], "-h", 2)) { relh=argv[a][2]!='/'; if (!relh) { @@ -1116,29 +825,15 @@ int main(int argc, char *argv[]) } home = 1; } - } calc_dirs_n_files(relh, home, relhome, ctdldir, 0); SetTitles(); - /* 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); - exit(0); - } - enable_home = ( relh | home ); if (chdir(ctdl_run_dir) != 0) { - display_error("%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); } @@ -1146,12 +841,14 @@ int main(int argc, char *argv[]) /* * Connect to the running Citadel server. */ - while ((serv_sock < 0) && (nRetries < 10)) { + 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); - nRetries ++; - if (serv_sock < 0) - sleep(1); + sleep(1); } + progress(connectingmsg, 30, 30); + if (serv_sock < 0) { display_error( "%s: %s %s\n", @@ -1192,53 +889,23 @@ 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", program_title); - } - - if (setup_type == UI_DIALOG) { - system("clear 2>/dev/null"); - } + printf("\n\n\n *** %s ***\n\n", program_title); /* 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 */ } if (curr == eSysAdminName) { - if (atoi(configs[52]) == AUTHMODE_NATIVE) { + if (getconf_int("c_auth_mode") == AUTHMODE_NATIVE) { /* for native auth mode, fetch the admin's existing pw */ - snprintf(buf, sizeof buf, "AGUP %s", configs[13]); + snprintf(buf, sizeof buf, "AGUP %s", admin_name); serv_puts(buf); serv_gets(buf); if (buf[0] == '2') { @@ -1251,85 +918,70 @@ int main(int argc, char *argv[]) } } - if ((pw = getpwuid(atoi(configs[69]))) == NULL) { + if ((pw = getpwuid( getconf_int("c_ctdluid") )) == NULL) { gid = getgid(); } else { gid = pw->pw_gid; } - if (create_run_directories(atoi(configs[69]), gid) != 0) { - display_error("%s\n", - _("failed to create directories")); + 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+3); - sleep(1); /* Let the message appear briefly */ - serv_puts("CONF SET"); - serv_gets(buf); - if (buf[0] == '4') { - for (i=0; i