diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2002-09-12 19:50:37 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2002-09-12 19:50:37 +0000 |
| commit | d043778b5fc0abf56e8b6e5e73feefd5943cc73c (patch) | |
| tree | a1a3a0ba257142245c54bd2212f8e1f160dfe529 /usr.bin | |
| parent | 9d2d486e749228e556f0dc675fe5ae6e6223f605 (diff) | |
add SSH_CONNECTION and deprecate SSH_CLIENT; bug #384. ok markus@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/session.c | 8 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh.1 | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c index fb0df415c65..e3bf330d0fe 100644 --- a/usr.bin/ssh/session.c +++ b/usr.bin/ssh/session.c @@ -33,7 +33,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: session.c,v 1.148 2002/08/29 15:57:25 stevesk Exp $"); +RCSID("$OpenBSD: session.c,v 1.149 2002/09/12 19:50:36 stevesk Exp $"); #include "ssh.h" #include "ssh1.h" @@ -871,10 +871,16 @@ do_setup_env(Session *s, const char *shell) } } + /* SSH_CLIENT deprecated */ snprintf(buf, sizeof buf, "%.50s %d %d", get_remote_ipaddr(), get_remote_port(), get_local_port()); child_set_env(&env, &envsize, "SSH_CLIENT", buf); + snprintf(buf, sizeof buf, "%.50s %d %.50s %d", + get_remote_ipaddr(), get_remote_port(), + get_local_ipaddr(packet_get_connection_in()), get_local_port()); + child_set_env(&env, &envsize, "SSH_CONNECTION", buf); + if (s->ttyfd != -1) child_set_env(&env, &envsize, "SSH_TTY", s->tty); if (s->term) diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index ce0dd291dd4..a65da561170 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.165 2002/09/11 17:55:03 stevesk Exp $ +.\" $OpenBSD: ssh.1,v 1.166 2002/09/12 19:50:36 stevesk Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -726,11 +726,11 @@ to make this work.) .It Ev SSH_AUTH_SOCK Identifies the path of a unix-domain socket used to communicate with the agent. -.It Ev SSH_CLIENT -Identifies the client end of the connection. +.It Ev SSH_CONNECTION +Identifies the client and server ends of the connection. The variable contains -three space-separated values: client ip-address, client port number, -and server port number. +four space-separated values: client ip-address, client port number, +server ip-address and server port number. .It Ev SSH_ORIGINAL_COMMAND The variable contains the original command line if a forced command is executed. |