From: Art Cancro Date: Fri, 27 Jan 2012 16:38:34 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.11~217 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=dbebe0b18421f635c0cded24c7194be47b03bc9d;hp=f76f3c0605ef8837dbba97014c1381365f3a82ba Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- diff --git a/citadel/citadel.h b/citadel/citadel.h index 8c58ff58d..cdc0a6b7e 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -232,6 +232,9 @@ enum { #define GF_SKIP 1 /* <;S>kip floor mode */ #define GF_ZAP 2 /* <;Z>ap floor mode */ +/* number of items which may be handled by the CONF command */ +#define NUM_CONFIGS 70 + /* * MIME types used in Citadel for configuration stuff */ diff --git a/citadel/citserver.c b/citadel/citserver.c index 2cca2f8db..782f6a99b 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -346,9 +346,9 @@ void cmd_time(char *argbuf) /* timezone and daylight global variables are not portable. */ #ifdef HAVE_STRUCT_TM_TM_GMTOFF - cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, tmp.tm_gmtoff, tmp.tm_isdst); + cprintf("%d %ld|%ld|%d|%ld\n", CIT_OK, (long)tv, tmp.tm_gmtoff, tmp.tm_isdst, server_startup_time); #else - cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, tmp.tm_isdst); + cprintf("%d %ld|%ld|%d|%ld\n", CIT_OK, (long)tv, timezone, tmp.tm_isdst, server_startup_time); #endif } diff --git a/citadel/config.c b/citadel/config.c index 303e06d4b..60806b1b7 100644 --- a/citadel/config.c +++ b/citadel/config.c @@ -106,17 +106,6 @@ void get_config(void) { } #endif - /* Check to see whether 'setup' must first be run to update data file formats */ - if (config.c_setup_level < REV_MIN) { - fprintf(stderr, "Your data files are out of date. Run setup to update them.\n"); - fprintf(stderr, " This program requires level %d.%02d\n", - (REV_LEVEL / 100), (REV_LEVEL % 100)); - fprintf(stderr, " Data files are currently at %d.%02d\n", - (config.c_setup_level / 100), - (config.c_setup_level % 100)); - exit(CTDLEXIT_OOD); - } - /* Default maximum message length is 10 megabytes. This is site * configurable. Also check to make sure the limit has not been * set below 8192 bytes. diff --git a/citadel/control.c b/citadel/control.c index 6ba0f8fe1..bd4136635 100644 --- a/citadel/control.c +++ b/citadel/control.c @@ -1,21 +1,15 @@ /* * This module handles states which are global to the entire server. * - * Copyright (c) 1987-2010 by the citadel.org team + * Copyright (c) 1987-2012 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -427,6 +421,8 @@ void cmd_conf(char *argbuf) cprintf("%ld\n", config.c_pop3_fastest); cprintf("%d\n", config.c_spam_flag_only); cprintf("%d\n", config.c_guest_logins); + cprintf("%d\n", config.c_port_number); + cprintf("%d\n", config.c_ctdluid); cprintf("000\n"); } @@ -686,6 +682,12 @@ void cmd_conf(char *argbuf) case 67: config.c_guest_logins = atoi(buf); break; + case 68: + config.c_port_number = atoi(buf); + break; + case 69: + config.c_ctdluid = atoi(buf); + break; } ++a; } diff --git a/citadel/include/dtds/config-defs.h b/citadel/include/dtds/config-defs.h index cb082da33..3574dd912 100644 --- a/citadel/include/dtds/config-defs.h +++ b/citadel/include/dtds/config-defs.h @@ -21,11 +21,11 @@ CFG_VALUE(CHAR(c_twitdetect), " twit detect flag "); CFG_VALUE(STRING_BUF(c_twitroom, ROOMNAMELEN), " twit detect msg move to room "); CFG_VALUE(STRING_BUF(c_moreprompt, 80), " paginator prompt "); CFG_VALUE(CHAR(c_restrict), " restrict internet mail flag "); -NO_ARTV(CFG_VALUE(LONG(c_niu_1), " (not in use) ")); /////// +NO_ARTV(CFG_VALUE(LONG(c_niu_1), " (not in use) ")); CFG_VALUE(STRING_BUF(c_site_location, 32), " physical location of server "); CFG_VALUE(STRING_BUF(c_sysadm, 26), " name of system administrator "); NO_ARTV(CFG_VALUE(STRING_BUF(c_niu_2, 15), " (not in use) ")); -CFG_VALUE(INTEGER(c_setup_level), " what rev level we've setup to "); +CFG_VALUE(INTEGER(c_setup_level), " (not in use) "); CFG_VALUE(INTEGER(c_maxsessions), " maximum concurrent sessions "); /* c_ip_addr is out of sortorder; its located after c_ldap_bind_pw in the old export */ CFG_VALUE(STRING_BUF(c_ip_addr, 20), " IP address to listen on "); diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c index d1d6d04b9..ddf52aeea 100644 --- a/citadel/modules/migrate/serv_migrate.c +++ b/citadel/modules/migrate/serv_migrate.c @@ -1,21 +1,15 @@ /* * This module dumps and/or loads the Citadel database in XML format. * - * Copyright (c) 1987-2010 by the citadel.org team + * Copyright (c) 1987-2012 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -55,12 +49,8 @@ #include "user_ops.h" #include "control.h" #include "euidindex.h" - - #include "ctdl_module.h" - - #define END_OF_MESSAGE "---eom---dbd---" char migr_tempfilename1[PATH_MAX]; @@ -68,14 +58,10 @@ char migr_tempfilename2[PATH_MAX]; FILE *migr_global_message_list; - - /* * Code which implements the export appears in this section */ - - /* * Output a string to the client with these characters escaped: & < > */ @@ -421,7 +407,6 @@ void migr_do_export(void) { cprintf("%d\n", config.c_restrict); client_write("", 17); xml_strout(config.c_site_location); client_write("\n", 19); client_write("", 10); xml_strout(config.c_sysadm); client_write("\n", 12); - cprintf("%d\n", config.c_setup_level); cprintf("%d\n", config.c_maxsessions); client_write("", 11); xml_strout(config.c_ip_addr); client_write("\n", 13); cprintf("%d\n", config.c_port_number); @@ -656,7 +641,6 @@ void migr_xml_end(void *data, const char *el) { else if (!strcasecmp(el, "c_restrict")) config.c_restrict = atoi(migr_chardata); else if (!strcasecmp(el, "c_site_location")) safestrncpy(config.c_site_location, migr_chardata, sizeof config.c_site_location); else if (!strcasecmp(el, "c_sysadm")) safestrncpy(config.c_sysadm, migr_chardata, sizeof config.c_sysadm); - else if (!strcasecmp(el, "c_setup_level")) config.c_setup_level = atoi(migr_chardata); else if (!strcasecmp(el, "c_maxsessions")) config.c_maxsessions = atoi(migr_chardata); else if (!strcasecmp(el, "c_ip_addr")) safestrncpy(config.c_ip_addr, migr_chardata, sizeof config.c_ip_addr); else if (!strcasecmp(el, "c_port_number")) config.c_port_number = atoi(migr_chardata); diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c index 8e7ef3455..3e8ad1e74 100644 --- a/citadel/modules/upgrade/serv_upgrade.c +++ b/citadel/modules/upgrade/serv_upgrade.c @@ -21,6 +21,7 @@ #include #include #include +#include #if TIME_WITH_SYS_TIME # include @@ -48,12 +49,9 @@ #include "msgbase.h" #include "serv_upgrade.h" #include "euidindex.h" - - #include "ctdl_module.h" - /* * Fix up the name for Citadel user 0 and try to remove any extra users with number 0 */ @@ -256,6 +254,82 @@ void guess_time_zone(void) { } +/* + * Put some sane default values into our configuration. Some will be overridden when we run setup. + */ +void brand_new_installation_set_defaults(void) { + + 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... */ + char c_nodename[256]; + safestrncpy(c_nodename, my_utsname.nodename, sizeof c_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); + } + } + + safestrncpy(config.c_humannode, "Citadel Server", sizeof config.c_humannode); + safestrncpy(config.c_phonenum, "US 800 555 1212", sizeof config.c_phonenum); + config.c_initax = 4; + safestrncpy(config.c_moreprompt, "", sizeof config.c_moreprompt); + safestrncpy(config.c_twitroom, "Trashcan", sizeof config.c_twitroom); + safestrncpy(config.c_baseroom, BASEROOM, sizeof config.c_baseroom); + safestrncpy(config.c_aideroom, "Aide", sizeof config.c_aideroom); + config.c_port_number = 504; + config.c_sleeping = 900; + config.c_instant_expunge = 1; + + 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; + } + + /* + * Default port numbers for various services + */ + config.c_smtp_port = 25; + config.c_pop3_port = 110; + config.c_imap_port = 143; + config.c_msa_port = 587; + config.c_smtps_port = 465; + config.c_pop3s_port = 995; + config.c_imaps_port = 993; + config.c_pftcpdict_port = -1 ; + config.c_managesieve_port = 2020; + config.c_xmpp_c2s_port = 5222; + config.c_xmpp_s2s_port = 5269; +} + + + /* * Perform any upgrades that can be done automatically based on our knowledge of the previous * version of Citadel server that was running here. @@ -266,7 +340,7 @@ void update_config(void) { get_config(); if (CitControl.version == 0) { - config.c_instant_expunge = 1; + brand_new_installation_set_defaults(); } if (CitControl.version < 606) { @@ -353,6 +427,23 @@ void check_server_upgrades(void) { remove_thread_users(); } CitControl.version = REV_LEVEL; + + /* + * 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; + } + put_control(); } diff --git a/citadel/textclient/tuiconfig.c b/citadel/textclient/tuiconfig.c index 60c1ada10..df5c43bd5 100644 --- a/citadel/textclient/tuiconfig.c +++ b/citadel/textclient/tuiconfig.c @@ -1,6 +1,15 @@ /* * Configuration screens that are part of the text mode client. * + * Copyright (c) 1987-2012 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. */ #include @@ -62,7 +71,7 @@ extern int screenwidth; void do_system_configuration(CtdlIPC *ipc) { -#define NUM_CONFIGS 68 + /* NUM_CONFIGS is now defined in citadel.h */ char buf[256]; char sc[NUM_CONFIGS][256]; @@ -355,8 +364,9 @@ void do_system_configuration(CtdlIPC *ipc) scr_printf("Save this configuration? "); if (yesno()) { r = 1; - for (a = 0; a < NUM_CONFIGS; a++) + for (a = 0; a < NUM_CONFIGS; a++) { r += 1 + strlen(sc[a]); + } resp = (char *)calloc(1, r); if (!resp) { scr_printf("Can't save config - out of memory!\n"); diff --git a/citadel/user_ops.c b/citadel/user_ops.c index 7d4088c56..29b6f621f 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -2102,18 +2102,18 @@ CTDL_MODULE_INIT(user_ops) CtdlRegisterProtoHook(cmd_invt, "INVT", "Invite a user to a room"); CtdlRegisterProtoHook(cmd_kick, "KICK", "Kick a user out of a room"); CtdlRegisterProtoHook(cmd_forg, "FORG", "Forget a room"); - CtdlRegisterProtoHook(cmd_gnur, "GNUR", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_gnur, "GNUR", "Get Next Unregistered User"); CtdlRegisterProtoHook(cmd_vali, "VALI", "Validate new users"); CtdlRegisterProtoHook(cmd_list, "LIST", "List users"); - CtdlRegisterProtoHook(cmd_chek, "CHEK", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_qusr, "QUSR", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_agup, "AGUP", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_asup, "ASUP", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_seen, "SEEN", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_gtsn, "GTSN", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_view, "VIEW", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_renu, "RENU", "Autoconverted. TODO: document me."); - CtdlRegisterProtoHook(cmd_newu, "NEWU", "Autoconverted. TODO: document me."); + CtdlRegisterProtoHook(cmd_chek, "CHEK", "assorted info we need to check at login"); + CtdlRegisterProtoHook(cmd_qusr, "QUSR", "check to see if a user exists"); + CtdlRegisterProtoHook(cmd_agup, "AGUP", "Administratively Get User Parameters"); + CtdlRegisterProtoHook(cmd_asup, "ASUP", "Administratively Set User Parameters"); + CtdlRegisterProtoHook(cmd_seen, "SEEN", "Manipulate seen/unread message flags"); + CtdlRegisterProtoHook(cmd_gtsn, "GTSN", "Fetch seen/unread message flags"); + CtdlRegisterProtoHook(cmd_view, "VIEW", "Set preferred view for user/room combination"); + CtdlRegisterProtoHook(cmd_renu, "RENU", "Rename a user"); + CtdlRegisterProtoHook(cmd_newu, "NEWU", "Log in as a new user"); } /* return our Subversion id for the Log */ return "user_ops"; diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c index 326564bcd..98fab1fd6 100644 --- a/citadel/utils/setup.c +++ b/citadel/utils/setup.c @@ -3,8 +3,8 @@ * * Copyright (c) 1987-2012 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 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 @@ -13,7 +13,6 @@ */ #define SHOW_ME_VAPPEND_PRINTF -#include "ctdl_module.h" #include #include #include @@ -22,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -30,11 +28,13 @@ #include #include #include +#include +#include +#include #include #include "citadel.h" #include "axdefs.h" #include "sysdep.h" -#include "config.h" #include "citadel_dirs.h" #if HAVE_BACKTRACE #include @@ -51,18 +51,14 @@ #define _(string) (string) #endif - -#define MAXSETUP 11 /* 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_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" - typedef enum _SetupStep { eCitadelHomeDir = 0, eSysAdminName = 1, @@ -96,11 +92,13 @@ const char *EnvNames [eMaxQuestions] = { "LDAP_BIND_PW" }; -int setup_type; +int setup_type = (-1); int using_web_installer = 0; int enable_home = 1; 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]; @@ -218,11 +216,7 @@ void SetTitles(void) 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." -"Please enter the DN of an account to use for binding to the LDAP server\n" -"for performing queries. The account does not require any other\n" -"privileges. If your LDAP server allows anonymous queries, you can\n" -"leave this blank.\n"); +"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] = _( @@ -266,18 +260,9 @@ void cit_backtrace(void) #endif } -struct config config; int direction; -void cleanup(int exitcode) -{ -// printf("Exitcode: %d\n", exitcode); -// cit_backtrace(); - exit(exitcode); -} - - void title(const char *text) { @@ -306,18 +291,21 @@ int yesno(const char *question, int default_value) if (fgets(buf, sizeof buf, stdin)) { answer = tolower(buf[0]); - if ((buf[0]==0) || (buf[0]==13) || (buf[0]==10)) + if ((buf[0]==0) || (buf[0]==13) || (buf[0]==10)) { answer = default_value; - else if (answer == 'y') + } + else if (answer == 'y') { answer = 1; - else if (answer == 'n') + } + else if (answer == 'n') { answer = 0; + } } } while ((answer < 0) || (answer > 1)); break; case UI_DIALOG: - sprintf(buf, "exec %s %s --yesno '%s' 15 75", + snprintf(buf, sizeof buf, "exec %s %s --yesno '%s' 15 75", getenv("CTDL_DIALOG"), ( default_value ? "" : "--defaultno" ), question); @@ -331,7 +319,6 @@ int yesno(const char *question, int default_value) break; case UI_SILENT: break; - } return (answer); } @@ -340,7 +327,6 @@ int yesno(const char *question, int default_value) void important_message(const char *title, const char *msgtext) { char buf[SIZ]; - int rv; switch (setup_type) { @@ -352,12 +338,13 @@ void important_message(const char *title, const char *msgtext) break; case UI_DIALOG: - sprintf(buf, "exec %s --msgbox '%s' 19 72", + snprintf(buf, sizeof buf, "exec %s --msgbox '%s' 19 72", getenv("CTDL_DIALOG"), msgtext); - rv = system(buf); - if (rv != 0) + 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); @@ -398,7 +385,6 @@ void progress(char *text, long int curr, long int cmax) printf("%s\n", text); printf("...................................................."); printf("..........................\r"); - fflush(stdout); dots_printed = 0; } else if (curr == cmax) { printf("\r%79s\n", ""); @@ -409,14 +395,14 @@ void progress(char *text, long int curr, long int cmax) while (dots_printed < a) { printf("*"); ++dots_printed; - fflush(stdout); } } + fflush(stdout); break; case UI_DIALOG: if (curr == 0) { - sprintf(buf, "exec %s --gauge '%s' 7 72 0", + snprintf(buf, sizeof buf, "exec %s --gauge '%s' 7 72 0", getenv("CTDL_DIALOG"), text); fp = popen(buf, "w"); @@ -443,236 +429,110 @@ void progress(char *text, long int curr, long int cmax) case UI_SILENT: break; + default: + assert(1==0); /* If we got here then the developer is a moron */ } } -/* - * check_services_entry() -- Make sure "citadel" is in /etc/services - * - */ -void check_services_entry(void) +int uds_connectsock(char *sockpath) { - int i; - FILE *sfp; - char errmsg[256]; - - if (getservbyname(SERVICE_NAME, PROTO_NAME) == NULL) { - for (i=0; i<=2; ++i) { - progress(_("Adding service entry..."), i, 2); - if (i == 0) { - sfp = fopen("/etc/services", "a"); - if (sfp == NULL) { - sprintf(errmsg, "%s /etc/services: %s", _("Cannot open"), strerror(errno)); - display_error(errmsg); - } else { - fprintf(sfp, "%s 504/tcp\n", SERVICE_NAME); - fclose(sfp); - } - } - } + 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); + + s = socket(AF_UNIX, SOCK_STREAM, 0); + if (s < 0) { + return(-1); } -} + if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { + close(s); + return(-1); + } + return s; +} /* - * delete_inittab_entry() -- Remove obsolete /etc/inittab entry for Citadel + * input binary data from socket */ -void delete_inittab_entry(void) +void serv_read(char *buf, int bytes) { - FILE *infp; - FILE *outfp; - char looking_for[256]; - char buf[1024]; - char outfilename[32]; - int changes_made = 0; - int rv; + int len, rlen; - /* Determine the fully qualified path name of citserver */ - snprintf(looking_for, sizeof looking_for, "%s/citserver", ctdl_sbin_dir); - - /* Now tweak /etc/inittab */ - infp = fopen("/etc/inittab", "r"); - if (infp == NULL) { - - /* If /etc/inittab does not exist, return quietly. - * Not all host platforms have it. - */ - if (errno == ENOENT) { + len = 0; + while (len < bytes) { + rlen = read(serv_sock, &buf[len], bytes - len); + if (rlen < 1) { return; } - - /* Other errors might mean something really did go wrong. - */ - sprintf(buf, "%s /etc/inittab: %s", _("Cannot open"), strerror(errno)); - display_error(buf); - return; - } - - strcpy(outfilename, "/tmp/ctdlsetup.XXXXXX"); - outfp = fdopen(mkstemp(outfilename), "w+"); - if (outfp == NULL) { - sprintf(buf, "%s %s: %s", _("Cannot open"), outfilename, strerror(errno)); - display_error(buf); - fclose(infp); - return; - } - - while (fgets(buf, sizeof buf, infp) != NULL) { - if (strstr(buf, looking_for) != NULL) { - rv = fwrite("#", 1, 1, outfp); - if (rv == -1) - { - display_error("%s %s\n", - _("failed to modify inittab"), - strerror(errno)); - } - ++changes_made; - } - rv = fwrite(buf, strlen(buf), 1, outfp); - if (rv == -1) - { - display_error("%s %s\n", _("failed to modify inittab"), strerror(errno)); - } - } - - fclose(infp); - fclose(outfp); - - if (changes_made) { - sprintf(buf, "/bin/mv -f %s /etc/inittab 2>/dev/null", outfilename); - rv = system(buf); - rv = system("/sbin/init q 2>/dev/null"); - } - else { - unlink(outfilename); + len = len + rlen; } } /* - * install_init_scripts() -- Try to configure to start Citadel at boot + * send binary to server */ -void install_init_scripts(void) +void serv_write(char *buf, int nbytes) { - struct stat etcinitd; - FILE *fp; - char *initfile = "/etc/init.d/citadel"; - char command[SIZ]; - int rv; - - if ( (stat("/etc/init.d/", &etcinitd) == -1) - && (errno == ENOENT) - ) { - if ( (stat("/etc/rc.d/init.d/", &etcinitd) == -1) - && (errno == ENOENT) - ) { - initfile = CTDLDIR"/citadel.init"; - } - else { - initfile = "/etc/rc.d/init.d/citadel"; - } - } - - fp = fopen(initfile, "r"); - if (fp != NULL) { - if (yesno(_("Citadel already appears to be configured to start at boot.\n" - "Would you like to keep your boot configuration as is?\n"), 1) == 1) { + int bytes_written = 0; + int retval; + while (bytes_written < nbytes) { + retval = write(serv_sock, &buf[bytes_written], nbytes - bytes_written); + if (retval < 1) { return; } - fclose(fp); - + bytes_written = bytes_written + retval; } +} - if (yesno(_("Would you like to automatically start Citadel at boot?\n"), 1) == 0) { - return; - } - fp = fopen(initfile, "w"); - if (fp == NULL) { - display_error("%s /etc/init.d/citadel", _("Cannot create")); - return; - } - - fprintf(fp, "#!/bin/sh\n" - "#\n" - "# Init file for Citadel\n" - "#\n" - "# chkconfig: - 79 30\n" - "# description: Citadel service\n" - "# processname: citserver\n" - "# pidfile: %s/citadel.pid\n\n" - "# uncomment this to create coredumps as described in\n" - "# http://www.citadel.org/doku.php/faq:mastering_your_os:gdb#how.do.i.make.my.system.produce.core-files\n" - "# ulimit -c unlimited\n" - "\n" - "CITADEL_DIR=%s\n" - , - ctdl_run_dir, - ctdl_sbin_dir - ); - fprintf(fp, "\n" - "test -d /var/run || exit 0\n" - "\n" - "case \"$1\" in\n" - "\n" - "start) echo -n \"Starting Citadel... \"\n" - " if $CITADEL_DIR/citserver -lmail -d\n" - " then\n" - " echo \"ok\"\n" - " else\n" - " echo \"failed\"\n" - " fi\n"); - fprintf(fp, " ;;\n" - "stop) echo -n \"Stopping Citadel... \"\n" - " if $CITADEL_DIR/sendcommand DOWN >/dev/null 2>&1 ; then\n" - " echo \"ok\"\n" - " else\n" - " echo \"failed\"\n" - " fi\n" - " rm -f %s/citadel.pid 2>/dev/null\n" - , - ctdl_run_dir - ); - fprintf(fp, " ;;\n" - "restart) if $CITADEL_DIR/sendcommand DOWN 1 >/dev/null 2>&1 ; then\n" - " echo \"ok\"\n" - " else\n" - " echo \"failed\"\n" - " fi\n" - " ;;\n" - "*) echo \"Usage: $0 {start|stop|restart}\"\n" - " exit 1\n" - " ;;\n" - "esac\n" - ); - fclose(fp); - chmod(initfile, 0755); +/* + * input string from socket - implemented in terms of serv_read() + */ +void serv_gets(char *buf) +{ + int i; - /* Set up the run levels. */ - rv = system("/bin/rm -f /etc/rc?.d/[SK]??citadel 2>/dev/null"); - if (rv != 0) { - display_error(_("failed to remove system V init links\n")); + /* Read one character at a time. + */ + for (i = 0;; i++) { + serv_read(&buf[i], 1); + if (buf[i] == '\n' || i == (SIZ-1)) + break; } - snprintf(command, sizeof(command), "for x in 2 3 4 5 ; do [ -d /etc/rc$x.d ] && ln -s %s /etc/rc$x.d/S79citadel ; done 2>/dev/null", initfile); - rv = system(command); - if (rv != 0) { - display_error(_("failed to set system V init links\n")); + /* If we got a long line, discard characters until the newline. + */ + if (i == (SIZ-1)) { + while (buf[i] != '\n') { + serv_read(&buf[i], 1); + } } - snprintf(command, sizeof(command),"for x in 0 6 S; do [ -d /etc/rc$x.d ] && ln -s %s /etc/rc$x.d/K30citadel ; done 2>/dev/null", initfile); - rv = system(command); - if (rv != 0) { - display_error(_("failed to set system V init links\n")); - } + /* Strip all trailing nonprintables (crlf) + */ + buf[i] = 0; } +/* + * send line to server - implemented in terms of serv_write() + */ +void serv_puts(char *buf) +{ + serv_write(buf, strlen(buf)); + serv_write("\n", 1); +} + /* * On systems which use xinetd, see if we can offer to install Citadel as @@ -689,7 +549,9 @@ void check_xinetd_entry(void) { if (fp == NULL) return; /* Not there. Oh well... */ while (fgets(buf, sizeof buf, fp) != NULL) { - if (strstr(buf, "/citadel") != NULL) already_citadel = 1; + if (strstr(buf, "/citadel") != NULL) { + already_citadel = 1; + } } fclose(fp); if (already_citadel) return; /* Already set up this way. */ @@ -731,8 +593,9 @@ void check_xinetd_entry(void) { /* Now try to restart the service */ rv = system("/etc/init.d/xinetd restart >/dev/null 2>&1"); - if (rv != 0) + if (rv != 0) { display_error(_("failed to restart xinetd.\n")); + } } @@ -746,9 +609,11 @@ void disable_other_mta(const char *mta) { int lines = 0; int rv; - sprintf(buf, "/bin/ls -l /etc/rc*.d/S*%s 2>/dev/null; " + 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); + mta, mta + ); fp = popen(buf, "r"); if (fp == NULL) return; @@ -758,7 +623,6 @@ void disable_other_mta(const char *mta) { fclose(fp); if (lines == 0) return; /* Nothing to do. */ - /* Offer to replace other MTA with the vastly superior Citadel :) */ snprintf(buf, sizeof buf, @@ -784,12 +648,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); @@ -834,53 +698,6 @@ void disable_other_mtas(void) } } -/* - * Check to see if our server really works. Returns 0 on success. - */ -int test_server(char *relhomestr, int relhome) { - 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. - */ - generate_uuid(cookie); - - if (relhome) { - sprintf(cmd, "%s/sendcommand -h%s ECHO %s 2>&1", - ctdl_sbin_dir, - relhomestr, - cookie - ); - } - else { - sprintf(cmd, "%s/sendcommand ECHO %s 2>&1", - ctdl_sbin_dir, - cookie - ); - } - - fp = popen(cmd, "r"); - 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); - } - return(-1); -} - void strprompt(const char *prompt_title, const char *prompt_text, char *Target, char *DefValue) { char buf[SIZ] = ""; @@ -906,7 +723,7 @@ 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 --inputbox '%s' 19 72 '%s' 2>%s", + snprintf(buf, sizeof buf, "exec %s --nocancel --inputbox '%s' 19 72 '%s' 2>%s", getenv("CTDL_DIALOG"), prompt_text, Target, @@ -949,30 +766,14 @@ void set_str_val(int msgpos, char *Target, char *DefValue) ); } -void set_int_val(int msgpos, int *ip, char *DefValue) -{ - char buf[16]; - snprintf(buf, sizeof buf, "%d", (int) *ip); - set_str_val(msgpos, buf, DefValue); - *ip = atoi(buf); -} - - -void set_char_val(int msgpos, char *ip, 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) { - char buf[16]; - snprintf(buf, sizeof buf, "%d", (int) *ip); - set_str_val(msgpos, buf, DefValue); - *ip = (char) atoi(buf); -} - - -void set_long_val(int msgpos, long int *ip, char *DefValue) -{ - char buf[16]; - snprintf(buf, sizeof buf, "%ld", *ip); - set_str_val(msgpos, buf, DefValue); - *ip = atol(buf); + while(1) { + set_str_val(msgpos, target, DefValue); + if (!strcmp(target, "0")) return; + if (atoi(target) != 0) return; + } } @@ -994,7 +795,7 @@ void edit_value(int curr) switch (curr) { case eSysAdminName: - set_str_val(curr, config.c_sysadm, Value); + set_str_val(curr, configs[13], Value); break; case eSysAdminPW: @@ -1005,29 +806,29 @@ void edit_value(int curr) if (setup_type == UI_SILENT) { if (Value) { - config.c_ctdluid = atoi(Value); + sprintf(configs[69], "%d", atoi(Value)); } } else { #ifdef __CYGWIN__ - config.c_ctdluid = 0; /* work-around for Windows */ + strcpy(configs[69], "0"); /* work-around for Windows */ #else - i = config.c_ctdluid; + i = atoi(configs[69]); pw = getpwuid(i); if (pw == NULL) { - set_int_val(curr, &i, Value); - config.c_ctdluid = i; + set_int_val(curr, configs[69], Value); + sprintf(configs[69], "%d", i); } else { strcpy(ctdluidname, pw->pw_name); set_str_val(curr, ctdluidname, Value); pw = getpwnam(ctdluidname); if (pw != NULL) { - config.c_ctdluid = pw->pw_uid; + sprintf(configs[69], "%d", pw->pw_uid); } else if (atoi(ctdluidname) > 0) { - config.c_ctdluid = atoi(ctdluidname); + sprintf(configs[69], "%d", atoi(ctdluidname)); } } #endif @@ -1035,94 +836,69 @@ void edit_value(int curr) break; case eIP_ADDR: - set_str_val(curr, config.c_ip_addr, Value); + set_str_val(curr, configs[37], Value); break; case eCTDL_Port: - set_int_val(curr, &config.c_port_number, Value); + set_int_val(curr, configs[68], Value); break; case eAuthType: if (setup_type == UI_SILENT) { const char *auth; - config.c_auth_mode = AUTHMODE_NATIVE; + //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; + //config.c_auth_mode = AUTHMODE_HOST; } else if (strcasecmp(auth, "ldap") == 0){ - config.c_auth_mode = AUTHMODE_LDAP; + //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; + //config.c_auth_mode = AUTHMODE_LDAP_AD; } } } else { - set_int_val(curr, &config.c_auth_mode, Value); + set_int_val(curr, configs[52], Value); } break; case eLDAP_Host: - set_str_val(curr, config.c_ldap_host, Value); + if (IsEmptyStr(configs[32])) { + strcpy(configs[32], "localhost"); + } + set_str_val(curr, configs[32], Value); break; case eLDAP_Port: - if (config.c_ldap_port == 0) { - config.c_ldap_port = 389; + if (atoi(configs[33]) == 0) { + strcpy(configs[33], "389"); } - set_int_val(curr, &config.c_ldap_port, Value); + set_int_val(curr, configs[33], Value); break; case eLDAP_Base_DN: - set_str_val(curr, config.c_ldap_base_dn, Value); + set_str_val(curr, configs[34], Value); break; case eLDAP_Bind_DN: - set_str_val(curr, config.c_ldap_bind_dn, Value); + set_str_val(curr, configs[35], Value); break; case eLDAP_Bind_PW: - set_str_val(curr, config.c_ldap_bind_pw, Value); + set_str_val(curr, configs[36], Value); break; } } -/* - * (re-)write the config data to disk - */ -void write_config_to_disk(void) -{ - FILE *fp; - int fd; - int rv; - - if ((fd = creat(file_citadel_config, S_IRUSR | S_IWUSR)) == -1) { - display_error("%s citadel.config [%s][%s]\n", _("setup: cannot open"), file_citadel_config, strerror(errno)); - cleanup(1); - } - fp = fdopen(fd, "wb"); - if (fp == NULL) { - display_error("%s citadel.config [%s][%s]\n", _("setup: cannot open"), file_citadel_config, strerror(errno)); - cleanup(1); - return; - } - rv = fwrite((char *) &config, sizeof(struct config), 1, fp); - - if (rv == -1) - display_error("%s citadel.config [%s][%s]\n", _("setup: cannot write"), file_citadel_config, strerror(errno)); - - fclose(fp); -} - - /* @@ -1218,80 +994,30 @@ 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) + if (rv != 0) { fprintf(stderr, "failed to edit %s.\n", NSSCONF); - + } chmod(NSSCONF, 0644); } unlink(new_filename); } -void check_init_script (char *relhome) -{ - int rv; - FILE *fp; - - /* - * If we're running on SysV, install init scripts. - */ - if (!access("/var/run", W_OK)) { - - if (getenv("NO_INIT_SCRIPTS") == NULL) { - install_init_scripts(); - } - - if (!access("/etc/init.d/citadel", X_OK)) { - rv = system("/etc/init.d/citadel start"); - if (rv != 0) - fprintf(stderr, "failed to call our initscript."); - sleep(3); - } - if (test_server(relhome, enable_home) == 0) { - char buf[SIZ]; - int found_it = 0; - - if (config.c_auth_mode == AUTHMODE_NATIVE) { - snprintf (admin_cmd, sizeof(admin_cmd), "%s/sendcommand \"CREU %s|%s\" 2>&1", - ctdl_sbin_dir, config.c_sysadm, admin_pass); - fp = popen(admin_cmd, "r"); - if (fp != NULL) { - while (fgets(buf, sizeof buf, fp) != NULL) - { - if ((atol(buf) == 574) || (atol(buf) == 200)) - ++found_it; - } - pclose(fp); - } - - if (found_it == 0) { - important_message("Error","Setup failed to create your admin user"); - } - } - if (setup_type != UI_SILENT) +#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")); - } - else { important_message(_("Setup failed"), _("Setup is finished, but the Citadel server failed to start.\n" "Go back and check your configuration.\n") - ); - } - - } - - else { important_message(_("Setup finished"), _("Setup is finished. You may now start the server.")); - } -} +#endif @@ -1336,6 +1062,7 @@ void GetDefaultValStr(char *WhereTo, size_t nMax, const char *VarName, const cha void set_default_values(void) { +#if 0 struct passwd *pw; struct utsname my_utsname; struct hostent *he; @@ -1416,68 +1143,25 @@ void set_default_values(void) GetDefaultVALINT(c_managesieve_port, 2020); GetDefaultVALINT(c_xmpp_c2s_port, 5222); GetDefaultVALINT(c_xmpp_s2s_port, 5269); +#endif } -void get_config (void) -{ - int a; - int rv; - FILE *fp; - - /* - * 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. - */ - if ((a = open(file_citadel_config, O_WRONLY | O_CREAT | O_APPEND, - S_IRUSR | S_IWUSR)) == -1) { - display_error("%s citadel.config [%s][%s]\n", _("setup: cannot append"), file_citadel_config, strerror(errno)); - cleanup(errno); - } - fp = fdopen(a, "ab"); - if (fp == NULL) { - display_error("%s citadel.config [%s][%s]\n", _("setup: cannot append"), file_citadel_config, strerror(errno)); - cleanup(errno); - } - 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(file_citadel_config, "rb"); - if (fp == NULL) { - display_error("%s citadel.config [%s][%s]\n", _("setup: cannot open"), file_citadel_config, strerror(errno)); - cleanup(errno); - return; - } - rv = fread((char *) &config, sizeof(struct config), 1, fp); - if (rv == -1) - display_error("%s citadel.config [%s][%s]\n", _("setup: cannot write"), file_citadel_config, strerror(errno)); - fclose(fp); - -} int main(int argc, char *argv[]) { - int a; - int curr; + int a, i; + int curr; + char buf[1024]; char aaa[128]; - int old_setup_level = 0; int info_only = 0; int relh=0; int home=0; char relhome[PATH_MAX]=""; char ctdldir[PATH_MAX]=CTDLDIR; - int rv; struct passwd *pw; gid_t gid; + char *activity = NULL; /* set an invalid setup type */ setup_type = (-1); @@ -1523,7 +1207,7 @@ int main(int argc, char *argv[]) } if (info_only == 1) { important_message(_("Citadel Setup"), CITADEL); - cleanup(0); + exit(0); } enable_home = ( relh | home ); @@ -1533,103 +1217,228 @@ int main(int argc, char *argv[]) "%s: [%s]\n", _("The directory you specified does not exist"), ctdl_run_dir); - cleanup(errno); + exit(errno); } - /* Try to stop Citadel if we can */ - if (!access("/etc/init.d/citadel", X_OK)) { - rv = system("/etc/init.d/citadel stop"); - if (rv != 0) - fprintf(stderr, _("failed to stop us using the initscript.\n")); + /* + * Connect to the running Citadel server. + */ + serv_sock = uds_connectsock(file_citadel_admin_socket); + if (serv_sock < 0) { + display_error( + "%s\n", + _("Setup could not connect to a running Citadel server.") + ); + exit(1); } - /* Make sure Citadel is not running. */ - if (test_server(relhome, enable_home) == 0) { - important_message(_("Citadel Setup"), - _("The Citadel service is still running.\n" - "Please stop the service manually and run " - "setup again.")); - cleanup(1); + /* + * read the server greeting + */ + serv_gets(buf); + if (buf[0] != '2') { + display_error("%s\n", buf); + exit(2); } - /* Now begin. */ - switch (setup_type) { - - case UI_TEXT: - printf("\n\n\n" - " *** %s ***\n\n", - _("Citadel setup program")); - break; - + /* + * Are we connected to the correct Citadel server? + */ + 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; } - get_config(); - set_default_values(); - - /* Go through a series of dialogs prompting for config info */ - for (curr = 1; curr <= MAXSETUP; ++curr) { - edit_value(curr); - if ((curr == 6) && (config.c_auth_mode != AUTHMODE_LDAP) && (config.c_auth_mode != AUTHMODE_LDAP_AD)) { - curr += 5; /* skip LDAP questions if we're not authenticating against LDAP */ + /* + * 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; } - /***** begin version update section *****/ + /* + * Now begin. + */ - old_setup_level = config.c_setup_level; + /* _("Citadel Setup"), */ - if (old_setup_level == 0) { - goto NEW_INST; + if (setup_type == UI_TEXT) { + printf("\n\n\n *** %s ***\n\n", _("Citadel setup program")); } - if (old_setup_level < 555) { - important_message( - _("Citadel Setup"), - _("This Citadel installation is too old to be upgraded.") - ); - cleanup(1); + if (setup_type == UI_DIALOG) { + system("clear 2>/dev/null"); } - write_config_to_disk(); - old_setup_level = config.c_setup_level; + set_default_values(); - /***** end of version update section *****/ + /* 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) + ) { + curr += 5; /* skip LDAP questions if we're not authenticating against LDAP */ + } -NEW_INST: - config.c_setup_level = REV_LEVEL; + if (curr == eSysAdminName) { + if (atoi(configs[52]) == AUTHMODE_NATIVE) { + /* for native auth mode, fetch the admin's existing pw */ + snprintf(buf, sizeof buf, "AGUP %s", configs[13]); + 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(config.c_ctdluid)) == NULL) { + if ((pw = getpwuid(atoi(configs[69]))) == NULL) { gid = getgid(); } else { gid = pw->pw_gid; } - create_run_directories(config.c_ctdluid, gid); + create_run_directories(atoi(configs[69]), gid); - write_config_to_disk(); + 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