diff options
author | Tim Potter <tpot@samba.org> | 2004-10-06 02:05:39 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2004-10-06 02:05:39 +0000 |
commit | 3ccc081944f0f36ccc47eb835b829b53abec972b (patch) | |
tree | 909a1ee7d1bd9923c649aa2284b2db9b3d95a8aa /source/python | |
parent | ce742c2f66d5b0656c4d0ae69381ecaa5f6a9f8f (diff) | |
download | samba-3ccc081944f0f36ccc47eb835b829b53abec972b.tar.gz samba-3ccc081944f0f36ccc47eb835b829b53abec972b.tar.xz samba-3ccc081944f0f36ccc47eb835b829b53abec972b.zip |
r2828: Fix for bugzilla #1864 from Brett again.
Add sd->type field to security descriptor Python representation.
Diffstat (limited to 'source/python')
-rw-r--r-- | source/python/py_ntsec.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/python/py_ntsec.c b/source/python/py_ntsec.c index 5ce5e8fc1be..907e9d08c1b 100644 --- a/source/python/py_ntsec.c +++ b/source/python/py_ntsec.c @@ -182,6 +182,10 @@ BOOL py_from_SECDESC(PyObject **dict, SEC_DESC *sd) PyDict_SetItemString(*dict, "revision", obj); Py_DECREF(obj); + obj = PyInt_FromLong(sd->type); + PyDict_SetItemString(*dict, "type", obj); + Py_DECREF(obj); + if (py_from_SID(&obj, sd->owner_sid)) { PyDict_SetItemString(*dict, "owner_sid", obj); Py_DECREF(obj); @@ -209,6 +213,7 @@ BOOL py_to_SECDESC(SEC_DESC **sd, PyObject *dict, TALLOC_CTX *mem_ctx) { PyObject *obj; uint16 revision; + uint16 type = SEC_DESC_SELF_RELATIVE; DOM_SID owner_sid, group_sid; SEC_ACL sacl, dacl; BOOL got_dacl = False, got_sacl = False; @@ -222,6 +227,12 @@ BOOL py_to_SECDESC(SEC_DESC **sd, PyObject *dict, TALLOC_CTX *mem_ctx) revision = PyInt_AsLong(obj); + if ((obj = PyDict_GetItemString(dict, "type"))) { + if (obj != Py_None) { + type = PyInt_AsLong(obj); + } + } + if ((obj = PyDict_GetItemString(dict, "owner_sid"))) { if (obj != Py_None) { @@ -276,7 +287,7 @@ BOOL py_to_SECDESC(SEC_DESC **sd, PyObject *dict, TALLOC_CTX *mem_ctx) { size_t sd_size; - *sd = make_sec_desc(mem_ctx, revision, SEC_DESC_SELF_RELATIVE, + *sd = make_sec_desc(mem_ctx, revision, type, got_owner_sid ? &owner_sid : NULL, got_group_sid ? &group_sid : NULL, got_sacl ? &sacl : NULL, |