X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/f78eb7c6264c5f1a4ec2fb24c39060e0686f7714..24c7087f56530d2d81a92d9955afef13b4f1462f:/test/confs/3400?ds=sidebyside diff --git a/test/confs/3400 b/test/confs/3400 index b84ee56c4..d94e70d7c 100644 --- a/test/confs/3400 +++ b/test/confs/3400 @@ -1,13 +1,8 @@ # Exim test configuration 3400 -exim_path = EXIM_PATH -host_lookup_order = bydns +.include DIR/aux-var/std_conf_prefix + primary_hostname = myhost.test.ex -rfc1413_query_timeout = 0s -spool_directory = DIR/spool -log_file_path = DIR/spool/log/%slog -gecos_pattern = "" -gecos_name = CALLER_NAME # ----- Main settings ----- @@ -17,6 +12,7 @@ hostlist auth_hosts = 10.0.0.1 hostlist relay_hosts = 10.0.0.4 hostlist auth_relay_hosts = 10.0.0.3 : 10.0.0.4 +acl_smtp_connect = check_connect acl_smtp_etrn = check_etrn acl_smtp_expn = check_expn acl_smtp_rcpt = check_recipient @@ -32,6 +28,11 @@ trusted_users = CALLER begin acl +check_connect: + warn hosts = 10.0.0.6 + control = allow_auth_unadvertised + accept + check_recipient: warn hosts = 10.0.0.5 message = authentication-failed: $authentication_failed @@ -150,7 +151,7 @@ appendfile: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER