- (dtucker) [auth-pam.c] Use SSHD_PAM_SERVICE for PAM service name, patch

from cjwatson at debian.org.
This commit is contained in:
Darren Tucker 2003-09-13 22:02:05 +10:00
parent ae477e922e
commit c58c2eedb0
2 changed files with 6 additions and 3 deletions

View File

@ -6,6 +6,8 @@
registry other than "files" (eg LDAP, see bug #543). registry other than "files" (eg LDAP, see bug #543).
- (tim) [configure.ac] define WITH_ABBREV_NO_TTY for SCO. - (tim) [configure.ac] define WITH_ABBREV_NO_TTY for SCO.
Report by Roger Cornelius. Report by Roger Cornelius.
- (dtucker) [auth-pam.c] Use SSHD_PAM_SERVICE for PAM service name, patch
from cjwatson at debian.org.
20030912 20030912
- (tim) [regress/agent-ptrace.sh] sh doesn't like "if ! shell_function; then". - (tim) [regress/agent-ptrace.sh] sh doesn't like "if ! shell_function; then".
@ -1084,4 +1086,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.2988 2003/09/13 01:15:15 tim Exp $ $Id: ChangeLog,v 1.2989 2003/09/13 12:02:05 dtucker Exp $

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.70 2003/09/02 13:18:53 djm Exp $"); RCSID("$Id: auth-pam.c,v 1.71 2003/09/13 12:02:05 dtucker Exp $");
#ifdef USE_PAM #ifdef USE_PAM
#include <security/pam_appl.h> #include <security/pam_appl.h>
@ -289,7 +289,8 @@ sshpam_init(const char *user)
sshpam_handle = NULL; sshpam_handle = NULL;
} }
debug("PAM: initializing for \"%s\"", user); debug("PAM: initializing for \"%s\"", user);
sshpam_err = pam_start("sshd", user, &null_conv, &sshpam_handle); sshpam_err =
pam_start(SSHD_PAM_SERVICE, user, &null_conv, &sshpam_handle);
if (sshpam_err != PAM_SUCCESS) { if (sshpam_err != PAM_SUCCESS) {
pam_end(sshpam_handle, sshpam_err); pam_end(sshpam_handle, sshpam_err);
sshpam_handle = NULL; sshpam_handle = NULL;