diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-10-23 05:08:00 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-10-23 16:14:30 +1100 |
| commit | b7548b12a6b2b4abf4d057192c353147e0abba08 (patch) | |
| tree | dc76477cd371b6197ba840c3a178bfbcf6d7baba /session.c | |
| parent | 887669ef032d63cf07f53cada216fa8a0c9a7d72 (diff) | |
| download | openssh-git-b7548b12a6b2b4abf4d057192c353147e0abba08.tar.gz | |
upstream commit
Expose devices allocated for tun/tap forwarding.
At the client, the device may be obtained from a new %T expansion
for LocalCommand.
At the server, the allocated devices will be listed in a
SSH_TUNNEL variable exposed to the environment of any user sessions
started after the tunnel forwarding was established.
ok markus
Upstream-ID: e61e53f8ae80566e9ddc0d67a5df5bdf2f3c9f9e
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.292 2017/09/12 06:32:07 djm Exp $ */ +/* $OpenBSD: session.c,v 1.293 2017/10/23 05:08:00 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -140,6 +140,7 @@ extern u_int utmp_len; extern int startup_pipe; extern void destroy_sensitive_data(void); extern Buffer loginmsg; +char *tun_fwd_ifnames; /* serverloop.c */ /* original command from peer. */ const char *original_command = NULL; @@ -1066,6 +1067,8 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell) free(laddr); child_set_env(&env, &envsize, "SSH_CONNECTION", buf); + if (tun_fwd_ifnames != NULL) + child_set_env(&env, &envsize, "SSH_TUNNEL", tun_fwd_ifnames); if (auth_info_file != NULL) child_set_env(&env, &envsize, "SSH_USER_AUTH", auth_info_file); if (s->ttyfd != -1) |