summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-10-21 04:12:47 +0000
committerTim Potter <tpot@samba.org>2002-10-21 04:12:47 +0000
commit7f62309268bf28dfd44eea23ca4d911742f25e5b (patch)
tree8e991c4ed54f26822f933bcdb0e2ed52c7e38549 /source3
parentaed3a9f3435b0d337645d3c7efc8d32194a8c528 (diff)
downloadsamba-7f62309268bf28dfd44eea23ca4d911742f25e5b.tar.gz
samba-7f62309268bf28dfd44eea23ca4d911742f25e5b.tar.bz2
samba-7f62309268bf28dfd44eea23ca4d911742f25e5b.zip
Fixed DRIVER_INFO_3 conversion function to check for dependent_files
key. (This used to be commit 35413be0ac39ce52f009f7750f23b41728d8a35c)
Diffstat (limited to 'source3')
-rw-r--r--source3/python/py_spoolss_drivers_conv.c32
1 files changed, 29 insertions, 3 deletions
diff --git a/source3/python/py_spoolss_drivers_conv.c b/source3/python/py_spoolss_drivers_conv.c
index 41ff38327e..fd47c0e84d 100644
--- a/source3/python/py_spoolss_drivers_conv.c
+++ b/source3/python/py_spoolss_drivers_conv.c
@@ -102,10 +102,16 @@ static PyObject *from_dependentfiles(uint16 *dependentfiles)
return list;
}
+static uint16 *to_dependentfiles(PyObject *dict)
+{
+ return (uint16 *)"abcd\0";
+}
+
BOOL py_from_DRIVER_INFO_1(PyObject **dict, DRIVER_INFO_1 *info)
{
*dict = from_struct(info, py_DRIVER_INFO_1);
PyDict_SetItemString(*dict, "level", PyInt_FromLong(1));
+
return True;
}
@@ -118,6 +124,7 @@ BOOL py_from_DRIVER_INFO_2(PyObject **dict, DRIVER_INFO_2 *info)
{
*dict = from_struct(info, py_DRIVER_INFO_2);
PyDict_SetItemString(*dict, "level", PyInt_FromLong(2));
+
return True;
}
@@ -129,7 +136,9 @@ BOOL py_to_DRIVER_INFO_2(DRIVER_INFO_2 *info, PyObject *dict)
BOOL py_from_DRIVER_INFO_3(PyObject **dict, DRIVER_INFO_3 *info)
{
*dict = from_struct(info, py_DRIVER_INFO_3);
+
PyDict_SetItemString(*dict, "level", PyInt_FromLong(3));
+
PyDict_SetItemString(
*dict, "dependent_files",
from_dependentfiles(info->dependentfiles));
@@ -139,12 +148,29 @@ BOOL py_from_DRIVER_INFO_3(PyObject **dict, DRIVER_INFO_3 *info)
BOOL py_to_DRIVER_INFO_3(DRIVER_INFO_3 *info, PyObject *dict)
{
- PyObject *dict_copy = PyDict_Copy(dict);
- BOOL result;
+ PyObject *obj, *dict_copy = PyDict_Copy(dict);
+ BOOL result = False;
+
+ if (!(obj = PyDict_GetItemString(dict_copy, "dependent_files")) ||
+ !PyList_Check(obj))
+ goto done;
+
+ info->dependentfiles = to_dependentfiles(obj);
+
+ PyDict_DelItemString(dict_copy, "dependent_files");
+
+ if (!(obj = PyDict_GetItemString(dict_copy, "level")) ||
+ !PyInt_Check(obj))
+ goto done;
PyDict_DelItemString(dict_copy, "level");
- result = to_struct(info, dict_copy, py_DRIVER_INFO_3);
+ if (!to_struct(info, dict_copy, py_DRIVER_INFO_3))
+ goto done;
+
+ result = True;
+
+done:
Py_DECREF(dict_copy);
return result;
}