From bebd8be67bd8fc8e832faf0ed635f9e8a46ca126 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 22 Mar 2001 11:58:15 +1100
Subject:  - (djm) Better AIX no tty fix, spotted by Gert Doering
 <gert@greenie.muc.de>

---
 ChangeLog | 5 ++++-
 session.c | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e9ace6aa..27b5ad971 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20010322
+ - (djm) Better AIX no tty fix, spotted by Gert Doering <gert@greenie.muc.de>
+
 20010321
  - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve 
    VanDevender <stevev@darkwing.uoregon.edu>
@@ -4656,4 +4659,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.998 2001/03/21 05:13:03 djm Exp $
+$Id: ChangeLog,v 1.999 2001/03/22 00:58:15 djm Exp $
diff --git a/session.c b/session.c
index bed03c746..a794f3b2d 100644
--- a/session.c
+++ b/session.c
@@ -1134,11 +1134,12 @@ do_child(Session *s, const char *command)
 			 * other stuff is stored - a few applications
 			 * actually use this and die if it's not set
 			 */
+			if (s->ttyfd == -1)
+				s->tty[0] = '\0';
 			cp = xmalloc(22 + strlen(s->tty) + 
 			    2 * strlen(pw->pw_name));
 			i = sprintf(cp, "LOGNAME=%s%cNAME=%s%cTTY=%s%c%c",
-			    pw->pw_name, 0, pw->pw_name, 0, 
-			    s->ttyfd == -1 ? "" : s->tty, 0,0);
+			    pw->pw_name, 0, pw->pw_name, 0, s->tty, 0, 0);
 			if (usrinfo(SETUINFO, cp, i) == -1)
 				fatal("Couldn't set usrinfo: %s", 
 				    strerror(errno));
-- 
cgit v1.2.3