- (bal) sftp-client.c replace NULL w/ 0 in do_ls() (pending in OpenBSD tree)

2 files changed, 3 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c950d0187..4aa2ddfa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,7 @@
      [sftp-int.c]
      cleanup get_pathname, fix pwd after failed cd. okay djm@
  - (djm) Update makefile.in for _PATH_SFTP_SERVER
+ - (bal) sftp-client.c replace NULL w/ 0 in do_ls() (pending in OpenBSD tree)
 
 20010209
  - (bal) patch to vis.c to deal with HAVE_VIS right by Robert Mooney 
@@ -3779,4 +3780,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.711 2001/02/09 13:47:59 djm Exp $
+$Id: ChangeLog,v 1.712 2001/02/10 00:37:17 mouring Exp $
diff --git a/sftp-client.c b/sftp-client.c
index 490c00bdd..b4ee847da 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -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(NULL);
+                                return(0);
                         }
                 } else if (type != SSH2_FXP_NAME)
                         fatal("Expected SSH2_FXP_NAME(%d) packet, got %d",