From e9b2c23d61c055b10ba4377eccfbdfdede51221a Mon Sep 17 00:00:00 2001
From: stevesk <stevesk>
Date: Sun, 21 Jul 2002 23:59:39 +0000
Subject: [PATCH]  - (stevesk) [auth-pam.[ch] ssh.h] move SSHD_PAM_SERVICE to
 auth-pam.h

---
 ChangeLog  | 1 +
 auth-pam.c | 1 -
 auth-pam.h | 4 ++++
 ssh.h      | 4 ----
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 737e5b67..0fabd7a5 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().
diff --git a/auth-pam.c b/auth-pam.c
index 708d0ae9..e6bd851c 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"
diff --git a/auth-pam.h b/auth-pam.h
index 18f81028..966c719b 100644
--- a/auth-pam.h
+++ b/auth-pam.h
@@ -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 07eee78b..0a6ad131 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.
-- 
2.45.2