X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/284c9d7ee4b07b87c8db9e85ae3e16511d3b6798..043a914faccd94618840dae1c66ff48b1ed3ac80:/auth.m4

diff --git a/auth.m4 b/auth.m4
index 3462c1a..93b25c0 100644
--- a/auth.m4
+++ b/auth.m4
@@ -30,9 +30,25 @@ m4_define(<:CHECK_PASSWD:>,
 	   {false}}:>)
 
 m4_define(<:ALLOW_PLAINTEXT_AUTH_P:>,
-<:or {{match_ip {$sender_host_address}{+localnet}} \
+<:or {{match_ip {$sender_host_address}{+thishost}} \
       {and {{def:tls_cipher} {eq{$acl_c_mode}{submission}}}}}:>)
 
+m4_define(<:CLIENT_SECRETS_FILE:>, <:CONF_sysconf_dir/client-secrets:>)
+
+m4_define(<:CLIENT_SECRET_GET:>,
+<:${if exists {CLIENT_SECRETS_FILE} \
+       {${lookup {$domain} partial0-lsearch {CLIENT_SECRETS_FILE} \
+	    {${extract {$1}{$value}$2$3}} \
+	    {${lookup {$host} partial0-lsearch {CLIENT_SECRETS_FILE} \
+		      {${extract {$1}{$value}$2$3}} $3}}}} \
+       $3}:>)
+
+m4_define(<:CLIENT_SECRET_EXISTSP:>,
+<:CLIENT_SECRET_GET($1, {true}, {false}):>)
+
+m4_define(<:CLIENT_SECRET:>,
+<:CLIENT_SECRET_GET($1, {${expand:$value}}, fail):>)
+
 SECTION(auth)m4_dnl
 plain:
 	driver = plaintext
@@ -41,6 +57,8 @@ plain:
 	server_prompts = :
 	server_condition = CHECK_PASSWD($auth2, $auth3)
 	server_set_id = $auth2
+	client_condition = CLIENT_SECRET_EXISTSP(plain)
+	client_send = <; CLIENT_SECRET(plain)
 
 login:
 	driver = plaintext
@@ -49,6 +67,17 @@ login:
 	server_prompts = <; Username: ; Password:
 	server_condition = CHECK_PASSWD($auth1, $auth2)
 	server_set_id = $auth1
+	client_condition = CLIENT_SECRET_EXISTSP(login-passwd)
+	client_send = <; \
+		; CLIENT_SECRET(login-name) \
+		; CLIENT_SECRET(login-passwd)
+
+cram_md5:
+	driver = cram_md5
+	public_name = CRAM-MD5
+	client_condition = CLIENT_SECRET_EXISTSP(cram-md5-secret)
+	client_name = CLIENT_SECRET(cram-md5-name)
+	client_secret = CLIENT_SECRET(cram-md5-secret)
 
 DIVERT(null)
 ###--------------------------------------------------------------------------