diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-04-23 14:31:45 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-04-23 18:27:32 +0200 |
commit | b6981e79dfb22819f48edcd4041b00f9b8cd7a93 (patch) | |
tree | ad1ac3680665c9bd77191be87d2900ed291ca639 /source3/lib/ldb | |
parent | 9b64073cf733588b75c3780f2c18728ff3009500 (diff) | |
download | samba-b6981e79dfb22819f48edcd4041b00f9b8cd7a93.tar.gz samba-b6981e79dfb22819f48edcd4041b00f9b8cd7a93.tar.bz2 samba-b6981e79dfb22819f48edcd4041b00f9b8cd7a93.zip |
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.
Diffstat (limited to 'source3/lib/ldb')
-rw-r--r-- | source3/lib/ldb/common/ldb.c | 4 | ||||
-rw-r--r-- | source3/lib/ldb/common/ldb_dn.c | 53 |
2 files changed, 40 insertions, 17 deletions
diff --git a/source3/lib/ldb/common/ldb.c b/source3/lib/ldb/common/ldb.c index 0ea80fecfc..791c1863d7 100644 --- a/source3/lib/ldb/common/ldb.c +++ b/source3/lib/ldb/common/ldb.c @@ -166,7 +166,7 @@ static const struct ldb_dn *ldb_set_default_basedn(struct ldb_context *ldb) } tmp_ctx = talloc_new(ldb); - ret = ldb_search(ldb, ldb, &res, ldb_dn_new(tmp_ctx), LDB_SCOPE_BASE, + ret = ldb_search(ldb, ldb, &res, ldb_dn_new(tmp_ctx, ldb, NULL), LDB_SCOPE_BASE, attrs, "(objectClass=*)"); if (ret == LDB_SUCCESS) { if (res->count == 1) { @@ -601,7 +601,7 @@ int ldb_build_search_req(struct ldb_request **ret_req, req->operation = LDB_SEARCH; if (base == NULL) { - req->op.search.base = ldb_dn_new(req); + req->op.search.base = ldb_dn_new(req, ldb, NULL); } else { req->op.search.base = base; } diff --git a/source3/lib/ldb/common/ldb_dn.c b/source3/lib/ldb/common/ldb_dn.c index 7ef3c38024..09d58555bd 100644 --- a/source3/lib/ldb/common/ldb_dn.c +++ b/source3/lib/ldb/common/ldb_dn.c @@ -332,21 +332,44 @@ failed: return dc; } -struct ldb_dn *ldb_dn_new(void *mem_ctx) +struct ldb_dn *ldb_dn_new(void *mem_ctx, struct ldb_context *ldb, const char *text) { struct ldb_dn *edn; - edn = talloc(mem_ctx, struct ldb_dn); - LDB_DN_NULL_FAILED(edn); - - /* Initially there are no components */ - edn->comp_num = 0; - edn->components = NULL; + if (text == NULL) { + edn = talloc_zero(mem_ctx, struct ldb_dn); + } else { + edn = ldb_dn_explode(mem_ctx, text); + } return edn; +} -failed: - return NULL; +bool ldb_dn_validate(struct ldb_dn *dn) +{ + /* This implementation does not do "lazy" evaluation of DN's, so + * if a DN can be created it will be valid. */ + return true; +} + +struct ldb_dn *ldb_dn_new_fmt(void *mem_ctx, struct ldb_context *ldb, const char *new_fmt, ...) +{ + char *strdn; + va_list ap; + struct ldb_dn *dn; + + if ( (! mem_ctx) || (! ldb)) return NULL; + + va_start(ap, new_fmt); + strdn = talloc_vasprintf(mem_ctx, new_fmt, ap); + if (strdn == NULL) + return NULL; + va_end(ap); + + dn = ldb_dn_explode(mem_ctx, strdn); + + talloc_free(strdn); + return dn; } /* @@ -360,7 +383,7 @@ struct ldb_dn *ldb_dn_explode(void *mem_ctx, const char *dn) if (dn == NULL) return NULL; /* Allocate a structure to hold the exploded DN */ - edn = ldb_dn_new(mem_ctx); + edn = talloc_zero(mem_ctx, struct ldb_dn); if (edn == NULL) { return NULL; } @@ -440,7 +463,7 @@ struct ldb_dn *ldb_dn_explode_or_special(void *mem_ctx, const char *dn) */ /* Allocate a structure to hold the exploded DN */ - if (!(edn = ldb_dn_new(mem_ctx))) { + if (!(edn = talloc_zero(mem_ctx, struct ldb_dn))) { return NULL; } @@ -599,7 +622,7 @@ struct ldb_dn *ldb_dn_casefold(struct ldb_context *ldb, void *mem_ctx, const str if (edn == NULL) return NULL; - cedn = ldb_dn_new(mem_ctx); + cedn = talloc_zero(mem_ctx, struct ldb_dn); if (!cedn) { return NULL; } @@ -737,7 +760,7 @@ struct ldb_dn *ldb_dn_copy_partial(void *mem_ctx, const struct ldb_dn *dn, int n if (dn == NULL) return NULL; if (num_el <= 0) return NULL; - newdn = ldb_dn_new(mem_ctx); + newdn = talloc_zero(mem_ctx, struct ldb_dn); LDB_DN_NULL_FAILED(newdn); newdn->comp_num = num_el; @@ -814,7 +837,7 @@ struct ldb_dn *ldb_dn_build_child(void *mem_ctx, const char *attr, newdn = ldb_dn_copy_partial(mem_ctx, base, base->comp_num + 1); LDB_DN_NULL_FAILED(newdn); } else { - newdn = ldb_dn_new(mem_ctx); + newdn = talloc_zero(mem_ctx, struct ldb_dn); LDB_DN_NULL_FAILED(newdn); newdn->comp_num = 1; @@ -847,7 +870,7 @@ struct ldb_dn *ldb_dn_compose(void *mem_ctx, const struct ldb_dn *dn1, const str } if (dn2 == NULL) { - newdn = ldb_dn_new(mem_ctx); + newdn = talloc_zero(mem_ctx, struct ldb_dn); LDB_DN_NULL_FAILED(newdn); newdn->comp_num = dn1->comp_num; |