summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-04-07 16:34:18 +1000
committerAndrew Tridgell <tridge@samba.org>2009-04-07 16:34:18 +1000
commitb202911123ea6c867c6f7553ce3cb0bbb28829c2 (patch)
tree8385a2da1b7785d5d6f7b97a168bb542621ec8bc
parent9181637170a994ef93bfb8c0fa69ab7b89837f0d (diff)
downloadsamba-b202911123ea6c867c6f7553ce3cb0bbb28829c2.tar.gz
samba-b202911123ea6c867c6f7553ce3cb0bbb28829c2.tar.bz2
samba-b202911123ea6c867c6f7553ce3cb0bbb28829c2.zip
don't load @ATTRIBUTES if we have an override handler in place
-rw-r--r--source4/lib/ldb/ldb_tdb/ldb_cache.c7
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;