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 e1deac1088b17cc7c321143147706335b92c067f..796b375e787b2e7722d21252524428b08e8ea519 100644 (file)
--- 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 f3ac7429ddd6fc65941008b5809d04c1ccf89850..0d6211c0dc3ceec4259bba5b894226390aed2be0 100644 (file)
--- 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 5ba4578eedadb3ced2f00a64b07381fa02a75fd0..fb9b63fe7ebdca665ce5de934330399619f6f560 100644 (file)
--- 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 46827f64cf449d71c48cefc784c24231a5a2d097..070735a115e82e4c93dbe0ccf6591f3cc78472e1 100644 (file)
--- 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 4222245d805231c87136ea2f9cc0eeafa546510d..f05386b5b216a3ec9e9ff7da831e467c34f5e41f 100644 (file)
--- 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 be521f5b6e72ba10979b4a16ccebf48c3d477d84..ce925ccef900719b1f3b2c44f6f321509787061c 100644 (file)
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 a39ff4ac7368ca5c8d679e148d0c252d103e707c..7ada8e7cdc3bf76a0bf9ecec00b3eea9fa62b600 100644 (file)
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 1aef84fb3094930072c814ab3a46a432f266e673..724bf04fa1a261ef811945a2d4685cba81f27b31 100644 (file)
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 3a7de55952a6370b55123fdb1f2c2fbc9886e4f3..d4338ff303bbeaf97113020a125658afe1f7b81c 100644 (file)
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 085dbd36eb4841af699a62d550656a715eb44389..3decebab2efd850d82bf8e046386568c6d4213d4 100644 (file)
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 b43d494f74683cb257c3cd9aad7ff9df8f9e05ef..8dd8f71a13896205962b42ebe614b10a518e99f0 100644 (file)
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 7fcfa8496fde97b9e513fdb5c2ec596002f44c0e..a5865073e188dcaee1c46ca8dc0cc2f55ae1bb96 100644 (file)
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 03bbcdcbadd156913b2873f0ec7dc574e5179934..38ad9934a667992a6536c770441b724f56aa534e 100644 (file)
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 31e0a63522cee8a48388b781e0bd33eb7a34bb01..f086662dae3fcb6a4a24264956c28e35dce01666 100644 (file)
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 ff059831dd649594b9163a4fe136b0543c029c9c..0b3a6c79d09be47812ffc386255de83ac1f1fe06 100644 (file)
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 979f351f6c8901d7c1a8a6a455b29a4b469db786..0d512c3f2e59646f1cac0b7729169026b4bb8814 100644 (file)
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 7bdc3132d52982c4f6736eb3d733d5e8c17b255c..56bcecbe47f9b5a04ee1a3b95259232991b445f3 100644 (file)
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 47166293ef358db1db3e85b399d5976f079ced45..37a41cb7bfbc020d4718d5c1c7f855e38171b12f 100644 (file)
Binary files a/src/WINNT/kfw/lib/i386/xpprof32.lib and b/src/WINNT/kfw/lib/i386/xpprof32.lib differ