git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tidying
[users/jgh/exim.git]
/
test
/
confs
/
5860
diff --git
a/test/confs/5860
b/test/confs/5860
index 956a5dc37f3f30b5380f424faa4bd45f6d456caa..94436c3449b08b9d64a7c052fb138289228b2a5c 100644
(file)
--- a/
test/confs/5860
+++ b/
test/confs/5860
@@
-3,14
+3,9
@@
SERVER=
SERVER=
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
primary_hostname = myhost.test.ex
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
# ----- Main settings -----
# ----- Main settings -----
@@
-43,13
+38,13
@@
tls_privatekey = ${if eq {SERVER}{server} \
begin acl
logger:
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
<${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 -----
accept
# ----- Routers -----
@@
-83,6
+78,6
@@
send_to_server:
{= {0}{$tls_out_tlsa_usage}} } \
{*}{}}
{= {0}{$tls_out_tlsa_usage}} } \
{*}{}}
-
tpda_
event_action = ${acl {logger}}
+ event_action = ${acl {logger}}
# End
# End