[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1188-g1df5ca6

[Andrew Bartlett]

The branch, master has been updated
       via  1df5ca6afab3aeac43dfe4773cba1b9ce4d488f5 (commit)
       via  f128bfd44988a4db90222e7d5af5ab94337a065d (commit)
       via  6f60a6e71aa9b734ec80865f598ff302d45f2bf3 (commit)
      from  9b044be82906b651a70085898809bac0e77d832a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1df5ca6afab3aeac43dfe4773cba1b9ce4d488f5
Merge: f128bfd44988a4db90222e7d5af5ab94337a065d 9b044be82906b651a70085898809bac0e77d832a
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Apr 21 12:20:37 2009 +0200

    Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel

commit f128bfd44988a4db90222e7d5af5ab94337a065d
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Apr 21 12:06:04 2009 +0200

    Add str() for policy_handles.
    
    Pair programmed with Jelmer

commit 6f60a6e71aa9b734ec80865f598ff302d45f2bf3
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Apr 21 11:53:00 2009 +0200

    python/dcerpc: Custom implementations of policy_handle.__init__ and policy_handle.__repr__
    
    pair-programmed with Jelmer

-----------------------------------------------------------------------

Summary of changes:
 source4/librpc/ndr/py_misc.c                       |   48 ++++++++++++++++++++
 .../scripting/python/samba/tests/dcerpc/misc.py    |   16 +++++++
 2 files changed, 64 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/librpc/ndr/py_misc.c b/source4/librpc/ndr/py_misc.c
index 4e25566..5d5b881 100644
--- a/source4/librpc/ndr/py_misc.c
+++ b/source4/librpc/ndr/py_misc.c
@@ -90,3 +90,51 @@ static void py_GUID_patch(PyTypeObject *type)
 
 #define PY_GUID_PATCH py_GUID_patch
 
+static int py_policy_handle_init(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+	char *str = NULL;
+	NTSTATUS status;
+	struct policy_handle *handle = py_talloc_get_ptr(self);
+	const char *kwnames[] = { "uuid", "type", NULL };
+
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|si", discard_const_p(char *, kwnames), &str, &handle->handle_type))
+		return -1;
+
+	if (str != NULL) {
+		status = GUID_from_string(str, &handle->uuid);
+		if (!NT_STATUS_IS_OK(status)) {
+			PyErr_SetNTSTATUS(status);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+static PyObject *py_policy_handle_repr(PyObject *py_self)
+{
+	struct policy_handle *self = py_talloc_get_ptr(py_self);
+	char *uuid_str = GUID_string(NULL, &self->uuid);
+	PyObject *ret = PyString_FromFormat("policy_handle(%d, '%s')", self->handle_type, uuid_str);
+	talloc_free(uuid_str);
+	return ret;
+}
+
+static PyObject *py_policy_handle_str(PyObject *py_self)
+{
+	struct policy_handle *self = py_talloc_get_ptr(py_self);
+	char *uuid_str = GUID_string(NULL, &self->uuid);
+	PyObject *ret = PyString_FromFormat("%d, %s", self->handle_type, uuid_str);
+	talloc_free(uuid_str);
+	return ret;
+}
+
+static void py_policy_handle_patch(PyTypeObject *type)
+{
+	type->tp_init = py_policy_handle_init;
+	type->tp_repr = py_policy_handle_repr;
+	type->tp_str = py_policy_handle_str;
+}
+
+#define PY_POLICY_HANDLE_PATCH py_policy_handle_patch
+
diff --git a/source4/scripting/python/samba/tests/dcerpc/misc.py b/source4/scripting/python/samba/tests/dcerpc/misc.py
index d9a5573..e9b5127 100644
--- a/source4/scripting/python/samba/tests/dcerpc/misc.py
+++ b/source4/scripting/python/samba/tests/dcerpc/misc.py
@@ -24,6 +24,7 @@ text1 = "76f53846-a7c2-476a-ae2c-20e2b80d7b34"
 text2 = "344edffa-330a-4b39-b96e-2c34da52e8b1"
 
 class GUIDTests(unittest.TestCase):
+
     def test_str(self):
         guid = misc.GUID(text1)
         self.assertEquals(text1, str(guid))
@@ -46,3 +47,18 @@ class GUIDTests(unittest.TestCase):
 
          
         
+class PolicyHandleTests(unittest.TestCase):
+
+    def test_init(self):
+        x = misc.policy_handle(text1, 1)
+        self.assertEquals(1, x.handle_type)
+        self.assertEquals(text1, str(x.uuid))
+
+    def test_repr(self):
+        x = misc.policy_handle(text1, 42)
+        self.assertEquals("policy_handle(%d, '%s')" % (42, text1), repr(x))
+
+    def test_str(self):
+        x = misc.policy_handle(text1, 42)
+        self.assertEquals("%d, %s" % (42, text1), str(x))
+


-- 
Samba Shared Repository