Author: jra Date: 2007-04-11 05:27:00 +0000 (Wed, 11 Apr 2007) New Revision: 22164
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22164 Log: Fix missing lock count release in transaction cancel. Found by Taj Khattra <[EMAIL PROTECTED]>. Jeremy. Modified: branches/SAMBA_3_0/source/tdb/common/transaction.c branches/SAMBA_3_0_25/source/tdb/common/transaction.c Changeset: Modified: branches/SAMBA_3_0/source/tdb/common/transaction.c =================================================================== --- branches/SAMBA_3_0/source/tdb/common/transaction.c 2007-04-11 05:05:33 UTC (rev 22163) +++ branches/SAMBA_3_0/source/tdb/common/transaction.c 2007-04-11 05:27:00 UTC (rev 22164) @@ -523,6 +523,8 @@ F_UNLCK,F_SETLKW, 0, 1); } tdb->num_locks = 0; + tdb->num_lockrecs = 0; + SAFE_FREE(tdb->lockrecs); } /* restore the normal io methods */ Modified: branches/SAMBA_3_0_25/source/tdb/common/transaction.c =================================================================== --- branches/SAMBA_3_0_25/source/tdb/common/transaction.c 2007-04-11 05:05:33 UTC (rev 22163) +++ branches/SAMBA_3_0_25/source/tdb/common/transaction.c 2007-04-11 05:27:00 UTC (rev 22164) @@ -526,6 +526,8 @@ F_UNLCK,F_SETLKW, 0, 1); } tdb->num_locks = 0; + tdb->num_lockrecs = 0; + SAFE_FREE(tdb->lockrecs); } /* restore the normal io methods */