2 files changed, 194 insertions, 10 deletions

diff --git a/source4/libnet/groupman.c b/source4/libnet/groupman.c
index de0ae0af94..1e12c87713 100644
--- a/source4/libnet/groupman.c
+++ b/source4/libnet/groupman.c
@@ -114,16 +114,6 @@ static void continue_groupadd_created(struct rpc_request *req)
 	c->status = s->creategroup.out.result;
 	if (!composite_is_ok(c)) return;
 	
-	if (s->monitor_fn) {
-		struct monitor_msg msg;
-		
-		msg.type      = mon_SamrCreateUser;
-		msg.data      = NULL;
-		msg.data_size = 0;
-		
-		s->monitor_fn(&msg);
-	}
-
 	composite_done(c);
 }
 
@@ -136,3 +126,186 @@ NTSTATUS libnet_rpc_groupadd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	c = libnet_rpc_groupadd_send(p, io, NULL);
 	return libnet_rpc_groupadd_recv(c, mem_ctx, io);
 }
+
+
+struct groupdel_state {
+	struct dcerpc_pipe             *pipe;
+	struct policy_handle           domain_handle;
+	struct policy_handle           group_handle;
+	struct samr_LookupNames        lookupname;
+	struct samr_OpenGroup          opengroup;
+	struct samr_DeleteDomainGroup  deletegroup;
+
+	/* information about the progress */
+	void (*monitor_fn)(struct monitor_msg *);
+};
+
+
+static void continue_groupdel_name_found(struct rpc_request *req);
+static void continue_groupdel_group_opened(struct rpc_request *req);
+static void continue_groupdel_deleted(struct rpc_request *req);
+
+
+struct composite_context* libnet_rpc_groupdel_send(struct dcerpc_pipe *p,
+						   struct libnet_rpc_groupdel *io,
+						   void (*monitor)(struct monitor_msg*))
+{
+	struct composite_context *c;
+	struct groupdel_state *s;
+	struct rpc_request *lookup_req;
+
+	/* composite context allocation and setup */
+	c = composite_create(p, dcerpc_event_context(p));
+	if (c == NULL) return NULL;
+
+	s = talloc_zero(c, struct groupdel_state);
+	if (composite_nomem(s, c)) return c;
+
+	c->private_data  = s;
+
+	/* store function parameters in the state structure */
+	s->pipe          = p;
+	s->domain_handle = io->in.domain_handle;
+	s->monitor_fn    = monitor;
+	
+	/* prepare parameters to send rpc request */
+	s->lookupname.in.domain_handle = &io->in.domain_handle;
+	s->lookupname.in.num_names     = 1;
+	s->lookupname.in.names         = talloc_zero(s, struct lsa_String);
+	s->lookupname.in.names->string = io->in.groupname;
+
+	/* send the request */
+	lookup_req = dcerpc_samr_LookupNames_send(p, c, &s->lookupname);
+	if (composite_nomem(lookup_req, c)) return c;
+
+	composite_continue_rpc(c, lookup_req, continue_groupdel_name_found, c);
+	return c;
+}
+
+
+static void continue_groupdel_name_found(struct rpc_request *req)
+{
+	struct composite_context *c;
+	struct groupdel_state *s;
+	struct rpc_request *opengroup_req;
+
+	c = talloc_get_type(req->async.private_data, struct composite_context);
+	s = talloc_get_type(c->private_data, struct groupdel_state);
+
+	/* receive samr_LookupNames result */
+	c->status = dcerpc_ndr_request_recv(req);
+	if (!composite_is_ok(c)) return;
+
+	c->status = s->lookupname.out.result;
+	if (!NT_STATUS_IS_OK(c->status)) {
+		composite_error(c, c->status);
+		return;
+	}
+
+	/* what to do when there's no group account to delete
+	   and what if there's more than one rid resolved */
+	if (!s->lookupname.out.rids.count) {
+		c->status = NT_STATUS_NO_SUCH_GROUP;
+		composite_error(c, c->status);
+		return;
+
+	} else if (!s->lookupname.out.rids.count > 1) {
+		c->status = NT_STATUS_INVALID_ACCOUNT_NAME;
+		composite_error(c, c->status);
+		return;
+	}
+
+	/* prepare the arguments for rpc call */
+	s->opengroup.in.domain_handle = &s->domain_handle;
+	s->opengroup.in.rid           = s->lookupname.out.rids.ids[0];
+	s->opengroup.in.access_mask   = SEC_FLAG_MAXIMUM_ALLOWED;
+	s->opengroup.out.group_handle  = &s->group_handle;
+
+	/* send rpc request */
+	opengroup_req = dcerpc_samr_OpenGroup_send(s->pipe, c, &s->opengroup);
+	if (composite_nomem(opengroup_req, c)) return;
+
+	composite_continue_rpc(c, opengroup_req, continue_groupdel_group_opened, c);
+}
+
+
+static void continue_groupdel_group_opened(struct rpc_request *req)
+{
+	struct composite_context *c;
+	struct groupdel_state *s;
+	struct rpc_request *delgroup_req;
+
+	c = talloc_get_type(req->async.private_data, struct composite_context);
+	s = talloc_get_type(c->private_data, struct groupdel_state);
+
+	/* receive samr_OpenGroup result */
+	c->status = dcerpc_ndr_request_recv(req);
+	if (!composite_is_ok(c)) return;
+
+	c->status = s->opengroup.out.result;
+	if (!NT_STATUS_IS_OK(c->status)) {
+		composite_error(c, c->status);
+		return;
+	}
+	
+	/* prepare the final rpc call arguments */
+	s->deletegroup.in.group_handle   = &s->group_handle;
+	s->deletegroup.out.group_handle  = &s->group_handle;
+	
+	/* send rpc request */
+	delgroup_req = dcerpc_samr_DeleteDomainGroup_send(s->pipe, c, &s->deletegroup);
+	if (composite_nomem(delgroup_req, c)) return;
+
+	/* callback handler setup */
+	composite_continue_rpc(c, delgroup_req, continue_groupdel_deleted, c);
+}
+
+
+static void continue_groupdel_deleted(struct rpc_request *req)
+{
+	struct composite_context *c;
+	struct groupdel_state *s;
+
+	c = talloc_get_type(req->async.private_data, struct composite_context);
+	s = talloc_get_type(c->private_data, struct groupdel_state);
+
+	/* receive samr_DeleteGroup result */
+	c->status = dcerpc_ndr_request_recv(req);
+	if (!composite_is_ok(c)) return;
+
+	/* return the actual function call status */
+	c->status = s->deletegroup.out.result;
+	if (!NT_STATUS_IS_OK(c->status)) {
+		composite_error(c, c->status);
+		return;
+	}
+	
+	composite_done(c);
+}
+
+
+NTSTATUS libnet_rpc_groupdel_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
+				  struct libnet_rpc_groupdel *io)
+{
+	NTSTATUS status;
+	struct groupdel_state *s;
+
+	status = composite_wait(c);
+	if (NT_STATUS_IS_OK(status) && io) {
+		s = talloc_get_type(c->private_data, struct groupdel_state);
+		io->out.group_handle = s->group_handle;
+	}
+
+	talloc_free(c);
+	return status;
+}
+
+
+NTSTATUS libnet_rpc_groupdel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+			     struct libnet_rpc_groupdel *io)
+{
+	struct composite_context *c;
+
+	c = libnet_rpc_groupdel_send(p, io, NULL);
+	return libnet_rpc_groupdel_recv(c, mem_ctx, io);
+}
diff --git a/source4/libnet/groupman.h b/source4/libnet/groupman.h
index 0acb02de5a..cd4452e73c 100644
--- a/source4/libnet/groupman.h
+++ b/source4/libnet/groupman.h
@@ -33,3 +33,14 @@ struct libnet_rpc_groupadd {
 		struct policy_handle group_handle;
 	} out;
 };
+
+
+struct libnet_rpc_groupdel {
+	struct {
+		struct policy_handle domain_handle;
+		const char *groupname;
+	} in;
+	struct {
+		struct policy_handle group_handle;
+	} out;
+};