/*
* Citadel setup utility
+ *
+ * Copyright (c) 1987-2017 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 "ctdl_module.h"
#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 <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 "citadel_dirs.h"
#if HAVE_BACKTRACE
#include <execinfo.h>
#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,
eLDAP_Bind_DN = 10,
eLDAP_Bind_PW = 11,
eMaxQuestions = 12
-} eSteupStep;
+} eSetupStep;
///"CREATE_XINETD_ENTRY";
/* Environment variables, don't translate! */
"LDAP_BIND_PW"
};
-int setup_type;
-int using_web_installer = 0;
+int setup_type = (-1);
int enable_home = 1;
+char admin_name[SIZ];
char admin_pass[SIZ];
char admin_cmd[SIZ];
+int serv_sock = (-1) ;
const char *setup_titles[eMaxQuestions];
const char *setup_text[eMaxQuestions];
-/* calculate all our path on a central place */
-/* where to keep our config */
-
-
+char *program_title;
void SetTitles(void)
{
- char *locale;
int have_run_dir;
#ifndef HAVE_RUN_DIR
have_run_dir = 1;
have_run_dir = 0;
#endif
- locale = setlocale(LC_MESSAGES, getenv("LANG"));
+#ifdef ENABLE_NLS
+ setlocale(LC_MESSAGES, getenv("LANG"));
bindtextdomain("citadel-setup", LOCALEDIR"/locale");
textdomain("citadel-setup");
bind_textdomain_codeset("citadel-setup","UTF8");
+#endif
setup_titles[eCitadelHomeDir] = _("Citadel Home Directory");
if (have_run_dir)
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 BBS, you might also call it \"bbs\" or \"guest\".\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_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"
+"\"*\" 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_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] = _(
#endif
}
-/*
- * print the actual stack frame.
- */
-void cit_backtrace(void)
-{
-#ifdef HAVE_BACKTRACE
- void *stack_frames[50];
- size_t size, i;
- char **strings;
-
- size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
- strings = backtrace_symbols(stack_frames, size);
- for (i = 0; i < size; i++) {
- if (strings != NULL)
- fprintf(stderr, "%s\n", strings[i]);
- else
- fprintf(stderr, "%p\n", stack_frames[i]);
- }
- free(strings);
-#endif
-}
-
-struct config config;
-
-int direction;
-
-
-void cleanup(int exitcode)
-{
-// printf("Exitcode: %d\n", exitcode);
-// cit_backtrace();
- exit(exitcode);
-}
-
void title(const char *text)
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 --backtitle '%s' %s --yesno '%s' 15 75",
getenv("CTDL_DIALOG"),
+ program_title,
( default_value ? "" : "--defaultno" ),
question);
i = system(buf);
break;
case UI_SILENT:
break;
-
}
return (answer);
}
void important_message(const char *title, const char *msgtext)
{
char buf[SIZ];
- int rv;
switch (setup_type) {
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);
- rv = system(buf);
+ 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);
Msg = NewStrBuf();
va_start(arg_ptr, error_message_format);
- StrBufVAppendPrintf(Msg,
- error_message_format,
- arg_ptr);
+ StrBufVAppendPrintf(Msg, error_message_format, arg_ptr);
va_end(arg_ptr);
important_message(_("Error"), ChrPtr(Msg));
printf("%s\n", text);
printf("....................................................");
printf("..........................\r");
- fflush(stdout);
dots_printed = 0;
} else if (curr == cmax) {
printf("\r%79s\n", "");
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 --backtitle '%s' --gauge '%s' 7 72 0",
getenv("CTDL_DIALOG"),
+ program_title,
text);
fp = popen(buf, "w");
if (fp != NULL) {
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
- );
+ len = 0;
+ while (len < bytes) {
+ rlen = read(serv_sock, &buf[len], bytes - len);
+ if (rlen < 1) {
+ return;
+ }
+ len = len + rlen;
+ }
+}
- /* 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) {
+/*
+ * 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;
}
-
- /* Other errors might mean something really did go wrong.
- */
- sprintf(buf, "%s /etc/inittab: %s", _("Cannot open"), strerror(errno));
- display_error(buf);
- return;
+ bytes_written = bytes_written + retval;
}
+}
- 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;
+
+
+/*
+ * input string from socket - implemented in terms of serv_read()
+ */
+void serv_gets(char *buf)
+{
+ int i;
+
+ /* Read one character at a time.
+ */
+ for (i = 0;; i++) {
+ serv_read(&buf[i], 1);
+ if (buf[i] == '\n' || i == (SIZ-1))
+ break;
}
- while (fgets(buf, sizeof buf, infp) != NULL) {
- if (strstr(buf, looking_for) != NULL) {
- rv = fwrite("#", 1, 1, outfp);
- ++changes_made;
+ /* If we got a long line, discard characters until the newline.
+ */
+ if (i == (SIZ-1)) {
+ while (buf[i] != '\n') {
+ serv_read(&buf[i], 1);
}
- rv = fwrite(buf, strlen(buf), 1, outfp);
}
- fclose(infp);
- fclose(outfp);
+ /* Strip all trailing nonprintables (crlf)
+ */
+ buf[i] = 0;
+}
- 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);
- }
+
+/*
+ * send line to server - implemented in terms of serv_write()
+ */
+void serv_puts(char *buf)
+{
+ serv_write(buf, strlen(buf));
+ serv_write("\n", 1);
}
/*
- * install_init_scripts() -- Try to configure to start Citadel at boot
+ * Convenience functions to get/set system configuration entries
*/
-void install_init_scripts(void)
+void getconf_str(char *buf, char *key)
{
- struct stat etcinitd;
- FILE *fp;
- char *initfile = "/etc/init.d/citadel";
- char command[SIZ];
- int rv;
+ char cmd[SIZ];
+ char ret[SIZ];
- if ((stat("/etc/init.d/", &etcinitd) == -1) &&
- (errno == ENOENT))
- {
- if ((stat("/etc/rc.d/init.d/", &etcinitd) == -1) &&
- (errno == ENOENT))
- initfile = CTDLDIR"/citadel.init";
- else
- initfile = "/etc/rc.d/init.d/citadel";
+ sprintf(cmd, "CONF GETVAL|%s", key);
+ serv_puts(cmd);
+ serv_gets(ret);
+ if (ret[0] == '2') {
+ extract_token(buf, &ret[4], 0, '|', SIZ);
}
-
- fp = fopen(initfile, "r");
- if (fp != NULL) {
- if (yesno(_("Citadel already appears to be configured to start at boot.\n"
- "Would you like to keep your boot configuration as is?\n"), 1) == 1) {
- return;
- }
- fclose(fp);
-
+ else {
+ strcpy(buf, "");
}
+}
- if (yesno(_("Would you like to automatically start Citadel at boot?\n"), 1) == 0) {
- return;
- }
+int getconf_int(char *key)
+{
+ char buf[SIZ];
+ getconf_str(buf, key);
+ return atoi(buf);
+}
- fp = fopen(initfile, "w");
- if (fp == NULL) {
- display_error("%s /etc/init.d/citadel", _("Cannot create"));
- return;
- }
+void setconf_str(char *key, char *val)
+{
+ char buf[SIZ];
- 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"
- );
+ sprintf(buf, "CONF PUTVAL|%s|%s", key, val);
+ serv_puts(buf);
+ serv_gets(buf);
+}
- fclose(fp);
- chmod(initfile, 0755);
- /* Set up the run levels. */
- rv = system("/bin/rm -f /etc/rc?.d/[SK]??citadel 2>/dev/null");
- snprintf(command, sizeof(command), "for x in 2 3 4 5 ; do [ -d /etc/rc$x.d ] && ln -s %s /etc/rc$x.d/S79citadel ; done 2>/dev/null", initfile);
- rv = system(command);
- snprintf(command, sizeof(command),"for x in 0 6 S; do [ -d /etc/rc$x.d ] && ln -s %s /etc/rc$x.d/K30citadel ; done 2>/dev/null", initfile);
- rv = system(command);
+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];
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. */
_("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;
}
/* Now try to restart the service */
rv = system("/etc/init.d/xinetd restart >/dev/null 2>&1");
+ if (rv != 0) {
+ display_error(_("failed to restart xinetd.\n"));
+ }
}
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;
fclose(fp);
if (lines == 0) return; /* Nothing to do. */
-
/* Offer to replace other MTA with the vastly superior Citadel :) */
snprintf(buf, sizeof buf,
}
- sprintf(buf, "for x in /etc/rc*.d/S*%s; do mv $x `echo $x |sed s/S/K/g`; done >/dev/null 2>&1", mta);
+ 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);
- sprintf(buf, "/etc/init.d/%s stop >/dev/null 2>&1", mta);
+ 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[] = {
}
}
-/*
- * 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.
- */
- sprintf(cookie, "--test--%d--", getpid());
-
- 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] = "";
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))
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 --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)) {
}
break;
case UI_SILENT:
- strcpy(Target, DefValue);
+ if (*DefValue != '\0')
+ strcpy(Target, DefValue);
break;
}
}
strprompt(setup_titles[msgpos],
setup_text[msgpos],
Target,
- 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)
-{
- char buf[16];
- snprintf(buf, sizeof buf, "%d", (int) *ip);
- set_str_val(msgpos, buf, DefValue);
- *ip = (char) atoi(buf);
+ DefValue
+ );
}
-
-void set_long_val(int msgpos, long int *ip, char *DefValue)
+/* 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, DefValue);
- *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;
+ 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 (default_value == NULL) {
+ default_value = "";
}
- if (Value == NULL)
- Value = "";
-
switch (curr) {
case eSysAdminName:
- set_str_val(curr, config.c_sysadm, 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:
+ ctdluid = getconf_int("c_ctdluid");
if (setup_type == UI_SILENT)
{
- if (Value) {
- config.c_ctdluid = atoi(Value);
+ if (default_value) {
+ ctdluid = atoi(default_value);
}
}
else
{
#ifdef __CYGWIN__
- config.c_ctdluid = 0; /* XXX Windows hack, prob. insecure */
+ ctdluid = 0; /* work-around for Windows */
#else
- i = config.c_ctdluid;
- pw = getpwuid(i);
+ pw = getpwuid(ctdluid);
if (pw == NULL) {
- set_int_val(curr, &i, Value);
- config.c_ctdluid = 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) {
- config.c_ctdluid = pw->pw_uid;
+ ctdluid = pw->pw_uid;
}
else if (atoi(ctdluidname) > 0) {
- config.c_ctdluid = atoi(ctdluidname);
+ ctdluid = atoi(ctdluidname);
}
}
#endif
}
+ setconf_int("c_ctdluid", ctdluid);
break;
case eIP_ADDR:
- set_str_val(curr, config.c_ip_addr, 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, &config.c_port_number, 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, &config.c_auth_mode, Value);
+ set_int_val(curr, &auth, default_value);
}
+ setconf_int("c_auth_mode", auth);
break;
case eLDAP_Host:
- set_str_val(curr, config.c_ldap_host, Value);
+ 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;
case eLDAP_Port:
- if (config.c_ldap_port == 0) {
- config.c_ldap_port = 389;
+ lportnum = getconf_int("c_ldap_port");
+ if (lportnum == 0) {
+ lportnum = 389;
}
- set_int_val(curr, &config.c_ldap_port, Value);
+ set_int_val(curr, &lportnum, default_value);
+ setconf_int("c_ldap_port", lportnum);
break;
case eLDAP_Base_DN:
- set_str_val(curr, config.c_ldap_base_dn, 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, config.c_ldap_bind_dn, 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, config.c_ldap_bind_pw, Value);
+ getconf_str(buf, "c_ldap_bind_pw");
+ set_str_val(curr, buf, default_value);
+ setconf_str("c_ldap_bind_pw", buf);
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);
- }
- rv = fwrite((char *) &config, sizeof(struct config), 1, fp);
- fclose(fp);
}
-
/*
* Figure out what type of user interface we're going to use
*/
int discover_ui(void)
{
- /* Use "dialog" if we have it */
+ /* Use "whiptail" or "dialog" if we have it */
if (getenv("CTDL_DIALOG") != NULL) {
return UI_DIALOG;
}
-void migrate_old_installs(void)
-{
- int rv;
- rv = system("exec /bin/rm -fr ./rooms ./chatpipes ./expressmsgs ./sessions 2>/dev/null");
- unlink("citadel.log");
- unlink("weekly");
-}
-
-
/*
* Strip "db" entries out of /etc/nsswitch.conf
*/
char buf_nc[256];
char question[512];
int i;
- int changed = 0;
int file_changed = 0;
char new_filename[64];
int rv;
}
while (fgets(buf, sizeof buf, fp_read) != NULL) {
- changed = 0;
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) {
if (!strncasecmp(&buf_nc[i], "db", 2)) {
if (i > 0) {
if ((isspace(buf_nc[i+2])) || (buf_nc[i+2]==0)) {
- changed = 1;
file_changed = 1;
strcpy(&buf_nc[i], &buf_nc[i+2]);
strcpy(&buf[i], &buf[i+2]);
}
}
}
- 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);
);
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);
+ }
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");
- 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)
+/*
+ * 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"));
- }
- 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."));
- }
-}
-
-void set_default_values(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... */
- if (IsEmptyStr(config.c_nodename))
- safestrncpy(config.c_nodename, my_utsname.nodename,
- sizeof config.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);
- }
- }
- if (IsEmptyStr(config.c_humannode)) {
- strcpy(config.c_humannode, _("My System"));
- }
- if (IsEmptyStr(config.c_phonenum)) {
- strcpy(config.c_phonenum, _("US 800 555 1212"));
- }
- if (config.c_initax == 0) {
- config.c_initax = 4;
- }
- if (IsEmptyStr(config.c_moreprompt)) strcpy(config.c_moreprompt, "<more>");
- if (IsEmptyStr(config.c_twitroom)) strcpy(config.c_twitroom, "Trashcan");
- if (IsEmptyStr(config.c_baseroom)) strcpy(config.c_baseroom, BASEROOM);
- if (IsEmptyStr(config.c_aideroom)) 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_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
- */
- 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;
- if (config.c_msa_port == 0) config.c_msa_port = 587;
- if (config.c_smtps_port == 0) config.c_smtps_port = 465;
- if (config.c_pop3s_port == 0) config.c_pop3s_port = 995;
- if (config.c_imaps_port == 0) config.c_imaps_port = 993;
- if (config.c_pftcpdict_port == 0) config.c_pftcpdict_port = -1;
- if (config.c_managesieve_port == 0) config.c_managesieve_port = 2020;
- if (config.c_xmpp_c2s_port == 0) config.c_xmpp_c2s_port = 5222;
- if (config.c_xmpp_s2s_port == 0) config.c_xmpp_s2s_port = 5269;
-}
-
-
-void get_config (void)
-{
- int a;
- int rv;
- FILE *fp;
+#endif
- /*
- * 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);
- }
- rv = fread((char *) &config, sizeof(struct config), 1, fp);
- 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;
+ 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;
+ /* 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)) {
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;
}
if (setup_type < 0) {
setup_type = discover_ui();
}
- if (info_only == 1) {
- important_message(_("Citadel Setup"), CITADEL);
- cleanup(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);
- cleanup(errno);
+ display_error("%s: [%s]\n", _("The directory you specified does not exist"), ctdl_run_dir);
+ exit(errno);
}
- /* Try to stop Citadel if we can */
- if (!access("/etc/init.d/citadel", X_OK)) {
- rv = system("/etc/init.d/citadel stop");
- }
-
- /* 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);
+ /*
+ * 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);
+
+ 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"
- " *** %s ***\n\n",
- _("Citadel setup program"));
- break;
-
+ /*
+ * read the server greeting
+ */
+ serv_gets(buf);
+ if (buf[0] != '2') {
+ display_error("%s\n", buf);
+ exit(2);
}
- 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 */
+ /*
+ * 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;
}
- /***** begin version update section *****/
+ /*
+ * Now begin.
+ */
- old_setup_level = config.c_setup_level;
- if (old_setup_level == 0) {
- goto NEW_INST;
+ if (setup_type == UI_TEXT) {
+ printf("\n\n\n *** %s ***\n\n", program_title);
}
- 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;
+ /* Go through a series of dialogs prompting for config info */
+ for (curr = 1; curr < eMaxQuestions; ++curr) {
+ edit_value(curr);
- /***** end of version update section *****/
+ 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 */
+ }
-NEW_INST:
- 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(config.c_ctdluid)) == NULL) {
+ if ((pw = getpwuid( getconf_int("c_ctdluid") )) == NULL) {
gid = getgid();
} else {
gid = pw->pw_gid;
}
- create_run_directories(config.c_ctdluid, gid);
-
- write_config_to_disk();
+ 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 */
- migrate_old_installs(); /* Delete files and directories used by older Citadel versions */
+ /*
+ * Create the administrator account. It's ok if the command fails if this user already exists.
+ */
+ 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);
- if ( ((setup_type == UI_SILENT)
- && (getenv("ALTER_ETC_SERVICES")!=NULL))
- || (setup_type != UI_SILENT)
- ) {
- check_services_entry(); /* Check /etc/services */
+ /*
+ * Assign the desired password and access level to the administrator account.
+ */
+ 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);
#ifndef __CYGWIN__
- delete_inittab_entry(); /* Remove obsolete /etc/inittab entry */
check_xinetd_entry(); /* Check /etc/xinetd.d/telnet */
disable_other_mtas(); /* Offer to disable other MTAs */
fixnss(); /* Check for the 'db' nss and offer to disable it */
#endif
- progress(_("Setting file permissions"), 1, 3);
- rv = chown(file_citadel_config, config.c_ctdluid, gid);
- progress(_("Setting file permissions"), 2, 3);
- rv = chmod(file_citadel_config, S_IRUSR | S_IWUSR);
- progress(_("Setting file permissions"), 3, 3);
+ /*
+ * Restart citserver
+ */
+ activity = _("Restarting Citadel server to apply changes");
+ progress(activity, 0, 41);
- check_init_script(relhome);
- cleanup(0);
- return 0;
-}
+ serv_puts("TIME");
+ serv_gets(buf);
+ long original_start_time = extract_long(&buf[4], 3);
+ progress(activity, 1, 41);
+ serv_puts("DOWN 1");
+ progress(activity, 2, 41);
+ serv_gets(buf);
+ if (buf[0] != '2') {
+ display_error("%s\n", buf);
+ exit(6);
+ }
+
+ close(serv_sock);
+ serv_sock = (-1);
+ 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) { /* wait for server to start up */
+ progress(activity, i, 41);
+ serv_sock = uds_connectsock(file_citadel_admin_socket);
+ sleep(1);
+ }
+
+ progress(activity, 39, 41);
+ serv_gets(buf);
+
+ progress(activity, 40, 41);
+ serv_puts("TIME");
+ serv_gets(buf);
+ long new_start_time = extract_long(&buf[4], 3);
+
+ close(serv_sock);
+ progress(activity, 41, 41);
+
+ 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;
+}
projects / citadel.git / blobdiff