r25598: Add missing become_root/unbecome_root around calls of add_aliases.

[samba.git] / source / python / py_spoolss_ports.c

diff --git a/source/python/py_spoolss_ports.c b/source/python/py_spoolss_ports.c
index 8e74017f4a71d40c8968c0021c13278545f5374d..8dad35b79df95d3219726c50a817010c6ce6a55b 100644 (file)
--- a/source/python/py_spoolss_ports.c
+++ b/source/python/py_spoolss_ports.c
@@ -5,7 +5,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "python/py_spoolss.h"
@@ -25,71 +24,108 @@
 PyObject *spoolss_enumports(PyObject *self, PyObject *args, PyObject *kw)
 {
        WERROR werror;
-       PyObject *result, *creds = NULL;
-       int level = 1;
+       PyObject *result = NULL, *creds = NULL;
+       uint32 level = 1;
        uint32 i, needed, num_ports;
        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, &level, &creds))
                return NULL;
        
-       if (server[0] == '\\' && server[1] == '\\')
-               server += 2;
+       if (server[0] != '\\' || server[1] != '\\') {
+               PyErr_SetString(PyExc_ValueError, "UNC name required");
+               return NULL;
+       }
 
-       mem_ctx = talloc_init();
-       cli = open_pipe_creds(server, creds, cli_spoolss_initialise);
+       server += 2;
 
-       /* Call rpc function */
-       
-       werror = cli_spoolss_enum_ports(
-               cli, mem_ctx, 0, &needed, level, &num_ports, &ctr);
+       if (creds && creds != Py_None && !PyDict_Check(creds)) {
+               PyErr_SetString(PyExc_TypeError, 
+                               "credentials must be dictionary or None");
+               return NULL;
+       }
 
-       if (W_ERROR_V(werror) == ERRinsufficientbuffer)
-               werror = cli_spoolss_enum_ports(
-                       cli, mem_ctx, needed, NULL, level,
-                       &num_ports, &ctr);
+       if (!(cli = open_pipe_creds(server, creds, PI_SPOOLSS, &errstr))) {
+               PyErr_SetString(spoolss_error, errstr);
+               free(errstr);
+               goto done;
+       }
 
-       /* Return value */
+       if (!(mem_ctx = talloc_init("spoolss_enumports"))) {
+               PyErr_SetString(
+                       spoolss_error, "unable to init talloc context\n");
+               goto done;
+       }
+
+       /* Call rpc function */
        
-       result = Py_None;
+       werror = rpccli_spoolss_enum_ports( 
+               cli->pipe_list, mem_ctx, level, &num_ports, &ctr);
 
-       if (!W_ERROR_IS_OK(werror))
+       if (!W_ERROR_IS_OK(werror)) {
+               PyErr_SetObject(spoolss_werror, py_werror_tuple(werror));
                goto done;
+       }
 
-       result = PyList_New(num_ports);
-
+       /* Return value */
+       
        switch (level) {
        case 1: 
+               result = PyDict_New();
+
                for (i = 0; i < num_ports; i++) {
                        PyObject *value;
+                       fstring name;
+
+                       rpcstr_pull(name, ctr.port.info_1[i].port_name.buffer,
+                                   sizeof(fstring), -1, STR_TERMINATE);
 
                        py_from_PORT_INFO_1(&value, &ctr.port.info_1[i]);
 
-                       PyList_SetItem(result, i, value);
+                       PyDict_SetItemString(
+                               value, "level", PyInt_FromLong(1));
+
+                       PyDict_SetItemString(result, name, value);
                }
 
                break;
        case 2:
+               result = PyDict_New();
+
                for(i = 0; i < num_ports; i++) {
                        PyObject *value;
+                       fstring name;
+
+                       rpcstr_pull(name, ctr.port.info_2[i].port_name.buffer,
+                                   sizeof(fstring), -1, STR_TERMINATE);
 
                        py_from_PORT_INFO_2(&value, &ctr.port.info_2[i]);
 
-                       PyList_SetItem(result, i, value);
+                       PyDict_SetItemString(
+                               value, "level", PyInt_FromLong(2));
+
+                       PyDict_SetItemString(result, name, value);
                }
                
                break;
+       default:
+               PyErr_SetString(spoolss_error, "unknown info level");
+               goto done;
        }
 
  done:
-       Py_INCREF(result);
+       if (cli)
+               cli_shutdown(cli);
+       
+       if (mem_ctx)
+               talloc_destroy(mem_ctx);
+
        return result;
 }