From b6981e79dfb22819f48edcd4041b00f9b8cd7a93 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 23 Apr 2009 14:31:45 +0200 Subject: samba3/ldb: Update the ldb_dn API to match that of the Samba 4 LDB: * ldb_dn_new() now takes an initial DN string * ldb_dn_string_compose() -> ldb_dn_new_fmt() * dummy ldb_dn_validate(), since LDB DNs in the current implementation are always valid if they could be created. --- source3/groupdb/mapping_ldb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/groupdb/mapping_ldb.c') diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c index 143f4ed6cf..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; @@ -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; } -- cgit