From: Jeffrey Altman <jaltman@mit.edu>
Date: Sun, 25 Jul 2004 22:45:19 +0000 (+0000)
Subject: kfw-2-6-4-20040725
X-Git-Tag: openafs-devel-1_3_66~9
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c281138620a634e805f86b29d6dd58fdc4dcb286;p=packages%2Fo%2Fopenafs.git

kfw-2-6-4-20040725


Update KFW SDK to 2.6.4
---

diff --git a/src/WINNT/kfw/inc/krb4/krb.h b/src/WINNT/kfw/inc/krb4/krb.h
index e1deac108..796b375e7 100644
--- a/src/WINNT/kfw/inc/krb4/krb.h
+++ b/src/WINNT/kfw/inc/krb4/krb.h
@@ -452,4 +452,7 @@ int krb_save_credentials(char *service, char *instance, char *realm,
 
 int krb_in_tkt(char *pname, char *pinst, char *prealm);
 
+/* lifetime.c */
+int krb_life_to_time(int start, int life);
+int krb_time_to_life(int start, int end);
 #endif  /* KRB_DEFS */
diff --git a/src/WINNT/kfw/inc/leash/leashwin.h b/src/WINNT/kfw/inc/leash/leashwin.h
index f3ac7429d..0d6211c0d 100644
--- a/src/WINNT/kfw/inc/leash/leashwin.h
+++ b/src/WINNT/kfw/inc/leash/leashwin.h
@@ -42,7 +42,8 @@ typedef struct {
     } out;
 } LSH_DLGINFO_EX, FAR *LPLSH_DLGINFO_EX;
 
-#define LSH_DLGINFO_EX_V1_SZ (sizeof(DWORD) + 3 * sizeof(LPSTR) * 8 * sizeof(int))
+#define LSH_DLGINFO_EX_V1_SZ (sizeof(DWORD) + 3 * sizeof(LPSTR) + 8 * sizeof(int))
+#define LSH_DLGINFO_EX_V2_SZ (sizeof(DWORD) + 3 * sizeof(LPSTR) + 8 * sizeof(int) + max(LEASH_USERNAME_SZ,LEASH_REALM_SZ))
 
 typedef struct {                                                
     char    principal[MAX_K_NAME_SZ]; /* Principal name/instance/realm */
@@ -129,5 +130,11 @@ DWORD Leash_reset_lock_file_locations();
 DWORD Leash_get_default_uppercaserealm();
 DWORD Leash_set_default_uppercaserealm(DWORD onoff);
 DWORD Leash_reset_default_uppercaserealm();
+DWORD Leash_get_default_mslsa_import();
+DWORD Leash_set_default_mslsa_import(DWORD onoffmatch);
+DWORD Leash_reset_default_mslsa_import();
+DWORD Leash_get_default_preserve_kinit_settings();
+DWORD Leash_set_default_preserve_kinit_settings(DWORD onoff);
+DWORD Leash_reset_default_preserve_kinit_settings();
 
 #endif /* LEASHWIN */
diff --git a/src/WINNT/kfw/inc/loadfuncs/loadfuncs-krb.h b/src/WINNT/kfw/inc/loadfuncs/loadfuncs-krb.h
index 5ba4578ee..fb9b63fe7 100644
--- a/src/WINNT/kfw/inc/loadfuncs/loadfuncs-krb.h
+++ b/src/WINNT/kfw/inc/loadfuncs/loadfuncs-krb.h
@@ -302,5 +302,16 @@ TYPEDEF_FUNC(
     lsh_LoadKrb4LeashErrorTables,
     (HMODULE hLeashDll, INT useCallBackFunction)
     );
-
+TYPEDEF_FUNC(
+    int,
+    CALLCONV_C,
+    krb_life_to_time,
+    (int start, int life)
+    );
+TYPEDEF_FUNC(
+    int,
+    CALLCONV_C,
+    krb_time_to_life,
+    (int start, int end)
+    );
 #endif /* __LOADFUNCS_KRB_H__ */
diff --git a/src/WINNT/kfw/inc/loadfuncs/loadfuncs-krb5.h b/src/WINNT/kfw/inc/loadfuncs/loadfuncs-krb5.h
index 46827f64c..070735a11 100644
--- a/src/WINNT/kfw/inc/loadfuncs/loadfuncs-krb5.h
+++ b/src/WINNT/kfw/inc/loadfuncs/loadfuncs-krb5.h
@@ -876,6 +876,14 @@ TYPEDEF_FUNC(
      const char * )
     );
 
