chdir(tempdir);
switch (c) {
case 0:
- sttybbs(0);
+ stty_ctdl(0);
scr_printf("Receiving %s - press Ctrl-D to end.\n", flnm);
fp = fopen(flnm, "w");
do {
exit(0);
case 1:
screen_reset();
- sttybbs(3);
+ stty_ctdl(3);
execlp("rx", "rx", flnm, NULL);
exit(1);
case 2:
screen_reset();
- sttybbs(3);
+ stty_ctdl(3);
execlp("rb", "rb", NULL);
exit(1);
case 3:
screen_reset();
- sttybbs(3);
+ stty_ctdl(3);
execlp("rz", "rz", NULL);
exit(1);
}
do {
b = ka_wait(&a);
} while ((b != xfer_pid) && (b != (-1)));
- sttybbs(0);
+ stty_ctdl(0);
screen_set();
if (a != 0) {
int a, b;
screen_reset();
- sttybbs(SB_RESTORE);
+ stty_ctdl(SB_RESTORE);
a = fork();
if (a == 0) {
signal(SIGINT, SIG_DFL);
do {
b = ka_wait(NULL);
} while ((a != b) && (a != (-1)));
- sttybbs(0);
+ stty_ctdl(0);
screen_set();
}
void do_system_configuration(CtdlIPC *ipc)
{
-#define NUM_CONFIGS 42
+#define NUM_CONFIGS 52
char buf[SIZ];
- char sc[NUM_CONFIGS][SIZ];
+ char sc[NUM_CONFIGS][256];
char *resp = NULL;
struct ExpirePolicy *site_expirepolicy = NULL;
struct ExpirePolicy *mbx_expirepolicy = NULL;
int a;
int logpages = 0;
int r; /* IPC response code */
+ int server_configs = 0;
/* Clear out the config buffers */
memset(&sc[0][0], 0, sizeof(sc));
/* Fetch the current config */
r = CtdlIPCGetSystemConfig(ipc, &resp, buf);
if (r / 100 == 1) {
- a = 0;
- while (strlen(resp)) {
- extract_token(buf, resp, 0, '\n', sizeof buf);
- remove_token(resp, 0, '\n');
+ server_configs = num_tokens(resp, '\n');
+ for (a=0; a<server_configs; ++a) {
if (a < NUM_CONFIGS) {
- strcpy(&sc[a][0], buf);
+ extract_token(&sc[a][0], resp, a, '\n', sizeof sc[a]);
}
- ++a;
}
}
if (resp) free(resp);
strprompt("Node name", &sc[0][0], 15);
strprompt("Fully qualified domain name", &sc[1][0], 63);
strprompt("Human readable node name", &sc[2][0], 20);
- strprompt("Modem dialup number", &sc[3][0], 15);
+ strprompt("Telephone number", &sc[3][0], 15);
strprompt("Geographic location of this system", &sc[12][0], 31);
strprompt("Name of system administrator", &sc[13][0], 25);
strprompt("Paginator prompt", &sc[10][0], 79);
/* Security parameters */
snprintf(sc[7], sizeof sc[7], "%d", (boolprompt(
- "Require registration for new users",
- atoi(&sc[7][0]))));
+ "Require registration for new users",
+ atoi(&sc[7][0]))));
snprintf(sc[29], sizeof sc[29], "%d", (boolprompt(
- "Disable self-service user account creation",
- atoi(&sc[29][0]))));
+ "Disable self-service user account creation",
+ atoi(&sc[29][0]))));
strprompt("Initial access level for new users", &sc[6][0], 1);
strprompt("Access level required to create rooms", &sc[19][0], 1);
snprintf(sc[4], sizeof sc[4], "%d", (boolprompt(
- "Automatically give room aide privs to a user who creates a private room",
- atoi(&sc[4][0]))));
+ "Automatically give room aide privs to a user who creates a private room",
+ atoi(&sc[4][0]))));
snprintf(sc[8], sizeof sc[8], "%d", (boolprompt(
- "Automatically move problem user messages to twit room",
- atoi(&sc[8][0]))));
+ "Automatically move problem user messages to twit room",
+ atoi(&sc[8][0]))));
strprompt("Name of twit room", &sc[9][0], ROOMNAMELEN);
snprintf(sc[11], sizeof sc[11], "%d", (boolprompt(
- "Restrict Internet mail to only those with that privilege",
- atoi(&sc[11][0]))));
+ "Restrict Internet mail to only those with that privilege",
+ atoi(&sc[11][0]))));
snprintf(sc[26], sizeof sc[26], "%d", (boolprompt(
- "Allow Aides to Zap (forget) rooms",
- atoi(&sc[26][0]))));
+ "Allow Aides to Zap (forget) rooms",
+ atoi(&sc[26][0]))));
if (strlen(&sc[18][0]) > 0) logpages = 1;
else logpages = 0;
strprompt("Maximum message length", &sc[20][0], 20);
strprompt("Minimum number of worker threads", &sc[21][0], 3);
strprompt("Maximum number of worker threads", &sc[22][0], 3);
+ snprintf(sc[43], sizeof sc[43], "%d", (boolprompt(
+ "Automatically delete committed database logs",
+ atoi(&sc[43][0]))));
strprompt("Server IP address (0.0.0.0 for 'any')", &sc[37][0], 15);
strprompt("POP3 server port (-1 to disable)", &sc[23][0], 5);
strprompt("SMTP MTA server port (-1 to disable)", &sc[24][0], 5);
strprompt("SMTP MSA server port (-1 to disable)", &sc[38][0], 5);
strprompt("SMTPS server port (-1 to disable)", &sc[41][0], 5);
+ strprompt("Postfix TCP Dictionary Port server port (-1 to disable)", &sc[50][0], 5);
+ strprompt("ManageSieve server port (-1 to disable)", &sc[51][0], 5);
/* This logic flips the question around, because it's one of those
* situations where 0=yes and 1=no
a);
a = (a ? 0 : 1);
snprintf(sc[25], sizeof sc[25], "%d", a);
+ snprintf(sc[45], sizeof sc[45], "%d", (boolprompt(
+ "Allow unauthenticated SMTP clients to spoof my domains",
+ atoi(&sc[45][0]))));
+ snprintf(sc[44], sizeof sc[44], "%d", (boolprompt(
+ "Instantly expunge deleted IMAP messages",
+ atoi(&sc[44][0]))));
/* LDAP settings */
if (ipc->ServInfo.supports_ldap) {
strprompt("How often to run network jobs (in seconds)", &sc[28][0], 5);
strprompt("Hour to run purges (0-23)", &sc[31][0], 2);
+ snprintf(sc[42], sizeof sc[42], "%d", (boolprompt(
+ "Enable full text search index (warning: resource intensive)",
+ atoi(&sc[42][0]))));
+
+ snprintf(sc[46], sizeof sc[46], "%d", (boolprompt(
+ "Perform journaling of email messages",
+ atoi(&sc[46][0]))));
+ snprintf(sc[47], sizeof sc[47], "%d", (boolprompt(
+ "Perform journaling of non-email messages",
+ atoi(&sc[47][0]))));
+ if ( (atoi(&sc[46][0])) || (atoi(&sc[47][0])) ) {
+ strprompt("Email destination of journalized messages",
+ &sc[48][0], 127);
+ }
/* Save it */
scr_printf("Save this configuration? ");
return;
}
- snprintf(filename, sizeof filename, "%s.listedit", tmpnam(NULL));
- snprintf(changefile, sizeof changefile, "%s.listedit", tmpnam(NULL));
+ CtdlMakeTempFileName(filename, sizeof filename);
+ CtdlMakeTempFileName(changefile, sizeof changefile);
tempfp = fopen(filename, "w");
if (tempfp == NULL) {
e_ex_code = 1; /* start with a failed exit code */
screen_reset();
- sttybbs(SB_RESTORE);
+ stty_ctdl(SB_RESTORE);
editor_pid = fork();
cksum = file_checksum(filename);
if (editor_pid == 0) {
b = ka_wait(&e_ex_code);
} while ((b != editor_pid) && (b >= 0));
editor_pid = (-1);
- sttybbs(0);
+ stty_ctdl(0);
screen_set();
}
projects / citadel.git / blobdiff