summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-03-08 07:13:11 +0000
committerAndrew Tridgell <tridge@samba.org>2004-03-08 07:13:11 +0000
commitab615698ad385b3ec9c8bde9100dde9f8e5a7b20 (patch)
tree994799038daa232add8e676285a2a3d5f0169af7 /source4/ntvfs
parent14591dc0eaa8751e8eb982d4157862e8ab8f2841 (diff)
downloadsamba-ab615698ad385b3ec9c8bde9100dde9f8e5a7b20.tar.gz
samba-ab615698ad385b3ec9c8bde9100dde9f8e5a7b20.tar.bz2
samba-ab615698ad385b3ec9c8bde9100dde9f8e5a7b20.zip
in the async socket handling routines in the cifs backend don't assume
that conn->ntvfs_private is set correctly, instead use our copy of the private pointer in the fde callback. This allows the cifs backend to be used on conjunction with a NTVFS filter module. (This used to be commit 8047b806e78815706bca81a77d04d5874ffd7d6e)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/cifs/vfs_cifs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 878dbf2357..966a670677 100644
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -73,8 +73,8 @@ static BOOL oplock_handler(struct cli_transport *transport, uint16 tid, uint16 f
*/
static void cifs_socket_handler(struct event_context *ev, struct fd_event *fde, time_t t, uint16 flags)
{
- struct tcon_context *conn = fde->private;
- struct cvfs_private *private = conn->ntvfs_private;
+ struct cvfs_private *private = fde->private;
+ struct tcon_context *conn = private->conn;
DEBUG(5,("cifs_socket_handler event on fd %d\n", fde->fd));
@@ -160,7 +160,7 @@ static NTSTATUS cvfs_connect(struct request_context *req, const char *sharename)
on our SMB connection to the server */
fde.fd = private->transport->socket->fd;
fde.flags = EVENT_FD_READ;
- fde.private = req->conn;
+ fde.private = private;
fde.handler = cifs_socket_handler;
event_add_fd(conn->smb->events, &fde);