diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-11 14:35:26 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-11 14:35:26 +1000 |
| commit | 67faa71c5be5fabeeef16d97c2ed9af152af198d (patch) | |
| tree | c0011a07a68d3f988005c030426004124d047b2e | |
| parent | ae977ef24780c52da66e3608a3ed94649ae9f873 (diff) | |
| parent | 3d01c8eb6d4a9da9dc3dde9edb4057b534655e1d (diff) | |
| download | samba-67faa71c5be5fabeeef16d97c2ed9af152af198d.tar.gz samba-67faa71c5be5fabeeef16d97c2ed9af152af198d.tar.bz2 samba-67faa71c5be5fabeeef16d97c2ed9af152af198d.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit de5349cc7a5a97c0d2d7288436a4090dfd9bd093)
| -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; } |