summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/confs/055826
-rw-r--r--test/log/05586
-rw-r--r--test/rejectlog/05586
-rw-r--r--test/scripts/0000-Basic/045814
-rw-r--r--test/scripts/0000-Basic/055819
-rw-r--r--test/stdout/00912
-rw-r--r--test/stdout/01395
-rw-r--r--test/stdout/01754
-rw-r--r--test/stdout/03952
-rw-r--r--test/stdout/045834
-rw-r--r--test/stdout/055830
11 files changed, 145 insertions, 3 deletions
diff --git a/test/confs/0558 b/test/confs/0558
new file mode 100644
index 000000000..18fe64990
--- /dev/null
+++ b/test/confs/0558
@@ -0,0 +1,26 @@
+# Exim test configuration 0558
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 0s
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = a1
+
+
+# ----- ACLs -----
+
+begin acl
+
+a1:
+ deny message = Special deny message
+ local_parts = ^special
+ deny message = Default deny message\non two lines
+
+# End
diff --git a/test/log/0558 b/test/log/0558
new file mode 100644
index 000000000..3f5f92a55
--- /dev/null
+++ b/test/log/0558
@@ -0,0 +1,6 @@
+1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <userx@test.ex>: Default deny message
+1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <usery@test.ex>: Default deny message
+1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <userz@test.ex>: Default deny message
+1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <userx@test.ex>: Default deny message
+1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <specialusery@test.ex>: Special deny message
+1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <userz@test.ex>: Default deny message
diff --git a/test/rejectlog/0558 b/test/rejectlog/0558
new file mode 100644
index 000000000..3f5f92a55
--- /dev/null
+++ b/test/rejectlog/0558
@@ -0,0 +1,6 @@
+1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <userx@test.ex>: Default deny message
+1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <usery@test.ex>: Default deny message
+1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <userz@test.ex>: Default deny message
+1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <userx@test.ex>: Default deny message
+1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <specialusery@test.ex>: Special deny message
+1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <userz@test.ex>: Default deny message
diff --git a/test/scripts/0000-Basic/0458 b/test/scripts/0000-Basic/0458
index c05b4b6ff..d31709e58 100644
--- a/test/scripts/0000-Basic/0458
+++ b/test/scripts/0000-Basic/0458
@@ -16,6 +16,8 @@ rcpt to:<userx@test.ex>
??? 550
DATA
??? 503
+??? 503
+??? 503
QUIT
??? 221
****
@@ -29,6 +31,8 @@ rcpt to:<userx@test.ex>
??? 550
DATA
??? 503
+??? 503
+??? 503
QUIT
??? 221
****
@@ -45,6 +49,8 @@ rcpt to:<userx@test.ex>
??? 503
DATA
??? 503
+??? 503
+??? 503
QUIT
??? 221
****
@@ -58,6 +64,8 @@ rcpt to:<userx@test.ex>
??? 503
DATA
??? 503
+??? 503
+??? 503
QUIT
??? 221
****
@@ -78,6 +86,8 @@ rcpt to:<ph12@test.ex>
??? 550
DATA
??? 503
+??? 503
+??? 503
QUIT
??? 221
****
@@ -95,6 +105,8 @@ rcpt to:<ph12@test.ex>
??? 550
DATA
??? 503
+??? 503
+??? 503
QUIT
??? 221
****
@@ -109,6 +121,8 @@ rcpt to:<userx@test.ex>
??? 503
DATA
??? 503
+??? 503
+??? 503
QUIT
??? 221
****
diff --git a/test/scripts/0000-Basic/0558 b/test/scripts/0000-Basic/0558
new file mode 100644
index 000000000..c6aaf7dd4
--- /dev/null
+++ b/test/scripts/0000-Basic/0558
@@ -0,0 +1,19 @@
+# DATA error after identical RCPT failures
+exim -bs
+ehlo test.ex
+mail from:<>
+rcpt to:<userx@test.ex>
+rcpt to:<usery@test.ex>
+rcpt to:<userz@test.ex>
+data
+quit
+****
+exim -bs
+ehlo test.ex
+mail from:<>
+rcpt to:<userx@test.ex>
+rcpt to:<specialusery@test.ex>
+rcpt to:<userz@test.ex>
+data
+quit
+****
diff --git a/test/stdout/0091 b/test/stdout/0091
index 10cf780a9..809bad067 100644
--- a/test/stdout/0091
+++ b/test/stdout/0091
@@ -19,6 +19,8 @@
550-Verification failed for <junk@jink.jonk.test.ex>
550-Unrouteable address
550 Sender verify failed
+503-All RCPT commands were rejected with this error:
+503-Sender verify failed
503 valid RCPT command must precede DATA
500 unrecognized command
221 myhost.test.ex closing connection
diff --git a/test/stdout/0139 b/test/stdout/0139
index 3736dd4fd..e19fbb74a 100644
--- a/test/stdout/0139
+++ b/test/stdout/0139
@@ -24,6 +24,11 @@
550-This is a very long blacklisting message, continuing for ages and ages and
550-certainly being longer than 128 characters which was a previous limit on
550 the length that Exim was prepared to handle.
+503-All RCPT commands were rejected with this error:
+503-host is listed in rbl3.test.ex with value 127.0.0.3
+503-This is a very long blacklisting message, continuing for ages and ages and
+503-certainly being longer than 128 characters which was a previous limit on
+503-the length that Exim was prepared to handle.
503 valid RCPT command must precede DATA
500 unrecognized command
500 unrecognized command
diff --git a/test/stdout/0175 b/test/stdout/0175
index 92280840f..10cb2c731 100644
--- a/test/stdout/0175
+++ b/test/stdout/0175
@@ -6,6 +6,8 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
550 Sender verify failed
+503-All RCPT commands were rejected with this error:
+503-Sender verify failed
503 valid RCPT command must precede DATA
500 unrecognized command
221 the.local.host.name closing connection
@@ -17,6 +19,8 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
550 Sender verify failed
+503-All RCPT commands were rejected with this error:
+503-Sender verify failed
503 valid RCPT command must precede DATA
500 unrecognized command
221 the.local.host.name closing connection
diff --git a/test/stdout/0395 b/test/stdout/0395
index 03eedb7cf..21f34430a 100644
--- a/test/stdout/0395
+++ b/test/stdout/0395
@@ -9,6 +9,8 @@ rcpt to: userx
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
501 userx: recipient address must contain a domain
+503-All RCPT commands were rejected with this error:
+503-501 userx: recipient address must contain a domain
503 valid RCPT command must precede DATA
500 unrecognized command
500 unrecognized command
diff --git a/test/stdout/0458 b/test/stdout/0458
index b9b54b4db..8bf719501 100644
--- a/test/stdout/0458
+++ b/test/stdout/0458
@@ -18,7 +18,11 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 550 Administrative prohibition
>>> DATA
??? 503
-<<< 503 valid RCPT command must precede DATA
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-Administrative prohibition
+??? 503
+<<< 503 Valid RCPT command must precede DATA
>>> QUIT
??? 221
<<< 221 myhost.test.ex closing connection
@@ -37,6 +41,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 550 Administrative prohibition
>>> DATA
??? 503
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-Administrative prohibition
+??? 503
<<< 503 valid RCPT command must precede DATA
>>> QUIT
??? 221
@@ -62,7 +70,11 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 503 sender not yet given
>>> DATA
??? 503
-<<< 503 valid RCPT command must precede DATA
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-503 sender not yet given
+??? 503
+<<< 503 Valid RCPT command must precede DATA
>>> QUIT
??? 221
<<< 221 myhost.test.ex closing connection
@@ -81,6 +93,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 503 sender not yet given
>>> DATA
??? 503
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-503 sender not yet given
+??? 503
<<< 503 valid RCPT command must precede DATA
>>> QUIT
??? 221
@@ -112,7 +128,11 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 550 Administrative prohibition
>>> DATA
??? 503
-<<< 503 valid RCPT command must precede DATA
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-Administrative prohibition
+??? 503
+<<< 503 Valid RCPT command must precede DATA
>>> QUIT
??? 221
<<< 221 myhost.test.ex closing connection
@@ -137,6 +157,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 550 Administrative prohibition
>>> DATA
??? 503
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-Administrative prohibition
+??? 503
<<< 503 valid RCPT command must precede DATA
>>> QUIT
??? 221
@@ -159,6 +183,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 503 sender not yet given
>>> DATA
??? 503
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-503 sender not yet given
+??? 503
<<< 503 valid RCPT command must precede DATA
>>> QUIT
??? 221
diff --git a/test/stdout/0558 b/test/stdout/0558
new file mode 100644
index 000000000..aa3c21c74
--- /dev/null
+++ b/test/stdout/0558
@@ -0,0 +1,30 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+550-Default deny message
+550 on two lines
+550-Default deny message
+550 on two lines
+550-Default deny message
+550 on two lines
+503-All RCPT commands were rejected with this error:
+503-Default deny message
+503-on two lines
+503 Valid RCPT command must precede DATA
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-PIPELINING
+250 HELP
+250 OK
+550-Default deny message
+550 on two lines
+550 Special deny message
+550-Default deny message
+550 on two lines
+503 Valid RCPT command must precede DATA
+221 myhost.test.ex closing connection
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-21 05:15:31 +0000