sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-12 12:23:50 +03:00
Code Activity

Honour return value of to_struct() when converting to Samba structures.

Browse Source
This commit is contained in:
Tim Potter
-
parent 736eb3c748
commit 1ef99e7663
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/python/py_spoolss_jobs_conv.c
View File

@@ -98,6 +98,5 @@ BOOL py_from_DOC_INFO_1(PyObject **dict, DOC_INFO_1 *info)
BOOL py_to_DOC_INFO_1(DOC_INFO_1 *info, PyObject *dict)
{
to_struct(info, dict, py_DOC_INFO_1);
return True;
return to_struct(info, dict, py_DOC_INFO_1);
}

18
source/python/py_spoolss_printers_conv.c
View File

@@ -163,7 +163,8 @@ BOOL py_to_DEVICEMODE(DEVICEMODE *devmode, PyObject *dict)
{
PyObject *obj;
to_struct(devmode, dict, py_DEVICEMODE);
if (!to_struct(devmode, dict, py_DEVICEMODE))
return False;
if (!(obj = PyDict_GetItemString(dict, "private")))
return False;
@@ -203,7 +204,14 @@ BOOL py_from_PRINTER_INFO_1(PyObject **dict, PRINTER_INFO_1 *info)
BOOL py_to_PRINTER_INFO_1(PRINTER_INFO_1 *info, PyObject *dict)
{
return False;
PyObject *dict_copy = PyDict_Copy(dict);
BOOL result;
PyDict_DelItemString(dict_copy, "level");
result = to_struct(info, dict_copy, py_PRINTER_INFO_1);
Py_DECREF(dict_copy);
return result;
}
/*
@@ -232,7 +240,8 @@ BOOL py_to_PRINTER_INFO_2(PRINTER_INFO_2 *info, PyObject *dict,
{
PyObject *obj;
to_struct(info, dict, py_PRINTER_INFO_2);
if (!to_struct(info, dict, py_PRINTER_INFO_2))
return False;
if (!(obj = PyDict_GetItemString(dict, "security_descriptor")))
return False;
@@ -274,7 +283,8 @@ BOOL py_to_PRINTER_INFO_3(PRINTER_INFO_3 *info, PyObject *dict,
{
PyObject *obj;
to_struct(info, dict, py_PRINTER_INFO_3);
if (!to_struct(info, dict, py_PRINTER_INFO_3))
return False;
if (!(obj = PyDict_GetItemString(dict, "security_descriptor")))
return False;