s4:samba_dsdb: fix 'const char **' vs. 'char **' compiler warnings

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
index 4697c0914043ab73413bd331124ada71a87957fd..0f91f2744b5917bb2c8490e4abbdc0656803c5d1 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
+++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
@@ -81,7 +81,8 @@ static int prepare_modules_line(struct ldb_context *ldb,
                                const char *backend_mod, const char **backend_mod_list)
 {
        int ret;
-       const char **backend_full_list;
+       char **backend_full_list1;
+       const char **backend_full_list2;
        const char *backend_dn;
        char *mod_list_string;
        char *full_string;
@@ -105,22 +106,24 @@ 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);
+               backend_full_list1 = str_list_make_single(tmp_ctx, backend_mod);
        } else {
-               backend_full_list = (const char **)str_list_make_empty(tmp_ctx);
+               backend_full_list1 = str_list_make_empty(tmp_ctx);
        }
-       if (!backend_full_list) {
+       if (!backend_full_list1) {
                talloc_free(tmp_ctx);
                return ldb_oom(ldb);
        }
 
-       backend_full_list = str_list_append_const(backend_full_list, backend_mod_list);
-       if (!backend_full_list) {
+       backend_full_list2 = discard_const_p(const char *, backend_full_list1);
+       backend_full_list2 = str_list_append_const(backend_full_list2,
+                                                 backend_mod_list);
+       if (!backend_full_list2) {
                talloc_free(tmp_ctx);
                return ldb_oom(ldb);
        }
 
-       mod_list_string = str_list_join(tmp_ctx, backend_full_list, ',');
+       mod_list_string = str_list_join(tmp_ctx, backend_full_list2, ',');
        if (!mod_list_string) {
                talloc_free(tmp_ctx);
                return ldb_oom(ldb);