[SCM] Samba Shared Repository - branch master updated
Ralph Böhme
slow at samba.org
Mon Aug 8 15:35:03 UTC 2016
The branch, master has been updated
via a0e60e9 samba-tool/ldapcmp: ignore differences of whenChanged
via 7147859 smbd: ignore ctdb tombstone records in fetch_share_mode_unlocked_parser()
from 464b386 ctdb-packaging: Stop RPM from renaming working config to ctdb.rpmsave
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a0e60e96aa38407ded8d63650dcf8f39304c958a
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Aug 8 12:53:26 2016 +0200
samba-tool/ldapcmp: ignore differences of whenChanged
This is implicitly replicated, but may diverge on updates of non-replicated
attributes.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12129
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Autobuild-User(master): Ralph Böhme <slow at samba.org>
Autobuild-Date(master): Mon Aug 8 17:34:24 CEST 2016 on sn-devel-144
commit 7147859c7afc1344e76485e2cbc286679110d96e
Author: Ralph Boehme <slow at samba.org>
Date: Wed Jul 20 12:36:24 2016 +0200
smbd: ignore ctdb tombstone records in fetch_share_mode_unlocked_parser()
dbwrap_parse_record() can return ctdb tombstone records from the lctdb,
ignore them.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12005
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
python/samba/netcmd/ldapcmp.py | 2 +-
source3/locking/share_mode_lock.c | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py
index 96b94f2..cb02de2 100644
--- a/python/samba/netcmd/ldapcmp.py
+++ b/python/samba/netcmd/ldapcmp.py
@@ -438,7 +438,7 @@ class LDAPObject(object):
"uSNChanged",
"uSNCreated",
"uSNLastObjRem",
- # "whenChanged", # This is implicitly replicated
+ "whenChanged", # This is implicitly replicated, but may diverge on updates of non-replicated attributes
]
self.ignore_attributes = self.non_replicated_attributes
self.ignore_attributes += ["msExchServer1HighestUSN"]
diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index b5a63f8..f738323 100644
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -628,6 +628,12 @@ static void fetch_share_mode_unlocked_parser(
struct share_mode_lock *lck = talloc_get_type_abort(
private_data, struct share_mode_lock);
+ if (data.dsize == 0) {
+ /* Likely a ctdb tombstone record, ignore it */
+ lck->data = NULL;
+ return;
+ }
+
lck->data = parse_share_modes(lck, key, data);
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list