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

diff --git a/source/winbind/wb_name2domain.c b/source/winbind/wb_name2domain.c
index b3f9f0c799ae2fe9b675b56a940c1d899fdb4791..b31ccb121261c7e0e23b577db00ae3006a4e3ffe 100644 (file)
--- a/source/winbind/wb_name2domain.c
+++ b/source/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/source/winbind/wb_sid2domain.c b/source/winbind/wb_sid2domain.c
index d9c0fb2ef83db84630a6bafe37c8e27a64318f9e..de535cdcf91efa71a77f1f4533b7123745695bfc 100644 (file)
--- a/source/winbind/wb_sid2domain.c
+++ b/source/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: