Added log selector +smtp_no_mail to log when no MAIL is issued (for

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

diff --git a/src/src/exim.c b/src/src/exim.c
index 60e5b52617b68b49419a113e9e1d635d367c6d5c..d33a04d03325fca0f0a6870300c3f42643f4cff9 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1,10 +1,10 @@
-/* $Cambridge: exim/src/src/exim.c,v 1.50 2006/11/20 11:43:40 ph10 Exp $ */
+/* $Cambridge: exim/src/src/exim.c,v 1.52 2007/01/15 15:59:22 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2006 */
+/* Copyright (c) University of Cambridge 1995 - 2007 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
@@ -4381,6 +4381,7 @@ if (host_checking)
       if (!receive_msg(FALSE)) break;
       }
     }
+  smtp_log_no_mail();
   exim_exit(EXIT_SUCCESS);
   }
 
@@ -4636,10 +4637,15 @@ while (more)
       if (message_id[0] == 0)
         {
         if (more) continue;
+        smtp_log_no_mail();               /* Log no mail if configured */
         exim_exit(EXIT_FAILURE);
         }
       }
-    else exim_exit((rc == 0)? EXIT_SUCCESS : EXIT_FAILURE);
+    else
+      {
+      smtp_log_no_mail();               /* Log no mail if configured */
+      exim_exit((rc == 0)? EXIT_SUCCESS : EXIT_FAILURE);
+      }
     }
 
   /* In the non-SMTP case, we have all the information from the command