diff options
| author | Gerald Carter <jerry@samba.org> | 2007-01-25 02:24:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:17:27 -0500 |
| commit | 45aa381a7702779106bdb55b8cef1a371eb726c8 (patch) | |
| tree | c3bfcc123655d03d828e92fef882c6a092a299a4 /source3/nsswitch | |
| parent | 7e8a068a5edd6676353e80535660d803fc5bdfe4 (diff) | |
| download | samba-45aa381a7702779106bdb55b8cef1a371eb726c8.tar.gz samba-45aa381a7702779106bdb55b8cef1a371eb726c8.tar.bz2 samba-45aa381a7702779106bdb55b8cef1a371eb726c8.zip | |
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)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/pam_winbind.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; |