Overhaul of GnuTLS code.

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

diff --git a/src/src/expand.c b/src/src/expand.c
index ec4dd71f94392407f12a78208b6af1c107825871..2fc953aeccf99da3b043d6ec97c8aff0fa7ad1d6 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -13,7 +13,7 @@
 
 /* Recursively called function */
 
 
 /* Recursively called function */
 

-static uschar *expand_string_internal(uschar *, BOOL, uschar **, BOOL);
+static uschar *expand_string_internal(uschar *, BOOL, uschar **, BOOL, BOOL);

 
 #ifdef STAND_ALONE
 #ifndef SUPPORT_CRYPTEQ
 
 #ifdef STAND_ALONE
 #ifndef SUPPORT_CRYPTEQ


@@ -258,6 +258,8 @@ static uschar *cond_table[] = {
   US"gei",
   US"gt",
   US"gti",
   US"gei",
   US"gt",
   US"gti",

+  US"inlist",
+  US"inlisti",

   US"isip",
   US"isip4",
   US"isip6",
   US"isip",
   US"isip4",
   US"isip6",


@@ -301,6 +303,8 @@ enum {
   ECOND_STR_GEI,
   ECOND_STR_GT,
   ECOND_STR_GTI,
   ECOND_STR_GEI,
   ECOND_STR_GT,
   ECOND_STR_GTI,

+  ECOND_INLIST,
+  ECOND_INLISTI,

   ECOND_ISIP,
   ECOND_ISIP4,
   ECOND_ISIP6,
   ECOND_ISIP,
   ECOND_ISIP4,
   ECOND_ISIP6,


@@ -607,9 +611,13 @@ static var_entry var_table[] = {
   { "srs_status",          vtype_stringptr,   &srs_status },
 #endif
   { "thisaddress",         vtype_stringptr,   &filter_thisaddress },
   { "srs_status",          vtype_stringptr,   &srs_status },
 #endif
   { "thisaddress",         vtype_stringptr,   &filter_thisaddress },

+  { "tls_bits",            vtype_int,         &tls_bits },

   { "tls_certificate_verified", vtype_int,    &tls_certificate_verified },
   { "tls_cipher",          vtype_stringptr,   &tls_cipher },
   { "tls_peerdn",          vtype_stringptr,   &tls_peerdn },
   { "tls_certificate_verified", vtype_int,    &tls_certificate_verified },
   { "tls_cipher",          vtype_stringptr,   &tls_cipher },
   { "tls_peerdn",          vtype_stringptr,   &tls_peerdn },

+#ifdef SUPPORT_TLS
+  { "tls_sni",             vtype_stringptr,   &tls_sni },
+#endif

   { "tod_bsdinbox",        vtype_todbsdin,    NULL },
   { "tod_epoch",           vtype_tode,        NULL },
   { "tod_full",            vtype_todf,        NULL },
   { "tod_bsdinbox",        vtype_todbsdin,    NULL },
   { "tod_epoch",           vtype_tode,        NULL },
   { "tod_full",            vtype_todf,        NULL },


@@ -768,6 +776,7 @@ return rc;
 
 
 
 
 
 

+

 /*************************************************
 *        Pseudo-random number generation         *
 *************************************************/
 /*************************************************
 *        Pseudo-random number generation         *
 *************************************************/


@@ -780,19 +789,23 @@ weirdness they'll twist this into.  The result should ideally handle fork().
 However, if we're stuck unable to provide this, then we'll fall back to
 appallingly bad randomness.
 
 However, if we're stuck unable to provide this, then we'll fall back to
 appallingly bad randomness.
 

-If SUPPORT_TLS is defined and OpenSSL is used, then this will not be used.
-The GNUTLS randomness functions found do not seem amenable to extracting
-random numbers outside of a TLS context.  Any volunteers?
+If SUPPORT_TLS is defined then this will not be used except as an emergency
+fallback.

 
 Arguments:
   max       range maximum
 Returns     a random number in range [0, max-1]
 */
 
 
 Arguments:
   max       range maximum
 Returns     a random number in range [0, max-1]
 */
 

-#if !defined(SUPPORT_TLS) || defined(USE_GNUTLS)
+#ifdef SUPPORT_TLS
+# define vaguely_random_number vaguely_random_number_fallback
+#endif

 int
 int

-pseudo_random_number(int max)
+vaguely_random_number(int max)

 {
 {

+#ifdef SUPPORT_TLS
+# undef vaguely_random_number
+#endif

   static pid_t pid = 0;
   pid_t p2;
 #if defined(HAVE_SRANDOM) && !defined(HAVE_SRANDOMDEV)
   static pid_t pid = 0;
   pid_t p2;
 #if defined(HAVE_SRANDOM) && !defined(HAVE_SRANDOMDEV)


@@ -835,7 +848,8 @@ pseudo_random_number(int max)
 #endif
 }
 
 #endif
 }
 

-#endif
+
+

 
 /*************************************************
 *             Pick out a name from a string      *
 
 /*************************************************
 *             Pick out a name from a string      *


@@ -1699,7 +1713,7 @@ for (i = 0; i < n; i++)
     sub[i] = NULL;
     break;
     }
     sub[i] = NULL;
     break;
     }

-  sub[i] = expand_string_internal(s+1, TRUE, &s, skipping);
+  sub[i] = expand_string_internal(s+1, TRUE, &s, skipping, TRUE);

   if (sub[i] == NULL) return 3;
   if (*s++ != '}') return 1;
   while (isspace(*s)) s++;
   if (sub[i] == NULL) return 3;
   if (*s++ != '}') return 1;
   while (isspace(*s)) s++;


@@ -1771,8 +1785,9 @@ eval_condition(uschar *s, BOOL *yield)
 BOOL testfor = TRUE;
 BOOL tempcond, combined_cond;
 BOOL *subcondptr;
 BOOL testfor = TRUE;
 BOOL tempcond, combined_cond;
 BOOL *subcondptr;

+BOOL sub2_honour_dollar = TRUE;

 int i, rc, cond_type, roffset;
 int i, rc, cond_type, roffset;

-int num[2];
+int_eximarith_t num[2];

 struct stat statbuf;
 uschar name[256];
 uschar *sub[4];
 struct stat statbuf;
 uschar name[256];
 uschar *sub[4];


@@ -1903,7 +1918,7 @@ switch(cond_type)
   while (isspace(*s)) s++;
   if (*s != '{') goto COND_FAILED_CURLY_START;
 
   while (isspace(*s)) s++;
   if (*s != '{') goto COND_FAILED_CURLY_START;
 

-  sub[0] = expand_string_internal(s+1, TRUE, &s, yield == NULL);
+  sub[0] = expand_string_internal(s+1, TRUE, &s, yield == NULL, TRUE);

   if (sub[0] == NULL) return NULL;
   if (*s++ != '}') goto COND_FAILED_CURLY_END;
 
   if (sub[0] == NULL) return NULL;
   if (*s++ != '}') goto COND_FAILED_CURLY_END;
 


@@ -2016,22 +2031,30 @@ switch(cond_type)
   /* symbolic operators for numeric and string comparison, and a number of
   other operators, all requiring two arguments.
 
   /* symbolic operators for numeric and string comparison, and a number of
   other operators, all requiring two arguments.
 

+  crypteq:           encrypts plaintext and compares against an encrypted text,
+                       using crypt(), crypt16(), MD5 or SHA-1
+  inlist/inlisti:    checks if first argument is in the list of the second

   match:             does a regular expression match and sets up the numerical
                        variables if it succeeds
   match_address:     matches in an address list
   match_domain:      matches in a domain list
   match_ip:          matches a host list that is restricted to IP addresses
   match_local_part:  matches in a local part list
   match:             does a regular expression match and sets up the numerical
                        variables if it succeeds
   match_address:     matches in an address list
   match_domain:      matches in a domain list
   match_ip:          matches a host list that is restricted to IP addresses
   match_local_part:  matches in a local part list

-  crypteq:           encrypts plaintext and compares against an encrypted text,
-                       using crypt(), crypt16(), MD5 or SHA-1

   */
 
   */
 

-  case ECOND_MATCH:

   case ECOND_MATCH_ADDRESS:
   case ECOND_MATCH_DOMAIN:
   case ECOND_MATCH_IP:
   case ECOND_MATCH_LOCAL_PART:
   case ECOND_MATCH_ADDRESS:
   case ECOND_MATCH_DOMAIN:
   case ECOND_MATCH_IP:
   case ECOND_MATCH_LOCAL_PART:

+#ifndef EXPAND_LISTMATCH_RHS
+    sub2_honour_dollar = FALSE;
+#endif
+    /* FALLTHROUGH */
+

   case ECOND_CRYPTEQ:
   case ECOND_CRYPTEQ:

+  case ECOND_INLIST:
+  case ECOND_INLISTI:
+  case ECOND_MATCH:

 
   case ECOND_NUM_L:     /* Numerical comparisons */
   case ECOND_NUM_LE:
 
   case ECOND_NUM_L:     /* Numerical comparisons */
   case ECOND_NUM_LE:


@@ -2053,6 +2076,13 @@ switch(cond_type)
 
   for (i = 0; i < 2; i++)
     {
 
   for (i = 0; i < 2; i++)
     {

+    /* Sometimes, we don't expand substrings; too many insecure configurations
+    created using match_address{}{} and friends, where the second param
+    includes information from untrustworthy sources. */
+    BOOL honour_dollar = TRUE;
+    if ((i > 0) && !sub2_honour_dollar)
+      honour_dollar = FALSE;
+

     while (isspace(*s)) s++;
     if (*s != '{')
       {
     while (isspace(*s)) s++;
     if (*s != '{')
       {


@@ -2061,7 +2091,8 @@ switch(cond_type)
         "after \"%s\"", name);
       return NULL;
       }
         "after \"%s\"", name);
       return NULL;
       }

-    sub[i] = expand_string_internal(s+1, TRUE, &s, yield == NULL);
+    sub[i] = expand_string_internal(s+1, TRUE, &s, yield == NULL,
+        honour_dollar);

     if (sub[i] == NULL) return NULL;
     if (*s++ != '}') goto COND_FAILED_CURLY_END;
 
     if (sub[i] == NULL) return NULL;
     if (*s++ != '}') goto COND_FAILED_CURLY_END;
 


@@ -2320,6 +2351,7 @@ switch(cond_type)
       }
 
     else   /* {crypt} or {crypt16} and non-{ at start */
       }
 
     else   /* {crypt} or {crypt16} and non-{ at start */

+           /* }-for-text-editors */

       {
       int which = 0;
       uschar *coded;
       {
       int which = 0;
       uschar *coded;


@@ -2366,6 +2398,30 @@ switch(cond_type)
       }
     break;
     #endif  /* SUPPORT_CRYPTEQ */
       }
     break;
     #endif  /* SUPPORT_CRYPTEQ */

+
+    case ECOND_INLIST:
+    case ECOND_INLISTI:
+      {
+      int sep = 0;
+      BOOL found = FALSE;
+      uschar *save_iterate_item = iterate_item;
+      int (*compare)(const uschar *, const uschar *);
+
+      if (cond_type == ECOND_INLISTI)
+        compare = strcmpic;
+      else
+        compare = (int (*)(const uschar *, const uschar *)) strcmp;
+
+      while ((iterate_item = string_nextinlist(&sub[1], &sep, NULL, 0)) != NULL)
+        if (compare(sub[0], iterate_item) == 0)
+          {
+          found = TRUE;
+          break;
+          }
+      iterate_item = save_iterate_item;
+      *yield = found;
+      }
+

     }   /* Switch for comparison conditions */
 
   return s;    /* End of comparison conditions */
     }   /* Switch for comparison conditions */
 
   return s;    /* End of comparison conditions */


