svn commit: samba r15505 - in branches/SAMBA_4_0/source/libcli/raw: .

metze at samba.org metze at samba.org
Sun May 7 20:53:45 GMT 2006


Author: metze
Date: 2006-05-07 20:53:45 +0000 (Sun, 07 May 2006)
New Revision: 15505

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15505

Log:
- 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
Modified:
   branches/SAMBA_4_0/source/libcli/raw/interfaces.h


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/interfaces.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/interfaces.h	2006-05-07 19:55:14 UTC (rev 15504)
+++ branches/SAMBA_4_0/source/libcli/raw/interfaces.h	2006-05-07 20:53:45 UTC (rev 15505)
@@ -52,6 +52,8 @@
 	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 @@
 	 * 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 {
 	/*
-	 * 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 @@
 	 * 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 @@
 		struct {
 			int32_t offset;
 		} out;
-	} lseek;
+	} lseek, generic;
 };
 
 /* struct used in unlink() call */
@@ -1681,7 +1687,7 @@
 		struct {
 			union smb_handle file;
 		} in;
-	} flush;
+	} flush, generic;
 };
 
 



More information about the samba-cvs mailing list