- (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext()

[openssh.git] / session.c

diff --git a/session.c b/session.c
index bf1a3ecf721c75c96fe9e99fba9ca845d9da0607..a31ff85d84929e984a906202318af106a5816220 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1146,9 +1146,6 @@ 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
-               aix_usrinfo(s)
-#endif
                /* Permanently switch to the desired uid. */
                permanently_set_uid(pw);
 #endif
@@ -1190,6 +1187,9 @@ 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 */
        }