X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/35e4802b4bdf92823c4813e61d9e6ddf5162f8ca..e2016f158a749c1966618e25adfa19387b6bad3b:/src/src/expand.c

diff --git a/src/src/expand.c b/src/src/expand.c
index d808d1bf3..ac914707a 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -431,16 +431,6 @@ static var_entry var_table[] = {
   { "compile_date",        vtype_stringptr,   &version_date },
   { "compile_number",      vtype_stringptr,   &version_cnumber },
   { "csa_status",          vtype_stringptr,   &csa_status },
-#ifdef EXPERIMENTAL_DBL
-  { "dbl_defer_errno",     vtype_int,         &dbl_defer_errno },
-  { "dbl_defer_errstr",    vtype_stringptr,   &dbl_defer_errstr },
-  { "dbl_delivery_confirmation", vtype_stringptr,   &dbl_delivery_confirmation },
-  { "dbl_delivery_domain", vtype_stringptr,   &dbl_delivery_domain },
-  { "dbl_delivery_fqdn",   vtype_stringptr,   &dbl_delivery_fqdn },
-  { "dbl_delivery_ip",     vtype_stringptr,   &dbl_delivery_ip },
-  { "dbl_delivery_local_part",vtype_stringptr,&dbl_delivery_local_part },
-  { "dbl_delivery_port",   vtype_int,         &dbl_delivery_port },
-#endif
 #ifdef EXPERIMENTAL_DCC
   { "dcc_header",          vtype_stringptr,   &dcc_header },
   { "dcc_result",          vtype_stringptr,   &dcc_result },
@@ -686,6 +676,16 @@ static var_entry var_table[] = {
   { "tod_logfile",         vtype_todlf,       NULL },
   { "tod_zone",            vtype_todzone,     NULL },
   { "tod_zulu",            vtype_todzulu,     NULL },
+#ifdef EXPERIMENTAL_TPDA
+  { "tpda_defer_errno",     vtype_int,         &tpda_defer_errno },
+  { "tpda_defer_errstr",    vtype_stringptr,   &tpda_defer_errstr },
+  { "tpda_delivery_confirmation", vtype_stringptr,   &tpda_delivery_confirmation },
+  { "tpda_delivery_domain", vtype_stringptr,   &tpda_delivery_domain },
+  { "tpda_delivery_fqdn",   vtype_stringptr,   &tpda_delivery_fqdn },
+  { "tpda_delivery_ip",     vtype_stringptr,   &tpda_delivery_ip },
+  { "tpda_delivery_local_part",vtype_stringptr,&tpda_delivery_local_part },
+  { "tpda_delivery_port",   vtype_int,         &tpda_delivery_port },
+#endif
   { "transport_name",      vtype_stringptr,   &transport_name },
   { "value",               vtype_stringptr,   &lookup_value },
   { "version_number",      vtype_stringptr,   &version_string },
@@ -1908,7 +1908,7 @@ while (i < nsub)
 DEBUG(D_expand)
   debug_printf("expanding: acl: %s  arg: %s%s\n",
     sub[0],
-    acl_narg>0 ? sub[1]   : US"<none>",
+    acl_narg>0 ? acl_arg[0]   : US"<none>",
     acl_narg>1 ? " +more" : "");
 
 ret = acl_eval(acl_where, sub[0], user_msgp, &tmp);