diff options
author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:23:26 +0100 |
---|---|---|
committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:25:08 +0100 |
commit | 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch) | |
tree | 3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/scripts/3400-plaintext | |
parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/scripts/3400-plaintext')
-rw-r--r-- | test/scripts/3400-plaintext/3414 | 4 |
1 files changed, 2 insertions, 2 deletions
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:<a@b> auth=c@d quit @@ -15,7 +15,7 @@ mail from:<a@b> auth=c@d quit **** # No acl_smtp_mailauth, but authenticated -exim -DS=# -bs +exim -DOPT=# -bs ehlo xxxx auth plain abcd mail from:<a@b> auth=c@d |