tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2011/01/06 22:23:53 

[ssh.c]
     unbreak %n expansion in LocalCommand; patch from bert.wesarg AT
     googlemail.com; ok markus@
This commit is contained in:
Damien Miller 2011-01-07 09:51:17 +11:00
parent 322125b960
commit 83f8a4014d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,6 +1,10 @@
20110107 20110107
- (djm) [regress/cert-hostkey.sh regress/cert-userkey.sh] fix shell test - (djm) [regress/cert-hostkey.sh regress/cert-userkey.sh] fix shell test
for no-ECC case. Patch from cristian.ionescu-idbohrn AT axis.com for no-ECC case. Patch from cristian.ionescu-idbohrn AT axis.com
- djm@cvs.openbsd.org 2011/01/06 22:23:53
[ssh.c]
unbreak %n expansion in LocalCommand; patch from bert.wesarg AT
googlemail.com; ok markus@
20110106 20110106
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

8
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.355 2010/11/29 23:45:51 djm Exp $ */ /* $OpenBSD: ssh.c,v 1.356 2011/01/06 22:23:53 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -221,7 +221,7 @@ int
main(int ac, char **av) main(int ac, char **av)
{ {
int i, r, opt, exit_status, use_syslog; int i, r, opt, exit_status, use_syslog;
char *p, *cp, *line, *argv0, buf[MAXPATHLEN]; char *p, *cp, *line, *argv0, buf[MAXPATHLEN], *host_arg;
struct stat st; struct stat st;
struct passwd *pw; struct passwd *pw;
int dummy, timeout_ms; int dummy, timeout_ms;
@ -693,6 +693,8 @@ main(int ac, char **av)
options.port = sp ? ntohs(sp->s_port) : SSH_DEFAULT_PORT; options.port = sp ? ntohs(sp->s_port) : SSH_DEFAULT_PORT;
} }
/* preserve host name given on command line for %n expansion */
host_arg = host;
if (options.hostname != NULL) { if (options.hostname != NULL) {
host = percent_expand(options.hostname, host = percent_expand(options.hostname,
"h", host, (char *)NULL); "h", host, (char *)NULL);
@ -707,7 +709,7 @@ main(int ac, char **av)
debug3("expanding LocalCommand: %s", options.local_command); debug3("expanding LocalCommand: %s", options.local_command);
cp = options.local_command; cp = options.local_command;
options.local_command = percent_expand(cp, "d", pw->pw_dir, options.local_command = percent_expand(cp, "d", pw->pw_dir,
"h", host, "l", thishost, "n", host, "r", options.user, "h", host, "l", thishost, "n", host_arg, "r", options.user,
"p", buf, "u", pw->pw_name, (char *)NULL); "p", buf, "u", pw->pw_name, (char *)NULL);
debug3("expanded LocalCommand: %s", options.local_command); debug3("expanded LocalCommand: %s", options.local_command);
xfree(cp); xfree(cp);