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)

4 files changed, 12 insertions, 12 deletions

diff --git a/source4/torture/smb2/find.c b/source4/torture/smb2/find.c
index 07c3f865e2..2e1c9f8814 100644
--- a/source4/torture/smb2/find.c
+++ b/source4/torture/smb2/find.c
@@ -100,7 +100,7 @@ static BOOL torture_smb2_find_levels(struct smb2_tree *tree)
 	}
 
 	io.generic.level = RAW_FILEINFO_ALT_NAME_INFORMATION;
-	io.generic.in.handle = handle;
+	io.generic.file.handle = handle;
 	status = smb2_getinfo_file(tree, tree, &io);
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
@@ -108,7 +108,7 @@ static BOOL torture_smb2_find_levels(struct smb2_tree *tree)
 	alt_name = talloc_strdup(tree, io.alt_name_info.out.fname.s);	
 
 	io.generic.level = RAW_FILEINFO_SMB2_ALL_INFORMATION;
-	io.generic.in.handle = handle;
+	io.generic.file.handle = handle;
 	status = smb2_getinfo_file(tree, tree, &io);
 	if (!NT_STATUS_IS_OK(status)) {
 		return False;
diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c
index 2e3d2f2fac..450c51be76 100644
--- a/source4/torture/smb2/getinfo.c
+++ b/source4/torture/smb2/getinfo.c
@@ -99,23 +99,23 @@ static BOOL torture_smb2_fileinfo(struct smb2_tree *tree)
 
 	for (i=0;i<ARRAY_SIZE(file_levels);i++) {
 		if (file_levels[i].level == RAW_FILEINFO_SEC_DESC) {
-			file_levels[i].finfo.query_secdesc.secinfo_flags = 0x7;
-			file_levels[i].dinfo.query_secdesc.secinfo_flags = 0x7;
+			file_levels[i].finfo.query_secdesc.in.secinfo_flags = 0x7;
+			file_levels[i].dinfo.query_secdesc.in.secinfo_flags = 0x7;
 		}
 		if (file_levels[i].level == RAW_FILEINFO_SMB2_ALL_EAS) {
-			file_levels[i].finfo.all_eas.continue_flags = 
+			file_levels[i].finfo.all_eas.in.continue_flags = 
 				SMB2_CONTINUE_FLAG_RESTART;
-			file_levels[i].dinfo.all_eas.continue_flags = 
+			file_levels[i].dinfo.all_eas.in.continue_flags = 
 				SMB2_CONTINUE_FLAG_RESTART;
 		}
 		file_levels[i].finfo.generic.level = file_levels[i].level;
-		file_levels[i].finfo.generic.in.handle = hfile;
+		file_levels[i].finfo.generic.file.handle = hfile;
 		file_levels[i].fstatus = smb2_getinfo_file(tree, tree, &file_levels[i].finfo);
 		if (!NT_STATUS_IS_OK(file_levels[i].fstatus)) {
 			printf("%s failed on file - %s\n", file_levels[i].name, nt_errstr(file_levels[i].fstatus));
 		}
 		file_levels[i].dinfo.generic.level = file_levels[i].level;
-		file_levels[i].dinfo.generic.in.handle = hdir;
+		file_levels[i].dinfo.generic.file.handle = hdir;
 		file_levels[i].dstatus = smb2_getinfo_file(tree, tree, &file_levels[i].dinfo);
 		if (!NT_STATUS_IS_OK(file_levels[i].dstatus)) {
 			printf("%s failed on dir - %s\n", file_levels[i].name, nt_errstr(file_levels[i].dstatus));
diff --git a/source4/torture/smb2/setinfo.c b/source4/torture/smb2/setinfo.c
index 562493b047..bf8c8dad01 100644
--- a/source4/torture/smb2/setinfo.c
+++ b/source4/torture/smb2/setinfo.c
@@ -88,7 +88,7 @@ BOOL torture_smb2_setinfo(void)
 #define CHECK1(call) \
 	do { if (NT_STATUS_IS_OK(status)) { \
 		finfo2.generic.level = RAW_FILEINFO_ ## call; \
-		finfo2.generic.in.handle = handle; \
+		finfo2.generic.file.handle = handle; \
 		status2 = smb2_getinfo_file(tree, mem_ctx, &finfo2); \
 		if (!NT_STATUS_IS_OK(status2)) { \
 			printf("%s - %s\n", #call, nt_errstr(status2)); \
diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index 953ef448d9..9be9b07c5b 100644
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -159,7 +159,7 @@ static NTSTATUS smb2_create_complex(struct smb2_tree *tree, const char *fname,
 
 	/* make sure all the timestamps aren't the same */
 	fileinfo.generic.level = RAW_FILEINFO_BASIC_INFORMATION;
-	fileinfo.generic.in.handle = *handle;
+	fileinfo.generic.file.handle = *handle;
 
 	status = smb2_getinfo_file(tree, tree, &fileinfo);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -207,7 +207,7 @@ void torture_smb2_all_info(struct smb2_tree *tree, struct smb2_handle handle)
 	union smb_fileinfo io;
 
 	io.generic.level = RAW_FILEINFO_SMB2_ALL_INFORMATION;
-	io.generic.in.handle = handle;
+	io.generic.file.handle = handle;
 
 	status = smb2_getinfo_file(tree, tmp_ctx, &io);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -272,7 +272,7 @@ void torture_smb2_all_info(struct smb2_tree *tree, struct smb2_handle handle)
 	if (DEBUGLVL(1)) {
 		/* the security descriptor */
 		io.query_secdesc.level = RAW_FILEINFO_SEC_DESC;
-		io.query_secdesc.secinfo_flags = 
+		io.query_secdesc.in.secinfo_flags = 
 			SECINFO_OWNER|SECINFO_GROUP|
 			SECINFO_DACL;
 		status = smb2_getinfo_file(tree, tmp_ctx, &io);