summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb/ldb_modules/partition.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-08-28 05:43:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:03:00 -0500
commit714c5c92ef8e80b3510e222ce621401e55d05d7e (patch)
treec52e0dfb100f8cbbb83014a2f725d555954e6bbd /source4/dsdb/samdb/ldb_modules/partition.c
parent362ff066903524c710c53b92aad26671c8ebaa42 (diff)
downloadsamba-714c5c92ef8e80b3510e222ce621401e55d05d7e.tar.gz
samba-714c5c92ef8e80b3510e222ce621401e55d05d7e.tar.bz2
samba-714c5c92ef8e80b3510e222ce621401e55d05d7e.zip
r24731: Remove unused code - if we hit these error conditions, then we are
dead anyway, and a segfault would leave us with more infomation. Andrew Bartlett (This used to be commit 62320616ff8795ff18c8f49029d81f12558c10ed)
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/partition.c')
-rw-r--r--source4/dsdb/samdb/ldb_modules/partition.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index ae739f9b00..0675f38c56 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -45,7 +45,6 @@ struct partition_private_data {
struct partition_context {
struct ldb_module *module;
- struct ldb_handle *handle;
struct ldb_request *orig_req;
struct ldb_request **down_req;
@@ -76,7 +75,6 @@ static struct partition_context *partition_init_handle(struct ldb_request *req,
h->private_data = ac;
ac->module = module;
- ac->handle = h;
ac->orig_req = req;
req->handle = h;
@@ -126,11 +124,6 @@ static int partition_search_callback(struct ldb_context *ldb, void *context, str
{
struct partition_context *ac;
- if (!context || !ares) {
- ldb_set_errstring(ldb, "partition_search_callback: NULL Context or Result in 'search' callback");
- goto error;
- }
-
ac = talloc_get_type(context, struct partition_context);
if (ares->type == LDB_REPLY_ENTRY) {
@@ -144,9 +137,6 @@ static int partition_search_callback(struct ldb_context *ldb, void *context, str
return LDB_SUCCESS;
}
}
-error:
- talloc_free(ares);
- return LDB_ERR_OPERATIONS_ERROR;
}
/*
@@ -156,11 +146,6 @@ static int partition_other_callback(struct ldb_context *ldb, void *context, stru
{
struct partition_context *ac;
- if (!context) {
- ldb_set_errstring(ldb, "partition_other_callback: NULL Context in 'other' callback");
- goto error;
- }
-
ac = talloc_get_type(context, struct partition_context);
if (!ac->orig_req->callback) {
@@ -179,7 +164,6 @@ static int partition_other_callback(struct ldb_context *ldb, void *context, stru
return LDB_SUCCESS;
}
ldb_set_errstring(ldb, "partition_other_callback: Unknown reply type, only supports START_TLS");
-error:
talloc_free(ares);
return LDB_ERR_OPERATIONS_ERROR;
}