Make def:<var> compatible between "static" and "dynamic" vars.

[user/henk/code/exim.git] / src / src / search.c

diff --git a/src/src/search.c b/src/src/search.c
index db56b61a61ba3eaee43b1be95b2d341438febd17..f8aaacb04fd194bf9b74f5ff3f376dd8148c0952 100644 (file)
--- a/src/src/search.c
+++ b/src/src/search.c
@@ -189,7 +189,7 @@ if ((t = Ustrchr(t, ',')))
   *opts = string_copy(t+1);
   }
 else
-  * opts = NULL;
+  *opts = NULL;
 
 /* Check for the individual search type. Only those that are actually in the
 binary are valid. For query-style types, "partial" and default types are
@@ -715,7 +715,7 @@ else if (partial >= 0)
   /* The key in its entirety did not match a wild entry; try chopping off
   leading components. */
 
-  if (yield == NULL)
+  if (!yield)
     {
     int dotcount = 0;
     uschar *keystring3 = keystring2 + affixlen;
@@ -839,6 +839,22 @@ if (set_null_wild && expand_setup && *expand_setup >= 0)
   expand_nlength[*expand_setup] = Ustrlen(keystring);
   }
 
+/* If we have a result, check the options to see if the key was wanted rather
+than the result.  Return a de-tainted version of the key on the grounds that
+it have been validated by the lookup. */
+
+if (yield && opts)
+  {
+  int sep = ',';
+  for (uschar * ele; ele = string_nextinlist(&opts, &sep, NULL, 0); )
+    if (Ustrcmp(ele, "ret=key") == 0)
+      {
+      DEBUG(D_lookup) debug_printf_indent("lookup ret=key: %s\n", keystring);
+      yield = string_copy_taint(keystring, FALSE);
+      break;
+      }
+  }
+
 return yield;
 }