summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-08-14 09:52:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:15:34 -0500
commit999015bfbec2b9a066a3f2068ae747e2ee393d56 (patch)
treeffb53dd200c22cef5a0728e2fcbcd2d8e608ef4c
parent8131b6414cf28d0936ce1646435638be7cc623fe (diff)
downloadsamba-999015bfbec2b9a066a3f2068ae747e2ee393d56.tar.gz
samba-999015bfbec2b9a066a3f2068ae747e2ee393d56.tar.bz2
samba-999015bfbec2b9a066a3f2068ae747e2ee393d56.zip
r17532: merge from SAMBA_3_0 Revision: 17460
First step at fixing the build breakage with the groupmapping test. On Linux, F_RDLCK is defined to 0, for example NetBSD has it at 1. Still does not work fully though. Still investigating. metze (This used to be commit af08e56442367b5d803f61b8554d85e2fe0ce7e9)
-rw-r--r--source4/lib/tdb/common/traverse.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/lib/tdb/common/traverse.c b/source4/lib/tdb/common/traverse.c
index 90c92042ad..6f6510c38a 100644
--- a/source4/lib/tdb/common/traverse.c
+++ b/source4/lib/tdb/common/traverse.c
@@ -261,6 +261,7 @@ TDB_DATA tdb_firstkey(struct tdb_context *tdb)
if (tdb_unlock_record(tdb, tdb->travlocks.off) != 0)
return tdb_null;
tdb->travlocks.off = tdb->travlocks.hash = 0;
+ tdb->travlocks.lock_rw = F_RDLCK;
if (tdb_next_lock(tdb, &tdb->travlocks, &rec) <= 0)
return tdb_null;