git.samba.org / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
r25598: Add missing become_root/unbecome_root around calls of add_aliases.
[samba.git] / source / python / py_spoolss_printers.c
diff --git a/source/python/py_spoolss_printers.c b/source/python/py_spoolss_printers.c
index aa5f636b06367aae80e4a84bce901fa1535cb03e..306475800774105ca3f203c752024f2951ef2d89 100644 (file)
--- a/source/python/py_spoolss_printers.c
+++ b/source/python/py_spoolss_printers.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"
@@ -34,36 +33,42 @@ PyObject *spoolss_openprinter(PyObject *self, PyObject *args, PyObject *kw)
        struct cli_state *cli;
 
        if (!PyArg_ParseTupleAndKeywords(
-                   args, kw, "s|O!i", kwlist, &unc_name, &PyDict_Type, &creds,
+                   args, kw, "s|Oi", kwlist, &unc_name, &creds,
                    &desired_access))
                return NULL;
 
        if (unc_name[0] != '\\' || unc_name[1] != '\\') {
-               PyErr_SetString(spoolss_error, "bad printer name");
+               PyErr_SetString(PyExc_ValueError, "UNC name required");
                return NULL;
        }
 
-       server = strdup(unc_name + 2);
+       server = SMB_STRDUP(unc_name + 2);
 
        if (strchr(server, '\\')) {
                char *c = strchr(server, '\\');
                *c = 0;
        }
 
