s4:python: add PyString_FromStringOrNULL() to pyrpc_util

metze

diff --git a/source4/librpc/rpc/pyrpc_util.c b/source4/librpc/rpc/pyrpc_util.c
index 33bce387afeeeff65813eeed666fc7bc82105691..5ad8d2f9e89e0eff13e462c0104f0afa2b9323a7 100644 (file)
--- a/source4/librpc/rpc/pyrpc_util.c
+++ b/source4/librpc/rpc/pyrpc_util.c
@@ -300,3 +300,11 @@ PyObject *py_return_ndr_struct(const char *module_name, const char *type_name,
 
        return py_talloc_reference_ex(py_type, r_ctx, r);
 }
+
+PyObject *PyString_FromStringOrNULL(const char *str)
+{
+       if (str == NULL) {
+               Py_RETURN_NONE;
+       }
+       return PyString_FromString(str);
+}

diff --git a/source4/librpc/rpc/pyrpc_util.h b/source4/librpc/rpc/pyrpc_util.h
index f102014147c499cc2843eb764e713e6c5d9d4a8a..445138b9b5f62263aff679b34ceed6b35d60b498 100644 (file)
--- a/source4/librpc/rpc/pyrpc_util.h
+++ b/source4/librpc/rpc/pyrpc_util.h
@@ -53,4 +53,6 @@ PyObject *py_dcerpc_interface_init_helper(PyTypeObject *type, PyObject *args, Py
 PyObject *py_return_ndr_struct(const char *module_name, const char *type_name,
                               TALLOC_CTX *r_ctx, void *r);
 
+PyObject *PyString_FromStringOrNULL(const char *str);
+
 #endif /* __PYRPC_UTIL_H__ */