git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better debug.
[users/heiko/exim.git]
/
test
/
confs
/
3400
diff --git
a/test/confs/3400
b/test/confs/3400
index 61dc5a590588b401ea17e4eea2274cd0423ca817..e567565437a4e8082281d70222b0fc0624bdf9d1 100644
(file)
--- a/
test/confs/3400
+++ b/
test/confs/3400
@@
-17,6
+17,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
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
acl_smtp_etrn = check_etrn
acl_smtp_expn = check_expn
acl_smtp_rcpt = check_recipient
@@
-32,6
+33,11
@@
trusted_users = CALLER
begin acl
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
check_recipient:
warn hosts = 10.0.0.5
message = authentication-failed: $authentication_failed
@@
-85,46
+91,46
@@
plain:
driver = plaintext
public_name = PLAIN
server_condition = "\
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{$auth
3}{secret}}}{yes}{no}}"
+ server_set_id = $
auth
2
extended_plain:
driver = plaintext
public_name = EXPLAIN
server_prompts = :
server_condition = "\
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{$auth
3}{secret}}}{yes}{no}}"
+ server_set_id = $
auth
2
expanded_prompt_plain:
driver = plaintext
public_name = EXPANDED
server_prompts = $primary_hostname
server_condition = "\
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{$auth
3}{secret}}}{yes}{no}}"
+ server_set_id = $
auth
2
expanded_prompt_plain_fail:
driver = plaintext
public_name = EXPANDFAIL
server_prompts = $nonexistent
server_condition = "\
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{$auth
3}{secret}}}{yes}{no}}"
+ server_set_id = $
auth
2
defer:
driver = plaintext
public_name = DEFER
server_condition = "account suspended"
defer:
driver = plaintext
public_name = DEFER
server_condition = "account suspended"
- server_set_id = $2
+ server_set_id = $
auth
2
login:
driver = plaintext
public_name = LOGIN
server_prompts = "User Name : Password "
server_condition = "\
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{$auth
2}{secret}}}{yes}{no}}"
+ server_set_id = $
auth
1
# ----- Routers -----
# ----- Routers -----