diff options
Diffstat (limited to 'test/scripts')
-rw-r--r-- | test/scripts/0000-Basic/0022 | 2 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0035 | 6 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0214 | 2 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0230 | 2 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0282 | 4 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0287 | 2 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0301 | 6 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0454 | 2 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0458 | 14 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0460 | 2 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0480 | 2 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0482 | 2 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0547 | 8 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0559 | 2 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0562 | 12 | ||||
-rw-r--r-- | test/scripts/0000-Basic/0564 | 2 | ||||
-rw-r--r-- | test/scripts/3400-plaintext/3415 | 8 | ||||
-rw-r--r-- | test/scripts/5500-PRDR/5500 | 10 |
18 files changed, 44 insertions, 44 deletions
diff --git a/test/scripts/0000-Basic/0022 b/test/scripts/0000-Basic/0022 index 5e20032aa..92d955171 100644 --- a/test/scripts/0000-Basic/0022 +++ b/test/scripts/0000-Basic/0022 @@ -91,7 +91,7 @@ exim -bp **** exim -DSERVER=server -odq -bd -oX PORT_D **** -client -t5 127.0.0.1 PORT_D 127.0.0.1 +client -t5 127.0.0.1 PORT_D ??? 220 mail from:<x@y> ??? 250 diff --git a/test/scripts/0000-Basic/0035 b/test/scripts/0000-Basic/0035 index fc0850c90..147c8e7e2 100644 --- a/test/scripts/0000-Basic/0035 +++ b/test/scripts/0000-Basic/0035 @@ -3,7 +3,7 @@ need_ipv4 # exim -DSERVER=server -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -61,7 +61,7 @@ killdaemon millisleep 500 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/sender_retain -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -86,7 +86,7 @@ killdaemon millisleep 500 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/name=SomeName -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- diff --git a/test/scripts/0000-Basic/0214 b/test/scripts/0000-Basic/0214 index 34d518efd..fa2a5334a 100644 --- a/test/scripts/0000-Basic/0214 +++ b/test/scripts/0000-Basic/0214 @@ -3,7 +3,7 @@ need_ipv4 # exim -DSERVER=server -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 mail from:<x@y.x> ??? 250 diff --git a/test/scripts/0000-Basic/0230 b/test/scripts/0000-Basic/0230 index 8a64308af..1bd97d670 100644 --- a/test/scripts/0000-Basic/0230 +++ b/test/scripts/0000-Basic/0230 @@ -17,7 +17,7 @@ quit ??? 221 +++ 1 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 mail from:<x@y.x> ??? 250 diff --git a/test/scripts/0000-Basic/0282 b/test/scripts/0000-Basic/0282 index 829b2c0d3..d19464e12 100644 --- a/test/scripts/0000-Basic/0282 +++ b/test/scripts/0000-Basic/0282 @@ -3,7 +3,7 @@ need_ipv4 # exim -DSERVER=server -bd -oX PORT_D3 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -23,7 +23,7 @@ This is a test message. quit ??? 221 **** -client 127.0.0.1 PORT_D2 127.0.0.1 +client 127.0.0.1 PORT_D2 ??? 220 ehlo rhu.barb ??? 250- diff --git a/test/scripts/0000-Basic/0287 b/test/scripts/0000-Basic/0287 index f18ef8437..9aa9f52e2 100644 --- a/test/scripts/0000-Basic/0287 +++ b/test/scripts/0000-Basic/0287 @@ -3,7 +3,7 @@ need_ipv4 # exim -DSERVER=server -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301 index 20c2184bc..08996c7ef 100644 --- a/test/scripts/0000-Basic/0301 +++ b/test/scripts/0000-Basic/0301 @@ -3,7 +3,7 @@ need_ipv4 # exim -DSERVER=server -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo abcd\r\nmail from:<userx@test.ex> ??? 250- @@ -15,7 +15,7 @@ ehlo abcd\r\nmail from:<userx@test.ex> quit ??? 221 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo abcd ??? 250- @@ -39,7 +39,7 @@ quit ??? 221 **** # For this one, the check will be dyamically turned on again -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo en.force ??? 250- diff --git a/test/scripts/0000-Basic/0454 b/test/scripts/0000-Basic/0454 index e12f8904a..902e2966e 100644 --- a/test/scripts/0000-Basic/0454 +++ b/test/scripts/0000-Basic/0454 @@ -3,7 +3,7 @@ need_ipv4 # exim -bd -DSERVER=server -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 helo rhu.barb ??? 250 diff --git a/test/scripts/0000-Basic/0458 b/test/scripts/0000-Basic/0458 index 2944146e1..062dec500 100644 --- a/test/scripts/0000-Basic/0458 +++ b/test/scripts/0000-Basic/0458 @@ -3,7 +3,7 @@ need_ipv4 # exim -bd -DSERVER=server -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -22,7 +22,7 @@ DATA QUIT ??? 221 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 helo rhu.barb ??? 250 @@ -37,7 +37,7 @@ DATA QUIT ??? 221 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -56,7 +56,7 @@ DATA QUIT ??? 221 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 helo rhu.barb ??? 250 @@ -71,7 +71,7 @@ DATA QUIT ??? 221 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -94,7 +94,7 @@ DATA QUIT ??? 221 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 helo rhu.barb ??? 250 @@ -113,7 +113,7 @@ DATA QUIT ??? 221 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- diff --git a/test/scripts/0000-Basic/0460 b/test/scripts/0000-Basic/0460 index e3dda1d52..b91be2084 100644 --- a/test/scripts/0000-Basic/0460 +++ b/test/scripts/0000-Basic/0460 @@ -3,7 +3,7 @@ need_ipv4 # exim -bd -DSERVER=server -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- diff --git a/test/scripts/0000-Basic/0480 b/test/scripts/0000-Basic/0480 index 45ab61958..cb4712bb1 100644 --- a/test/scripts/0000-Basic/0480 +++ b/test/scripts/0000-Basic/0480 @@ -20,7 +20,7 @@ quit **** exim -DSERVER=server -DIP1=127.0.0.1 -DIP2=HOSTIPV4 -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 helo foobar ??? 250 diff --git a/test/scripts/0000-Basic/0482 b/test/scripts/0000-Basic/0482 index c7c501125..48a53d749 100644 --- a/test/scripts/0000-Basic/0482 +++ b/test/scripts/0000-Basic/0482 @@ -3,7 +3,7 @@ need_ipv4 # exim -DSERVER=server -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 helo foobar ??? 250 diff --git a/test/scripts/0000-Basic/0547 b/test/scripts/0000-Basic/0547 index b628c2278..2595eff48 100644 --- a/test/scripts/0000-Basic/0547 +++ b/test/scripts/0000-Basic/0547 @@ -3,15 +3,15 @@ need_ipv4 # exim -DSERVER=server -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 quit ??? 221 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo x.y.z ??? 250 @@ -24,7 +24,7 @@ VRFY a@b.c quit ??? 221 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo x.y.z ??? 250 diff --git a/test/scripts/0000-Basic/0559 b/test/scripts/0000-Basic/0559 index 351df3de0..7ebc64d34 100644 --- a/test/scripts/0000-Basic/0559 +++ b/test/scripts/0000-Basic/0559 @@ -3,7 +3,7 @@ need_ipv4 # exim -DSERVER=server -bd -oX PORT_D **** -client -t5 127.0.0.1 PORT_D 127.0.0.1 +client -t5 127.0.0.1 PORT_D ??? 220 ehlo abcd ??? 250- diff --git a/test/scripts/0000-Basic/0562 b/test/scripts/0000-Basic/0562 index 2fcaf354d..9355c46fc 100644 --- a/test/scripts/0000-Basic/0562 +++ b/test/scripts/0000-Basic/0562 @@ -3,7 +3,7 @@ need_ipv4 # exim -DSERVER=server -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo abcd ??? 250- @@ -18,14 +18,14 @@ mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata This is a test message. +++ 2 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 +++ 2 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 unknown ??? 500 @@ -36,7 +36,7 @@ unknown unknown ??? 500 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 vrfy ??? 252 @@ -49,7 +49,7 @@ vrfy vrfy ??? 554 **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo abcd ??? 250- diff --git a/test/scripts/0000-Basic/0564 b/test/scripts/0000-Basic/0564 index d1f9d1ee0..68fb607ec 100644 --- a/test/scripts/0000-Basic/0564 +++ b/test/scripts/0000-Basic/0564 @@ -3,7 +3,7 @@ need_ipv4 # exim -DSERVER=wait:PORT_D -bw **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo abcd ??? 250- diff --git a/test/scripts/3400-plaintext/3415 b/test/scripts/3400-plaintext/3415 index 22005aa07..d5bcc33be 100644 --- a/test/scripts/3400-plaintext/3415 +++ b/test/scripts/3400-plaintext/3415 @@ -3,7 +3,7 @@ need_ipv4 # exim -DSERVER=server -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -38,7 +38,7 @@ killdaemon millisleep 500 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=another.domain -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -65,7 +65,7 @@ killdaemon millisleep 500 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain= -DAUTH_ID_DOMAIN=@auth.id.domain -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -92,7 +92,7 @@ killdaemon millisleep 500 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain= -DAUTH_ID_DOMAIN=@auth.id.domain -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- diff --git a/test/scripts/5500-PRDR/5500 b/test/scripts/5500-PRDR/5500 index fec0701a2..567b00085 100644 --- a/test/scripts/5500-PRDR/5500 +++ b/test/scripts/5500-PRDR/5500 @@ -6,7 +6,7 @@ no_msglog_check # z rejected, all after data per PRDR spec exim -DSERVER=server -bd -oX PORT_D **** -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -39,7 +39,7 @@ sleep 1 # # # 2: traditional data acl should be called, resulting in an overall reject -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -70,7 +70,7 @@ sleep 1 # # 3: PRDR should be avoided for a single-recipient message # even though the client showed support. -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -94,7 +94,7 @@ quit sleep 1 # # 4: double temp-reject -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -123,7 +123,7 @@ quit sleep 1 # # 5: double reject -client 127.0.0.1 PORT_D 127.0.0.1 +client 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- |