Correct issue with relaxed/simple handling. Fixes: #910

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 67529ad2fa94466803f9ead4b2f149ab72ceb27c..0d6e81facab3bf9bbb19f8c629858da5d4b64393 100644 (file)
--- 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 bcf12ce1ebdc5cb6586b2aab0f5114e23642e585..15e2b2ce20864e842fd0fd50262c7564351003e8 100644 (file)
--- 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;