Author: gd Date: 2006-09-21 23:10:40 +0000 (Thu, 21 Sep 2006) New Revision: 18801
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18801 Log: Fix (at least the build of) python bindings. Guenther Modified: branches/SAMBA_3_0/source/python/py_ntsec.c Changeset: Modified: branches/SAMBA_3_0/source/python/py_ntsec.c =================================================================== --- branches/SAMBA_3_0/source/python/py_ntsec.c 2006-09-21 22:55:00 UTC (rev 18800) +++ branches/SAMBA_3_0/source/python/py_ntsec.c 2006-09-21 23:10:40 UTC (rev 18801) @@ -60,7 +60,7 @@ *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 @@ !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 @@ 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 @@ 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 @@ 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); }
