tidying

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index cd95d99ff50d694925da2f7b44b49d2040fe9770..82e4dfaff40f31ec0608c6466e639e761f6aa205 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -29903,9 +29903,10 @@ warn   hosts           = +internal_hosts
 warn   message         = Remove internal headers
        remove_header   = $acl_c_ihdrs
 .endd
-Removed header lines are accumulated during the MAIL, RCPT, and predata ACLs.
-They are removed from the message before processing the DATA and MIME ACLs.
-There is no harm in attempting to remove the same header twice nor is removing
+Header names for removal are accumulated during the MAIL, RCPT, and predata ACLs.
+Matching header lines are removed from the message before processing the DATA and MIME ACLs.
+If multiple header lines match, all are removed.
+There is no harm in attempting to remove the same header twice nor in removing
 a non-existent header. Further header lines to be removed may be accumulated
 during the DATA and MIME ACLs, after which they are removed from the message,
 if present. In the case of non-SMTP messages, headers to be removed are

diff --git a/src/src/acl.c b/src/src/acl.c
index d243ff4af6cd3d6e967fbfcbcde65dac975d1c9a..1fa5c1f63b525b2e9204f5d96a9996f444cf69b4 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1070,7 +1070,7 @@ Returns:    nothing
 static void
 setup_remove_header(const uschar *hnames)
 {
-if (*hnames != 0)
+if (*hnames)
   acl_removed_headers = acl_removed_headers
     ? string_sprintf("%s : %s", acl_removed_headers, hnames)
     : string_copy(hnames);

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 7127518e2c1df84af330f04d819279d6b5f8f258..68152d50539fa2f58e9f5c6773d22dac7b94a2b8 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -8531,7 +8531,7 @@ uschar * where;
 
 if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
   {
-  int pfd[2], channel_fd = cutthrough.cctx.sock, pid;
+  int channel_fd = cutthrough.cctx.sock;
 
   smtp_peer_options = cutthrough.peer_options;
   continue_sequence = 0;
@@ -8539,6 +8539,8 @@ if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
 #ifdef SUPPORT_TLS
   if (cutthrough.is_tls)
     {
+    int pfd[2], pid;
+
     smtp_peer_options |= OPTION_TLS;
     sending_ip_address = cutthrough.snd_ip;
     sending_port = cutthrough.snd_port;

diff --git a/src/src/dkim.c b/src/src/dkim.c
index edbeded5e4ac886885d37847e9f9b12219f2d568..29ec29a964aeb998f3db1998f6a75c8a9d03288d 100644 (file)
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -702,7 +702,7 @@ if (dkim_domain)
        { errwhen = US"dkim_timestamps"; goto expand_bad; }
       else
        xval = (tval = (unsigned long) time(NULL))
-             + strtoul(dkim_timestamps_expanded, NULL, 10);
+             + strtoul(CCS dkim_timestamps_expanded, NULL, 10);
 
     if (!(sig = pdkim_init_sign(&dkim_sign_ctx, dkim_signing_domain,
                          dkim_signing_selector,

diff --git a/src/src/expand.c b/src/src/expand.c
index a1a70c718f9107e4cfe9b7dcc1a4641f0d9d1fb6..2feaf957b6462f26497452fc6c18c0a3a7472b11 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -4826,10 +4826,8 @@ while (*s != 0)
       uschar * server_name = NULL;
       host_item host;
       BOOL do_shutdown = TRUE;
-#ifdef SUPPORT_TLS
-      BOOL do_tls = FALSE;
-      void * tls_ctx = NULL;
-#endif
+      BOOL do_tls = FALSE;     /* Only set under SUPPORT_TLS */
+      void * tls_ctx = NULL;   /* ditto                      */
       blob reqstr;
 
       if (expand_forbid & RDO_READSOCK)
@@ -4934,8 +4932,9 @@ while (*s != 0)
                  do_tls ? NULL : &reqstr);
          callout_address = NULL;
          if (fd < 0)
-              goto SOCK_FAIL;
-         if (!do_tls) reqstr.len = 0;
+           goto SOCK_FAIL;
+         if (!do_tls)
+           reqstr.len = 0;
           }
 
         /* Handle a Unix domain socket */