Testsuite: Explicit disabling of identd no longer needed

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

diff --git a/test/confs/0021 b/test/confs/0021
index 902d5f36961bc4e28593bcd3634212a96b368164..96dccd4af5f8b4d9184c5ae385173a6c94340279 100644 (file)
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -1,11 +1,11 @@
 # Exim test configuration 0021
 
 SERVER=
 # Exim test configuration 0021
 
 SERVER=

+BR=

 
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""


@@ -24,6 +24,8 @@ acl_smtp_helo = helo
 acl_smtp_mail = mail
 acl_smtp_rcpt = rcpt
 
 acl_smtp_mail = mail
 acl_smtp_rcpt = rcpt
 

+BR
+

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


@@ -62,7 +64,7 @@ mail:
          senders = ok@test3
   accept senders = ok@test1 : ok@test3
          verify  = sender
          senders = ok@test3
   accept senders = ok@test1 : ok@test3
          verify  = sender

-         logwrite = :main,reject: mail accepted
+         logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argument"

 
 rcpt:
   accept senders = +ok_senders
 
 rcpt:
   accept senders = +ok_senders