aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/ssh.c b/lib/ssh.c
index 22d3ecb27..f8b0f7643 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -1226,10 +1226,11 @@ static CURLcode ssh_statemach_act(struct connectdata *conn)
}
else {
err = libssh2_sftp_last_error(sshc->sftp_session);
- failf(data, "Upload failed: %s", sftp_libssh2_strerror(err));
if(sshc->secondCreateDirs) {
state(conn, SSH_SFTP_CLOSE);
sshc->actualcode = sftp_libssh2_error_to_CURLE(err);
+ failf(data, "Creating the dir/file failed: %s",
+ sftp_libssh2_strerror(err));
break;
}
else if(((err == LIBSSH2_FX_NO_SUCH_FILE) ||
@@ -1244,6 +1245,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn)
}
state(conn, SSH_SFTP_CLOSE);
sshc->actualcode = sftp_libssh2_error_to_CURLE(err);
+ failf(data, "Upload failed: %s", sftp_libssh2_strerror(err));
break;
}
}
@@ -1966,8 +1968,10 @@ static CURLcode ssh_init(struct connectdata *conn)
{
struct SessionHandle *data = conn->data;
struct SSHPROTO *ssh;
+ struct ssh_conn *sshc = &conn->proto.sshc;
- conn->proto.sshc.actualcode = CURLE_OK; /* reset error code */
+ sshc->actualcode = CURLE_OK; /* reset error code */
+ sshc->secondCreateDirs =0; /* reset the create dir attempt state variable */
if(data->state.proto.ssh)
return CURLE_OK;