From 7a642c8bf10266978baf8a45c039d8656dcd5b36 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 2 Sep 2009 21:05:47 +0000 Subject: [PATCH] - Daniel Johnson founded a flaw in the code convering sftp-errors to libcurl errors. --- CHANGES | 4 ++++ RELEASE-NOTES | 2 +- lib/ssh.c | 5 +---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 2500119e0..3ae8c0635 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,10 @@ Changelog +Daniel Stenberg (2 Sep 2009) +- Daniel Johnson founded a flaw in the code convering sftp-errors to libcurl + errors. + Daniel Stenberg (1 Sep 2009) - Peter Sylvester made a debug featuer for Curl_resolv() that now will force libcurl to resolve 'localhost' whatever name you use in the URL *if* you set diff --git a/RELEASE-NOTES b/RELEASE-NOTES index bf7e094dd..d2eb90104 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -36,6 +36,6 @@ This release would not have looked like this without help, code, reports and advice from friends like these: Karl Moerder, Kamil Dudka, Krister Johansen, Andre Guibert de Bruet, - Michal Marek, Eric Wong, Guenter Knauf, Peter Sylvester + Michal Marek, Eric Wong, Guenter Knauf, Peter Sylvester, Daniel Johnson Thanks! (and sorry if I forgot to mention someone) diff --git a/lib/ssh.c b/lib/ssh.c index 01d035322..a6d379f79 100644 --- a/lib/ssh.c +++ b/lib/ssh.c @@ -230,15 +230,12 @@ kbd_callback(const char *name, int name_len, const char *instruction, (void)abstract; } /* kbd_callback */ -static CURLcode sftp_libssh2_error_to_CURLE(unsigned long err) +static CURLcode sftp_libssh2_error_to_CURLE(int err) { switch (err) { case LIBSSH2_FX_OK: return CURLE_OK; - case LIBSSH2_ERROR_ALLOC: - return CURLE_OUT_OF_MEMORY; - case LIBSSH2_FX_NO_SUCH_FILE: case LIBSSH2_FX_NO_SUCH_PATH: return CURLE_REMOTE_FILE_NOT_FOUND;