From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 22 Jul 2011 19:39:49 +0000 (-0400)
Subject: aklog: check ccache errors in get_user_realm
X-Git-Tag: upstream/1.6.0^2~78
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3f35f178101e268612f46ecf8253868275ca1cae;p=packages%2Fo%2Fopenafs.git

aklog: check ccache errors in get_user_realm

if there's an error finding the specified ccache, don't
bother continuing.

Reviewed-on: http://gerrit.openafs.org/5069
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 09d1d8575ce96ef945a4fd8a99a0347f4e258c1e)

Change-Id: I4b18cae14a9b620ea62d62eebc0b62f83f67a84a
Reviewed-on: http://gerrit.openafs.org/5072
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c
index 75b4629e0..0999003a0 100644
--- a/src/aklog/aklog.c
+++ b/src/aklog/aklog.c
@@ -2175,8 +2175,11 @@ get_user_realm(krb5_context context, char **realm)
 
     *realm = NULL;
 
-    if (!_krb425_ccache)
-        krb5_cc_default(context, &_krb425_ccache);
+    if (!_krb425_ccache) {
+	r = krb5_cc_default(context, &_krb425_ccache);
+	if (r)
+	    return r;
+    }
     if (!client_principal) {
 	if (client) {
 	    r = krb5_parse_name(context, client,  &client_principal);