[SCM] Samba Shared Repository - branch v3-5-test updated
Karolin Seeger
kseeger at samba.org
Mon Apr 4 12:56:26 MDT 2011
The branch, v3-5-test has been updated
via 5fc7b78 s3: Fix Coverity ID 1137: CONSTANT_EXPRESSION_RESULT
via ec4d201 s3: Fix Coverity ID 1136: CONSTANT_EXPRESSION_RESULT
from baecb5a s3: Fix Bug 8047 -- Fix mdns registration if "interfaces=" is used
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 5fc7b78c64c43fd345b96dcbc1d30f2cabfaef81
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
This patch and the last one address bug #8054 - winbindd cache stores/retrieves
wrong sizes for 16-bit ints.
commit ec4d201d5b9b86dfead5d999e4f186316797f77f
Author: Volker Lendecke <vl at 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 a85f123..afd0a15 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -736,7 +736,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 81970d4..64a4a1c 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;
}
@@ -757,7 +757,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
More information about the samba-cvs
mailing list