From f5e3b7a5c40e1f98ceabb7676cccd28a3009b335 Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood Date: Tue, 30 Sep 2008 05:11:58 +0000 Subject: [PATCH] Fixed a bug where getting addressless tickets would cause kim to pass a NULL krb5_context into krb5_os_localaddr ticket: 6055 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20783 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kim/lib/kim_options.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kim/lib/kim_options.c b/src/kim/lib/kim_options.c index 89272b635..d97b34699 100644 --- a/src/kim/lib/kim_options.c +++ b/src/kim/lib/kim_options.c @@ -454,17 +454,17 @@ krb5_get_init_creds_opt *kim_options_init_cred_options (kim_options in_options) if (!err && !in_options) { err = check_error (KIM_NULL_PARAMETER_ERR); } + if (!err && !in_options->init_cred_context) { + err = krb5_error (NULL, + krb5_init_context (&in_options->init_cred_context)); + } + if (!err && !in_options->addressless) { err = krb5_error (in_options->init_cred_context, krb5_os_localaddr (in_options->init_cred_context, &addresses)); } - if (!err && !in_options->init_cred_context) { - err = krb5_error (NULL, - krb5_init_context (&in_options->init_cred_context)); - } - if (!err && !in_options->init_cred_options) { err = krb5_error (in_options->init_cred_context, krb5_get_init_creds_opt_alloc (in_options->init_cred_context, -- 2.26.2