svn commit: samba r24121 - in branches/SAMBA_3_2_0/source/locking: .

[metze at samba.org]

Author: metze
Date: 2007-08-02 08:56:10 +0000 (Thu, 02 Aug 2007)
New Revision: 24121

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24121

Log:
merge from SAMBA_3_2:
use locking_key() instead of forming the TDB_DATA key
by hand

metze
Modified:
   branches/SAMBA_3_2_0/source/locking/locking.c


Changeset:
Modified: branches/SAMBA_3_2_0/source/locking/locking.c
===================================================================
--- branches/SAMBA_3_2_0/source/locking/locking.c	2007-08-02 08:53:24 UTC (rev 24120)
+++ branches/SAMBA_3_2_0/source/locking/locking.c	2007-08-02 08:56:10 UTC (rev 24121)
@@ -782,11 +782,8 @@
 					    const char *fname)
 {
 	struct share_mode_lock *lck;
-	TDB_DATA key;
+	TDB_DATA key = locking_key(id);
 
-	key.dptr = (unsigned char *)&id;
-	key.dsize = sizeof(id);
-
 	if (!(lck = TALLOC_P(mem_ctx, struct share_mode_lock))) {
 		DEBUG(0, ("talloc failed\n"));
 		return NULL;