RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [auth-pam.c] Don't set PAM_TTY if tty is null. ok djm@

This commit is contained in:
Darren Tucker 2003-08-08 13:43:37 +10:00
parent 65914f1eb3
commit f38db7f5da
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,7 @@
- (dtucker) [openbsd-compat/fake-rfc2553.h] Older Linuxes have AI_PASSIVE and - (dtucker) [openbsd-compat/fake-rfc2553.h] Older Linuxes have AI_PASSIVE and
AI_CANONNAME in netdb.h but not AI_NUMERICHOST, so check each definition AI_CANONNAME in netdb.h but not AI_NUMERICHOST, so check each definition
separately before defining them. separately before defining them.
- (dtucker) [auth-pam.c] Don't set PAM_TTY if tty is null. ok djm@
20030807 20030807
- (dtucker) [session.c] Have session_break_req not attempt to send a break - (dtucker) [session.c] Have session_break_req not attempt to send a break
@ -803,4 +804,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2885 2003/08/08 02:15:11 dtucker Exp $ $Id: ChangeLog,v 1.2886 2003/08/08 03:43:37 dtucker Exp $

14
auth-pam.c
View File

@ -31,7 +31,7 @@
/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
#include "includes.h" #include "includes.h"
RCSID("$Id: auth-pam.c,v 1.65 2003/07/30 04:53:11 djm Exp $"); RCSID("$Id: auth-pam.c,v 1.66 2003/08/08 03:43:37 dtucker Exp $");
#ifdef USE_PAM #ifdef USE_PAM
#include <security/pam_appl.h> #include <security/pam_appl.h>
@ -534,11 +534,13 @@ do_pam_session(const char *user, const char *tty)
if (sshpam_err != PAM_SUCCESS) if (sshpam_err != PAM_SUCCESS)
fatal("PAM: failed to set PAM_CONV: %s", fatal("PAM: failed to set PAM_CONV: %s",
pam_strerror(sshpam_handle, sshpam_err)); pam_strerror(sshpam_handle, sshpam_err));
debug("PAM: setting PAM_TTY to \"%s\"", tty); if (tty != NULL) {
sshpam_err = pam_set_item(sshpam_handle, PAM_TTY, tty); debug("PAM: setting PAM_TTY to \"%s\"", tty);
if (sshpam_err != PAM_SUCCESS) sshpam_err = pam_set_item(sshpam_handle, PAM_TTY, tty);
fatal("PAM: failed to set PAM_TTY: %s", if (sshpam_err != PAM_SUCCESS)
pam_strerror(sshpam_handle, sshpam_err)); fatal("PAM: failed to set PAM_TTY: %s",
pam_strerror(sshpam_handle, sshpam_err));
}
sshpam_err = pam_open_session(sshpam_handle, 0); sshpam_err = pam_open_session(sshpam_handle, 0);
if (sshpam_err != PAM_SUCCESS) if (sshpam_err != PAM_SUCCESS)
fatal("PAM: pam_open_session(): %s", fatal("PAM: pam_open_session(): %s",