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 d011681acc212f722555e854cb8ce8cf8f87a919..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"
@@ -43,7 +42,7 @@ PyObject *spoolss_openprinter(PyObject *self, PyObject *args, PyObject *kw)
                return NULL;
        }
 
-       server = strdup(unc_name + 2);
+       server = SMB_STRDUP(unc_name + 2);
 
        if (strchr(server, '\\')) {
                char *c = strchr(server, '\\');
@@ -68,8 +67,8 @@ PyObject *spoolss_openprinter(PyObject *self, PyObject *args, PyObject *kw)
                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)) {
@@ -110,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 */
 
@@ -127,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 */
@@ -139,13 +138,8 @@ PyObject *spoolss_hnd_getprinter(PyObject *self, PyObject *args, PyObject *kw)
 
        /* 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 */
 
@@ -255,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 */
 
@@ -277,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;
@@ -331,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));
@@ -459,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;