From fcd57af8e1497f4558789251768f9d2900b54679 Mon Sep 17 00:00:00 2001 From: "Roland C. Dowdeswell" Date: Tue, 11 Jun 2019 21:02:05 +0100 Subject: [PATCH] Implement KRB5_TRACE using existing logging framework --- lib/krb5/context.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/krb5/context.c b/lib/krb5/context.c index e82260b35..64e844df6 100644 --- a/lib/krb5/context.c +++ b/lib/krb5/context.c @@ -240,17 +240,24 @@ init_context_from_config_file(krb5_context context) context->default_cc_name = NULL; context->default_cc_name_set = 0; + tmp = secure_getenv("KRB5_TRACE"); s = krb5_config_get_strings(context, NULL, "logging", "krb5", NULL); - if(s) { + if (tmp || s) { char **p; if (context->debug_dest) krb5_closelog(context, context->debug_dest); krb5_initlog(context, "libkrb5", &context->debug_dest); - for(p = s; *p; p++) - krb5_addlog_dest(context, context->debug_dest, *p); - krb5_config_free_strings(s); + + if (s) { + for(p = s; *p; p++) + krb5_addlog_dest(context, context->debug_dest, *p); + krb5_config_free_strings(s); + } + + if (tmp) + krb5_addlog_dest(context, context->debug_dest, tmp); } tmp = krb5_config_get_string(context, NULL, "libdefaults",