summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-09-21 23:10:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:00:59 -0500
commit8ffe6c8a8d0c3315393506feabbbba5d503666e8 (patch)
treed2911044024ea974b3a7e07dc7110a11f5f9cee4
parent1b7b6e54db63ec1faceaeb58b9df0627a5992806 (diff)
downloadsamba-8ffe6c8a8d0c3315393506feabbbba5d503666e8.tar.gz
samba-8ffe6c8a8d0c3315393506feabbbba5d503666e8.tar.bz2
samba-8ffe6c8a8d0c3315393506feabbbba5d503666e8.zip
r18801: Fix (at least the build of) python bindings.
Guenther (This used to be commit fc6543ca78e5c137d77bdc7845df273aae50e5cb)
-rw-r--r--source3/python/py_ntsec.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/python/py_ntsec.c b/source3/python/py_ntsec.c
index 38886f679e..e59a33f97b 100644
--- a/source3/python/py_ntsec.c
+++ b/source3/python/py_ntsec.c
@@ -60,7 +60,7 @@ BOOL py_from_ACE(PyObject **dict, SEC_ACE *ace)
*dict = Py_BuildValue("{sisisi}", "type", ace->type,
"flags", ace->flags,
- "mask", ace->info.mask);
+ "mask", ace->access_mask);
if (py_from_SID(&obj, &ace->trustee)) {
PyDict_SetItemString(*dict, "trustee", obj);
@@ -103,7 +103,7 @@ BOOL py_to_ACE(SEC_ACE *ace, PyObject *dict)
!PyInt_Check(obj))
return False;
- sec_access.mask = PyInt_AsLong(obj);
+ sec_access = PyInt_AsLong(obj);
init_sec_ace(ace, &trustee, ace_type, sec_access, ace_flags);
@@ -130,7 +130,7 @@ BOOL py_from_ACL(PyObject **dict, SEC_ACL *acl)
for (i = 0; i < acl->num_aces; i++) {
PyObject *obj;
- if (py_from_ACE(&obj, &acl->ace[i]))
+ if (py_from_ACE(&obj, &acl->aces[i]))
PyList_SetItem(ace_list, i, obj);
}
@@ -157,16 +157,16 @@ BOOL py_to_ACL(SEC_ACL *acl, PyObject *dict, TALLOC_CTX *mem_ctx)
acl->num_aces = PyList_Size(obj);
- acl->ace = _talloc(mem_ctx, acl->num_aces * sizeof(SEC_ACE));
+ acl->aces = talloc_array(mem_ctx, struct security_ace, acl->num_aces);
acl->size = SEC_ACL_HEADER_SIZE;
for (i = 0; i < acl->num_aces; i++) {
PyObject *py_ace = PyList_GetItem(obj, i);
- if (!py_to_ACE(&acl->ace[i], py_ace))
+ if (!py_to_ACE(&acl->aces[i], py_ace))
return False;
- acl->size += acl->ace[i].size;
+ acl->size += acl->aces[i].size;
}
return True;
@@ -191,7 +191,7 @@ BOOL py_from_SECDESC(PyObject **dict, SEC_DESC *sd)
Py_DECREF(obj);
}
- if (py_from_SID(&obj, sd->grp_sid)) {
+ if (py_from_SID(&obj, sd->group_sid)) {
PyDict_SetItemString(*dict, "group_sid", obj);
Py_DECREF(obj);
}