sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

py_passdb: Use pytalloc_BaseObject_PyType_Ready()

Browse Source 
This changes py_passdb to use talloc.BaseObject() just like the PIDL output

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2016-03-01 09:30:03 +13:00
parent fc747539dc
commit 0705aee099
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/passdb/py_passdb.c
View File

@ -1108,7 +1108,6 @@ static PyObject *py_samu_new(PyTypeObject *type, PyObject *args, PyObject *kwarg
static PyTypeObject PySamu = {
.tp_name = "passdb.Samu",
.tp_basicsize = sizeof(pytalloc_Object),
.tp_getset = py_samu_getsetters,
.tp_methods = NULL,
.tp_new = py_samu_new,
@ -1311,7 +1310,6 @@ static PyObject *py_groupmap_new(PyTypeObject *type, PyObject *args, PyObject *k
static PyTypeObject PyGroupmap = {
.tp_name = "passdb.Groupmap",
.tp_basicsize = sizeof(pytalloc_Object),
.tp_getset = py_groupmap_getsetters,
.tp_methods = NULL,
.tp_new = py_groupmap_new,
@ -3569,7 +3567,6 @@ static PyObject *py_pdb_new(PyTypeObject *type, PyObject *args, PyObject *kwargs
static PyTypeObject PyPDB = {
.tp_name = "passdb.PDB",
.tp_basicsize = sizeof(pytalloc_Object),
.tp_new = py_pdb_new,
.tp_flags = Py_TPFLAGS_DEFAULT,
.tp_methods = py_pdb_methods,
@ -3713,26 +3710,17 @@ void initpassdb(void)
PyObject *m, *mod;
char exception_name[] = "passdb.error";
PyTypeObject *talloc_type = pytalloc_GetObjectType();
if (talloc_type == NULL) {
if (pytalloc_BaseObject_PyType_Ready(&PyPDB) < 0) {
talloc_free(frame);
return;
}
PyPDB.tp_base = talloc_type;
if (PyType_Ready(&PyPDB) < 0) {
if (pytalloc_BaseObject_PyType_Ready(&PySamu) < 0) {
talloc_free(frame);
return;
}
PySamu.tp_base = talloc_type;
if (PyType_Ready(&PySamu) < 0) {
talloc_free(frame);
return;
}
PyGroupmap.tp_base = talloc_type;
if (PyType_Ready(&PyGroupmap) < 0) {
if (pytalloc_BaseObject_PyType_Ready(&PyGroupmap) < 0) {
talloc_free(frame);
return;
}