[SCM] Samba Shared Repository - branch v3-6-test updated

[Volker Lendecke]

The branch, v3-6-test has been updated
       via  bf65a3a s3: Fix Coverity ID 1137: CONSTANT_EXPRESSION_RESULT
       via  02ae791 s3: Fix Coverity ID 1136: CONSTANT_EXPRESSION_RESULT (cherry picked from commit d9b03cb4f0906bc7844c4abffcb3c9d8b04dc5eb)
      from  7b3ff54 s3-ctdb_wrap: remove unused variable from db_ctdb_fetch_persistent().

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit bf65a3a582a740c187b668068cb1d5cba3573a08
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Apr 1 08:40:38 2011 +0200

    s3: Fix Coverity ID 1137: CONSTANT_EXPRESSION_RESULT
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Fri Apr  1 09:35:19 CEST 2011 on sn-devel-104
    (cherry picked from commit 1272758f8f989647802ea90722661ab133efa83f)

commit 02ae7915ee3bbba8291588ce9ebced396c93a5c0
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Apr 1 08:40:38 2011 +0200

    s3: Fix Coverity ID 1136: CONSTANT_EXPRESSION_RESULT
    (cherry picked from commit d9b03cb4f0906bc7844c4abffcb3c9d8b04dc5eb)

-----------------------------------------------------------------------

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 243c46a..0a59b8c 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -244,7 +244,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;
 }
@@ -790,7 +790,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