diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | auth-pam.c | 7 | ||||
-rw-r--r-- | defines.h | 15 |
3 files changed, 10 insertions, 15 deletions
@@ -85,6 +85,7 @@ | |||
85 | - stevesk@cvs.openbsd.org 2006/08/04 20:46:05 | 85 | - stevesk@cvs.openbsd.org 2006/08/04 20:46:05 |
86 | [monitor.c session.c ssh-agent.c] | 86 | [monitor.c session.c ssh-agent.c] |
87 | spaces | 87 | spaces |
88 | - (djm) [auth-pam.c defines.h] Move PAM related bits to auth-pam.c | ||
88 | 89 | ||
89 | 20060804 | 90 | 20060804 |
90 | - (dtucker) [configure.ac] The "crippled AES" test does not work on recent | 91 | - (dtucker) [configure.ac] The "crippled AES" test does not work on recent |
@@ -5155,4 +5156,4 @@ | |||
5155 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 5156 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
5156 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 5157 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
5157 | 5158 | ||
5158 | $Id: ChangeLog,v 1.4453 2006/08/05 02:40:11 djm Exp $ | 5159 | $Id: ChangeLog,v 1.4454 2006/08/05 02:43:32 djm Exp $ |
diff --git a/auth-pam.c b/auth-pam.c index 6ce9db12b..a67eaa309 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -71,6 +71,13 @@ | |||
71 | # define sshpam_const const /* LinuxPAM, OpenPAM */ | 71 | # define sshpam_const const /* LinuxPAM, OpenPAM */ |
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | /* Ambiguity in spec: is it an array of pointers or a pointer to an array? */ | ||
75 | #ifdef PAM_SUN_CODEBASE | ||
76 | # define PAM_MSG_MEMBER(msg, n, member) ((*(msg))[(n)].member) | ||
77 | #else | ||
78 | # define PAM_MSG_MEMBER(msg, n, member) ((msg)[(n)]->member) | ||
79 | #endif | ||
80 | |||
74 | #include "auth.h" | 81 | #include "auth.h" |
75 | #include "auth-pam.h" | 82 | #include "auth-pam.h" |
76 | #include "buffer.h" | 83 | #include "buffer.h" |
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _DEFINES_H | 25 | #ifndef _DEFINES_H |
26 | #define _DEFINES_H | 26 | #define _DEFINES_H |
27 | 27 | ||
28 | /* $Id: defines.h,v 1.134 2006/07/24 04:51:01 djm Exp $ */ | 28 | /* $Id: defines.h,v 1.135 2006/08/05 02:43:33 djm Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -528,19 +528,6 @@ struct winsize { | |||
528 | # define optarg BSDoptarg | 528 | # define optarg BSDoptarg |
529 | #endif | 529 | #endif |
530 | 530 | ||
531 | /* In older versions of libpam, pam_strerror takes a single argument */ | ||
532 | #ifdef HAVE_OLD_PAM | ||
533 | # define PAM_STRERROR(a,b) pam_strerror((b)) | ||
534 | #else | ||
535 | # define PAM_STRERROR(a,b) pam_strerror((a),(b)) | ||
536 | #endif | ||
537 | |||
538 | #ifdef PAM_SUN_CODEBASE | ||
539 | # define PAM_MSG_MEMBER(msg, n, member) ((*(msg))[(n)].member) | ||
540 | #else | ||
541 | # define PAM_MSG_MEMBER(msg, n, member) ((msg)[(n)]->member) | ||
542 | #endif | ||
543 | |||
544 | #if defined(BROKEN_GETADDRINFO) && defined(HAVE_GETADDRINFO) | 531 | #if defined(BROKEN_GETADDRINFO) && defined(HAVE_GETADDRINFO) |
545 | # undef HAVE_GETADDRINFO | 532 | # undef HAVE_GETADDRINFO |
546 | #endif | 533 | #endif |