Nalin Dahyabhai 414f99e
From 0d2a65745287238c5e5e2cc2fc68c40b358e68e4 Mon Sep 17 00:00:00 2001
Nalin Dahyabhai 414f99e
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Nalin Dahyabhai 414f99e
Date: Tue, 29 Oct 2013 16:27:20 -0400
Nalin Dahyabhai 414f99e
Subject: [PATCH 6/6] Copy config entries to the target ccache
Nalin Dahyabhai 414f99e
Nalin Dahyabhai 414f99e
When we try to screen out expired creds while reading them from one
Nalin Dahyabhai 414f99e
ccache to eventually store in another, also keep configuration entries.
Nalin Dahyabhai 414f99e
---
Nalin Dahyabhai 414f99e
 src/clients/ksu/ccache.c | 3 ++-
Nalin Dahyabhai 414f99e
 1 file changed, 2 insertions(+), 1 deletion(-)
Nalin Dahyabhai 414f99e
Nalin Dahyabhai 414f99e
diff --git a/src/clients/ksu/ccache.c b/src/clients/ksu/ccache.c
Nalin Dahyabhai 414f99e
index 2a97893..83b5e46 100644
Nalin Dahyabhai 414f99e
--- a/src/clients/ksu/ccache.c
Nalin Dahyabhai 414f99e
+++ b/src/clients/ksu/ccache.c
Nalin Dahyabhai 414f99e
@@ -269,7 +269,8 @@ krb5_error_code krb5_get_nonexp_tkts(context, cc, creds_array)
Nalin Dahyabhai 414f99e
 
Nalin Dahyabhai 414f99e
     while (!(retval = krb5_cc_next_cred(context, cc, &cur, &creds))){
Nalin Dahyabhai 414f99e
 
Nalin Dahyabhai 414f99e
-        if ((retval = krb5_check_exp(context, creds.times))){
Nalin Dahyabhai 414f99e
+        if (!krb5_is_config_principal(context, creds.server) &&
Nalin Dahyabhai 414f99e
+            (retval = krb5_check_exp(context, creds.times))){
Nalin Dahyabhai 414f99e
             if (retval != KRB5KRB_AP_ERR_TKT_EXPIRED){
Nalin Dahyabhai 414f99e
                 return retval;
Nalin Dahyabhai 414f99e
             }
Nalin Dahyabhai 414f99e
-- 
Nalin Dahyabhai 414f99e
1.8.5.3
Nalin Dahyabhai 414f99e