From 307e43bb5628e8b53a930c2928279af994281ba5 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 10 Mar 2006 20:49:20 +0000 Subject: r14173: change smb interface structures to always use a union smb_file, to abtract - const char *path fot qpathinfo and setpathinfo - uint16_t fnum for SMB - smb2_handle handle for SMB2 the idea is to later add a struct ntvfs_handle *ntvfs so that the ntvfs subsystem don't need to know the difference between SMB and SMB2 metze (This used to be commit 2ef3f5970901b5accdb50f0d0115b5d46b0c788f) --- source4/client/cifsddio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/client/cifsddio.c') diff --git a/source4/client/cifsddio.c b/source4/client/cifsddio.c index fee5540a5a..c66cb5eeee 100644 --- a/source4/client/cifsddio.c +++ b/source4/client/cifsddio.c @@ -169,7 +169,7 @@ BOOL smb_read_func(void * handle, smbh = IO_HANDLE_TO_SMB(handle); r.generic.level = RAW_READ_READX; - r.readx.in.fnum = smbh->fnum; + r.readx.file.fnum = smbh->fnum; r.readx.in.offset = smbh->offset; r.readx.in.mincnt = wanted; r.readx.in.maxcnt = wanted; @@ -207,7 +207,7 @@ BOOL smb_write_func(void * handle, smbh = IO_HANDLE_TO_SMB(handle); w.generic.level = RAW_WRITE_WRITEX; - w.writex.in.fnum = smbh->fnum; + w.writex.file.fnum = smbh->fnum; w.writex.in.offset = smbh->offset; w.writex.in.count = wanted; w.writex.in.data = buf; @@ -290,7 +290,7 @@ static int open_smb_file(struct smbcli_state * cli, return(-1); } - return(o.ntcreatex.out.fnum); + return(o.ntcreatex.file.fnum); } static struct dd_iohandle * open_smb_handle(const char * host, -- cgit