summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Soref <jsoref@users.noreply.github.com>2017-01-18 11:36:24 -0500
committerPhil Pennock <pdp@exim.org>2017-01-18 11:36:24 -0500
commitf988ce57300f2dcb7ddb63f767ef5ebef76b2aa4 (patch)
tree6348feb5447ab6ac182c785c0bab9f9328823bd9
parent4c04137d73637107669e02b21f890387aaa2ef34 (diff)
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. ]
-rw-r--r--doc/doc-misc/Ext-maildir++2
-rw-r--r--doc/doc-txt/ChangeLog6
-rw-r--r--src/src/host.c2
-rw-r--r--src/src/readconf.c2
4 files changed, 8 insertions, 4 deletions
diff --git a/doc/doc-misc/Ext-maildir++ b/doc/doc-misc/Ext-maildir++
index 6d821fb4d..1ee8e981e 100644
--- 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.
- 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
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index dba99c2ff..67a1bf476 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,5 +1,5 @@
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.
@@ -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.
+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
-----------------
diff --git a/src/src/host.c b/src/src/host.c
index f69e329d9..b3b8b1882 100644
--- 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, "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;
diff --git a/src/src/readconf.c b/src/src/readconf.c
index b2de8a3d3..55bba4c05 100644
--- 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
- 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);