[exim-cvs] tidying

Gitweb: https://git.exim.org/exim.git/commitdiff/6a1c2ef020854ef49c6a52ad4552d6b5ae1e1d1a

Commit:     6a1c2ef020854ef49c6a52ad4552d6b5ae1e1d1a
Parent:     0c70e694cf1a703798c0778a3236079e1b25c91d
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Nov 8 18:11:56 2020 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Fri Jan 29 18:41:22 2021 +0000

    tidying
---
 doc/doc-docbook/spec.xfpt | 3 ++-
 src/src/dmarc.h           | 2 --
 src/src/drtables.c        | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index ab76e87..b3c7bdb 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -11732,6 +11732,7 @@ users' filter files may be locked out by the system administrator.
.new
&*Note:*& Testing a path using this condition is not a sufficient way of
de-tainting it.
+Consider using a dsearch lookup.
.wen

.vitem &*first_delivery*&
@@ -25732,7 +25733,7 @@ If this option is set to &"smtps"&, the default value for the &%port%& option
changes to &"smtps"&, and the transport initiates TLS immediately after
connecting, as an outbound SSL-on-connect, instead of using STARTTLS to upgrade.
The Internet standards bodies used to strongly discourage use of this mode,
-but as of RFC 8314 it is perferred over STARTTLS for message submission
+but as of RFC 8314 it is preferred over STARTTLS for message submission
(as distinct from MTA-MTA communication).


diff --git a/src/src/dmarc.h b/src/src/dmarc.h
index 772726a..ef967e0 100644
--- a/src/src/dmarc.h
+++ b/src/src/dmarc.h
@@ -22,9 +22,7 @@ int dmarc_store_data(header_line *);
int dmarc_process();
uschar *dmarc_exim_expand_query(int);
uschar *dmarc_exim_expand_defaults(int);
-uschar *dmarc_auth_results_header(header_line *,uschar *);

-#define DMARC_AR_HEADER        US"Authentication-Results:"
 #define DMARC_VERIFY_STATUS    1

 #define DMARC_HIST_OK          1
diff --git a/src/src/drtables.c b/src/src/drtables.c
index 67a2b8f..72f47c1 100644
--- a/src/src/drtables.c
+++ b/src/src/drtables.c
@@ -764,10 +764,10 @@ else
     }

       /* FreeBSD nsdispatch() can trigger dlerror() errors about
-       * _nss_cache_cycle_prevention_function; we need to clear the dlerror()
-       * state before calling dlsym(), so that any error afterwards only
-       * comes from dlsym().
-       */
+      _nss_cache_cycle_prevention_function; we need to clear the dlerror()
+      state before calling dlsym(), so that any error afterwards only comes
+      from dlsym().  */
+
       errormsg = dlerror();

       info = (struct lookup_module_info*) dlsym(dl, "_lookup_module_info");