3 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index dceb982ab..8ba9f7e5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
      Split out and improve escape character documentation, mention ~R in
      ~? help text; ok markus@
  - Update RPM spec files for CVS version.h
+ - (stevesk) set the default PAM service name to __progname instead
+   of the hard-coded value "sshd"; from Mark D. Roth <roth@feep.net>
 
 20010420
  - OpenBSD CVS Sync                         
@@ -5195,4 +5197,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1149 2001/04/20 13:19:37 djm Exp $
+$Id: ChangeLog,v 1.1150 2001/04/20 17:43:48 stevesk Exp $
diff --git a/auth-pam.c b/auth-pam.c
index d8eefdfd7..8113a2fc0 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -33,7 +33,9 @@
 #include "canohost.h"
 #include "readpass.h"
 
-RCSID("$Id: auth-pam.c,v 1.34 2001/03/27 06:12:24 djm Exp $");
+extern char *__progname;
+
+RCSID("$Id: auth-pam.c,v 1.35 2001/04/20 17:43:47 stevesk Exp $");
 
 #define NEW_AUTHTOK_MSG \
         "Warning: Your password has expired, please change it now"
diff --git a/ssh.h b/ssh.h
index 3ca92549d..0ee62868f 100644
--- a/ssh.h
+++ b/ssh.h
@@ -61,7 +61,7 @@
 #define SSH_SERVICE_NAME        "ssh"
 
 #if defined(USE_PAM) && !defined(SSHD_PAM_SERVICE)
-# define SSHD_PAM_SERVICE       "sshd"
+# define SSHD_PAM_SERVICE       __progname
 #endif
 
 /*