diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | session.c | 9 |
2 files changed, 9 insertions, 6 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20010215 | ||
2 | - (djm) Move PAM session setup back to before setuid to user. Fixes | ||
3 | problems on Solaris-derived PAMs. | ||
4 | |||
1 | 20010214 | 5 | 20010214 |
2 | - (djm) Don't try to close PAM session or delete credentials if the | 6 | - (djm) Don't try to close PAM session or delete credentials if the |
3 | session has not been open or credentials not set. Based on patch from | 7 | session has not been open or credentials not set. Based on patch from |
@@ -3925,4 +3929,4 @@ | |||
3925 | - Wrote replacements for strlcpy and mkdtemp | 3929 | - Wrote replacements for strlcpy and mkdtemp |
3926 | - Released 1.0pre1 | 3930 | - Released 1.0pre1 |
3927 | 3931 | ||
3928 | $Id: ChangeLog,v 1.759 2001/02/13 18:45:00 stevesk Exp $ | 3932 | $Id: ChangeLog,v 1.760 2001/02/15 00:32:15 djm Exp $ |
@@ -1016,6 +1016,10 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1016 | #endif /* WITH_IRIX_ARRAY */ | 1016 | #endif /* WITH_IRIX_ARRAY */ |
1017 | #endif /* WITH_IRIX_JOBS */ | 1017 | #endif /* WITH_IRIX_JOBS */ |
1018 | 1018 | ||
1019 | #ifdef USE_PAM | ||
1020 | do_pam_session(pw->pw_name, ttyname); | ||
1021 | do_pam_setcred(); | ||
1022 | #endif /* USE_PAM */ | ||
1019 | 1023 | ||
1020 | /* login(1) is only called if we execute the login shell */ | 1024 | /* login(1) is only called if we execute the login shell */ |
1021 | if (options.use_login && command != NULL) | 1025 | if (options.use_login && command != NULL) |
@@ -1129,11 +1133,6 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1129 | shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell); | 1133 | shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell); |
1130 | #endif | 1134 | #endif |
1131 | 1135 | ||
1132 | #ifdef USE_PAM | ||
1133 | do_pam_session(pw->pw_name, ttyname); | ||
1134 | do_pam_setcred(); | ||
1135 | #endif /* USE_PAM */ | ||
1136 | |||
1137 | #ifdef AFS | 1136 | #ifdef AFS |
1138 | /* Try to get AFS tokens for the local cell. */ | 1137 | /* Try to get AFS tokens for the local cell. */ |
1139 | if (k_hasafs()) { | 1138 | if (k_hasafs()) { |