From 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Fri, 25 Nov 2016 11:23:26 +0100 Subject: Merge from master into 4.next Done with git merge --squash -x theirs master --- test/scripts/3400-plaintext/3414 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/scripts/3400-plaintext') diff --git a/test/scripts/3400-plaintext/3414 b/test/scripts/3400-plaintext/3414 index 37528f2ea..edd3a011f 100644 --- a/test/scripts/3400-plaintext/3414 +++ b/test/scripts/3400-plaintext/3414 @@ -1,5 +1,5 @@ # control of AUTH= on MAIL by ACL -exim -DS=# -bs +exim -DOPT=# -bs ehlo xxxx mail from: auth=c@d quit @@ -15,7 +15,7 @@ mail from: auth=c@d quit **** # No acl_smtp_mailauth, but authenticated -exim -DS=# -bs +exim -DOPT=# -bs ehlo xxxx auth plain abcd mail from: auth=c@d -- cgit v1.2.3