From c708c7e9fb66a4cd9132c59f91631aba205e652e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sat, 18 Oct 2008 21:15:46 +0000 Subject: [PATCH] more working copy git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23926 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/context.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/lib/krb5/context.c b/lib/krb5/context.c index bebfbec05..8aff73edc 100644 --- a/lib/krb5/context.c +++ b/lib/krb5/context.c @@ -359,17 +359,23 @@ krb5_copy_context(krb5_context context, krb5_context *out) if (context->default_cc_name_env) p->default_cc_name_env = strdup(context->default_cc_name_env); - ret = copy_etypes(context, context->etypes, &p->etypes); - if (ret) - goto out; - ret = copy_etypes(context, context->etypes_des, &p->etypes_des); - if (ret) - goto out; + if (context->etypes) { + ret = copy_etypes(context, context->etypes, &p->etypes); + if (ret) + goto out; + } + if (context->etypes_des) { + ret = copy_etypes(context, context->etypes_des, &p->etypes_des); + if (ret) + goto out; + } - ret = krb5_copy_host_realm(context, - context->default_realms, &p->default_realms); - if (ret) - goto out; + if (context->default_realms) { + ret = krb5_copy_host_realm(context, + context->default_realms, &p->default_realms); + if (ret) + goto out; + } p->cf = context->cf; /* XXX krb5_config_file_copy() */