From 15ce7cb89669d761f41561ffcbd6e3f6d80f4224 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Sat, 14 Apr 2018 19:17:30 -0400 Subject: [PATCH] Display more extended errors in kdb5_util In kadm5_create(), use the global context instead of a newly created context, so that extended error messages are displayed properly by extended_com_err_fn(). ticket: 8665 (new) --- src/kadmin/dbutil/kadm5_create.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/kadmin/dbutil/kadm5_create.c b/src/kadmin/dbutil/kadm5_create.c index 1745a4d620..4f254a387c 100644 --- a/src/kadmin/dbutil/kadm5_create.c +++ b/src/kadmin/dbutil/kadm5_create.c @@ -68,28 +68,22 @@ static int add_admin_princs(void *handle, krb5_context context, char *realm); int kadm5_create(kadm5_config_params *params) { int retval; - krb5_context context; - kadm5_config_params lparams; - if ((retval = kadm5_init_krb5_context(&context))) - exit(ERR); - /* * The lock file has to exist before calling kadm5_init, but * params->admin_lockfile may not be set yet... */ - if ((retval = kadm5_get_config_params(context, 1, - params, &lparams))) { + retval = kadm5_get_config_params(util_context, 1, params, &lparams); + if (retval) { com_err(progname, retval, _("while looking up the Kerberos " "configuration")); return 1; } - retval = kadm5_create_magic_princs(&lparams, context); + retval = kadm5_create_magic_princs(&lparams, util_context); - kadm5_free_config_params(context, &lparams); - krb5_free_context(context); + kadm5_free_config_params(util_context, &lparams); return retval; } -- 2.47.2