- (djm) [auth-pam.c defines.h] Move PAM related bits to auth-pam.c

diff --git a/ChangeLog b/ChangeLog
index 8298507a5686b749f4c43ed899cf6d53daa9ecdd..ad2eadb6fa5cf4df0da59fdc039797b5b9fdea92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -85,6 +85,7 @@
    - stevesk@cvs.openbsd.org 2006/08/04 20:46:05
      [monitor.c session.c ssh-agent.c]
      spaces
+ - (djm) [auth-pam.c defines.h] Move PAM related bits to auth-pam.c
 
 20060804
  - (dtucker) [configure.ac] The "crippled AES" test does not work on recent

diff --git a/auth-pam.c b/auth-pam.c
index 6ce9db12b2fa9e774b295a3c9f460d2006365711..a67eaa309dc4daeb88a4034bfd926b32b649f329 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -71,6 +71,13 @@
 # define sshpam_const  const   /* LinuxPAM, OpenPAM */
 #endif
 
+/* Ambiguity in spec: is it an array of pointers or a pointer to an array? */
+#ifdef PAM_SUN_CODEBASE
+# define PAM_MSG_MEMBER(msg, n, member) ((*(msg))[(n)].member)
+#else
+# define PAM_MSG_MEMBER(msg, n, member) ((msg)[(n)]->member)
+#endif
+
 #include "auth.h"
 #include "auth-pam.h"
 #include "buffer.h"

diff --git a/defines.h b/defines.h
index 4c949746b5d62d70556ba91f6eea7ba663d46f4d..d2e5dab667bb66871755cb553fdda9313be7e35c 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -528,19 +528,6 @@ struct winsize {
 # define optarg             BSDoptarg
 #endif
 
-/* In older versions of libpam, pam_strerror takes a single argument */
-#ifdef HAVE_OLD_PAM
-# define PAM_STRERROR(a,b) pam_strerror((b))
-#else
-# define PAM_STRERROR(a,b) pam_strerror((a),(b))
-#endif
-
-#ifdef PAM_SUN_CODEBASE
-# define PAM_MSG_MEMBER(msg, n, member) ((*(msg))[(n)].member)
-#else
-# define PAM_MSG_MEMBER(msg, n, member) ((msg)[(n)]->member)
-#endif
-
 #if defined(BROKEN_GETADDRINFO) && defined(HAVE_GETADDRINFO)
 # undef HAVE_GETADDRINFO
 #endif