svn commit: samba r25367 - in branches/SAMBA_4_0/source/libnet: .

mimir at samba.org mimir at samba.org
Thu Sep 27 00:25:55 GMT 2007


Author: mimir
Date: 2007-09-27 00:25:54 +0000 (Thu, 27 Sep 2007)
New Revision: 25367

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

Log:
Add initial implementation of internal group add function.


rafal


Added:
   branches/SAMBA_4_0/source/libnet/groupman.c
   branches/SAMBA_4_0/source/libnet/groupman.h
Modified:
   branches/SAMBA_4_0/source/libnet/config.mk
   branches/SAMBA_4_0/source/libnet/libnet.h


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libnet/config.mk	2007-09-27 00:00:38 UTC (rev 25366)
+++ branches/SAMBA_4_0/source/libnet/config.mk	2007-09-27 00:25:54 UTC (rev 25367)
@@ -28,6 +28,7 @@
 		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

Added: branches/SAMBA_4_0/source/libnet/groupman.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/groupman.c	2007-09-27 00:00:38 UTC (rev 25366)
+++ branches/SAMBA_4_0/source/libnet/groupman.c	2007-09-27 00:25:54 UTC (rev 25367)
@@ -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);
+}

Added: branches/SAMBA_4_0/source/libnet/groupman.h
===================================================================
--- branches/SAMBA_4_0/source/libnet/groupman.h	2007-09-27 00:00:38 UTC (rev 25366)
+++ branches/SAMBA_4_0/source/libnet/groupman.h	2007-09-27 00:25:54 UTC (rev 25367)
@@ -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;
+};

Modified: branches/SAMBA_4_0/source/libnet/libnet.h
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet.h	2007-09-27 00:00:38 UTC (rev 25366)
+++ branches/SAMBA_4_0/source/libnet/libnet.h	2007-09-27 00:25:54 UTC (rev 25367)
@@ -58,6 +58,7 @@
 #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"



More information about the samba-cvs mailing list