[src/netbsd-7]: src/crypto/external/bsd/openssh/dist Pull up following revisi...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/161c8d0e3a89
branches:  netbsd-7
changeset: 799764:161c8d0e3a89
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Jan 26 01:29:35 2016 +0000

description:
Pull up following revision(s) (requested by snj in ticket #1066):
        crypto/external/bsd/openssh/dist/sftp.c: revision 1.17
PR/50564: Rin Okuyama: sftp: filename completion is broken

diffstat:

 crypto/external/bsd/openssh/dist/sftp.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 6befe3191014 -r 161c8d0e3a89 crypto/external/bsd/openssh/dist/sftp.c
--- a/crypto/external/bsd/openssh/dist/sftp.c   Tue Jan 26 01:27:21 2016 +0000
+++ b/crypto/external/bsd/openssh/dist/sftp.c   Tue Jan 26 01:29:35 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sftp.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $        */
+/*     $NetBSD: sftp.c,v 1.12.4.2 2016/01/26 01:29:35 riz Exp $        */
 /* $OpenBSD: sftp.c,v 1.170 2015/01/20 23:14:00 deraadt Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm%openbsd.org@localhost>
@@ -17,7 +17,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: sftp.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: sftp.c,v 1.12.4.2 2016/01/26 01:29:35 riz Exp $");
 #include <sys/param.h> /* MIN MAX */
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -1845,8 +1845,8 @@
        if (remote != LOCAL) {
                tmp = make_absolute(tmp, remote_path);
                remote_glob(conn, tmp, GLOB_DOOFFS|GLOB_MARK, NULL, &g);
+       } else
                glob(tmp, GLOB_LIMIT|GLOB_DOOFFS|GLOB_MARK, NULL, &g);
-       }
        
        /* Determine length of pwd so we can trim completion display */
        for (hadglob = tmplen = pwdlen = 0; tmp[tmplen] != 0; tmplen++) {