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)

1 files changed, 4 insertions, 4 deletions

diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c
index c0716a1af8..cf82f1daed 100644
--- a/source4/librpc/rpc/dcerpc_smb.c
+++ b/source4/librpc/rpc/dcerpc_smb.c
@@ -152,7 +152,7 @@ static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLO
 
 	io = state->io;
 	io->generic.level = RAW_READ_READX;
-	io->readx.in.fnum = smb->fnum;
+	io->readx.file.fnum = smb->fnum;
 	io->readx.in.mincnt = state->data.length - state->received;
 	io->readx.in.maxcnt = io->readx.in.mincnt;
 	io->readx.in.offset = 0;
@@ -295,7 +295,7 @@ static NTSTATUS smb_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, B
 	}
 
 	io.generic.level = RAW_WRITE_WRITEX;
-	io.writex.in.fnum = smb->fnum;
+	io.writex.file.fnum = smb->fnum;
 	io.writex.in.offset = 0;
 	io.writex.in.wmode = PIPE_START_MESSAGE;
 	io.writex.in.remaining = blob->length;
@@ -334,7 +334,7 @@ static NTSTATUS smb_shutdown_pipe(struct dcerpc_connection *c)
 	if (!smb) return NT_STATUS_OK;
 
 	io.close.level = RAW_CLOSE_CLOSE;
-	io.close.in.fnum = smb->fnum;
+	io.close.file.fnum = smb->fnum;
 	io.close.in.write_time = 0;
 	req = smb_raw_close_send(smb->tree, &io);
 	if (req != NULL) {
@@ -478,7 +478,7 @@ static void pipe_open_recv(struct smbcli_request *req)
 		goto done;
 	}
 
-	smb->fnum	= state->open->ntcreatex.out.fnum;
+	smb->fnum	= state->open->ntcreatex.file.fnum;
 	smb->tree	= talloc_reference(smb, state->tree);
 	smb->server_name= strupper_talloc(
 		smb, state->tree->session->transport->called.name);