diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-08-22 17:37:43 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-08-22 17:37:43 +1000 |
| commit | 0a27ff953e17670aecc7aedb56c0f872cc4bb75d (patch) | |
| tree | 18ed167d94e1a50acf04bc22fc6d8f01bf7f1a5f /source4/lib/ldb_wrap.c | |
| parent | 8acc7f7da7718c7750387c1043391618be46e15b (diff) | |
| parent | cc43037f19056ed24d7fffa54456d597c63ad105 (diff) | |
| download | samba-0a27ff953e17670aecc7aedb56c0f872cc4bb75d.tar.gz samba-0a27ff953e17670aecc7aedb56c0f872cc4bb75d.tar.xz samba-0a27ff953e17670aecc7aedb56c0f872cc4bb75d.zip | |
Merge branch 'abartlet-4-0-local' into v4-0-test
(This used to be commit 469fac2669991b130dec219e1a109a8b2ce224be)
Diffstat (limited to 'source4/lib/ldb_wrap.c')
| -rw-r--r-- | source4/lib/ldb_wrap.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source4/lib/ldb_wrap.c b/source4/lib/ldb_wrap.c index 883597108a..6c683a1e33 100644 --- a/source4/lib/ldb_wrap.c +++ b/source4/lib/ldb_wrap.c @@ -147,17 +147,21 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx, talloc_free(ldb); return NULL; } - - if (lp_ctx != NULL && strcmp(lp_sam_url(lp_ctx), url) == 0) { - dsdb_set_global_schema(ldb); - } + /* This must be done before we load the schema, as these + * handlers for objectSid and objectGUID etc must take + * precedence over the 'binary attribute' declaration in the + * schema */ ret = ldb_register_samba_handlers(ldb); if (ret == -1) { talloc_free(ldb); return NULL; } + if (lp_ctx != NULL && strcmp(lp_sam_url(lp_ctx), url) == 0) { + dsdb_set_global_schema(ldb); + } + ldb_set_debug(ldb, ldb_wrap_debug, NULL); ldb_set_utf8_fns(ldb, NULL, wrap_casefold); |