summaryrefslogtreecommitdiffstats
path: root/source4/winbind
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-08-01 00:38:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:01:25 -0500
commitfa16e28424946d7bcea948c977208921e39b5c62 (patch)
treec64f2627ffa3944c9116d3c6750868ca2aab42e9 /source4/winbind
parent6d10dc296ce65dbbc30eea8607c0f54c61b259f3 (diff)
downloadsamba-fa16e28424946d7bcea948c977208921e39b5c62.tar.gz
samba-fa16e28424946d7bcea948c977208921e39b5c62.tar.xz
samba-fa16e28424946d7bcea948c977208921e39b5c62.zip
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)
Diffstat (limited to 'source4/winbind')
-rw-r--r--source4/winbind/wb_name2domain.c3
-rw-r--r--source4/winbind/wb_sid2domain.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/source4/winbind/wb_name2domain.c b/source4/winbind/wb_name2domain.c
index b3f9f0c799a..b31ccb12126 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 d9c0fb2ef83..de535cdcf91 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: