diff options
| author | Simo Sorce <idra@samba.org> | 2005-04-25 12:46:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:40 -0500 |
| commit | fe4d985b6f3d318d9b58a16677be3b4ae34fba15 (patch) | |
| tree | 2cc878469fa214d73b852341e080d176a9577d3f /source4/dsdb/samdb/samdb.c | |
| parent | c06297f776d92354e92f0ddda659778d57f426e5 (diff) | |
| download | samba-fe4d985b6f3d318d9b58a16677be3b4ae34fba15.tar.gz samba-fe4d985b6f3d318d9b58a16677be3b4ae34fba15.tar.bz2 samba-fe4d985b6f3d318d9b58a16677be3b4ae34fba15.zip | |
r6470: Remove ldb_search_free() it is not needed anymore.
Just use talloc_free() to release the memory after an ldb_search().
(This used to be commit 4f0948dab0aa5e8b6a4ce486f3668ca8dfae23db)
Diffstat (limited to 'source4/dsdb/samdb/samdb.c')
| -rw-r--r-- | source4/dsdb/samdb/samdb.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c index 6f9251dd32..b337577ae7 100644 --- a/source4/dsdb/samdb/samdb.c +++ b/source4/dsdb/samdb/samdb.c @@ -79,15 +79,6 @@ int samdb_search_domain(struct ldb_context *sam_ldb, } /* - free up a search result -*/ -int samdb_search_free(struct ldb_context *sam_ldb, - TALLOC_CTX *mem_ctx, struct ldb_message **res) -{ - return ldb_search_free(sam_ldb, res); -} - -/* search the sam for a single string attribute in exactly 1 record */ const char *samdb_search_string_v(struct ldb_context *sam_ldb, @@ -106,7 +97,7 @@ const char *samdb_search_string_v(struct ldb_context *sam_ldb, attr_name, format, count)); } if (count != 1) { - samdb_search_free(sam_ldb, mem_ctx, res); + talloc_free(res); return NULL; } @@ -235,14 +226,14 @@ int samdb_search_string_multiple(struct ldb_context *sam_ldb, if (res[i]->num_elements != 1) { DEBUG(1,("samdb: search for %s %s not single valued\n", attr_name, format)); - samdb_search_free(sam_ldb, mem_ctx, res); + talloc_free(res); return -1; } } *strs = talloc_array(mem_ctx, const char *, count+1); if (! *strs) { - samdb_search_free(sam_ldb, mem_ctx, res); + talloc_free(res); return -1; } |