Bug-fix no_require_dnssec parsing & spelling fixes

Patches from Josh Soref fixing spelling fixed two bugs:
* Parsing `no_require_dnssec` configuration option
* Setting `_HAVE_TRANSPORT_APPEND_MAILDIR` macro (for config parsing)

[ PP pulled these two out into a separate commit to update the ChangeLog
  accordingly. ]

diff --git a/doc/doc-misc/Ext-maildir++ b/doc/doc-misc/Ext-maildir++
index 6d821fb4db94ad2fcbd69c50cbba2b3cfd24a126..1ee8e981eb6f0ef3988a7516d4feae9dc39d1268 100644 (file)
--- a/doc/doc-misc/Ext-maildir++
+++ b/doc/doc-misc/Ext-maildir++
@@ -330,7 +330,7 @@ Calculating the quota for a Maildir++
        quota recalculation ended up removing maildirsize due to a race
        condition, so the caller may or may not get a file descriptor
        together with the Maildir++ size.
        quota recalculation ended up removing maildirsize due to a race
        condition, so the caller may or may not get a file descriptor
        together with the Maildir++ size.

-    4. If the numbers we got indicated that the Maidlir++ is over quota,
+    4. If the numbers we got indicated that the Maildir++ is over quota,

        some additional logic is in order: if we did not recalculate
        maildirsize, if the numbers in maildirsize indicated that we are
        over quota, then if maildirsize was more than one line long, or if
        some additional logic is in order: if we did not recalculate
        maildirsize, if the numbers in maildirsize indicated that we are
        over quota, then if maildirsize was more than one line long, or if

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index dba99c2ff897d88bbaf9319fce206e33bb48218f..67a1bf476a68304acb0fdea4ccf9c8a0befc44d8 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,5 +1,5 @@
 Change log file for Exim from version 4.21
 Change log file for Exim from version 4.21

--------------------------------------------
+------------------------------------------

 This document describes *changes* to previous versions, that might
 affect Exim's operation, with an unchanged configuration file.  For new
 options, and new features, see the NewStuff file next to this ChangeLog.
 This document describes *changes* to previous versions, that might
 affect Exim's operation, with an unchanged configuration file.  For new
 options, and new features, see the NewStuff file next to this ChangeLog.


@@ -24,6 +24,10 @@ JH/04 Bug 2004: fix CHUNKING in non-PIPELINEING mode.  Chunk data following
       giving a synch failure.  Fix by only checking for synch immediately
       before acknowledging the chunk.
 
       giving a synch failure.  Fix by only checking for synch immediately
       before acknowledging the chunk.
 

+PP/02 GitHub PR 52: many spelling fixes, which include fixing parsing of
+      no_require_dnssec option and creation of _HAVE_TRANSPORT_APPEND_MAILDIR
+      macro.  Patches provided by Josh Soref.
+

 
 Exim version 4.88
 -----------------
 
 Exim version 4.88
 -----------------

diff --git a/src/src/host.c b/src/src/host.c
index f69e329d9cbe149a0d0ad2e8743c1466c375bb43..b3b8b1882a127eb473663d37df4c512949133927 100644 (file)
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -3243,7 +3243,7 @@ while (Ufgets(buffer, 256, stdin) != NULL)
   else if (Ustrcmp(buffer, "request_dnssec")    == 0) request_dnssec = TRUE;
   else if (Ustrcmp(buffer, "no_request_dnssec") == 0) request_dnssec = FALSE;
   else if (Ustrcmp(buffer, "require_dnssec")    == 0) require_dnssec = TRUE;
   else if (Ustrcmp(buffer, "request_dnssec")    == 0) request_dnssec = TRUE;
   else if (Ustrcmp(buffer, "no_request_dnssec") == 0) request_dnssec = FALSE;
   else if (Ustrcmp(buffer, "require_dnssec")    == 0) require_dnssec = TRUE;

-  else if (Ustrcmp(buffer, "no_reqiret_dnssec") == 0) require_dnssec = FALSE;
+  else if (Ustrcmp(buffer, "no_require_dnssec") == 0) require_dnssec = FALSE;

   else if (Ustrcmp(buffer, "test_harness") == 0)
     running_in_test_harness = !running_in_test_harness;
   else if (Ustrcmp(buffer, "ipv6") == 0) disable_ipv6 = !disable_ipv6;
   else if (Ustrcmp(buffer, "test_harness") == 0)
     running_in_test_harness = !running_in_test_harness;
   else if (Ustrcmp(buffer, "ipv6") == 0) disable_ipv6 = !disable_ipv6;

diff --git a/src/src/readconf.c b/src/src/readconf.c
index b2de8a3d32412cb68714ad716e250071aba490c3..55bba4c05317f9bee419c86cb6060038938cdb8a 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -852,7 +852,7 @@ due to conflicts with other common macros. */
 
 #ifdef TRANSPORT_APPENDFILE
 # ifdef SUPPORT_MAILDIR
 
 #ifdef TRANSPORT_APPENDFILE
 # ifdef SUPPORT_MAILDIR

-  macro_create(US"_HAVE_TRANSPORT_APPEND_MAILDR", US"y", FALSE, TRUE);
+  macro_create(US"_HAVE_TRANSPORT_APPEND_MAILDIR", US"y", FALSE, TRUE);

 # endif
 # ifdef SUPPORT_MAILSTORE
   macro_create(US"_HAVE_TRANSPORT_APPEND_MAILSTORE", US"y", FALSE, TRUE);
 # endif
 # ifdef SUPPORT_MAILSTORE
   macro_create(US"_HAVE_TRANSPORT_APPEND_MAILSTORE", US"y", FALSE, TRUE);