summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/confs/560812
-rw-r--r--test/confs/565812
-rw-r--r--test/confs/570036
-rw-r--r--test/confs/575010
-rw-r--r--test/confs/576010
-rw-r--r--test/confs/586010
-rw-r--r--test/log/57002
-rw-r--r--test/paniclog/57002
-rw-r--r--test/scripts/5608-OCSP-OpenSSL-TPDA/REQUIRES2
-rw-r--r--test/scripts/5658-OCSP-GnuTLS-TPDA/REQUIRES2
-rw-r--r--test/scripts/5700-tpt-post-dlv-action/REQUIRES2
-rw-r--r--test/scripts/5750-GnuTLS-TPDA/REQUIRES2
-rw-r--r--test/scripts/5760-OpenSSL-TPDA/REQUIRES2
-rw-r--r--test/scripts/5860-DANE-OpenSSL-TPDA/REQUIRES2
-rw-r--r--test/stderr/57002
15 files changed, 54 insertions, 54 deletions
diff --git a/test/confs/5608 b/test/confs/5608
index 500c54b6d..da0f6707f 100644
--- a/test/confs/5608
+++ b/test/confs/5608
@@ -1,5 +1,5 @@
# Exim test configuration 5608
-# OCSP stapling, client, tpda
+# OCSP stapling, client, events
SERVER =
@@ -55,7 +55,7 @@ check_data:
accept
logger:
- accept condition = ${if !eq {msg} {${listextract{1}{$tpda_event}}}}
+ accept condition = ${if !eq {msg} {${listextract{1}{$event_name}}}}
warn logwrite = client ocsp status: $tls_out_ocsp \
(${listextract {${eval:$tls_out_ocsp+1}} \
{notreq:notresp:vfynotdone:failed:verified}})
@@ -101,7 +101,7 @@ send_to_server1:
hosts_require_tls = *
hosts_request_ocsp = :
headers_add = X-TLS-out: ocsp status $tls_out_ocsp
- tpda_event_action = ${acl {logger}}
+ event_action = ${acl {logger}}
# norequire: request stapling but do not verify
send_to_server2:
@@ -113,7 +113,7 @@ send_to_server2:
hosts_require_tls = *
# note no ocsp mention here
headers_add = X-TLS-out: ocsp status $tls_out_ocsp
- tpda_event_action = ${acl {logger}}
+ event_action = ${acl {logger}}
# (any other name): request and verify
send_to_server3:
@@ -126,7 +126,7 @@ send_to_server3:
hosts_require_tls = *
hosts_require_ocsp = *
headers_add = X-TLS-out: ocsp status $tls_out_ocsp
- tpda_event_action = ${acl {logger}}
+ event_action = ${acl {logger}}
# (any other name): request and verify, ssl-on-connect
send_to_server4:
@@ -140,7 +140,7 @@ send_to_server4:
hosts_require_tls = *
hosts_require_ocsp = *
headers_add = X-TLS-out: ocsp status $tls_out_ocsp
- tpda_event_action = ${acl {logger}}
+ event_action = ${acl {logger}}
# ----- Retry -----
diff --git a/test/confs/5658 b/test/confs/5658
index e4c346a96..7ab2de68f 100644
--- a/test/confs/5658
+++ b/test/confs/5658
@@ -1,5 +1,5 @@
# Exim test configuration 5658
-# OCSP stapling, client, tpda
+# OCSP stapling, client, events
SERVER =
@@ -52,7 +52,7 @@ check_data:
accept
logger:
- accept condition = ${if !eq {msg} {${listextract{1}{$tpda_event}}}}
+ accept condition = ${if !eq {msg} {${listextract{1}{$event_name}}}}
warn logwrite = client ocsp status: $tls_out_ocsp \
(${listextract {${eval:$tls_out_ocsp+1}} \
{notreq:notresp:vfynotdone:failed:verified}})
@@ -100,7 +100,7 @@ send_to_server1:
headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
(${listextract {${eval:$tls_out_ocsp+1}} \
{notreq:notresp:vfynotdone:failed:verified}})
- tpda_event_action = ${acl {logger}}
+ event_action = ${acl {logger}}
send_to_server2:
driver = smtp
@@ -113,7 +113,7 @@ send_to_server2:
headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
(${listextract {${eval:$tls_out_ocsp+1}} \
{notreq:notresp:vfynotdone:failed:verified}})
- tpda_event_action = ${acl {logger}}
+ event_action = ${acl {logger}}
send_to_server3:
driver = smtp
@@ -128,7 +128,7 @@ send_to_server3:
headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
(${listextract {${eval:$tls_out_ocsp+1}} \
{notreq:notresp:vfynotdone:failed:verified}})
- tpda_event_action = ${acl {logger}}
+ event_action = ${acl {logger}}
send_to_server4:
driver = smtp
@@ -144,7 +144,7 @@ send_to_server4:
headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
(${listextract {${eval:$tls_out_ocsp+1}} \
{notreq:notresp:vfynotdone:failed:verified}})
- tpda_event_action = ${acl {logger}}
+ event_action = ${acl {logger}}
# ----- Retry -----
diff --git a/test/confs/5700 b/test/confs/5700
index 0e9fd1d3f..2df63415d 100644
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -13,7 +13,7 @@ gecos_name = CALLER_NAME
acl_smtp_rcpt = accept
acl_smtp_data = accept
-delivery_event_action = ${acl {logger}}
+event_action = ${acl {logger}}
# ----- ACL -----
@@ -21,9 +21,9 @@ delivery_event_action = ${acl {logger}}
begin acl
ev_tcp:
- accept condition = ${if eq {$tpda_event}{tcp:connect}}
+ accept condition = ${if eq {$event_name}{tcp:connect}}
logwrite = . [$host_address]:$host_port
- accept condition = ${if eq {$tpda_event}{tcp:close}}
+ accept condition = ${if eq {$event_name}{tcp:close}}
logwrite = . [$sending_ip_address] -> \
[$host_address]:$host_port
accept
@@ -32,10 +32,10 @@ ev_smtp:
accept
logwrite = . [$sending_ip_address] -> \
[$host_address]:$host_port
- logwrite = . banner <$tpda_data>
+ logwrite = . banner <$event_data>
ev_msg_fail:
- accept condition = ${if eq {$tpda_event}{msg:fail:delivery}}
+ accept condition = ${if eq {$event_name}{msg:fail:delivery}}
logwrite = . \
refused by fdqn <$host> \
local_part <$local_part> \
@@ -44,19 +44,19 @@ ev_msg_fail:
accept logwrite = . \
local_part <$local_part> \
domain <$domain> \
- reason <$tpda_data>
+ reason <$event_data>
ev_msg:
- accept condition = ${if eq {fail} {${listextract{2}{$tpda_event}}}}
+ accept condition = ${if eq {fail} {${listextract{2}{$event_name}}}}
acl = ev_msg_fail
- accept condition = ${if eq {$tpda_event}{msg:complete}}
+ accept condition = ${if eq {$event_name}{msg:complete}}
logwrite = . finished: $message_exim_id
accept condition = ${if !eq {$domain}{domain1}}
logwrite = $this_expansion_will_fail
- accept condition = ${if eq {$tpda_event}{msg:delivery}}
+ accept condition = ${if eq {$event_name}{msg:delivery}}
logwrite = . \
delivery \
ip <$host_address> \
@@ -64,11 +64,11 @@ ev_msg:
fqdn <$host> \
local_part <$local_part> \
domain <$domain> \
- confirmation <$tpda_data> \
+ confirmation <$event_data> \
router <$router_name> \
transport <$transport_name>
- accept condition = ${if eq {$tpda_event}{msg:host:defer}}
+ accept condition = ${if eq {$event_name}{msg:host:defer}}
logwrite = . \
deferral \
ip <$host_address> \
@@ -76,18 +76,18 @@ ev_msg:
fqdn <$host> \
local_part <$local_part> \
domain <$domain> \
- errno <$tpda_defer_errno> \
- errstr <$tpda_data> \
+ errno <$event_defer_errno> \
+ errstr <$event_data> \
router <$router_name> \
transport <$transport_name>
logger:
- warn logwrite = event $tpda_event
- accept condition = ${if eq {tcp} {${listextract{1}{$tpda_event}}}}
+ warn logwrite = event $event_name
+ accept condition = ${if eq {tcp} {${listextract{1}{$event_name}}}}
acl = ev_tcp
- accept condition = ${if eq {smtp} {${listextract{1}{$tpda_event}}}}
+ accept condition = ${if eq {smtp} {${listextract{1}{$event_name}}}}
acl = ev_smtp
- accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
+ accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
acl = ev_msg
@@ -117,6 +117,6 @@ smtp:
port = PORT_S
command_timeout = 1s
final_timeout = 1s
- tpda_event_action = ${acl {logger}}
+ event_action = ${acl {logger}}
# End
diff --git a/test/confs/5750 b/test/confs/5750
index bcb03ac5d..8cfef3153 100644
--- a/test/confs/5750
+++ b/test/confs/5750
@@ -34,7 +34,7 @@ tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server2.example.com/
begin acl
ev_tls:
- accept logwrite = $tpda_event depth=$tpda_data \
+ accept logwrite = $event_name depth=$event_data \
<${certextract {subject} {$tls_out_peercert}}>
# message = noooo
@@ -58,9 +58,9 @@ ev_msg:
logwrite = ${certextract {crl_uri} {$tls_out_peercert} {CRU <$value>}{(no CRU)}}
logger:
- accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
- acl = ev_msg $tpda_event $acl_arg2
- accept condition = ${if eq {tls} {${listextract{1}{$tpda_event}}}}
+ accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
+ acl = ev_msg $event_name $acl_arg2
+ accept condition = ${if eq {tls} {${listextract{1}{$event_name}}}}
message = ${acl {ev_tls}}
accept
@@ -93,7 +93,7 @@ send_to_server:
{example.com/server1.example.com/ca_chain.pem}\
{example.net/server1.example.net/ca_chain.pem}}
- tpda_event_action = ${acl {logger} {$tpda_event} {$domain} }
+ event_action = ${acl {logger} {$event_name} {$domain} }
# ----- Retry -----
diff --git a/test/confs/5760 b/test/confs/5760
index c3b49d1b7..b8cab04fa 100644
--- a/test/confs/5760
+++ b/test/confs/5760
@@ -34,7 +34,7 @@ tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server2.example.com/
begin acl
ev_tls:
- accept logwrite = $tpda_event depth=$tpda_data \
+ accept logwrite = $event_name depth=$event_data \
<${certextract {subject} {$tls_out_peercert}}>
# message = nooooo
@@ -58,9 +58,9 @@ ev_msg:
logwrite = ${certextract {crl_uri} {$tls_out_peercert} {CRU <$value>}{(no CRU)}}
logger:
- accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
- acl = ev_msg $tpda_event $acl_arg2
- accept condition = ${if eq {tls} {${listextract{1}{$tpda_event}}}}
+ accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
+ acl = ev_msg $event_name $acl_arg2
+ accept condition = ${if eq {tls} {${listextract{1}{$event_name}}}}
message = ${acl {ev_tls}}
accept
@@ -93,7 +93,7 @@ send_to_server:
{example.com/server1.example.com/ca_chain.pem}\
{example.net/server1.example.net/ca_chain.pem}}
- tpda_event_action = ${acl {logger} {$tpda_event} {$domain} }
+ event_action = ${acl {logger} {$event_name} {$domain} }
# ----- Retry -----
diff --git a/test/confs/5860 b/test/confs/5860
index 956a5dc37..7d9c7551c 100644
--- a/test/confs/5860
+++ b/test/confs/5860
@@ -43,13 +43,13 @@ tls_privatekey = ${if eq {SERVER}{server} \
begin acl
logger:
- accept condition = ${if eq {tls} {${listextract{1}{$tpda_event}}}}
- logwrite = $tpda_event depth = $tpda_data \
+ accept condition = ${if eq {tls} {${listextract{1}{$event_name}}}}
+ logwrite = $event_name depth = $event_data \
<${certextract {subject} {$tls_out_peercert}}>
# message = noooo
- accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
- logwrite = $tpda_event dane=$tls_out_dane
+ accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
+ logwrite = $event_name dane=$tls_out_dane
accept
# ----- Routers -----
@@ -83,6 +83,6 @@ send_to_server:
{= {0}{$tls_out_tlsa_usage}} } \
{*}{}}
- tpda_event_action = ${acl {logger}}
+ event_action = ${acl {logger}}
# End
diff --git a/test/log/5700 b/test/log/5700
index c3fe6497f..6af2a9011 100644
--- a/test/log/5700
+++ b/test/log/5700
@@ -25,7 +25,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 . [127.0.0.1] -> [127.0.0.1]:1224
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain2 R=others T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:delivery
-1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand tpda_event_action msg:delivery in smtp: error from acl "logger"
+1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand event_action msg:delivery in smtp: error from acl "logger"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:complete
diff --git a/test/paniclog/5700 b/test/paniclog/5700
index dcb696955..4ed4279a2 100644
--- a/test/paniclog/5700
+++ b/test/paniclog/5700
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand tpda_event_action msg:delivery in smtp: error from acl "logger"
+1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand event_action msg:delivery in smtp: error from acl "logger"
diff --git a/test/scripts/5608-OCSP-OpenSSL-TPDA/REQUIRES b/test/scripts/5608-OCSP-OpenSSL-TPDA/REQUIRES
index 492da8f2c..d4c3b4939 100644
--- a/test/scripts/5608-OCSP-OpenSSL-TPDA/REQUIRES
+++ b/test/scripts/5608-OCSP-OpenSSL-TPDA/REQUIRES
@@ -1,4 +1,4 @@
support OpenSSL
support OCSP
-support Experimental_TPDA
+support Experimental_Event
running IPv4
diff --git a/test/scripts/5658-OCSP-GnuTLS-TPDA/REQUIRES b/test/scripts/5658-OCSP-GnuTLS-TPDA/REQUIRES
index 379807959..c06f36969 100644
--- a/test/scripts/5658-OCSP-GnuTLS-TPDA/REQUIRES
+++ b/test/scripts/5658-OCSP-GnuTLS-TPDA/REQUIRES
@@ -1,4 +1,4 @@
support GnuTLS
support OCSP
-support Experimental_TPDA
+support Experimental_Event
running IPv4
diff --git a/test/scripts/5700-tpt-post-dlv-action/REQUIRES b/test/scripts/5700-tpt-post-dlv-action/REQUIRES
index 444465835..33cd625a3 100644
--- a/test/scripts/5700-tpt-post-dlv-action/REQUIRES
+++ b/test/scripts/5700-tpt-post-dlv-action/REQUIRES
@@ -1 +1 @@
-support Experimental_TPDA
+support Experimental_Event
diff --git a/test/scripts/5750-GnuTLS-TPDA/REQUIRES b/test/scripts/5750-GnuTLS-TPDA/REQUIRES
index af1eb46f7..66a85d789 100644
--- a/test/scripts/5750-GnuTLS-TPDA/REQUIRES
+++ b/test/scripts/5750-GnuTLS-TPDA/REQUIRES
@@ -1,2 +1,2 @@
-support Experimental_TPDA
+support Experimental_Event
support GnuTLS
diff --git a/test/scripts/5760-OpenSSL-TPDA/REQUIRES b/test/scripts/5760-OpenSSL-TPDA/REQUIRES
index 5b4892059..d87b2875d 100644
--- a/test/scripts/5760-OpenSSL-TPDA/REQUIRES
+++ b/test/scripts/5760-OpenSSL-TPDA/REQUIRES
@@ -1,2 +1,2 @@
-support Experimental_TPDA
+support Experimental_Event
support OpenSSL
diff --git a/test/scripts/5860-DANE-OpenSSL-TPDA/REQUIRES b/test/scripts/5860-DANE-OpenSSL-TPDA/REQUIRES
index 7e51b4fa7..a80adaf10 100644
--- a/test/scripts/5860-DANE-OpenSSL-TPDA/REQUIRES
+++ b/test/scripts/5860-DANE-OpenSSL-TPDA/REQUIRES
@@ -1,4 +1,4 @@
support Experimental_DANE
-support Experimental_TPDA
+support Experimental_EVENT
support OpenSSL
running IPv4
diff --git a/test/stderr/5700 b/test/stderr/5700
index dcb696955..4ed4279a2 100644
--- a/test/stderr/5700
+++ b/test/stderr/5700
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand tpda_event_action msg:delivery in smtp: error from acl "logger"
+1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand event_action msg:delivery in smtp: error from acl "logger"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 04:26:09 +0000