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

diff --git a/ChangeLog b/ChangeLog
index 30f21e6bfbcbe9740356088ac41f8602648fca36..a819238a977d08947360fa5b5bae893798d52c08 100644 (file)
--- 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 

diff --git a/sftp-client.c b/sftp-client.c
index 490c00bdd866f71a4b49123025f17b71c5636aa3..b4ee847da781ff1cf9e025179ee3cd62917cd373 100644 (file)
--- 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",