--- files/patch-readconf.c	(nonexistent)
+++ files/patch-readconf.c	(working copy)
@@ -0,0 +1,11 @@ 
+--- src/readconf.c.orig	2018-03-14 08:31:12 UTC
++++ src/readconf.c
+@@ -4502,7 +4502,7 @@ for (i = config_lines; i; i = i->next)
+   /* hidden lines (all MACROS or lines prefixed with "hide") */
+   else if (  !admin
+ 	  && (  isupper(*current)
+-	     || Ustrncmp(current, "hide", 4) == 0 && isspace(current[4])
++	     || (Ustrncmp(current, "hide", 4) == 0) && (isspace(current[4]))
+ 	     )
+ 	  )
+     {
--- files/patch-receive.c	(nonexistent)
+++ files/patch-receive.c	(working copy)
@@ -0,0 +1,11 @@ 
+--- src/receive.c.orig	2018-03-14 08:24:54 UTC
++++ src/receive.c
+@@ -1416,7 +1416,7 @@ if (rc == OK)
+   struct dirent * entry;
+   DIR * tempdir;
+ 
+-  for (tempdir = opendir(CS scandir); entry = readdir(tempdir); )
++  for (tempdir = opendir(CS scandir); (entry = readdir(tempdir)); )
+     if (strncmpic(US entry->d_name, US"__rfc822_", 9) == 0)
+       {
+       rfc822_file_path = string_sprintf("%s/%s", scandir, entry->d_name);
--- files/patch-tls-openssl.c	(nonexistent)
+++ files/patch-tls-openssl.c	(working copy)
@@ -0,0 +1,20 @@ 
+--- src/tls-openssl.c.orig	2018-03-14 08:33:02 UTC
++++ src/tls-openssl.c
+@@ -1099,7 +1099,7 @@ else
+       int sep = 0;
+       uschar * file;
+ 
+-      while (file = string_nextinlist(&file_list, &sep, NULL, 0))
++      while ((file = string_nextinlist(&file_list, &sep, NULL, 0)))
+ 	if ((err = tls_add_certfile(sctx, cbinfo, file, errstr)))
+ 	  return err;
+       }
+@@ -1122,7 +1122,7 @@ else
+       int sep = 0;
+       uschar * file;
+ 
+-      while (file = string_nextinlist(&file_list, &sep, NULL, 0))
++      while ((file = string_nextinlist(&file_list, &sep, NULL, 0)))
+ 	if ((err = tls_add_pkeyfile(sctx, cbinfo, file, errstr)))
+ 	  return err;
+       }
--- files/patch-tls.c	(nonexistent)
+++ files/patch-tls.c	(working copy)
@@ -0,0 +1,13 @@ 
+--- src/tls.c.orig	2018-02-25 20:26:22 UTC
++++ src/tls.c
+@@ -275,8 +275,8 @@ dn_to_list(dn);
+ insep = ',';
+ len = match ? Ustrlen(match) : -1;
+ while ((ele = string_nextinlist(CUSS &dn, &insep, NULL, 0)))
+-  if (  !match
+-     || Ustrncmp(ele, match, len) == 0 && ele[len] == '='
++  if (  (!match)
++     ||( Ustrncmp(ele, match, len == 0) && (ele[len] == '='))
+      )
+     list = string_append_listele(list, outsep, ele+len+1);
+ return string_from_gstring(list);
--- files/patch-verify.c	(nonexistent)
+++ files/patch-verify.c	(working copy)
@@ -0,0 +1,11 @@ 
+--- src/verify.c.orig	2018-03-14 08:25:09 UTC
++++ src/verify.c
+@@ -170,7 +170,7 @@ else
+     *old_domain_res = cache_record->result;
+ 
+     if (  cache_record->result == ccache_reject
+-       || *from_address == 0 && cache_record->result == ccache_reject_mfnull)
++       || (*from_address == 0 ) && (cache_record->result == ccache_reject_mfnull))
+       {
+       setflag(addr, af_verify_nsfail);
+       HDEBUG(D_verify)