Get saslauthd and Exim really working this time

diff --git a/conf.d/auth/30_exim4-config_examples b/conf.d/auth/30_exim4-config_examples
index cf1bbeb..3cb9f1f 100644 (file)
--- a/conf.d/auth/30_exim4-config_examples
+++ b/conf.d/auth/30_exim4-config_examples
@@ -216,25 +216,28 @@ cram_md5:
 hcoop_plain:
   driver = plaintext
   public_name = PLAIN
+  server_prompts = :
   server_condition = \
-    ${if or {{crypteq {$3} \
-                      {${extract{systempw}{${tr{${lookup{$2} \
+    ${if or {{crypteq {$auth3} \
+                      {${extract{systempw}{${tr{${lookup{$auth2} \
                                  dbm{/etc/courier/exim.dat} \
                            }}{|}{ }}}}}} \
-             {saslauthd {{$2}{$3}}}}}
-  server_set_id = $2
+             {saslauthd {{$auth2}{$auth3}{exim4}}}}}
+  server_set_id = $auth2
+  server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}}
 
 hcoop_login:
   driver = plaintext
   public_name = LOGIN
   server_prompts = "Username:: : Password::"
   server_condition = \
-    ${if or {{crypteq {$2} \
-                      {${extract{systempw}{${tr{${lookup{$1} \
+    ${if or {{crypteq {$auth2} \
+                      {${extract{systempw}{${tr{${lookup{$auth1} \
                                  dbm{/etc/courier/exim.dat} \
                            }}{|}{ }}}}}} \
-             {saslauthd {{$1}{$2}}}}}
-  server_set_id = $1
+             {saslauthd {{$auth1}{$auth2}{exim4}}}}}
+  server_set_id = $auth1
+  server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}}
 
 # this returns the matching line from passwd.client and doubles all ^
 PASSWDLINE=${sg{\