svn commit: samba r13792 - in branches/SAMBA_3_0/source/tdb: .
jra at samba.org
jra at samba.org
Thu Mar 2 18:34:11 GMT 2006
Author: jra
Date: 2006-03-02 18:34:10 +0000 (Thu, 02 Mar 2006)
New Revision: 13792
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13792
Log:
Merged Simo's fixes for tdbtraverse.
Jeremy.
Modified:
branches/SAMBA_3_0/source/tdb/tdb.c
Changeset:
Modified: branches/SAMBA_3_0/source/tdb/tdb.c
===================================================================
--- branches/SAMBA_3_0/source/tdb/tdb.c 2006-03-02 18:33:43 UTC (rev 13791)
+++ branches/SAMBA_3_0/source/tdb/tdb.c 2006-03-02 18:34:10 UTC (rev 13792)
@@ -1397,6 +1397,7 @@
/* Drop chain lock, call out */
if (tdb_unlock(tdb, tl.hash, F_WRLCK) != 0) {
ret = -1;
+ SAFE_FREE(key.dptr);
goto out;
}
if (fn && fn(tdb, key, dbuf, private_val)) {
@@ -1406,9 +1407,8 @@
TDB_LOG((tdb, 0, "tdb_traverse: unlock_record failed!\n"));;
ret = -1;
}
- tdb->travlocks.next = tl.next;
SAFE_FREE(key.dptr);
- return count;
+ goto out;
}
SAFE_FREE(key.dptr);
}
More information about the samba-cvs
mailing list