use dynamic mem for regex_match_string

[exim.git] / test / scripts / 5500-PRDR / 5500

diff --git a/test/scripts/5500-PRDR/5500 b/test/scripts/5500-PRDR/5500
index 567b0008596467213a2c2204fffba6a04fec1506..73aaa977c92a37228e566ab38ce2681cfe560028 100644 (file)
--- a/test/scripts/5500-PRDR/5500
+++ b/test/scripts/5500-PRDR/5500
@@ -13,6 +13,7 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250-PRDR
 ??? 250
 mail from:<> PRDR
 ??? 250-PRDR
 ??? 250
 mail from:<> PRDR


@@ -35,7 +36,7 @@ Sender: sender@some.where
 quit
 ??? 221
 ****
 quit
 ??? 221
 ****

-sleep 1
+millisleep 500

 #
 #
 # 2: traditional data acl should be called, resulting in an overall reject
 #
 #
 # 2: traditional data acl should be called, resulting in an overall reject


@@ -46,6 +47,7 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250-PRDR
 ??? 250
 mail from:<> PRDR
 ??? 250-PRDR
 ??? 250
 mail from:<> PRDR


@@ -65,7 +67,7 @@ Sender: sender@some.where
 quit
 ??? 221
 ****
 quit
 ??? 221
 ****

-sleep 1
+millisleep 500

 #
 #
 # 3: PRDR should be avoided for a single-recipient message
 #
 #
 # 3: PRDR should be avoided for a single-recipient message


@@ -77,6 +79,7 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250-PRDR
 ??? 250
 mail from:<> PRDR
 ??? 250-PRDR
 ??? 250
 mail from:<> PRDR


@@ -91,7 +94,7 @@ Sender: sender@some.where
 quit
 ??? 221
 ****
 quit
 ??? 221
 ****

-sleep 1
+millisleep 500

 #
 # 4: double temp-reject
 client 127.0.0.1 PORT_D
 #
 # 4: double temp-reject
 client 127.0.0.1 PORT_D


@@ -101,6 +104,7 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250-PRDR
 ??? 250
 mail from:<> PRDR
 ??? 250-PRDR
 ??? 250
 mail from:<> PRDR


@@ -120,7 +124,7 @@ Sender: sender@some.where
 quit
 ??? 221
 ****
 quit
 ??? 221
 ****

-sleep 1
+millisleep 500

 #
 # 5: double reject
 client 127.0.0.1 PORT_D
 #
 # 5: double reject
 client 127.0.0.1 PORT_D


@@ -130,6 +134,7 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250-PRDR
 ??? 250
 mail from:<> PRDR
 ??? 250-PRDR
 ??? 250
 mail from:<> PRDR


@@ -149,7 +154,32 @@ Sender: sender@some.where
 quit
 ??? 221
 ****
 quit
 ??? 221
 ****

-sleep 1
+millisleep 500
+#
+# 6: no PRDR request
+client 127.0.0.1 PORT_D
+??? 220
+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250-PRDR
+??? 250
+mail from:<>
+??? 250
+rcpt to:<userx@test.ex>
+??? 250
+data
+??? 354
+Sender: sender@some.where
+.
+??? 250
+quit
+??? 221
+****
+millisleep 500

 #
 killdaemon
 #
 #
 killdaemon
 #