Enabled unconditional build of kfwlogon on Windows

Removed dependency on KFW, as it is now a part of the same build.

Signed-off-by: Alexey Melnikov <aamelnikov@gmail.com>

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

7 files changed, 416 insertions, 9 deletions

diff --git a/src/windows/leashdll/include/loadfuncs-com_err.h b/src/include/loadfuncs-com_err.h
index a579749c1..a579749c1 100644
--- a/src/windows/leashdll/include/loadfuncs-com_err.h
+++ b/src/include/loadfuncs-com_err.h
diff --git a/src/windows/leashdll/include/loadfuncs-krb5.h b/src/include/loadfuncs-krb5.h
index 58ff443bf..58ff443bf 100644
--- a/src/windows/leashdll/include/loadfuncs-krb5.h
+++ b/src/include/loadfuncs-krb5.h
diff --git a/src/include/loadfuncs-leash.h b/src/include/loadfuncs-leash.h
new file mode 100644
index 000000000..38b1decbb
--- /dev/null
+++ b/src/include/loadfuncs-leash.h
@@ -0,0 +1,413 @@
+#ifndef __LOADFUNCS_LEASH_H__
+#define __LOADFUNCS_LEASH_H__
+
+#include "loadfuncs.h"
+#include <leashwin.h>
+
+#if defined(_WIN64)
+#define LEASH_DLL      "leashw64.dll"
+#else
+#define LEASH_DLL      "leashw32.dll"
+#endif
+
+#define CALLCONV_C
+
+TYPEDEF_FUNC(
+    int,
+    CALLCONV_C,
+    Leash_kinit_dlg,
+    (HWND, LPLSH_DLGINFO)
+    );
+TYPEDEF_FUNC(
+    int,
+    CALLCONV_C,
+    Leash_kinit_dlg_ex,
+    (HWND, LPLSH_DLGINFO_EX)
+    );
+TYPEDEF_FUNC(
+    int,
+    CALLCONV_C,
+    Leash_changepwd_dlg,
+    (HWND, LPLSH_DLGINFO)
+    );
+TYPEDEF_FUNC(
+    int,
+    CALLCONV_C,
+    Leash_changepwd_dlg_ex,
+    (HWND, LPLSH_DLGINFO_EX)
+    );
+TYPEDEF_FUNC(
+    long,
+    CALLCONV_C,
+    Leash_checkpwd,
+    (char *, char *)
+    );
+TYPEDEF_FUNC(
+    long,
+    CALLCONV_C,
+    Leash_changepwd,
+    (char *, char *, char*, char*)
+    );
+TYPEDEF_FUNC(
+    long,
+    CALLCONV_C,
+    Leash_kinit,
+    (char *, char *, int)
+    );
+TYPEDEF_FUNC(
+    long,
+    CALLCONV_C,
+    Leash_kinit_ex,
+    (char *, char *, int,int, int, int, int, unsigned long)
+    );
+TYPEDEF_FUNC(
+    long,
+    CALLCONV_C,
+    Leash_klist,
+    (HWND, TICKETINFO*)
+    );
+TYPEDEF_FUNC(
+    long,
+    CALLCONV_C,
+    Leash_kdestroy,
+    (void)
+    );
+TYPEDEF_FUNC(
+    long,
+    CALLCONV_C,
+    Leash_get_lsh_errno,
+    (LONG *)
+    );
+TYPEDEF_FUNC(
+    BOOL,
+    CALLCONV_C,
+    Leash_set_help_file,
+    (char *)
+    );
+TYPEDEF_FUNC(
+    char *,
+    CALLCONV_C,
+    Leash_get_help_file,
+    (void)
+    );
+TYPEDEF_FUNC(
+    long,
+    CALLCONV_C,
+    Leash_timesync,
+    (int)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_lifetime,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_lifetime,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_lifetime,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_renew_till,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_renew_till,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_renew_till,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_forwardable,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_forwardable,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_forwardable,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_noaddresses,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_noaddresses,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_noaddresses,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_proxiable,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_proxiable,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_proxiable,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_publicip,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_publicip,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_publicip,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_use_krb4,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_use_krb4,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_use_krb4,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_life_min,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_life_min,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_life_min,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_life_max,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_life_max,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_life_max,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_renew_min,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_renew_min,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_renew_min,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_renew_max,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_renew_max,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_renew_max,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_renewable,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_renewable,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_default_renewable,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_lock_file_locations,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_lock_file_locations,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_reset_lock_file_locations,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_get_default_uppercaserealm,
+    (void)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    Leash_set_default_uppercaserealm,
+    (DWORD)
+    );
+TYPEDEF_FUNC(
+    DWORD,
+    CALLCONV_C,
+    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,
+    Leash_import,
+    (void)
+    );
+TYPEDEF_FUNC(
+    long,
+    CALLCONV_C,
+    Leash_importable,
+    (void)
+    );
+TYPEDEF_FUNC(
+    int,
+    CALLCONV_C,
+    Leash_renew,
+    (void)
+    );
+TYPEDEF_FUNC(
+    void,
+    CALLCONV_C,
+    Leash_reset_defaults,
+    (void)
+    );
+/* They are not yet all here... */
+
+#endif /* __LOADFUNCS_LEASH_H__ */
diff --git a/src/windows/leashdll/include/loadfuncs-lsa.h b/src/include/loadfuncs-lsa.h
index 40138f5de..40138f5de 100644
--- a/src/windows/leashdll/include/loadfuncs-lsa.h
+++ b/src/include/loadfuncs-lsa.h
diff --git a/src/windows/leashdll/include/loadfuncs-profile.h b/src/include/loadfuncs-profile.h
index ef7f6b7c8..ef7f6b7c8 100644
--- a/src/windows/leashdll/include/loadfuncs-profile.h
+++ b/src/include/loadfuncs-profile.h
diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in
index 7e75a6c80..008cfa90f 100644
--- a/src/windows/Makefile.in
+++ b/src/windows/Makefile.in
@@ -1,6 +1,3 @@
 BUILDTOP=..
 NO_OUTPRE=1
-!if "$(KRB5_KFW_COMPILE)"=="1"
-KFWLOGON= kfwlogon
-!endif
-SUBDIRS= wshelper lib leashdll cns gss gina ms2mit $(KFWLOGON)
+SUBDIRS= wshelper lib leashdll cns gss gina ms2mit kfwlogon
diff --git a/src/windows/kfwlogon/Makefile.in b/src/windows/kfwlogon/Makefile.in
index f05c85387..3c8cb0b7a 100644
--- a/src/windows/kfwlogon/Makefile.in
+++ b/src/windows/kfwlogon/Makefile.in
@@ -3,11 +3,8 @@
 
 mydir=.
 BUILDTOP=$(REL)..$(S)..
-DEFINES = 
-LOCALINCLUDES = -I$(BUILDTOP) -I$(PISMERE)\athena\util\loadfuncs \
-	-I$(PISMERE)\athena\auth\krb5\src\include\kerberosIV \
-	-I$(PISMERE)\athena\auth\krb4\include \
-	-I$(PISMERE)\athena\auth\leash\include
+DEFINES = -DNO_KRB4
+LOCALINCLUDES = -I$(BUILDTOP) -I$(BUILDTOP)\include -I$(BUILDTOP)\windows\leashdll\include
 PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR)
 
 SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib userenv.lib