From 45aa381a7702779106bdb55b8cef1a371eb726c8 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 25 Jan 2007 02:24:56 +0000 Subject: r21013: * Remove "inline" keyword * Remove anpther check for PAM_SILENT that prevents logging to syslog * Add missing check for TRY_FIRST_PASS when using authtok (missed from previous merge) (This used to be commit ed794f0872b749955f56112507fd3ae7a6c6e6f5) --- source3/nsswitch/pam_winbind.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/nsswitch/pam_winbind.c') diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c index 593adfe2f2..cc135ce76b 100644 --- a/source3/nsswitch/pam_winbind.c +++ b/source3/nsswitch/pam_winbind.c @@ -73,7 +73,7 @@ static void _pam_log_int(const pam_handle_t *pamh, int err, const char *format, } #endif /* HAVE_PAM_VSYSLOG */ -static inline int _pam_log_is_silent(int ctrl) +static int _pam_log_is_silent(int ctrl) { return (ctrl & WINBIND_SILENT) ? 1 : 0; } @@ -91,7 +91,7 @@ static void _pam_log(const pam_handle_t *pamh, int ctrl, int err, const char *fo va_end(args); } -static inline int _pam_log_is_debug_enabled(int ctrl) +static int _pam_log_is_debug_enabled(int ctrl) { if (ctrl == -1) { return 0; @@ -108,7 +108,7 @@ static inline int _pam_log_is_debug_enabled(int ctrl) return 1; } -static inline int _pam_log_is_debug_state_enabled(int ctrl) +static int _pam_log_is_debug_state_enabled(int ctrl) { if (!(ctrl & WINBIND_DEBUG_STATE)) { return 0; @@ -1406,7 +1406,7 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags, _PAM_LOG_FUNCTION_ENTER("pam_sm_setcred", pamh, ctrl, flags); - switch (flags & ~PAM_SILENT) { + switch (flag) { case PAM_DELETE_CRED: ret = pam_sm_close_session(pamh, flags, argc, argv); @@ -1794,7 +1794,7 @@ int pam_sm_chauthtok(pam_handle_t * pamh, int flags, goto out; } - lctrl = ctrl; + lctrl = ctrl & ~WINBIND_TRY_FIRST_PASS_ARG; if (on(WINBIND_USE_AUTHTOK_ARG, lctrl)) { lctrl |= WINBIND_USE_FIRST_PASS_ARG; -- cgit