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/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c
index 92d31b30ef..b50a330093 100644
--- a/source4/libcli/raw/rawfileinfo.c
+++ b/source4/libcli/raw/rawfileinfo.c
@@ -536,7 +536,7 @@ static struct smbcli_request *smb_raw_getattr_send(struct smbcli_tree *tree,
 	req = smbcli_request_setup(tree, SMBgetatr, 0, 0);
 	if (!req) return NULL;
 
-	smbcli_req_append_ascii4(req, parms->getattr.in.fname, STR_TERMINATE);
+	smbcli_req_append_ascii4(req, parms->getattr.file.path, STR_TERMINATE);
 	
 	if (!smbcli_request_send(req)) {
 		smbcli_request_destroy(req);
@@ -579,7 +579,7 @@ static struct smbcli_request *smb_raw_getattrE_send(struct smbcli_tree *tree,
 	req = smbcli_request_setup(tree, SMBgetattrE, 1, 0);
 	if (!req) return NULL;
 	
-	SSVAL(req->out.vwv, VWV(0), parms->getattre.in.fnum);
+	SSVAL(req->out.vwv, VWV(0), parms->getattre.file.fnum);
 	if (!smbcli_request_send(req)) {
 		smbcli_request_destroy(req);
 		return NULL;
@@ -647,7 +647,7 @@ struct smbcli_request *smb_raw_fileinfo_send(struct smbcli_tree *tree,
 	}
 
 	req = smb_raw_fileinfo_blob_send(tree, 
-					 parms->generic.in.fnum,
+					 parms->generic.file.fnum,
 					 parms->generic.level, data);
 
 	data_blob_free(&data);
@@ -722,7 +722,7 @@ struct smbcli_request *smb_raw_pathinfo_send(struct smbcli_tree *tree,
 		}
 	}
 
-	req = smb_raw_pathinfo_blob_send(tree, parms->generic.in.fname,
+	req = smb_raw_pathinfo_blob_send(tree, parms->generic.file.path,
 					 parms->generic.level, data);
 	data_blob_free(&data);