summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-17 11:37:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:58 -0500
commit53891ed37e32a97380430e6911878f3b94133e01 (patch)
treea50cdbcc809f3182e34a5b948326cf0c20e8e59e /source4/ntvfs
parent6591a226144d371a6b68fc5e7201a90a77dc9153 (diff)
downloadsamba-53891ed37e32a97380430e6911878f3b94133e01.tar.gz
samba-53891ed37e32a97380430e6911878f3b94133e01.tar.bz2
samba-53891ed37e32a97380430e6911878f3b94133e01.zip
r3017: nicer memory handling for event_context_merge()
(This used to be commit 1cef44505e5de9b8ae5206522b624082ad2343b2)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/cifs/vfs_cifs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 65a7c7a206..7c4a1d79d6 100644
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -138,7 +138,6 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs,
private->transport = private->tree->session->transport;
private->tree->session->pid = SVAL(req->in.hdr, HDR_PID);
private->tcon = req->tcon;
- /*private->ops = ntvfs_backend_byname("cifs", NTVFS_DISK);*/
tcon->fs_type = talloc_strdup(tcon, "NTFS");
tcon->dev_type = talloc_strdup(tcon, "A:");
@@ -151,7 +150,8 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs,
private->transport->event.fde->private = private;
private->transport->event.ctx = event_context_merge(tcon->smb_conn->connection->event.ctx,
- private->transport->event.ctx);
+ private->transport->event.ctx);
+ talloc_reference(private, private->transport->event.ctx);
return NT_STATUS_OK;
}