From b04ce096d4cdd32cfd4a9579dc00c54f9cb211ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Thu, 26 Jul 2007 19:21:39 +0000 Subject: [PATCH] (get_cache_principal): make sure id is reset if we fail. From Benjamin Bennet. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21703 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/kadm5/init_c.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/kadm5/init_c.c b/lib/kadm5/init_c.c index 7cc7e6061..b522ae08a 100644 --- a/lib/kadm5/init_c.c +++ b/lib/kadm5/init_c.c @@ -242,12 +242,15 @@ get_cache_principal(krb5_context context, krb5_principal p1, p2; ret = krb5_cc_default(context, id); - if(ret) + if(ret) { + *id = NULL; return ret; + } ret = krb5_cc_get_principal(context, *id, &p1); if(ret) { krb5_cc_close(context, *id); + *id = NULL; return ret; } @@ -255,6 +258,7 @@ get_cache_principal(krb5_context context, "kadmin", "admin", NULL); if (ret) { krb5_cc_close(context, *id); + *id = NULL; krb5_free_principal(context, p1); return ret; }