diff options
author | Tim Potter <tpot@samba.org> | 2002-05-16 04:00:31 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2002-05-16 04:00:31 +0000 |
commit | 286d3a80fdcd316ebbf63b007a24e787143313a4 (patch) | |
tree | 7eeabd842ec6e6f1721f5b3ecb19d350092d53e8 /source3/python/py_spoolss_ports.c | |
parent | ce03ce2e5629930e582f9fd17445e52ce1b08907 (diff) | |
download | samba-286d3a80fdcd316ebbf63b007a24e787143313a4.tar.gz samba-286d3a80fdcd316ebbf63b007a24e787143313a4.tar.bz2 samba-286d3a80fdcd316ebbf63b007a24e787143313a4.zip |
More cleanups.
- removed dodgy fprintf() error handling
- return an error string from open_pipe_creds() so the appropriate
exception can be raised by the caller
- reformatting
(This used to be commit d35cad359df3bd53e6bb49f6655d4c7b9993abb0)
Diffstat (limited to 'source3/python/py_spoolss_ports.c')
-rw-r--r-- | source3/python/py_spoolss_ports.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/source3/python/py_spoolss_ports.c b/source3/python/py_spoolss_ports.c index 8e74017f4a..fb3f47c746 100644 --- a/source3/python/py_spoolss_ports.c +++ b/source3/python/py_spoolss_ports.c @@ -31,21 +31,31 @@ PyObject *spoolss_enumports(PyObject *self, PyObject *args, PyObject *kw) static char *kwlist[] = {"server", "level", "creds", NULL}; TALLOC_CTX *mem_ctx = NULL; struct cli_state *cli = NULL; - char *server; + char *server, *errstr; PORT_INFO_CTR ctr; /* Parse parameters */ - if (!PyArg_ParseTupleAndKeywords(args, kw, "s|iO!", kwlist, - &server, &creds, &level, - &PyDict_Type)) + if (!PyArg_ParseTupleAndKeywords( + args, kw, "s|iO!", kwlist, &server, &creds, &level, + &PyDict_Type)) return NULL; if (server[0] == '\\' && server[1] == '\\') server += 2; - mem_ctx = talloc_init(); - cli = open_pipe_creds(server, creds, cli_spoolss_initialise); + if (!(cli = open_pipe_creds( + server, creds, cli_spoolss_initialise, &errstr))) { + PyErr_SetString(spoolss_error, errstr); + free(errstr); + return NULL; + } + + if (!(mem_ctx = talloc_init())) { + PyErr_SetString( + spoolss_error, "unable to initialise talloc context\n"); + return NULL; + } /* Call rpc function */ |