3 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 3eec58073..15cf17b86 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
@@ -1092,4 +1094,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2270 2002/06/25 17:07:25 tim Exp $
+$Id: ChangeLog,v 1.2271 2002/06/25 17:12:26 mouring Exp $
diff --git a/TODO b/TODO
index 86fdb5d82..4331a1364 100644
--- a/TODO
+++ b/TODO
@@ -96,10 +96,11 @@ 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
   + Privsep for Pre-auth only (no fd passing)
 
-$Id: TODO,v 1.49 2002/06/25 14:14:30 mouring Exp $
+$Id: TODO,v 1.50 2002/06/25 17:12:27 mouring Exp $
diff --git a/session.c b/session.c
index 9abe028b0..4bdf28d45 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 */
         }