From: Alexandra Ellwood <lxs@mit.edu>
Date: Tue, 7 Oct 2008 18:58:53 +0000 (+0000)
Subject: KLLastChangedTime should return current time, not 0
X-Git-Tag: krb5-1.7-alpha1~338
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19069a085fe75da4d82339778b8d4622d767ebd6;p=krb5.git

KLLastChangedTime should return current time, not 0

cc_context_get_change_time returns 0 the first time it is called
if the CCacheServer is not running.  KLLastChangedTime always
returned the current time on the first call.  So use globals and
a mutex to make sure that KLLastChangedTime both monotonically
increases and also returns the current time on the first call.

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20835 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kim/lib/mac/KerberosLogin.c b/src/kim/lib/mac/KerberosLogin.c
index 3ecb96630..6f37aae1c 100644
--- a/src/kim/lib/mac/KerberosLogin.c
+++ b/src/kim/lib/mac/KerberosLogin.c
@@ -33,11 +33,14 @@
 #include "KerberosLoginPrivate.h"
 #include <kim/kim.h>
 #include "kim_private.h"
+#include "k5-thread.h"
+#include <time.h>
 
 krb5_get_init_creds_opt *__KLLoginOptionsGetKerberos5Options (KLLoginOptions ioOptions);
 KLTime __KLLoginOptionsGetStartTime (KLLoginOptions ioOptions);
 char *__KLLoginOptionsGetServiceName (KLLoginOptions ioOptions);
 
+
 /* ------------------------------------------------------------------------ */
 
 static KLStatus kl_check_error_ (kim_error inError, const char *function, const char *file, int line)
@@ -567,17 +570,49 @@ KLStatus KLValidateInitialTickets (KLPrincipal      inPrincipal,
     return kl_check_error (err);
 }
 
+static cc_time_t g_cc_change_time = 0;
+static KLTime g_kl_change_time = 0;
+static k5_mutex_t g_change_time_mutex = K5_MUTEX_PARTIAL_INITIALIZER;
+
+MAKE_INIT_FUNCTION(kim_change_time_init);
+MAKE_FINI_FUNCTION(kim_change_time_fini);
+
+/* ------------------------------------------------------------------------ */
+
+static int kim_change_time_init (void)
+{
+    g_kl_change_time = time (NULL);
+    
+    return k5_mutex_finish_init(&g_change_time_mutex);
+}
+
+/* ------------------------------------------------------------------------ */
+
+static void kim_change_time_fini (void)
+{
+    if (!INITIALIZER_RAN (kim_change_time_init) || PROGRAM_EXITING ()) {
+	return;
+    }
+    
+    k5_mutex_destroy(&g_change_time_mutex);
+}
 
 /* ------------------------------------------------------------------------ */
 
 KLStatus KLLastChangedTime (KLTime *outLastChangedTime)
 {
-    KLStatus     err = klNoErr;
+    KLStatus     err = CALL_INIT_FUNCTION (kim_change_time_init);
+    kim_error mutex_err = KIM_NO_ERROR;
     cc_context_t context = NULL;
     cc_time_t    ccChangeTime = 0;
     
-    if (!outLastChangedTime) { err = kl_check_error (klParameterErr); }
-    
+    if (!err && !outLastChangedTime) { err = kl_check_error (klParameterErr); }
+        
+    if (!err) {
+        mutex_err = k5_mutex_lock (&g_change_time_mutex);
+        if (mutex_err) { err = mutex_err; }
+    }
+
     if (!err) {
         err = cc_initialize (&context, ccapi_version_4, NULL, NULL);
     }
@@ -587,10 +622,24 @@ KLStatus KLLastChangedTime (KLTime *outLastChangedTime)
     }
     
     if (!err) {
-        *outLastChangedTime = ccChangeTime;
+        /* cc_context_get_change_time returns 0 if there are no tickets
+         * but KLLastChangedTime always returned the current time.  So
+         * fake the current time if cc_context_get_change_time returns 0. */
+        if (ccChangeTime > g_cc_change_time) {
+            /* changed, make sure g_kl_change_time increases in value */
+            if (ccChangeTime > g_kl_change_time) {
+                g_kl_change_time = ccChangeTime;
+            } else {
+                g_kl_change_time++; /* we got ahead of the ccapi, just increment */
+            }
+            g_cc_change_time = ccChangeTime;
+        }
+        
+        *outLastChangedTime = g_kl_change_time;
     }
     
-    if (context) { cc_context_release (context); }
+    if (context   ) { cc_context_release (context); }
+    if (!mutex_err) { k5_mutex_unlock (&g_change_time_mutex); }
     
     return kl_check_error (err);
 }