Don't infloop.

1 files changed, 7 insertions, 14 deletions

diff --git a/src/cli.c b/src/cli.c
index ac5fc31514..3d8cf1d88c 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -632,24 +632,17 @@ after_handshake:
 
   for (;;)
     {
-      if (starttls_alarmed)
+      if (starttls_alarmed && !hd.secure)
 	{
-	  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
+	  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;
+	      break;
 	    }
-	  continue;
 	}
 
       FD_ZERO (&rset);