diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-02-25 15:48:02 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-02-25 15:48:02 +0000 |
commit | c004135b72ff934c2576f8dec4d35d53019bf239 (patch) | |
tree | 41523774bd884409eae08ef6ac757b104eda922b | |
parent | e06ae4a4bcdb637911a1be6657e2dfa592fd49c8 (diff) |
- (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext()
since we need more session information than provided by that function.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | openbsd-compat/port-aix.h | 2 | ||||
-rw-r--r-- | session.c | 6 |
3 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,7 @@ +20020225 + - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() + since we need more session information than provided by that function. + 20020224 - (bal) Drop Session *s usage in ports-aix.[ch] and pass just what we need to do the jobs (AIX still does not fully compile, but that is @@ -7666,4 +7670,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1873 2002/02/25 01:56:46 tim Exp $ +$Id: ChangeLog,v 1.1874 2002/02/25 15:48:02 mouring Exp $ diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index b5647e7a..29d2ee63 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h @@ -5,6 +5,6 @@ void set_limit(char *user, char *soft, char *hard, int resource, int mult); void set_limits_from_userattr(char *user); #endif /* HAVE_GETUSERATTR */ -void aix_usrinfo(struct passwd *pw, char *tty, int ttyfd) +void aix_usrinfo(struct passwd *pw, char *tty, int ttyfd); #endif /* _AIX */ @@ -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 */ } |