svn commit: samba r24110 - in branches/SAMBA_4_0/source/winbind: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-08-01 00:38:53 +0000 (Wed, 01 Aug 2007)
New Revision: 24110

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24110

Log:
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

Modified:
   branches/SAMBA_4_0/source/winbind/wb_name2domain.c
   branches/SAMBA_4_0/source/winbind/wb_sid2domain.c


Changeset:
Modified: branches/SAMBA_4_0/source/winbind/wb_name2domain.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_name2domain.c	2007-07-31 23:49:04 UTC (rev 24109)
+++ branches/SAMBA_4_0/source/winbind/wb_name2domain.c	2007-08-01 00:38:53 UTC (rev 24110)
@@ -59,8 +59,7 @@
 	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:

Modified: branches/SAMBA_4_0/source/winbind/wb_sid2domain.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_sid2domain.c	2007-07-31 23:49:04 UTC (rev 24109)
+++ branches/SAMBA_4_0/source/winbind/wb_sid2domain.c	2007-08-01 00:38:53 UTC (rev 24110)
@@ -94,8 +94,8 @@
 
 	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: