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 @@ | |||
2 | - (bal) Removed -L/usr/ucblib -R/usr/ucblib for Solaris platform. | 2 | - (bal) Removed -L/usr/ucblib -R/usr/ucblib for Solaris platform. |
3 | - (bal) Fixed OpenSSL rework to use $saved_*. Patch by Tim Rice | 3 | - (bal) Fixed OpenSSL rework to use $saved_*. Patch by Tim Rice |
4 | <tim@multitalents.net> | 4 | <tim@multitalents.net> |
5 | - (bal) Reverted out of 2001/02/15 patch by djm below because it | ||
6 | breaks Solaris. | ||
7 | - (djm) Move PAM session setup back to before setuid to user. | ||
8 | fixes problems on Solaris-drived PAMs. | ||
5 | 9 | ||
6 | 20010220 | 10 | 20010220 |
7 | - (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and | 11 | - (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and |
@@ -4083,4 +4087,4 @@ | |||
4083 | - Wrote replacements for strlcpy and mkdtemp | 4087 | - Wrote replacements for strlcpy and mkdtemp |
4084 | - Released 1.0pre1 | 4088 | - Released 1.0pre1 |
4085 | 4089 | ||
4086 | $Id: ChangeLog,v 1.807 2001/02/21 02:35:37 mouring Exp $ | 4090 | $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, | |||
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()) { |