Remove confusing #ifndef environ
[users/jgh/exim.git] / test / stdout / 0572
index 240a2332a0d64fc8196ae3bbfc9c5ee6a20732fb..3a026977c039a42552aad7ab076f30c16994da99 100644 (file)
@@ -68,12 +68,12 @@ protocol = smtp
 retry_include_ip_address
 serialize_hosts = 
 size_addition = 1024
 retry_include_ip_address
 serialize_hosts = 
 size_addition = 1024
-socks_proxy = 127.0.0.1 port=1225
 
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
 OPT =
 exim_path = TESTSUITE/eximdir/exim
 
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
 OPT =
 exim_path = TESTSUITE/eximdir/exim
+keep_environment =
 hide host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = TESTSUITE/spool
 hide host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = TESTSUITE/spool
@@ -91,7 +91,7 @@ begin routers
     route_list = * 127.0.0.1
     self = send
     transport = my_smtp
     route_list = * 127.0.0.1
     self = send
     transport = my_smtp
-    debug_print = router_name <$router_name>
+    hide debug_print = router_name <$router_name>
     no_more
 
 begin transports
     no_more
 
 begin transports
@@ -100,5 +100,4 @@ begin transports
     driver = smtp
     interface = ip4.ip4.ip4.ip4
     port = 1224
     driver = smtp
     interface = ip4.ip4.ip4.ip4
     port = 1224
-    hide socks_proxy = 127.0.0.1 port=1225
     debug_print = transport_name <$transport_name>
     debug_print = transport_name <$transport_name>