From 0150f231386b3d980a62c994f496b459fa02779f57aecfc0073d15ff230ea85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 6 May 2011 18:59:57 +0000
Subject: [PATCH] - Don't pass DKIM compound log line as format string;
 (beo#1106); (bnc#692227).

OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=104
---
 337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff | 34 +++++++++++++++++++
 exim.changes                                  |  5 +++
 exim.spec                                     |  2 ++
 3 files changed, 41 insertions(+)
 create mode 100644 337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff

diff --git a/337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff b/337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff
new file mode 100644
index 0000000..0af5b71
--- /dev/null
+++ b/337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff
@@ -0,0 +1,34 @@
+From 337e3505b0e6cd4309db6bf6062b33fa56e06cf8 Mon Sep 17 00:00:00 2001
+From: Tom Kistner <tom@tahini.csx.cam.ac.uk>
+Date: Sat, 30 Apr 2011 13:20:17 +0100
+Subject: [PATCH] Bugzilla #1106: Don't pass DKIM compound log line as format string
+
+---
+ src/src/dkim.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/src/dkim.c b/src/src/dkim.c
+index e25ff8c..2318cc3 100644
+--- a/src/src/dkim.c
++++ b/src/src/dkim.c
+@@ -108,7 +108,7 @@ void dkim_exim_verify_finish(void) {
+     /* Log a line for each signature */
+     uschar *logmsg = string_append(NULL, &size, &ptr, 5,
+ 
+-      string_sprintf( "DKIM: d=%s s=%s c=%s/%s a=%s ",
++      string_sprintf( "d=%s s=%s c=%s/%s a=%s ",
+                       sig->domain,
+                       sig->selector,
+                       (sig->canon_headers == PDKIM_CANON_SIMPLE)?"simple":"relaxed",
+@@ -176,7 +176,7 @@ void dkim_exim_verify_finish(void) {
+     }
+ 
+     logmsg[ptr] = '\0';
+-    log_write(0, LOG_MAIN, (char *)logmsg);
++    log_write(0, LOG_MAIN, "DKIM: %s", logmsg);
+ 
+     /* Build a colon-separated list of signing domains (and identities, if present) in dkim_signers */
+     dkim_signers = string_append(dkim_signers,
+-- 
+1.6.3.2
+
diff --git a/exim.changes b/exim.changes
index 2886c46..8c309d5 100644
--- a/exim.changes
+++ b/exim.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May  6 18:18:00 UTC 2011 - lars@samba.org
+
+- Don't pass DKIM compound log line as format string; (beo#1106); (bnc#692227).
+
 -------------------------------------------------------------------
 Thu Mar 10 18:30:11 UTC 2011 - poeml@cmdline.net
 
diff --git a/exim.spec b/exim.spec
index 9fb76bf..83232cf 100644
--- a/exim.spec
+++ b/exim.spec
@@ -63,6 +63,7 @@ Source30:       eximstats-html-update.py
 Source31:       eximstats.conf
 Patch:          exim-4.12-tail.patch
 Patch1:         aa097c4c00f62487128d74f65c521f9e877b184f.diff
+Patch2:         337e3505b0e6cd4309db6bf6062b33fa56e06cf8.diff
 %if !%{?build_with_mysql:1}0 && !%{?build_with_pgsql:1}0 
 
 %package -n eximon
@@ -130,6 +131,7 @@ Authors:
 %setup -q -n exim-%{version}
 %patch
 %patch1 -p1
+%patch1 -p2
 # build with fPIE/pie on SUSE 10.0 or newer, or on any other platform
 %if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930
 fPIE="-fPIE"