A "Completed" log line is now written for messages that are removed from

the spool by the -Mrm option.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index d44ebae844a146bb6727d23af8adc61b681777bb..9ae2962de47ff2ef4b2eec7af007837589ef4001 100644 (file)
--- 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
 -------------------------------------------
 
 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.)
 
 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
 -----------------
 
 Exim version 4.43
 -----------------

diff --git a/src/src/queue.c b/src/src/queue.c
index cfcb0440afb6f4de1d914af6bf8bc8e15866bec3..c3e81a09d7bb96add319939267807cf566e1e3d8 100644 (file)
--- 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    *
 
 /*************************************************
 *     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 (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;
 
 
   break;