s4:dsdb/ldb_modules: avoid invalid pointer type warnings

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

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 42a729c73f17ee566d8e24d87fc9fc5f9b4650c4..91a9680741df35beebb44141197f8cc306147c8c 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -2762,7 +2762,6 @@ static int check_rename_constraints(struct ldb_message *msg,
 static int samldb_rename_search_base_callback(struct ldb_request *req,
                                               struct ldb_reply *ares)
 {
-       struct ldb_request *rename_req;
        struct samldb_ctx *ac;
        int ret;
 

diff --git a/source4/dsdb/samdb/ldb_modules/update_keytab.c b/source4/dsdb/samdb/ldb_modules/update_keytab.c
index 0bc7f2ac48b056ec6713daa5feeed8fc66dba985..6b195459e9eff524386115fc57503be4a772bbe4 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/update_keytab.c
+++ b/source4/dsdb/samdb/ldb_modules/update_keytab.c
@@ -397,7 +397,7 @@ static int update_kt_prepare_commit(struct ldb_module *module)
                const char *realm;
                char *upper_realm;
                struct ldb_message_element *spn_el = ldb_msg_find_element(p->msg, "servicePrincipalName");
-               char **SPNs = NULL;
+               const char **SPNs = NULL;
                int num_SPNs = 0;
                int i;
 
@@ -411,13 +411,13 @@ static int update_kt_prepare_commit(struct ldb_module *module)
                        }
 
                        num_SPNs = spn_el->num_values;
-                       SPNs = talloc_array(tmp_ctx, char *, num_SPNs);
+                       SPNs = talloc_array(tmp_ctx, const char *, num_SPNs);
                        if (!SPNs) {
                                ldb_oom(ldb);
                                goto fail;
                        }
                        for (i = 0; i < num_SPNs; i++) {
-                               SPNs[i] = talloc_asprintf(tmp_ctx, "%*.*s@%s",
+                               SPNs[i] = talloc_asprintf(SPNs, "%*.*s@%s",
                                                          (int)spn_el->values[i].length,
                                                          (int)spn_el->values[i].length,
                                                          (const char *)spn_el->values[i].data,
@@ -432,7 +432,7 @@ static int update_kt_prepare_commit(struct ldb_module *module)
                krb5_ret = smb_krb5_update_keytab(tmp_ctx, smb_krb5_context->krb5_context,
                                                  keytab_name_from_msg(tmp_ctx, ldb, p->msg),
                                                  ldb_msg_find_attr_as_string(p->msg, "samAccountName", NULL),
-                                                 realm, (const char **)SPNs, num_SPNs,
+                                                 realm, SPNs, num_SPNs,
                                                  ldb_msg_find_attr_as_string(p->msg, "saltPrincipal", NULL),
                                                  ldb_msg_find_attr_as_string(p->msg, "secret", NULL),
                                                  ldb_msg_find_attr_as_string(p->msg, "priorSecret", NULL),