- (stevesk) set the default PAM service name to __progname instead

   of the hard-coded value "sshd"; from Mark D. Roth <roth@feep.net>

diff --git a/ChangeLog b/ChangeLog
index 39fd67b6250cf53df54483743363d4d2b54627f7..038d83ac5c64e7d6df10d9686379dcbfea84ac4f 100644 (file)
--- 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                         

diff --git a/auth-pam.c b/auth-pam.c
index a8362cb7fc8943b5e185a850b82e23b1eebf8835..eb8b27dc28e5773b69465377f8f00f9924b523f2 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -33,6 +33,8 @@
 #include "canohost.h"
 #include "readpass.h"
 
+extern char *__progname;
+
 RCSID("$Id$");
 
 #define NEW_AUTHTOK_MSG \

diff --git a/ssh.h b/ssh.h
index 3ca92549d2873f74acc8bad36905af4f85dbd78c..0ee62868f64a07119413163c4c220184bb66b14b 100644 (file)
--- 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
 
 /*