diff options
author | Damien Miller <djm@mindrot.org> | 2001-02-15 11:32:15 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-02-15 11:32:15 +1100 |
commit | e8b5b04521f33d868ac3301802e3dab1f57588fd (patch) | |
tree | 9dbf00ddf957dbae2955e055e3fc1da79a8f6efb /session.c | |
parent | 7fafa5ccbe332d3c3faabd75b3354f8d149e6d09 (diff) |
- (djm) Move PAM session setup back to before setuid to user. Fixes
problems on Solaris-derived PAMs.
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -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()) { |