summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Jetmore <jj33@pobox.com>2010-06-03 15:20:41 +0000
committerJohn Jetmore <jj33@pobox.com>2010-06-03 15:20:41 +0000
commita8c8d6b5abcc66b6bbbf8d7c453410a55b2d0e91 (patch)
tree2b122f83eca66953852944505eb116a5293fc8c7
parent8a483da652e021e51ee3f4dd83cd34e53c986b35 (diff)
Added DISABLE_DKIM option to EDITME, leaving some breadcrumbs about it being turned on by default
-rw-r--r--doc/doc-txt/ChangeLog4
-rw-r--r--doc/doc-txt/NewStuff5
-rw-r--r--src/src/EDITME12
3 files changed, 18 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 72fca4c2d..7b560e527 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.615 2010/06/03 08:19:13 pdp Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.616 2010/06/03 15:20:41 jetmore Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -12,6 +12,8 @@ PP/01 Date: & Message-Id: revert to normally being appended to a message,
PP/02 Include check_rfc2047_length in configure.default because we're seeing
increasing numbers of administrators be bitten by this.
+JJ/01 Added DISABLE_DKIM and comment to src/EDITME
+
Exim version 4.72
-----------------
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index e15453caa..b42c0d07c 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.164 2010/06/01 11:21:30 pdp Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.165 2010/06/03 15:20:41 jetmore Exp $
New Features in Exim
--------------------
@@ -44,6 +44,9 @@ Version 4.70 / 4.71
-------------------
1. Native DKIM support without an external library.
+ (Note that if no action to prevent it is taken, a straight upgrade will
+ result in DKIM verification of all signed incoming emails. See spec
+ for details on conditionally disabling)
2. Experimental DCC support via dccifd (contributed by Wolfgang Breyha).
diff --git a/src/src/EDITME b/src/src/EDITME
index 3ee1663af..02f2fead0 100644
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/src/EDITME,v 1.23 2009/11/20 12:18:19 nm4 Exp $
+# $Cambridge: exim/src/src/EDITME,v 1.24 2010/06/03 15:20:41 jetmore Exp $
##################################################
# The Exim mail transport agent #
@@ -353,6 +353,16 @@ EXIM_MONITOR=eximon.bin
# WITH_OLD_DEMIME=yes
#------------------------------------------------------------------------------
+# By default Exim includes code to support DKIM (DomainKeys Identified
+# Mail, RFC4871) signing and verification. Verification of signatures is
+# turned on by default. See the spec for information on conditionally
+# disabling it. To disable the inclusion of the entire feature, set
+# DISABLE_DKIM to "yes"
+
+# DISABLE_DKIM=yes
+
+
+#------------------------------------------------------------------------------
# Compiling Exim with experimental features. These are documented in
# experimental-spec.txt. "Experimental" means that the way these features are
# implemented may still change. Backward compatibility is not guaranteed.