Merge branch 'master' into transp_logging_1031

Conflicts:
	src/src/expand.c

diff --combined src/src/expand.c
index ac914707ad1e2a18dc5d22671e9c25bf2f936796,dba047b284c511cbe5aad1c53f311e7a76c1c6af..1674c5fb57f9252caea2aaaff144e814d1c737e6
--- 1/src/src/expand.c
--- 2/src/src/expand.c
+++ b/src/src/expand.c
@@@ -676,16 -676,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,8 -1898,8 +1908,8 @@@ while (i < nsub
  DEBUG(D_expand)
    debug_printf("expanding: acl: %s  arg: %s%s\n",
      sub[0],
-     acl_narg>0 ? acl_arg[0]   : US"<none>",
-     acl_narg>1 ? " +more" : "");
+     acl_narg>0 ? acl_arg[0] : US"<none>",
+     acl_narg>1 ? " +more"   : "");
  
  ret = acl_eval(acl_where, sub[0], user_msgp, &tmp);