The branch, master has been updated
via 7bd5d40 s4-ldb: don't give an error if a module is already
registered
via 8759523 waf: go back to the previous method of handling .inst. rules
from e427f2f waf: fixed the names of the installed libraries after the
last change
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7bd5d402081bd7cd4cfeb2641bf011ad68be6443
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Nov 8 15:46:09 2010 +1100
s4-ldb: don't give an error if a module is already registered
this can happen when both the build and install paths are used to load
ldb modules
Autobuild-User: Andrew Tridgell <tri...@samba.org>
Autobuild-Date: Mon Nov 8 05:28:14 UTC 2010 on sn-devel-104
commit 87595232951cf4d6fe5e3bd9ebdc71f1442b581c
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Nov 8 15:45:18 2010 +1100
waf: go back to the previous method of handling .inst. rules
the change broke the library linkages for some library, as spotted by
Brad
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_install.py | 2 +-
source4/lib/ldb/common/ldb_modules.c | 7 +++++++
2 files changed, 8 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_install.py
b/buildtools/wafsamba/samba_install.py
index bf534f0..0196bd9 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -83,7 +83,7 @@ def install_library(self):
# install link. That stops us from overwriting the existing build
# target, which has different ldflags
self.done_install_library = True
- t = self
+ t = self.clone('default')
t.posted = False
t.target += '.inst'
self.env.RPATH = build_ldflags
diff --git a/source4/lib/ldb/common/ldb_modules.c
b/source4/lib/ldb/common/ldb_modules.c
index ab06dc5..123d218 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -905,6 +905,13 @@ static int ldb_modules_load_path(const char *path, const
char *version)
}
ret = init_fn(version);
+ if (ret == LDB_ERR_ENTRY_ALREADY_EXISTS) {
+ /* the module is already registered - ignore this, as
+ * it can happen if LDB_MODULES_PATH points at both
+ * the build and install directory
+ */
+ ret = LDB_SUCCESS;
+ }
return ret;
}
--
Samba Shared Repository
