r15505: - add 'generic' alias to smb_seek and smb_flush

- add struct ntvfs_handle pointer to smb_file, this will
  later be used by the ntvfs backends

metze
(This used to be commit 8322fc70adbb951ad72b97dfcc91467c1d906afe)

1 files changed, 14 insertions, 8 deletions

diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 88daf304cf..f715c10e11 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -52,6 +52,8 @@ struct smb2_handle {
 	uint64_t data[2];
 };
 
+struct ntvfs_handle;
+
 /*
  * a generic container for file handles or file pathes
  * for qfileinfo/setfileinfo and qpathinfo/setpathinfo
@@ -72,6 +74,11 @@ union smb_handle_or_path {
 	 * this is used as file handle in SMB2
 	 */
 	struct smb2_handle handle;
+
+	/*
+	 * this is used as generic file handle for the NTVFS layer
+	 */
+	struct ntvfs_handle *ntvfs;
 };
 
 /*
@@ -79,12 +86,6 @@ union smb_handle_or_path {
 */
 union smb_handle {
 	/*
-	 * this is used for
-	 * the qpathinfo and setpathinfo
-	 * calls
-	 */
-	const char *path;
-	/*
 	 * this is used as file handle in SMB
 	 */
 	uint16_t fnum;
@@ -93,6 +94,11 @@ union smb_handle {
 	 * this is used as file handle in SMB2
 	 */
 	struct smb2_handle handle;
+
+	/*
+	 * this is used as generic file handle for the NTVFS layer
+	 */
+	struct ntvfs_handle *ntvfs;
 };
 
 /*
@@ -111,7 +117,7 @@ union smb_seek {
 		struct {
 			int32_t offset;
 		} out;
-	} lseek;
+	} lseek, generic;
 };
 
 /* struct used in unlink() call */
@@ -1681,7 +1687,7 @@ union smb_flush {
 		struct {
 			union smb_handle file;
 		} in;
-	} flush;
+	} flush, generic;
 };