Fix the PIPE_CONNECT feature control in the template Makefile, the

[users/heiko/exim.git] / test / confs / 0021

diff --git a/test/confs/0021 b/test/confs/0021
index da92933120ad37f43b1ba88d7b04d79ac137e8c0..0150839b431e000c52b4acc987f08cf8c7155ef6 100644 (file)
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -2,15 +2,11 @@
 
 SERVER=
 BR=
 
 SERVER=
 BR=

+LOG_SELECTOR=
+
+.include DIR/aux-var/std_conf_prefix

 
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -26,6 +22,7 @@ acl_smtp_mail = mail
 acl_smtp_rcpt = rcpt
 
 BR
 acl_smtp_rcpt = rcpt
 
 BR

+log_selector = LOG_SELECTOR

 
 qualify_domain = test.ex
 trusted_users = CALLER
 
 qualify_domain = test.ex
 trusted_users = CALLER


@@ -70,7 +67,7 @@ mail:
 rcpt:
   accept senders = +ok_senders
          sender_domains = +ok_sender_domains
 rcpt:
   accept senders = +ok_senders
          sender_domains = +ok_sender_domains

-         logwrite = :panic: rcpt accepted
+         logwrite = :panic: rcpt accepted C=$smtp_command_history

 
 # ----- Routers -----
 
 
 # ----- Routers -----
 


@@ -87,7 +84,7 @@ begin transports
 
 appendfile:
   driver = appendfile
 
 appendfile:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
 
 # End
   user = CALLER
 
 # End