From 96535b98872036fb590dc53aee194956b66243ac Mon Sep 17 00:00:00 2001 From: Nigel Metheringham Date: Thu, 12 Nov 2009 13:02:16 +0000 Subject: [PATCH 1/1] Correct issue with relaxed/simple handling. Fixes: #910 --- doc/doc-txt/ChangeLog | 4 +++- src/src/dkim.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 67529ad2f..0d6e81fac 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.590 2009/11/12 08:34:23 nm4 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.591 2009/11/12 13:02:16 nm4 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -153,6 +153,8 @@ NM/35 Bugzilla 39: Base64 decode bug fixes NM/36 Bugzilla 909: Correct connect() call in dcc code +NM/36 Bugzilla 910: Correct issue with relaxed/simple handling + Exim version 4.69 ----------------- diff --git a/src/src/dkim.c b/src/src/dkim.c index bcf12ce1e..15e2b2ce2 100644 --- a/src/src/dkim.c +++ b/src/src/dkim.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/dkim.c,v 1.8 2009/11/09 14:31:24 tom Exp $ */ +/* $Cambridge: exim/src/src/dkim.c,v 1.9 2009/11/12 13:02:17 nm4 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -430,7 +430,7 @@ uschar *dkim_exim_sign(int dkim_fd, if (Ustrcmp(dkim_canon, "relaxed") == 0) pdkim_canon = PDKIM_CANON_RELAXED; else if (Ustrcmp(dkim_canon, "simple") == 0) - pdkim_canon = PDKIM_CANON_RELAXED; + pdkim_canon = PDKIM_CANON_SIMPLE; else { log_write(0, LOG_MAIN, "DKIM: unknown canonicalization method '%s', defaulting to 'relaxed'.\n",dkim_canon); pdkim_canon = PDKIM_CANON_RELAXED; -- 2.30.2