The branch, master has been updated via 1272758 s3: Fix Coverity ID 1137: CONSTANT_EXPRESSION_RESULT via d9b03cb s3: Fix Coverity ID 1136: CONSTANT_EXPRESSION_RESULT from 644222a debug: Restore the s3-style check in check_log_size()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 1272758f8f989647802ea90722661ab133efa83f Author: Volker Lendecke <v...@samba.org> Date: Fri Apr 1 08:40:38 2011 +0200 s3: Fix Coverity ID 1137: CONSTANT_EXPRESSION_RESULT Autobuild-User: Volker Lendecke <vlen...@samba.org> Autobuild-Date: Fri Apr 1 09:35:19 CEST 2011 on sn-devel-104 commit d9b03cb4f0906bc7844c4abffcb3c9d8b04dc5eb Author: Volker Lendecke <v...@samba.org> Date: Fri Apr 1 08:40:38 2011 +0200 s3: Fix Coverity ID 1136: CONSTANT_EXPRESSION_RESULT ----------------------------------------------------------------------- Summary of changes: source3/utils/ntlm_auth.c | 2 +- source3/winbindd/winbindd_cache.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index a6c5be8..73f41a7 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -772,7 +772,7 @@ static NTSTATUS do_ccache_ntlm_auth(DATA_BLOB initial_msg, DATA_BLOB challenge_m */ ctrl = get_pam_winbind_config(); - if (ctrl | WINBIND_KRB5_AUTH) { + if (ctrl & WINBIND_KRB5_AUTH) { wb_request.flags |= WBFLAG_PAM_CONTACT_TRUSTDOM; } diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index 57a93a7..68a8625 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -246,7 +246,7 @@ static uint16 centry_uint16(struct cache_entry *centry) if (!centry_check_bytes(centry, 2)) { smb_panic_fn("centry_uint16"); } - ret = CVAL(centry->data, centry->ofs); + ret = SVAL(centry->data, centry->ofs); centry->ofs += 2; return ret; } @@ -792,7 +792,7 @@ static void centry_put_uint32(struct cache_entry *centry, uint32 v) static void centry_put_uint16(struct cache_entry *centry, uint16 v) { centry_expand(centry, 2); - SIVAL(centry->data, centry->ofs, v); + SSVAL(centry->data, centry->ofs, v); centry->ofs += 2; } -- Samba Shared Repository