[exim-cvs] Fix build with DISABLE_EVENT (proper spelling)

Página Inicial
Delete this message
Reply to this message
Autor: Exim Git Commits Mailing List
Data:  
Para: exim-cvs
Assunto: [exim-cvs] Fix build with DISABLE_EVENT (proper spelling)
Gitweb: https://git.exim.org/exim.git/commitdiff/0578e5cd0d433794ba33cefc8963476ef1c22d53
Commit:     0578e5cd0d433794ba33cefc8963476ef1c22d53
Parent:     b9ecb570888756a645781505fbcd1b70c93216a5
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Jun 15 13:20:07 2024 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Wed Jun 19 10:46:08 2024 +0100


    Fix build with DISABLE_EVENT (proper spelling)


    cf. 04c21a8fe3b5
---
 src/src/dns.c                 |  4 ++--
 test/confs/0612               | 10 ++++++++++
 test/confs/4020               |  2 ++
 test/confs/5890               |  4 ++++
 test/confs/5891               |  4 ++++
 test/confs/5892               |  4 ++++
 test/confs/5893               |  4 ++++
 test/confs/5894               |  4 ++++
 test/confs/5895               |  4 ++++
 test/scripts/5700-events/5700 |  3 +--
 10 files changed, 39 insertions(+), 4 deletions(-)


diff --git a/src/src/dns.c b/src/src/dns.c
index 538c0c0b4..45dc1574d 100644
--- a/src/src/dns.c
+++ b/src/src/dns.c
@@ -1135,7 +1135,7 @@ errstr = US"cname_loop";

 not_good:
   {
-#ifndef DISABLE_EVENTS
+#ifndef DISABLE_EVENT
   const uschar * s = NULL;
   BOOL save_flag = f.search_find_defer;
   uschar * save_serr = search_error_message;
@@ -1168,7 +1168,7 @@ not_good:
   /*XXX what other state could an expansion in the eventhandler mess up? */
   search_error_message = save_serr;
   f.search_find_defer = save_flag;
-#endif    /*EVENTS*/
+#endif    /*EVENT*/
   return rc;
   }
 }
diff --git a/test/confs/0612 b/test/confs/0612
index 786b2e58e..f4f427246 100644
--- a/test/confs/0612
+++ b/test/confs/0612
@@ -24,14 +24,18 @@ queue_only
 queue_run_in_order



+.ifdef _HAVE_EVENT
event_action = ${acl {ev_log}}
+.endif

#

begin acl

+.ifdef _HAVE_EVENT
ev_log:
accept logwrite = event $event_name
+.endif

 rcpt:
   accept    hosts =    HOSTIPV4
@@ -76,20 +80,26 @@ begin transports


 smtp:
   driver =    smtp
+.ifdef _HAVE_EVENT
   event_action = ${acl {ev_log}}
+.endif
   hosts_try_fastopen = :


 bad_tpt:
   driver =    smtp
   connect_timeout = 1s
+.ifdef _HAVE_EVENT
   event_action = ${acl {ev_log}}
+.endif


tofile:
driver = appendfile
file = DIR/test-mail/$local_part
create_file = DIR/test-mail
user = CALLER
+.ifdef _HAVE_EVENT
event_action = ${acl {ev_log}}
+.endif

begin retry

diff --git a/test/confs/4020 b/test/confs/4020
index dc0db460e..6702dcd68 100644
--- a/test/confs/4020
+++ b/test/confs/4020
@@ -46,7 +46,9 @@ my_smtp:
   hide socks_proxy =    HOSTIPV4 port=PORT_D OPT
   hosts_try_fastopen =    ${if eq {$local_part}{user_tfo} {*}}
   debug_print =        transport_name <$transport_name>
+.ifdef _HAVE_EVENT
   event_action =    ${if eq {smtp:connect}{$event_name} {${acl {logger}}} {}}
+.endif



 # End
diff --git a/test/confs/5890 b/test/confs/5890
index ff5adb90f..c81cd92f3 100644
--- a/test/confs/5890
+++ b/test/confs/5890
@@ -103,7 +103,9 @@ send_to_server1:
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    ${if match {$local_part}{^noverify} {*}{:}}
   tls_try_verify_hosts =    *
+.ifdef _HAVE_EVENT
   event_action =        ${acl {log_resumption}}
+.endif


 send_to_server2:
   driver =            smtp
