diff options
| author |   djm <djm@openbsd.org> | 2017-10-23 05:08:00 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2017-10-23 05:08:00 +0000 |
| commit | 39a288ec9abdad08cdca4429df9f9771a04419dd (patch) | |
| tree | 7cdcf9ef4307992f96f7c1aa88e29de232013596 /usr.bin/ssh/session.c | |
| parent | remove mention of unused MACOBIOVERBOSE and NBUF options (diff) | |
| download | wireguard-openbsd-39a288ec9abdad08cdca4429df9f9771a04419dd.tar.xz wireguard-openbsd-39a288ec9abdad08cdca4429df9f9771a04419dd.zip | |
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
Diffstat (limited to 'usr.bin/ssh/session.c')
| -rw-r--r-- | usr.bin/ssh/session.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c index 7fbc3048274..6ab23a84dd1 100644 --- a/usr.bin/ssh/session.c +++ b/usr.bin/ssh/session.c @@ -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 @@ -124,6 +124,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; @@ -834,6 +835,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) |