Check starttls_alarmed earlier, the signal might be sent before select

is called.  Report by Otto Maddox <ottomaddox@fastmail.fm> and
influenced by tiny patch from Nozomu Ando <nand@mac.com>.

1 files changed, 22 insertions, 22 deletions

diff --git a/src/cli.c b/src/cli.c
index 1d6179ae2c..ac5fc31514 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -632,6 +632,26 @@ after_handshake:
 
   for (;;)
     {
+      if (starttls_alarmed)
+	{
+	  if (hd.secure == 0)
+	    {
+	      fprintf (stderr, "*** Starting TLS handshake\n");
+	      ret = do_handshake (&hd);
+	      if (ret < 0)
+		{
+		  fprintf (stderr, "*** Handshake has failed\n");
+		  socket_bye (&hd);
+		  user_term = 1;
+		}
+	    }
+	  else
+	    {
+	      user_term = 1;
+	    }
+	  continue;
+	}
+
       FD_ZERO (&rset);
       FD_SET (fileno (stdin), &rset);
       FD_SET (sd, &rset);
@@ -639,30 +659,10 @@ after_handshake:
       maxfd = MAX (fileno (stdin), sd);
       tv.tv_sec = 3;
       tv.tv_usec = 0;
-      err = select (maxfd + 1, &rset, NULL, NULL, &tv);
 
+      err = select (maxfd + 1, &rset, NULL, NULL, &tv);
       if (err < 0)
-	{
-	  if (errno == EINTR && starttls_alarmed)
-	    {
-	      if (hd.secure == 0)
-		{
-		  fprintf (stderr, "*** Starting TLS handshake\n");
-		  ret = do_handshake (&hd);
-		  if (ret < 0)
-		    {
-		      fprintf (stderr, "*** Handshake has failed\n");
-		      socket_bye (&hd);
-		      user_term = 1;
-		    }
-		}
-	      else
-		{
-		  user_term = 1;
-		}
-	    }
-	  continue;
-	}
+	continue;
 
       if (FD_ISSET (sd, &rset))
 	{