X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fexpand.c;h=989e97b84bed7cfc9fe34442f51de71434c9ad40;hb=f83d4a2b3fedd9a8a0e7367db82a68a719f08e30;hp=37276dd693ab41f1f3b371377617e467dbf80818;hpb=60236d8a7bbccd9f73b39525b2dc54528c0de22a;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/expand.c b/src/src/expand.c
index 37276dd69..989e97b84 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -216,7 +216,6 @@ static uschar *op_table_main[] = {
   US"base62d",
   US"base64",
   US"base64d",
-  US"bless",
   US"domain",
   US"escape",
   US"escape8bit",
@@ -264,7 +263,6 @@ enum {
   EOP_BASE62D,
   EOP_BASE64,
   EOP_BASE64D,
-  EOP_BLESS,
   EOP_DOMAIN,
   EOP_ESCAPE,
   EOP_ESCAPE8BIT,
@@ -6433,13 +6431,10 @@ while (*s)
       condition for real. For EITEM_MAP and EITEM_REDUCE, do the same, using
       the normal internal expansion function. */
 
-      if (item_type == EITEM_FILTER)
-        {
-        if ((temp = eval_condition(expr, &resetok, NULL)))
-	  s = temp;
-        }
-      else
+      if (item_type != EITEM_FILTER)
         temp = expand_string_internal(s, TRUE, &s, TRUE, TRUE, &resetok);
+      else
+        if ((temp = eval_condition(expr, &resetok, NULL))) s = temp;
 
       if (!temp)
         {
@@ -6448,7 +6443,7 @@ while (*s)
         goto EXPAND_FAILED;
         }
 
-      Uskip_whitespace(&s);
+      Uskip_whitespace(&s);				/*{*/
       if (*s++ != '}')
         {						/*{*/
         expand_string_message = string_sprintf("missing } at end of condition "
@@ -7112,20 +7107,6 @@ while (*s)
         continue;
         }
 
-      case EOP_BLESS:
-	/* This is purely for the convenience of the test harness.  Do not enable
-	it otherwise as it defeats the taint-checking security. */
-
-	if (f.running_in_test_harness)
-	  yield = string_cat(yield, is_tainted(sub)
-				    ? string_copy_taint(sub, FALSE) : sub);
-	else
-	  {
-	  DEBUG(D_expand) debug_printf_indent("bless operator not supported\n");
-	  yield = string_cat(yield, sub);
-	  }
-	continue;
-
       case EOP_EXPAND:
         {
         uschar *expanded = expand_string_internal(sub, FALSE, NULL, skipping, TRUE, &resetok);
@@ -7324,10 +7305,10 @@ while (*s)
 
       case EOP_LISTCOUNT:
         {
-	int cnt = 0;
-	int sep = 0;
+	int cnt = 0, sep = 0;
+	uschar * buf = store_get(2, is_tainted(sub));
 
-	while (string_nextinlist(CUSS &sub, &sep, NULL, 0)) cnt++;
+	while (string_nextinlist(CUSS &sub, &sep, buf, 1)) cnt++;
 	yield = string_fmt_append(yield, "%d", cnt);
         continue;
         }
@@ -8641,6 +8622,7 @@ debug_selector = D_v;
 debug_file = stderr;
 debug_fd = fileno(debug_file);
 big_buffer = malloc(big_buffer_size);
+store_init();
 
 for (int i = 1; i < argc; i++)
   {