mirror of
https://github.com/samba-team/samba.git
synced 2025-01-29 21:47:30 +03:00
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit de5349cc7a5a97c0d2d7288436a4090dfd9bd093)
This commit is contained in:
commit
67faa71c5b
@ -67,15 +67,13 @@ NTSTATUS wb_sids2xids_recv(struct composite_context *ctx,
|
||||
struct id_mapping **ids)
|
||||
{
|
||||
NTSTATUS status = composite_wait(ctx);
|
||||
struct sids2xids_state *state = talloc_get_type(ctx->private_data,
|
||||
struct sids2xids_state);
|
||||
|
||||
DEBUG(5, ("wb_sids2xids_recv called\n"));
|
||||
|
||||
if (NT_STATUS_IS_OK(status)) {
|
||||
struct sids2xids_state *state =
|
||||
talloc_get_type(ctx->private_data,
|
||||
struct sids2xids_state);
|
||||
*ids = state->ids;
|
||||
}
|
||||
*ids = state->ids;
|
||||
|
||||
talloc_free(ctx);
|
||||
return status;
|
||||
}
|
||||
|
@ -67,15 +67,13 @@ NTSTATUS wb_xids2sids_recv(struct composite_context *ctx,
|
||||
struct id_mapping **ids)
|
||||
{
|
||||
NTSTATUS status = composite_wait(ctx);
|
||||
struct xids2sids_state *state = talloc_get_type(ctx->private_data,
|
||||
struct xids2sids_state);
|
||||
|
||||
DEBUG(5, ("wb_xids2sids_recv called.\n"));
|
||||
|
||||
if (NT_STATUS_IS_OK(status)) {
|
||||
struct xids2sids_state *state =
|
||||
talloc_get_type(ctx->private_data,
|
||||
struct xids2sids_state);
|
||||
*ids = state->ids;
|
||||
}
|
||||
*ids = state->ids;
|
||||
|
||||
talloc_free(ctx);
|
||||
return status;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user