r10504: - seperate implementation specific stuff, from the generic composite

  stuff.
- don't use SMBCLI_REQUEST_* state's in the genreic composite stuff
- move monitor_fn to libnet.

NOTE: I have maybe found some bugs, in code that is dirrectly in DONE or ERROR
      state in the _send() function. I haven't fixed this bugs in this
      commit! We may need some composite_trigger_*() functions or so.
      And maybe some other generic helper functions...

metze
(This used to be commit 4527815a0a9b96e460f301cb1f0c0b3964c166fc)

1 files changed, 3 insertions, 4 deletions

diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c
index ba806e4e44..010d30ac4a 100644
--- a/source4/libnet/libnet_lookup.c
+++ b/source4/libnet/libnet_lookup.c
@@ -27,7 +27,6 @@
 #include "lib/events/events.h"
 #include "libnet/libnet.h"
 #include "libcli/composite/composite.h"
-#include "libcli/composite/monitor.h"
 #include "libnet/composite.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
@@ -78,8 +77,8 @@ struct composite_context *libnet_Lookup_send(struct libnet_context *ctx,
 		methods = (const char**)ctx->name_res_methods;
 	}
 
-	c->private  = s;
-	c->state    = SMBCLI_REQUEST_SEND;
+	c->private_data	= s;
+	c->state	= COMPOSITE_STATE_IN_PROGRESS;
 
 	/* send resolve request */
 	s->resolve_ctx = resolve_name_send(&s->hostname, c->event_ctx, methods);
@@ -107,7 +106,7 @@ NTSTATUS libnet_Lookup_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
 	NTSTATUS status;
 	struct lookup_state *s;
 
-	s = talloc_get_type(c->private, struct lookup_state);
+	s = talloc_get_type(c->private_data, struct lookup_state);
 
 	status = resolve_name_recv(s->resolve_ctx, mem_ctx, s->address);
 	return status;