Implemented enum_domain_groups function.

(This used to be commit 9e36824d47f7d1aac14bb5aeded8da54962c90a8)

diff --git a/source3/python/py_samr.c b/source3/python/py_samr.c
index ce6eda99c231234bc5408f9830518f2db9c479b9..917a90a2fb33a3e5367d0ba1d5ed2994e62b3f99 100644 (file)
--- a/source3/python/py_samr.c
+++ b/source3/python/py_samr.c
@@ -151,8 +151,50 @@ static void py_samr_domain_hnd_dealloc(PyObject* self)
        PyObject_Del(self);
 }
 
+static PyObject *samr_enum_dom_groups(PyObject *self, PyObject *args, 
+                                     PyObject *kw)
+{
+       samr_domain_hnd_object *domain_hnd = (samr_domain_hnd_object *)self;
+       static char *kwlist[] = { NULL };
+       TALLOC_CTX *mem_ctx;
+       uint32 desired_access = MAXIMUM_ALLOWED_ACCESS;
+       uint32 start_idx, size, num_dom_groups;
+       struct acct_info *dom_groups;
+       NTSTATUS result;
+       PyObject *py_result = NULL;
+       
+       if (!PyArg_ParseTupleAndKeywords(
+                   args, kw, "", kwlist))
+               return NULL;
+
+       if (!(mem_ctx = talloc_init())) {
+               PyErr_SetString(samr_error, "unable to init talloc context");
+               return NULL;
+       }
+
+       start_idx = 0;
+       size = 0xffff;
+
+       do {
+               result = cli_samr_enum_dom_groups(
+                       domain_hnd->cli, mem_ctx, &domain_hnd->domain_pol,
+                       &start_idx, size, &dom_groups, &num_dom_groups);
+
+               if (NT_STATUS_IS_OK(result) ||
+                   NT_STATUS_V(result) == NT_STATUS_V(STATUS_MORE_ENTRIES)) {
+                       py_from_acct_info(&py_result, dom_groups,
+                                         num_dom_groups);
+               }
+
+       } while (NT_STATUS_V(result) == NT_STATUS_V(STATUS_MORE_ENTRIES));
+
+       return py_result;
+}      
+
 static PyMethodDef samr_domain_methods[] = {
-       { NULL }
+       { "enum_domain_groups", (PyCFunction)samr_enum_dom_groups,
+         METH_VARARGS | METH_KEYWORDS, "Enumerate domain groups" },
+       { NULL }
 };
 
 static PyObject *py_samr_domain_hnd_getattr(PyObject *self, char *attrname)

diff --git a/source3/python/py_samr_conv.c b/source3/python/py_samr_conv.c
new file mode 100644 (file)
index 0000000..fdf7164
--- /dev/null
+++ b/source3/python/py_samr_conv.c
@@ -0,0 +1,58 @@
+/* 
+   Python wrappers for DCERPC/SMB client routines.
+
+   Copyright (C) Tim Potter, 2002
+   
+   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 2 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, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "python/py_samr.h"
+#include "python/py_conv.h"
+
+/*
+ * Convert between acct_info and Python 
+ */
+
+BOOL py_from_acct_info(PyObject **array, struct acct_info *info, int num_accts)
+{
+       int i;
+
+       *array = PyList_New(num_accts);
+
+       for (i = 0; i < num_accts; i++) {
+               PyObject *obj;  
+
+               obj = PyDict_New();
+               
+               PyDict_SetItemString(
+                       obj, "name", PyString_FromString(info[i].acct_name));
+
+               PyDict_SetItemString(
+                       obj, "description", 
+                       PyString_FromString(info[i].acct_desc));
+
+               PyDict_SetItemString(obj, "rid", PyInt_FromLong(info[i].rid));
+
+               PyList_SetItem(*array, i, obj);
+       }
+
+       return True;
+}
+
+BOOL py_to_acct_info(PRINTER_INFO_3 *info, PyObject *dict,
+                    TALLOC_CTX *mem_ctx)
+{
+       return False;
+}

diff --git a/source3/python/setup.py.in b/source3/python/setup.py.in
index c61ec2c2143809166d388556781fc1c1f2608246..9b6dc1a650c13d2551ee2bea97629155c6729b1b 100755 (executable)
--- a/source3/python/setup.py.in
+++ b/source3/python/setup.py.in
@@ -118,6 +118,7 @@ setup(
 
     Extension(name = "samr",
               sources = [samba_srcdir + "python/py_samr.c",
+                         samba_srcdir + "python/py_samr_conv.c",
                          samba_srcdir + "python/py_common.c"],
               libraries = lib_list,
               library_dirs = ["/usr/kerberos/lib"],