The branch, master has been updated
via 4774860 s3: smbd: Locking, fix off-by one calculation in
brl_pending_overlap().
via fbd418d make: Add gdbtestenv target.
via 6767d51 s3:winbindd - fix bad bugfix for bug #10280 - winbind panic
if AD server is down.
from 9fc9e48 smbd: Fix some typos
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 47748606dc903ab7b834eeaa337246764201af76
Author: Jeremy Allison <[email protected]>
Date: Tue Jul 1 13:30:50 2014 -0700
s3: smbd: Locking, fix off-by one calculation in brl_pending_overlap().
Consider:
lock = start=110,size=10
pend_lock = 100, size=10
Do not overlap. However,
(lock->start <= pend_lock->start + pend_lock->size)
110 100 10
is true, so it returns true (overlap).
lock->start <= pend_lock->start + pend_lock->size
should be:
lock->start < pend_lock->start + pend_lock->size
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10685
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Autobuild-User(master): Michael Adam <[email protected]>
Autobuild-Date(master): Wed Jul 2 10:18:17 CEST 2014 on sn-devel-104
commit fbd418d2f666c3e2af31d34667b63c03fdca6ca6
Author: Andreas Schneider <[email protected]>
Date: Tue Jul 1 15:05:21 2014 +0200
make: Add gdbtestenv target.
This starts the sever components in a xterm with gdb.
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
commit 6767d519c5c78aee2fdb3195530ec38cf2f08fb6
Author: Jeremy Allison <[email protected]>
Date: Tue Jul 1 20:27:11 2014 -0700
s3:winbindd - fix bad bugfix for bug #10280 - winbind panic if AD server is
down.
Previous bug fix reversed the sense of the test for out of memory.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10280
Signed-off-by: Jeremy Allison <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Makefile | 3 +++
source3/locking/brlock.c | 2 +-
source3/winbindd/winbindd_cache.c | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile b/Makefile
index 5f220fa..a53c27a 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,9 @@ subunit-test:
testenv:
$(WAF) test --testenv $(TEST_OPTIONS)
+gdbtestenv:
+ $(WAF) test --testenv --gdbtest $(TEST_OPTIONS)
+
quicktest:
$(WAF) test --quick $(TEST_OPTIONS)
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index e134aac..2ab7092 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -263,7 +263,7 @@ static bool brl_pending_overlap(const struct lock_struct
*lock, const struct loc
{
if ((lock->start <= pend_lock->start) && (lock->start + lock->size >
pend_lock->start))
return True;
- if ((lock->start >= pend_lock->start) && (lock->start <=
pend_lock->start + pend_lock->size))
+ if ((lock->start >= pend_lock->start) && (lock->start <
pend_lock->start + pend_lock->size))
return True;
return False;
}
diff --git a/source3/winbindd/winbindd_cache.c
b/source3/winbindd/winbindd_cache.c
index 51f3e04..dfad8f5 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -2129,14 +2129,14 @@ static NTSTATUS rids_to_names(struct winbindd_domain
*domain,
have_mapped = have_unmapped = false;
*names = talloc_array(mem_ctx, char *, num_rids);
- if (*names != NULL) {
+ if (*names == NULL) {
result = NT_STATUS_NO_MEMORY;
goto error;
}
*types = talloc_array(mem_ctx, enum lsa_SidType,
num_rids);
- if (*types != NULL) {
+ if (*types == NULL) {
result = NT_STATUS_NO_MEMORY;
goto error;
}
--
Samba Shared Repository
