From 089793a459ee02ce35a9c3dae9b1454d0f1f9464 Mon Sep 17 00:00:00 2001
From: Tony Finch <dot@dot.at>
Date: Tue, 22 Jan 2008 19:23:46 +0000
Subject: [PATCH] Do not log submission mode rewrites if they do not change the
 address.

---
 doc/doc-txt/ChangeLog | 4 +++-
 src/src/receive.c     | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 776151b24..4ff9535a5 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.538 2008/01/18 12:23:26 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.539 2008/01/22 19:23:47 fanf2 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -15,6 +15,8 @@ NM/02 Bugzilla 646: Removed unwanted C/R in Dovecot authenticator
       conversation.  Added nologin parameter to request.
       Patch contributed by Kirill Miazine
 
+TF/01 Do not log submission mode rewrites if they do not change the address.
+
 
 Exim version 4.69
 -----------------
diff --git a/src/src/receive.c b/src/src/receive.c
index 88f5eb2a0..4d97a1930 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/receive.c,v 1.43 2008/01/17 13:03:36 tom Exp $ */
+/* $Cambridge: exim/src/src/receive.c,v 1.44 2008/01/22 19:23:46 fanf2 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -2585,9 +2585,10 @@ if (from_header != NULL &&
     if (sender_address_unrewritten == NULL)
       sender_address_unrewritten = sender_address;
     sender_address = generated_sender_address;
-    log_write(L_address_rewrite, LOG_MAIN,
-      "\"%s\" from env-from rewritten as \"%s\" by submission mode",
-      sender_address_unrewritten, generated_sender_address);
+    if (Ustrcmp(sender_address_unrewritten, generated_sender_address) != 0)
+      log_write(L_address_rewrite, LOG_MAIN,
+        "\"%s\" from env-from rewritten as \"%s\" by submission mode",
+        sender_address_unrewritten, generated_sender_address);
     }
   }
 
-- 
2.25.1