[src/trunk]: src/crypto/external/bsd/openssh/dist PR/50564: Rin Okuyama: sftp...

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

details:   https://anonhg.NetBSD.org/src/rev/6c6aa95d8903
branches:  trunk
changeset: 812465:6c6aa95d8903
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Dec 16 13:23:38 2015 +0000

description:
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 1a821a7f79d9 -r 6c6aa95d8903 crypto/external/bsd/openssh/dist/sftp.c
--- a/crypto/external/bsd/openssh/dist/sftp.c   Wed Dec 16 12:26:14 2015 +0000
+++ b/crypto/external/bsd/openssh/dist/sftp.c   Wed Dec 16 13:23:38 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sftp.c,v 1.16 2015/08/21 08:20:59 christos Exp $       */
+/*     $NetBSD: sftp.c,v 1.17 2015/12/16 13:23:38 christos Exp $       */
 /* $OpenBSD: sftp.c,v 1.171 2015/08/20 22:32:42 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.16 2015/08/21 08:20:59 christos Exp $");
+__RCSID("$NetBSD: sftp.c,v 1.17 2015/12/16 13:23:38 christos 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++) {