From cd103d84e64c35ad7098445d3780be3aef396ff1 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 27 Feb 2014 09:29:36 +0100 Subject: s4:dsdb/ldb_modules: avoid str_list related const warnings Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- source4/dsdb/samdb/ldb_modules/partition.c | 3 ++- source4/dsdb/samdb/ldb_modules/samba_dsdb.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c index 39e85e4754..f2624a2612 100644 --- a/source4/dsdb/samdb/ldb_modules/partition.c +++ b/source4/dsdb/samdb/ldb_modules/partition.c @@ -693,7 +693,8 @@ static int partition_search(struct ldb_module *module, struct ldb_request *req) /* Initialise the referrals list */ if (ac->referrals == NULL) { - ac->referrals = (const char **) str_list_make_empty(ac); + char **l = str_list_make_empty(ac); + ac->referrals = discard_const_p(const char *, l); if (ac->referrals == NULL) { return ldb_oom(ldb); } diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c index 249f655a07..086b11fb54 100644 --- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c +++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c @@ -105,9 +105,11 @@ static int prepare_modules_line(struct ldb_context *ldb, } if (backend_mod) { - backend_full_list = (const char **)str_list_make_single(tmp_ctx, backend_mod); + char **b = str_list_make_single(tmp_ctx, backend_mod); + backend_full_list = discard_const_p(const char *, b); } else { - backend_full_list = (const char **)str_list_make_empty(tmp_ctx); + char **b = str_list_make_empty(tmp_ctx); + backend_full_list = discard_const_p(const char *, b); } if (!backend_full_list) { talloc_free(tmp_ctx); -- cgit