r14256: - rename smb_file -> smb_handle

- move it into the in/out substructs again
- allow file.path only on smb_fileinfo/smb_setfileinfo

metze
(This used to be commit be6d5298a2cdb7e7c61d70471bad445645af5963)

1 files changed, 4 insertions, 4 deletions

diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c
index bac91ef134c..6700e2f2432 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.file.fnum = smb->fnum;
+	io->readx.in.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;
@@ -296,7 +296,7 @@ static NTSTATUS smb_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, B
 	}
 
 	io.generic.level = RAW_WRITE_WRITEX;
-	io.writex.file.fnum = smb->fnum;
+	io.writex.in.file.fnum = smb->fnum;
 	io.writex.in.offset = 0;
 	io.writex.in.wmode = PIPE_START_MESSAGE;
 	io.writex.in.remaining = blob->length;
@@ -335,7 +335,7 @@ static NTSTATUS smb_shutdown_pipe(struct dcerpc_connection *c)
 	if (!smb) return NT_STATUS_OK;
 
 	io.close.level = RAW_CLOSE_CLOSE;
-	io.close.file.fnum = smb->fnum;
+	io.close.in.file.fnum = smb->fnum;
 	io.close.in.write_time = 0;
 	req = smb_raw_close_send(smb->tree, &io);
 	if (req != NULL) {
@@ -479,7 +479,7 @@ static void pipe_open_recv(struct smbcli_request *req)
 		goto done;
 	}
 
-	smb->fnum	= state->open->ntcreatex.file.fnum;
+	smb->fnum	= state->open->ntcreatex.out.file.fnum;
 	smb->tree	= talloc_reference(smb, state->tree);
 	smb->server_name= strupper_talloc(
 		smb, state->tree->session->transport->called.name);