r25367: Add initial implementation of internal group add function.

rafal
(This used to be commit 05624840c79982a6125fb037dc771a3c42f3c7ac)

diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index a4cbedb51583c2a53679dee4e078fc03e7dd5e25..ef0c7ff6ca4f78cfcb23a33883d66b91840b01a2 100644 (file)
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -28,6 +28,7 @@ OBJ_FILES = \
                userinfo.o \
                groupinfo.o \
                userman.o \
+               groupman.o \
                prereq_domain.o
 PUBLIC_DEPENDENCIES = CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBSAMBA3 LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel
 PRIVATE_DEPENDENCIES = CREDENTIALS_KRB5

diff --git a/source4/libnet/groupman.c b/source4/libnet/groupman.c
new file mode 100644 (file)
index 0000000..de0ae0a
--- /dev/null
+++ b/source4/libnet/groupman.c
@@ -0,0 +1,138 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Copyright (C) Rafal Szczesniak 2007
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+  a composite function for manipulating (add/edit/del) groups via samr pipe
+*/
+
+#include "includes.h"
+#include "libcli/composite/composite.h"
+#include "libnet/composite.h"
+#include "libnet/groupman.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
+
+
+struct groupadd_state {
+       struct dcerpc_pipe *pipe;
+       struct policy_handle domain_handle;
+       struct samr_CreateDomainGroup creategroup;
+       struct policy_handle group_handle;
+       uint32_t group_rid;
+       
+       void (*monitor_fn)(struct monitor_msg*);
+};
+
+
+static void continue_groupadd_created(struct rpc_request *req);
+
+
+struct composite_context* libnet_rpc_groupadd_send(struct dcerpc_pipe *p,
+                                                  struct libnet_rpc_groupadd *io,
+                                                  void (*monitor)(struct monitor_msg*))
+{
+       struct composite_context *c;
+       struct groupadd_state *s;
+       struct rpc_request *create_req;
+
+       if (!p || !io) return NULL;
+
+       c = composite_create(p, dcerpc_event_context(p));
+       if (c == NULL) return NULL;
+
+       s = talloc_zero(c, struct groupadd_state);
+       if (composite_nomem(s, c)) return c;
+
+       c->private_data = s;
+
+       s->domain_handle = io->in.domain_handle;
+       s->pipe          = p;
+       s->monitor_fn    = monitor;
+
+       s->creategroup.in.domain_handle  = &s->domain_handle;
+
+       s->creategroup.in.name           = talloc_zero(c, struct lsa_String);
+       if (composite_nomem(s->creategroup.in.name, c)) return c;
+
+       s->creategroup.in.name->string   = talloc_strdup(c, io->in.groupname);
+       if (composite_nomem(s->creategroup.in.name->string, c)) return c;
+       
+       s->creategroup.in.access_mask    = 0;
+       
+       s->creategroup.out.group_handle  = &s->group_handle;
+       s->creategroup.out.rid           = &s->group_rid;
+       
+       create_req = dcerpc_samr_CreateDomainGroup_send(s->pipe, c, &s->creategroup);
+       if (composite_nomem(create_req, c)) return c;
+
+       composite_continue_rpc(c, create_req, continue_groupadd_created, c);
+       return c;
+}
+
+
+NTSTATUS libnet_rpc_groupadd_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
+                                 struct libnet_rpc_groupadd *io)
+{
+       NTSTATUS status;
+       struct groupadd_state *s;
+       
+       status = composite_wait(c);
+       if (NT_STATUS_IS_OK(status)) {
+               s = talloc_get_type(c, struct groupadd_state);
+       }
+
+       return status;
+}
+
+
+static void continue_groupadd_created(struct rpc_request *req)
+{
+       struct composite_context *c;
+       struct groupadd_state *s;
+
+       c = talloc_get_type(req->async.private_data, struct composite_context);
+       s = talloc_get_type(c->private_data, struct groupadd_state);
+
+       c->status = dcerpc_ndr_request_recv(req);
+       if (!composite_is_ok(c)) return;
+
+       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);
+}
+
+
+NTSTATUS libnet_rpc_groupadd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+                            struct libnet_rpc_groupadd *io)
+{
+       struct composite_context *c;
+
+       c = libnet_rpc_groupadd_send(p, io, NULL);
+       return libnet_rpc_groupadd_recv(c, mem_ctx, io);
+}

diff --git a/source4/libnet/groupman.h b/source4/libnet/groupman.h
new file mode 100644 (file)
index 0000000..0acb02d
--- /dev/null
+++ b/source4/libnet/groupman.h
@@ -0,0 +1,35 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Copyright (C) Rafal Szczesniak 2007
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "librpc/gen_ndr/misc.h"
+
+
+/*
+ * IO structures for groupman.c functions
+ */
+
+struct libnet_rpc_groupadd {
+       struct {
+               struct policy_handle domain_handle;
+               const char *groupname;
+       } in;
+       struct {
+               struct policy_handle group_handle;
+       } out;
+};

diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h
index 03cca1b7fe909b1803da4c24319241b60ceb3538..56a7d0ba2019f83115e722829894c88f81bdddfa 100644 (file)
--- a/source4/libnet/libnet.h
+++ b/source4/libnet/libnet.h
@@ -58,6 +58,7 @@ struct libnet_context {
 #include "libnet/userman.h"
 #include "libnet/userinfo.h"
 #include "libnet/groupinfo.h"
+#include "libnet/groupman.h"
 #include "libnet/libnet_passwd.h"
 #include "libnet/libnet_time.h"
 #include "libnet/libnet_rpc.h"