summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-02-21 05:53:33 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-02-21 05:53:33 +0000
commit94bce40720e91d184ae22272a1537edffb65f945 (patch)
tree02e822eac8cedbdb5a684cbfb8cd4c6dcc792a32 /session.c
parent5eff0316a8bc81e43c8ca4223bc4f904bac5cbe4 (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.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/session.c b/session.c
index e862c650..de8127f7 100644
--- a/session.c
+++ b/session.c
@@ -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()) {