Merge branch 'ConstStr_Access_Checks' into 'master'

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

diff --git a/citadel/server/modules/smtp/serv_smtpclient.c b/citadel/server/modules/smtp/serv_smtpclient.c
index 12c11098aff01009defed52f84982a4f83145de3..5bbc77d1720007e582d8efc3423b5c34691cbd55 100644 (file)
--- a/citadel/server/modules/smtp/serv_smtpclient.c
+++ b/citadel/server/modules/smtp/serv_smtpclient.c
@@ -167,12 +167,6 @@ void trim_response(long response_code, char *response) {
                return;
        }
 
-       char *t = malloc(strlen(response));
-       if (!t) {
-               return;
-       }
-       t[0] = 0;
-
        char *p;
        for (p = response; *p != 0; ++p) {
                if ( (*p != '\n') && (!isprint(*p)) ) {         // expunge any nonprintables except for newlines
@@ -518,7 +512,10 @@ void smtp_do_queue(int type_of_queue_run) {
        doing_smtpclient = 1;
        end_critical_section(S_SMTPQUEUE);
 
-       syslog(LOG_DEBUG, "smtpclient: start queue run , last_queue_job_processed=%ld , last_queue_job_submitted=%ld", last_queue_job_processed, last_queue_job_submitted);
+       syslog(LOG_DEBUG, "smtpclient: start %s queue run , last_queue_job_processed=%ld , last_queue_job_submitted=%ld",
+               (type_of_queue_run == QUICK_QUEUE_RUN ? "quick" : "full"),
+               last_queue_job_processed, last_queue_job_submitted
+       );
 
        if (CtdlGetRoom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) {
                syslog(LOG_WARNING, "smtpclient: cannot find room <%s>", SMTP_SPOOLOUT_ROOM);
@@ -546,16 +543,20 @@ void smtp_do_queue(int type_of_queue_run) {
        );
 
        // We are ready to run through the queue now.
+       syslog(LOG_DEBUG, "smtpclient: %d messages to be processed", array_len(smtp_queue));
        for (i = 0; i < array_len(smtp_queue); ++i) {
                long m;
                memcpy(&m, array_get_element_at(smtp_queue, i), sizeof(long));
                smtp_process_one_msg(m);
-               last_queue_job_processed = m;
        }
 
        array_free(smtp_queue);
+       last_queue_job_processed = last_queue_job_submitted;
        doing_smtpclient = 0;
-       syslog(LOG_DEBUG, "smtpclient: end queue run , last_queue_job_processed=%ld , last_queue_job_submitted=%ld", last_queue_job_processed, last_queue_job_submitted);
+       syslog(LOG_DEBUG, "smtpclient: end %s queue run , last_queue_job_processed=%ld , last_queue_job_submitted=%ld",
+               (type_of_queue_run == QUICK_QUEUE_RUN ? "quick" : "full"),
+               last_queue_job_processed, last_queue_job_submitted
+       );
 }