components/krb5/patches/073-root-init-cred-kt.patch
changeset 6978 14cbeb78966a
parent 6867 87f7fd05f888
--- a/components/krb5/patches/073-root-init-cred-kt.patch	Fri Sep 23 11:19:39 2016 -0700
+++ b/components/krb5/patches/073-root-init-cred-kt.patch	Mon Sep 26 15:58:55 2016 -0700
@@ -18,7 +18,7 @@
  
  #ifdef USE_LEASH
  #ifdef _WIN64
-@@ -88,6 +89,9 @@
+@@ -88,6 +89,9 @@ static void (*pLeash_AcquireInitialTicketsIfNeeded)(krb5_context,krb5_principal,
  static HANDLE hLeashDLL = INVALID_HANDLE_VALUE;
  #endif
  
@@ -28,7 +28,7 @@
  #ifndef LEAN_CLIENT
  k5_mutex_t gssint_krb5_keytab_lock = K5_MUTEX_PARTIAL_INITIALIZER;
  static char *krb5_gss_keytab = NULL;
-@@ -590,6 +594,151 @@
+@@ -590,6 +594,151 @@ kg_cred_set_initial_refresh(krb5_context context, krb5_gss_cred_id_rec *cred,
      set_refresh_time(context, cred->ccache, refresh);
  }
  
@@ -180,7 +180,7 @@
  /* Get initial credentials using the supplied password or client keytab. */
  static krb5_error_code
  get_initial_cred(krb5_context context, krb5_gss_cred_id_rec *cred)
-@@ -609,8 +758,41 @@
+@@ -609,8 +758,41 @@ get_initial_cred(krb5_context context, krb5_gss_cred_id_rec *cred)
                                              cred->password, NULL, NULL, 0,
                                              NULL, opt);
      } else if (cred->client_keytab != NULL) {
@@ -224,7 +224,7 @@
      } else {
          code = KRB5_KT_NOTFOUND;
      }
-@@ -700,6 +882,23 @@
+@@ -700,6 +882,23 @@ acquire_init_cred(krb5_context context,
              krb5_clear_error_message(context);
              code = 0;
          }
@@ -250,7 +250,7 @@
          goto error;
 --- a/src/lib/krb5/keytab/Makefile.in
 +++ b/src/lib/krb5/keytab/Makefile.in
-@@ -13,6 +13,7 @@
+@@ -13,6 +13,7 @@ STLIBOBJS= \
  	ktremove.o	\
  	ktfns.o		\
  	kt_file.o	\
@@ -258,7 +258,7 @@
  	kt_memory.o	\
  	kt_srvtab.o	\
  	read_servi.o	\
-@@ -26,6 +27,7 @@
+@@ -26,6 +27,7 @@ OBJS=	\
  	$(OUTPRE)ktremove.$(OBJEXT)	\
  	$(OUTPRE)ktfns.$(OBJEXT)	\
  	$(OUTPRE)kt_file.$(OBJEXT)	\
@@ -266,7 +266,7 @@
  	$(OUTPRE)kt_memory.$(OBJEXT)	\
  	$(OUTPRE)kt_srvtab.$(OBJEXT)	\
  	$(OUTPRE)read_servi.$(OBJEXT)	\
-@@ -39,6 +41,7 @@
+@@ -39,6 +41,7 @@ SRCS=	\
  	$(srcdir)/ktremove.c	\
  	$(srcdir)/ktfns.c	\
  	$(srcdir)/kt_file.c	\