From ccd02552ddf0fd0b7bfcc29d8c5eb38dd459c465 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Mon, 31 Aug 2009 15:25:39 +0000
Subject: [PATCH] - set $SSH_TTY environment variable - remove extraneous
(crash causing) printf()
--HG--
extra : convert_revision : cf4b256bf6785be384eca32f7b229b89e58539eb
---
svr-chansession.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/svr-chansession.c b/svr-chansession.c
index cb5acda2..2664382e 100644
--- a/svr-chansession.c
+++ b/svr-chansession.c
@@ -742,8 +742,6 @@ static int ptycommand(struct Channel *channel, struct ChanSess *chansess) {
login_login(li);
login_free_entry(li);
- m_free(chansess->tty);
-
#ifdef DO_MOTD
if (svr_opts.domotd) {
/* don't show the motd if ~/.hushlogin exists */
@@ -884,9 +882,10 @@ static void execchild(void *user_data) {
addnewvar("TERM", chansess->term);
}
- printf("adding option %p %s\n", ses.authstate.pubkey_options,
- ses.authstate.pubkey_options->original_command);
-
+ if (chansess->tty) {
+ addnewvar("SSH_TTY", chansess->tty);
+ }
+
#ifdef ENABLE_SVR_PUBKEY_OPTIONS
if (ses.authstate.pubkey_options &&
ses.authstate.pubkey_options->original_command) {
--
GitLab