- (stevesk) [auth-pam.[ch] ssh.h] move SSHD_PAM_SERVICE to auth-pam.h

diff --git a/ChangeLog b/ChangeLog
index 737e5b67da50346c542f6c9a8713375f0cf6346f..0fabd7a5008a8e0ce6dea44e3db71990df10a1cf 100644 (file)
--- 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 708d0ae9a903d89329ce8eca15479daafc9a9134..e6bd851ceb554d1aa0756b62706e6a58171e3042 100644 (file)
--- 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 18f810289403d3df2fca45d04bfffd8df66f5f74..966c719b25953445148a578e15196b6c58e43191 100644 (file)
--- 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 07eee78b6eacd307841c742c5c0a9fc5e4faca29..0a6ad1317b96398744d08c2a7755d2c3d0eb3f00 100644 (file)
--- 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.