From 0cd95fa34e04827767674b6a5545c55ae391a3e2 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 1 Feb 2021 12:51:24 +0000
Subject: [PATCH] wip

---
 doc/doc-docbook/spec.xfpt    |  4 ++--
 src/src/match.c              |  2 +-
 src/src/transports/smtp.c    | 12 ++++++------
 test/scripts/0000-Basic/0139 |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 782343fd0..09ff75044 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -28578,7 +28578,7 @@ and for clients to only attempt,
 this authentication method on a secure (eg. under TLS) connection.
 
 One possible use, compatible with the
-K-9 Mail Andoid client (&url(https://k9mail.github.io/)),
+K-9 Mail Android client (&url(https://k9mail.github.io/)),
 is for using X509 client certificates.
 
 It thus overlaps in function with the TLS authenticator
@@ -39024,7 +39024,7 @@ unchanged, or whether they should be rendered as escape sequences.
 when TLS is in use. The item is &`CV=yes`& if the peer's certificate was
 verified
 using a CA trust anchor,
-&`CA=dane`& if using a DNS trust anchor,
+&`CV=dane`& if using a DNS trust anchor,
 and &`CV=no`& if not.
 .next
 .cindex "log" "TLS cipher"
diff --git a/src/src/match.c b/src/src/match.c
index 73cdab012..42145e98e 100644
--- a/src/src/match.c
+++ b/src/src/match.c
@@ -1275,7 +1275,7 @@ patterns.) Otherwise just the domain is lower cases. A magic item "+caseful" in
 the list can be used to restore a caseful copy of the local part from the
 original address.
 Limit the subject address size to avoid mem-exhastion attacks.  The size chosen
-is historical (we used to use big_buffer her). */
+is historical (we used to use big_buffer here). */
 
 if ((len = Ustrlen(address)) > BIG_BUFFER_SIZE) len = BIG_BUFFER_SIZE;
 ab.address = string_copyn(address, len);
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 33051a5e2..7ad2a89ec 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -380,7 +380,7 @@ if (ob->command_timeout <= 0 || ob->data_timeout <= 0 ||
 /* If hosts_override is set and there are local hosts, set the global
 flag that stops verify from showing router hosts. */
 
-if (ob->hosts_override && ob->hosts != NULL) tblock->overrides_hosts = TRUE;
+if (ob->hosts_override && ob->hosts) tblock->overrides_hosts = TRUE;
 
 /* If there are any fallback hosts listed, build a chain of host items
 for them, but do not do any lookups at this time. */
@@ -2675,7 +2675,7 @@ so its response needs to be analyzed. If TLS is not active and this is a
 continued session down a previously-used socket, we haven't just done EHLO, so
 we skip this. */
 
-if (continue_hostname == NULL
+if (   !continue_hostname
 #ifndef DISABLE_TLS
     || tls_out.active.sock >= 0
 #endif
@@ -4233,7 +4233,7 @@ if (sx->completed_addr && sx->ok && sx->send_quit)
   t_compare.tblock = tblock;
   t_compare.current_sender_address = sender_address;
 
-  if (  sx->first_addr != NULL		/* more addrs for this message */
+  if (  sx->first_addr			/* more addrs for this message */
      || f.continue_more			/* more addrs for coninued-host */
      || (
 #ifndef DISABLE_TLS
@@ -4280,7 +4280,7 @@ if (sx->completed_addr && sx->ok && sx->send_quit)
       int socket_fd = sx->cctx.sock;
 
 
-      if (sx->first_addr != NULL)	/* More addresses still to be sent */
+      if (sx->first_addr)		/* More addresses still to be sent */
         {				/*   for this message              */
         continue_sequence++;		/* Causes * in logging */
 	pipelining_active = sx->pipelining_used;    /* was cleared at DATA */
@@ -4685,7 +4685,7 @@ if (!hostlist || (ob->hosts_override && ob->hosts))
     {
     uschar *s = ob->hosts;
 
-    if (Ustrchr(s, '$') != NULL)
+    if (Ustrchr(s, '$'))
       {
       if (!(expanded_hosts = expand_string(s)))
         {
@@ -5033,7 +5033,7 @@ retry_non_continued:
     because connections to the same host from a different interface should be
     treated separately. */
 
-    host_af = Ustrchr(host->address, ':') == NULL ? AF_INET : AF_INET6;
+    host_af = Ustrchr(host->address, ':') ? AF_INET6 : AF_INET;
       {
       uschar * s = ob->interface;
       if (s && *s)
diff --git a/test/scripts/0000-Basic/0139 b/test/scripts/0000-Basic/0139
index d5ebc995c..5a3473aa5 100644
--- a/test/scripts/0000-Basic/0139
+++ b/test/scripts/0000-Basic/0139
@@ -1,4 +1,4 @@
-# RBL specific address
+# dnslists specific address
 exim -bh V4NET.11.12.14
 mail from:postmaster@exim.test.ex
 rcpt to:<userx@exim.test.ex>
-- 
2.30.2