Merge branch 'master' of ssh://git.exim.org/home/git/exim

diff --combined src/src/string.c
index f216e5a86e01d759757ab69b147cf565c2c51001,7b52455575f0795c525de7c16ac32365ec42aecf..914390255f43f59e55a919f00a3fb3d0d55d8689
--- 1/src/src/string.c
--- 2/src/src/string.c
+++ b/src/src/string.c
@@@ -717,8 -717,7 +717,8 @@@ uschar buffer[STRING_SPRINTF_BUFFER_SIZ
  va_start(ap, format);
  if (!string_vformat(buffer, sizeof(buffer), format, ap))
    log_write(0, LOG_MAIN|LOG_PANIC_DIE,
 -    "string_sprintf expansion was longer than " SIZE_T_FMT, sizeof(buffer));
 +    "string_sprintf expansion was longer than " SIZE_T_FMT " (%s)",
 +    sizeof(buffer), format);
  va_end(ap);
  return string_copy(buffer);
  }
@@@ -998,7 -997,7 +998,7 @@@ if (list
    new = string_cat(new, &sz, &off, &sep, 1);
    }
  
- while (sp = Ustrchr(ele, sep))
+ while((sp = Ustrchr(ele, sep)))
    {
    new = string_cat(new, &sz, &off, ele, sp-ele+1);
    new = string_cat(new, &sz, &off, &sep, 1);