From: Jay Satiro <raysatiro@yahoo.com>
Date: Thu, 12 Jan 2017 07:22:41 +0000 (-0500)
Subject: STARTTLS: Don't print response character in denied messages
X-Git-Tag: curl-7_53_0~111
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a18db792624a677221d895f4662a06b5016e4eee;p=thirdparty%2Fcurl.git

STARTTLS: Don't print response character in denied messages

Both IMAP and POP3 response characters are used internally, but when
appended to the STARTTLS denial message likely could confuse the user.

Closes https://github.com/curl/curl/pull/1203
---

diff --git a/lib/imap.c b/lib/imap.c
index 78dc6fa2da..980002d97e 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -952,7 +952,7 @@ static CURLcode imap_state_starttls_resp(struct connectdata *conn,
 
   if(imapcode != 'O') {
     if(data->set.use_ssl != CURLUSESSL_TRY) {
-      failf(data, "STARTTLS denied. %c", imapcode);
+      failf(data, "STARTTLS denied");
       result = CURLE_USE_SSL_FAILED;
     }
     else
diff --git a/lib/pop3.c b/lib/pop3.c
index 9bb691c9b3..433421a7be 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -799,7 +799,7 @@ static CURLcode pop3_state_starttls_resp(struct connectdata *conn,
 
   if(pop3code != '+') {
     if(data->set.use_ssl != CURLUSESSL_TRY) {
-      failf(data, "STARTTLS denied. %c", pop3code);
+      failf(data, "STARTTLS denied");
       result = CURLE_USE_SSL_FAILED;
     }
     else