summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/confs/05026
-rw-r--r--test/log/05022
-rw-r--r--test/paniclog/05022
-rw-r--r--test/stderr/05022
-rw-r--r--test/stdout/05022
5 files changed, 10 insertions, 4 deletions
diff --git a/test/confs/0502 b/test/confs/0502
index aab2adaae..cf3ceb74f 100644
--- a/test/confs/0502
+++ b/test/confs/0502
@@ -33,11 +33,17 @@ check_mail:
warn set acl_c1 = ${eval:$acl_c1+1}
accept
+q_sub:
+ deny
+
check_quit:
warn logwrite = Messages received: $acl_c1
logwrite = Messages accepted: $acl_c0
logwrite = Recipients: $acl_c2
logwrite = Accepted: $acl_c3
+
+ require !acl = q_sub
+
LAST
check_rcpt:
diff --git a/test/log/0502 b/test/log/0502
index d55bd6e3e..37d82e43b 100644
--- a/test/log/0502
+++ b/test/log/0502
@@ -8,7 +8,7 @@
1999-03-02 09:44:33 Messages accepted:
1999-03-02 09:44:33 Recipients:
1999-03-02 09:44:33 Accepted:
-1999-03-02 09:44:33 ACL for QUIT returned ERROR: "deny" is not allowed in a QUIT or not-QUIT ACL
+1999-03-02 09:44:33 ACL for QUIT returned ERROR: QUIT or not-QUIT teplevel ACL may not fail ('deny' verb used incorrectly)
1999-03-02 09:44:33 Messages received: 1
1999-03-02 09:44:33 Messages accepted:
1999-03-02 09:44:33 Recipients:
diff --git a/test/paniclog/0502 b/test/paniclog/0502
index 8ab24fba4..71afc025b 100644
--- a/test/paniclog/0502
+++ b/test/paniclog/0502
@@ -1 +1 @@
-1999-03-02 09:44:33 ACL for QUIT returned ERROR: "deny" is not allowed in a QUIT or not-QUIT ACL
+1999-03-02 09:44:33 ACL for QUIT returned ERROR: QUIT or not-QUIT teplevel ACL may not fail ('deny' verb used incorrectly)
diff --git a/test/stderr/0502 b/test/stderr/0502
index 8ab24fba4..71afc025b 100644
--- a/test/stderr/0502
+++ b/test/stderr/0502
@@ -1 +1 @@
-1999-03-02 09:44:33 ACL for QUIT returned ERROR: "deny" is not allowed in a QUIT or not-QUIT ACL
+1999-03-02 09:44:33 ACL for QUIT returned ERROR: QUIT or not-QUIT teplevel ACL may not fail ('deny' verb used incorrectly)
diff --git a/test/stdout/0502 b/test/stdout/0502
index 4b307e817..a0fbe6b00 100644
--- a/test/stdout/0502
+++ b/test/stdout/0502
@@ -15,7 +15,7 @@
250 OK id=10HmaY-0005vi-00
221 Your message here
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-221 myhost.test.ex closing connection
+221 Your message here
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
221 myhost.test.ex closing connection