Revert "pvfs: Use the tevent_context from the ntvfs_context"

This reverts commit 15700a9f6e5393cecf78052f510e015300c5bd85.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index 657e10306322112094748fa39916f4f6934ef865..3ef66e1a12a793dcc5543dde0e272d5556069b9c 100644 (file)
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -169,7 +169,7 @@ static NTSTATUS pvfs_default_acl(struct pvfs_state *pvfs,
        ids[1].xid.type = ID_TYPE_GID;
        ids[1].sid = NULL;
 
-       status = wbc_xids_to_sids(pvfs->ntvfs->ctx->event_ctx, ids, 2);
+       status = wbc_xids_to_sids(pvfs->wbc_ctx->event_ctx, ids, 2);
        NT_STATUS_NOT_OK_RETURN(status);
 
        sd->owner_sid = talloc_steal(sd, ids[0].sid);
@@ -313,7 +313,7 @@ NTSTATUS pvfs_acl_set(struct pvfs_state *pvfs,
                }
                if (!dom_sid_equal(sd->owner_sid, new_sd->owner_sid)) {
                        ids->sid = new_sd->owner_sid;
-                       status = wbc_sids_to_xids(pvfs->ntvfs->ctx->event_ctx,
+                       status = wbc_sids_to_xids(pvfs->wbc_ctx->event_ctx,
                                                  ids, 1);
                        NT_STATUS_NOT_OK_RETURN(status);
 
@@ -331,7 +331,7 @@ NTSTATUS pvfs_acl_set(struct pvfs_state *pvfs,
                }
                if (!dom_sid_equal(sd->group_sid, new_sd->group_sid)) {
                        ids->sid = new_sd->group_sid;
-                       status = wbc_sids_to_xids(pvfs->ntvfs->ctx->event_ctx,
+                       status = wbc_sids_to_xids(pvfs->wbc_ctx->event_ctx,
                                                  ids, 1);
                        NT_STATUS_NOT_OK_RETURN(status);
 
@@ -969,7 +969,7 @@ NTSTATUS pvfs_acl_inherited_sd(struct pvfs_state *pvfs,
        ids[1].sid = NULL;
        ids[1].status = ID_UNKNOWN;
 
-       status = wbc_xids_to_sids(pvfs->ntvfs->ctx->event_ctx, ids, 2);
+       status = wbc_xids_to_sids(pvfs->wbc_ctx->event_ctx, ids, 2);
        NT_STATUS_NOT_OK_RETURN_AND_FREE(status, tmp_ctx);
 
        sd->owner_sid = talloc_steal(sd, ids[0].sid);

diff --git a/source4/ntvfs/posix/pvfs_acl_nfs4.c b/source4/ntvfs/posix/pvfs_acl_nfs4.c
index dbb43e2bae5bab56e01b0018d6fbcc856c014043..272cdbc53951a9f5a0235d3b21f282ffecf2618b 100644 (file)
--- a/source4/ntvfs/posix/pvfs_acl_nfs4.c
+++ b/source4/ntvfs/posix/pvfs_acl_nfs4.c
@@ -90,7 +90,7 @@ static NTSTATUS pvfs_acl_load_nfs4(struct pvfs_state *pvfs, struct pvfs_filename
 
        /* Allocate memory for the sids from the security descriptor to be on
         * the safe side. */
-       status = wbc_xids_to_sids(pvfs->ntvfs->ctx->event_ctx, ids, num_ids);
+       status = wbc_xids_to_sids(pvfs->wbc_ctx->event_ctx, ids, num_ids);
        NT_STATUS_NOT_OK_RETURN(status);
 
        sd->owner_sid = talloc_steal(sd, ids[0].sid);
@@ -155,8 +155,7 @@ static NTSTATUS pvfs_acl_save_nfs4(struct pvfs_state *pvfs, struct pvfs_filename
                ids[i].status = ID_UNKNOWN;
        }
 
-       status = wbc_sids_to_xids(pvfs->ntvfs->ctx->event_ctx, ids,
-                                 acl.a_count);
+       status = wbc_sids_to_xids(pvfs->wbc_ctx->event_ctx, ids, acl.a_count);
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(tmp_ctx);
                return status;