sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

r24731: Remove unused code - if we hit these error conditions, then we are

Browse Source 
dead anyway, and a segfault would leave us with more infomation.

Andrew Bartlett
(This used to be commit 62320616ff8795ff18c8f49029d81f12558c10ed)
This commit is contained in:
Andrew Bartlett 2007-08-28 05:43:26 +00:00 committed by Gerald (Jerry) Carter
parent 362ff06690
commit 714c5c92ef
9 changed files with 0 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/dsdb/samdb/ldb_modules/extended_dn.c
View File

@ -181,11 +181,6 @@ static int extended_callback(struct ldb_context *ldb, void *context, struct ldb_
{ {
struct extended_context *ac; struct extended_context *ac;
if (!context || !ares) {
ldb_set_errstring(ldb, "NULL Context or Result in callback");
goto error;
}
ac = talloc_get_type(context, struct extended_context); ac = talloc_get_type(context, struct extended_context);
if (ares->type == LDB_REPLY_ENTRY) { if (ares->type == LDB_REPLY_ENTRY) {

9
source4/dsdb/samdb/ldb_modules/kludge_acl.c
View File

@ -236,11 +236,6 @@ static int kludge_acl_callback(struct ldb_context *ldb, void *context, struct ld
struct kludge_private_data *data; struct kludge_private_data *data;
int i, ret; int i, ret;
if (!context || !ares) {
ldb_set_errstring(ldb, "NULL Context or Result in callback");
goto error;
}
ac = talloc_get_type(context, struct kludge_acl_context); ac = talloc_get_type(context, struct kludge_acl_context);
data = talloc_get_type(ac->module->private_data, struct kludge_private_data); data = talloc_get_type(ac->module->private_data, struct kludge_private_data);
@ -296,10 +291,6 @@ static int kludge_acl_callback(struct ldb_context *ldb, void *context, struct ld
} }
return ac->up_callback(ldb, ac->up_context, ares); return ac->up_callback(ldb, ac->up_context, ares);
error:
talloc_free(ares);
return LDB_ERR_OPERATIONS_ERROR;
} }
static int kludge_acl_search(struct ldb_module *module, struct ldb_request *req) static int kludge_acl_search(struct ldb_module *module, struct ldb_request *req)

18
source4/dsdb/samdb/ldb_modules/local_password.c
View File

@ -355,11 +355,6 @@ static int get_self_callback(struct ldb_context *ldb, void *context, struct ldb_
{ {
struct lpdb_context *ac; struct lpdb_context *ac;
if (!context || !ares) {
ldb_set_errstring(ldb, "NULL Context or Result in callback");
return LDB_ERR_OPERATIONS_ERROR;
}
ac = talloc_get_type(context, struct lpdb_context); ac = talloc_get_type(context, struct lpdb_context);
/* we are interested only in the single reply (base search) we receive here */ /* we are interested only in the single reply (base search) we receive here */
@ -461,11 +456,6 @@ static int lpdb_local_search_callback(struct ldb_context *ldb, void *context, st
{ {
struct lpdb_local_search_context *local_context; struct lpdb_local_search_context *local_context;
if (!context || !ares) {
ldb_set_errstring(ldb, "NULL Context or Result in callback");
return LDB_ERR_OPERATIONS_ERROR;
}
local_context = talloc_get_type(context, struct lpdb_local_search_context); local_context = talloc_get_type(context, struct lpdb_local_search_context);
/* we are interested only in the single reply (base search) we receive here */ /* we are interested only in the single reply (base search) we receive here */
@ -529,11 +519,6 @@ static int lpdb_remote_search_callback(struct ldb_context *ldb, void *context, s
{ {
struct lpdb_context *ac; struct lpdb_context *ac;
if (!context || !ares) {
ldb_set_errstring(ldb, "NULL Context or Result in callback");
goto error;
}
ac = talloc_get_type(context, struct lpdb_context); ac = talloc_get_type(context, struct lpdb_context);
if (ares->type == LDB_REPLY_ENTRY) { if (ares->type == LDB_REPLY_ENTRY) {
@ -610,9 +595,6 @@ static int lpdb_remote_search_callback(struct ldb_context *ldb, void *context, s
} else { } else {
return ac->orig_req->callback(ldb, ac->orig_req->context, ares); return ac->orig_req->callback(ldb, ac->orig_req->context, ares);
} }
error:
talloc_free(ares);
return LDB_ERR_OPERATIONS_ERROR;
} }
/* Search for passwords and other attributes. The passwords are /* Search for passwords and other attributes. The passwords are

5
source4/dsdb/samdb/ldb_modules/objectclass.c
View File

@ -480,11 +480,6 @@ static int get_self_callback(struct ldb_context *ldb, void *context, struct ldb_
{ {
struct oc_context *ac; struct oc_context *ac;
if (!context || !ares) {
ldb_set_errstring(ldb, "NULL Context or Result in callback");
return LDB_ERR_OPERATIONS_ERROR;
}
ac = talloc_get_type(context, struct oc_context); ac = talloc_get_type(context, struct oc_context);
/* we are interested only in the single reply (base search) we receive here */ /* we are interested only in the single reply (base search) we receive here */

16
source4/dsdb/samdb/ldb_modules/partition.c
View File

@ -45,7 +45,6 @@ struct partition_private_data {
struct partition_context { struct partition_context {
struct ldb_module *module; struct ldb_module *module;
struct ldb_handle *handle;
struct ldb_request *orig_req; struct ldb_request *orig_req;
struct ldb_request **down_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; h->private_data = ac;
ac->module = module; ac->module = module;
ac->handle = h;
ac->orig_req = req; ac->orig_req = req;
req->handle = h; req->handle = h;
@ -126,11 +124,6 @@ static int partition_search_callback(struct ldb_context *ldb, void *context, str
{ {
struct partition_context *ac; 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); ac = talloc_get_type(context, struct partition_context);
if (ares->type == LDB_REPLY_ENTRY) { 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; 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; 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); ac = talloc_get_type(context, struct partition_context);
if (!ac->orig_req->callback) { if (!ac->orig_req->callback) {
@ -179,7 +164,6 @@ static int partition_other_callback(struct ldb_context *ldb, void *context, stru
return LDB_SUCCESS; return LDB_SUCCESS;
} }
ldb_set_errstring(ldb, "partition_other_callback: Unknown reply type, only supports START_TLS"); ldb_set_errstring(ldb, "partition_other_callback: Unknown reply type, only supports START_TLS");
error:
talloc_free(ares); talloc_free(ares);
return LDB_ERR_OPERATIONS_ERROR; return LDB_ERR_OPERATIONS_ERROR;
} }

10
source4/dsdb/samdb/ldb_modules/password_hash.c
View File

@ -1168,11 +1168,6 @@ static int get_domain_data_callback(struct ldb_context *ldb, void *context, stru
{ {
struct ph_context *ac; struct ph_context *ac;
if (!context || !ares) {
ldb_set_errstring(ldb, "NULL Context or Result in callback");
return LDB_ERR_OPERATIONS_ERROR;
}
ac = talloc_get_type(context, struct ph_context); ac = talloc_get_type(context, struct ph_context);
/* we are interested only in the single reply (base search) we receive here */ /* we are interested only in the single reply (base search) we receive here */
@ -1629,11 +1624,6 @@ static int get_self_callback(struct ldb_context *ldb, void *context, struct ldb_
{ {
struct ph_context *ac; struct ph_context *ac;
if (!context || !ares) {
ldb_set_errstring(ldb, "NULL Context or Result in callback");
return LDB_ERR_OPERATIONS_ERROR;
}
ac = talloc_get_type(context, struct ph_context); ac = talloc_get_type(context, struct ph_context);
/* we are interested only in the single reply (base search) we receive here */ /* we are interested only in the single reply (base search) we receive here */

5
source4/dsdb/samdb/ldb_modules/rootdse.c
View File

@ -226,11 +226,6 @@ static int rootdse_callback(struct ldb_context *ldb, void *context, struct ldb_r
{ {
struct rootdse_context *ac; struct rootdse_context *ac;
if (!context || !ares) {
ldb_set_errstring(ldb, "NULL Context or Result in callback");
goto error;
}
ac = talloc_get_type(context, struct rootdse_context); ac = talloc_get_type(context, struct rootdse_context);
if (ares->type == LDB_REPLY_ENTRY) { if (ares->type == LDB_REPLY_ENTRY) {

6
source4/dsdb/samdb/ldb_modules/schema.c
View File

@ -523,11 +523,6 @@ static int schema_add_check_parent(struct ldb_context *ldb, void *context, struc
{ {
struct schema_context *sctx; struct schema_context *sctx;
if (!context || !ares) {
ldb_set_errstring(ldb, "NULL Context or Result in callback");
return LDB_ERR_OPERATIONS_ERROR;
}
sctx = talloc_get_type(context, struct schema_context); sctx = talloc_get_type(context, struct schema_context);
/* we are interested only in the single reply (base search) we receive here */ /* we are interested only in the single reply (base search) we receive here */
@ -883,7 +878,6 @@ static int schema_add_build_down_req(struct schema_context *sctx)
{ {
struct schema_class_dlist *temp; struct schema_class_dlist *temp;
struct ldb_message *msg; struct ldb_message *msg;
char *oc;
int ret; int ret;
sctx->down_req = talloc(sctx, struct ldb_request); sctx->down_req = talloc(sctx, struct ldb_request);

8
source4/dsdb/samdb/ldb_modules/show_deleted.c
View File

@ -52,11 +52,6 @@ static int show_deleted_search_callback(struct ldb_context *ldb, void *context,
{ {
struct show_deleted_search_request *ar; struct show_deleted_search_request *ar;
if (!context || !ares) {
ldb_set_errstring(ldb, "NULL Context or Result in callback");
goto error;
}
ar = talloc_get_type(context, struct show_deleted_search_request); ar = talloc_get_type(context, struct show_deleted_search_request);
if (ares->type == LDB_REPLY_ENTRY) { if (ares->type == LDB_REPLY_ENTRY) {
@ -78,9 +73,6 @@ static int show_deleted_search_callback(struct ldb_context *ldb, void *context,
skip_deleted: skip_deleted:
talloc_free(ares); talloc_free(ares);
return LDB_SUCCESS; return LDB_SUCCESS;
error:
talloc_free(ares);
return LDB_ERR_OPERATIONS_ERROR;
} }
static int show_deleted_search(struct ldb_module *module, struct ldb_request *req) static int show_deleted_search(struct ldb_module *module, struct ldb_request *req)