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

Fix of a bug in the security.descriptor.as_sddl() method

Browse Source 
security.descriptor.as_sddl() method did not work correctly when invoked without
supplying the domain sid. Returned the same value as when the sid was provided.
Test added for this case in  libcli/security/tests/bindings.py

Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
This commit is contained in:
nadezhda ivanova 2009-04-23 17:18:23 +03:00 committed by Jelmer Vernooij
parent 3cf48ee05a
commit 90cc5e72ba
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/libcli/security/tests/bindings.py
View File

@ -77,6 +77,12 @@ class SecurityDescriptorTests(unittest.TestCase):
self.assertEquals(desc1.sacl, desc2.sacl)
self.assertEquals(desc1.type, desc2.type)
def test_domsid_nodomsid_as_sddl(self):
dom = security.dom_sid("S-2-0-0")
text = "O:AOG:DAD:(A;;RPWPCCDCLCSWRCWDWOGA;;;S-1-0-0)"
desc1 = security.descriptor.from_sddl(text, dom)
self.assertNotEqual(desc1.as_sddl(), desc1.as_sddl(dom))
class DomSidTests(unittest.TestCase):
def test_parse_sid(self):

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

@ -198,7 +198,7 @@ static PyObject *py_descriptor_as_sddl(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "|O", &py_sid))
return NULL;
if (py_sid == Py_None)
if (py_sid != Py_None)
sid = py_talloc_get_ptr(py_sid);
else
sid = NULL;