tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Move PAM session initialisation until after fork in sshd. Patch 

from Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Damien Miller 2001-02-14 00:45:51 +11:00
parent 3dfeee46d7
commit 6b4146ad73
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -2,6 +2,8 @@
- (djm) Don't try to close PAM session or delete credentials if the - (djm) Don't try to close PAM session or delete credentials if the
session has not been open or credentials not set. Based on patch from session has not been open or credentials not set. Based on patch from
Andrew Bartlett <abartlet@pcug.org.au> Andrew Bartlett <abartlet@pcug.org.au>
- (djm) Move PAM session initialisation until after fork in sshd. Patch
from Nalin Dahyabhai <nalin@redhat.com>
20010213 20010213
- (djm) Only test -S potential EGD sockets if they exist and are readable. - (djm) Only test -S potential EGD sockets if they exist and are readable.
@ -3918,4 +3920,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.755 2001/02/13 13:43:55 djm Exp $ $Id: ChangeLog,v 1.756 2001/02/13 13:45:51 djm Exp $

14
session.c
View File

@ -484,10 +484,6 @@ do_exec_no_pty(Session *s, const char *command, struct passwd * pw)
session_proctitle(s); session_proctitle(s);
#ifdef USE_PAM
do_pam_setcred();
#endif /* USE_PAM */
/* Fork the child. */ /* Fork the child. */
if ((pid = fork()) == 0) { if ((pid = fork()) == 0) {
/* Child. Reinitialize the log since the pid has changed. */ /* Child. Reinitialize the log since the pid has changed. */
@ -600,11 +596,6 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw)
ptyfd = s->ptyfd; ptyfd = s->ptyfd;
ttyfd = s->ttyfd; ttyfd = s->ttyfd;
#ifdef USE_PAM
do_pam_session(pw->pw_name, s->tty);
do_pam_setcred();
#endif /* USE_PAM */
/* Fork the child. */ /* Fork the child. */
if ((pid = fork()) == 0) { if ((pid = fork()) == 0) {
/* Child. Reinitialize the log because the pid has changed. */ /* Child. Reinitialize the log because the pid has changed. */
@ -1156,6 +1147,11 @@ do_child(const char *command, struct passwd * pw, const char *term,
shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell); shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell);
#endif #endif
#ifdef USE_PAM
do_pam_session(pw->pw_name, ttyname);
do_pam_setcred();
#endif /* USE_PAM */
#ifdef AFS #ifdef AFS
/* Try to get AFS tokens for the local cell. */ /* Try to get AFS tokens for the local cell. */
if (k_hasafs()) { if (k_hasafs()) {