summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2015-12-27 14:25:39 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2015-12-27 14:26:39 +0000
commit97960574543971c4fdb744087cb856aeb707672e (patch)
tree6c66f0c42f72df06bbb498c96cb7ad9217048b7a
parent06cf6fdcb4b33f3751ec8d121c98e00553c8b069 (diff)
Testsuite: testcase for -bP
l---------test/confs/05721
-rw-r--r--test/confs/40204
-rw-r--r--test/scripts/0000-Basic/057227
-rw-r--r--test/stdout/0572133
4 files changed, 163 insertions, 2 deletions
diff --git a/test/confs/0572 b/test/confs/0572
new file mode 120000
index 000000000..4af051ca9
--- /dev/null
+++ b/test/confs/0572
@@ -0,0 +1 @@
+4020 \ No newline at end of file
diff --git a/test/confs/4020 b/test/confs/4020
index 794272e6d..acc447718 100644
--- a/test/confs/4020
+++ b/test/confs/4020
@@ -3,7 +3,7 @@
OPT =
exim_path = EXIM_PATH
-host_lookup_order = bydns
+hide host_lookup_order = bydns
primary_hostname = myhost.test.ex
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
@@ -40,7 +40,7 @@ my_smtp:
driver = smtp
interface = HOSTIPV4
port = PORT_S
- socks_proxy = 127.0.0.1 port=PORT_D OPT
+ hide socks_proxy = 127.0.0.1 port=PORT_D OPT
debug_print = transport_name <$transport_name>
diff --git a/test/scripts/0000-Basic/0572 b/test/scripts/0000-Basic/0572
new file mode 100644
index 000000000..3525333c6
--- /dev/null
+++ b/test/scripts/0000-Basic/0572
@@ -0,0 +1,27 @@
+# -bP
+#
+# Ought to test a non-priv user, checking "hide", but
+# the testsuite cannot do that...
+#
+exim -bP spool_directory
+****
+perl -e 'print "\n";'
+****
+#
+exim -bP host_lookup_order
+****
+perl -e 'print "\n";'
+****
+#
+exim -bP +local_domains
+****
+perl -e 'print "\n";'
+****
+#
+exim -bP transport my_smtp
+****
+perl -e 'print "\n";'
+****
+#
+exim -bP config
+****
diff --git a/test/stdout/0572 b/test/stdout/0572
new file mode 100644
index 000000000..ec427ae62
--- /dev/null
+++ b/test/stdout/0572
@@ -0,0 +1,133 @@
+spool_directory = TESTSUITE/spool
+
+host_lookup_order = bydns
+
+domainlist local_domains = test.ex : *.test.ex
+
+no_body_only
+current_directory =
+debug_print = transport_name <$transport_name>
+no_delivery_date_add
+no_disable_logging
+driver = smtp
+no_envelope_to_add
+event_action =
+group =
+headers_add =
+no_headers_only
+headers_remove =
+headers_rewrite =
+home_directory =
+no_initgroups
+max_parallel =
+message_size_limit =
+no_rcpt_include_affixes
+no_retry_use_local_part
+return_path =
+no_return_path_add
+shadow_condition =
+shadow_transport =
+transport_filter =
+transport_filter_timeout = 5m
+user =
+address_retry_include_sender
+no_allow_localhost
+authenticated_sender =
+no_authenticated_sender_force
+command_timeout = 5m
+connect_timeout = 5m
+connection_max_messages = 500
+data_timeout = 5m
+delay_after_cutoff
+dkim_canon =
+dkim_domain =
+dkim_private_key =
+dkim_selector =
+dkim_sign_headers =
+dkim_strict =
+dns_qualify_single
+no_dns_search_parents
+dnssec_request_domains =
+dnssec_require_domains =
+dscp =
+fallback_hosts =
+final_timeout = 10m
+no_gethostbyname
+gnutls_require_kx =
+gnutls_require_mac =
+gnutls_require_protocols =
+helo_data = $primary_hostname
+hosts =
+hosts_avoid_esmtp =
+hosts_avoid_pipelining =
+hosts_avoid_tls =
+hosts_max_try = 5
+hosts_max_try_hardlimit = 50
+hosts_nopass_tls =
+no_hosts_override
+no_hosts_randomize
+hosts_request_ocsp = *
+hosts_require_auth =
+hosts_require_dane =
+hosts_require_ocsp =
+hosts_require_tls =
+hosts_try_auth =
+hosts_try_dane =
+hosts_try_prdr = *
+hosts_verify_avoid_tls =
+interface = ip4.ip4.ip4.ip4
+keepalive
+no_lmtp_ignore_quota
+max_rcpt = 100
+multi_domain
+port = 1224
+protocol = smtp
+retry_include_ip_address
+serialize_hosts =
+size_addition = 1024
+socks_proxy = 127.0.0.1 port=1225
+tls_certificate =
+tls_crl =
+tls_dh_min_bits = 1024
+tls_privatekey =
+tls_require_ciphers =
+tls_sni =
+tls_tempfail_tryclear
+tls_try_verify_hosts = *
+tls_verify_cert_hostnames = *
+tls_verify_certificates = system
+tls_verify_hosts =
+
+# Exim Configuration (X)
+# 1 "TESTSUITE/test-config"
+OPT =
+exim_path = TESTSUITE/eximdir/exim
+hide host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+spool_directory = TESTSUITE/spool
+log_file_path = TESTSUITE/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+tls_advertise_hosts =
+log_selector = +proxy +outgoing_port
+domainlist local_domains = test.ex : *.test.ex
+acl_smtp_rcpt = accept
+
+begin routers
+
+ my_main_router:
+ driver = manualroute
+ route_list = * 127.0.0.1
+ self = send
+ transport = my_smtp
+ debug_print = router_name <$router_name>
+ no_more
+
+begin transports
+
+ my_smtp:
+ driver = smtp
+ interface = ip4.ip4.ip4.ip4
+ port = 1224
+ hide socks_proxy = 127.0.0.1 port=1225
+ debug_print = transport_name <$transport_name>