r2751: this is a new ntvfs design which tries to solve:

- the stacking of modules
- finding the modules private data
- hide the ntvfs details from the calling layer
- I set NTVFS_INTERFACE_VERSION 0 till we are closer to release
  (because we need to solve some async problems with the module stacking)

metze
(This used to be commit 3ff03b5cb21bb79afdd3b1609be9635f6688a539)

1 files changed, 7 insertions, 5 deletions

diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c
index b6b7171487..2ac12b1918 100644
--- a/source4/ntvfs/simple/svfs_util.c
+++ b/source4/ntvfs/simple/svfs_util.c
@@ -29,9 +29,10 @@
 /*
   convert a windows path to a unix path - don't do any manging or case sensitive handling
 */
-char *svfs_unix_path(struct smbsrv_request *req, const char *name)
+char *svfs_unix_path(struct ntvfs_module_context *ntvfs,
+		     struct smbsrv_request *req, const char *name)
 {
-	NTVFS_GET_PRIVATE(svfs_private, private, req);
+	struct svfs_private *private = ntvfs->private_data;
 	char *ret;
 
 	if (*name != '\\') {
@@ -135,14 +136,15 @@ struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct smbsrv_request *req,
   returned names are separate unix and DOS names. The returned names
   are relative to the directory
 */
-struct svfs_dir *svfs_list(TALLOC_CTX *mem_ctx, struct smbsrv_request *req, const char *pattern)
+struct svfs_dir *svfs_list(struct ntvfs_module_context *ntvfs, struct smbsrv_request *req, const char *pattern)
 {
+	struct svfs_private *private = ntvfs->private_data;
 	char *unix_path;
 
-	unix_path = svfs_unix_path(req, pattern);
+	unix_path = svfs_unix_path(ntvfs, req, pattern);
 	if (!unix_path) { return NULL; }
 
-	return svfs_list_unix(mem_ctx, req, unix_path);
+	return svfs_list_unix(private, req, unix_path);
 }