tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2002/09/12 19:50:36

Browse Source 
[session.c ssh.1]
     add SSH_CONNECTION and deprecate SSH_CLIENT; bug #384.  ok markus@
This commit is contained in:
Damien Miller 2002-09-19 11:47:55 +10:00
parent db30b12d7b
commit f37e246f85
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -3,6 +3,9 @@
- stevesk@cvs.openbsd.org 2002/09/12 19:11:52 - stevesk@cvs.openbsd.org 2002/09/12 19:11:52
[ssh-agent.c] [ssh-agent.c]
%u for uid print; ok markus@ %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 20020912
- (djm) Made GNOME askpass programs return non-zero if cancel button is - (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; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ 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 $

8
session.c
View File

@ -33,7 +33,7 @@
*/ */
#include "includes.h" #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 "ssh.h"
#include "ssh1.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", snprintf(buf, sizeof buf, "%.50s %d %d",
get_remote_ipaddr(), get_remote_port(), get_local_port()); get_remote_ipaddr(), get_remote_port(), get_local_port());
child_set_env(&env, &envsize, "SSH_CLIENT", buf); 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) if (s->ttyfd != -1)
child_set_env(&env, &envsize, "SSH_TTY", s->tty); child_set_env(&env, &envsize, "SSH_TTY", s->tty);
if (s->term) if (s->term)

10
ssh.1
View File

@ -34,7 +34,7 @@
.\" (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.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 .Dd September 25, 1999
.Dt SSH 1 .Dt SSH 1
.Os .Os
@ -726,11 +726,11 @@ to make this work.)
.It Ev SSH_AUTH_SOCK .It Ev SSH_AUTH_SOCK
Identifies the path of a unix-domain socket used to communicate with the Identifies the path of a unix-domain socket used to communicate with the
agent. agent.
.It Ev SSH_CLIENT .It Ev SSH_CONNECTION
Identifies the client end of the connection. Identifies the client and server ends of the connection.
The variable contains The variable contains
three space-separated values: client ip-address, client port number, four space-separated values: client ip-address, client port number,
and server port number. server ip-address and server port number.
.It Ev SSH_ORIGINAL_COMMAND .It Ev SSH_ORIGINAL_COMMAND
The variable contains the original command line if a forced command The variable contains the original command line if a forced command
is executed. is executed.