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

[jerry/samba.git] / source / python / py_spoolss_forms_conv.c

diff --git a/source/python/py_spoolss_forms_conv.c b/source/python/py_spoolss_forms_conv.c
index 2ded9afe91f7c08599cefeacb9493a5a10669d0d..ae990a50d6c3decf06551911a76523c865811215 100644 (file)
--- a/source/python/py_spoolss_forms_conv.c
+++ b/source/python/py_spoolss_forms_conv.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"
@@ -47,11 +46,45 @@ struct pyconv py_FORM_1[] = {
 BOOL py_from_FORM_1(PyObject **dict, FORM_1 *form)
 {
        *dict = from_struct(form, py_FORM_1);
+
+       PyDict_SetItemString(*dict, "level", PyInt_FromLong(1));
+
        return True;
 }
 
 BOOL py_to_FORM(FORM *form, PyObject *dict)
 {
-       to_struct(form, dict, py_FORM);
-       return True;
+       PyObject *obj, *dict_copy = PyDict_Copy(dict);
+       char *name;
+       BOOL result = False;
+
+       if (!(obj = PyDict_GetItemString(dict_copy, "name")) || 
+           !PyString_Check(obj))
+               goto done;
+
+       PyDict_DelItemString(dict_copy, "name");
+
+       if (!(obj = PyDict_GetItemString(dict_copy, "level")) ||
+           !PyInt_Check(obj))
+               goto done;
+
+       PyDict_DelItemString(dict_copy, "level");
+
+       if (!to_struct(form, dict_copy, py_FORM))
+               goto done;
+
+       /* Careful!  We can't call PyString_AsString(obj) then delete
+          obj and still expect to have our pointer pointing somewhere
+          useful. */
+
+       obj = PyDict_GetItemString(dict, "name");
+       name = PyString_AsString(obj);
+
+       init_unistr2(&form->name, name, UNI_STR_TERMINATE);
+       
+       result = True;
+
+done:
+       Py_DECREF(dict_copy);
+       return result;
 }