diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-12-19 22:14:18 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-12-19 22:14:18 +0000 |
| commit | d4fd1b83a197d73cbac114fe53f3448d8b5c7cc2 (patch) | |
| tree | 595ac359ff45f8e9f8b29f6432cb088a17cf7a88 /test/confs/5860 | |
| parent | 3721c5545411010ffbea82fc58b883664d07e865 (diff) | |
| parent | b4ad78623875988d016ff816dc6c9c382be897f9 (diff) | |
Merge branch '4.next'
Diffstat (limited to 'test/confs/5860')
| -rw-r--r-- | test/confs/5860 | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/test/confs/5860 b/test/confs/5860 index 81eb5a16d..df9115129 100644 --- a/test/confs/5860 +++ b/test/confs/5860 @@ -19,20 +19,10 @@ queue_run_in_order tls_advertise_hosts = * # Set certificate only if server -CDIR1 = DIR/aux-fixed CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com -tls_certificate = ${if eq {SERVER}{server} \ - {${if eq {DETAILS}{ta} \ - {CDIR2/fullchain.pem}\ - {CDIR1/cert1}}}\ - fail} - -tls_privatekey = ${if eq {SERVER}{server} \ - {${if eq {DETAILS}{ta} \ - {CDIR2/server1.example.com.unlocked.key}\ - {CDIR1/cert1}}}\ - fail} +tls_certificate = ${if eq {SERVER}{server} {CDIR2/fullchain.pem} fail} +tls_privatekey = ${if eq {SERVER}{server} {CDIR2/server1.example.com.unlocked.key} fail} begin acl |