summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/common
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2005-04-25 12:46:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:11:40 -0500
commitfe4d985b6f3d318d9b58a16677be3b4ae34fba15 (patch)
tree2cc878469fa214d73b852341e080d176a9577d3f /source4/lib/ldb/common
parentc06297f776d92354e92f0ddda659778d57f426e5 (diff)
downloadsamba-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/lib/ldb/common')
-rw-r--r--source4/lib/ldb/common/ldb.c12
-rw-r--r--source4/lib/ldb/common/ldb_modules.c8
2 files changed, 3 insertions, 17 deletions
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c
index 40616c5963..600c7063f0 100644
--- a/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@ -81,6 +81,9 @@ struct ldb_context *ldb_connect(const char *url, unsigned int flags,
search the database given a LDAP-like search expression
return the number of records found, or -1 on error
+
+ Use talloc_free to free the ldb_message returned in 'res'
+
*/
int ldb_search(struct ldb_context *ldb,
const char *base,
@@ -91,15 +94,6 @@ int ldb_search(struct ldb_context *ldb,
return ldb->modules->ops->search(ldb->modules, base, scope, expression, attrs, res);
}
-/*
- free a set of messages returned by ldb_search
-*/
-int ldb_search_free(struct ldb_context *ldb, struct ldb_message **msgs)
-{
- return ldb->modules->ops->search_free(ldb->modules, msgs);
-}
-
-
/*
add a record to the database. Will fail if a record with the given class and key
already exists
diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index ffa150d773..644154d645 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -224,14 +224,6 @@ int ldb_next_search(struct ldb_module *module,
return module->next->ops->search(module->next, base, scope, expression, attrs, res);
}
-int ldb_next_search_free(struct ldb_module *module, struct ldb_message **msg)
-{
- if (!module->next) {
- return -1;
- }
- return module->next->ops->search_free(module->next, msg);
-}
-
int ldb_next_add_record(struct ldb_module *module, const struct ldb_message *message)
{
if (!module->next) {