diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-07-21 08:32:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:52 -0500 |
| commit | 4396d0d1482d4033a469f7a3e3835a6f3b145046 (patch) | |
| tree | 7bbfae04ff6d9ebac282e7db009fcc2b2e65432a /source4/lib/ldb/common/ldb_modules.c | |
| parent | eb08c1fc8f877bffeaf63acfbc97ae00a4370a15 (diff) | |
| download | samba-4396d0d1482d4033a469f7a3e3835a6f3b145046.tar.gz samba-4396d0d1482d4033a469f7a3e3835a6f3b145046.tar.bz2 samba-4396d0d1482d4033a469f7a3e3835a6f3b145046.zip | |
r8669: The objectguid module belongs in Samba's ldb module collection, not in
ldb, as it can't build without the NDR and GUID code.
Also make it properly use the NDR encoding for the GUID (I forgot last
time, and used a string), as well as set the dependencies on the
module correctly.
Andrew Bartlett
(This used to be commit 8054abc76e5e3588cebc7fc01062a1223b7f140b)
Diffstat (limited to 'source4/lib/ldb/common/ldb_modules.c')
| -rw-r--r-- | source4/lib/ldb/common/ldb_modules.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index d6213be79a..dcc384ffad 100644 --- a/source4/lib/ldb/common/ldb_modules.c +++ b/source4/lib/ldb/common/ldb_modules.c @@ -189,8 +189,8 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[]) continue; } - if (strcmp(modules[i], "objectguid") == 0) { - current = objectguid_module_init(ldb, options); + if (strcmp(modules[i], "rdn_name") == 0) { + current = rdn_name_module_init(ldb, options); if (!current) { ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]); return -1; @@ -199,8 +199,9 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[]) continue; } - if (strcmp(modules[i], "rdn_name") == 0) { - current = rdn_name_module_init(ldb, options); +#ifdef _SAMBA_BUILD_ + if (strcmp(modules[i], "objectguid") == 0) { + current = objectguid_module_init(ldb, options); if (!current) { ldb_debug(ldb, LDB_DEBUG_FATAL, "function 'init_module' in %s fails\n", modules[i]); return -1; @@ -209,7 +210,6 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[]) continue; } -#ifdef _SAMBA_BUILD_ if (strcmp(modules[i], "samldb") == 0) { current = samldb_module_init(ldb, options); if (!current) { |