From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Thu, 5 Dec 2013 18:54:09 +0000 (-0500)
Subject: Set an error message when keyring get_princ fails
X-Git-Tag: krb5-1.13-alpha1~276
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c25fc42e8eac7350209df61e4a7b9960d17755ca;p=thirdparty%2Fkrb5.git

Set an error message when keyring get_princ fails

When attempting to use a keyring cache that doesn't exist, set an error
message when we fail to read a principal name, as we do when we return
the same error code when using a file ccache.

[ghudson: removed unnecessary check for d->name nullity.]

ticket: 7809
target_version: 1.12.1
tags: pullup
---

diff --git a/src/lib/krb5/ccache/cc_keyring.c b/src/lib/krb5/ccache/cc_keyring.c
index 1a0f1dfcf7..a02cdf0688 100644
--- a/src/lib/krb5/ccache/cc_keyring.c
+++ b/src/lib/krb5/ccache/cc_keyring.c
@@ -1707,6 +1707,9 @@ krb5_krcc_retrieve_principal(krb5_context context, krb5_ccache id,
     if (!d->cache_id || !d->princ_id) {
         princ = 0L;
         kret = KRB5_FCC_NOFILE;
+        krb5_set_error_message(context, kret,
+                               _("Credentials cache keyring '%s' not found"),
+                               d->name);
         goto errout;
     }