summaryrefslogtreecommitdiff
path: root/sftp-client.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-08-03 16:04:22 +1000
committerDamien Miller <djm@mindrot.org>2010-08-03 16:04:22 +1000
commitc4bb91c79c0a05d2bbf2ac68b7be8421fb4957bf (patch)
treeff0269be382e2680ab4b988a1029d681ec7dcab6 /sftp-client.c
parent4e8285e31248f7306e4b1d299d186b277c69d00f (diff)
- djm@cvs.openbsd.org 2010/07/19 03:16:33
[sftp-client.c] bz#1797: fix swapped args in upload_dir_internal(), breaking recursive upload depth checks and causing verbose printing of transfers to always be turned on; patch from imorgan AT nas.nasa.gov
Diffstat (limited to 'sftp-client.c')
-rw-r--r--sftp-client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sftp-client.c b/sftp-client.c
index 408b29840..9dab47780 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-client.c,v 1.91 2010/06/18 04:43:08 djm Exp $ */ 1/* $OpenBSD: sftp-client.c,v 1.92 2010/07/19 03:16:33 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -1523,7 +1523,7 @@ upload_dir_internal(struct sftp_conn *conn, char *src, char *dst,
1523 continue; 1523 continue;
1524 1524
1525 if (upload_dir_internal(conn, new_src, new_dst, 1525 if (upload_dir_internal(conn, new_src, new_dst,
1526 pflag, depth + 1, printflag) == -1) 1526 pflag, printflag, depth + 1) == -1)
1527 ret = -1; 1527 ret = -1;
1528 } else if (S_ISREG(sb.st_mode)) { 1528 } else if (S_ISREG(sb.st_mode)) {
1529 if (do_upload(conn, new_src, new_dst, pflag) == -1) { 1529 if (do_upload(conn, new_src, new_dst, pflag) == -1) {