From: Dwarakanath Yadavalli <ydnath@users.noreply.github.com>
Date: Mon, 31 Jul 2017 05:52:04 +0000 (+0530)
Subject: libcurl: Stop using error codes defined under CURL_NO_OLDIES
X-Git-Tag: curl-7_55_0~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=512f8c774a8ae541d2e4fbccdd94e4bb0d39e90c;p=thirdparty%2Fcurl.git

libcurl: Stop using error codes defined under CURL_NO_OLDIES

Fixes https://github.com/curl/curl/issues/1688
Closes https://github.com/curl/curl/pull/1712
---

diff --git a/lib/telnet.c b/lib/telnet.c
index 100f29099d..3dec959073 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -899,7 +899,7 @@ static CURLcode check_telnet_options(struct connectdata *conn)
       }
 
       failf(data, "Unknown telnet option %s", head->data);
-      result = CURLE_UNKNOWN_TELNET_OPTION;
+      result = CURLE_UNKNOWN_OPTION;
       break;
     }
     failf(data, "Syntax error in telnet option: %s", head->data);
diff --git a/lib/tftp.c b/lib/tftp.c
index 336beb512b..02bd842427 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -1345,7 +1345,7 @@ static CURLcode tftp_do(struct connectdata *conn, bool *done)
 
   state = (tftp_state_data_t *)conn->proto.tftpc;
   if(!state)
-    return CURLE_BAD_CALLING_ORDER;
+    return CURLE_TFTP_ILLEGAL;
 
   result = tftp_perform(conn, done);