X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/b3ef41c94af9aefec7b6855cf2ce73ffeaba9d9a..6f47da8d2d526953e8e6403f448d1598c9140df1:/test/confs/3700?ds=sidebyside diff --git a/test/confs/3700 b/test/confs/3700 index 1565b5f79..6578ecb2d 100644 --- a/test/confs/3700 +++ b/test/confs/3700 @@ -2,20 +2,18 @@ SERVER= -exim_path = EXIM_PATH -host_lookup_order = bydns -primary_hostname = myhost.test.ex -spool_directory = DIR/spool -log_file_path = DIR/spool/log/SERVER%slog -gecos_pattern = "" -gecos_name = CALLER_NAME +.include DIR/aux-var/tls_conf_prefix +primary_hostname = myhost.test.ex log_selector = +received_recipients +outgoing_port # ----- Main settings ----- +acl_smtp_auth = log_call acl_smtp_mail = check_authd acl_smtp_rcpt = check_authd +acl_smtp_data = ar_header + queue_only queue_run_in_order trusted_users = CALLER @@ -32,11 +30,16 @@ tls_verify_certificates = DIR/aux-fixed/cert2 begin acl +log_call: + accept logwrite = Auth ACL called, after smtp cmd "$smtp_command" + check_authd: deny message = authentication required !authenticated = * accept +ar_header: + accept add_header = :at_start:${authresults {$primary_hostname}} # ----- Authentication ----- @@ -55,9 +58,14 @@ tls: begin routers -r1: - driver = accept - transport = ${if eq {$local_part}{smtps} {t2}{t1}} +server_r: + driver = accept + condition = ${if eq {server}{SERVER}} + transport = file + +client_r1: + driver = accept + transport = ${if eq {$local_part}{smtps} {t2}{t1}} # ----- Transports ----- @@ -83,4 +91,9 @@ t2: tls_verify_certificates = DIR/aux-fixed/cert1 tls_verify_cert_hostnames = : +file: + driver = appendfile + file = DIR/test-mail/$local_part + user = CALLER + # End