Implemented client configuration of the new RBL handling option

diff --git a/citadel/control.c b/citadel/control.c
index 91731ce5e84a95916966122221550767b3aa35c4..fe596d41a5eb636aecbf552c3cd3d47bae009733 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -256,6 +256,7 @@ void cmd_conf(char *argbuf)
                cprintf("%d\n", config.c_funambol_port);
                cprintf("%s\n", config.c_funambol_source);
                cprintf("%s\n", config.c_funambol_auth);
+               cprintf("%d\n", config.c_rbl_at_greeting);
                cprintf("000\n");
        }
 
@@ -480,6 +481,9 @@ void cmd_conf(char *argbuf)
                                        buf,
                                        sizeof config.c_funambol_auth);
                                break;
+                       case 57:
+                               config.c_rbl_at_greeting = atoi(buf);
+                               break;
                        }
                        ++a;
                }

diff --git a/citadel/routines2.c b/citadel/routines2.c
index a5b5cd50d0e84d0e3253705f9c93ccf93bcb3dfb..3a9673c4fe51ab5a17dd9951dad89cbafc3effb7 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 57
+#define NUM_CONFIGS 58
 
        char buf[256];
        char sc[NUM_CONFIGS][256];
@@ -764,6 +764,9 @@ void do_system_configuration(CtdlIPC *ipc)
        snprintf(sc[45], sizeof sc[45], "%d", (boolprompt(
                "Allow unauthenticated SMTP clients to spoof my domains",
                atoi(&sc[45][0]))));
+       snprintf(sc[57], sizeof sc[57], "%d", (boolprompt(
+               "Perform RBL checks at greeting instead of after RCPT",
+               atoi(&sc[57][0]))));
        snprintf(sc[44], sizeof sc[44], "%d", (boolprompt(
                "Instantly expunge deleted IMAP messages",
                atoi(&sc[44][0]))));