nm4 2009/11/12 13:02:17 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src dkim.c
Log:
Correct issue with relaxed/simple handling. Fixes: #910
Revision Changes Path
1.591 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.9 +1 -1 exim/exim-src/src/dkim.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.590
retrieving revision 1.591
diff -u -r1.590 -r1.591
--- ChangeLog 12 Nov 2009 08:34:23 -0000 1.590
+++ ChangeLog 12 Nov 2009 13:02:16 -0000 1.591
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.590 2009/11/12 08:34:23 nm4 Exp $
+$Cambridge: exim/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/36 Bugzilla 909: Correct connect() call in dcc code
+NM/36 Bugzilla 910: Correct issue with relaxed/simple handling
+
Exim version 4.69
-----------------
Index: dkim.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/dkim.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dkim.c 9 Nov 2009 14:31:24 -0000 1.8
+++ dkim.c 12 Nov 2009 13:02:17 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/dkim.c,v 1.8 2009/11/09 14:31:24 tom Exp $ */
+/* $Cambridge: exim/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 @@
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;
