Include the smbconf parameter to the provision

[samba.git] / source4 / param / provision.c

diff --git a/source4/param/provision.c b/source4/param/provision.c
index 41b062883c31cc51bebbfe2104b46360071b8c3c..0e54acf9e429b5a4b403eab6c91a817ef7652244 100644 (file)
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -32,6 +32,8 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
                        struct provision_settings *settings, 
                        struct provision_result *result)
 {
+       extern struct loadparm_context *lp_from_py_object(PyObject *py_obj);
+       struct ldb_context *ldb_context_from_py_object(PyObject *py_obj);
        PyObject *provision_mod, *provision_dict, *provision_fn, *py_result, *parameters;
        
        DEBUG(0,("Provision for Become-DC test using python\n"));
@@ -62,20 +64,21 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
                return NT_STATUS_UNSUCCESSFUL;
        }
        
-       DEBUG(0,("New Server[%s] in Site[%s]\n", settings->dns_name, 
-                        settings->site_name));
+       DEBUG(0,("New Server in Site[%s]\n", 
+                settings->site_name));
 
        DEBUG(0,("DSA Instance [%s]\n"
-               "\tobjectGUID[%s]\n"
                "\tinvocationId[%s]\n",
                settings->ntds_dn_str,
-               settings->ntds_guid == NULL?"None":GUID_string(mem_ctx, settings->ntds_guid),
                settings->invocation_id == NULL?"None":GUID_string(mem_ctx, settings->invocation_id)));
 
        DEBUG(0,("Pathes under targetdir[%s]\n",
                 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)
@@ -128,5 +131,9 @@ 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 */
+       result->lp_ctx = lp_from_py_object(PyObject_GetAttrString(py_result, "lp"));
+       result->samdb = ldb_context_from_py_object(PyObject_GetAttrString(py_result, "samdb"));
+
        return NT_STATUS_OK;
 }