1 files changed, 47 insertions, 2 deletions

diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c
index 08542640b9..93e4a093f3 100644
--- a/source4/librpc/ndr/py_security.c
+++ b/source4/librpc/ndr/py_security.c
@@ -31,7 +31,11 @@ static void PyType_AddMethods(PyTypeObject *type, PyMethodDef *methods)
 		type->tp_dict = PyDict_New();
 	dict = type->tp_dict;
 	for (i = 0; methods[i].ml_name; i++) {
-		PyObject *descr = PyDescr_NewMethod(type, &methods[i]);
+		PyObject *descr;
+		if (methods[i].ml_flags & METH_CLASS) 
+			descr = PyCFunction_New(&methods[i], (PyObject *)type);
+		else 
+			descr = PyDescr_NewMethod(type, &methods[i]);
 		PyDict_SetItemString(dict, methods[i].ml_name, 
 				     descr);
 	}
@@ -160,7 +164,44 @@ static PyObject *py_descriptor_sacl_del(PyObject *self, PyObject *args)
 static PyObject *py_descriptor_new(PyTypeObject *self, PyObject *args, PyObject *kwargs)
 {
 	return py_talloc_import(self, security_descriptor_initialise(NULL));
-}	
+}
+
+static PyObject *py_descriptor_from_sddl(PyObject *self, PyObject *args)
+{
+	struct security_descriptor *secdesc;
+	char *sddl;
+	PyObject *py_sid;
+	struct dom_sid *sid;
+
+	if (!PyArg_ParseTuple(args, "sO", &sddl, &py_sid))
+		return NULL;
+
+	sid = py_talloc_get_ptr(py_sid);
+
+	secdesc = sddl_decode(NULL, sddl, sid);
+	if (secdesc == NULL) {
+		PyErr_SetString(PyExc_TypeError, "Unable to parse SDDL");
+		return NULL;
+	}
+
+	return py_talloc_import((PyTypeObject *)self, secdesc);
+}
+
+static PyObject *py_descriptor_as_sddl(PyObject *self, PyObject *py_sid)
+{
+	struct dom_sid *sid = py_talloc_get_ptr(py_sid);
+	struct security_descriptor *desc = py_talloc_get_ptr(self);
+	char *text;
+	PyObject *ret;
+
+	text = sddl_encode(NULL, desc, sid);
+
+	ret = PyString_FromString(text);
+
+	talloc_free(text);
+
+	return ret;
+}
 
 static PyMethodDef py_descriptor_extra_methods[] = {
 	{ "sacl_add", (PyCFunction)py_descriptor_sacl_add, METH_VARARGS,
@@ -172,6 +213,10 @@ static PyMethodDef py_descriptor_extra_methods[] = {
 		NULL },
 	{ "sacl_del", (PyCFunction)py_descriptor_sacl_del, METH_VARARGS,
 		NULL },
+	{ "from_sddl", (PyCFunction)py_descriptor_from_sddl, METH_VARARGS|METH_CLASS, 
+		NULL },
+	{ "as_sddl", (PyCFunction)py_descriptor_as_sddl, METH_O,
+		NULL },
 	{ NULL }
 };