diff options
-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 @@ | |||
1 | 20020225 | ||
2 | - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() | ||
3 | since we need more session information than provided by that function. | ||
4 | |||
1 | 20020224 | 5 | 20020224 |
2 | - (bal) Drop Session *s usage in ports-aix.[ch] and pass just what we | 6 | - (bal) Drop Session *s usage in ports-aix.[ch] and pass just what we |
3 | need to do the jobs (AIX still does not fully compile, but that is | 7 | need to do the jobs (AIX still does not fully compile, but that is |
@@ -7666,4 +7670,4 @@ | |||
7666 | - Wrote replacements for strlcpy and mkdtemp | 7670 | - Wrote replacements for strlcpy and mkdtemp |
7667 | - Released 1.0pre1 | 7671 | - Released 1.0pre1 |
7668 | 7672 | ||
7669 | $Id: ChangeLog,v 1.1873 2002/02/25 01:56:46 tim Exp $ | 7673 | $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 b5647e7ab..29d2ee630 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); | |||
5 | void set_limits_from_userattr(char *user); | 5 | void set_limits_from_userattr(char *user); |
6 | #endif /* HAVE_GETUSERATTR */ | 6 | #endif /* HAVE_GETUSERATTR */ |
7 | 7 | ||
8 | void aix_usrinfo(struct passwd *pw, char *tty, int ttyfd) | 8 | void aix_usrinfo(struct passwd *pw, char *tty, int ttyfd); |
9 | 9 | ||
10 | #endif /* _AIX */ | 10 | #endif /* _AIX */ |
@@ -1146,9 +1146,6 @@ do_setusercontext(struct passwd *pw) | |||
1146 | # if defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) | 1146 | # if defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) |
1147 | irix_setusercontext(pw); | 1147 | irix_setusercontext(pw); |
1148 | # endif /* defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) */ | 1148 | # endif /* defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) */ |
1149 | #ifdef _AIX | ||
1150 | aix_usrinfo(s) | ||
1151 | #endif | ||
1152 | /* Permanently switch to the desired uid. */ | 1149 | /* Permanently switch to the desired uid. */ |
1153 | permanently_set_uid(pw); | 1150 | permanently_set_uid(pw); |
1154 | #endif | 1151 | #endif |
@@ -1190,6 +1187,9 @@ do_child(Session *s, const char *command) | |||
1190 | do_motd(); | 1187 | do_motd(); |
1191 | #else /* HAVE_OSF_SIA */ | 1188 | #else /* HAVE_OSF_SIA */ |
1192 | do_nologin(pw); | 1189 | do_nologin(pw); |
1190 | # ifdef _AIX | ||
1191 | aix_usrinfo(pw, s->tty, s->ttyfd); | ||
1192 | # endif /* _AIX */ | ||
1193 | do_setusercontext(pw); | 1193 | do_setusercontext(pw); |
1194 | #endif /* HAVE_OSF_SIA */ | 1194 | #endif /* HAVE_OSF_SIA */ |
1195 | } | 1195 | } |