summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-02-27 10:48:01 +1100
committerDamien Miller <djm@mindrot.org>2001-02-27 10:48:01 +1100
commit7bd1c6262b059064ce71e39a883c8f0de8a25139 (patch)
treefd0ffb0f5581515178390f067f34c049b0b53d7a
parenta66eca47ee454de6c18a0fe8af7d5f562c00c99d (diff)
- (djm) Fix PAM fix
-rw-r--r--ChangeLog3
-rw-r--r--session.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 258bc047e..5a278e972 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
14 - (djm) Move PAM init to after fork for non-Solaris derived PAMs 14 - (djm) Move PAM init to after fork for non-Solaris derived PAMs
15 - (djm) Warning fix on entropy.c saved uid stuff. Patch from Mark Miller 15 - (djm) Warning fix on entropy.c saved uid stuff. Patch from Mark Miller
16 <markm@swoon.net> 16 <markm@swoon.net>
17 - (djm) Fix PAM fix
17 18
1820010226 1920010226
19 - (bal) Fixed bsd-snprinf.c so it now honors 'BROKEN_SNPRINTF' again. 20 - (bal) Fixed bsd-snprinf.c so it now honors 'BROKEN_SNPRINTF' again.
@@ -4148,4 +4149,4 @@
4148 - Wrote replacements for strlcpy and mkdtemp 4149 - Wrote replacements for strlcpy and mkdtemp
4149 - Released 1.0pre1 4150 - Released 1.0pre1
4150 4151
4151$Id: ChangeLog,v 1.832 2001/02/26 22:47:16 djm Exp $ 4152$Id: ChangeLog,v 1.833 2001/02/26 23:48:01 djm Exp $
diff --git a/session.c b/session.c
index d4053b4c9..be0cdf795 100644
--- a/session.c
+++ b/session.c
@@ -1036,7 +1036,7 @@ do_child(const char *command, struct passwd * pw, const char *term,
1036 1036
1037#if defined(USE_PAM) && !defined(PAM_SUN_CODEBASE) 1037#if defined(USE_PAM) && !defined(PAM_SUN_CODEBASE)
1038 /* Solaris-derived PAMs don't like doing this after the fork() */ 1038 /* Solaris-derived PAMs don't like doing this after the fork() */
1039 do_pam_session(pw->pw_name, s->tty); 1039 do_pam_session(pw->pw_name, ttyname);
1040 do_pam_setcred(); 1040 do_pam_setcred();
1041#endif 1041#endif
1042 1042