@@ -2437,7 +2493,7 @@ switch(cond_type)
 
     while (isspace(*s)) s++;
     if (*s++ != '{') goto COND_FAILED_CURLY_START;
 
     while (isspace(*s)) s++;
     if (*s++ != '{') goto COND_FAILED_CURLY_START;

-    sub[0] = expand_string_internal(s, TRUE, &s, (yield == NULL));
+    sub[0] = expand_string_internal(s, TRUE, &s, (yield == NULL), TRUE);

     if (sub[0] == NULL) return NULL;
     if (*s++ != '}') goto COND_FAILED_CURLY_END;
 
     if (sub[0] == NULL) return NULL;
     if (*s++ != '}') goto COND_FAILED_CURLY_END;
 


@@ -2719,7 +2775,7 @@ if (*s++ != '{') goto FAILED_CURLY;
 want this string. Set skipping in the call in the fail case (this will always
 be the case if we were already skipping). */
 
 want this string. Set skipping in the call in the fail case (this will always
 be the case if we were already skipping). */
 

-sub1 = expand_string_internal(s, TRUE, &s, !yes);
+sub1 = expand_string_internal(s, TRUE, &s, !yes, TRUE);

 if (sub1 == NULL && (yes || !expand_string_forcedfail)) goto FAILED;
 expand_string_forcedfail = FALSE;
 if (*s++ != '}') goto FAILED_CURLY;
 if (sub1 == NULL && (yes || !expand_string_forcedfail)) goto FAILED;
 expand_string_forcedfail = FALSE;
 if (*s++ != '}') goto FAILED_CURLY;


