]> granicus.if.org Git - curl/commitdiff
STARTTLS: Don't print response character in denied messages
authorJay Satiro <raysatiro@yahoo.com>
Thu, 12 Jan 2017 07:22:41 +0000 (02:22 -0500)
committerJay Satiro <raysatiro@yahoo.com>
Thu, 12 Jan 2017 07:36:03 +0000 (02:36 -0500)
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

lib/imap.c
lib/pop3.c

index 78dc6fa2da6ba65dc0ba137ac6835dce75dc0ae3..980002d97e5337ac3b88f3581d3fcc09169e6283 100644 (file)
@@ -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
index 9bb691c9b34aaa6307fc2e87242bf630a1e68c5e..433421a7be6b1d27b2663ae2978ecdab3fc797a5 100644 (file)
@@ -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