diff options
Diffstat (limited to 'nsswitch')
| -rw-r--r-- | nsswitch/pam_winbind.h | 9 | ||||
| -rw-r--r-- | nsswitch/winbind_nss_linux.c | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/nsswitch/pam_winbind.h b/nsswitch/pam_winbind.h index c6b2c5e726..d21fc04a78 100644 --- a/nsswitch/pam_winbind.h +++ b/nsswitch/pam_winbind.h @@ -27,7 +27,14 @@ #include <libintl.h> #endif -#ifndef LINUX +#if defined(LINUX) + +/* newer versions of PAM have this in _pam_compat.h */ +#ifndef PAM_AUTHTOK_RECOVERY_ERR +#define PAM_AUTHTOK_RECOVERY_ERR PAM_AUTHTOK_RECOVER_ERR +#endif + +#else /* !LINUX */ /* Solaris always uses dynamic pam modules */ #define PAM_EXTERN extern diff --git a/nsswitch/winbind_nss_linux.c b/nsswitch/winbind_nss_linux.c index 2b51a8e15d..4a7943278e 100644 --- a/nsswitch/winbind_nss_linux.c +++ b/nsswitch/winbind_nss_linux.c @@ -105,8 +105,8 @@ static bool next_token_alloc(const char **ptr, char **pp_buff, const char *sep) { - char *s; - char *saved_s; + const char *s; + const char *saved_s; char *pbuf; bool quoted; size_t len=1; @@ -116,7 +116,7 @@ static bool next_token_alloc(const char **ptr, return(false); } - s = (char *)*ptr; + s = *ptr; /* default to simple separators */ if (!sep) { |