diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-13 22:49:08 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-13 22:49:08 +0200 |
| commit | 60a6682c855cbe5094433881649e7ed4945a06e7 (patch) | |
| tree | d66516ad8b6695335b6ded31bb664b5eaf86d59f /source4/winbind | |
| parent | 148d3b170ae00d4001fa011450c7238052d32ae2 (diff) | |
| parent | 6b013c90fda01974ac0c27ac035ce78958276aad (diff) | |
| download | samba-60a6682c855cbe5094433881649e7ed4945a06e7.tar.gz samba-60a6682c855cbe5094433881649e7ed4945a06e7.tar.bz2 samba-60a6682c855cbe5094433881649e7ed4945a06e7.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into cprovision
(This used to be commit 9b8448c1e4567be26fa4890c647e0d4d46efbe20)
Diffstat (limited to 'source4/winbind')
| -rw-r--r-- | source4/winbind/wb_sids2xids.c | 10 | ||||
| -rw-r--r-- | source4/winbind/wb_xids2sids.c | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/source4/winbind/wb_sids2xids.c b/source4/winbind/wb_sids2xids.c index 302b915ff5..6b89caf465 100644 --- a/source4/winbind/wb_sids2xids.c +++ b/source4/winbind/wb_sids2xids.c @@ -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; } diff --git a/source4/winbind/wb_xids2sids.c b/source4/winbind/wb_xids2sids.c index 1be394d276..a1cf2667ff 100644 --- a/source4/winbind/wb_xids2sids.c +++ b/source4/winbind/wb_xids2sids.c @@ -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; } |