diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-09-22 16:44:17 -0700 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-09-22 17:48:24 -0700 |
| commit | 1c3c9a483be6d63b8efb67bfd2c04ef9302ccce6 (patch) | |
| tree | 173fbd8c50b007dee35491958dd31d5604a2da5e /source4/scripting | |
| parent | 5b10c82a5837073836fcf04152a6f032c98c93d1 (diff) | |
| download | samba-1c3c9a483be6d63b8efb67bfd2c04ef9302ccce6.tar.gz samba-1c3c9a483be6d63b8efb67bfd2c04ef9302ccce6.tar.bz2 samba-1c3c9a483be6d63b8efb67bfd2c04ef9302ccce6.zip | |
s4-param: Fix more memory leaks, invalid memory context.
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/pyglue.c | 4 | ||||
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c index 2afd1fa010..627443dee5 100644 --- a/source4/scripting/python/pyglue.c +++ b/source4/scripting/python/pyglue.c @@ -131,6 +131,10 @@ static PyObject *py_interface_ips(PyObject *self, PyObject *args) return NULL; tmp_ctx = talloc_new(NULL); + if (tmp_ctx == NULL) { + PyErr_NoMemory(); + return NULL; + } lp_ctx = lpcfg_from_py_object(tmp_ctx, py_lp_ctx); if (lp_ctx == NULL) { diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index ef5852090f..6429251850 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -1491,7 +1491,6 @@ def provision(setup_dir, logger, session_info, lp=lp) share_ldb.load_ldif_file_add(setup_path("share.ldif")) - logger.info("Setting up secrets.ldb") secrets_ldb = setup_secretsdb(paths.secrets, setup_path, session_info=session_info, @@ -1623,7 +1622,7 @@ def provision(setup_dir, logger, session_info, provision_backend.post_setup() provision_backend.shutdown() - + create_phpldapadmin_config(paths.phpldapadminconfig, setup_path, ldapi_url) except: |