tidying

diff --git a/src/src/miscmods/dkim.c b/src/src/miscmods/dkim.c
index 38677097be4b477bd9cd10d24819f78ecd85b2ce..632ff4813df4c86d18ab495d9743b058d23869aa 100644 (file)
--- 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
 /* 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;
 }
 *errstr_p = errstr;
 return rc;
 }

+#endif

 
 
 
 
 
 

diff --git a/src/src/miscmods/dmarc.c b/src/src/miscmods/dmarc.c
index 4a8beab66d6606e2f2c087f84678a06e64e429f5..d977d29feec5d71019838e1d1c2aad994bf6b7df 100644 (file)
--- 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
 /* 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)))
 {
 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;
   }
 
   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);
 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 cdd2a404f795da3ce930e53cb3af33593a3ac419..36b5e61fce8d4e52fb787c03c0a2b0851294989f 100644 (file)
--- 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);
 }
 
   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)
 {
 /* 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);
 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;
     }
     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");
 
 # if !defined(DISABLE_TLS) && !defined(DISABLE_TLS_RESUME)
   GET_OPTION("host_name_extract");