Changeset 751 for trunk/server/source3/librpc/gen_ndr/py_samr.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/librpc/gen_ndr/py_samr.c (modified) (2 diffs)

trunk/server/source3/librpc/gen_ndr/py_samr.c

@@ -6728 +6728 @@
         struct userPwdChangeFailureInformation *object = (struct userPwdChangeFailureInformation *)py_talloc_get_ptr(obj);
         PyObject *py_filterModuleName;
-        if (object->filterModuleName == NULL) {
-                py_filterModuleName = Py_None;
-                Py_INCREF(py_filterModuleName);
-        } else {
-                if (object->filterModuleName == NULL) {
-                        py_filterModuleName = Py_None;
-                        Py_INCREF(py_filterModuleName);
-                } else {
-                        py_filterModuleName = PyUnicode_Decode(object->filterModuleName, strlen(object->filterModuleName), "utf-8", "ignore");
-                }
-        }
+        py_filterModuleName = py_talloc_reference_ex(lsa_String_Type, py_talloc_get_mem_ctx(obj), &object->filterModuleName);
         return py_filterModuleName;
 }
@@ -6745 +6735 @@
 {
         struct userPwdChangeFailureInformation *object = (struct userPwdChangeFailureInformation *)py_talloc_get_ptr(py_obj);
-        if (value == Py_None) {
-                object->filterModuleName = NULL;
-        } else {
-                object->filterModuleName = NULL;
-                if (PyUnicode_Check(value)) {
-                        object->filterModuleName = PyString_AS_STRING(PyUnicode_AsEncodedString(value, "utf-8", "ignore"));
-                } else if (PyString_Check(value)) {
-                        object->filterModuleName = PyString_AS_STRING(value);
-                } else {
-                        PyErr_Format(PyExc_TypeError, "Expected string or unicode object, got %s", Py_TYPE(value)->tp_name);
-                        return -1;
-                }
-        }
+        PY_CHECK_TYPE(lsa_String_Type, value, return -1;);
+        if (talloc_reference(py_talloc_get_mem_ctx(py_obj), py_talloc_get_mem_ctx(value)) == NULL) {
+                PyErr_NoMemory();
+                return -1;
+        }
+        object->filterModuleName = *(struct lsa_String *)py_talloc_get_ptr(value);
         return 0;
 }