X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Fsmtp_in.c;h=98968f95dd349d34826e7d9639e7eec2f2385665;hp=0498ecb18d8399c643f1b70e043ebb403f5dd1ff;hb=3ae121c94f0dfaeba5938de26931c49e29677d0a;hpb=4f6ae5c314e5c3e462313f3b53c917f36b131bf4

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 0498ecb18..98968f95d 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -2353,10 +2353,9 @@ code = US"220";   /* Default status code */
 esc = US"";       /* Default extended status code */
 esclen = 0;       /* Length of esc */
 
-if (user_msg == NULL)
+if (!user_msg)
   {
-  s = expand_string(smtp_banner);
-  if (s == NULL)
+  if (!(s = expand_string(smtp_banner)))
     log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Expansion of \"%s\" (smtp_banner) "
       "failed: %s", smtp_banner, expand_string_message);
   }
@@ -3323,9 +3322,9 @@ while (done <= 0)
 	smtp_cmd_data = NULL;
 
 	if (smtp_in_auth(au, &s, &ss) == OK)
-	  DEBUG(D_auth) debug_printf("tls auth succeeded\n");
+	  { DEBUG(D_auth) debug_printf("tls auth succeeded\n"); }
 	else
-	  DEBUG(D_auth) debug_printf("tls auth not succeeded\n");
+	  { DEBUG(D_auth) debug_printf("tls auth not succeeded\n"); }
 	break;
 	}
     }