Fix (string const and shadow) warnings, from metze.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20276 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-02-22 01:50:37 +00:00
parent bebd317964
commit 21ddb4aee9

View File

@@ -433,8 +433,9 @@ get_pa_etype_info(krb5_context context,
char *name; char *name;
ret = krb5_unparse_name(context, client->principal, &name); ret = krb5_unparse_name(context, client->principal, &name);
if (ret) if (ret)
name = "<unparse_name failed>"; name = rk_UNCONST("<unparse_name failed>");
kdc_log(context, config, 0, "internal error in get_pa_etype_info(%s): %d != %d", kdc_log(context, config, 0,
"internal error in get_pa_etype_info(%s): %d != %d",
name, n, pa.len); name, n, pa.len);
if (ret == 0) if (ret == 0)
free(name); free(name);
@@ -613,7 +614,7 @@ get_pa_etype_info2(krb5_context context,
char *name; char *name;
ret = krb5_unparse_name(context, client->principal, &name); ret = krb5_unparse_name(context, client->principal, &name);
if (ret) if (ret)
name = "<unparse_name failed>"; name = rk_UNCONST("<unparse_name failed>");
kdc_log(context, config, 0, kdc_log(context, config, 0,
"internal error in get_pa_etype_info2(%s): %d != %d", "internal error in get_pa_etype_info2(%s): %d != %d",
name, n, pa.len); name, n, pa.len);
@@ -692,11 +693,11 @@ log_as_req(krb5_context context,
} }
{ {
char str[128]; char fixedstr[128];
unparse_flags(KDCOptions2int(b->kdc_options), asn1_KDCOptions_units(), unparse_flags(KDCOptions2int(b->kdc_options), asn1_KDCOptions_units(),
str, sizeof(str)); fixedstr, sizeof(fixedstr));
if(*str) if(*fixedstr)
kdc_log(context, config, 2, "Requested flags: %s", str); kdc_log(context, config, 2, "Requested flags: %s", fixedstr);
} }
} }