Debug: build a summary string tracking transport SMTP commands & responses

[exim.git] / src / src / queue.c

diff --git a/src/src/queue.c b/src/src/queue.c
index 93d69f89f2e6de00f777242d6fef4e07cc74e24e..2933c5439841055d450e9130ff007f212a3b0299 100644 (file)
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -214,8 +214,8 @@ for (; i <= *subcount; i++)
        (*pcount)++;
       else
        {
-       queue_filename *next =
-         store_get(sizeof(queue_filename) + Ustrlen(name), is_tainted(name));
+       queue_filename * next =
+         store_get(sizeof(queue_filename) + Ustrlen(name), name);
        Ustrcpy(next->text, name);
        next->dir_uschar = subdirchar;
 
@@ -901,8 +901,8 @@ if (count > 0)
   queue_filename *last = NULL;
   for (int i = 0; i < count; i++)
     {
-    queue_filename *next =
-      store_get(sizeof(queue_filename) + Ustrlen(list[i]) + 2, is_tainted(list[i]));
+    queue_filename * next =
+      store_get(sizeof(queue_filename) + Ustrlen(list[i]) + 2, list[i]);
     sprintf(CS next->text, "%s-H", list[i]);
     next->dir_uschar = '*';
     next->next = NULL;
@@ -1348,15 +1348,15 @@ switch(action)
            deliver_domain = dom
              ? CUS string_copyn(addr+dom, end - dom) : CUS"";
 
-           event_raise(event_action, US"msg:fail:internal",
-             string_sprintf("message removed by %s", username));
+           (void) event_raise(event_action, US"msg:fail:internal",
+             string_sprintf("message removed by %s", username), NULL);
 
            deliver_localpart = save_local;
            deliver_domain = save_domain;
            }
          }
        }
-      (void) event_raise(event_action, US"msg:complete", NULL);
+      (void) event_raise(event_action, US"msg:complete", NULL, NULL);
 #endif
       log_write(0, LOG_MAIN, "removed by %s", username);
       log_write(0, LOG_MAIN, "Completed");