From c58c2eedb04168330060406d7634db155d871fb2 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sat, 13 Sep 2003 22:02:05 +1000 Subject: - (dtucker) [auth-pam.c] Use SSHD_PAM_SERVICE for PAM service name, patch from cjwatson at debian.org. --- ChangeLog | 4 +++- auth-pam.c | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2467d8a4..c76e1fc29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ registry other than "files" (eg LDAP, see bug #543). - (tim) [configure.ac] define WITH_ABBREV_NO_TTY for SCO. Report by Roger Cornelius. + - (dtucker) [auth-pam.c] Use SSHD_PAM_SERVICE for PAM service name, patch + from cjwatson at debian.org. 20030912 - (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. 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 $ diff --git a/auth-pam.c b/auth-pam.c index bc378a32b..8cb78db11 100644 --- a/auth-pam.c +++ b/auth-pam.c @@ -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 $ */ #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 #include @@ -289,7 +289,8 @@ sshpam_init(const char *user) sshpam_handle = NULL; } 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) { pam_end(sshpam_handle, sshpam_err); sshpam_handle = NULL; -- cgit v1.2.3