summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2011-01-21 18:09:56 +0000
committerGreg Hudson <ghudson@mit.edu>2011-01-21 18:09:56 +0000
commita6eafba6148b91fda7c2b1544e968ae325ffc868 (patch)
tree857b456e9986b788d2498b419c8bcc0dbbe77634 /src/lib
parent49204ef76a83dcc3e8f6f152980562b8ce5433e0 (diff)
downloadkrb5-a6eafba6148b91fda7c2b1544e968ae325ffc868.tar.gz
krb5-a6eafba6148b91fda7c2b1544e968ae325ffc868.tar.xz
krb5-a6eafba6148b91fda7c2b1544e968ae325ffc868.zip
Add a trace log event for unrecognized enctypes in a profile enctype
list. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24602 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/krb5/krb/init_ctx.c11
-rw-r--r--src/lib/krb5/krb/t_etypes.c4
2 files changed, 9 insertions, 6 deletions
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 67810adcbe..4f00750311 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -404,8 +404,9 @@ mod_list(krb5_enctype etype, krb5_boolean add, krb5_boolean allow_weak,
* parsing profstr. profstr may be modified during parsing.
*/
krb5_error_code
-krb5int_parse_enctype_list(krb5_context context, char *profstr,
- krb5_enctype *default_list, krb5_enctype **result)
+krb5int_parse_enctype_list(krb5_context context, const char *profkey,
+ char *profstr, krb5_enctype *default_list,
+ krb5_enctype **result)
{
char *token, *delim = " \t\r\n,", *save = NULL;
krb5_boolean sel, weak = context->allow_weak_crypto;
@@ -450,6 +451,8 @@ krb5int_parse_enctype_list(krb5_context context, char *profstr,
} else if (krb5_string_to_enctype(token, &etype) == 0) {
/* Set a specific enctype. */
mod_list(etype, sel, weak, &list);
+ } else {
+ TRACE_ENCTYPE_LIST_UNKNOWN(context, profkey, token);
}
}
@@ -489,8 +492,8 @@ get_profile_etype_list(krb5_context context, krb5_enctype **etypes_ptr,
profkey, NULL, "DEFAULT", &profstr);
if (code)
return code;
- code = krb5int_parse_enctype_list(context, profstr, default_list,
- &etypes);
+ code = krb5int_parse_enctype_list(context, profkey, profstr,
+ default_list, &etypes);
profile_release_string(profstr);
if (code)
return code;
diff --git a/src/lib/krb5/krb/t_etypes.c b/src/lib/krb5/krb/t_etypes.c
index b27f7bdfe3..5de4ced0b3 100644
--- a/src/lib/krb5/krb/t_etypes.c
+++ b/src/lib/krb5/krb/t_etypes.c
@@ -238,8 +238,8 @@ main(int argc, char **argv)
if (tests[i].str != NULL) {
copy = strdup(tests[i].str);
- ret = krb5int_parse_enctype_list(ctx, copy, tests[i].defaults,
- &list);
+ ret = krb5int_parse_enctype_list(ctx, "", copy,
+ tests[i].defaults, &list);
if (ret != expected_err) {
com_err("krb5int_parse_enctype_list", ret, "");
return 2;