summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-04-14 16:01:15 +0200
committerAndrew Bartlett <abartlet@samba.org>2008-04-14 16:01:15 +0200
commit0fa62eb2751805bb60d4cfc55b539770aa3471a4 (patch)
tree522989e382784aea66060df29c11cc8b8c8adcc0
parent5a73810e127b7d0af531e2bd0c0a4964878c866b (diff)
downloadsamba-0fa62eb2751805bb60d4cfc55b539770aa3471a4.tar.gz
samba-0fa62eb2751805bb60d4cfc55b539770aa3471a4.tar.bz2
samba-0fa62eb2751805bb60d4cfc55b539770aa3471a4.zip
Include the smbconf parameter to the provision
Otherwise this fails, if the targetdir is not specified Andrew Bartlett (This used to be commit cd2d3d1c7a0aad7beb167459276c012c7a6d2e88)
-rw-r--r--source4/param/provision.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/param/provision.c b/source4/param/provision.c
index 70ef618b6e..0e54acf9e4 100644
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -76,6 +76,9 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
settings->targetdir));
parameters = PyDict_New();
+ PyDict_SetItemString(parameters, "smbconf",
+ PyString_FromString(lp_configfile(lp_ctx)));
+
PyDict_SetItemString(parameters, "rootdn",
PyString_FromString(settings->root_dn_str));
if (settings->targetdir != NULL)
@@ -129,7 +132,6 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
result->domaindn = talloc_strdup(mem_ctx, PyString_AsString(PyObject_GetAttrString(py_result, "domaindn")));
/* FIXME paths */
- /* FIXME samdb */
result->lp_ctx = lp_from_py_object(PyObject_GetAttrString(py_result, "lp"));
result->samdb = ldb_context_from_py_object(PyObject_GetAttrString(py_result, "samdb"));