Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-mta/exim/files: exim-4.75-CVE-2011-1764.patch
Date: Sat, 07 May 2011 19:13:10
Message-Id: 20110507191259.D8A3320057@flycatcher.gentoo.org
1 grobian 11/05/07 19:12:59
2
3 Added: exim-4.75-CVE-2011-1764.patch
4 Log:
5 Revbump for backport of fix for CVE-2011-1764, bug #366369
6
7 (Portage version: 2.2.01.18252-prefix/cvs/Darwin powerpc)
8
9 Revision Changes Path
10 1.1 mail-mta/exim/files/exim-4.75-CVE-2011-1764.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/files/exim-4.75-CVE-2011-1764.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/files/exim-4.75-CVE-2011-1764.patch?rev=1.1&content-type=text/plain
14
15 Index: exim-4.75-CVE-2011-1764.patch
16 ===================================================================
17 http://bugs.gentoo.org/show_bug.cgi?id=366369
18
19 From: Tom Kistner <tom@×××××××××××××××××.uk>
20 Date: Sat, 30 Apr 2011 12:20:17 +0000 (+0100)
21 Subject: Bugzilla #1106: Don't pass DKIM compound log line as format string
22 X-Git-Tag: exim-4_76_RC1~2
23 X-Git-Url: http://git.exim.org/exim.git/commitdiff_plain/337e3505b0e6cd4309db6bf6062b33fa56e06cf8
24
25 Bugzilla #1106: Don't pass DKIM compound log line as format string
26 ---
27
28 diff --git a/src/src/dkim.c b/src/src/dkim.c
29 index e25ff8c..2318cc3 100644
30 --- a/src/src/dkim.c
31 +++ b/src/src/dkim.c
32 @@ -108,7 +108,7 @@ void dkim_exim_verify_finish(void) {
33 /* Log a line for each signature */
34 uschar *logmsg = string_append(NULL, &size, &ptr, 5,
35
36 - string_sprintf( "DKIM: d=%s s=%s c=%s/%s a=%s ",
37 + string_sprintf( "d=%s s=%s c=%s/%s a=%s ",
38 sig->domain,
39 sig->selector,
40 (sig->canon_headers == PDKIM_CANON_SIMPLE)?"simple":"relaxed",
41 @@ -176,7 +176,7 @@ void dkim_exim_verify_finish(void) {
42 }
43
44 logmsg[ptr] = '\0';
45 - log_write(0, LOG_MAIN, (char *)logmsg);
46 + log_write(0, LOG_MAIN, "DKIM: %s", logmsg);
47
48 /* Build a colon-separated list of signing domains (and identities, if present) in dkim_signers */
49 dkim_signers = string_append(dkim_signers,