-       if (!(cli = open_pipe_creds(server, creds, PIPE_SPOOLSS, &errstr))) {
+       if (creds && creds != Py_None && !PyDict_Check(creds)) {
+               PyErr_SetString(PyExc_TypeError, 
+                               "credentials must be dictionary or None");
+               return NULL;
+       }
+
+       if (!(cli = open_pipe_creds(server, creds, PI_SPOOLSS, &errstr))) {
                PyErr_SetString(spoolss_error, errstr);
                free(errstr);
                goto done;
        }
 
-       if (!(mem_ctx = talloc_init())) {
+       if (!(mem_ctx = talloc_init("spoolss_openprinter"))) {
                PyErr_SetString(spoolss_error, 
                                "unable to init talloc context\n");
                goto done;
        }
 
-       werror = cli_spoolss_open_printer_ex(
-               cli, mem_ctx, unc_name, "", desired_access, server, 
+       werror = rpccli_spoolss_open_printer_ex(
+               cli->pipe_list, mem_ctx, unc_name, "", desired_access, server, 
                "", &hnd);
 
        if (!W_ERROR_IS_OK(werror)) {
@@ -104,7 +109,8 @@ PyObject *spoolss_closeprinter(PyObject *self, PyObject *args)
 
        /* Call rpc function */
 
-       result = cli_spoolss_close_printer(hnd->cli, hnd->mem_ctx, &hnd->pol);
+       result = rpccli_spoolss_close_printer(
+               hnd->cli, hnd->mem_ctx, &hnd->pol);
 
        /* Return value */
 
@@ -121,7 +127,6 @@ PyObject *spoolss_hnd_getprinter(PyObject *self, PyObject *args, PyObject *kw)
        PyObject *result = NULL;
        PRINTER_INFO_CTR ctr;
        int level = 1;
-       uint32 needed;
        static char *kwlist[] = {"level", NULL};
        
        /* Parse parameters */
@@ -129,22 +134,12 @@ PyObject *spoolss_hnd_getprinter(PyObject *self, PyObject *args, PyObject *kw)
        if (!PyArg_ParseTupleAndKeywords(args, kw, "|i", kwlist, &level))
                return NULL;
        
-       if (level < 0 || level > 3) {
-               PyErr_SetString(spoolss_error, "Invalid info level");
-               return NULL;
-       }
-
        ZERO_STRUCT(ctr);
 
        /* Call rpc function */
        
-       werror = cli_spoolss_getprinter(
-               hnd->cli, hnd->mem_ctx, 0, &needed, &hnd->pol, level, &ctr);
-
-       if (W_ERROR_V(werror) == ERRinsufficientbuffer)
-               werror = cli_spoolss_getprinter(
-                       hnd->cli, hnd->mem_ctx, needed, NULL, &hnd->pol,
-                       level, &ctr);
+       werror = rpccli_spoolss_getprinter(
+               hnd->cli, hnd->mem_ctx, &hnd->pol, level, &ctr);
 
        /* Return value */
 
@@ -218,7 +213,7 @@ PyObject *spoolss_hnd_setprinter(PyObject *self, PyObject *args, PyObject *kw)
        case 1:
                ctr.printers_1 = &pinfo.printers_1;
 
-               if (!py_to_PRINTER_INFO_1(&pinfo.printers_1, info)){
+               if (!py_to_PRINTER_INFO_1(ctr.printers_1, info)){
                        PyErr_SetString(spoolss_error, 
                                        "error converting printer to info 1");
                        return NULL;
@@ -228,7 +223,7 @@ PyObject *spoolss_hnd_setprinter(PyObject *self, PyObject *args, PyObject *kw)
        case 2:
                ctr.printers_2 = &pinfo.printers_2;
 
-               if (!py_to_PRINTER_INFO_2(&pinfo.printers_2, info,
+               if (!py_to_PRINTER_INFO_2(ctr.printers_2, info,
                                          hnd->mem_ctx)){
                        PyErr_SetString(spoolss_error, 
                                        "error converting printer to info 2");
@@ -239,7 +234,7 @@ PyObject *spoolss_hnd_setprinter(PyObject *self, PyObject *args, PyObject *kw)
        case 3:
                ctr.printers_3 = &pinfo.printers_3;
 
-               if (!py_to_PRINTER_INFO_3(&pinfo.printers_3, info,
+               if (!py_to_PRINTER_INFO_3(ctr.printers_3, info,
                                          hnd->mem_ctx)) {
                        PyErr_SetString(spoolss_error,
                                        "error converting to printer info 3");
@@ -254,8 +249,8 @@ PyObject *spoolss_hnd_setprinter(PyObject *self, PyObject *args, PyObject *kw)
 
        /* Call rpc function */
        
-       werror = cli_spoolss_setprinter(hnd->cli, hnd->mem_ctx, &hnd->pol,
-                                       level, &ctr, 0);
+       werror = rpccli_spoolss_setprinter(
+               hnd->cli, hnd->mem_ctx, &hnd->pol, level, &ctr, 0);
 
        /* Return value */
 
@@ -276,7 +271,7 @@ PyObject *spoolss_enumprinters(PyObject *self, PyObject *args, PyObject *kw)
        PyObject *result = NULL, *creds = NULL;
        PRINTER_INFO_CTR ctr;
        int level = 1, flags = PRINTER_ENUM_LOCAL, i;
-       uint32 needed, num_printers;
+       uint32 num_printers;
        static char *kwlist[] = {"server", "name", "level", "flags", 
                                 "creds", NULL};
        TALLOC_CTX *mem_ctx = NULL;
@@ -286,20 +281,30 @@ PyObject *spoolss_enumprinters(PyObject *self, PyObject *args, PyObject *kw)
        /* Parse parameters */
 
        if (!PyArg_ParseTupleAndKeywords(
-                   args, kw, "s|siiO!", kwlist, &server, &name, &level, 
-                   &flags, &PyDict_Type, &creds))
+                   args, kw, "s|siiO", kwlist, &server, &name, &level, 
+                   &flags, &creds))
                return NULL;
        
-       if (server[0] == '\\' && server[1] == '\\')
-               server += 2;
+       if (server[0] != '\\' || server[1] != '\\') {
+               PyErr_SetString(PyExc_ValueError, "UNC name required");
+               return NULL;
+       }
 
-       if (!(cli = open_pipe_creds(server, creds, PIPE_SPOOLSS, &errstr))) {
+       server += 2;
+
+       if (creds && creds != Py_None && !PyDict_Check(creds)) {
+               PyErr_SetString(PyExc_TypeError, 
+                               "credentials must be dictionary or None");
+               return NULL;
+       }
+
+       if (!(cli = open_pipe_creds(server, creds, PI_SPOOLSS, &errstr))) {
                PyErr_SetString(spoolss_error, errstr);
                free(errstr);
                goto done;
        }
 
-       if (!(mem_ctx = talloc_init())) {
+       if (!(mem_ctx = talloc_init("spoolss_enumprinters"))) {
                PyErr_SetString(
                        spoolss_error, "unable to init talloc context\n");
                goto done;
@@ -320,14 +325,8 @@ PyObject *spoolss_enumprinters(PyObject *self, PyObject *args, PyObject *kw)
 
        /* Call rpc function */
        
-       werror = cli_spoolss_enum_printers(
-               cli, mem_ctx, 0, &needed, name, flags, level,
-               &num_printers, &ctr);
-
-       if (W_ERROR_V(werror) == ERRinsufficientbuffer)
-               werror = cli_spoolss_enum_printers(
-                       cli, mem_ctx, needed, NULL, name, flags, level,
-                       &num_printers, &ctr);
+       werror = rpccli_spoolss_enum_printers(
+               cli->pipe_list, mem_ctx, name, flags, level, &num_printers, &ctr);
 
        if (!W_ERROR_IS_OK(werror)) {
                PyErr_SetObject(spoolss_werror, py_werror_tuple(werror));
@@ -342,9 +341,9 @@ PyObject *spoolss_enumprinters(PyObject *self, PyObject *args, PyObject *kw)
 
                for (i = 0; i < num_printers; i++) {
                        PyObject *value;
-                       fstring name;
+                       fstring s;
 
-                       rpcstr_pull(name, ctr.printers_0[i].printername.buffer,
+                       rpcstr_pull(s, ctr.printers_0[i].printername.buffer,
                                    sizeof(fstring), -1, STR_TERMINATE);
 
                        py_from_PRINTER_INFO_0(&value, &ctr.printers_0[i]);
@@ -352,7 +351,7 @@ PyObject *spoolss_enumprinters(PyObject *self, PyObject *args, PyObject *kw)
                        PyDict_SetItemString(
                                value, "level", PyInt_FromLong(0));
 
-                       PyDict_SetItemString(result, name, value);
+                       PyDict_SetItemString(result, s, value);
                }
 
                break;
@@ -361,9 +360,9 @@ PyObject *spoolss_enumprinters(PyObject *self, PyObject *args, PyObject *kw)
 
                for(i = 0; i < num_printers; i++) {
                        PyObject *value;
-                       fstring name;
+                       fstring s;
 
-                       rpcstr_pull(name, ctr.printers_1[i].name.buffer,
+                       rpcstr_pull(s, ctr.printers_1[i].name.buffer,
                                    sizeof(fstring), -1, STR_TERMINATE);
 
                        py_from_PRINTER_INFO_1(&value, &ctr.printers_1[i]);
@@ -371,7 +370,7 @@ PyObject *spoolss_enumprinters(PyObject *self, PyObject *args, PyObject *kw)
                        PyDict_SetItemString(
                                value, "level", PyInt_FromLong(1));
 
-                       PyDict_SetItemString(result, name, value);
+                       PyDict_SetItemString(result, s, value);
                }
                
                break;
@@ -380,9 +379,9 @@ PyObject *spoolss_enumprinters(PyObject *self, PyObject *args, PyObject *kw)
 
                for(i = 0; i < num_printers; i++) {
                        PyObject *value;
-                       fstring name;
+                       fstring s;
 
-                       rpcstr_pull(name, ctr.printers_2[i].printername.buffer,
+                       rpcstr_pull(s, ctr.printers_2[i].printername.buffer,
                                    sizeof(fstring), -1, STR_TERMINATE);
 
                        py_from_PRINTER_INFO_2(&value, &ctr.printers_2[i]);
@@ -390,7 +389,7 @@ PyObject *spoolss_enumprinters(PyObject *self, PyObject *args, PyObject *kw)
                        PyDict_SetItemString(
                                value, "level", PyInt_FromLong(2));
 
-                       PyDict_SetItemString(result, name, value);
+                       PyDict_SetItemString(result, s, value);
                }
                
                break;
@@ -428,13 +427,13 @@ PyObject *spoolss_addprinterex(PyObject *self, PyObject *args, PyObject *kw)
                    &PyDict_Type, &info, &PyDict_Type, &creds))
                return NULL;
 
-       if (!(cli = open_pipe_creds(server, creds, PIPE_SPOOLSS, &errstr))) {
+       if (!(cli = open_pipe_creds(server, creds, PI_SPOOLSS, &errstr))) {
                PyErr_SetString(spoolss_error, errstr);
                free(errstr);
                goto done;
        }
 
-       if (!(mem_ctx = talloc_init())) {
+       if (!(mem_ctx = talloc_init("spoolss_addprinterex"))) {
                PyErr_SetString(
                        spoolss_error, "unable to init talloc context\n");
                goto done;
@@ -448,7 +447,7 @@ PyObject *spoolss_addprinterex(PyObject *self, PyObject *args, PyObject *kw)
 
        ctr.printers_2 = &info2;
 
-       werror = cli_spoolss_addprinterex(cli, mem_ctx, 2, &ctr);
+       werror = rpccli_spoolss_addprinterex(cli->pipe_list, mem_ctx, 2, &ctr);
 
        Py_INCREF(Py_None);
        result = Py_None;
Samba Shared Repository