@@ -113,7 +115,9 @@ send_to_server2:
   hosts_try_fastopen =        :
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    :
+.ifdef _HAVE_EVENT
   event_action =        ${acl {log_resumption}}
+.endif



 # ----- Retry -----
diff --git a/test/confs/5891 b/test/confs/5891
index 89ee8fd53..ff50b2b2e 100644
--- a/test/confs/5891
+++ b/test/confs/5891
@@ -93,7 +93,9 @@ send_to_server1:
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    ${if match {$local_part}{^noverify} {*}{:}}
   tls_try_verify_hosts =    *
+.ifdef _HAVE_EVENT
   event_action =        ${acl {log_resumption}}
+.endif


 send_to_server2:
   driver = smtp
@@ -103,7 +105,9 @@ send_to_server2:
   hosts_try_fastopen =    :
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    :
+.ifdef _HAVE_EVENT
   event_action =        ${acl {log_resumption}}
+.endif



 # ----- Retry -----
diff --git a/test/confs/5892 b/test/confs/5892
index 571cb8e7e..77b5c9052 100644
--- a/test/confs/5892
+++ b/test/confs/5892
@@ -108,7 +108,9 @@ send_to_server1:
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    ${if match {$local_part}{^noverify} {*}{:}}
   tls_try_verify_hosts =    *
+.ifdef _HAVE_EVENT
   event_action =        ${acl {log_resumption}}
+.endif


 send_to_server2:
   driver =            smtp
@@ -118,7 +120,9 @@ send_to_server2:
   hosts_try_fastopen =        :
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    :
+.ifdef _HAVE_EVENT
   event_action =        ${acl {log_resumption}}
+.endif



 # ----- Retry -----
diff --git a/test/confs/5893 b/test/confs/5893
index a7f73a98c..5d569d708 100644
--- a/test/confs/5893
+++ b/test/confs/5893
@@ -97,7 +97,9 @@ send_to_server1:
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    ${if match {$local_part}{^noverify} {*}{:}}
   tls_try_verify_hosts =    *
+.ifdef _HAVE_EVENT
   event_action =        ${acl {log_resumption}}
+.endif


 send_to_server2:
   driver = smtp
@@ -107,7 +109,9 @@ send_to_server2:
   hosts_try_fastopen =    :
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    :
+.ifdef _HAVE_EVENT
   event_action =        ${acl {log_resumption}}
+.endif



 # ----- Retry -----
diff --git a/test/confs/5894 b/test/confs/5894
index 4b34c75ae..d823290aa 100644
--- a/test/confs/5894
+++ b/test/confs/5894
@@ -99,7 +99,9 @@ send_to_server1:
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    ${if match {$local_part}{^noverify} {*}{:}}
   tls_try_verify_hosts =    *
+.ifdef _HAVE_EVENT
   event_action =        ${acl {log_resumption}}
+.endif


 send_to_server2:
   driver =            smtp
@@ -109,7 +111,9 @@ send_to_server2:
   hosts_try_fastopen =        :
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    :
+.ifdef _HAVE_EVENT
   event_action =        ${acl {log_resumption}}
+.endif



 # ----- Retry -----
diff --git a/test/confs/5895 b/test/confs/5895
index d279b1e3e..c83c70926 100644
--- a/test/confs/5895
+++ b/test/confs/5895
@@ -92,7 +92,9 @@ send_to_server1:
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    ${if match {$local_part}{^noverify} {*}{:}}
   tls_try_verify_hosts =    *
+.ifdef _HAVE_EVENT
   event_action =        ${acl {log_resumption}}
+.endif


 send_to_server2:
   driver = smtp
@@ -102,7 +104,9 @@ send_to_server2:
   hosts_try_fastopen =    :
   tls_verify_certificates =    CDIR/CA/CA.pem
   tls_verify_cert_hostnames =    :
+.ifdef _HAVE_EVENT
   event_action =        ${acl {log_resumption}}
+.endif



# ----- Retry -----
diff --git a/test/scripts/5700-events/5700 b/test/scripts/5700-events/5700
index c6b6e76ff..bb62c1991 100644
--- a/test/scripts/5700-events/5700
+++ b/test/scripts/5700-events/5700
@@ -1,5 +1,4 @@
-# Arbitrary expansion after transport
-# (EXPERIMENTAL_EVENT)
+# Events
#
need_ipv4
munge timeout_errno

--
## 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/