tidying

[exim.git] / test / scripts / 4020-socks / 4020

diff --git a/test/scripts/4020-socks/4020 b/test/scripts/4020-socks/4020
index 49d97c05f7dad0fde26a0332222a57e72884eeaf..2ba57ba525e15685c9282f78fc7480e9770c8edb 100644 (file)
--- a/test/scripts/4020-socks/4020
+++ b/test/scripts/4020-socks/4020
@@ -3,7 +3,7 @@
 munge loopback
 #
 # auth: null
 munge loopback
 #
 # auth: null

-server PORT_S
+server PORT_D

 <<\x05\x01\x00
 >>\x05\x00
 <<\x05\x01\x00\x01\x7f\x00\x00\x01\x04\xc8
 <<\x05\x01\x00
 >>\x05\x00
 <<\x05\x01\x00\x01\x7f\x00\x00\x01\x04\xc8


@@ -42,7 +42,7 @@ quit
 #
 #
 # auth: username/password
 #
 #
 # auth: username/password

-server PORT_S
+server PORT_D

 <<\x05\x01\x02
 >>\x05\x02
 <<\x01\x04fred\x05fubar
 <<\x05\x01\x02
 >>\x05\x02
 <<\x01\x04fred\x05fubar


@@ -80,6 +80,35 @@ via name/pwd-auth proxy
 quit
 ****
 #
 quit
 ****
 #

+# sock_proxy option set but expands to empty string
+server PORT_S
+220 Connected OK
+EHLO
+250-server id
+250
+MAIL FROM
+250
+RCPT TO
+250
+DATA
+354 hit me
+.
+250 accepted OK
+QUIT
+250 bye
+****

 #
 #

-#
+exim -odi -bs -DFALLBACK=yes
+ehlo test.ex
+mail from:<>
+rcpt to:<userx@test.ex>
+data
+Date: Fri, 17 Dec 2004 14:35:01 +0100
+Subject: message should be sent

 
 

+direct, not via proxy
+.
+quit
+****
+#
+# Ends