more tiny merge misses

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

diff --git a/citadel/modules/smtp/serv_smtpclient.c b/citadel/modules/smtp/serv_smtpclient.c
index 1a906bfd66faf3a1f511784c5c9862a9e8a3f0a5..cec2f9bd0c1d21a1f1b3e3e65b4fac8e50318b1e 100644 (file)
--- a/citadel/modules/smtp/serv_smtpclient.c
+++ b/citadel/modules/smtp/serv_smtpclient.c
@@ -962,6 +962,7 @@ void smtp_do_queue(void) {
                num_processed = CtdlForEachMessage(MSGS_ALL, 0L, NULL, SPOOLMIME, NULL, smtp_do_procmsg, NULL);
        }
        syslog(LOG_INFO, "SMTP client: queue run completed; %d messages processed", num_processed);
+       run_queue_now = 0;
        is_running = 0;
 }
 
@@ -1000,9 +1001,8 @@ CTDL_MODULE_INIT(smtp_client)
                CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER);
                CtdlRegisterProtoHook(cmd_smtp, "SMTP", "SMTP utility commands");
        }
-       
 #endif
-       /* return our Subversion id for the Log */
-       return "smtpclient";
+       /* return our module name for the log */
+       return "smtp";
 }