diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-26 16:26:08 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-26 16:26:08 +1000 |
| commit | f08786686c0bf2440e35ce29b8e0b1a2f116fe3a (patch) | |
| tree | fd7ac6f7cd8528c550952731347f03397c70df77 /source4/lib/ldb_wrap.c | |
| parent | b5a3f45f645204bcc3d6caa47993b7839c8e4c99 (diff) | |
| parent | 4eba234a7352094e1640e8ff9d80a20f8d4705a3 (diff) | |
| download | samba-f08786686c0bf2440e35ce29b8e0b1a2f116fe3a.tar.gz samba-f08786686c0bf2440e35ce29b8e0b1a2f116fe3a.tar.xz samba-f08786686c0bf2440e35ce29b8e0b1a2f116fe3a.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pac-verify
(This used to be commit b706708210a05d6f10474a3cd2bbc550704d4356)
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); |