+TYPEDEF_FUNC(
+    krb5_error_code,
+    KRB5_CALLCONV,
+    krb5_free_default_realm,
+    (krb5_context,
+     const char * )
+    );
+
 TYPEDEF_FUNC(
     krb5_error_code,
     KRB5_CALLCONV,
diff --git a/src/WINNT/kfw/inc/loadfuncs/loadfuncs-leash.h b/src/WINNT/kfw/inc/loadfuncs/loadfuncs-leash.h
index 4222245d8..f05386b5b 100644
--- a/src/WINNT/kfw/inc/loadfuncs/loadfuncs-leash.h
+++ b/src/WINNT/kfw/inc/loadfuncs/loadfuncs-leash.h
@@ -344,6 +344,42 @@ TYPEDEF_FUNC(
     Leash_reset_default_uppercaserealm,
     (void)
     );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_mslsa_import,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_mslsa_import,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_mslsa_import,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_preserve_kinit_settings,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_preserve_kinit_settings,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_preserve_kinit_settings,
+    (void)
+    );
 TYPEDEF_FUNC(
     BOOL,
     CALLCONV_C,
diff --git a/src/WINNT/kfw/lib/i386/comerr32.lib b/src/WINNT/kfw/lib/i386/comerr32.lib
index be521f5b6..ce925ccef 100644
Binary files a/src/WINNT/kfw/lib/i386/comerr32.lib and b/src/WINNT/kfw/lib/i386/comerr32.lib differ
diff --git a/src/WINNT/kfw/lib/i386/delaydlls.lib b/src/WINNT/kfw/lib/i386/delaydlls.lib
index a39ff4ac7..7ada8e7cd 100644
Binary files a/src/WINNT/kfw/lib/i386/delaydlls.lib and b/src/WINNT/kfw/lib/i386/delaydlls.lib differ
diff --git a/src/WINNT/kfw/lib/i386/getopt.lib b/src/WINNT/kfw/lib/i386/getopt.lib
index 1aef84fb3..724bf04fa 100644
Binary files a/src/WINNT/kfw/lib/i386/getopt.lib and b/src/WINNT/kfw/lib/i386/getopt.lib differ
diff --git a/src/WINNT/kfw/lib/i386/gssapi32.lib b/src/WINNT/kfw/lib/i386/gssapi32.lib
index 3a7de5595..d4338ff30 100644
Binary files a/src/WINNT/kfw/lib/i386/gssapi32.lib and b/src/WINNT/kfw/lib/i386/gssapi32.lib differ
diff --git a/src/WINNT/kfw/lib/i386/kclnt32.lib b/src/WINNT/kfw/lib/i386/kclnt32.lib
index 085dbd36e..3decebab2 100644
Binary files a/src/WINNT/kfw/lib/i386/kclnt32.lib and b/src/WINNT/kfw/lib/i386/kclnt32.lib differ
diff --git a/src/WINNT/kfw/lib/i386/krb524.lib b/src/WINNT/kfw/lib/i386/krb524.lib
index b43d494f7..8dd8f71a1 100644
Binary files a/src/WINNT/kfw/lib/i386/krb524.lib and b/src/WINNT/kfw/lib/i386/krb524.lib differ
diff --git a/src/WINNT/kfw/lib/i386/krb5_32.lib b/src/WINNT/kfw/lib/i386/krb5_32.lib
index 7fcfa8496..a5865073e 100644
Binary files a/src/WINNT/kfw/lib/i386/krb5_32.lib and b/src/WINNT/kfw/lib/i386/krb5_32.lib differ
diff --git a/src/WINNT/kfw/lib/i386/krbcc32.lib b/src/WINNT/kfw/lib/i386/krbcc32.lib
index 03bbcdcba..38ad9934a 100644
Binary files a/src/WINNT/kfw/lib/i386/krbcc32.lib and b/src/WINNT/kfw/lib/i386/krbcc32.lib differ
diff --git a/src/WINNT/kfw/lib/i386/krbv4w32.lib b/src/WINNT/kfw/lib/i386/krbv4w32.lib
index 31e0a6352..f086662da 100644
Binary files a/src/WINNT/kfw/lib/i386/krbv4w32.lib and b/src/WINNT/kfw/lib/i386/krbv4w32.lib differ
diff --git a/src/WINNT/kfw/lib/i386/leashw32.lib b/src/WINNT/kfw/lib/i386/leashw32.lib
index ff059831d..0b3a6c79d 100644
Binary files a/src/WINNT/kfw/lib/i386/leashw32.lib and b/src/WINNT/kfw/lib/i386/leashw32.lib differ
diff --git a/src/WINNT/kfw/lib/i386/loadfuncs.lib b/src/WINNT/kfw/lib/i386/loadfuncs.lib
index 979f351f6..0d512c3f2 100644
Binary files a/src/WINNT/kfw/lib/i386/loadfuncs.lib and b/src/WINNT/kfw/lib/i386/loadfuncs.lib differ
diff --git a/src/WINNT/kfw/lib/i386/wshelp32.lib b/src/WINNT/kfw/lib/i386/wshelp32.lib
index 7bdc3132d..56bcecbe4 100644
Binary files a/src/WINNT/kfw/lib/i386/wshelp32.lib and b/src/WINNT/kfw/lib/i386/wshelp32.lib differ
diff --git a/src/WINNT/kfw/lib/i386/xpprof32.lib b/src/WINNT/kfw/lib/i386/xpprof32.lib
index 47166293e..37a41cb7b 100644
Binary files a/src/WINNT/kfw/lib/i386/xpprof32.lib and b/src/WINNT/kfw/lib/i386/xpprof32.lib differ