From d3087451c4ec25171ba956fe2cd4e1d0f64f7edc Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 16 Mar 2006 18:54:19 +0000 Subject: r14487: split smbsrv_request into two parts, one will be moved to ntvfs_request but I don't to get the commit to large, to I'll do this tomorrow... metze (This used to be commit 10e627032d7d04f1ebf6efed248c426614f5aa6f) --- source4/ntvfs/cifs/vfs_cifs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/ntvfs/cifs/vfs_cifs.c') diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c index 806585f8e9..ee831de665 100644 --- a/source4/ntvfs/cifs/vfs_cifs.c +++ b/source4/ntvfs/cifs/vfs_cifs.c @@ -53,7 +53,7 @@ struct async_info { void *parms; }; -#define SETUP_PID private->tree->session->pid = SVAL(req->in.hdr, HDR_PID) +#define SETUP_PID private->tree->session->pid = req->smbpid /* a handler for oplock break events from the server - these need to be passed @@ -136,9 +136,9 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs, if (!NT_STATUS_IS_OK(status)) { return status; } - } else if (req->session->session_info->credentials) { + } else if (req->session_info->credentials) { DEBUG(5, ("CIFS backend: Using delegated credentials\n")); - credentials = req->session->session_info->credentials; + credentials = req->session_info->credentials; } else { DEBUG(1,("CIFS backend: You must supply server, user and password and or have delegated credentials\n")); return NT_STATUS_INVALID_PARAMETER; @@ -698,11 +698,11 @@ static NTSTATUS cvfs_cancel(struct ntvfs_module_context *ntvfs, struct ntvfs_request *req) { struct cvfs_private *private = ntvfs->private_data; + struct async_info *a; /* find the matching request */ - struct async_info *a; for (a=private->pending;a;a=a->next) { - if (SVAL(a->req->in.hdr, HDR_MID) == SVAL(req->in.hdr, HDR_MID)) { + if (a->req->smbmid == req->smbmid) { break; } } -- cgit