diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-21 05:53:33 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-21 05:53:33 +0000 |
| commit | 94bce40720e91d184ae22272a1537edffb65f945 (patch) | |
| tree | 02e822eac8cedbdb5a684cbfb8cd4c6dcc792a32 | |
| parent | 5eff0316a8bc81e43c8ca4223bc4f904bac5cbe4 (diff) | |
- (bal) Reverted out of 2001/02/15 patch by djm below because it
breaks Solaris.
- (djm) Move PAM session setup back to before setuid to user.
fixes problems on Solaris-drived PAMs.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | session.c | 9 |
2 files changed, 10 insertions, 5 deletions
@@ -2,6 +2,10 @@ - (bal) Removed -L/usr/ucblib -R/usr/ucblib for Solaris platform. - (bal) Fixed OpenSSL rework to use $saved_*. Patch by Tim Rice <tim@multitalents.net> + - (bal) Reverted out of 2001/02/15 patch by djm below because it + breaks Solaris. + - (djm) Move PAM session setup back to before setuid to user. + fixes problems on Solaris-drived PAMs. 20010220 - (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and @@ -4083,4 +4087,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.807 2001/02/21 02:35:37 mouring Exp $ +$Id: ChangeLog,v 1.808 2001/02/21 05:53:33 mouring Exp $ @@ -1017,10 +1017,6 @@ do_child(const char *command, struct passwd * pw, const char *term, #endif /* WITH_IRIX_ARRAY */ #endif /* WITH_IRIX_JOBS */ -#ifdef USE_PAM - do_pam_session(pw->pw_name, ttyname); - do_pam_setcred(); -#endif /* USE_PAM */ /* login(1) is only called if we execute the login shell */ if (options.use_login && command != NULL) @@ -1147,6 +1143,11 @@ do_child(const char *command, struct passwd * pw, const char *term, shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell); #endif +#ifdef USE_PAM + do_pam_session(pw->pw_name, ttyname); + do_pam_setcred(); +#endif /* USE_PAM */ + #ifdef AFS /* Try to get AFS tokens for the local cell. */ if (k_hasafs()) { |