From: mouring <mouring>
Date: Tue, 25 Jun 2002 17:12:26 +0000 (+0000)
Subject: 20020626
X-Git-Tag: V_3_4_P1~32
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/e2bc41f93e6ef79504fe4721629fc571db66fe57

20020626
 - (bal) moved aix_usrinfo() and noted not setting real TTY.  Patch by
   dtucker@zip.com.au
---

diff --git a/ChangeLog b/ChangeLog
index fdf53ac4..90475dc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
  - (bal) if mmap() is substandard, don't allow compression on server side.
    Post 'event' we will add more options.
  - (tim) [contrib/caldera/openssh.spec] Sync with Caldera
+ - (bal) moved aix_usrinfo() and noted not setting real TTY.  Patch by
+   dtucker@zip.com.au
 
 20020624
  - OpenBSD CVS Sync
diff --git a/TODO b/TODO
index 6206abe9..d47a7fc6 100644
--- a/TODO
+++ b/TODO
@@ -96,7 +96,8 @@ PrivSep Issues:
 - PAM 
   + See above PAM notes
 - AIX
-  + Issues with usrinfo()
+  + usrinfo() does not set TTY, but only required for legicy systems.  Works
+    with PrivSep.
 - OSF
   + SIA is broken
 - Cygwin
diff --git a/session.c b/session.c
index 9abe028b..4bdf28d4 100644
--- a/session.c
+++ b/session.c
@@ -1152,6 +1152,8 @@ do_nologin(struct passwd *pw)
 void
 do_setusercontext(struct passwd *pw)
 {
+	char tty='\0';
+
 #ifdef HAVE_CYGWIN
 	if (is_winnt) {
 #else /* HAVE_CYGWIN */
@@ -1196,6 +1198,10 @@ do_setusercontext(struct passwd *pw)
 # if defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY)
 		irix_setusercontext(pw);
 #  endif /* defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) */
+# ifdef _AIX
+		/* XXX: Disable tty setting.  Enabled if required later */
+		aix_usrinfo(pw, &tty, -1);
+# endif /* _AIX */
 		/* Permanently switch to the desired uid. */
 		permanently_set_uid(pw);
 #endif
@@ -1258,9 +1264,6 @@ do_child(Session *s, const char *command)
 			do_motd();
 #else /* HAVE_OSF_SIA */
 		do_nologin(pw);
-# ifdef _AIX
-		aix_usrinfo(pw, s->tty, s->ttyfd);
-# endif /* _AIX */
 		do_setusercontext(pw);
 #endif /* HAVE_OSF_SIA */
 	}