summaryrefslogtreecommitdiffstats
path: root/session.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-25 19:12:26 +0200
committerBen Lindstrom <mouring@eviladmin.org>2002-06-25 19:12:26 +0200
commitb129be657c17c2a861f6c9e2c1f2d9fdf2770615 (patch)
treeb1d8fb956ccaa7df1c7189fd2508f2861a1c739a /session.c
parentSync with Caldera (diff)
downloadopenssh-b129be657c17c2a861f6c9e2c1f2d9fdf2770615.tar.xz
openssh-b129be657c17c2a861f6c9e2c1f2d9fdf2770615.zip
20020626
- (bal) moved aix_usrinfo() and noted not setting real TTY. Patch by dtucker@zip.com.au
Diffstat (limited to 'session.c')
-rw-r--r--session.c9
1 files changed, 6 insertions, 3 deletions
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 */
}