From 84501f6b59e7903581deb87c7612f0a879cfb576 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 22 Dec 2008 06:34:18 +0100 Subject: Raise proper exceptions when lp file can't be found, be a bit less strict when no file was specified. --- source4/param/pyparam.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c index 04bef072314..0cf651dd7c6 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; } -- cgit v1.2.1