Author: jerry Date: 2007-01-25 02:24:56 +0000 (Thu, 25 Jan 2007) New Revision: 21013
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21013 Log: * 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) Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c 2007-01-25 01:56:34 UTC (rev 21012) +++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c 2007-01-25 02:24:56 UTC (rev 21013) @@ -73,7 +73,7 @@ } #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 @@ 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 @@ 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 @@ _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 @@ goto out; } - lctrl = ctrl; + lctrl = ctrl & ~WINBIND_TRY_FIRST_PASS_ARG; if (on(WINBIND_USE_AUTHTOK_ARG, lctrl)) { lctrl |= WINBIND_USE_FIRST_PASS_ARG;
