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

3 files changed, 10 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index d37f894f..f859f08a 100644
--- 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
@@ -5155,4 +5156,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4453 2006/08/05 02:40:11 djm Exp $
+$Id: ChangeLog,v 1.4454 2006/08/05 02:43:32 djm Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 6ce9db12..a67eaa30 100644
--- 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 7b0a302a..bcd4fc39 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.134 2006/07/24 04:51:01 djm Exp $ */
+/* $Id: defines.h,v 1.135 2006/08/05 02:43:33 djm Exp $ */
 
 
 /* Constants */
@@ -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