diff options
| -rw-r--r-- | source4/auth/unix_token.c | 2 | ||||
| -rw-r--r-- | source4/libcli/wbclient/wbclient.c | 3 | ||||
| -rw-r--r-- | source4/libcli/wbclient/wbclient.h | 3 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl.c | 6 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl_nfs4.c | 3 | ||||
| -rw-r--r-- | source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 4 |
6 files changed, 8 insertions, 13 deletions
diff --git a/source4/auth/unix_token.c b/source4/auth/unix_token.c index efc9a9db4a6..385109b96ef 100644 --- a/source4/auth/unix_token.c +++ b/source4/auth/unix_token.c @@ -55,7 +55,7 @@ NTSTATUS security_token_to_unix_token(TALLOC_CTX *mem_ctx, ids[s].status = ID_UNKNOWN; } - status = wbc_sids_to_xids(ev, ids, token->num_sids); + status = wbc_sids_to_xids(ids, token->num_sids); NT_STATUS_NOT_OK_RETURN(status); g = token->num_sids; diff --git a/source4/libcli/wbclient/wbclient.c b/source4/libcli/wbclient/wbclient.c index f306556ff40..1ff35c8eba5 100644 --- a/source4/libcli/wbclient/wbclient.c +++ b/source4/libcli/wbclient/wbclient.c @@ -26,8 +26,7 @@ #include "libcli/security/dom_sid.h" #include "nsswitch/libwbclient/wbclient.h" -NTSTATUS wbc_sids_to_xids(struct tevent_context *ev, struct id_map *ids, - uint32_t count) +NTSTATUS wbc_sids_to_xids(struct id_map *ids, uint32_t count) { TALLOC_CTX *mem_ctx; uint32_t i; diff --git a/source4/libcli/wbclient/wbclient.h b/source4/libcli/wbclient/wbclient.h index fc096cc7c76..1300c73ad4e 100644 --- a/source4/libcli/wbclient/wbclient.h +++ b/source4/libcli/wbclient/wbclient.h @@ -20,8 +20,7 @@ */ #include "librpc/gen_ndr/idmap.h" -NTSTATUS wbc_sids_to_xids(struct tevent_context *ev, struct id_map *ids, - uint32_t count); +NTSTATUS wbc_sids_to_xids(struct id_map *ids, uint32_t count); NTSTATUS wbc_xids_to_sids(struct tevent_context *ev, struct id_map *ids, uint32_t count); diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c index 269b5ecd098..be12ef246f4 100644 --- a/source4/ntvfs/posix/pvfs_acl.c +++ b/source4/ntvfs/posix/pvfs_acl.c @@ -330,8 +330,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, - ids, 1); + status = wbc_sids_to_xids(ids, 1); NT_STATUS_NOT_OK_RETURN(status); if (ids->xid.type == ID_TYPE_BOTH || @@ -348,8 +347,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, - ids, 1); + status = wbc_sids_to_xids(ids, 1); NT_STATUS_NOT_OK_RETURN(status); if (ids->xid.type == ID_TYPE_BOTH || diff --git a/source4/ntvfs/posix/pvfs_acl_nfs4.c b/source4/ntvfs/posix/pvfs_acl_nfs4.c index dbb43e2bae5..948ddb26905 100644 --- a/source4/ntvfs/posix/pvfs_acl_nfs4.c +++ b/source4/ntvfs/posix/pvfs_acl_nfs4.c @@ -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(ids, acl.a_count); if (!NT_STATUS_IS_OK(status)) { talloc_free(tmp_ctx); return status; diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c index 10eda452d3f..771e4fdede9 100644 --- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c +++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c @@ -40,7 +40,7 @@ static NTSTATUS dcesrv_unixinfo_SidToUid(struct dcesrv_call_state *dce_call, ids->sid = &r->in.sid; ids->status = ID_UNKNOWN; ZERO_STRUCT(ids->xid); - status = wbc_sids_to_xids(dce_call->event_ctx, ids, 1); + status = wbc_sids_to_xids(ids, 1); NT_STATUS_NOT_OK_RETURN(status); if (ids->xid.type == ID_TYPE_BOTH || @@ -99,7 +99,7 @@ static NTSTATUS dcesrv_unixinfo_SidToGid(struct dcesrv_call_state *dce_call, ids->sid = &r->in.sid; ids->status = ID_UNKNOWN; ZERO_STRUCT(ids->xid); - status = wbc_sids_to_xids(dce_call->event_ctx, ids, 1); + status = wbc_sids_to_xids(ids, 1); NT_STATUS_NOT_OK_RETURN(status); if (ids->xid.type == ID_TYPE_BOTH || |