From: mouring <mouring>
Date: Sat, 10 Feb 2001 00:37:17 +0000 (+0000)
Subject:  - (bal) sftp-client.c replace NULL w/ 0 in do_ls() (pending in OpenBSD tree)
X-Git-Tag: V_2_5_0_P1~108
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/c9f5e42e8c87fc5f8963b5c13ccc516cf0ba659c

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

diff --git a/ChangeLog b/ChangeLog
index 30f21e6b..a819238a 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 
diff --git a/sftp-client.c b/sftp-client.c
index 490c00bd..b4ee847d 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",