X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsrc%2Fsmtp_out.c;h=7ea5a7c9a877682c133748875a0c93d49a57796e;hb=137ae145e066dda8f9d81cf6d2c9f76c15929605;hp=3dc3a13fba6cee5682b59e492391b054b8c0c844;hpb=73a10da9bbc6aadd03c3aff7a12307252e617a71;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index 3dc3a13fb..7ea5a7c9a 100644
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -63,8 +63,8 @@ if (is_tainted(expint))
   return FALSE;
   }
 
-while (isspace(*expint)) expint++;
-if (*expint == 0) return TRUE;
+Uskip_whitespace(&expint);
+if (!*expint) return TRUE;
 
 while ((iface = string_nextinlist(&expint, &sep, big_buffer,
           big_buffer_size)))
@@ -155,11 +155,11 @@ return TRUE;
 static void
 tfo_out_check(int sock)
 {
+# ifdef __FreeBSD__
 struct tcp_info tinfo;
 int val;
 socklen_t len = sizeof(val);
 
-# ifdef __FreeBSD__
 /* The observability as of 12.1 is not useful as a client, only telling us that
 a TFO option was used on SYN.  It could have been a TFO-R, or ignored by the
 server. */
@@ -177,6 +177,8 @@ switch (tcp_out_fastopen)
 
 # else	/* Linux & Apple */
 #  if defined(TCP_INFO) && defined(EXIM_HAVE_TCPI_UNACKED)
+struct tcp_info tinfo;
+socklen_t len = sizeof(tinfo);
 
 switch (tcp_out_fastopen)
   {
@@ -498,7 +500,7 @@ else
     rc = n;
     }
   else
-
+    {
     rc = send(outblock->cctx->sock, outblock->buffer, n,
 #ifdef MSG_MORE
 	      more ? MSG_MORE : 0
@@ -506,6 +508,7 @@ else
 	      0
 #endif
 	     );
+    }
   }
 
 if (rc <= 0)