-/*
- * Citadel setup utility
- *
- * 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.
- *
- * 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.
- */
+// Citadel setup utility
+//
+// Copyright (c) 1987-2024 by the citadel.org team
+//
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
#define SHOW_ME_VAPPEND_PRINTF
#include <stdlib.h>
#include <sys/un.h>
#include <assert.h>
#include <libcitadel.h>
-#include "citadel.h"
+#include "../server/citadel_defs.h"
+#include "../server/server.h"
#include "axdefs.h"
-#include "sysdep.h"
-#include "citadel_dirs.h"
+#include "../server/sysdep.h"
+#include "../server/citadel_dirs.h"
#ifdef ENABLE_NLS
#ifdef HAVE_XLOCALE_H
#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"
eMaxQuestions = 12
} eSetupStep;
-///"CREATE_XINETD_ENTRY";
-/* Environment variables, don't translate! */
+// "CREATE_XINETD_ENTRY";
+// Environment variables, don't translate!
const char *EnvNames [eMaxQuestions] = {
"HOME_DIRECTORY",
"SYSADMIN_NAME",
char *program_title;
-void SetTitles(void)
-{
+void SetTitles(void) {
int have_run_dir;
#ifndef HAVE_RUN_DIR
have_run_dir = 1;
#ifdef ENABLE_NLS
setlocale(LC_MESSAGES, getenv("LANG"));
-
bindtextdomain("citadel-setup", LOCALEDIR"/locale");
textdomain("citadel-setup");
bind_textdomain_codeset("citadel-setup","UTF8");
"specify the -h flag to the server when you start it up.\n"
"note that it may not have a leading /");
-
setup_titles[eSysAdminName] = _("Citadel administrator username:");
setup_text[eSysAdminName] = _(
"Please enter the name of the Citadel user account that should be granted "
"this user account will be created if it does not exist. For external "
"authentication this user account has to exist.");
-
setup_titles[eSysAdminPW] = _("Administrator password:");
setup_text[eSysAdminPW] = _(
"Enter a password for the system administrator. When setup\n"
" 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"
+"For help: http://www.citadel.org/authmodes.html\n"
"\n"
"ANSWER \"0\" UNLESS YOU COMPLETELY UNDERSTAND THIS OPTION.\n");
"If you entered a Bind DN in the previous question, you must now enter\n"
"the password associated with that account. Otherwise, you can leave this\n"
"blank.\n");
-
-#if 0
-// Debug loading of locales... Strace does a better job though.
- printf("Message catalog directory: %s\n", bindtextdomain("citadel-setup", LOCALEDIR"/locale"));
- printf("Text domain: %s\n", textdomain("citadel-setup"));
- printf("Text domain Charset: %s\n", bind_textdomain_codeset("citadel-setup","UTF8"));
- {
- int i;
- for (i = 0; i < eMaxQuestions; i++)
- printf("%s - %s\n", setup_titles[i], _(setup_titles[i]));
- exit(0);
- }
-#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 cls(void) {
+ printf("\033[2J\033[H\033[44m\033[1m\033[K\n");
+ printf(" %s \033[K\n", program_title);
+ printf("\033[K\n");
+ printf("\033[0m\n");
}
+void title(const char *text) {
+ cls();
+ printf("\033[1m\033[32m<\033[33m%s\033[32m>\033[0m\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("\033[31m\033[32m%s\n%s [\033[33m%s\033[32m]\033[0m --> ", 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;
+ cls();
+ printf("%s\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;
FreeStrBuf(&Msg);
}
-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;
+void progress(char *text, long int curr, long int cmax) {
+ long a = 0;
+ long i = 0;
- 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) {
+ cls();
+ printf("%s\n", text);
+ printf("\033[1m\033[33m[\033[32m............................................................................\033[33m]\033[0m\r");
+ }
+ else if (curr == cmax) {
+ printf("\r%79s\n", "");
+ }
+ else {
+ printf("\033[1m\033[33m[\033[32m");
+ a = (curr * 100) / cmax;
+ a = a * 76;
+ a = a / 100;
+ for (i=0; i<a; ++i) {
+ printf("*");
}
- break;
- case UI_SILENT:
- break;
-
- default:
- assert(1==0); /* If we got here then the developer is a moron */
+ printf("\033[0m\r");
}
+ 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) {
}
-/*
- * input binary data from socket
- */
-void serv_read(char *buf, int bytes)
-{
+// input binary data from socket
+void serv_read(char *buf, int bytes) {
int len, rlen;
len = 0;
}
-/*
- * send binary to server
- */
-void serv_write(char *buf, int nbytes)
-{
+// send binary to server
+void serv_write(char *buf, int nbytes) {
int bytes_written = 0;
int retval;
while (bytes_written < nbytes) {
}
-
-/*
- * input string from socket - implemented in terms of serv_read()
- */
-void serv_gets(char *buf)
-{
+// input string from socket - implemented in terms of serv_read()
+void serv_gets(char *buf) {
int i;
- /* Read one character at a time.
- */
+ // Read one character at a time.
for (i = 0;; i++) {
serv_read(&buf[i], 1);
if (buf[i] == '\n' || i == (SIZ-1))
break;
}
- /* If we got a long line, discard characters until the newline.
- */
+ // If we got a long line, discard characters until the newline.
if (i == (SIZ-1)) {
while (buf[i] != '\n') {
serv_read(&buf[i], 1);
}
}
- /* Strip all trailing nonprintables (crlf)
- */
+ // Strip all trailing nonprintables (crlf)
buf[i] = 0;
}
-/*
- * send line to server - implemented in terms of serv_write()
- */
-void serv_puts(char *buf)
-{
+// send line to server - implemented in terms of serv_write()
+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)
-{
+// Convenience functions to get/set system configuration entries
+void getconf_str(char *buf, char *key) {
char cmd[SIZ];
char ret[SIZ];
}
}
-int getconf_int(char *key)
-{
+
+int getconf_int(char *key) {
char buf[SIZ];
getconf_str(buf, key);
return atoi(buf);
}
-void setconf_str(char *key, char *val)
-{
+
+void setconf_str(char *key, char *val) {
char buf[SIZ];
sprintf(buf, "CONF PUTVAL|%s|%s", key, val);
}
-void setconf_int(char *key, int val)
-{
+void setconf_int(char *key, int val) {
char buf[SIZ];
sprintf(buf, "CONF PUTVAL|%s|%d", key, val);
}
-
-
-
-/*
- * On systems which use xinetd, see if we can offer to install Citadel as
- * the default telnet target.
- */
-void check_xinetd_entry(void)
-{
+// On systems which use xinetd, see if we can offer to install Citadel as
+// the default telnet target.
+void check_xinetd_entry(void) {
char *filename = "/etc/xinetd.d/telnet";
FILE *fp;
char buf[SIZ];
int rv;
fp = fopen(filename, "r+");
- if (fp == NULL) return; /* Not there. Oh well... */
+ if (fp == NULL) return; // Not there. Oh well...
while (fgets(buf, sizeof buf, fp) != NULL) {
if (strstr(buf, "/citadel") != NULL) {
}
}
fclose(fp);
- if (already_citadel) return; /* Already set up this way. */
+ if (already_citadel) return; // Already set up this way.
- /* Otherwise, prompt the user to create an entry. */
+ // Otherwise, prompt the user to create an entry.
if (getenv("CREATE_XINETD_ENTRY") != NULL) {
if (strcasecmp(getenv("CREATE_XINETD_ENTRY"), "yes")) {
return;
);
fclose(fp);
- /* Now try to restart the service. This will not have the intended effect on Solaris, but who the hell uses Solaris anymore? */
+ // Now try to restart the service. (This only works on systemd; others will need to restart it manually.)
rv = system("systemctl restart xinetd >/dev/null 2>&1");
if (rv != 0) {
rv = system("service xinetd restart >/dev/null 2>&1");
}
-void disable_other_mtas(void)
-{
- 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. */
- /* 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)
-{
+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)
-{
+
+void set_str_val(int msgpos, char *Target, char *DefValue) {
strprompt(setup_titles[msgpos],
setup_text[msgpos],
Target,
);
}
-/* like set_str_val() but for numeric values */
-void set_int_val(int msgpos, int *target, char *default_value)
-{
+
+// like set_str_val() but for numeric values
+void set_int_val(int msgpos, int *target, char *default_value) {
char buf[32];
sprintf(buf, "%d", *target);
do {
}
-void edit_value(int curr)
-{
+void edit_value(int curr) {
struct passwd *pw = NULL;
char ctdluidname[256];
char buf[SIZ];
int auth = 0;
int lportnum = 0;
- if (setup_type == UI_SILENT)
- {
- default_value = getenv(EnvNames[curr]);
- }
if (default_value == NULL) {
default_value = "";
}
case eUID:
ctdluid = getconf_int("c_ctdluid");
- if (setup_type == UI_SILENT)
- {
- if (default_value) {
- ctdluid = atoi(default_value);
- }
+ pw = getpwuid(ctdluid);
+ if (pw == NULL) {
+ set_int_val(curr, &ctdluid, default_value);
}
- else
- {
- pw = getpwuid(ctdluid);
- if (pw == NULL) {
- set_int_val(curr, &ctdluid, default_value);
+ 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, default_value);
- pw = getpwnam(ctdluidname);
- if (pw != NULL) {
- ctdluid = pw->pw_uid;
- }
- else if (atoi(ctdluidname) > 0) {
- ctdluid = atoi(ctdluidname);
- }
+ else if (atoi(ctdluidname) > 0) {
+ ctdluid = atoi(ctdluidname);
}
-#endif
}
setconf_int("c_ctdluid", ctdluid);
break;
case eAuthType:
auth = getconf_int("c_auth_mode");
- if (setup_type == UI_SILENT)
- {
- 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, &auth, default_value);
- }
+ set_int_val(curr, &auth, default_value);
setconf_int("c_auth_mode", auth);
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
- */
-void fixnss(void) {
- FILE *fp_read;
- int fd_write;
- char buf[256];
- char buf_nc[256];
- char question[512];
- int i;
- int file_changed = 0;
- char new_filename[64];
- int rv;
-
- fp_read = fopen(NSSCONF, "r");
- if (fp_read == NULL) {
- return;
- }
-
- strcpy(new_filename, "/tmp/ctdl_fixnss_XXXXXX");
- fd_write = mkstemp(new_filename);
- if (fd_write < 0) {
- fclose(fp_read);
- return;
- }
-
- while (fgets(buf, sizeof buf, fp_read) != NULL) {
- strcpy(buf_nc, buf);
- 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)) {
- file_changed = 1;
- strcpy(&buf_nc[i], &buf_nc[i+2]);
- strcpy(&buf[i], &buf[i+2]);
- if (buf[i]==32) {
- strcpy(&buf_nc[i], &buf_nc[i+1]);
- strcpy(&buf[i], &buf[i+1]);
- }
- }
- }
- }
- }
- long buflen = strlen(buf);
- if (write(fd_write, buf, buflen) != buflen) {
- fclose(fp_read);
- close(fd_write);
- unlink(new_filename);
- return;
- }
- }
-
- fclose(fp_read);
-
- if (!file_changed) {
- unlink(new_filename);
- return;
- }
-
- snprintf(question, sizeof question,
- _(
- "\n"
- "/etc/nsswitch.conf is configured to use the 'db' module for\n"
- "one or more services. This is not necessary on most systems,\n"
- "and it is known to crash the Citadel server when delivering\n"
- "mail to the Internet.\n"
- "\n"
- "Do you want this module to be automatically disabled?\n"
- "\n"
- )
+// Messages that are no longer in use.
+// We keep them here so we don't lose the translations if we need them later.
+void unused_messages(void) {
+ 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.")
);
-
- if (yesno(question, 1)) {
- 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);
-}
-
-
-/*
- * Messages that are no longer in use.
- * We keep them here so we don't lose the translations if we need them later.
- */
-void niu_messages() {
- 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."));
}
-
-
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
int a, i;
int curr;
char buf[1024];
char aaa[128];
- int relh = 0;
- int home = 0;
- char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
struct passwd *pw;
gid_t gid;
char *activity = NULL;
- /* Keep a mild groove on */
- program_title = _("Citadel setup program");
+ // Keep a mild groove on
+ program_title = _("Citadel Server setup");
- /* set an invalid setup type */
+ // set an invalid setup type
setup_type = (-1);
- /* parse command line args */
+ // parse command line args
for (a = 0; a < argc; ++a) {
if (!strncmp(argv[a], "-u", 2)) {
strcpy(aaa, argv[a]);
strcpy(aaa, &aaa[2]);
setup_type = atoi(aaa);
}
- else if (!strcmp(argv[a], "-q")) {
- setup_type = UI_SILENT;
- }
else if (!strncmp(argv[a], "-h", 2)) {
- relh=argv[a][2]!='/';
- if (!relh) {
- safestrncpy(ctdl_home_directory, &argv[a][2], sizeof ctdl_home_directory);
- } else {
- safestrncpy(relhome, &argv[a][2], sizeof relhome);
- }
- home = 1;
+ safestrncpy(ctdldir, &argv[a][2], sizeof ctdldir);
}
-
}
- 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();
- }
-
- 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);
+ if (chdir(ctdldir) != 0) {
+ fprintf(stderr, "sendcommand: %s: %s\n", ctdldir, strerror(errno));
exit(errno);
}
+ SetTitles();
- /*
- * Connect to the running Citadel server.
- */
+ // 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 */
+ 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);
exit(1);
}
- /*
- * read the server greeting
- */
+ // read the server greeting
serv_gets(buf);
if (buf[0] != '2') {
display_error("%s\n", buf);
exit(2);
}
- /*
- * Are we connected to the correct Citadel server?
- */
+ // Are we connected to the correct Citadel server?
serv_puts("INFO");
serv_gets(buf);
if (buf[0] != '1') {
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.")
- );
+ display_error("%s\n", _("Your setup program and Citadel server are from different versions."));
exit(4);
}
}
++a;
}
- /*
- * Now begin.
- */
-
+ printf("\n\n\n *** %s ***\n\n", program_title);
- if (setup_type == UI_TEXT) {
- printf("\n\n\n *** %s ***\n\n", program_title);
- }
-
- if (setup_type == UI_DIALOG) {
- system("clear 2>/dev/null");
- }
-
- /* Go through a series of dialogs prompting for config info */
+ // Go through a series of dialogs prompting for config info
for (curr = 1; curr < eMaxQuestions; ++curr) {
edit_value(curr);
&& (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 */
+ curr += 5; // skip LDAP questions if we're not authenticating against LDAP
}
if (curr == eSysAdminName) {
- if (getconf_int("c_auth_mode") == AUTHMODE_NATIVE) {
- /* for native auth mode, fetch the admin's existing pw */
+ 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);
}
}
else {
- ++curr; /* skip the password question for non-native auth modes */
+ ++curr; // skip the password question for non-native auth modes
}
}
}
if ((pw = getpwuid( getconf_int("c_ctdluid") )) == NULL) {
gid = getgid();
- } else {
+ }
+ else {
gid = pw->pw_gid;
}
- if (create_run_directories(getconf_int("c_ctdluid"), gid) != 0) {
- display_error("%s\n", _("failed to create directories"));
- }
+ // setup now must be run after Citadel Server is already running, so we don't need this anymore.
+ //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 */
+ sleep(1); // Let the message appear briefly
- /*
- * Create the administrator account. It's ok if the command fails if this user already exists.
- */
+ // 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);
}
progress(activity, 3, 5);
- /*
- * Assign the desired password and access level to the administrator account.
- */
+ // 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, 5, 5);
-#ifndef __CYGWIN__
- 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
+ check_xinetd_entry(); // Check /etc/xinetd.d/telnet
- /*
- * Restart citserver
- */
+ // Restart citserver
activity = _("Restarting Citadel server to apply changes");
progress(activity, 0, 51);
long original_start_time = extract_long(&buf[4], 3);
progress(activity, 1, 51);
- serv_puts("DOWN 1");
+ serv_puts("DOWN");
progress(activity, 2, 51);
serv_gets(buf);
if (buf[0] != '2') {
close(serv_sock);
serv_sock = (-1);
- for (i=3; i<=6; ++i) { /* wait for server to shut down */
+ for (i=3; i<=6; ++i) { // wait for server to shut down
progress(activity, i, 51);
sleep(1);
}
- for (i=7; ((i<=48) && (serv_sock < 0)) ; ++i) { /* wait for server to start up */
+ for (i=7; ((i<=48) && (serv_sock < 0)) ; ++i) { // wait for server to start up
progress(activity, i, 51);
serv_sock = uds_connectsock(file_citadel_admin_socket);
sleep(1);
close(serv_sock);
progress(activity, 51, 51);
- if ( (original_start_time == new_start_time)
- || (new_start_time <= 0)
- ) {
+ 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);
}
projects / citadel.git / blobdiff