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

upstream: Add %-TOKEN, environment variable and tilde expansion to 

UserKnownHostsFile, allowing the file to be automagically split up in the
configuration (eg bz#1654).  ok djm@, man page parts jmc@

OpenBSD-Commit-ID: 7e1b406caf147638bb51558836a72d6cc0bd1b18
This commit is contained in:
dtucker@openbsd.org 2020-07-17 03:23:10 +00:00 committed by Damien Miller
parent dbaaa01dae
commit c4f239944a
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.531 2020/07/05 23:59:45 djm Exp $ */ /* $OpenBSD: ssh.c,v 1.532 2020/07/17 03:23:10 dtucker 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
@ -654,6 +654,7 @@ main(int ac, char **av)
struct Forward fwd; struct Forward fwd;
struct addrinfo *addrs = NULL; struct addrinfo *addrs = NULL;
size_t n, len; size_t n, len;
u_int j;
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
sanitise_stdfd(); sanitise_stdfd();
@ -1427,6 +1428,21 @@ main(int ac, char **av)
options.forward_agent_sock_path = cp; options.forward_agent_sock_path = cp;
} }
for (j = 0; j < options.num_user_hostfiles; j++) {
if (options.user_hostfiles[j] != NULL) {
cp = tilde_expand_filename(options.user_hostfiles[j],
getuid());
p = default_client_percent_dollar_expand(cp,
pw->pw_dir, host, options.user, pw->pw_name);
if (strcmp(options.user_hostfiles[j], p) != 0)
debug3("expanded UserKnownHostsFile '%s' -> "
"'%s'", options.user_hostfiles[j], p);
free(options.user_hostfiles[j]);
free(cp);
options.user_hostfiles[j] = p;
}
}
for (i = 0; i < options.num_local_forwards; i++) { for (i = 0; i < options.num_local_forwards; i++) {
if (options.local_forwards[i].listen_path != NULL) { if (options.local_forwards[i].listen_path != NULL) {
cp = options.local_forwards[i].listen_path; cp = options.local_forwards[i].listen_path;

18
ssh_config.5
View File

@ -33,8 +33,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.328 2020/05/29 05:48:39 jmc Exp $ .\" $OpenBSD: ssh_config.5,v 1.329 2020/07/17 03:23:10 dtucker Exp $
.Dd $Mdocdate: May 29 2020 $ .Dd $Mdocdate: July 17 2020 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -1738,6 +1738,12 @@ having to remember to give the user name on the command line.
.It Cm UserKnownHostsFile .It Cm UserKnownHostsFile
Specifies one or more files to use for the user Specifies one or more files to use for the user
host key database, separated by whitespace. host key database, separated by whitespace.
Each filename may use tilde notation to refer to the user's home directory,
the tokens described in the
.Sx TOKENS
section and environment variables as described in the
.Sx ENVIRONMENT VARIABLES
section.
The default is The default is
.Pa ~/.ssh/known_hosts , .Pa ~/.ssh/known_hosts ,
.Pa ~/.ssh/known_hosts2 . .Pa ~/.ssh/known_hosts2 .
@ -1874,8 +1880,9 @@ The local username.
.Cm LocalForward , .Cm LocalForward ,
.Cm Match exec , .Cm Match exec ,
.Cm RemoteCommand , .Cm RemoteCommand ,
.Cm RemoteForward ,
and and
.Cm RemoteForward .Com UserKnownHostsFile
accept the tokens %%, %C, %d, %h, %i, %L, %l, %n, %p, %r, and %u. accept the tokens %%, %C, %d, %h, %i, %L, %l, %n, %p, %r, and %u.
.Pp .Pp
.Cm Hostname .Cm Hostname
@ -1899,9 +1906,10 @@ returned and the setting for that keyword will be ignored.
The keywords The keywords
.Cm CertificateFile , .Cm CertificateFile ,
.Cm ControlPath , .Cm ControlPath ,
.Cm IdentityAgent .Cm IdentityAgent ,
and
.Cm IdentityFile .Cm IdentityFile
and
.Cm UserKnownHostsFile
support environment variables. support environment variables.
The keywords The keywords
.Cm LocalForward .Cm LocalForward