fix build for Solaris

[citadel.git] / citadel / routines2.c

diff --git a/citadel/routines2.c b/citadel/routines2.c
index 111864869a63ac22e01db53c23c6b37aba6a169b..374464cbbc91c95579ad9b7f9faa3f8c9374a357 100644 (file)
--- a/citadel/routines2.c
+++ b/citadel/routines2.c
@@ -44,6 +44,11 @@
 #endif
 #include "screen.h"
 
+/* work around solaris include files */
+#ifdef reg
+#undef reg
+#endif
+
 extern char temp[];
 extern char tempdir[];
 extern char *axdefs[7];
@@ -195,7 +200,12 @@ void updatels(CtdlIPC *ipc)
                r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?
                                 maxmsgnum : highest_msg_read, buf);
        } else {
-               r = CtdlIPCSetLastRead(ipc, maxmsgnum, buf);
+               r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?
+                                maxmsgnum : highest_msg_read, buf);
+/*             r = CtdlIPCSetLastRead(ipc, maxmsgnum, buf); */
+/* This is a quick-and-dirty fix to all msgs becoming new in Mail>.
+ * It will need to be rethought when messages.c is rewritten.
+ */
        }
        if (r / 100 != 2)
                scr_printf("%s\n", buf);
@@ -694,7 +704,7 @@ void do_system_configuration(CtdlIPC *ipc)
        snprintf(sc[26], sizeof sc[26], "%d", (boolprompt(
              "Allow Aides to Zap (forget) rooms",
                                                     atoi(&sc[26][0]))));
-       snprintf(sc[30], sizeof sc[29], "%d", (boolprompt(
+       snprintf(sc[30], sizeof sc[30], "%d", (boolprompt(
              "Allow system Aides access to user mailboxes",
                                                     atoi(&sc[30][0]))));
 
@@ -722,9 +732,19 @@ void do_system_configuration(CtdlIPC *ipc)
        */
 
        strprompt("How often to run network jobs (in seconds)", &sc[28][0], 5);
-       strprompt("SMTP server port (-1 to disable)", &sc[24][0], 5);
        strprompt("POP3 server port (-1 to disable)", &sc[23][0], 5);
        strprompt("IMAP server port (-1 to disable)", &sc[27][0], 5);
+       strprompt("SMTP server port (-1 to disable)", &sc[24][0], 5);
+
+       /* This logic flips the question around, because it's one of those
+        * situations where 0=yes and 1=no
+        */
+       a = atoi(sc[25]);
+       a = (a ? 0 : 1);
+       a = boolprompt("Correct forged From: lines during authenticated SMTP",
+               a);
+       a = (a ? 0 : 1);
+       snprintf(sc[25], sizeof sc[25], "%d", a);
 
        /* Expiry settings */
        strprompt("Default user purge time (days)", &sc[16][0], 5);