[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-246-gd0c9d5e

[Jelmer Vernooij]

The branch, master has been updated
       via  d0c9d5ed8eeafe316856ccb654d2297f0078cbb5 (commit)
       via  df65fc02fb6684d86271c89a21f297fd29b8539c (commit)
      from  10833f641a33d340c03d01bf25551cd1d0d1ef63 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d0c9d5ed8eeafe316856ccb654d2297f0078cbb5
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Sep 11 23:49:57 2009 +0200

    ldb: Remove references to operational module init function.
    
    This module is now part of Samba 4's dsdb subsystem rather than
    standalone ldb.

commit df65fc02fb6684d86271c89a21f297fd29b8539c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Sep 11 23:49:36 2009 +0200

    ldb: Support running testsuite without installing first.

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

Summary of changes:
 source4/lib/ldb/Makefile.in           |    5 +++--
 source4/lib/ldb/common/ldb_modules.c  |    1 -
 source4/lib/ldb/include/ldb_private.h |    1 -
 source4/lib/ldb/ldb.mk                |    4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 663dea9..c1f403d 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -23,6 +23,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PYTHON = @PYTHON@
 PYTHON_CONFIG = @PYTHON_CONFIG@
 ldbdir = $(srcdir)
+LIB_PATH_VAR = @LIB_PATH_VAR@
 
 LDB_MODULESDIR = @LDB_MODULESDIR@
 
@@ -146,10 +147,10 @@ realdistclean:: distclean
 check:: test @PYTHON_CHECK_TARGET@
 
 check-soloading: sample.$(SHLIBEXT)
-	LDB_MODULES_PATH=$(builddir) $(srcdir)/tests/test-soloading.sh
+	$(LIB_PATH_VAR)=lib LDB_MODULES_PATH=$(builddir) $(srcdir)/tests/test-soloading.sh
 
 test:: all check-soloading
-	for t in $(TESTS); do echo STARTING $${t}; $(srcdir)/tests/$${t} || exit 1; done
+	for t in $(TESTS); do echo STARTING $${t}; $(LIB_PATH_VAR)=lib $(srcdir)/tests/$${t} || exit 1; done
 
 valgrindtest:: all
 	for t in $(TESTS); do echo STARTING $${t}; VALGRIND="valgrind -q --db-attach=yes --num-callers=30" $(srcdir)/tests/$${t} || exit 1; done
diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 79a97ca..206b225 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -785,7 +785,6 @@ int ldb_mod_register_control(struct ldb_module *module, const char *oid)
 	LDB_BACKEND(tdb),	\
 	LDAP_BACKEND	\
 	SQLITE3_BACKEND	\
-	LDB_MODULE(operational),	\
 	LDB_MODULE(rdn_name),	\
 	LDB_MODULE(paged_results),	\
 	LDB_MODULE(server_sort),		\
diff --git a/source4/lib/ldb/include/ldb_private.h b/source4/lib/ldb/include/ldb_private.h
index a70d9c7..c12f334 100644
--- a/source4/lib/ldb/include/ldb_private.h
+++ b/source4/lib/ldb/include/ldb_private.h
@@ -123,7 +123,6 @@ int ldb_connect_backend(struct ldb_context *ldb, const char *url, const char *op
 
 
 extern const struct ldb_module_ops ldb_objectclass_module_ops;
-extern const struct ldb_module_ops ldb_operational_module_ops;
 extern const struct ldb_module_ops ldb_paged_results_module_ops;
 extern const struct ldb_module_ops ldb_rdn_name_module_ops;
 extern const struct ldb_module_ops ldb_schema_module_ops;
diff --git a/source4/lib/ldb/ldb.mk b/source4/lib/ldb/ldb.mk
index 4b73a45..e87db64 100644
--- a/source4/lib/ldb/ldb.mk
+++ b/source4/lib/ldb/ldb.mk
@@ -74,8 +74,8 @@ install-python:: build-python
 	mkdir -p $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"`
 	cp ldb.$(SHLIBEXT) $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"`
 
-check-python:: build-python
-	LD_LIBRARY_PATH=lib PYTHONPATH=.:$(ldbdir) $(PYTHON) $(ldbdir)/tests/python/api.py
+check-python:: build-python lib/$(SONAME)
+	$(LIB_PATH_VAR)=lib PYTHONPATH=.:$(ldbdir) $(PYTHON) $(ldbdir)/tests/python/api.py
 
 clean::
 	rm -f ldb.$(SHLIBEXT)


-- 
Samba Shared Repository