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

3 files changed, 14 insertions, 14 deletions

diff --git a/source/libcli/smb_composite/appendacl.c b/source/libcli/smb_composite/appendacl.c
index 0a5b56b90d7..b09acfaf637 100644
--- a/source/libcli/smb_composite/appendacl.c
+++ b/source/libcli/smb_composite/appendacl.c
@@ -37,8 +37,8 @@ static NTSTATUS appendacl_open(struct composite_context *c,
 	NT_STATUS_HAVE_NO_MEMORY(state->io_fileinfo);
 	
 	state->io_fileinfo->query_secdesc.level = RAW_FILEINFO_SEC_DESC;
-	state->io_fileinfo->query_secdesc.in.fnum = state->io_open->ntcreatex.out.fnum;
-	state->io_fileinfo->query_secdesc.secinfo_flags = SECINFO_DACL;
+	state->io_fileinfo->query_secdesc.file.fnum = state->io_open->ntcreatex.file.fnum;
+	state->io_fileinfo->query_secdesc.in.secinfo_flags = SECINFO_DACL;
 
 	state->req = smb_raw_fileinfo_send(tree, state->io_fileinfo);
 	NT_STATUS_HAVE_NO_MEMORY(state->req);
@@ -69,7 +69,7 @@ static NTSTATUS appendacl_get(struct composite_context *c,
 	NT_STATUS_HAVE_NO_MEMORY(state->io_setfileinfo);
 	
 	state->io_setfileinfo->set_secdesc.level            = RAW_SFILEINFO_SEC_DESC;
-	state->io_setfileinfo->set_secdesc.file.fnum        = state->io_fileinfo->query_secdesc.in.fnum;
+	state->io_setfileinfo->set_secdesc.file.fnum        = state->io_fileinfo->query_secdesc.file.fnum;
 	
 	state->io_setfileinfo->set_secdesc.in.secinfo_flags = SECINFO_DACL;
 	state->io_setfileinfo->set_secdesc.in.sd            = state->io_fileinfo->query_secdesc.out.sd;
@@ -115,8 +115,8 @@ static NTSTATUS appendacl_set(struct composite_context *c,
 	
 
 	state->io_fileinfo->query_secdesc.level = RAW_FILEINFO_SEC_DESC;
-	state->io_fileinfo->query_secdesc.in.fnum = state->io_setfileinfo->set_secdesc.file.fnum;
-	state->io_fileinfo->query_secdesc.secinfo_flags = SECINFO_DACL;
+	state->io_fileinfo->query_secdesc.file.fnum = state->io_setfileinfo->set_secdesc.file.fnum;
+	state->io_fileinfo->query_secdesc.in.secinfo_flags = SECINFO_DACL;
 
 	state->req = smb_raw_fileinfo_send(tree, state->io_fileinfo);
 	NT_STATUS_HAVE_NO_MEMORY(state->req);
@@ -150,7 +150,7 @@ static NTSTATUS appendacl_getagain(struct composite_context *c,
 	NT_STATUS_HAVE_NO_MEMORY(io_close);
 	
 	io_close->close.level = RAW_CLOSE_CLOSE;
-	io_close->close.in.fnum = state->io_fileinfo->query_secdesc.in.fnum;
+	io_close->close.file.fnum = state->io_fileinfo->query_secdesc.file.fnum;
 	io_close->close.in.write_time = 0;
 
 	state->req = smb_raw_close_send(tree, io_close);
diff --git a/source/libcli/smb_composite/loadfile.c b/source/libcli/smb_composite/loadfile.c
index 2551b6da9e6..9a593c07266 100644
--- a/source/libcli/smb_composite/loadfile.c
+++ b/source/libcli/smb_composite/loadfile.c
@@ -54,7 +54,7 @@ static NTSTATUS setup_close(struct composite_context *c,
 	NT_STATUS_HAVE_NO_MEMORY(io_close);
 	
 	io_close->close.level = RAW_CLOSE_CLOSE;
-	io_close->close.in.fnum = fnum;
+	io_close->close.file.fnum = fnum;
 	io_close->close.in.write_time = 0;
 
 	state->req = smb_raw_close_send(tree, io_close);
@@ -93,7 +93,7 @@ static NTSTATUS loadfile_open(struct composite_context *c,
 	NT_STATUS_HAVE_NO_MEMORY(io->out.data);
 
 	if (io->out.size == 0) {
-		return setup_close(c, tree, state->io_open->ntcreatex.out.fnum);
+		return setup_close(c, tree, state->io_open->ntcreatex.file.fnum);
 	}
 
 	/* setup for the read */
@@ -101,7 +101,7 @@ static NTSTATUS loadfile_open(struct composite_context *c,
 	NT_STATUS_HAVE_NO_MEMORY(state->io_read);
 	
 	state->io_read->readx.level        = RAW_READ_READX;
-	state->io_read->readx.in.fnum      = state->io_open->ntcreatex.out.fnum;
+	state->io_read->readx.file.fnum    = state->io_open->ntcreatex.file.fnum;
 	state->io_read->readx.in.offset    = 0;
 	state->io_read->readx.in.mincnt    = MIN(32768, io->out.size);
 	state->io_read->readx.in.maxcnt    = state->io_read->readx.in.mincnt;
@@ -139,7 +139,7 @@ static NTSTATUS loadfile_read(struct composite_context *c,
 	/* we might be done */
 	if (state->io_read->readx.in.offset +
 	    state->io_read->readx.out.nread == io->out.size) {
-		return setup_close(c, tree, state->io_read->readx.in.fnum);
+		return setup_close(c, tree, state->io_read->readx.file.fnum);
 	}
 
 	/* setup for the next read */
diff --git a/source/libcli/smb_composite/savefile.c b/source/libcli/smb_composite/savefile.c
index 9600af97d2e..89a2d26c0c1 100644
--- a/source/libcli/smb_composite/savefile.c
+++ b/source/libcli/smb_composite/savefile.c
@@ -55,7 +55,7 @@ static NTSTATUS setup_close(struct composite_context *c,
 	NT_STATUS_HAVE_NO_MEMORY(io_close);
 	
 	io_close->close.level = RAW_CLOSE_CLOSE;
-	io_close->close.in.fnum = fnum;
+	io_close->close.file.fnum = fnum;
 	io_close->close.in.write_time = 0;
 
 	state->req = smb_raw_close_send(tree, io_close);
@@ -86,7 +86,7 @@ static NTSTATUS savefile_open(struct composite_context *c,
 	NT_STATUS_NOT_OK_RETURN(status);
 	
 	if (io->in.size == 0) {
-		return setup_close(c, tree, state->io_open->ntcreatex.out.fnum);
+		return setup_close(c, tree, state->io_open->ntcreatex.file.fnum);
 	}
 
 	/* setup for the first write */
@@ -94,7 +94,7 @@ static NTSTATUS savefile_open(struct composite_context *c,
 	NT_STATUS_HAVE_NO_MEMORY(io_write);
 	
 	io_write->writex.level        = RAW_WRITE_WRITEX;
-	io_write->writex.in.fnum      = state->io_open->ntcreatex.out.fnum;
+	io_write->writex.file.fnum    = state->io_open->ntcreatex.file.fnum;
 	io_write->writex.in.offset    = 0;
 	io_write->writex.in.wmode     = 0;
 	io_write->writex.in.remaining = 0;
@@ -135,7 +135,7 @@ static NTSTATUS savefile_write(struct composite_context *c,
 	/* we might be done */
 	if (state->io_write->writex.out.nwritten != state->io_write->writex.in.count ||
 	    state->total_written == io->in.size) {
-		return setup_close(c, tree, state->io_write->writex.in.fnum);
+		return setup_close(c, tree, state->io_write->writex.file.fnum);
 	}
 
 	/* setup for the next write */