sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

pvfs: Use the tevent_context from the ntvfs_context

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Kai Blin <kai@samba.org>
This commit is contained in:
Volker Lendecke 2014-02-02 15:53:25 +01:00
parent 5124a9e118
commit 15700a9f6e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source4/ntvfs/posix/pvfs_acl.c
View File

@ -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);

5
source4/ntvfs/posix/pvfs_acl_nfs4.c
View File

@ -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;