X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fexpand.c;h=a7edaae4728521fb613e63a3603a134bd0cbf4b1;hb=493e0e6648552c0dce6c5225c8438d2829f1ac11;hp=fd55436a24a925df20ccdad83dab403e1b720247;hpb=3367f8c2e08bf998efc84050e39d5a9fbdffb5dd;p=exim.git

diff --git a/src/src/expand.c b/src/src/expand.c
index fd55436a2..a7edaae47 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -3050,6 +3050,8 @@ switch(cond_type)
        "value \"%s\"", t);
       return NULL;
       }
+    DEBUG(D_expand) debug_printf("%s: condition evaluated to %s\n", ourname,
+        boolvalue? "true":"false");
     if (yield != NULL) *yield = (boolvalue == testfor);
     return s;
     }
@@ -7121,7 +7123,7 @@ while (*s != 0)
 	const uschar * s = sub;
 	uschar c;
 
-	for (s = sub; c = *s; s++)
+	for (s = sub; (c = *s); s++)
 	  yield = c < 127 && c != '\\'
 	    ? string_catn(yield, &size, &ptr, s, 1)
 	    : string_catn(yield, &size, &ptr, string_sprintf("\\%03o", c), 4);