2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 0d51580fd..f4fb5f05f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,11 @@
      more timing paranoia - compare all parts of the expected decrypted
      data before returning. AFAIK not exploitable in the SSH protocol.
      "groovy" deraadt@
+   - 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
 
 20100819
  - (dtucker) [contrib/ssh-copy-ud.1] Bug #1786: update ssh-copy-id.1 with more
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 @@
-/* $OpenBSD: sftp-client.c,v 1.91 2010/06/18 04:43:08 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.92 2010/07/19 03:16:33 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1523,7 +1523,7 @@ upload_dir_internal(struct sftp_conn *conn, char *src, char *dst,
                                 continue;
 
                         if (upload_dir_internal(conn, new_src, new_dst,
-                            pflag, depth + 1, printflag) == -1)
+                            pflag, printflag, depth + 1) == -1)
                                 ret = -1;
                 } else if (S_ISREG(sb.st_mode)) {
                         if (do_upload(conn, new_src, new_dst, pflag) == -1) {