summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-02-17 16:47:47 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-02-17 16:47:47 +0000
commit6dc75f594d4e10cb2102562a944d5873dea28f7e (patch)
tree4a4e6b65360ace79f83b93deab60acf08418a450
parent63015fdb0b6267774cbed10517048c63df587d09 (diff)
- (bal) Patch for fix FCHMOD reference in ftp-client.c by Tim Rice
<tim@multitalents.net>
-rw-r--r--ChangeLog6
-rw-r--r--sftp-client.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c4d0fb5f4..f84d67725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120010218
2 - (bal) Patch for fix FCHMOD reference in ftp-client.c by Tim Rice
3 <tim@multitalents.net>
4
120010217 520010217
2 - (bal) OpenBSD Sync: 6 - (bal) OpenBSD Sync:
3 - markus@cvs.openbsd.org 2001/02/16 13:38:18 7 - markus@cvs.openbsd.org 2001/02/16 13:38:18
@@ -4004,4 +4008,4 @@
4004 - Wrote replacements for strlcpy and mkdtemp 4008 - Wrote replacements for strlcpy and mkdtemp
4005 - Released 1.0pre1 4009 - Released 1.0pre1
4006 4010
4007$Id: ChangeLog,v 1.782 2001/02/16 16:02:14 mouring Exp $ 4011$Id: ChangeLog,v 1.783 2001/02/17 16:47:47 mouring Exp $
diff --git a/sftp-client.c b/sftp-client.c
index 760a224e2..7c234ce2d 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -662,7 +662,11 @@ do_download(int fd_in, int fd_out, char *remote_path, char *local_path,
662 status = do_close(fd_in, fd_out, handle, handle_len); 662 status = do_close(fd_in, fd_out, handle, handle_len);
663 663
664 /* Override umask and utimes if asked */ 664 /* Override umask and utimes if asked */
665#ifdef HAVE_FCHMOD
665 if (pflag && fchmod(local_fd, mode) == -1) 666 if (pflag && fchmod(local_fd, mode) == -1)
667#else
668 if (pflag && chmod(local_path, mode) == -1)
669#endif /* HAVE_FCHMOD */
666 error("Couldn't set mode on \"%s\": %s", local_path, 670 error("Couldn't set mode on \"%s\": %s", local_path,
667 strerror(errno)); 671 strerror(errno));
668 if (pflag && (a->flags & SSH2_FILEXFER_ATTR_ACMODTIME)) { 672 if (pflag && (a->flags & SSH2_FILEXFER_ATTR_ACMODTIME)) {