From 781bbbc5dbe056f8fd9af6072a0eb30c7d073ef0 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Thu, 17 Nov 2005 08:48:46 +0000 Subject: [PATCH] Relevant BUGIDs: 604380 Purpose of commit: bugfix Commit summary: --------------- Fix compatibility with Solaris if compiled on Solaris: 2005-11-17 Thorsten Kukuk * libpam/include/security/_pam_compat.h: Fix wrong #ifdef nesting. Redefine PAM_CHANGE_EXPIRED_AUTHTOK [#604380] --- ChangeLog | 7 ++- libpam/include/security/_pam_compat.h | 65 ++++++++++++++------------- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3f5b643..12ff7f8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-11-17 Thorsten Kukuk + + * libpam/include/security/_pam_compat.h: Fix wrong #ifdef nesting. + Redefine PAM_CHANGE_EXPIRED_AUTHTOK [#604380] + 2005-11-09 Tomas Mraz * modules/pam_access/pam_access.c (pam_sm_acct_mgmt): Parse correctly @@ -11,7 +16,7 @@ * libpam_misc/misc_conv.c (read_string): Read only up to EOL if stdin is not terminal. - + 2005-11-07 Thorsten Kukuk * modules/pam_unix/pam_unix_passwd.c (_unix_verify_shadow): Use diff --git a/libpam/include/security/_pam_compat.h b/libpam/include/security/_pam_compat.h index a5f77e7a..1bfec42c 100644 --- a/libpam/include/security/_pam_compat.h +++ b/libpam/include/security/_pam_compat.h @@ -15,105 +15,106 @@ /* Solaris uses different constants. We redefine to those here */ #if defined(solaris) || (defined(__SVR4) && defined(sun)) -#ifndef _SECURITY__PAM_TYPES_H - # ifdef _SECURITY_PAM_MODULES_H /* flags for pam_chauthtok() */ # undef PAM_PRELIM_CHECK -# define PAM_PRELIM_CHECK 0x1 +# define PAM_PRELIM_CHECK 0x1 # undef PAM_UPDATE_AUTHTOK -# define PAM_UPDATE_AUTHTOK 0x2 +# define PAM_UPDATE_AUTHTOK 0x2 # endif /* _SECURITY_PAM_MODULES_H */ -#else /* _SECURITY__PAM_TYPES_H */ +# ifdef _SECURITY__PAM_TYPES_H /* generic for pam_* functions */ # undef PAM_SILENT -# define PAM_SILENT 0x80000000 +# define PAM_SILENT 0x80000000 + +# undef PAM_CHANGE_EXPIRED_AUTHTOK +# define PAM_CHANGE_EXPIRED_AUTHTOK 0x4 /* flags for pam_setcred() */ # undef PAM_ESTABLISH_CRED -# define PAM_ESTABLISH_CRED 0x1 +# define PAM_ESTABLISH_CRED 0x1 # undef PAM_DELETE_CRED -# define PAM_DELETE_CRED 0x2 +# define PAM_DELETE_CRED 0x2 # undef PAM_REINITIALIZE_CRED -# define PAM_REINITIALIZE_CRED 0x4 +# define PAM_REINITIALIZE_CRED 0x4 # undef PAM_REFRESH_CRED -# define PAM_REFRESH_CRED 0x8 +# define PAM_REFRESH_CRED 0x8 /* another binary incompatibility comes from the return codes! */ # undef PAM_CONV_ERR -# define PAM_CONV_ERR 6 +# define PAM_CONV_ERR 6 # undef PAM_PERM_DENIED -# define PAM_PERM_DENIED 7 +# define PAM_PERM_DENIED 7 # undef PAM_MAXTRIES -# define PAM_MAXTRIES 8 +# define PAM_MAXTRIES 8 # undef PAM_AUTH_ERR -# define PAM_AUTH_ERR 9 +# define PAM_AUTH_ERR 9 # undef PAM_NEW_AUTHTOK_REQD -# define PAM_NEW_AUTHTOK_REQD 10 +# define PAM_NEW_AUTHTOK_REQD 10 # undef PAM_CRED_INSUFFICIENT -# define PAM_CRED_INSUFFICIENT 11 +# define PAM_CRED_INSUFFICIENT 11 # undef PAM_AUTHINFO_UNAVAIL -# define PAM_AUTHINFO_UNAVAIL 12 +# define PAM_AUTHINFO_UNAVAIL 12 # undef PAM_USER_UNKNOWN -# define PAM_USER_UNKNOWN 13 +# define PAM_USER_UNKNOWN 13 # undef PAM_CRED_UNAVAIL -# define PAM_CRED_UNAVAIL 14 +# define PAM_CRED_UNAVAIL 14 # undef PAM_CRED_EXPIRED -# define PAM_CRED_EXPIRED 15 +# define PAM_CRED_EXPIRED 15 # undef PAM_CRED_ERR -# define PAM_CRED_ERR 16 +# define PAM_CRED_ERR 16 # undef PAM_ACCT_EXPIRED -# define PAM_ACCT_EXPIRED 17 +# define PAM_ACCT_EXPIRED 17 # undef PAM_AUTHTOK_EXPIRED -# define PAM_AUTHTOK_EXPIRED 18 +# define PAM_AUTHTOK_EXPIRED 18 # undef PAM_SESSION_ERR -# define PAM_SESSION_ERR 19 +# define PAM_SESSION_ERR 19 # undef PAM_AUTHTOK_ERR -# define PAM_AUTHTOK_ERR 20 +# define PAM_AUTHTOK_ERR 20 # undef PAM_AUTHTOK_RECOVERY_ERR -# define PAM_AUTHTOK_RECOVERY_ERR 21 +# define PAM_AUTHTOK_RECOVERY_ERR 21 # undef PAM_AUTHTOK_LOCK_BUSY -# define PAM_AUTHTOK_LOCK_BUSY 22 +# define PAM_AUTHTOK_LOCK_BUSY 22 # undef PAM_AUTHTOK_DISABLE_AGING -# define PAM_AUTHTOK_DISABLE_AGING 23 +# define PAM_AUTHTOK_DISABLE_AGING 23 # undef PAM_NO_MODULE_DATA -# define PAM_NO_MODULE_DATA 24 +# define PAM_NO_MODULE_DATA 24 # undef PAM_IGNORE -# define PAM_IGNORE 25 +# define PAM_IGNORE 25 # undef PAM_ABORT -# define PAM_ABORT 26 +# define PAM_ABORT 26 # undef PAM_TRY_AGAIN -# define PAM_TRY_AGAIN 27 +# define PAM_TRY_AGAIN 27 #endif /* _SECURITY__PAM_TYPES_H */ -- 2.40.0