summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2004-11-05 14:59:12 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2004-11-05 14:59:12 +0000
commit650edc6fbfceeb90635fbe3019c419387ba9542b (patch)
treeb63fc7152d899b876031c4161bd35ef98de935a1
parent926e1192c5762fc251a8f8e275f4a21119cea050 (diff)
A "Completed" log line is now written for messages that are removed from
the spool by the -Mrm option.
-rw-r--r--doc/doc-txt/ChangeLog5
-rw-r--r--src/src/queue.c8
2 files changed, 10 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index d44ebae84..9ae2962de 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.16 2004/11/05 12:33:59 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.17 2004/11/05 14:59:12 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -62,6 +62,9 @@ Exim version 4.44
16. If FIXED_NEVER_USERS was defined, but empty, Exim was assuming the uid 0
was its contents. (It was OK if the option was not defined at all.)
+17. A "Completed" log line is now written for messages that are removed from
+ the spool by the -Mrm option.
+
Exim version 4.43
-----------------
diff --git a/src/src/queue.c b/src/src/queue.c
index cfcb0440a..c3e81a09d 100644
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/queue.c,v 1.1 2004/10/07 10:39:01 ph10 Exp $ */
+/* $Cambridge: exim/src/src/queue.c,v 1.2 2004/11/05 14:59:12 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1190,7 +1190,11 @@ switch(action)
if (deliver_datafile >= 0) printf("has been removed\n");
else printf("has been removed or did not exist\n");
- if (removed) log_write(0, LOG_MAIN, "removed by %s", username);
+ if (removed)
+ {
+ log_write(0, LOG_MAIN, "removed by %s", username);
+ log_write(0, LOG_MAIN, "Completed");
+ }
break;