diff options
| author | Volker Lendecke <vl@samba.org> | 2014-02-02 15:53:25 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-02-10 10:57:28 +0100 |
| commit | 15700a9f6e5393cecf78052f510e015300c5bd85 (patch) | |
| tree | 394713f0ad6da94b4808a611e64fa8c6ceef2cb7 /source4/ntvfs | |
| parent | 5124a9e1183de990ca3146cd355152094495a779 (diff) | |
| download | samba-15700a9f6e5393cecf78052f510e015300c5bd85.tar.gz samba-15700a9f6e5393cecf78052f510e015300c5bd85.tar.xz samba-15700a9f6e5393cecf78052f510e015300c5bd85.zip | |
pvfs: Use the tevent_context from the ntvfs_context
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Kai Blin <kai@samba.org>
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl.c | 8 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl_nfs4.c | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c index 3ef66e1a12a..657e1030632 100644 --- 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->wbc_ctx->event_ctx, ids, 2); + status = wbc_xids_to_sids(pvfs->ntvfs->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->wbc_ctx->event_ctx, + status = wbc_sids_to_xids(pvfs->ntvfs->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->wbc_ctx->event_ctx, + status = wbc_sids_to_xids(pvfs->ntvfs->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->wbc_ctx->event_ctx, ids, 2); + status = wbc_xids_to_sids(pvfs->ntvfs->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 272cdbc5395..dbb43e2bae5 100644 --- 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->wbc_ctx->event_ctx, ids, num_ids); + status = wbc_xids_to_sids(pvfs->ntvfs->ctx->event_ctx, ids, num_ids); NT_STATUS_NOT_OK_RETURN(status); sd->owner_sid = talloc_steal(sd, ids[0].sid); @@ -155,7 +155,8 @@ static NTSTATUS pvfs_acl_save_nfs4(struct pvfs_state *pvfs, struct pvfs_filename ids[i].status = ID_UNKNOWN; } - status = wbc_sids_to_xids(pvfs->wbc_ctx->event_ctx, ids, acl.a_count); + status = wbc_sids_to_xids(pvfs->ntvfs->ctx->event_ctx, ids, + acl.a_count); if (!NT_STATUS_IS_OK(status)) { talloc_free(tmp_ctx); return status; |