diff --git a/ChangeLog b/ChangeLog index be46b6625..1537b06b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,8 @@ - danh@cvs.openbsd.org 2001/02/10 15:14:11 [scp.c] fix memory leak; ok markus@ + - (bal) Minor correction to sftp-client.c I made. Should return 'status' + instead of '0' (from the OpenBSD tree) 20010210 - (djm) Sync sftp and scp stuff from OpenBSD: @@ -3804,4 +3806,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.718 2001/02/10 21:50:00 mouring Exp $ +$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 @@ /* XXX: copy between two remote sites */ #include "includes.h" -RCSID("$OpenBSD: sftp-client.c,v 1.8 2001/02/08 17:11:23 stevesk Exp $"); +RCSID("$OpenBSD: sftp-client.c,v 1.9 2001/02/10 00:41:46 djm Exp $"); #include "ssh.h" #include "buffer.h" @@ -331,7 +331,7 @@ do_ls(int fd_in, int fd_out, char *path) error("Couldn't read directory: %s", fx2txt(status)); do_close(fd_in, fd_out, handle, handle_len); - return(0); + return(status); } } else if (type != SSH2_FXP_NAME) fatal("Expected SSH2_FXP_NAME(%d) packet, got %d",