diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /sftp-client.c | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'sftp-client.c')
-rw-r--r-- | sftp-client.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sftp-client.c b/sftp-client.c index 0ffacbccc..d894a11f2 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -20,7 +20,7 @@ | |||
20 | /* XXX: copy between two remote sites */ | 20 | /* XXX: copy between two remote sites */ |
21 | 21 | ||
22 | #include "includes.h" | 22 | #include "includes.h" |
23 | RCSID("$OpenBSD: sftp-client.c,v 1.51 2004/07/11 17:48:47 deraadt Exp $"); | 23 | RCSID("$OpenBSD: sftp-client.c,v 1.52 2004/11/25 22:22:14 markus Exp $"); |
24 | 24 | ||
25 | #include "openbsd-compat/sys-queue.h" | 25 | #include "openbsd-compat/sys-queue.h" |
26 | 26 | ||
@@ -172,6 +172,7 @@ get_handle(int fd, u_int expected_id, u_int *len) | |||
172 | int status = buffer_get_int(&msg); | 172 | int status = buffer_get_int(&msg); |
173 | 173 | ||
174 | error("Couldn't get handle: %s", fx2txt(status)); | 174 | error("Couldn't get handle: %s", fx2txt(status)); |
175 | buffer_free(&msg); | ||
175 | return(NULL); | 176 | return(NULL); |
176 | } else if (type != SSH2_FXP_HANDLE) | 177 | } else if (type != SSH2_FXP_HANDLE) |
177 | fatal("Expected SSH2_FXP_HANDLE(%u) packet, got %u", | 178 | fatal("Expected SSH2_FXP_HANDLE(%u) packet, got %u", |
@@ -206,6 +207,7 @@ get_decode_stat(int fd, u_int expected_id, int quiet) | |||
206 | debug("Couldn't stat remote file: %s", fx2txt(status)); | 207 | debug("Couldn't stat remote file: %s", fx2txt(status)); |
207 | else | 208 | else |
208 | error("Couldn't stat remote file: %s", fx2txt(status)); | 209 | error("Couldn't stat remote file: %s", fx2txt(status)); |
210 | buffer_free(&msg); | ||
209 | return(NULL); | 211 | return(NULL); |
210 | } else if (type != SSH2_FXP_ATTRS) { | 212 | } else if (type != SSH2_FXP_ATTRS) { |
211 | fatal("Expected SSH2_FXP_ATTRS(%u) packet, got %u", | 213 | fatal("Expected SSH2_FXP_ATTRS(%u) packet, got %u", |