[exim-cvs] tidying

Gitweb: https://git.exim.org/exim.git/commitdiff/b09c17939112f84e689a9c1343f00ca84610325d

Commit:     b09c17939112f84e689a9c1343f00ca84610325d
Parent:     dc46d79f6c3b958036358dfd6c75b7bdc8471835
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Sep 10 12:28:44 2019 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Tue Sep 10 12:33:28 2019 +0100

    tidying
---
 doc/doc-docbook/spec.xfpt   | 6 +++---
 src/src/lookups/dnsdb.c     | 6 +++---
 src/src/routers/dnslookup.c | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 63db8ef..5311c8c 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -17644,8 +17644,8 @@ is not required the &%tls_advertise_hosts%& option should be set empty.
.cindex "TLS" "server certificate; location of"
.cindex "certificate" "server, location of"
The value of this option is expanded, and must then be a list of absolute paths to
-files which contains the server's certificates. Commonly only one file is
-needed.
+files which contain the server's certificates (in PEM format).
+Commonly only one file is needed.
The server's private key is also
assumed to be in this file if &%tls_privatekey%& is unset. See chapter
&<<CHAPTLS>>& for further details.
@@ -28663,7 +28663,7 @@ Great care should be taken to deal with matters of case, various injection
attacks in the string (&`../`& or SQL), and ensuring that a valid filename
can always be referenced; it is important to remember that &$tls_in_sni$& is
arbitrary unverified data provided prior to authentication.
-Further, the initial certificate is loaded before SNI is arrived, so
+Further, the initial certificate is loaded before SNI has arrived, so
an expansion for &%tls_certificate%& must have a default which is used
when &$tls_in_sni$& is empty.

diff --git a/src/src/lookups/dnsdb.c b/src/src/lookups/dnsdb.c
index 64d0a53..2727344 100644
--- a/src/src/lookups/dnsdb.c
+++ b/src/src/lookups/dnsdb.c
@@ -313,9 +313,9 @@ if (!outsep2) switch(type)
 while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))
   {
   uschar rbuffer[256];
-  int searchtype = (type == T_CSA)? T_SRV :         /* record type we want */
-                   (type == T_MXH)? T_MX :
-                   (type == T_ZNS)? T_NS : type;
+  int searchtype = type == T_CSA ? T_SRV :         /* record type we want */
+                   type == T_MXH ? T_MX :
+                   type == T_ZNS ? T_NS : type;

/* If the type is PTR or CSA, we have to construct the relevant magic lookup
key if the original is an IP address (some experimental protocols are using
diff --git a/src/src/routers/dnslookup.c b/src/src/routers/dnslookup.c
index 2471f2f..2a2dd46 100644
--- a/src/src/routers/dnslookup.c
+++ b/src/src/routers/dnslookup.c
@@ -289,7 +289,7 @@ for (;;)

/* Unfortunately, we cannot set the mx_only option in advance, because the
DNS lookup may extend an unqualified name. Therefore, we must do the test
- stoubsequently. We use the same logic as that for widen_domains above to avoid
+ subsequently. We use the same logic as that for widen_domains above to avoid
requesting a header rewrite that cannot work. */

if (verify != v_sender || !ob->rewrite_headers || addr->parent)