[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-127-gcd2d3d1

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  cd2d3d1c7a0aad7beb167459276c012c7a6d2e88 (commit)
      from  79854f0aa6a9899bb72d302cbca695b8b3a3b0dc (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit cd2d3d1c7a0aad7beb167459276c012c7a6d2e88
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Apr 14 16:01:15 2008 +0200

    Include the smbconf parameter to the provision
    
    Otherwise this fails, if the targetdir is not specified
    
    Andrew Bartlett

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

Summary of changes:
 source/param/provision.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/param/provision.c b/source/param/provision.c
index 70ef618..0e54acf 100644
--- a/source/param/provision.c
+++ b/source/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"));
 


-- 
Samba Shared Repository