20020626

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

diff --git a/ChangeLog b/ChangeLog
index fdf53ac4075452b96de66ed577401642d0cfb588..90475dc9cfb7723d6069443d06bc19a5c8499837 100644 (file)
--- 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 6206abe9c2ff7a8a264fe9e74a636120e243ad4b..d47a7fc679acc6e993231bfa2aeeeec2e00798a6 100644 (file)
--- 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 9abe028b06e125d226b5f7ef025122151e1fe827..4bdf28d4550f90c2cb6f674676a06bd28feb58a8 100644 (file)
--- 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 */
        }