2 files changed, 34 insertions, 0 deletions
diff --git a/source4/librpc/rpc/pyrpc_util.c b/source4/librpc/rpc/pyrpc_util.c
index 2af868c0c2..f3911eeb9a 100644
--- a/source4/librpc/rpc/pyrpc_util.c
+++ b/source4/librpc/rpc/pyrpc_util.c
@@ -240,3 +240,34 @@ void PyErr_SetDCERPCStatus(struct dcerpc_pipe *p, NTSTATUS status)
 }
 
 
+/*
+  take a NDR structure that has a type in a python module and return
+  it as a python object
+
+  r is the NDR structure pointer (a C structure)
+
+  r_ctx is the context that is a parent of r. It will be referenced by
+  the resulting python object
+ */
+PyObject *py_return_ndr_struct(const char *module_name, const char *type_name,
+			       TALLOC_CTX *r_ctx, void *r)
+{
+	PyTypeObject *py_type;
+	PyObject *module;
+
+	if (r == NULL) {
+		Py_RETURN_NONE;
+	}
+
+	module = PyImport_ImportModule(module_name);
+	if (module == NULL) {
+		return NULL;
+	}
+
+	py_type = (PyTypeObject *)PyObject_GetAttrString(module, type_name);
+	if (py_type == NULL) {
+		return NULL;
+	}
+
+	return py_talloc_reference_ex(py_type, r_ctx, r);
+}
diff --git a/source4/librpc/rpc/pyrpc_util.h b/source4/librpc/rpc/pyrpc_util.h
index abd7f6ba7b..1efe112a11 100644
--- a/source4/librpc/rpc/pyrpc_util.h
+++ b/source4/librpc/rpc/pyrpc_util.h
@@ -55,4 +55,7 @@ bool py_check_dcerpc_type(PyObject *obj, const char *module, const char *typenam
 bool PyInterface_AddNdrRpcMethods(PyTypeObject *object, const struct PyNdrRpcMethodDef *mds);
 PyObject *py_dcerpc_interface_init_helper(PyTypeObject *type, PyObject *args, PyObject *kwargs, const struct ndr_interface_table *table);
 
+PyObject *py_return_ndr_struct(const char *module_name, const char *type_name,
+			       TALLOC_CTX *r_ctx, void *r);
+
 #endif /* __PYRPC_UTIL_H__ */