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 2010/04/14 22:27:42 

[ssh_config.5 sshconnect.c]
     expand %r => remote username in ssh_config:ProxyCommand;
     ok deraadt markus
This commit is contained in:
Damien Miller 2010-04-16 15:54:19 +10:00
parent 601a23c02c
commit b1b17047e3
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -32,6 +32,10 @@
- djm@cvs.openbsd.org 2010/04/10 05:48:16 - djm@cvs.openbsd.org 2010/04/10 05:48:16
[mux.c] [mux.c]
fix NULL dereference; from matthew.haub AT alumni.adelaide.edu.au fix NULL dereference; from matthew.haub AT alumni.adelaide.edu.au
- djm@cvs.openbsd.org 2010/04/14 22:27:42
[ssh_config.5 sshconnect.c]
expand %r => remote username in ssh_config:ProxyCommand;
ok deraadt markus
20100410 20100410
- (dtucker) [configure.ac] Put the check for the existence of getaddrinfo - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo

12
ssh_config.5
View File

@ -34,8 +34,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.131 2010/03/27 14:26:55 jmc Exp $ .\" $OpenBSD: ssh_config.5,v 1.132 2010/04/14 22:27:42 djm Exp $
.Dd $Mdocdate: March 27 2010 $ .Dd $Mdocdate: April 14 2010 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -759,12 +759,14 @@ Specifies the command to use to connect to the server.
The command The command
string extends to the end of the line, and is executed with string extends to the end of the line, and is executed with
the user's shell. the user's shell.
In the command string, In the command string, any occurance of
.Ql %h .Ql %h
will be substituted by the host name to will be substituted by the host name to
connect and connect,
.Ql %p .Ql %p
by the port. by the port and
.Ql %u
by the remote user name.
The command can be basically anything, The command can be basically anything,
and should read from its standard input and write to its standard output. and should read from its standard input and write to its standard output.
It should eventually connect an It should eventually connect an

6
sshconnect.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect.c,v 1.221 2010/04/10 00:04:30 djm Exp $ */ /* $OpenBSD: sshconnect.c,v 1.222 2010/04/14 22:27:42 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
@ -101,8 +101,8 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
* (e.g. Solaris) * (e.g. Solaris)
*/ */
xasprintf(&tmp, "exec %s", proxy_command); xasprintf(&tmp, "exec %s", proxy_command);
command_string = percent_expand(tmp, "h", host, command_string = percent_expand(tmp, "h", host, "p", strport,
"p", strport, (char *)NULL); "u", options.user, (char *)NULL);
xfree(tmp); xfree(tmp);
/* Create pipes for communicating with the proxy. */ /* Create pipes for communicating with the proxy. */