From 869c258bcf44695b4d11eefd30a321efe0c7e56d Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Wed, 25 Apr 2001 05:12:37 +0000 Subject: [PATCH] (krb5_verify_init_creds): do not try to close an unopened ccache, noted by git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9814 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/verify_init.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/krb5/verify_init.c b/lib/krb5/verify_init.c index a4dd1ee80..2a0787d6d 100644 --- a/lib/krb5/verify_init.c +++ b/lib/krb5/verify_init.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -79,7 +79,7 @@ krb5_verify_init_creds(krb5_context context, { krb5_error_code ret; krb5_data req; - krb5_ccache local_ccache; + krb5_ccache local_ccache = NULL; krb5_keytab_entry entry; krb5_creds *new_creds = NULL; krb5_auth_context auth_context = NULL; @@ -185,8 +185,10 @@ cleanup: krb5_free_principal (context, server); if (ap_req_keytab == NULL && keytab) krb5_kt_close (context, keytab); - if (ccache == NULL - || (ret != 0 && *ccache == NULL)) + if (local_ccache != NULL + && + (ccache == NULL + || (ret != 0 && *ccache == NULL))) krb5_cc_destroy (context, local_ccache); if (ret == 0 && ccache != NULL && *ccache == NULL)