The branch, master has been updated
via f0bebcc ldb_tdb: Remove unnecessary call to tdb_get_seqnum
from e0b147f s3: vfs_fruit. Change check_ms_nfs() to remove the virtual
ACE's generated by fruit_fget_nt_acl().
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f0bebcc4e046ee668c83030c432f99586a17207c
Author: Garming Sam <garm...@catalyst.net.nz>
Date: Wed Mar 7 13:27:20 2018 +1300
ldb_tdb: Remove unnecessary call to tdb_get_seqnum
Signed-off-by: Garming Sam <garm...@catalyst.net.nz>
Reviewed-by: Andreas Schneider <a...@samba.org>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Thu Mar 8 14:14:37 CET 2018 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/ldb_tdb/ldb_tdb.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/ldb_tdb/ldb_tdb.c b/lib/ldb/ldb_tdb/ldb_tdb.c
index 4f1c241..9c8c771 100644
--- a/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -1799,11 +1799,12 @@ static const char * ltdb_tdb_name(struct ltdb_private
*ltdb)
static bool ltdb_tdb_changed(struct ltdb_private *ltdb)
{
- bool ret = (tdb_get_seqnum(ltdb->tdb) != ltdb->tdb_seqnum);
+ int seq = tdb_get_seqnum(ltdb->tdb);
+ bool has_changed = (seq != ltdb->tdb_seqnum);
- ltdb->tdb_seqnum = tdb_get_seqnum(ltdb->tdb);
+ ltdb->tdb_seqnum = seq;
- return ret;
+ return has_changed;
}
static const struct kv_db_ops key_value_ops = {
--
Samba Shared Repository
