summaryrefslogtreecommitdiff
path: root/source4/param
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-12-22 06:34:18 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-12-22 06:34:18 +0100
commit84501f6b59e7903581deb87c7612f0a879cfb576 (patch)
tree6dda4074639621ebbd99ed9f5c86aae93326290b /source4/param
parent1807b0870bd1b50229f29b9f78f660a454682006 (diff)
downloadsamba-84501f6b59e7903581deb87c7612f0a879cfb576.tar.gz
samba-84501f6b59e7903581deb87c7612f0a879cfb576.tar.bz2
samba-84501f6b59e7903581deb87c7612f0a879cfb576.zip
Raise proper exceptions when lp file can't be found, be a
bit less strict when no file was specified.
Diffstat (limited to 'source4/param')
-rw-r--r--source4/param/pyparam.c8
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;
}