Author: metze Date: 2006-08-14 09:52:58 +0000 (Mon, 14 Aug 2006) New Revision: 17532
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17532 Log: 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 Modified: branches/SAMBA_4_0/source/lib/tdb/common/traverse.c Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/common/traverse.c =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/common/traverse.c 2006-08-14 07:40:18 UTC (rev 17531) +++ branches/SAMBA_4_0/source/lib/tdb/common/traverse.c 2006-08-14 09:52:58 UTC (rev 17532) @@ -261,6 +261,7 @@ 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;
