summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/tools
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/tools
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/tools')
-rw-r--r--source4/lib/ldb/tools/ldbdel.c2
-rw-r--r--source4/lib/ldb/tools/ldbedit.c4
-rw-r--r--source4/lib/ldb/tools/ldbsearch.c4
-rw-r--r--source4/lib/ldb/tools/ldbtest.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/ldb/tools/ldbdel.c b/source4/lib/ldb/tools/ldbdel.c
index 72540db07a..ec2e302b20 100644
--- a/source4/lib/ldb/tools/ldbdel.c
+++ b/source4/lib/ldb/tools/ldbdel.c
@@ -55,7 +55,7 @@ static int ldb_delete_recursive(struct ldb_context *ldb, const char *dn)
}
}
- ldb_search_free(ldb, res);
+ talloc_free(res);
if (total == 0) {
return -1;
diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c
index b9f82c282a..4c41b6b19a 100644
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.c
@@ -427,9 +427,9 @@ static void usage(void)
do_edit(ldb, msgs, ret, editor);
if (ret > 0) {
- ret = ldb_search_free(ldb, msgs);
+ ret = talloc_free(msgs);
if (ret == -1) {
- fprintf(stderr, "search_free failed - %s\n", ldb_errstring(ldb));
+ fprintf(stderr, "talloc_free failed\n");
exit(1);
}
}
diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index 8d435e7661..3e6e7d7feb 100644
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -81,9 +81,9 @@ static int do_search(struct ldb_context *ldb,
}
if (ret > 0) {
- ret = ldb_search_free(ldb, msgs);
+ ret = talloc_free(msgs);
if (ret == -1) {
- fprintf(stderr, "search_free failed\n");
+ fprintf(stderr, "talloc_free failed\n");
exit(1);
}
}
diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c
index 86f39d4606..fc1f3e3098 100644
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/source4/lib/ldb/tools/ldbtest.c
@@ -248,7 +248,7 @@ static void search_uid(struct ldb_context *ldb, int nrecords, int nsearches)
}
if (ret > 0) {
- ldb_search_free(ldb, res);
+ talloc_free(res);
}
printf("testing uid %d/%d - %d \r", i, uid, ret);