2 files changed, 27 insertions, 8 deletions

diff --git a/conf.d/070_authenticators.conf b/conf.d/070_authenticators.conf
index 93a6ce2..f64796b 100644
--- a/conf.d/070_authenticators.conf
+++ b/conf.d/070_authenticators.conf
@@ -19,12 +19,6 @@
 
 begin authenticators
 
-.ifdef USERLIST
-AUTH_CHECK = ${if crypteq{$auth3}{${lookup{$auth2}lsearch{USERLIST}}} {yes}{no}}
-.else
-AUTH_CHECK = ${if pam{$auth2:${sg{$auth3}{:}{::}}} {yes}{no}}
-.endif
-
 # PLAIN authentication has no server prompts. The client sends its
 # credentials in one lump, containing an authorization ID (which we do not
 # use), an authentication ID, and a password. The latter two appear as
@@ -33,13 +27,35 @@ AUTH_CHECK = ${if pam{$auth2:${sg{$auth3}{:}{::}}} {yes}{no}}
 # use $auth2 as a lookup key, and compare $auth3 against the result of the
 # lookup, perhaps using the crypteq{}{} condition.
 
-PLAIN:
+.ifdef USERLIST
+virtual_plain:
   driver                     = plaintext
   public_name                = PLAIN
   server_prompts             = :
   server_set_id              = $auth2
-  server_condition           = AUTH_CHECK
+  server_condition           = ${if crypteq{$auth3}{${lookup{$auth2}lsearch{USERLIST}}} {yes}{no}}
   server_advertise_condition = ${if ={587}{$interface_port} {yes}{no}}
+.endif
+
+.ifdef ENABLE_PAM_AUTH
+pam_plain:
+  driver                     = plaintext
+  public_name                = PLAIN
+  server_prompts             = :
+  server_set_id              = $auth2
+  server_condition           = ${if pam{$auth2:${sg{$auth3}{:}{::}}} {yes}{no}}
+  server_advertise_condition = ${if ={587}{$interface_port} {yes}{no}}
+.endif
+
+.ifdef DOVECOT_AUTH_SOCKET
+dovecot_plain:
+  driver                     = dovecot
+  public_name                = PLAIN
+  server_set_id              = $auth1
+  server_socket              = DOVECOT_AUTH_SOCKET
+  server_advertise_condition = ${if ={587}{$interface_port} {yes}{no}}
+.endif
+
 
 # LOGIN authentication has traditional prompts and responses. There is no
 # authorization ID in this mechanism, so unlike PLAIN the username and
diff --git a/exim.conf b/exim.conf
index b020999..9c0b1a4 100644
--- a/exim.conf
+++ b/exim.conf
@@ -42,6 +42,9 @@ CERTDIR = /etc/mail/ssl
 DKIMDIR = /etc/mail/dkim
 
 USERLIST = /etc/mail/list.d/users.list
+#ENABLE_PAM_AUTH = yes
+#DOVECOT_AUTH_SOCKET = /var/run/dovecot/auth-client
+
 ALIASMAP = /etc/mail/list.d/aliases.map
 
 #SPAMD_ADDRESS = 127.0.0.1 11333 variant=rspamd