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

   from cjwatson at debian.org.

diff --git a/ChangeLog b/ChangeLog
index 69a99bf25aa00be5a8ab5c1ede11fa6066e6aecf..a42125cdaf08d36dc579c437089dffbd0df22fa4 100644 (file)
--- 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".

diff --git a/auth-pam.c b/auth-pam.c
index 4cfa2002a8b40e60096df3088ab7783420091953..82cac286992cde7647a5948625317c9387fdcf8d 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -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;