diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-02-27 09:29:36 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-04-02 09:03:44 +0200 |
| commit | cd103d84e64c35ad7098445d3780be3aef396ff1 (patch) | |
| tree | c2155df48b8652e822ffaa9605058b56967c7118 | |
| parent | de773f3785d8fedba605437fbd434a49b9d18b0e (diff) | |
| download | samba-cd103d84e64c35ad7098445d3780be3aef396ff1.tar.gz samba-cd103d84e64c35ad7098445d3780be3aef396ff1.tar.xz samba-cd103d84e64c35ad7098445d3780be3aef396ff1.zip | |
s4:dsdb/ldb_modules: avoid str_list related const warnings
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/partition.c | 3 | ||||
| -rw-r--r-- | 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); |