|
 |
905b4d |
From 8aa6f3460bc0b1a5cf29b6958f508735b5e82999 Mon Sep 17 00:00:00 2001
|
|
|
905b4d |
From: Sumit Bose <sbose@redhat.com>
|
|
|
905b4d |
Date: Thu, 27 Nov 2014 13:42:19 +0100
|
|
|
905b4d |
Subject: [PATCH 120/128] krb5: do not fail if checking the old ccache failed
|
|
|
905b4d |
|
|
|
905b4d |
https://fedorahosted.org/sssd/ticket/2510
|
|
|
905b4d |
|
|
|
905b4d |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
905b4d |
---
|
|
|
905b4d |
Makefile.am | 1 +
|
|
|
905b4d |
src/providers/krb5/krb5_child.c | 7 +++++--
|
|
|
905b4d |
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
905b4d |
|
|
|
905b4d |
diff --git a/Makefile.am b/Makefile.am
|
|
|
905b4d |
index 56a562c761d39ff5f54bc034ede563c40bf21ef8..130c647e51d3554b2b0f69e83f17b38f1366eb3b 100644
|
|
|
905b4d |
--- a/Makefile.am
|
|
|
905b4d |
+++ b/Makefile.am
|
|
|
905b4d |
@@ -2505,6 +2505,7 @@ krb5_child_SOURCES = \
|
|
|
905b4d |
src/util/signal.c \
|
|
|
905b4d |
src/util/strtonum.c \
|
|
|
905b4d |
src/util/become_user.c \
|
|
|
905b4d |
+ src/util/util_errors.c \
|
|
|
905b4d |
src/sss_client/common.c \
|
|
|
905b4d |
$(NULL)
|
|
|
905b4d |
krb5_child_CFLAGS = \
|
|
|
905b4d |
diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c
|
|
|
905b4d |
index 94cd34e433cf6a197860d233fbf9ca30cd3eb535..d828dd550251d70851edcdc6b1eda6f5c051baf2 100644
|
|
|
905b4d |
--- a/src/providers/krb5/krb5_child.c
|
|
|
905b4d |
+++ b/src/providers/krb5/krb5_child.c
|
|
|
905b4d |
@@ -34,6 +34,7 @@
|
|
|
905b4d |
#include "util/user_info_msg.h"
|
|
|
905b4d |
#include "util/child_common.h"
|
|
|
905b4d |
#include "util/find_uid.h"
|
|
|
905b4d |
+#include "src/util/util_errors.h"
|
|
|
905b4d |
#include "providers/dp_backend.h"
|
|
|
905b4d |
#include "providers/krb5/krb5_auth.h"
|
|
|
905b4d |
#include "providers/krb5/krb5_utils.h"
|
|
|
905b4d |
@@ -2039,8 +2040,10 @@ static int k5c_ccache_setup(struct krb5_req *kr, uint32_t offline)
|
|
|
905b4d |
|
|
|
905b4d |
ret = k5c_check_old_ccache(kr);
|
|
|
905b4d |
if (ret != 0) {
|
|
|
905b4d |
- DEBUG(SSSDBG_OP_FAILURE, "Cannot check old ccache\n");
|
|
|
905b4d |
- return ret;
|
|
|
905b4d |
+ DEBUG(SSSDBG_CRIT_FAILURE, "Cannot check old ccache [%s]: [%d][%s]. " \
|
|
|
905b4d |
+ "Assuming old cache is invalid " \
|
|
|
905b4d |
+ "and not used.\n",
|
|
|
905b4d |
+ kr->old_ccname, ret, sss_strerror(ret));
|
|
|
905b4d |
}
|
|
|
905b4d |
|
|
|
905b4d |
/* Pre-creating the ccache must be done as root, otherwise we can't mkdir
|
|
|
905b4d |
--
|
|
|
905b4d |
1.9.3
|
|
|
905b4d |
|