summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-01-23 14:16:26 +1100
committerDamien Miller <djm@mindrot.org>2004-01-23 14:16:26 +1100
commitd352636553bf85e21c697eca2e6873e78862576e (patch)
treef9cd116698013cd3e6f26e438ba0b9d21984498a
parentc900128e55134291e2d5dd0ec7ad18d97625cee3 (diff)
- (djm) Do pam_session processing for systems with HAVE_LOGIN_CAP; from
ralf.hack AT pipex.net; ok dtucker@
-rw-r--r--ChangeLog6
-rw-r--r--session.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 12a7f6a1b..4d9d9faa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120040123
2 - (djm) Do pam_session processing for systems with HAVE_LOGIN_CAP; from
3 ralf.hack AT pipex.net; ok dtucker@
4
120040122 520040122
2 - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/ 6 - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/
3 GSSAPI detection, libs and includes. ok djm@ 7 GSSAPI detection, libs and includes. ok djm@
@@ -1709,4 +1713,4 @@
1709 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1713 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1710 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1714 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1711 1715
1712$Id: ChangeLog,v 1.3180 2004/01/23 00:10:03 tim Exp $ 1716$Id: ChangeLog,v 1.3181 2004/01/23 03:16:26 djm Exp $
diff --git a/session.c b/session.c
index 6a1cb7841..947ba5eff 100644
--- a/session.c
+++ b/session.c
@@ -1243,6 +1243,12 @@ do_setusercontext(struct passwd *pw)
1243# ifdef __bsdi__ 1243# ifdef __bsdi__
1244 setpgid(0, 0); 1244 setpgid(0, 0);
1245# endif 1245# endif
1246# ifdef USE_PAM
1247 if (options.use_pam) {
1248 do_pam_session();
1249 do_pam_setcred(0);
1250 }
1251# endif /* USE_PAM */
1246 if (setusercontext(lc, pw, pw->pw_uid, 1252 if (setusercontext(lc, pw, pw->pw_uid,
1247 (LOGIN_SETALL & ~LOGIN_SETPATH)) < 0) { 1253 (LOGIN_SETALL & ~LOGIN_SETPATH)) < 0) {
1248 perror("unable to set user context"); 1254 perror("unable to set user context");