4 files changed, 8 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index ae78d0a96..cfe70b218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 $
diff --git a/auth-pam.c b/auth-pam.c
index 48d5afa0f..79af58a0b 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -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."
diff --git a/auth-pam.h b/auth-pam.h
index 8cb7389e1..215e75282 100644
--- a/auth-pam.h
+++ b/auth-pam.h
@@ -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);
diff --git a/ssh.h b/ssh.h
index 07eee78b6..0a6ad1317 100644
--- a/ssh.h
+++ b/ssh.h
@@ -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.