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

imap.c: Fixed unnecessary state change if starttls fails

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

diff --git a/lib/imap.c b/lib/imap.c
index 5e845fb35..4191f5722 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -601,7 +601,8 @@ static CURLcode imap_state_servergreet_resp(struct connectdata *conn,
        to TLS connection now */
     const char *str = getcmdid(conn);
     result = imap_sendf(conn, str, "%s STARTTLS", str);
-    state(conn, IMAP_STARTTLS);
+    if(!result)
+      state(conn, IMAP_STARTTLS);
   }
   else
     result = imap_state_capability(conn);