svn commit: samba r22814 - in branches/SAMBA_3_0_25/source/python: .
vlendec at samba.org
vlendec at samba.org
Sat May 12 11:08:43 GMT 2007
Author: vlendec
Date: 2007-05-12 11:08:42 +0000 (Sat, 12 May 2007)
New Revision: 22814
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22814
Log:
Fix the python build. Thanks to Steve Langasek!
Does not apply cleanly to 3_0, working on that.
Volker
Modified:
branches/SAMBA_3_0_25/source/python/py_ntsec.c
branches/SAMBA_3_0_25/source/python/py_spoolss_printers_conv.c
branches/SAMBA_3_0_25/source/python/py_srvsvc.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/python/py_ntsec.c
===================================================================
--- branches/SAMBA_3_0_25/source/python/py_ntsec.c 2007-05-12 07:44:09 UTC (rev 22813)
+++ branches/SAMBA_3_0_25/source/python/py_ntsec.c 2007-05-12 11:08:42 UTC (rev 22814)
@@ -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(mem_ctx, acl->num_aces * sizeof(SEC_ACE));
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);
}
Modified: branches/SAMBA_3_0_25/source/python/py_spoolss_printers_conv.c
===================================================================
--- branches/SAMBA_3_0_25/source/python/py_spoolss_printers_conv.c 2007-05-12 07:44:09 UTC (rev 22813)
+++ branches/SAMBA_3_0_25/source/python/py_spoolss_printers_conv.c 2007-05-12 11:08:42 UTC (rev 22814)
@@ -103,7 +103,6 @@
};
struct pyconv py_PRINTER_INFO_3[] = {
- { "flags", PY_UINT32, offsetof(PRINTER_INFO_3, flags) },
{ NULL }
};
Modified: branches/SAMBA_3_0_25/source/python/py_srvsvc.c
===================================================================
--- branches/SAMBA_3_0_25/source/python/py_srvsvc.c 2007-05-12 07:44:09 UTC (rev 22813)
+++ branches/SAMBA_3_0_25/source/python/py_srvsvc.c 2007-05-12 11:08:42 UTC (rev 22814)
@@ -122,7 +122,7 @@
status = rpccli_srvsvc_net_srv_get_info(cli->pipe_list, mem_ctx, level, &ctr);
- if (!NT_STATUS_IS_OK(status)) {
+ if (!W_ERROR_IS_OK(status)) {
PyErr_SetObject(srvsvc_error, py_werror_tuple(status));
goto done;
}
More information about the samba-cvs
mailing list