krb5 commit [krb5-1.15]: Allow clock skew in krb5 gss_context_time()

[Greg Hudson]

https://github.com/krb5/krb5/commit/9ea1b4dec15f26352da9e3f261cc0b4ea563beda
commit 9ea1b4dec15f26352da9e3f261cc0b4ea563beda
Author: Greg Hudson <ghudson at mit.edu>
Date:   Sat Apr 22 16:51:23 2017 -0400

    Allow clock skew in krb5 gss_context_time()
    
    Commit b496ce4095133536e0ace36b74130e4b9ecb5e11 (ticket #8268) adds
    the clock skew to krb5 acceptor context lifetimes for
    gss_accept_sec_context() and gss_inquire_context(), but not for
    gss_context_time().  Add the clock skew in gss_context_time() as well.
    
    (cherry picked from commit b0a072e6431261734e7350996a363801f180e8ea)
    
    ticket: 8581
    version_fixed: 1.15.2

 src/lib/gssapi/krb5/context_time.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/lib/gssapi/krb5/context_time.c b/src/lib/gssapi/krb5/context_time.c
index a18cfb0..4505932 100644
--- a/src/lib/gssapi/krb5/context_time.c
+++ b/src/lib/gssapi/krb5/context_time.c
@@ -51,7 +51,10 @@ krb5_gss_context_time(minor_status, context_handle, time_rec)
         return(GSS_S_FAILURE);
     }
 
-    if ((lifetime = ctx->krb_times.endtime - now) <= 0) {
+    lifetime = ctx->krb_times.endtime - now;
+    if (!ctx->initiate)
+        lifetime += ctx->k5_context->clockskew;
+    if (lifetime <= 0) {
         *time_rec = 0;
         *minor_status = 0;
         return(GSS_S_CONTEXT_EXPIRED);