diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-04-09 14:40:19 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-04-09 14:40:19 +1000 |
| commit | 65ad2ced6049f2901080cff61489fee7f4929c74 (patch) | |
| tree | 2421edc608db8a094113fd6ba876598329a5c060 /source4/lib/ldb/ldb_tdb/ldb_cache.c | |
| parent | e5702da72c752e913ff869bce341ca9799d10974 (diff) | |
| parent | 9d50c6b60364462daa68887fd64b59dd761a5133 (diff) | |
| download | samba-65ad2ced6049f2901080cff61489fee7f4929c74.tar.gz samba-65ad2ced6049f2901080cff61489fee7f4929c74.tar.bz2 samba-65ad2ced6049f2901080cff61489fee7f4929c74.zip | |
Merge branch 'wspp-schema'
Diffstat (limited to 'source4/lib/ldb/ldb_tdb/ldb_cache.c')
| -rw-r--r-- | source4/lib/ldb/ldb_tdb/ldb_cache.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_cache.c b/source4/lib/ldb/ldb_tdb/ldb_cache.c index 43b965f239..042c1c9282 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_cache.c +++ b/source4/lib/ldb/ldb_tdb/ldb_cache.c @@ -32,6 +32,7 @@ */ #include "ldb_tdb.h" +#include "ldb_private.h" #define LTDB_FLAG_CASE_INSENSITIVE (1<<0) #define LTDB_FLAG_INTEGER (1<<1) @@ -115,6 +116,12 @@ static int ltdb_attributes_load(struct ldb_module *module) ldb = ldb_module_get_ctx(module); + if (ldb->schema.attribute_handler_override) { + /* we skip loading the @ATTRIBUTES record when a module is supplying + its own attribute handling */ + return LDB_SUCCESS; + } + dn = ldb_dn_new(module, ldb, LTDB_ATTRIBUTES); if (dn == NULL) goto failed; |