5 files changed, 19 insertions, 18 deletions
diff --git a/test/confs/0002 b/test/confs/0002
index 6f02fafa7..8662e54d0 100644
--- a/test/confs/0002
+++ b/test/confs/0002
@@ -14,7 +14,7 @@ gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
-domainlist dlist = *.aa.bb : ^\Nxxx
+domainlist dlist = *.aa.bb : ^\Nxxx(.*)
 hostlist   hlist = V4NET.11.12.13 : iplsearch;DIR/aux-fixed/0002.iplsearch
 headers_charset = iso-8859-8
 
diff --git a/test/confs/3400 b/test/confs/3400
index 61dc5a590..b84ee56c4 100644
--- a/test/confs/3400
+++ b/test/confs/3400
@@ -85,46 +85,46 @@ plain:
   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{$auth3}{secret}}}{yes}{no}}"
+  server_set_id = $auth2
 
 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{$auth3}{secret}}}{yes}{no}}"
+  server_set_id = $auth2
 
 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{$auth3}{secret}}}{yes}{no}}"
+  server_set_id = $auth2
 
 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{$auth3}{secret}}}{yes}{no}}"
+  server_set_id = $auth2
 
 defer:
   driver = plaintext
   public_name = DEFER
   server_condition = "account suspended"
-  server_set_id = $2
+  server_set_id = $auth2
 
 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{$auth2}{secret}}}{yes}{no}}"
+  server_set_id = $auth1
 
 
 # ----- Routers -----
diff --git a/test/confs/3500 b/test/confs/3500
index 999cd5673..b83b1c33f 100644
--- a/test/confs/3500
+++ b/test/confs/3500
@@ -76,10 +76,10 @@ begin authenticators
 cram_md5:
   driver = cram_md5
   public_name = CRAM-MD5
-  server_debug_print = +++CRAM-MD5 \$1="$1" \$2=\"$2" \$3="$3"
-  server_secret = "${if eq{$1}{tim}{tanstaaftanstaaf}\
-    {${if eq{$1}{userx}{secret}fail}}}"
-  server_set_id = $1
+  server_debug_print = +++CRAM-MD5 \$auth1="$auth1" \$auth2=\"$auth2" \$auth3="$auth3"
+  server_secret = "${if eq{$auth1}{tim}{tanstaaftanstaaf}\
+    {${if eq{$auth1}{userx}{secret}fail}}}"
+  server_set_id = $auth1
 
 
 
diff --git a/test/confs/3600 b/test/confs/3600
index 5550c3b11..c70fa19d7 100644
--- a/test/confs/3600
+++ b/test/confs/3600
@@ -45,6 +45,7 @@ spa:
   public_name = NTLM
   client_password = $sender_address
   client_username = username
+  server_debug_print = +++SPA \$auth1="$auth1"
   server_password = ok@test.ex
 
 
diff --git a/test/confs/9300 b/test/confs/9300
index 8f413c0f2..91365047f 100644
--- a/test/confs/9300
+++ b/test/confs/9300
@@ -21,11 +21,11 @@ begin authenticators
 sasl1:
   driver = cyrus_sasl
   public_name = ANONYMOUS
-  server_set_id = $1
+  server_set_id = $auth1
 
 sasl2:
   driver = cyrus_sasl
   public_name = PLAIN
-  server_set_id = $1
+  server_set_id = $auth1
 
 # End