tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/09/19 00:49:12 

[sftp-client.c]
     fix swapped pflag and printflag in sftp upload_dir; from Iain Morgan
This commit is contained in:
Darren Tucker 2013-10-10 10:26:21 +11:00
parent 5d80e4522d
commit b59aaf3c4f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -9,6 +9,9 @@
[progressmeter.c] [progressmeter.c]
store the initial file offset so the progress meter doesn't freak out store the initial file offset so the progress meter doesn't freak out
when resuming sftp transfers. bz#2137; patch from Iain Morgan; ok dtucker@` when resuming sftp transfers. bz#2137; patch from Iain Morgan; ok dtucker@`
- djm@cvs.openbsd.org 2013/09/19 00:49:12
[sftp-client.c]
fix swapped pflag and printflag in sftp upload_dir; from Iain Morgan
20131009 20131009
- (djm) [openbsd-compat/arc4random.c openbsd-compat/chacha_private.h] Pull - (djm) [openbsd-compat/arc4random.c openbsd-compat/chacha_private.h] Pull

6
sftp-client.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp-client.c,v 1.103 2013/08/09 03:39:13 djm Exp $ */ /* $OpenBSD: sftp-client.c,v 1.104 2013/09/19 00:49:12 djm Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -1643,8 +1643,8 @@ upload_dir_internal(struct sftp_conn *conn, char *src, char *dst,
} }
int int
upload_dir(struct sftp_conn *conn, char *src, char *dst, int printflag, upload_dir(struct sftp_conn *conn, char *src, char *dst, int pflag,
int pflag) int printflag)
{ {
char *dst_canon; char *dst_canon;
int ret; int ret;