summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-05-07 20:53:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:43 -0500
commitc3958aa23112ba7ad1663e798d5226d1167639fe (patch)
treeabdb895c128c377d6c0d946482dbb45ae722ed04
parent7f0a396e3b4f02aea24d6e6d8d6123c5aa737248 (diff)
downloadsamba-c3958aa23112ba7ad1663e798d5226d1167639fe.tar.gz
samba-c3958aa23112ba7ad1663e798d5226d1167639fe.tar.bz2
samba-c3958aa23112ba7ad1663e798d5226d1167639fe.zip
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)
-rw-r--r--source4/libcli/raw/interfaces.h22
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;
};