summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--auth-pam.c4
-rw-r--r--ssh.h2
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 @@
5 Split out and improve escape character documentation, mention ~R in 5 Split out and improve escape character documentation, mention ~R in
6 ~? help text; ok markus@ 6 ~? help text; ok markus@
7 - Update RPM spec files for CVS version.h 7 - Update RPM spec files for CVS version.h
8 - (stevesk) set the default PAM service name to __progname instead
9 of the hard-coded value "sshd"; from Mark D. Roth <roth@feep.net>
8 10
920010420 1120010420
10 - OpenBSD CVS Sync 12 - OpenBSD CVS Sync
@@ -5195,4 +5197,4 @@
5195 - Wrote replacements for strlcpy and mkdtemp 5197 - Wrote replacements for strlcpy and mkdtemp
5196 - Released 1.0pre1 5198 - Released 1.0pre1
5197 5199
5198$Id: ChangeLog,v 1.1149 2001/04/20 13:19:37 djm Exp $ 5200$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 @@
33#include "canohost.h" 33#include "canohost.h"
34#include "readpass.h" 34#include "readpass.h"
35 35
36RCSID("$Id: auth-pam.c,v 1.34 2001/03/27 06:12:24 djm Exp $"); 36extern char *__progname;
37
38RCSID("$Id: auth-pam.c,v 1.35 2001/04/20 17:43:47 stevesk Exp $");
37 39
38#define NEW_AUTHTOK_MSG \ 40#define NEW_AUTHTOK_MSG \
39 "Warning: Your password has expired, please change it now" 41 "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 @@
61#define SSH_SERVICE_NAME "ssh" 61#define SSH_SERVICE_NAME "ssh"
62 62
63#if defined(USE_PAM) && !defined(SSHD_PAM_SERVICE) 63#if defined(USE_PAM) && !defined(SSHD_PAM_SERVICE)
64# define SSHD_PAM_SERVICE "sshd" 64# define SSHD_PAM_SERVICE __progname
65#endif 65#endif
66 66
67/* 67/*