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, 9 insertions, 9 deletions

diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index 29521980bef..d67825925b6 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -93,7 +93,7 @@ BOOL torture_raw_sfileinfo(void)
 		ret = False; \
 	} \
 	finfo1.generic.level = RAW_FILEINFO_ALL_INFO; \
-	finfo1.generic.in.fnum = fnum; \
+	finfo1.generic.file.fnum = fnum; \
 	status2 = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo1); \
 	if (!NT_STATUS_IS_OK(status2)) { \
 		printf("(%s) %s pathinfo - %s\n", __location__, #call, nt_errstr(status)); \
@@ -104,10 +104,10 @@ BOOL torture_raw_sfileinfo(void)
 	check_fnum = False; \
 	call_name = #call; \
 	sfinfo.generic.level = RAW_SFILEINFO_ ## call; \
-	sfinfo.generic.file.fname = path_fname; \
+	sfinfo.generic.file.path = path_fname; \
 	status = smb_raw_setpathinfo(cli->tree, &sfinfo); \
 	if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { \
-		sfinfo.generic.file.fname = path_fname_new; \
+		sfinfo.generic.file.path = path_fname_new; \
 		status = smb_raw_setpathinfo(cli->tree, &sfinfo); \
 	} \
 	if (!NT_STATUS_EQUAL(status, rightstatus)) { \
@@ -116,10 +116,10 @@ BOOL torture_raw_sfileinfo(void)
 		ret = False; \
 	} \
 	finfo1.generic.level = RAW_FILEINFO_ALL_INFO; \
-	finfo1.generic.in.fname = path_fname; \
+	finfo1.generic.file.path = path_fname; \
 	status2 = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo1); \
 	if (NT_STATUS_EQUAL(status2, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { \
-		finfo1.generic.in.fname = path_fname_new; \
+		finfo1.generic.file.path = path_fname_new; \
 		status2 = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo1); \
 	} \
 	if (!NT_STATUS_IS_OK(status2)) { \
@@ -131,13 +131,13 @@ BOOL torture_raw_sfileinfo(void)
 	do { if (NT_STATUS_IS_OK(status)) { \
 		finfo2.generic.level = RAW_FILEINFO_ ## call; \
 		if (check_fnum) { \
-			finfo2.generic.in.fnum = fnum; \
+			finfo2.generic.file.fnum = fnum; \
 			status2 = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo2); \
 		} else { \
-			finfo2.generic.in.fname = path_fname; \
+			finfo2.generic.file.path = path_fname; \
 			status2 = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo2); \
 			if (NT_STATUS_EQUAL(status2, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { \
-				finfo2.generic.in.fname = path_fname_new; \
+				finfo2.generic.file.path = path_fname_new; \
 				status2 = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo2); \
 			} \
 		} \
@@ -556,7 +556,7 @@ BOOL torture_raw_sfileinfo_bug(void)
 	smbcli_close(cli->tree, fnum);
 
 	sfinfo.generic.level = RAW_SFILEINFO_STANDARD;
-	sfinfo.generic.file.fname = fname;
+	sfinfo.generic.file.path = fname;
 
 	sfinfo.standard.in.create_time = 0;
 	sfinfo.standard.in.access_time = 0;