svn commit: samba r13129 - in branches/SAMBA_4_0/source/ntvfs: cifs ipc nbench simple unixuid

[metze at samba.org]

Author: metze
Date: 2006-01-25 12:19:49 +0000 (Wed, 25 Jan 2006)
New Revision: 13129

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

Log:
fix the memory hierachie

metze
Modified:
   branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
   branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c
   branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c
   branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c
   branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c	2006-01-25 12:19:13 UTC (rev 13128)
+++ branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c	2006-01-25 12:19:49 UTC (rev 13129)
@@ -93,7 +93,7 @@
 
 	machine_account = lp_parm_bool(req->tcon->service, "cifs", "use_machine_account", False);
 
-	private = talloc(req->tcon, struct cvfs_private);
+	private = talloc(ntvfs, struct cvfs_private);
 	if (!private) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -178,6 +178,7 @@
 	struct cvfs_private *private = ntvfs->private_data;
 
 	talloc_free(private);
+	ntvfs->private_data = NULL;
 
 	return NT_STATUS_OK;
 }

Modified: branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c	2006-01-25 12:19:13 UTC (rev 13128)
+++ branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c	2006-01-25 12:19:49 UTC (rev 13129)
@@ -87,7 +87,7 @@
 	NT_STATUS_HAVE_NO_MEMORY(tcon->dev_type);
 
 	/* prepare the private state for this connection */
-	private = talloc(tcon, struct ipc_private);
+	private = talloc(ntvfs, struct ipc_private);
 	NT_STATUS_HAVE_NO_MEMORY(private);
 
 	ntvfs->private_data = private;

Modified: branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c	2006-01-25 12:19:13 UTC (rev 13128)
+++ branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c	2006-01-25 12:19:49 UTC (rev 13129)
@@ -99,7 +99,7 @@
 	NTSTATUS status;
 	char *logname = NULL;
 
-	nprivates = talloc(req->tcon, struct nbench_private);
+	nprivates = talloc(ntvfs, struct nbench_private);
 	if (!nprivates) {
 		return NT_STATUS_NO_MEMORY;
 	}

Modified: branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c	2006-01-25 12:19:13 UTC (rev 13128)
+++ branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c	2006-01-25 12:19:49 UTC (rev 13129)
@@ -54,10 +54,10 @@
 	struct smbsrv_tcon *tcon = req->tcon;
 	struct svfs_private *private;
 
-	private = talloc(tcon, struct svfs_private);
+	private = talloc(ntvfs, struct svfs_private);
 
 	private->next_search_handle = 0;
-	private->connectpath = talloc_strdup(tcon, lp_pathname(tcon->service));
+	private->connectpath = talloc_strdup(private, lp_pathname(tcon->service));
 	private->open_files = NULL;
 	private->search = NULL;
 

Modified: branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c	2006-01-25 12:19:13 UTC (rev 13128)
+++ branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c	2006-01-25 12:19:49 UTC (rev 13129)
@@ -207,7 +207,7 @@
 	struct unixuid_private *private;
 	NTSTATUS status;
 
-	private = talloc(req->tcon, struct unixuid_private);
+	private = talloc(ntvfs, struct unixuid_private);
 	if (!private) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -239,6 +239,7 @@
 	NTSTATUS status;
 
 	talloc_free(private);
+	ntvfs->private_data = NULL;
 
 	status = ntvfs_next_disconnect(ntvfs, tcon);