From 75427291e5e06afed7aff0de992cad2cbec5a214 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Thu, 26 Oct 2017 11:08:43 +0200 Subject: [PATCH] libssh2: send the correct CURLE error code on scp file not found That also updates tests to expect the right error code libssh2 back-end returns CURLE_SSH error if the remote file is not found. Expect instead CURLE_REMOTE_FILE_NOT_FOUND which is sent by the libssh backend. Signed-off-by: Nikos Mavrogiannopoulos --- lib/ssh.c | 5 +++++ tests/data/test605 | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/ssh.c b/lib/ssh.c index 54f08edf7..e0e88632d 100644 --- a/lib/ssh.c +++ b/lib/ssh.c @@ -261,6 +261,11 @@ static CURLcode libssh2_session_error_to_CURLE(int err) case LIBSSH2_ERROR_NONE: return CURLE_OK; + /* This is the error returned by libssh2_scp_recv2 + * on unknown file */ + case LIBSSH2_ERROR_SCP_PROTOCOL: + return CURLE_REMOTE_FILE_NOT_FOUND; + case LIBSSH2_ERROR_SOCKET_NONE: return CURLE_COULDNT_CONNECT; diff --git a/tests/data/test605 b/tests/data/test605 index 1c162fca5..94329a528 100644 --- a/tests/data/test605 +++ b/tests/data/test605 @@ -24,7 +24,7 @@ SCP retrieval of nonexistent file # Verify data after the test has been "shot" -79 +78 disable