From 56a6e7261be95562c2342a07df07010d616937e5 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Tue, 20 Jun 2023 11:50:47 +0000 Subject: [PATCH] kadm5: Sprinkle const and rk_UNCONST for private string not modified. --- lib/kadm5/iprop-log.c | 8 ++++---- lib/kadm5/ipropd_slave.c | 4 ++-- lib/kadm5/marshall.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/kadm5/iprop-log.c b/lib/kadm5/iprop-log.c index a2ad51e7d..48ce343ea 100644 --- a/lib/kadm5/iprop-log.c +++ b/lib/kadm5/iprop-log.c @@ -310,8 +310,8 @@ iprop_dump(struct dump_options *opt, int argc, char **argv) krb5_error_code ret; enum kadm_iter_opts iter_opts_1st = 0; enum kadm_iter_opts iter_opts_2nd = 0; - char *desc_1st = ""; - char *desc_2nd = ""; + const char *desc_1st = ""; + const char *desc_2nd = ""; server_context = get_kadmin_context(opt->config_file_string, opt->realm_string); @@ -349,12 +349,12 @@ iprop_dump(struct dump_options *opt, int argc, char **argv) } ret = kadm5_log_foreach(server_context, iter_opts_1st, - NULL, print_entry, desc_1st); + NULL, print_entry, rk_UNCONST(desc_1st)); if (ret) krb5_warn(context, ret, "kadm5_log_foreach"); ret = kadm5_log_foreach(server_context, iter_opts_2nd, - NULL, print_entry, desc_2nd); + NULL, print_entry, rk_UNCONST(desc_2nd)); if (ret) krb5_warn(context, ret, "kadm5_log_foreach"); diff --git a/lib/kadm5/ipropd_slave.c b/lib/kadm5/ipropd_slave.c index ee4b1a14c..38a989eef 100644 --- a/lib/kadm5/ipropd_slave.c +++ b/lib/kadm5/ipropd_slave.c @@ -40,8 +40,8 @@ static const char *config_name = "ipropd-slave"; static int verbose; static int async_hdb = 0; static int no_keytab_flag; -static char *ccache_str; -static char *keytab_str; +static const char *ccache_str; +static const char *keytab_str; static krb5_log_facility *log_facility; static char five_min[] = "5 min"; diff --git a/lib/kadm5/marshall.c b/lib/kadm5/marshall.c index 849698fbd..52772a860 100644 --- a/lib/kadm5/marshall.c +++ b/lib/kadm5/marshall.c @@ -110,7 +110,7 @@ kadm5_store_fake_key_data(krb5_storage *sp, * keytab entries that will subsequently fail to be useful. */ c.length = sizeof (KADM5_BOGUS_KEY_DATA) - 1; - c.data = KADM5_BOGUS_KEY_DATA; + c.data = rk_UNCONST(KADM5_BOGUS_KEY_DATA); CHECK(krb5_store_data(sp, c)); /* This is the salt -- no need to send garbage */