diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-08 15:46:09 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-08 05:28:14 +0000 |
| commit | 7bd5d402081bd7cd4cfeb2641bf011ad68be6443 (patch) | |
| tree | 8c57f9e99385ee846e894c94f3913fca3c06160e | |
| parent | 87595232951cf4d6fe5e3bd9ebdc71f1442b581c (diff) | |
| download | samba-7bd5d402081bd7cd4cfeb2641bf011ad68be6443.tar.gz samba-7bd5d402081bd7cd4cfeb2641bf011ad68be6443.tar.bz2 samba-7bd5d402081bd7cd4cfeb2641bf011ad68be6443.zip | |
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 <tridge@samba.org>
Autobuild-Date: Mon Nov 8 05:28:14 UTC 2010 on sn-devel-104
| -rw-r--r-- | source4/lib/ldb/common/ldb_modules.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index ab06dc5788..123d218667 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; } |