diff options
| author | Volker Lendecke <vl@samba.org> | 2014-02-02 15:35:02 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2014-03-05 16:33:21 +0100 |
| commit | eb8f4b846fe2d1ebf7e5a6adc0622aefe54993cb (patch) | |
| tree | 37410b5d2a35a1967b5f28338322d95f5fa49837 /source4/ntvfs | |
| parent | 53b7665fc2dc4db911e6245132b8f5799e63e3e9 (diff) | |
| download | samba-eb8f4b846fe2d1ebf7e5a6adc0622aefe54993cb.tar.gz samba-eb8f4b846fe2d1ebf7e5a6adc0622aefe54993cb.tar.xz samba-eb8f4b846fe2d1ebf7e5a6adc0622aefe54993cb.zip | |
source4: Use wbc_xids_to_sids
Signed-off-by: Volker Lendecke <vl@samba.org>
Change-Id: Ib1b1a7fcd881510e3fb4e5da29391e3d9392fa17
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl.c | 12 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl_nfs4.c | 5 |
2 files changed, 3 insertions, 14 deletions
diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c index 2070fd105c4..3ef66e1a12a 100644 --- a/source4/ntvfs/posix/pvfs_acl.c +++ b/source4/ntvfs/posix/pvfs_acl.c @@ -151,7 +151,6 @@ static NTSTATUS pvfs_default_acl(struct pvfs_state *pvfs, struct security_ace ace; mode_t mode; struct id_map *ids; - struct composite_context *ctx; *psd = security_descriptor_initialise(req); if (*psd == NULL) { @@ -170,10 +169,7 @@ static NTSTATUS pvfs_default_acl(struct pvfs_state *pvfs, ids[1].xid.type = ID_TYPE_GID; ids[1].sid = NULL; - ctx = wbc_xids_to_sids_send(pvfs->wbc_ctx, ids, 2, ids); - NT_STATUS_HAVE_NO_MEMORY(ctx); - - status = wbc_xids_to_sids_recv(ctx, &ids); + 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); @@ -925,7 +921,6 @@ NTSTATUS pvfs_acl_inherited_sd(struct pvfs_state *pvfs, NTSTATUS status; struct security_descriptor *parent_sd, *sd; struct id_map *ids; - struct composite_context *ctx; TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx); *ret_sd = NULL; @@ -974,10 +969,7 @@ NTSTATUS pvfs_acl_inherited_sd(struct pvfs_state *pvfs, ids[1].sid = NULL; ids[1].status = ID_UNKNOWN; - ctx = wbc_xids_to_sids_send(pvfs->wbc_ctx, ids, 2, ids); - NT_STATUS_HAVE_NO_MEMORY_AND_FREE(ctx, tmp_ctx); - - status = wbc_xids_to_sids_recv(ctx, &ids); + 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 bf4d9c27210..272cdbc5395 100644 --- a/source4/ntvfs/posix/pvfs_acl_nfs4.c +++ b/source4/ntvfs/posix/pvfs_acl_nfs4.c @@ -42,7 +42,6 @@ static NTSTATUS pvfs_acl_load_nfs4(struct pvfs_state *pvfs, struct pvfs_filename struct security_descriptor *sd; int i, num_ids; struct id_map *ids; - struct composite_context *ctx; acl = talloc_zero(mem_ctx, struct nfs4acl); NT_STATUS_HAVE_NO_MEMORY(acl); @@ -91,9 +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. */ - ctx = wbc_xids_to_sids_send(pvfs->wbc_ctx, sd, num_ids, ids); - NT_STATUS_HAVE_NO_MEMORY(ctx); - status = wbc_xids_to_sids_recv(ctx, &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); |