diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | sftp-client.c | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -21,6 +21,8 @@ | |||
21 | - danh@cvs.openbsd.org 2001/02/10 15:14:11 | 21 | - danh@cvs.openbsd.org 2001/02/10 15:14:11 |
22 | [scp.c] | 22 | [scp.c] |
23 | fix memory leak; ok markus@ | 23 | fix memory leak; ok markus@ |
24 | - (bal) Minor correction to sftp-client.c I made. Should return 'status' | ||
25 | instead of '0' (from the OpenBSD tree) | ||
24 | 26 | ||
25 | 20010210 | 27 | 20010210 |
26 | - (djm) Sync sftp and scp stuff from OpenBSD: | 28 | - (djm) Sync sftp and scp stuff from OpenBSD: |
@@ -3804,4 +3806,4 @@ | |||
3804 | - Wrote replacements for strlcpy and mkdtemp | 3806 | - Wrote replacements for strlcpy and mkdtemp |
3805 | - Released 1.0pre1 | 3807 | - Released 1.0pre1 |
3806 | 3808 | ||
3807 | $Id: ChangeLog,v 1.718 2001/02/10 21:50:00 mouring Exp $ | 3809 | $Id: ChangeLog,v 1.719 2001/02/10 21:53:40 mouring Exp $ |
diff --git a/sftp-client.c b/sftp-client.c index b4ee847da..8338dbc9f 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -29,7 +29,7 @@ | |||
29 | /* XXX: copy between two remote sites */ | 29 | /* XXX: copy between two remote sites */ |
30 | 30 | ||
31 | #include "includes.h" | 31 | #include "includes.h" |
32 | RCSID("$OpenBSD: sftp-client.c,v 1.8 2001/02/08 17:11:23 stevesk Exp $"); | 32 | RCSID("$OpenBSD: sftp-client.c,v 1.9 2001/02/10 00:41:46 djm Exp $"); |
33 | 33 | ||
34 | #include "ssh.h" | 34 | #include "ssh.h" |
35 | #include "buffer.h" | 35 | #include "buffer.h" |
@@ -331,7 +331,7 @@ do_ls(int fd_in, int fd_out, char *path) | |||
331 | error("Couldn't read directory: %s", | 331 | error("Couldn't read directory: %s", |
332 | fx2txt(status)); | 332 | fx2txt(status)); |
333 | do_close(fd_in, fd_out, handle, handle_len); | 333 | do_close(fd_in, fd_out, handle, handle_len); |
334 | return(0); | 334 | return(status); |
335 | } | 335 | } |
336 | } else if (type != SSH2_FXP_NAME) | 336 | } else if (type != SSH2_FXP_NAME) |
337 | fatal("Expected SSH2_FXP_NAME(%d) packet, got %d", | 337 | fatal("Expected SSH2_FXP_NAME(%d) packet, got %d", |