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 /session.c | |
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.
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1017,10 +1017,6 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1017 | #endif /* WITH_IRIX_ARRAY */ | 1017 | #endif /* WITH_IRIX_ARRAY */ |
1018 | #endif /* WITH_IRIX_JOBS */ | 1018 | #endif /* WITH_IRIX_JOBS */ |
1019 | 1019 | ||
1020 | #ifdef USE_PAM | ||
1021 | do_pam_session(pw->pw_name, ttyname); | ||
1022 | do_pam_setcred(); | ||
1023 | #endif /* USE_PAM */ | ||
1024 | 1020 | ||
1025 | /* login(1) is only called if we execute the login shell */ | 1021 | /* login(1) is only called if we execute the login shell */ |
1026 | if (options.use_login && command != NULL) | 1022 | if (options.use_login && command != NULL) |
@@ -1147,6 +1143,11 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1147 | shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell); | 1143 | shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell); |
1148 | #endif | 1144 | #endif |
1149 | 1145 | ||
1146 | #ifdef USE_PAM | ||
1147 | do_pam_session(pw->pw_name, ttyname); | ||
1148 | do_pam_setcred(); | ||
1149 | #endif /* USE_PAM */ | ||
1150 | |||
1150 | #ifdef AFS | 1151 | #ifdef AFS |
1151 | /* Try to get AFS tokens for the local cell. */ | 1152 | /* Try to get AFS tokens for the local cell. */ |
1152 | if (k_hasafs()) { | 1153 | if (k_hasafs()) { |