svn commit: samba r23236 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd

[vlendec at samba.org]

Author: vlendec
Date: 2007-05-30 07:02:40 +0000 (Wed, 30 May 2007)
New Revision: 23236

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

Log:
Another bad merge: Correctly free and unlock the session record in
session_claim. Jerry, this fixes the hanging smbstatus.

Sorry for that,

Volker

Modified:
   branches/SAMBA_3_0/source/smbd/session.c
   branches/SAMBA_3_0_26/source/smbd/session.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/session.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/session.c	2007-05-30 01:09:18 UTC (rev 23235)
+++ branches/SAMBA_3_0/source/smbd/session.c	2007-05-30 07:02:40 UTC (rev 23236)
@@ -192,10 +192,11 @@
 
 	status = rec->store(rec, data, TDB_REPLACE);
 
+	TALLOC_FREE(rec);
+
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1,("session_claim: unable to create session id "
 			 "record: %s\n", nt_errstr(status)));
-		TALLOC_FREE(rec);
 		return False;
 	}
 

Modified: branches/SAMBA_3_0_26/source/smbd/session.c
===================================================================
--- branches/SAMBA_3_0_26/source/smbd/session.c	2007-05-30 01:09:18 UTC (rev 23235)
+++ branches/SAMBA_3_0_26/source/smbd/session.c	2007-05-30 07:02:40 UTC (rev 23236)
@@ -192,10 +192,11 @@
 
 	status = rec->store(rec, data, TDB_REPLACE);
 
+	TALLOC_FREE(rec);
+
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1,("session_claim: unable to create session id "
 			 "record: %s\n", nt_errstr(status)));
-		TALLOC_FREE(rec);
 		return False;
 	}