s4-param: Use s3 dump method if s3 context is defined

[kai/samba.git] / source4 / param / pyparam_util.c

diff --git a/source4/param/pyparam_util.c b/source4/param/pyparam_util.c
index 528c007624d68faf2025473ef6f2a2a7db92bd25..874d78363b760459fa0232c040bd7d43f2680f95 100644 (file)
--- a/source4/param/pyparam_util.c
+++ b/source4/param/pyparam_util.c
@@ -22,9 +22,9 @@
 #include "param/param.h"
 #include "param/pyparam.h"
 #include "param/loadparm.h"
-#include "lib/talloc/pytalloc.h"
+#include <pytalloc.h>
 
-#define PyLoadparmContext_AsLoadparmContext(obj) py_talloc_get_type(obj, struct loadparm_context)
+#define PyLoadparmContext_AsLoadparmContext(obj) pytalloc_get_type(obj, struct loadparm_context)
 
 _PUBLIC_ struct loadparm_context *lpcfg_from_py_object(TALLOC_CTX *mem_ctx, PyObject *py_obj)
 {
@@ -35,6 +35,9 @@ _PUBLIC_ struct loadparm_context *lpcfg_from_py_object(TALLOC_CTX *mem_ctx, PyOb
 
        if (PyString_Check(py_obj)) {
                lp_ctx = loadparm_init_global(false);
+               if (lp_ctx == NULL) {
+                       return NULL;
+               }
                if (!lpcfg_load(lp_ctx, PyString_AsString(py_obj))) {
                        PyErr_Format(PyExc_RuntimeError, "Unable to load %s", 
                                     PyString_AsString(py_obj));