diff options
| author | Tim Potter <tpot@samba.org> | 2002-05-17 02:28:26 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-05-17 02:28:26 +0000 |
| commit | 2566dad274e0bced9e55cbc3c126c00e70373fbe (patch) | |
| tree | 760ea3a166358f39f1b68e92eafacb7ccb49b4d6 /source/python | |
| parent | 4cafbcb205af11c478a2d9047554315915933e5d (diff) | |
| download | samba-2566dad274e0bced9e55cbc3c126c00e70373fbe.tar.gz samba-2566dad274e0bced9e55cbc3c126c00e70373fbe.tar.xz samba-2566dad274e0bced9e55cbc3c126c00e70373fbe.zip | |
Call get_level_value() utility function.
Diffstat (limited to 'source/python')
| -rw-r--r-- | source/python/py_spoolss_drivers.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/source/python/py_spoolss_drivers.c b/source/python/py_spoolss_drivers.c index ec85f9dd6fb..e95d548ef1d 100644 --- a/source/python/py_spoolss_drivers.c +++ b/source/python/py_spoolss_drivers.c @@ -298,7 +298,7 @@ PyObject *spoolss_addprinterdriver(PyObject *self, PyObject *args, static char *kwlist[] = { "server", "info", "creds", NULL }; char *server, *errstr; uint32 level; - PyObject *info, *result = NULL, *creds = NULL, *level_obj; + PyObject *info, *result = NULL, *creds = NULL; WERROR werror; TALLOC_CTX *mem_ctx; struct cli_state *cli; @@ -328,29 +328,16 @@ PyObject *spoolss_addprinterdriver(PyObject *self, PyObject *args, goto done; } - if ((level_obj = PyDict_GetItemString(info, "level"))) { - - if (!PyInt_Check(level_obj)) { - PyErr_SetString(spoolss_error, - "level not an integer"); - goto done; - } - - level = PyInt_AsLong(level_obj); - - /* Only level 2, 3 supported by NT */ - - if (level != 3) { - PyErr_SetString(spoolss_error, - "unsupported info level"); - goto done; - } + if (!get_level_value(info, &level)) { + PyErr_SetString(spoolss_error, "invalid info level"); + return NULL; + } - } else { - PyErr_SetString(spoolss_error, "no info level present"); + if (level != 3) { + PyErr_SetString(spoolss_error, "unsupported info level"); goto done; } - + ZERO_STRUCT(ctr); switch(level) { |