r14157: - pass a struct ntvfs_request to the ntvfs layer

  (for now we just do #define ntvfs_request smbsrv_request,
   but it's the first step...)
- rename ntvfs_openfile() -> ntvfs_open()
- fix the talloc hierachie in some places in the ntvfs_map_*() code

metze
(This used to be commit ed9ed1f48f602354810937c0b0de850b44322191)

1 files changed, 10 insertions, 10 deletions

diff --git a/source4/ntvfs/ipc/rap_server.c b/source4/ntvfs/ipc/rap_server.c
index 9fa831dd4f..a593999693 100644
--- a/source4/ntvfs/ipc/rap_server.c
+++ b/source4/ntvfs/ipc/rap_server.c
@@ -27,30 +27,30 @@
 /* At this moment these are just dummy functions, but you might get the
  * idea. */
 
-NTSTATUS rap_netshareenum(struct smbsrv_request *req,
+NTSTATUS rap_netshareenum(TALLOC_CTX *mem_ctx,
 			  struct rap_NetShareEnum *r)
 {
 	int i;
 	r->out.status = 0;
-	r->out.available = dcesrv_common_get_count_of_shares(req, NULL);
-	r->out.info = talloc_array(req,
-				     union rap_shareenum_info, r->out.available);
+	r->out.available = dcesrv_common_get_count_of_shares(mem_ctx, NULL);
+	r->out.info = talloc_array(mem_ctx,
+				   union rap_shareenum_info, r->out.available);
 
 	for (i=0;i<r->out.available;i++) {
 		strncpy(r->out.info[i].info1.name, 
-			dcesrv_common_get_share_name(req, NULL, i),
+			dcesrv_common_get_share_name(mem_ctx, NULL, i),
 			sizeof(r->out.info[0].info1.name));
 		r->out.info[i].info1.pad = 0;
-		r->out.info[i].info1.type = dcesrv_common_get_share_type(req, NULL, i);
-		r->out.info[i].info1.comment = talloc_strdup(req, 
-							     dcesrv_common_get_share_comment(req, NULL, i));
+		r->out.info[i].info1.type = dcesrv_common_get_share_type(mem_ctx, NULL, i);
+		r->out.info[i].info1.comment = talloc_strdup(mem_ctx, 
+							     dcesrv_common_get_share_comment(mem_ctx, NULL, i));
 	}
 	
 	return NT_STATUS_OK;
 }
 
-NTSTATUS rap_netserverenum2(struct smbsrv_request *req,
-				   struct rap_NetServerEnum2 *r)
+NTSTATUS rap_netserverenum2(TALLOC_CTX *mem_ctx,
+			    struct rap_NetServerEnum2 *r)
 {
 	r->out.status = 0;
 	r->out.available = 0;