diff options
| author | Damien Miller <djm@mindrot.org> | 2002-09-19 11:47:55 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2002-09-19 11:47:55 +1000 |
| commit | f37e246f858cdd79be4f4e158b7b04778d1cb7e9 (patch) | |
| tree | fc7f570e687743bb1fd0669cf7f8cbf0e204ebc6 | |
| parent | db30b12d7b41565aa7215c7aa45709cda0b41ab3 (diff) | |
- stevesk@cvs.openbsd.org 2002/09/12 19:50:36
[session.c ssh.1]
add SSH_CONNECTION and deprecate SSH_CLIENT; bug #384. ok markus@
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | session.c | 8 | ||||
| -rw-r--r-- | ssh.1 | 10 |
3 files changed, 16 insertions, 7 deletions
@@ -3,6 +3,9 @@ - stevesk@cvs.openbsd.org 2002/09/12 19:11:52 [ssh-agent.c] %u for uid print; ok markus@ + - stevesk@cvs.openbsd.org 2002/09/12 19:50:36 + [session.c ssh.1] + add SSH_CONNECTION and deprecate SSH_CLIENT; bug #384. ok markus@ 20020912 - (djm) Made GNOME askpass programs return non-zero if cancel button is @@ -653,4 +656,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2464 2002/09/19 01:46:58 djm Exp $ +$Id: ChangeLog,v 1.2465 2002/09/19 01:47:55 djm Exp $ @@ -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" @@ -1011,10 +1011,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) @@ -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. |