Began working on the 'clean shutdown' code for the new thread architecture.

[citadel.git] / citadel / modules / smtp / serv_smtp.c

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index e2d9766a68826c900bb42f0431b26137b9c1c5bf..885bf950f1193111294a3ddaa515868a2910fb93 100644 (file)
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -131,7 +131,7 @@ void smtp_greeting(int is_msa)
         */
        if ( (config.c_rbl_at_greeting) && (sSMTP->is_msa == 0) ) {
                if (rbl_check(message_to_spammer)) {
-                       if (CtdlThreadCheckStop())
+                       if (server_shutting_down)
                                cprintf("421 %s\r\n", message_to_spammer);
                        else
                                cprintf("550 %s\r\n", message_to_spammer);
@@ -584,7 +584,7 @@ void smtp_rcpt(char *argbuf) {
           && (!sSMTP->is_lmtp) ) {     /* Don't RBL LMTP clients */
                if (config.c_rbl_at_greeting == 0) {    /* Don't RBL again if we already did it */
                        if (rbl_check(message_to_spammer)) {
-                               if (CtdlThreadCheckStop())
+                               if (server_shutting_down)
                                        cprintf("421 %s\r\n", message_to_spammer);
                                else
                                        cprintf("550 %s\r\n", message_to_spammer);