diff options
author | Jeremy Allison <jra@samba.org> | 2001-01-08 20:37:48 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2001-01-08 20:37:48 +0000 |
commit | 3a50ad16c5b51d0d812e50cfb65ff43a5786d131 (patch) | |
tree | 444489de7c547a2009316359f12e418ec5c39d6c /source/tdb/tdb.c | |
parent | 4afc02447d4de9aaa329e4ec59d36f91716835c0 (diff) | |
download | samba-3a50ad16c5b51d0d812e50cfb65ff43a5786d131.tar.gz samba-3a50ad16c5b51d0d812e50cfb65ff43a5786d131.tar.xz samba-3a50ad16c5b51d0d812e50cfb65ff43a5786d131.zip |
Big merge to sync up appliance-head and 2.2.
Jeremy.
Diffstat (limited to 'source/tdb/tdb.c')
-rw-r--r-- | source/tdb/tdb.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/tdb/tdb.c b/source/tdb/tdb.c index afc87b7da07..474d0c7adb3 100644 --- a/source/tdb/tdb.c +++ b/source/tdb/tdb.c @@ -850,9 +850,14 @@ int tdb_traverse(TDB_CONTEXT *tdb, tdb_traverse_func fn, void *state) { TDB_DATA key, dbuf; struct list_struct rec; - struct tdb_traverse_lock tl = { tdb->travlocks.next, 0, 0 }; + struct tdb_traverse_lock tl = { NULL, 0, 0 }; int ret, count = 0; + /* This was in the initializaton, above, but the IRIX compiler + * did not like it. crh + */ + tl.next = tdb->travlocks.next; + /* fcntl locks don't stack: beware traverse inside traverse */ tdb->travlocks.next = &tl; |