summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/cifs/vfs_cifs.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 078075a11f..c9073b04cf 100644
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -163,10 +163,8 @@ static NTSTATUS cvfs_connect(struct smbsrv_request *req, const char *sharename)
private->transport->event.fde->handler = cifs_socket_handler;
private->transport->event.fde->private = private;
- event_context_merge(tcon->smb_conn->connection->event.ctx,
- private->transport->event.ctx);
-
- private->transport->event.ctx = tcon->smb_conn->connection->event.ctx;
+ private->transport->event.ctx = event_context_merge(tcon->smb_conn->connection->event.ctx,
+ private->transport->event.ctx);
return NT_STATUS_OK;
}