Callouts: r-verify option to use transport-defined mailfrom

[exim.git] / src / src / expand.c

diff --git a/src/src/expand.c b/src/src/expand.c
index 052c059e8264c3be67840c936fb557a0c9f0d0d2..b290720aa924548dcc2f775dd27743e0aa15a2e3 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -460,6 +460,7 @@ static var_entry var_table[] = {
   { "arc_state_reason",    vtype_module,       US"arc" },
 #endif
   { "atrn_host",          vtype_stringptr,   &atrn_host },
+  { "atrn_mode",          vtype_stringptr,   &atrn_mode },
   { "authenticated_fail_id",vtype_stringptr,  &authenticated_fail_id },
   { "authenticated_id",    vtype_stringptr,   &authenticated_id },
   { "authenticated_sender",vtype_stringptr,   &authenticated_sender },
@@ -2944,12 +2945,12 @@ switch(cond_type = identify_operator(&s, &opname))
   case ECOND_MATCH_DOMAIN:
   case ECOND_MATCH_IP:
   case ECOND_MATCH_LOCAL_PART:
-  case ECOND_INLIST:
-  case ECOND_INLISTI:
     sub2_honour_dollar = FALSE;
     /* FALLTHROUGH */
 
   case ECOND_CRYPTEQ:
+  case ECOND_INLIST:
+  case ECOND_INLISTI:
   case ECOND_MATCH:
 
   case ECOND_NUM_L:     /* Numerical comparisons */
@@ -4548,7 +4549,7 @@ for (int fill = 11 - Ustrlen(what); fill > 0; fill--)
   debug_printf("%V", "-");
 
 debug_printf("%s: %.*W\n", what, nchar, value);
-if (is_tainted(value))
+if (nchar > 0 && is_tainted(value))
   debug_printf_indent("%V          %V(tainted)\n",
     flags & ESI_SKIPPING ? "|" : " ", "\\__");
 }