tidying

[exim.git] / test / confs / 0612

diff --git a/test/confs/0612 b/test/confs/0612
index 786b2e58eac82d6d608f70945c26049044c3db6e..ad84f9268121bae81839974fe566dfd9b87f6045 100644 (file)
--- a/test/confs/0612
+++ b/test/confs/0612
@@ -24,14 +24,18 @@ queue_only
 queue_run_in_order
 
 
 queue_run_in_order
 
 

+.ifdef _HAVE_EVENT

 event_action = ${acl {ev_log}}
 event_action = ${acl {ev_log}}

+.endif

 
 #
 
 begin acl
 
 
 #
 
 begin acl
 

+.ifdef _HAVE_EVENT

 ev_log:
 ev_log:

-  accept logwrite = event $event_name
+  accept logwrite = event $event_name data "$event_data"
+.endif

 
 rcpt:
   accept       hosts = HOSTIPV4
 
 rcpt:
   accept       hosts = HOSTIPV4


@@ -76,20 +80,26 @@ begin transports
 
 smtp:
   driver =     smtp
 
 smtp:
   driver =     smtp

+.ifdef _HAVE_EVENT

   event_action = ${acl {ev_log}}
   event_action = ${acl {ev_log}}

+.endif

   hosts_try_fastopen = :
 
 bad_tpt:
   driver =     smtp
   connect_timeout = 1s
   hosts_try_fastopen = :
 
 bad_tpt:
   driver =     smtp
   connect_timeout = 1s

+.ifdef _HAVE_EVENT

   event_action = ${acl {ev_log}}
   event_action = ${acl {ev_log}}

+.endif

 
 tofile:
   driver = appendfile
   file = DIR/test-mail/$local_part
   create_file = DIR/test-mail
   user = CALLER
 
 tofile:
   driver = appendfile
   file = DIR/test-mail/$local_part
   create_file = DIR/test-mail
   user = CALLER

+.ifdef _HAVE_EVENT

   event_action = ${acl {ev_log}}
   event_action = ${acl {ev_log}}

+.endif

 
 begin retry
 
 
 begin retry