#include <errno.h>
#include <limits.h>
#include <pwd.h>
+#include <time.h>
#include "citadel.h"
#include "axdefs.h"
#define MAXSETUP 4 /* 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_SILENT 3 /* Silent running, for use in scripts */
#define UI_NEWT 4 /* Use the "newt" window library */
};
-char *setup_text[] =
-{
-"Enter the full pathname of the directory in which the Citadel installation\n"
-"you are creating or updating resides. If you specify a directory other\n"
-"than the default, you will need to specify the -h flag to the server when\n"
-"you start it up.\n",
-
-"Enter the name of the system administrator (which is probably you).\n"
-"When an account is created with this name, it will automatically be\n"
-"assigned the highest access level.\n",
-
-"Citadel needs to run under its own user ID. This would typically be\n"
-"called \"citadel\", but if you are running Citadel as a public BBS, you\n"
-"might also call it \"bbs\" or \"guest\". The server will run under this\n"
-"user ID. Please specify that user ID here. You may specify either a\n"
-"user name or a numeric UID.\n",
-
-"Specify the IP address on which your server will run. If you leave this\n"
-"blank, or if you specify 0.0.0.0, Citadel will listen on all addresses.\n"
-"You can usually skip this unless you're running multiple instances of\n"
-"Citadel on the same computer.\n",
-
-"Specify the TCP port number on which your server will run. Normally, this\n"
-"will be port 504, which is the official port assigned by the IANA for\n"
-"Citadel servers. You'll only need to specify a different port number if\n"
-"you run multiple instances of Citadel on the same computer and there's\n"
-"something else already using port 504.\n",
-
-"Setup has detected that you currently have data files from a Citadel\n"
-"version 3.2x installation. The program 'conv_32_40' can upgrade your\n"
-"files to version 4.0x format.\n"
-" Setup will now exit. Please either run 'conv_32_40' or delete your data\n"
-"files, and run setup again.\n"
+char *setup_text[] = {
+"Enter the full pathname of the directory in which the Citadel\n"
+"installation you are creating or updating resides. If you\n"
+"specify a directory other than the default, you will need to\n"
+"specify the -h flag to the server when you start it up.\n",
+
+"Enter the name of the system administrator (which is probably\n"
+"you). When an account is created with this name, it will\n"
+"automatically be given administrator-level access.\n",
+
+"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"
+"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",
+
+"Specify the IP address on which your server will run. If you\n"
+"leave this blank, or if you specify 0.0.0.0, Citadel will listen\n"
+"on all addresses. You can usually skip this unless you are\n"
+"running multiple instances of Citadel on the same computer.\n",
+
+"Specify the TCP port number on which your server will run.\n"
+"Normally, this will be port 504, which is the official port\n"
+"assigned by the IANA for Citadel servers. You will only need\n"
+"to specify a different port number if you run multiple instances\n"
+"of Citadel on the same computer and there is something else\n"
+"already using port 504.\n",
};
while(fgets(buf, sizeof buf, fp) != NULL) {
if (num_tokens(buf, ':') == 4) {
- extract_token(entry, buf, 0, ':');
- extract_token(levels, buf, 1, ':');
- extract_token(state, buf, 2, ':');
- extract_token(prog, buf, 3, ':'); /* includes 0x0a LF */
+ extract_token(entry, buf, 0, ':', sizeof entry);
+ extract_token(levels, buf, 1, ':', sizeof levels);
+ extract_token(state, buf, 2, ':', sizeof state);
+ extract_token(prog, buf, 3, ':', sizeof prog); /* includes 0x0a LF */
if (!strcmp(entry, which_entry)) {
strcpy(state, new_state);
/*
* Locate the name of an inittab entry for a specific program
*/
-void locate_init_entry(char *init_entry, char *program) {
+void locate_init_entry(char *init_entry, char *looking_for) {
FILE *infp;
char buf[SIZ];
int have_entry = 0;
- char looking_for[SIZ];
char entry[SIZ];
char prog[SIZ];
strcpy(init_entry, "");
/* Pound through /etc/inittab line by line. Set have_entry to 1 if
- * an entry is found which we believe starts citserver.
+ * an entry is found which we believe starts the specified program.
*/
infp = fopen("/etc/inittab", "r");
if (infp == NULL) {
} else {
while (fgets(buf, sizeof buf, infp) != NULL) {
buf[strlen(buf) - 1] = 0;
- extract_token(entry, buf, 0, ':');
- extract_token(prog, buf, 3, ':');
+ extract_token(entry, buf, 0, ':', sizeof entry);
+ extract_token(prog, buf, 3, ':', sizeof prog);
if (!strncasecmp(prog, looking_for,
strlen(looking_for))) {
++have_entry;
/*
* Shut down the Citadel service if necessary, during setup.
*/
-void shutdown_service(void) {
+void shutdown_citserver(void) {
char looking_for[SIZ];
- snprintf(looking_for, sizeof looking_for, "%s/citserver ", BBSDIR);
+ snprintf(looking_for, sizeof looking_for, "%s/citserver", setup_directory);
locate_init_entry(citserver_init_entry, looking_for);
if (strlen(citserver_init_entry) > 0) {
set_init_entry(citserver_init_entry, "off");
/*
* Start the Citadel service.
*/
-void start_the_service(void) {
+void start_citserver(void) {
if (strlen(citserver_init_entry) > 0) {
set_init_entry(citserver_init_entry, "respawn");
}
newtComponent form = NULL;
newtComponent yesbutton = NULL;
newtComponent nobutton = NULL;
- int i = 0;
int prompt_window_height = 0;
#endif
+ int i = 0;
int answer = 0;
char buf[SIZ];
} while ((answer < 0) || (answer > 1));
break;
+ case UI_DIALOG:
+ sprintf(buf, "exec %s --yesno '%s' 10 72",
+ getenv("CTDL_DIALOG"),
+ question);
+ i = system(buf);
+ if (i == 0) {
+ answer = 1;
+ }
+ else {
+ answer = 0;
+ }
+ break;
+
#ifdef HAVE_NEWT
case UI_NEWT:
prompt_window_height = num_tokens(question, '\n') + 5;
newtCenteredWindow(76, prompt_window_height, "Question");
form = newtForm(NULL, NULL, 0);
for (i=0; i<num_tokens(question, '\n'); ++i) {
- extract_token(buf, question, i, '\n');
+ extract_token(buf, question, i, '\n', sizeof buf);
newtFormAddComponent(form, newtLabel(1, 1+i, buf));
}
yesbutton = newtButton(10, (prompt_window_height - 4), "Yes");
fgets(buf, sizeof buf, stdin);
break;
+ case UI_DIALOG:
+ sprintf(buf, "exec %s --backtitle '%s' --msgbox '%s' 19 72",
+ getenv("CTDL_DIALOG"),
+ title,
+ msgtext);
+ system(buf);
+ break;
+
#ifdef HAVE_NEWT
case UI_NEWT:
newtCenteredWindow(76, 10, title);
form = newtForm(NULL, NULL, 0);
for (i=0; i<num_tokens(msgtext, '\n'); ++i) {
- extract_token(buf, msgtext, i, '\n');
+ extract_token(buf, msgtext, i, '\n', sizeof buf);
newtFormAddComponent(form, newtLabel(1, 1+i, buf));
}
newtFormAddComponent(form, newtButton(35, 5, "OK"));
#endif
static long dots_printed = 0L;
long a = 0;
+ static FILE *fp = NULL;
+ char buf[SIZ];
switch (setup_type) {
}
break;
+ case UI_DIALOG:
+ if (curr == 0) {
+ sprintf(buf, "exec %s --gauge '%s' 7 72 0",
+ getenv("CTDL_DIALOG"),
+ 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);
+ }
+ }
+ break;
+
#ifdef HAVE_NEWT
case UI_NEWT:
if (curr == 0) {
FILE *sfp;
if (getservbyname(SERVICE_NAME, PROTO_NAME) == NULL) {
- for (i=0; i<3; ++i) {
+ for (i=0; i<=3; ++i) {
progress("Adding service entry...", i, 3);
if (i == 0) {
sfp = fopen("/etc/services", "a");
char entryname[5];
/* Determine the fully qualified path name of citserver */
- snprintf(looking_for, sizeof looking_for, "%s/citserver ", BBSDIR);
+ snprintf(looking_for, sizeof looking_for, "%s/citserver", setup_directory);
locate_init_entry(citserver_init_entry, looking_for);
/* If there's already an entry, then we have nothing left to do. */
/* Otherwise, prompt the user to create an entry. */
snprintf(buf, sizeof buf,
- "Setup can configure the 'xinetd' service to automatically\n"
+ "Setup can configure the \"xinetd\" service to automatically\n"
"connect incoming telnet sessions to Citadel, bypassing the\n"
- "host system's login prompt. Would you like to do this?\n"
+ "host system login: prompt. Would you like to do this?\n"
);
if (yesno(buf) == 0)
return;
FILE *fp;
int lines = 0;
- sprintf(buf, "/bin/ls -l /etc/rc*.d/S*%s 2>/dev/null", mta);
+ sprintf(buf, "/bin/ls -l /etc/rc*.d/S*%s 2>/dev/null; "
+ "/bin/ls -l /etc/rc.d/rc*.d/S*%s 2>/dev/null",
+ mta, mta);
fp = popen(buf, "r");
if (fp == NULL) return;
/* Offer to replace other MTA with the vastly superior Citadel :) */
snprintf(buf, sizeof buf,
- "You appear to have the '%s' email program\n"
- "running on your system. Would you like to disable it,\n"
- "allowing Citadel to handle your system's Internet mail\n"
- "instead?\n",
- mta
+ "You appear to have the \"%s\" email program\n"
+ "running on your system. If you want Citadel mail\n"
+ "connected with %s, you will have to manually integrate\n"
+ "them. It is preferable to disable %s, and use Citadel's\n"
+ "SMTP, POP3, and IMAP services.\n\n"
+ "May we disable %s so that Citadel has access to ports\n"
+ "25, 110, and 143?\n",
+ mta, mta, mta, mta
);
if (yesno(buf) == 0)
return;
* to the server and try to get it back. The cookie does not
* have to be secret ... just unique.
*/
- sprintf(cookie, "%ld.%d", time(NULL), getpid());
+ sprintf(cookie, "--test--%d--", getpid());
sprintf(cmd, "%s/sendcommand -h%s ECHO %s 2>&1",
setup_directory,
#endif
char buf[SIZ];
char setupmsg[SIZ];
+ char *dialog_result;
+ FILE *fp = NULL;
strcpy(setupmsg, "");
if (strlen(buf) != 0)
strcpy(str, buf);
break;
+
+ case UI_DIALOG:
+ dialog_result = tmpnam(NULL);
+ sprintf(buf, "exec %s --backtitle '%s' --inputbox '%s' 19 72 '%s' 2>%s",
+ getenv("CTDL_DIALOG"),
+ prompt_title,
+ prompt_text,
+ str,
+ dialog_result);
+ system(buf);
+ fp = fopen(dialog_result, "r");
+ if (fp != NULL) {
+ fgets(str, sizeof buf, fp);
+ if (str[strlen(str)-1] == 10) {
+ str[strlen(str)-1] = 0;
+ }
+ fclose(fp);
+ unlink(dialog_result);
+ }
+ break;
+
#ifdef HAVE_NEWT
case UI_NEWT:
prompt_title);
form = newtForm(NULL, NULL, 0);
for (i=0; i<num_tokens(prompt_text, '\n'); ++i) {
- extract_token(buf, prompt_text, i, '\n');
+ extract_token(buf, prompt_text, i, '\n', sizeof buf);
newtFormAddComponent(form, newtLabel(1, 1+i, buf));
}
newtFormAddComponent(form,
{
int i;
struct passwd *pw;
- char bbsuidname[SIZ];
+ char ctdluidname[SIZ];
switch (curr) {
case 2:
#ifdef __CYGWIN__
- config.c_bbsuid = 0; /* XXX Windows hack, prob. insecure */
+ config.c_ctdluid = 0; /* XXX Windows hack, prob. insecure */
#else
- i = config.c_bbsuid;
+ i = config.c_ctdluid;
pw = getpwuid(i);
if (pw == NULL) {
set_int_val(curr, &i);
- config.c_bbsuid = i;
+ config.c_ctdluid = i;
}
else {
- strcpy(bbsuidname, pw->pw_name);
- set_str_val(curr, bbsuidname);
- pw = getpwnam(bbsuidname);
+ strcpy(ctdluidname, pw->pw_name);
+ set_str_val(curr, ctdluidname);
+ pw = getpwnam(ctdluidname);
if (pw != NULL) {
- config.c_bbsuid = pw->pw_uid;
+ config.c_ctdluid = pw->pw_uid;
}
- else if (atoi(bbsuidname) > 0) {
- config.c_bbsuid = atoi(bbsuidname);
+ else if (atoi(ctdluidname) > 0) {
+ config.c_ctdluid = atoi(ctdluidname);
}
}
#endif
int discover_ui(void)
{
+ /* Use "dialog" if we have it */
+ if (getenv("CTDL_DIALOG") != NULL) {
+ return UI_DIALOG;
+ }
+
+
#ifdef HAVE_NEWT
newtInit();
newtCls();
}
/* Get started in a valid setup directory. */
- strcpy(setup_directory, BBSDIR);
+ strcpy(setup_directory, CTDLDIR);
if ( (using_web_installer) && (getenv("CITADEL") != NULL) ) {
strcpy(setup_directory, getenv("CITADEL"));
}
/* See if we need to shut down the Citadel service. */
for (a=0; a<=3; ++a) {
progress("Shutting down the Citadel service...", a, 3);
- if (a == 0) shutdown_service();
+ if (a == 0) shutdown_citserver();
sleep(1);
}
if (config.c_sleeping == 0) {
config.c_sleeping = 900;
}
- if (config.c_bbsuid == 0) {
+ if (config.c_ctdluid == 0) {
pw = getpwnam("citadel");
if (pw != NULL)
- config.c_bbsuid = pw->pw_uid;
+ config.c_ctdluid = pw->pw_uid;
}
- if (config.c_bbsuid == 0) {
+ if (config.c_ctdluid == 0) {
pw = getpwnam("bbs");
if (pw != NULL)
- config.c_bbsuid = pw->pw_uid;
+ config.c_ctdluid = pw->pw_uid;
}
- if (config.c_bbsuid == 0) {
+ if (config.c_ctdluid == 0) {
pw = getpwnam("guest");
if (pw != NULL)
- config.c_bbsuid = pw->pw_uid;
+ config.c_ctdluid = pw->pw_uid;
}
if (config.c_createax == 0) {
config.c_createax = 3;
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;
/* Go through a series of dialogs prompting for config info */
if (setup_type != UI_SILENT) {
}
/*
- if (setuid(config.c_bbsuid) != 0) {
+ if (setuid(config.c_ctdluid) != 0) {
important_message("Citadel Setup",
"Failed to change the user ID to your Citadel user.");
cleanup(errno);
disable_other_mta("popd");
disable_other_mta("pop3d");
disable_other_mta("exim");
+ disable_other_mta("dovecot");
+ disable_other_mta("hula");
#endif
- if ((pw = getpwuid(config.c_bbsuid)) == NULL)
+ if ((pw = getpwuid(config.c_ctdluid)) == NULL)
gid = getgid();
else
gid = pw->pw_gid;
progress("Setting file permissions", 0, 4);
- chown(".", config.c_bbsuid, gid);
+ chown(".", config.c_ctdluid, gid);
+ sleep(1);
progress("Setting file permissions", 1, 4);
- chown("citadel.config", config.c_bbsuid, gid);
+ chown("citadel.config", config.c_ctdluid, gid);
+ sleep(1);
progress("Setting file permissions", 2, 4);
snprintf(aaa, sizeof aaa,
"find . | grep -v chkpwd | xargs chown %ld:%ld 2>/dev/null",
- (long)config.c_bbsuid, (long)gid);
+ (long)config.c_ctdluid, (long)gid);
system(aaa);
+ sleep(1);
progress("Setting file permissions", 3, 4);
chmod("citadel.config", S_IRUSR | S_IWUSR);
+ sleep(1);
progress("Setting file permissions", 4, 4);
#ifdef HAVE_LDAP
if (strlen(citserver_init_entry) > 0) {
for (a=0; a<=3; ++a) {
progress("Starting the Citadel service...", a, 3);
- if (a == 0) start_the_service();
+ if (a == 0) start_citserver();
sleep(1);
}
if (test_server() == 0) {
important_message("Setup finished",
- "Setup is finished. You may now log in.");
+ "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 finished",
char slapd_init_entry[SIZ];
FILE *fp;
- /* If conditions are not ideal, give up on this idea. */
+ /* If conditions are not ideal, give up on this idea... */
if (using_web_installer == 0) return;
if (getenv("LDAP_CONFIG") == NULL) return;
if (getenv("SUPPORT") == NULL) return;
if (getenv("SLAPD_BINARY") == NULL) return;
if (getenv("CITADEL") == NULL) return;
- /* Otherwise, prompt the user to create an entry. */
+ /* And if inittab is already starting slapd, bail out... */
+ locate_init_entry(slapd_init_entry, getenv("SLAPD_BINARY"));
+ if (strlen(slapd_init_entry) > 0) {
+ important_message("Citadel Setup",
+ "You appear to already have a standalone LDAP "
+ "service\nconfigured for use with Citadel. No "
+ "changes will be made.\n");
+ /* set_init_entry(slapd_init_entry, "off"); */
+ return;
+ }
+
+ /* Generate a unique entry name for slapd if we don't have one. */
+ else {
+ generate_entry_name(slapd_init_entry);
+ }
+
+ /* Ask the user if it's ok to set up slapd automatically. */
snprintf(question, sizeof question,
"\n"
"Do you want this computer configured to start a standalone\n"
- "LDAP service automatically? (If you answer yes, a custom\n"
+ "LDAP service automatically? (If you answer yes, a new\n"
"slapd.conf will be written, and an /etc/inittab entry\n"
"pointing to %s will be added.)\n"
"\n",
"\n"
"Please enter the Base DN for your directory. This will\n"
"generally be something based on the primary DNS domain in\n"
- "which you receive mail, but it doesn't have to be. Your\n"
+ "which you receive mail, but it does not have to be. Your\n"
"LDAP tree will be built using this Distinguished Name.\n"
"\n",
config.c_ldap_base_dn
config.c_ldap_port = 389;
sprintf(config.c_ldap_bind_dn, "cn=manager,%s", config.c_ldap_base_dn);
- /* FIXME ... make the generated password harder to guess */
- sprintf(config.c_ldap_bind_pw, "%d%ld", getpid(), time(NULL));
+ /*
+ * Generate a bind password. If you're some grey hat hacker who
+ * is just dying to get some street cred on Bugtraq, and you think
+ * this password generation scheme is too weak, please submit a patch
+ * instead of just whining about it, ok?
+ */
+ sprintf(config.c_ldap_bind_pw, "%d%ld", getpid(), (long)time(NULL));
write_config_to_disk();
/* This is where our OpenLDAP server will keep its data. */
mkdir("openldap-data", 0700);
- /* If inittab is already starting slapd, disable the old entry. */
- locate_init_entry(slapd_init_entry, getenv("SLAPD_BINARY"));
- if (strlen(slapd_init_entry) > 0) {
- set_init_entry(slapd_init_entry, "off");
- }
-
- /* Generate a unique entry name for slapd */
- generate_entry_name(slapd_init_entry);
-
- /* Now write it out to /etc/inittab */
- /* FIXME make it run as some non-root user */
+ /* Now write it out to /etc/inittab.
+ * FIXME make it run as some non-root user.
+ * The "-d 0" seems superfluous, but it's actually a way to make
+ * slapd run in the foreground without spewing messages to the console.
+ */
fp = fopen("/etc/inittab", "a");
if (fp == NULL) {
display_error(strerror(errno));
} else {
fprintf(fp, "# Start the OpenLDAP server for Citadel...\n");
- fprintf(fp, "%s:2345:respawn:%s -d 1 -f %s\n",
+ fprintf(fp, "%s:2345:respawn:%s -d 0 -f %s\n",
slapd_init_entry,
getenv("SLAPD_BINARY"),
getenv("LDAP_CONFIG")
projects / citadel.git / blobdiff