From b59aaf3c4f3f449a4b86d8528668bd979be9aa5f Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 10 Oct 2013 10:26:21 +1100 Subject: - 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 --- ChangeLog | 3 +++ sftp-client.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e9eabb4e..5b49df51e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ [progressmeter.c] 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@` + - 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 - (djm) [openbsd-compat/arc4random.c openbsd-compat/chacha_private.h] Pull diff --git a/sftp-client.c b/sftp-client.c index f2ce9deb7..eb8930802 100644 --- a/sftp-client.c +++ b/sftp-client.c @@ -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 * @@ -1643,8 +1643,8 @@ upload_dir_internal(struct sftp_conn *conn, char *src, char *dst, } int -upload_dir(struct sftp_conn *conn, char *src, char *dst, int printflag, - int pflag) +upload_dir(struct sftp_conn *conn, char *src, char *dst, int pflag, + int printflag) { char *dst_canon; int ret; -- cgit v1.2.3