* initiall sieve listing support. authentication works now, we at least answer with...

[citadel.git] / citadel / routines2.c

diff --git a/citadel/routines2.c b/citadel/routines2.c
index 0248095359cb5037f04069b5b6a0354b9c0f84df..068cf9bba29469d4e76c978b5723d5df43ac2cc8 100644 (file)
--- a/citadel/routines2.c
+++ b/citadel/routines2.c
@@ -644,7 +644,7 @@ void read_bio(CtdlIPC *ipc)
 void do_system_configuration(CtdlIPC *ipc)
 {
 
-#define NUM_CONFIGS 44
+#define NUM_CONFIGS 52
 
        char buf[SIZ];
        char sc[NUM_CONFIGS][256];
@@ -682,7 +682,7 @@ void do_system_configuration(CtdlIPC *ipc)
        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);
@@ -743,6 +743,8 @@ void do_system_configuration(CtdlIPC *ipc)
        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
@@ -753,6 +755,12 @@ void do_system_configuration(CtdlIPC *ipc)
                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) {
@@ -836,6 +844,17 @@ void do_system_configuration(CtdlIPC *ipc)
                "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? ");
        if (yesno()) {
@@ -1040,8 +1059,8 @@ void network_config_management(CtdlIPC *ipc, char *entrytype, char *comment)
                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) {