Merge branch 'master' into 4.next

[exim.git] / test / scripts / 0000-Basic / 0001

diff --git a/test/scripts/0000-Basic/0001 b/test/scripts/0000-Basic/0001
index 039c7a66839159e2bcbb73b19165e88ae8bb99f2..43c51b56fb06118e245023b33738d6d19eb88aac 100644 (file)
--- a/test/scripts/0000-Basic/0001
+++ b/test/scripts/0000-Basic/0001
@@ -8,8 +8,12 @@
 exim -bP accept_8bitmime \
          bounce_message_file \
          callout_domain_negative_expire \
 exim -bP accept_8bitmime \
          bounce_message_file \
          callout_domain_negative_expire \

+        commandline_checks_require_admin \

          daemon_smtp_ports \
          daemon_smtp_ports \

+        debug_store \
+        dns_cname_loops \

          envelope_to_remove \
          envelope_to_remove \

+        exim_version \

          finduser_retries \
          gecos_name \
          headers_charset \
          finduser_retries \
          gecos_name \
          headers_charset \


@@ -18,12 +22,17 @@ exim -bP accept_8bitmime \
          local_from_check \
          max_username_length \
          never_users \
          local_from_check \
          max_username_length \
          never_users \

+        notifier_socket \

          percent_hack_domains \
          qualify_domain \
          percent_hack_domains \
          qualify_domain \

+         retry_interval_max \ 

          receive_timeout \
          sender_unqualified_hosts \
          receive_timeout \
          sender_unqualified_hosts \

+        smtp_backlog_monitor \
+        spool_wireformat \

          tcp_nodelay \
          trusted_users \ 
          unknown_login \
          tcp_nodelay \
          trusted_users \ 
          unknown_login \

-         warn_message_file
+         warn_message_file \
+         syslog_pid

 ****
 ****