sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Make domain sid argument to as_sddl() optional.

Browse Source
This commit is contained in:
Jelmer Vernooij 2009-04-20 15:03:21 +02:00
parent b5b6ecb58a
commit 294359b7bc
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source4/librpc/ndr/py_security.c
View File

@ -187,13 +187,22 @@ static PyObject *py_descriptor_from_sddl(PyObject *self, PyObject *args)
return py_talloc_import((PyTypeObject *)self, secdesc);
}
static PyObject *py_descriptor_as_sddl(PyObject *self, PyObject *py_sid)
static PyObject *py_descriptor_as_sddl(PyObject *self, PyObject *args)
{
struct dom_sid *sid = py_talloc_get_ptr(py_sid);
struct dom_sid *sid;
PyObject *py_sid = Py_None;
struct security_descriptor *desc = py_talloc_get_ptr(self);
char *text;
PyObject *ret;
if (!PyArg_ParseTuple(args, "|O", &py_sid))
return NULL;
if (py_sid == Py_None)
sid = py_talloc_get_ptr(py_sid);
else
sid = NULL;
text = sddl_encode(NULL, desc, sid);
ret = PyString_FromString(text);
@ -215,7 +224,7 @@ static PyMethodDef py_descriptor_extra_methods[] = {
NULL },
{ "from_sddl", (PyCFunction)py_descriptor_from_sddl, METH_VARARGS|METH_CLASS,
NULL },
{ "as_sddl", (PyCFunction)py_descriptor_as_sddl, METH_O,
{ "as_sddl", (PyCFunction)py_descriptor_as_sddl, METH_VARARGS,
NULL },
{ NULL }
};