[SCM] Samba Shared Repository - branch master updated - 2d85e23e06182c42a054477a62917a2176aaab16

[Jelmer Vernooij]

The branch, master has been updated
       via  2d85e23e06182c42a054477a62917a2176aaab16 (commit)
      from  354a2e03abda1e4c31256472ae721eadbf695591 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2d85e23e06182c42a054477a62917a2176aaab16
Author: Jelmer Vernooij <jel...@samba.org>
Date:   Thu Jan 15 21:16:31 2009 +0100

    python/param: Cope with lp configfile being NULL.

-----------------------------------------------------------------------

Summary of changes:
 source4/param/pyparam.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index 2d5a584..0061ead 100644
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -263,7 +263,11 @@ static PyObject 
*py_lp_ctx_default_service(py_talloc_Object *self, void *closure
 
 static PyObject *py_lp_ctx_config_file(py_talloc_Object *self, void *closure)
 {
-       return PyString_FromString(lp_configfile(self->ptr));
+       const char *configfile = lp_configfile(self->ptr);
+       if (configfile == NULL)
+               Py_RETURN_NONE;
+       else
+               return PyString_FromString(configfile);
 }
 
 static PyGetSetDef py_lp_ctx_getset[] = {


-- 
Samba Shared Repository