From fa16e28424946d7bcea948c977208921e39b5c62 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 1 Aug 2007 00:38:53 +0000 Subject: r24110: I hate seeing callers manually filling in the composite context. Use the helper functions instead (and in kai's new code, which just copied the previous bad practice). Andrew Bartlett (This used to be commit 0908d8232e8621e5c7bce74b19e5d1e75fc115ab) --- source4/winbind/wb_name2domain.c | 3 +-- source4/winbind/wb_sid2domain.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'source4') diff --git a/source4/winbind/wb_name2domain.c b/source4/winbind/wb_name2domain.c index b3f9f0c799..b31ccb1212 100644 --- a/source4/winbind/wb_name2domain.c +++ b/source4/winbind/wb_name2domain.c @@ -59,8 +59,7 @@ struct composite_context *wb_name2domain_send(TALLOC_CTX *mem_ctx, ctx = wb_cmd_lookupname_send(state, service, user_dom, user_name); if (ctx == NULL) goto failed; - ctx->async.fn = name2domain_recv_sid; - ctx->async.private_data = state; + composite_continue(result, ctx, name2domain_recv_sid, ctx->async.private_data); return result; failed: diff --git a/source4/winbind/wb_sid2domain.c b/source4/winbind/wb_sid2domain.c index d9c0fb2ef8..de535cdcf9 100644 --- a/source4/winbind/wb_sid2domain.c +++ b/source4/winbind/wb_sid2domain.c @@ -94,8 +94,8 @@ struct composite_context *wb_sid2domain_send(TALLOC_CTX *mem_ctx, ctx = wb_cmd_lookupsid_send(state, service, state->sid); if (ctx == NULL) goto failed; - ctx->async.fn = sid2domain_recv_name; - ctx->async.private_data = state; + composite_continue(result, ctx, sid2domain_recv_name, ctx->async.private_data); + return result; failed: -- cgit