diff options
| author | Volker Lendecke <vl@samba.org> | 2014-02-18 09:50:23 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-02-18 10:29:18 +0100 |
| commit | 2f41ecada530be78e02a2acfec2bf394e20a6bd4 (patch) | |
| tree | 555b2de1f0b99cc75bfbd7afa6865af100eec2ed /source4/ntvfs | |
| parent | c1bffac7e5f6aec7020bc2ce20915df7f4ce9e38 (diff) | |
| download | samba-2f41ecada530be78e02a2acfec2bf394e20a6bd4.tar.gz samba-2f41ecada530be78e02a2acfec2bf394e20a6bd4.tar.xz samba-2f41ecada530be78e02a2acfec2bf394e20a6bd4.zip | |
Revert "source4: Use wbc_xids_to_sids"
This reverts commit d0932a1ae089fda0d41be21a9916caeca7c0c233.
Signed-off-by: Volker Lendecke <vl@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, 14 insertions, 3 deletions
diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c index 3ef66e1a12a..2070fd105c4 100644 --- a/source4/ntvfs/posix/pvfs_acl.c +++ b/source4/ntvfs/posix/pvfs_acl.c @@ -151,6 +151,7 @@ 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) { @@ -169,7 +170,10 @@ 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); + 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); NT_STATUS_NOT_OK_RETURN(status); sd->owner_sid = talloc_steal(sd, ids[0].sid); @@ -921,6 +925,7 @@ 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; @@ -969,7 +974,10 @@ 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); + 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); 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..bf4d9c27210 100644 --- a/source4/ntvfs/posix/pvfs_acl_nfs4.c +++ b/source4/ntvfs/posix/pvfs_acl_nfs4.c @@ -42,6 +42,7 @@ 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); @@ -90,7 +91,9 @@ 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); + 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); NT_STATUS_NOT_OK_RETURN(status); sd->owner_sid = talloc_steal(sd, ids[0].sid); |