Merge branch 'master' of ssh://git.samba.org/data/git/samba

1 files changed, 4 insertions, 4 deletions

diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index 04bef07231..0cf651dd7c 100644
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -317,6 +317,8 @@ struct loadparm_context *lp_from_py_object(PyObject *py_obj)
         lp_ctx = loadparm_init(NULL);
         if (!lp_load(lp_ctx, PyString_AsString(py_obj))) {
             talloc_free(lp_ctx);
+	    PyErr_Format(PyExc_RuntimeError, 
+			 "Unable to load %s", PyString_AsString(py_obj));
             return NULL;
         }
         return lp_ctx;
@@ -324,10 +326,8 @@ struct loadparm_context *lp_from_py_object(PyObject *py_obj)
 
     if (py_obj == Py_None) {
         lp_ctx = loadparm_init(NULL);
-        if (!lp_load_default(lp_ctx)) {
-            talloc_free(lp_ctx);
-            return NULL;
-        }
+	/* We're not checking that loading the file succeeded *on purpose */
+        lp_load_default(lp_ctx);
         return lp_ctx;
     }