diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | auth-pam.c | 3 | ||||
-rw-r--r-- | auth-pam.h | 6 | ||||
-rw-r--r-- | ssh.h | 4 |
4 files changed, 8 insertions, 8 deletions
@@ -7,6 +7,7 @@ warning on pam_conv struct conversation function. - (stevesk) [auth-pam.h] license - (stevesk) [auth-pam.h] unneeded include + - (stevesk) [auth-pam.[ch] ssh.h] move SSHD_PAM_SERVICE to auth-pam.h 20020720 - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng(). @@ -1407,4 +1408,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2385 2002/07/21 23:20:07 stevesk Exp $ +$Id: ChangeLog,v 1.2386 2002/07/21 23:59:40 stevesk Exp $ @@ -25,7 +25,6 @@ #include "includes.h" #ifdef USE_PAM -#include "ssh.h" #include "xmalloc.h" #include "log.h" #include "auth.h" @@ -39,7 +38,7 @@ extern char *__progname; extern int use_privsep; -RCSID("$Id: auth-pam.c,v 1.50 2002/07/21 22:49:47 stevesk Exp $"); +RCSID("$Id: auth-pam.c,v 1.51 2002/07/21 23:59:39 stevesk Exp $"); #define NEW_AUTHTOK_MSG \ "Warning: Your password has expired, please change it now." @@ -1,4 +1,4 @@ -/* $Id: auth-pam.h,v 1.14 2002/07/21 23:20:07 stevesk Exp $ */ +/* $Id: auth-pam.h,v 1.15 2002/07/21 23:59:39 stevesk Exp $ */ /* * Copyright (c) 2000 Damien Miller. All rights reserved. @@ -27,6 +27,10 @@ #include "includes.h" #ifdef USE_PAM +#if !defined(SSHD_PAM_SERVICE) +# define SSHD_PAM_SERVICE __progname +#endif + void start_pam(const char *user); void finish_pam(void); int auth_pam_password(Authctxt *authctxt, const char *password); @@ -60,10 +60,6 @@ */ #define SSH_SERVICE_NAME "ssh" -#if defined(USE_PAM) && !defined(SSHD_PAM_SERVICE) -# define SSHD_PAM_SERVICE __progname -#endif - /* * Name of the environment variable containing the process ID of the * authentication agent. |