diff options
author | Andrew Bartlett <abartlet@samba.org> | 2009-04-24 09:17:08 +0200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-24 09:17:08 +0200 |
commit | 2ee9ee2c17ce435ce45a773f19302a7b474554c2 (patch) | |
tree | 2ea91c2d36664f02e001575be0591660190d86ed /source3/groupdb/mapping_ldb.c | |
parent | b82a204b9b2c28707ab7866a511ea4f5912826ac (diff) | |
parent | af6316d1500cfcedd5fd59ed0ddbba9aec9c3756 (diff) | |
download | samba-2ee9ee2c17ce435ce45a773f19302a7b474554c2.tar.gz samba-2ee9ee2c17ce435ce45a773f19302a7b474554c2.tar.bz2 samba-2ee9ee2c17ce435ce45a773f19302a7b474554c2.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'source3/groupdb/mapping_ldb.c')
-rw-r--r-- | source3/groupdb/mapping_ldb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c index a162c194d6..7ad0bbb703 100644 --- a/source3/groupdb/mapping_ldb.c +++ b/source3/groupdb/mapping_ldb.c @@ -23,7 +23,7 @@ #include "includes.h" #include "groupdb/mapping.h" -#include "lib/ldb/include/includes.h" +#include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" static struct ldb_context *ldb; @@ -57,7 +57,7 @@ static bool init_group_mapping(void) db_path = state_path("group_mapping.ldb"); - ldb = ldb_init(NULL); + ldb = ldb_init(NULL, NULL); if (ldb == NULL) goto failed; /* Ensure this db is created read/write for root only. */ @@ -133,8 +133,8 @@ static struct ldb_dn *mapping_dn(TALLOC_CTX *mem_ctx, const DOM_SID *sid) } /* we split by domain and rid so we can do a subtree search when we only want one domain */ - return ldb_dn_string_compose(mem_ctx, NULL, "rid=%u,domain=%s", - rid, string_sid); + return ldb_dn_new_fmt(mem_ctx, ldb, "rid=%u,domain=%s", + rid, string_sid); } /* @@ -328,7 +328,7 @@ static bool enum_group_mapping(const DOM_SID *domsid, enum lsa_SidType sid_name_ /* we do a subtree search on the domain */ if (domsid != NULL) { sid_to_fstring(name, domsid); - basedn = ldb_dn_string_compose(tmp_ctx, NULL, "domain=%s", name); + basedn = ldb_dn_new_fmt(tmp_ctx, ldb, "domain=%s", name); if (basedn == NULL) goto failed; } |