X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/afda344b580b54a4513569720aec3260cd5ba546..e5903596a0:/test/confs/3400 diff --git a/test/confs/3400 b/test/confs/3400 index 61dc5a590..6b817c2f4 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 @@ -85,46 +86,46 @@ plain: driver = plaintext public_name = PLAIN server_condition = "\ - ${if and {{eq{$2}{userx}}{eq{$3}{secret}}}{yes}{no}}" - server_set_id = $2 + ${if and {{eq{$auth2}{userx}}{eq{$auth3}{secret}}}{yes}{no}}" + server_set_id = $auth2 extended_plain: driver = plaintext public_name = EXPLAIN server_prompts = : server_condition = "\ - ${if and {{eq{$2}{userx}}{eq{$3}{secret}}}{yes}{no}}" - server_set_id = $2 + ${if and {{eq{$auth2}{userx}}{eq{$auth3}{secret}}}{yes}{no}}" + server_set_id = $auth2 expanded_prompt_plain: driver = plaintext public_name = EXPANDED server_prompts = $primary_hostname server_condition = "\ - ${if and {{eq{$2}{userx}}{eq{$3}{secret}}}{yes}{no}}" - server_set_id = $2 + ${if and {{eq{$auth2}{userx}}{eq{$auth3}{secret}}}{yes}{no}}" + server_set_id = $auth2 expanded_prompt_plain_fail: driver = plaintext public_name = EXPANDFAIL server_prompts = $nonexistent server_condition = "\ - ${if and {{eq{$2}{userx}}{eq{$3}{secret}}}{yes}{no}}" - server_set_id = $2 + ${if and {{eq{$auth2}{userx}}{eq{$auth3}{secret}}}{yes}{no}}" + server_set_id = $auth2 defer: driver = plaintext public_name = DEFER server_condition = "account suspended" - server_set_id = $2 + server_set_id = $auth2 login: driver = plaintext public_name = LOGIN server_prompts = "User Name : Password " server_condition = "\ - ${if and {{eq{$1}{userx}}{eq{$2}{secret}}}{yes}{no}}" - server_set_id = $1 + ${if and {{eq{$auth1}{userx}}{eq{$auth2}{secret}}}{yes}{no}}" + server_set_id = $auth1 # ----- Routers -----