@@ -2744,7 +2800,7 @@ already skipping. */
 while (isspace(*s)) s++;
 if (*s == '{')
   {
 while (isspace(*s)) s++;
 if (*s == '{')
   {

-  sub2 = expand_string_internal(s+1, TRUE, &s, yes || skipping);
+  sub2 = expand_string_internal(s+1, TRUE, &s, yes || skipping, TRUE);

   if (sub2 == NULL && (!yes || !expand_string_forcedfail)) goto FAILED;
   expand_string_forcedfail = FALSE;
   if (*s++ != '}') goto FAILED_CURLY;
   if (sub2 == NULL && (!yes || !expand_string_forcedfail)) goto FAILED;
   expand_string_forcedfail = FALSE;
   if (*s++ != '}') goto FAILED_CURLY;


@@ -3019,14 +3075,14 @@ Returns:      on success: the value of the expression, with *error still NULL
               on failure: an undefined value, with *error = a message
 */
 
               on failure: an undefined value, with *error = a message
 */
 

-static int eval_op_or(uschar **, BOOL, uschar **);
+static int_eximarith_t eval_op_or(uschar **, BOOL, uschar **);

 
 
 
 

-static int
+static int_eximarith_t

 eval_expr(uschar **sptr, BOOL decimal, uschar **error, BOOL endket)
 {
 uschar *s = *sptr;
 eval_expr(uschar **sptr, BOOL decimal, uschar **error, BOOL endket)
 {
 uschar *s = *sptr;

-int x = eval_op_or(&s, decimal, error);
+int_eximarith_t x = eval_op_or(&s, decimal, error);

 if (*error == NULL)
   {
   if (endket)
 if (*error == NULL)
   {
   if (endket)


@@ -3043,21 +3099,26 @@ return x;
 }
 
 
 }
 
 

-static int
+static int_eximarith_t

 eval_number(uschar **sptr, BOOL decimal, uschar **error)
 {
 register int c;
 eval_number(uschar **sptr, BOOL decimal, uschar **error)
 {
 register int c;

-int n;
+int_eximarith_t n;

 uschar *s = *sptr;
 while (isspace(*s)) s++;
 c = *s;
 if (isdigit(c))
   {
   int count;
 uschar *s = *sptr;
 while (isspace(*s)) s++;
 c = *s;
 if (isdigit(c))
   {
   int count;

-  (void)sscanf(CS s, (decimal? "%d%n" : "%i%n"), &n, &count);
+  (void)sscanf(CS s, (decimal? SC_EXIM_DEC "%n" : SC_EXIM_ARITH "%n"), &n, &count);

   s += count;
   s += count;

-  if (tolower(*s) == 'k') { n *= 1024; s++; }
-    else if (tolower(*s) == 'm') { n *= 1024*1024; s++; }
+  switch (tolower(*s))
+    {
+    default: break;
+    case 'k': n *= 1024; s++; break;
+    case 'm': n *= 1024*1024; s++; break;
+    case 'g': n *= 1024*1024*1024; s++; break;
+    }

   while (isspace (*s)) s++;
   }
 else if (c == '(')
   while (isspace (*s)) s++;
   }
 else if (c == '(')


@@ -3075,10 +3136,11 @@ return n;
 }
 
 
 }
 
 

-static int eval_op_unary(uschar **sptr, BOOL decimal, uschar **error)
+static int_eximarith_t
+eval_op_unary(uschar **sptr, BOOL decimal, uschar **error)

 {
 uschar *s = *sptr;
 {
 uschar *s = *sptr;

-int x;
+int_eximarith_t x;

 while (isspace(*s)) s++;
 if (*s == '+' || *s == '-' || *s == '~')
   {
 while (isspace(*s)) s++;
 if (*s == '+' || *s == '-' || *s == '~')
   {


@@ -3096,16 +3158,17 @@ return x;
 }
 
 
 }
 
 

-static int eval_op_mult(uschar **sptr, BOOL decimal, uschar **error)
+static int_eximarith_t
+eval_op_mult(uschar **sptr, BOOL decimal, uschar **error)

 {
 uschar *s = *sptr;
 {
 uschar *s = *sptr;

-int x = eval_op_unary(&s, decimal, error);
+int_eximarith_t x = eval_op_unary(&s, decimal, error);

 if (*error == NULL)
   {
   while (*s == '*' || *s == '/' || *s == '%')
     {
     int op = *s++;
 if (*error == NULL)
   {
   while (*s == '*' || *s == '/' || *s == '%')
     {
     int op = *s++;

-    int y = eval_op_unary(&s, decimal, error);
+    int_eximarith_t y = eval_op_unary(&s, decimal, error);

     if (*error != NULL) break;
     /* SIGFPE both on div/mod by zero and on INT_MIN / -1, which would give
      * a value of INT_MAX+1. Note that INT_MIN * -1 gives INT_MIN for me, which
     if (*error != NULL) break;
     /* SIGFPE both on div/mod by zero and on INT_MIN / -1, which would give
      * a value of INT_MAX+1. Note that INT_MIN * -1 gives INT_MIN for me, which


@@ -3125,12 +3188,12 @@ if (*error == NULL)
      * can just let the other invalid results occur otherwise, as they have
      * until now.  For this one case, we can coerce.
      */
      * can just let the other invalid results occur otherwise, as they have
      * until now.  For this one case, we can coerce.
      */

-    if (y == -1 && x == INT_MIN && op != '*')
+    if (y == -1 && x == LLONG_MIN && op != '*')

       {
       DEBUG(D_expand)
       {
       DEBUG(D_expand)

-        debug_printf("Integer exception dodging: %d%c-1 coerced to %d\n",
-            INT_MIN, op, INT_MAX);
-      x = INT_MAX;
+        debug_printf("Integer exception dodging: " PR_EXIM_ARITH "%c-1 coerced to " PR_EXIM_ARITH "\n",
+            LLONG_MIN, op, LLONG_MAX);
+      x = LLONG_MAX;

       continue;
       }
     if (op == '*')
       continue;
       }
     if (op == '*')


@@ -3155,16 +3218,17 @@ return x;
 }
 
 
 }
 
 

-static int eval_op_sum(uschar **sptr, BOOL decimal, uschar **error)
+static int_eximarith_t
+eval_op_sum(uschar **sptr, BOOL decimal, uschar **error)

 {
 uschar *s = *sptr;
 {
 uschar *s = *sptr;

-int x = eval_op_mult(&s, decimal, error);
+int_eximarith_t x = eval_op_mult(&s, decimal, error);

 if (*error == NULL)
   {
   while (*s == '+' || *s == '-')
     {
     int op = *s++;
 if (*error == NULL)
   {
   while (*s == '+' || *s == '-')
     {
     int op = *s++;

-    int y = eval_op_mult(&s, decimal, error);
+    int_eximarith_t y = eval_op_mult(&s, decimal, error);

     if (*error != NULL) break;
     if (op == '+') x += y; else x -= y;
     }
     if (*error != NULL) break;
     if (op == '+') x += y; else x -= y;
     }


@@ -3174,15 +3238,16 @@ return x;
 }
 
 
 }
 
 

-static int eval_op_shift(uschar **sptr, BOOL decimal, uschar **error)
+static int_eximarith_t
+eval_op_shift(uschar **sptr, BOOL decimal, uschar **error)

 {
 uschar *s = *sptr;
 {
 uschar *s = *sptr;

-int x = eval_op_sum(&s, decimal, error);
+int_eximarith_t x = eval_op_sum(&s, decimal, error);

 if (*error == NULL)
   {
   while ((*s == '<' || *s == '>') && s[1] == s[0])
     {
 if (*error == NULL)
   {
   while ((*s == '<' || *s == '>') && s[1] == s[0])
     {

-    int y;
+    int_eximarith_t y;

     int op = *s++;
     s++;
     y = eval_op_sum(&s, decimal, error);
     int op = *s++;
     s++;
     y = eval_op_sum(&s, decimal, error);


@@ -3195,15 +3260,16 @@ return x;
 }
 
 
 }
 
 

-static int eval_op_and(uschar **sptr, BOOL decimal, uschar **error)
+static int_eximarith_t
+eval_op_and(uschar **sptr, BOOL decimal, uschar **error)

 {
 uschar *s = *sptr;
 {
 uschar *s = *sptr;

-int x = eval_op_shift(&s, decimal, error);
+int_eximarith_t x = eval_op_shift(&s, decimal, error);

 if (*error == NULL)
   {
   while (*s == '&')
     {
 if (*error == NULL)
   {
   while (*s == '&')
     {

-    int y;
+    int_eximarith_t y;

     s++;
     y = eval_op_shift(&s, decimal, error);
     if (*error != NULL) break;
     s++;
     y = eval_op_shift(&s, decimal, error);
     if (*error != NULL) break;


@@ -3215,15 +3281,16 @@ return x;
 }
 
 
 }
 
 

-static int eval_op_xor(uschar **sptr, BOOL decimal, uschar **error)
+static int_eximarith_t
+eval_op_xor(uschar **sptr, BOOL decimal, uschar **error)

 {
 uschar *s = *sptr;
 {
 uschar *s = *sptr;

-int x = eval_op_and(&s, decimal, error);
+int_eximarith_t x = eval_op_and(&s, decimal, error);

 if (*error == NULL)
   {
   while (*s == '^')
     {
 if (*error == NULL)
   {
   while (*s == '^')
     {

-    int y;
+    int_eximarith_t y;

     s++;
     y = eval_op_and(&s, decimal, error);
     if (*error != NULL) break;
     s++;
     y = eval_op_and(&s, decimal, error);
     if (*error != NULL) break;


@@ -3235,15 +3302,16 @@ return x;
 }
 
 
 }
 
 

-static int eval_op_or(uschar **sptr, BOOL decimal, uschar **error)
+static int_eximarith_t
+eval_op_or(uschar **sptr, BOOL decimal, uschar **error)

 {
 uschar *s = *sptr;
 {
 uschar *s = *sptr;

-int x = eval_op_xor(&s, decimal, error);
+int_eximarith_t x = eval_op_xor(&s, decimal, error);

 if (*error == NULL)
   {
   while (*s == '|')
     {
 if (*error == NULL)
   {
   while (*s == '|')
     {

-    int y;
+    int_eximarith_t y;

     s++;
     y = eval_op_xor(&s, decimal, error);
     if (*error != NULL) break;
     s++;
     y = eval_op_xor(&s, decimal, error);
     if (*error != NULL) break;


@@ -3307,6 +3375,8 @@ Arguments:
                  expansion is placed here (typically used with ket_ends)
   skipping       TRUE for recursive calls when the value isn't actually going
                  to be used (to allow for optimisation)
                  expansion is placed here (typically used with ket_ends)
   skipping       TRUE for recursive calls when the value isn't actually going
                  to be used (to allow for optimisation)

+  honour_dollar  TRUE if $ is to be expanded,
+                 FALSE if it's just another character

 
 Returns:         NULL if expansion fails:
                    expand_string_forcedfail is set TRUE if failure was forced
 
 Returns:         NULL if expansion fails:
                    expand_string_forcedfail is set TRUE if failure was forced


@@ -3316,7 +3386,7 @@ Returns:         NULL if expansion fails:
 
 static uschar *
 expand_string_internal(uschar *string, BOOL ket_ends, uschar **left,
 
 static uschar *
 expand_string_internal(uschar *string, BOOL ket_ends, uschar **left,

-  BOOL skipping)
+  BOOL skipping, BOOL honour_dollar)

 {
 int ptr = 0;
 int size = Ustrlen(string)+ 64;
 {
 int ptr = 0;
 int size = Ustrlen(string)+ 64;


@@ -3372,7 +3442,7 @@ while (*s != 0)
 
   if (ket_ends && *s == '}') break;
 
 
   if (ket_ends && *s == '}') break;
 

-  if (*s != '$')
+  if (*s != '$' || !honour_dollar)

     {
     yield = string_cat(yield, &size, &ptr, s++, 1);
     continue;
     {
     yield = string_cat(yield, &size, &ptr, s++, 1);
     continue;


@@ -3588,7 +3658,7 @@ while (*s != 0)
       while (isspace(*s)) s++;
       if (*s == '{')
         {
       while (isspace(*s)) s++;
       if (*s == '{')
         {

-        key = expand_string_internal(s+1, TRUE, &s, skipping);
+        key = expand_string_internal(s+1, TRUE, &s, skipping, TRUE);

         if (key == NULL) goto EXPAND_FAILED;
         if (*s++ != '}') goto EXPAND_FAILED_CURLY;
         while (isspace(*s)) s++;
         if (key == NULL) goto EXPAND_FAILED;
         if (*s++ != '}') goto EXPAND_FAILED_CURLY;
         while (isspace(*s)) s++;


@@ -3654,7 +3724,7 @@ while (*s != 0)
       first. */
 
       if (*s != '{') goto EXPAND_FAILED_CURLY;
       first. */
 
       if (*s != '{') goto EXPAND_FAILED_CURLY;

-      filename = expand_string_internal(s+1, TRUE, &s, skipping);
+      filename = expand_string_internal(s+1, TRUE, &s, skipping, TRUE);

       if (filename == NULL) goto EXPAND_FAILED;
       if (*s++ != '}') goto EXPAND_FAILED_CURLY;
       while (isspace(*s)) s++;
       if (filename == NULL) goto EXPAND_FAILED;
       if (*s++ != '}') goto EXPAND_FAILED_CURLY;
       while (isspace(*s)) s++;


@@ -4323,7 +4393,7 @@ while (*s != 0)
 
       if (*s == '{')
         {
 
       if (*s == '{')
         {

-        if (expand_string_internal(s+1, TRUE, &s, TRUE) == NULL)
+        if (expand_string_internal(s+1, TRUE, &s, TRUE, TRUE) == NULL)

           goto EXPAND_FAILED;
         if (*s++ != '}') goto EXPAND_FAILED_CURLY;
         while (isspace(*s)) s++;
           goto EXPAND_FAILED;
         if (*s++ != '}') goto EXPAND_FAILED_CURLY;
         while (isspace(*s)) s++;


@@ -4338,7 +4408,7 @@ while (*s != 0)
       SOCK_FAIL:
       if (*s != '{') goto EXPAND_FAILED;
       DEBUG(D_any) debug_printf("%s\n", expand_string_message);
       SOCK_FAIL:
       if (*s != '{') goto EXPAND_FAILED;
       DEBUG(D_any) debug_printf("%s\n", expand_string_message);

-      arg = expand_string_internal(s+1, TRUE, &s, FALSE);
+      arg = expand_string_internal(s+1, TRUE, &s, FALSE, TRUE);

       if (arg == NULL) goto EXPAND_FAILED;
       yield = string_cat(yield, &size, &ptr, arg, Ustrlen(arg));
       if (*s++ != '}') goto EXPAND_FAILED_CURLY;
       if (arg == NULL) goto EXPAND_FAILED;
       yield = string_cat(yield, &size, &ptr, arg, Ustrlen(arg));
       if (*s++ != '}') goto EXPAND_FAILED_CURLY;


@@ -4367,7 +4437,7 @@ while (*s != 0)
 
       while (isspace(*s)) s++;
       if (*s != '{') goto EXPAND_FAILED_CURLY;
 
       while (isspace(*s)) s++;
       if (*s != '{') goto EXPAND_FAILED_CURLY;

-      arg = expand_string_internal(s+1, TRUE, &s, skipping);
+      arg = expand_string_internal(s+1, TRUE, &s, skipping, TRUE);

       if (arg == NULL) goto EXPAND_FAILED;
       while (isspace(*s)) s++;
       if (*s++ != '}') goto EXPAND_FAILED_CURLY;
       if (arg == NULL) goto EXPAND_FAILED;
       while (isspace(*s)) s++;
       if (*s++ != '}') goto EXPAND_FAILED_CURLY;


@@ -4798,7 +4868,7 @@ while (*s != 0)
         while (isspace(*s)) s++;
         if (*s == '{')
           {
         while (isspace(*s)) s++;
         if (*s == '{')
           {

-          sub[i] = expand_string_internal(s+1, TRUE, &s, skipping);
+          sub[i] = expand_string_internal(s+1, TRUE, &s, skipping, TRUE);

           if (sub[i] == NULL) goto EXPAND_FAILED;
           if (*s++ != '}') goto EXPAND_FAILED_CURLY;
 
           if (sub[i] == NULL) goto EXPAND_FAILED;
           if (*s++ != '}') goto EXPAND_FAILED_CURLY;
 


@@ -4893,7 +4963,7 @@ while (*s != 0)
       while (isspace(*s)) s++;
       if (*s++ != '{') goto EXPAND_FAILED_CURLY;
 
       while (isspace(*s)) s++;
       if (*s++ != '{') goto EXPAND_FAILED_CURLY;
 

-      list = expand_string_internal(s, TRUE, &s, skipping);
+      list = expand_string_internal(s, TRUE, &s, skipping, TRUE);

       if (list == NULL) goto EXPAND_FAILED;
       if (*s++ != '}') goto EXPAND_FAILED_CURLY;
 
       if (list == NULL) goto EXPAND_FAILED;
       if (*s++ != '}') goto EXPAND_FAILED_CURLY;
 


@@ -4901,7 +4971,7 @@ while (*s != 0)
         {
         while (isspace(*s)) s++;
         if (*s++ != '{') goto EXPAND_FAILED_CURLY;
         {
         while (isspace(*s)) s++;
         if (*s++ != '{') goto EXPAND_FAILED_CURLY;

-        temp = expand_string_internal(s, TRUE, &s, skipping);
+        temp = expand_string_internal(s, TRUE, &s, skipping, TRUE);

         if (temp == NULL) goto EXPAND_FAILED;
         lookup_value = temp;
         if (*s++ != '}') goto EXPAND_FAILED_CURLY;
         if (temp == NULL) goto EXPAND_FAILED;
         lookup_value = temp;
         if (*s++ != '}') goto EXPAND_FAILED_CURLY;


@@ -4925,7 +4995,7 @@ while (*s != 0)
         }
       else
         {
         }
       else
         {

-        temp = expand_string_internal(s, TRUE, &s, TRUE);
+        temp = expand_string_internal(s, TRUE, &s, TRUE, TRUE);

         }
 
       if (temp == NULL)
         }
 
       if (temp == NULL)


@@ -4984,7 +5054,7 @@ while (*s != 0)
 
         else
           {
 
         else
           {

-          temp = expand_string_internal(expr, TRUE, NULL, skipping);
+          temp = expand_string_internal(expr, TRUE, NULL, skipping, TRUE);

           if (temp == NULL)
             {
             iterate_item = save_iterate_item;
           if (temp == NULL)
             {
             iterate_item = save_iterate_item;


@@ -5166,7 +5236,7 @@ while (*s != 0)
     {
     int c;
     uschar *arg = NULL;
     {
     int c;
     uschar *arg = NULL;

-    uschar *sub = expand_string_internal(s+1, TRUE, &s, skipping);
+    uschar *sub = expand_string_internal(s+1, TRUE, &s, skipping, TRUE);

     if (sub == NULL) goto EXPAND_FAILED;
     s++;
 
     if (sub == NULL) goto EXPAND_FAILED;
     s++;
 


@@ -5241,7 +5311,7 @@ while (*s != 0)
 
       case EOP_EXPAND:
         {
 
       case EOP_EXPAND:
         {

-        uschar *expanded = expand_string_internal(sub, FALSE, NULL, skipping);
+        uschar *expanded = expand_string_internal(sub, FALSE, NULL, skipping, TRUE);

         if (expanded == NULL)
           {
           expand_string_message =
         if (expanded == NULL)
           {
           expand_string_message =


@@ -5641,7 +5711,7 @@ while (*s != 0)
         {
         uschar *save_sub = sub;
         uschar *error = NULL;
         {
         uschar *save_sub = sub;
         uschar *error = NULL;

-        int n = eval_expr(&sub, (c == EOP_EVAL10), &error, FALSE);
+        int_eximarith_t n = eval_expr(&sub, (c == EOP_EVAL10), &error, FALSE);

         if (error != NULL)
           {
           expand_string_message = string_sprintf("error in expression "
         if (error != NULL)
           {
           expand_string_message = string_sprintf("error in expression "


@@ -5649,7 +5719,7 @@ while (*s != 0)
               save_sub);
           goto EXPAND_FAILED;
           }
               save_sub);
           goto EXPAND_FAILED;
           }

-        sprintf(CS var_buffer, "%d", n);
+        sprintf(CS var_buffer, PR_EXIM_ARITH, n);

         yield = string_cat(yield, &size, &ptr, var_buffer, Ustrlen(var_buffer));
         continue;
         }
         yield = string_cat(yield, &size, &ptr, var_buffer, Ustrlen(var_buffer));
         continue;
         }


@@ -5850,17 +5920,17 @@ while (*s != 0)
         continue;
         }
 
         continue;
         }
 

-      /* pseudo-random number less than N */
+      /* vaguely random number less than N */

 
       case EOP_RANDINT:
         {
 
       case EOP_RANDINT:
         {

-        int max;
+        int_eximarith_t max;

         uschar *s;
 
         max = expand_string_integer(sub, TRUE);
         if (expand_string_message != NULL)
           goto EXPAND_FAILED;
         uschar *s;
 
         max = expand_string_integer(sub, TRUE);
         if (expand_string_message != NULL)
           goto EXPAND_FAILED;

-        s = string_sprintf("%d", pseudo_random_number(max));
+        s = string_sprintf("%d", vaguely_random_number((int)max));

         yield = string_cat(yield, &size, &ptr, s, Ustrlen(s));
         continue;
         }
         yield = string_cat(yield, &size, &ptr, s, Ustrlen(s));
         continue;
         }


@@ -6009,7 +6079,7 @@ expand_string(uschar *string)
 search_find_defer = FALSE;
 malformed_header = FALSE;
 return (Ustrpbrk(string, "$\\") == NULL)? string :
 search_find_defer = FALSE;
 malformed_header = FALSE;
 return (Ustrpbrk(string, "$\\") == NULL)? string :

-  expand_string_internal(string, FALSE, NULL, FALSE);
+  expand_string_internal(string, FALSE, NULL, FALSE, TRUE);

 }
 
 
 }
 
 


@@ -6051,10 +6121,10 @@ Returns:  the integer value, or
           expand_string_message is set NULL for an OK integer
 */
 
           expand_string_message is set NULL for an OK integer
 */
 

-int
+int_eximarith_t

 expand_string_integer(uschar *string, BOOL isplus)
 {
 expand_string_integer(uschar *string, BOOL isplus)
 {

-long int value;
+int_eximarith_t value;

 uschar *s = expand_string(string);
 uschar *msg = US"invalid integer \"%s\"";
 uschar *endptr;
 uschar *s = expand_string(string);
 uschar *msg = US"invalid integer \"%s\"";
 uschar *endptr;


@@ -6086,7 +6156,7 @@ if (isspace(*s))
     }
   }
 
     }
   }
 

-value = strtol(CS s, CSS &endptr, 10);
+value = strtoll(CS s, CSS &endptr, 10);

 
 if (endptr == s)
   {
 
 if (endptr == s)
   {


@@ -6098,24 +6168,18 @@ else if (value < 0 && isplus)
   }
 else
   {
   }
 else
   {

-  /* Ensure we can cast this down to an int */
-  if (value > INT_MAX  || value < INT_MIN) errno = ERANGE;
-
-  if (errno != ERANGE)
+  if (tolower(*endptr) == 'k')

     {
     {

-    if (tolower(*endptr) == 'k')
-      {
-      if (value > INT_MAX/1024 || value < INT_MIN/1024) errno = ERANGE;
-        else value *= 1024;
-      endptr++;
-      }
+    if (value > LLONG_MAX/1024 || value < LLONG_MIN/1024) errno = ERANGE;
+      else value *= 1024;
+    endptr++;
+    }

     else if (tolower(*endptr) == 'm')
     else if (tolower(*endptr) == 'm')

-      {
-      if (value > INT_MAX/(1024*1024) || value < INT_MIN/(1024*1024))
-        errno = ERANGE;
-      else value *= 1024*1024;
-      endptr++;
-      }
+    {
+    if (value > LLONG_MAX/(1024*1024) || value < LLONG_MIN/(1024*1024))
+      errno = ERANGE;
+    else value *= 1024*1024;
+    endptr++;

     }
   if (errno == ERANGE)
     msg = US"absolute value of integer \"%s\" is too large (overflow)";
     }
   if (errno == ERANGE)
     msg = US"absolute value of integer \"%s\" is too large (overflow)";