From: Steve Holme <steve_holme@hotmail.com>
Date: Sun, 27 Jan 2013 10:42:32 +0000 (+0000)
Subject: pop3.c: Fixed unnecessary state change if starttls fails
X-Git-Tag: curl-7_29_0~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3dbf11d0a1f6986331d3a49a78c138f78693efa9;p=curl

pop3.c: Fixed unnecessary state change if starttls fails

The state machine should only be changed to POP3_STARTTLS when the
STLS command has been successfully sent to the server.
---

diff --git a/lib/pop3.c b/lib/pop3.c
index 9a9e81b20..18d16e0ff 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -542,7 +542,8 @@ static CURLcode pop3_state_servergreet_resp(struct connectdata *conn,
     /* We don't have a SSL/TLS connection yet, but SSL is requested. Switch
        to TLS connection now */
     result = Curl_pp_sendf(&pop3c->pp, "STLS");
-    state(conn, POP3_STARTTLS);
+    if(!result)
+      state(conn, POP3_STARTTLS);
   }
   else
     result = pop3_state_capa(conn);