[exim-cvs] tidying

Gitweb: https://git.exim.org/exim.git/commitdiff/4a0b4aef0029eabd256e246ac2b7e68f86be35e7

Commit:     4a0b4aef0029eabd256e246ac2b7e68f86be35e7
Parent:     9a0f997bac85d8f234238162f3cee4524b6f989c
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Sep 5 10:12:46 2024 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu Sep 5 10:22:45 2024 +0100

    tidying
---
 src/src/miscmods/dkim.c   | 2 ++
 src/src/miscmods/dmarc.c  | 3 +--
 src/src/transports/smtp.c | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/src/miscmods/dkim.c b/src/src/miscmods/dkim.c
index 38677097b..632ff4813 100644
--- a/src/src/miscmods/dkim.c
+++ b/src/src/miscmods/dkim.c
@@ -161,6 +161,7 @@ return p->srvtype;

+#ifdef EXPERIMENTAL_ARC
 /* Return:
     OK    verify succesful
     FAIL    verify did not pass
@@ -183,6 +184,7 @@ else if ((errstr = exim_dkim_verify(&vctx, hash, data_hash, sighash)))
 *errstr_p = errstr;
 return rc;
 }
+#endif

diff --git a/src/src/miscmods/dmarc.c b/src/src/miscmods/dmarc.c
index 4a8beab66..d977d29fe 100644
--- a/src/src/miscmods/dmarc.c
+++ b/src/src/miscmods/dmarc.c
@@ -71,7 +71,7 @@ uschar * dmarc_tld_file          = NULL; /* Mozilla TLDs text file */
 /* One-time initialisation for dmarc.  Ensure the spf module is available. */

static BOOL
-dmarc_init(void *)
+dmarc_init(void * dummy)
{
uschar * errstr;
if (!(dmarc_spf_mod_info = misc_mod_find(US"spf", &errstr)))
@@ -80,7 +80,6 @@ if (!(dmarc_spf_mod_info = misc_mod_find(US"spf", &errstr)))
return FALSE;
}

-/*XXX not yet used, but will be */
if (!(dmarc_dkim_mod_info = misc_mod_find(US"dkim", &errstr)))
{
log_write(0, LOG_MAIN|LOG_PANIC, "dmarc: %s", errstr);
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index cdd2a404f..36b5e61fc 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -869,16 +869,16 @@ ehlo_limits_apply(sx, sx->peer_limit_mail, sx->peer_limit_rcpt,
sx->peer_limit_rcptdom);
}

+# ifndef DISABLE_PIPE_CONNECT
 /* Apply values read from cache to the current connection */
 static void
 ehlo_cache_limits_apply(smtp_context * sx)
 {
-# ifndef DISABLE_PIPE_CONNECT
 ehlo_limits_apply(sx, sx->ehlo_resp.limit_mail, sx->ehlo_resp.limit_rcpt,
   sx->ehlo_resp.limit_rcptdom);
-# endif
 }
-#endif    /*EXPERIMENTAL_ESMTP_LIMITS*/
+# endif
+#endif    /*DISABLE_ESMTP_LIMITS*/

/******************************************************************************/

@@ -1096,7 +1096,7 @@ if (pending_BANNER)
     if (tls_out.active.sock >= 0) rc = DEFER;
     goto fail;
     }
-  /*XXX EXPERIMENTAL_ESMTP_LIMITS ? */
+  /*XXX DISABLE_ESMTP_LIMITS ? */

# if !defined(DISABLE_TLS) && !defined(DISABLE_TLS_RESUME)
GET_OPTION("host_name_extract");

--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/