Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

(This used to be commit e891157b4ec7b2f845fb20c4106d80bf169f2072)

3 files changed, 27 insertions, 14 deletions

diff --git a/source4/param/config.mk b/source4/param/config.mk
index b4182480a9..42cb6f3c1c 100644
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -1,30 +1,34 @@
 [LIBRARY::LIBSAMBA-HOSTCONFIG]
-VERSION = 0.0.1
-SO_VERSION = 0
-OBJ_FILES = loadparm.o \
-			generic.o \
-			util.o \
-			../lib/version.o
-PC_FILE = samba-hostconfig.pc
 PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL 
 PRIVATE_DEPENDENCIES = DYNCONFIG LIBREPLACE_EXT CHARSET
-PRIVATE_PROTO_HEADER = proto.h
+
+LIBSAMBA-HOSTCONFIG_VERSION = 0.0.1
+LIBSAMBA-HOSTCONFIG-SOVERSION = 0
+
+LIBSAMBA-HOSTCONFIG_OBJ_FILES = param/loadparm.o \
+			param/generic.o \
+			param/util.o \
+			lib/version.o
 
 PUBLIC_HEADERS += param/param.h
 
+PC_FILES += param/samba-hostconfig.pc
+
 [SUBSYSTEM::PROVISION]
-OBJ_FILES = provision.o
 PRIVATE_DEPENDENCIES = LIBPYTHON
 
+PROVISION_OBJ_FILES = param/provision.o
+
 #################################
 # Start SUBSYSTEM share
 [SUBSYSTEM::share]
 PRIVATE_PROTO_HEADER = share_proto.h
-OBJ_FILES = share.o
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
 # End SUBSYSTEM share
 #################################
 
+share_OBJ_FILES = param/share.o
+
 PUBLIC_HEADERS += param/share.h
 
 ################################################
@@ -32,25 +36,30 @@ PUBLIC_HEADERS += param/share.h
 [MODULE::share_classic]
 SUBSYSTEM = share
 INIT_FUNCTION = share_classic_init
-OBJ_FILES = share_classic.o 
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
 # End MODULE share_classic
 ################################################
 
+share_classic_OBJ_FILES = param/share_classic.o 
+
 ################################################
 # Start MODULE share_ldb
 [MODULE::share_ldb]
 SUBSYSTEM = share
 INIT_FUNCTION = share_ldb_init
-OBJ_FILES = share_ldb.o 
 PRIVATE_DEPENDENCIES = LIBLDB LDB_WRAP
 # End MODULE share_ldb
 ################################################
 
+share_ldb_OBJ_FILES = param/share_ldb.o 
+
 [SUBSYSTEM::SECRETS]
-OBJ_FILES = secrets.o
 PRIVATE_DEPENDENCIES = LIBLDB TDB_WRAP UTIL_TDB NDR_SECURITY
 
+SECRETS_OBJ_FILES = param/secrets.o
+
 [PYTHON::param]
 SWIG_FILE = param.i
 PRIVATE_DEPENDENCIES = LIBSAMBA-HOSTCONFIG
+
+param_OBJ_FILES = param/param_wrap.o
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"));
 
diff --git a/source4/param/share.c b/source4/param/share.c
index bc2999b03d..51134d8970 100644
--- a/source4/param/share.c
+++ b/source4/param/share.c
@@ -146,6 +146,8 @@ NTSTATUS share_get_context_by_name(TALLOC_CTX *mem_ctx, const char *backend_name
 */
 NTSTATUS share_init(void)
 {
+	extern NTSTATUS share_ldb_init(void);
+	extern NTSTATUS share_classic_init(void);
 	init_module_fn static_init[] = { STATIC_share_MODULES };
 
 	run_init_functions(static_init);