r20933: Fix the build without inotify

[samba.git] / source3 / python / py_spoolss_forms.c

diff --git a/source3/python/py_spoolss_forms.c b/source3/python/py_spoolss_forms.c
index b446ce3c967cbca802e089e800fe98f2e50c8591..ce8492c7213e68e607b04edf13c1e74690eb040d 100644 (file)
--- a/source3/python/py_spoolss_forms.c
+++ b/source3/python/py_spoolss_forms.c
@@ -59,7 +59,7 @@ PyObject *spoolss_hnd_addform(PyObject *self, PyObject *args, PyObject *kw)
                PyObject *obj = PyDict_GetItemString(info, "name");
                char *form_name = PyString_AsString(obj);
 
-               init_unistr2(&form.name, form_name);
+               init_unistr2(&form.name, form_name, UNI_STR_TERMINATE);
                break;
        }
        default:
@@ -67,8 +67,8 @@ PyObject *spoolss_hnd_addform(PyObject *self, PyObject *args, PyObject *kw)
                return NULL;
        }
                
-       werror = cli_spoolss_addform(hnd->cli, hnd->mem_ctx, &hnd->pol,
-                                    level, &form);
+       werror = rpccli_spoolss_addform(hnd->cli, hnd->mem_ctx, &hnd->pol,
+                                       level, &form);
 
 
        if (!W_ERROR_IS_OK(werror)) {
@@ -90,7 +90,6 @@ PyObject *spoolss_hnd_getform(PyObject *self, PyObject *args, PyObject *kw)
        char *form_name;
        int level = 1;
        static char *kwlist[] = {"form_name", "level", NULL};
-       uint32 needed;
        FORM_1 form;
 
        /* Parse parameters */
@@ -101,13 +100,8 @@ PyObject *spoolss_hnd_getform(PyObject *self, PyObject *args, PyObject *kw)
        
        /* Call rpc function */
 
-       werror = cli_spoolss_getform(hnd->cli, hnd->mem_ctx, 0, &needed,
-                                    &hnd->pol, form_name, level, &form);
-
-       if (W_ERROR_V(werror) == ERRinsufficientbuffer)
-               werror = cli_spoolss_getform(
-                       hnd->cli, hnd->mem_ctx, needed, NULL, &hnd->pol,
-                       form_name, 1, &form);
+       werror = rpccli_spoolss_getform(
+               hnd->cli, hnd->mem_ctx, &hnd->pol, form_name, level, &form);
 
        if (!W_ERROR_IS_OK(werror)) {
                PyErr_SetObject(spoolss_werror, py_werror_tuple(werror));
@@ -162,7 +156,7 @@ PyObject *spoolss_hnd_setform(PyObject *self, PyObject *args, PyObject *kw)
 
        form_name = PyDict_GetItemString(info, "name");
 
-       werror = cli_spoolss_setform(
+       werror = rpccli_spoolss_setform(
                hnd->cli, hnd->mem_ctx, &hnd->pol, level, 
                PyString_AsString(form_name), &form);
 
@@ -192,7 +186,7 @@ PyObject *spoolss_hnd_deleteform(PyObject *self, PyObject *args, PyObject *kw)
        
        /* Call rpc function */
 
-       werror = cli_spoolss_deleteform(
+       werror = rpccli_spoolss_deleteform(
                hnd->cli, hnd->mem_ctx, &hnd->pol, form_name);
 
        if (!W_ERROR_IS_OK(werror)) {
@@ -211,7 +205,7 @@ PyObject *spoolss_hnd_enumforms(PyObject *self, PyObject *args, PyObject *kw)
        PyObject *result;
        spoolss_policy_hnd_object *hnd = (spoolss_policy_hnd_object *)self;
        WERROR werror;
-       uint32 level = 1, num_forms, needed, i;
+       uint32 level = 1, num_forms, i;
        static char *kwlist[] = {"level", NULL};
        FORM_1 *forms;
 
@@ -223,14 +217,8 @@ PyObject *spoolss_hnd_enumforms(PyObject *self, PyObject *args, PyObject *kw)
        
        /* Call rpc function */
 
-       werror = cli_spoolss_enumforms(
-               hnd->cli, hnd->mem_ctx, 0, &needed, &hnd->pol, level,
-               &num_forms, &forms);
-
-       if (W_ERROR_V(werror) == ERRinsufficientbuffer)
-               werror = cli_spoolss_enumforms(
-                       hnd->cli, hnd->mem_ctx, needed, NULL, &hnd->pol, level,
-                       &num_forms, &forms);
+       werror = rpccli_spoolss_enumforms(
+               hnd->cli, hnd->mem_ctx, &hnd->pol, level, &num_forms, &forms);
 
        if (!W_ERROR_IS_OK(werror)) {
                PyErr_SetObject(spoolss_werror, py_werror_tuple(werror));