Index: Makefile.in =================================================================== --- Makefile.in (revision 17672) +++ Makefile.in (working copy) @@ -153,7 +153,7 @@ # try to build wconfig on a config-windows. # ##DOS##$(WCONFIG_EXE): outpre-dir wconfig.c -##DOS## $(CC) -Fe$@ -Fo$*.obj wconfig.c +##DOS## $(CC) -Fe$@ -Fo$*.obj wconfig.c $(CCLINKOPTION) ##DOS##MKFDEP=$(WCONFIG_EXE) config\win-pre.in config\win-post.in Index: include/win-mac.h =================================================================== --- include/win-mac.h (revision 17672) +++ include/win-mac.h (working copy) @@ -25,6 +25,21 @@ #else /* ! RES_ONLY */ +/* To ensure backward compatibility of the ABI use 32-bit time_t on + * 32-bit Windows. + */ +#ifdef _KRB5_INT_H +#ifdef KRB5_GENERAL__ +#error krb5.h included before k5-int.h +#endif /* KRB5_GENERAL__ */ +#if _INTEGRAL_MAX_BITS >= 64 && _MSC_VER >= 1400 && !defined(_WIN64) && !defined(_USE_32BIT_TIME_T) +#if defined(_TIME_T_DEFINED) || defined(_INC_IO) || defined(_INC_TIME) || defined(_INC_WCHAR) +#error time_t has been defined as a 64-bit integer which is incompatible with Kerberos on this platform. +#endif /* _TIME_T_DEFINED */ +#define _USE_32BIT_TIME_T +#endif +#endif + #define SIZEOF_INT 4 #define SIZEOF_SHORT 2 #define SIZEOF_LONG 4 @@ -40,21 +55,6 @@ #endif #endif -/* To ensure backward compatibility of the ABI use 32-bit time_t on - * 32-bit Windows. - */ -#ifdef _KRB5_INT_H -#ifdef KRB5_GENERAL__ -#error krb5.h included before k5-int.h -#endif /* KRB5_GENERAL__ */ -#if _INTEGRAL_MAX_BITS >= 64 && _MSC_VER >= 1400 && !defined(_WIN64) && !defined(_USE_32BIT_TIME_T) -#if defined(_TIME_T_DEFINED) || defined(_INC_IO) || defined(_INC_TIME) || defined(_INC_WCHAR) -#error time_t has been defined as a 64-bit integer which is incompatible with Kerberos on this platform. -#endif /* _TIME_T_DEFINED */ -#define _USE_32BIT_TIME_T -#endif -#endif - #ifndef KRB5_CALLCONV # define KRB5_CALLCONV __stdcall # define KRB5_CALLCONV_C __cdecl Index: include/ChangeLog =================================================================== --- include/ChangeLog (revision 17672) +++ include/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * win-mac.h: support for 64-bit Windows builds + 2006-01-25 Ken Raeburn * k5-thread.h (krb5int_mutex_alloc, krb5int_mutex_free, Index: ChangeLog =================================================================== --- ChangeLog (revision 17672) +++ ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2006-01-17 Ken Raeburn * aclocal.m4 (AC_KRB5_TCL_TRYOLD): Include $LIBS in $TCL_LIBS. Index: windows/Makefile.in =================================================================== --- windows/Makefile.in (revision 17672) +++ windows/Makefile.in (working copy) @@ -14,9 +14,11 @@ @echo Making in windows\wintel cd ..\wintel $(MAKE) -$(MFLAGS) - @echo Making in windows\gss +!if ( "$(CPU)" != "ALPHA64" ) && ( "$(CPU)" != "IA64" ) && ( "$(CPU)" != "AMD64" ) + @echo Making in windows\gss cd ..\gss $(MAKE) -$(MFLAGS) +!endif @echo Making in windows\gina cd ..\gina $(MAKE) -$(MFLAGS) Index: windows/cns/Makefile.in =================================================================== --- windows/cns/Makefile.in (revision 17672) +++ windows/cns/Makefile.in (working copy) @@ -54,7 +54,7 @@ $(OUTPRE)$(NAME).exe: $(NAME).def $(OBJS) $(XOBJS) $(LIBS) $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ - $(LIBS) $(SYSLIBS) + $(LIBS) $(SYSLIBS) $(SCLIB) install:: $(CP) $(OUTPRE)$(NAME).exe $(DESTDIR) Index: windows/cns/password.c =================================================================== --- windows/cns/password.c (revision 17672) +++ windows/cns/password.c (working copy) @@ -277,7 +277,7 @@ case WM_SETCURSOR: if (isblocking) { SetCursor(LoadCursor(NULL, IDC_WAIT)); - SetWindowLong(hwnd, DWL_MSGRESULT, TRUE); + SetWindowLongPtr(hwnd, DWLP_MSGRESULT, TRUE); return TRUE; } Index: windows/cns/ChangeLog =================================================================== --- windows/cns/ChangeLog (revision 17672) +++ windows/cns/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in, password.c: support for 64-bit Windows builds + 2005-03-15 Jeffrey Altman * tktlist.c: do not mix pointers to long and time_t Index: windows/kfwlogon/Makefile.in =================================================================== --- windows/kfwlogon/Makefile.in (revision 17672) +++ windows/kfwlogon/Makefile.in (working copy) @@ -1,37 +1,37 @@ -# Makefile for the KFW Network Provider -# - -thisconfigdir=./.. -myfulldir=windows/nplogon -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 -PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR) - -SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib -RFLAGS = $(LOCALINCLUDES) -RCFLAGS = $(RFLAGS) -D_WIN32 - -all-windows:: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe - -$(OUTPRE)kfwlogon.res: kfwlogon.rc ..\version.rc - -$(OUTPRE)kfwcpcc.res: kfwcpcc.rc ..\version.rc - -$(OUTPRE)kfwlogon.dll: $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwlogon.res - link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB) - -$(OUTPRE)kfwcpcc.exe: $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwcpcc.res - link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) - -install:: - copy $(OUTPRE)kfwlogon.dll $(DESTDIR) - copy $(OUTPRE)kfwcpcc.exe $(DESTDIR) - -clean:: - $(RM) $(OUTPRE)*.exe $(OUTPRE)*.dll $(OUTPRE)*.res - +# Makefile for the KFW Network Provider +# + +thisconfigdir=./.. +myfulldir=windows/nplogon +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 +PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR) + +SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib +RFLAGS = $(LOCALINCLUDES) +RCFLAGS = $(RFLAGS) -D_WIN32 + +all-windows:: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe + +$(OUTPRE)kfwlogon.res: kfwlogon.rc ..\version.rc + +$(OUTPRE)kfwcpcc.res: kfwcpcc.rc ..\version.rc + +$(OUTPRE)kfwlogon.dll: $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwlogon.res + link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB) $(SCLIB) + +$(OUTPRE)kfwcpcc.exe: $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwcpcc.res + link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) $(SCLIB) + +install:: + copy $(OUTPRE)kfwlogon.dll $(DESTDIR) + copy $(OUTPRE)kfwcpcc.exe $(DESTDIR) + +clean:: + $(RM) $(OUTPRE)*.exe $(OUTPRE)*.dll $(OUTPRE)*.res + Index: windows/ChangeLog =================================================================== --- windows/ChangeLog (revision 17672) +++ windows/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2005-11-29 Jeffrey Altman * Makefile.in: build src/windows/kfwlogon Index: windows/wintel/Makefile.in =================================================================== --- windows/wintel/Makefile.in (revision 17672) +++ windows/wintel/Makefile.in (working copy) @@ -34,7 +34,7 @@ $(OUTPRE)telnet.exe: telnet.def $(OBJS) $(XOBJS) $(LIBS) $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ - $(LIBS) $(SYSLIBS) + $(LIBS) $(SYSLIBS) $(SCLIB) install:: copy $(OUTPRE)telnet.exe $(DESTDIR) Index: windows/wintel/ChangeLog =================================================================== --- windows/wintel/ChangeLog (revision 17672) +++ windows/wintel/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2004-09-30 Jeffrey Altman * Makefile.in: Add $(BUILDTOP) to include path for patchlevel.h Index: windows/gina/Makefile.in =================================================================== --- windows/gina/Makefile.in (revision 17672) +++ windows/gina/Makefile.in (working copy) @@ -27,7 +27,7 @@ $(OUTPRE)kgina.dll: $(OBJS) $(KLIB) $(CLIB) link $(WINDLLFLAGS) -def:gina.def -out:$*.dll \ - $** $(WINLIBS) + $** $(WINLIBS) $(SCLIB) $(OUTPRE)ginastub.obj: ginastub.h Index: windows/gina/ChangeLog =================================================================== --- windows/gina/ChangeLog (revision 17672) +++ windows/gina/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2005-10-20 Jeffrey Altman * Makefile.in (WINLIBS): Link to the multi-threaded library. Index: appl/gssftp/ftp/Makefile.in =================================================================== --- appl/gssftp/ftp/Makefile.in (revision 17672) +++ appl/gssftp/ftp/Makefile.in (working copy) @@ -37,7 +37,7 @@ $(CC_LINK) -o ftp $(OBJS) $(GSS_LIBS) $(KRB4COMPAT_LIBS) $(OUTPRE)ftp.exe: $(OBJS) $(GLIB) $(KLIB) - link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib advapi32.lib + link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib advapi32.lib $(SCLIB) clean-unix:: $(RM) ftp Index: appl/gssftp/ftp/ChangeLog =================================================================== --- appl/gssftp/ftp/ChangeLog (revision 17672) +++ appl/gssftp/ftp/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2003-12-13 Ken Raeburn * ftp.c (do_auth): Handle a return code of 335, where the Index: appl/gss-sample/Makefile.in =================================================================== --- appl/gss-sample/Makefile.in (revision 17672) +++ appl/gss-sample/Makefile.in (working copy) @@ -20,10 +20,10 @@ $(CC_LINK) -o gss-client gss-client.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS) $(OUTPRE)gss-server.exe: $(OUTPRE)gss-server.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB) - link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib + link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(SCLIB) $(OUTPRE)gss-client.exe: $(OUTPRE)gss-client.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB) - link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib + link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(SCLIB) clean-unix:: $(RM) gss-server gss-client Index: appl/gss-sample/ChangeLog =================================================================== --- appl/gss-sample/ChangeLog (revision 17672) +++ appl/gss-sample/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2005-10-20 Ken Raeburn * gss-client.c, gss-misc.c, gss-server.c: Reindented. Index: clients/kpasswd/Makefile.in =================================================================== --- clients/kpasswd/Makefile.in (revision 17672) +++ clients/kpasswd/Makefile.in (working copy) @@ -26,4 +26,4 @@ all-windows:: $(OUTPRE)kpasswd.exe $(OUTPRE)kpasswd.exe: $(OUTPRE)kpasswd.obj $(KLIB) $(CLIB) - link $(EXE_LINKOPTS) -out:$@ $** + link $(EXE_LINKOPTS) -out:$@ $** $(SCLIB) Index: clients/kpasswd/ChangeLog =================================================================== --- clients/kpasswd/ChangeLog (revision 17672) +++ clients/kpasswd/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2004-06-24 Tom Yu * kpasswd.c (P1, P2): Cosmetic fix for prompts to avoid Index: config/win-post.in =================================================================== --- config/win-post.in (revision 17672) +++ config/win-post.in (working copy) @@ -34,6 +34,14 @@ $(WCONFIG) $(BUILDTOP)\config < Makefile.in > Makefile !endif +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +!if defined(WIN64LIBNAME) +LIBNAME=$(WIN64LIBNAME) +!endif +!if defined(WIN64OBJFILE) +OBJFILE=$(WIN64OBJFILE) +!endif +!endif !if defined(LIBNAME) Index: config/win-pre.in =================================================================== --- config/win-pre.in (revision 17672) +++ config/win-pre.in (working copy) @@ -31,8 +31,8 @@ CPU=i386 !endif # CPU == X86 -!if ( "$(CPU)" != "i386" ) && ( "$(CPU)" != "ALPHA" ) -!error Must specify CPU environment variable ( CPU=i386, CPU=ALPHA) +!if ( "$(CPU)" != "i386" ) && ( "$(CPU)" != "ALPHA" ) && ( "$(CPU)" != "ALPHA64" ) && ( "$(CPU)" != "IA64" ) && ( "$(CPU)" != "AMD64" ) +!error Must specify CPU environment variable ( CPU=i386, CPU=ALPHA, CPU=ALPHA64,CPU=IA64, CPU=AMD64) !endif # # End of figuring out CPU @@ -130,6 +130,16 @@ CCOPTS=-nologo /W3 $(PDB_OPTS) $(DLL_FILE_DEF) LOPTS=-nologo -incremental:no +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +CCLINKOPTION=/link bufferoverflowu.lib +SCLIB=bufferoverflowu.lib +DEBUGOPT=/Zi +!else +CCLINKOPTION= +SCLIB= +DEBUGOPT=/ZI +!endif + # /ZI gives better debug info in each object file (MSVC 6.0 or higher). # /Zi gives debug info in each object file. # /Gs Avoid stack probes (they don't seem to work anyway) @@ -143,13 +153,13 @@ # !ifdef NODEBUG !ifdef DEBUG_SYMBOL -CCOPTS=/ZI $(CCOPTS) +CCOPTS=$(DEBUGOPT) $(CCOPTS) LOPTS=$(LOPTS) -debug !endif CCOPTS=/Os /MD $(CCOPTS) LOPTS=$(LOPTS) !else -CCOPTS=/Od /ZI /MDd $(CCOPTS) +CCOPTS=/Od $(DEBUGOPT) /MDd $(CCOPTS) LOPTS=$(LOPTS) -debug !endif @@ -178,6 +188,17 @@ GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi32.lib WLIB= +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +CLIB=$(BUILDTOP)\lib\$(OUTPRE)comerr64.lib +PLIB=$(BUILDTOP)\lib\$(OUTPRE)xpprof64.lib +KLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5_64.lib +K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_64.lib +SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt64.lib +GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi64.lib +WLIB= + +!endif + KRB4_INCLUDES=-I$(BUILDTOP)/include/kerberosIV COM_ERR_DEPS = $(BUILDTOP)/include/com_err.h Index: config/ChangeLog =================================================================== --- config/ChangeLog (revision 17672) +++ config/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * win-pre.in, win-post.in: support for 64-bit Windows builds + 2006-01-25 Ken Raeburn * shlib.conf (*-*-linux*): Run export-check.pl after building a Index: lib/crypto/ChangeLog =================================================================== --- lib/crypto/ChangeLog (revision 17672) +++ lib/crypto/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2006-02-24 Jeffrey Altman + + * pbkdf2.c, crypto_libinit.c: move k5-int.h to top of file + to allow building with Microsoft VS8 compiler + 2006-01-17 Ken Raeburn * Makefile.in (t_nfold$(EXEEXT)): Include support library. Index: lib/crypto/pbkdf2.c =================================================================== --- lib/crypto/pbkdf2.c (revision 17672) +++ lib/crypto/pbkdf2.c (working copy) @@ -28,8 +28,8 @@ * Not currently used; likely to be used when we get around to AES support. */ +#include "k5-int.h" #include -#include "k5-int.h" #include "hash_provider.h" /* Not exported, for now. */ Index: lib/crypto/sha1/ChangeLog =================================================================== --- lib/crypto/sha1/ChangeLog (revision 17672) +++ lib/crypto/sha1/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2006-02-24 Jeffrey Altman + + * shs.c: add k5-int.h at top of file to allow building with + Microsoft VS8 compiler + 2006-01-17 Ken Raeburn * Makefile.in (t_shs, t_shs3): Include support library. Use Index: lib/crypto/sha1/shs.c =================================================================== --- lib/crypto/sha1/shs.c (revision 17672) +++ lib/crypto/sha1/shs.c (working copy) @@ -1,3 +1,4 @@ +#include #ifdef HAVE_SYS_TYPES_H #include #endif Index: lib/crypto/crypto_libinit.c =================================================================== --- lib/crypto/crypto_libinit.c (revision 17672) +++ lib/crypto/crypto_libinit.c (working copy) @@ -1,5 +1,5 @@ +#include "k5-int.h" #include -#include "k5-int.h" MAKE_INIT_FUNCTION(cryptoint_initialize_library); MAKE_FINI_FUNCTION(cryptoint_cleanup_library); Index: lib/Makefile.in =================================================================== --- lib/Makefile.in (revision 17672) +++ lib/Makefile.in (working copy) @@ -28,6 +28,8 @@ ##MIT##MITLIBS=$(VS_LIB) ##MIT##MITFLAGS=-I$(VS_INC) /DVERSERV=1 + + SLIBS = $(BUILDTOP)\util\support\$(OUTPRE)k5sprt32.lib CLIBS = $(BUILDTOP)\util\et\$(OUTPRE)comerr.lib PLIBS = $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib @@ -37,6 +39,10 @@ GLIBS = gssapi\$(OUTPRE)gssapi.lib K4LIBS = krb4\$(OUTPRE)krb4.lib +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +SLIBS = $(BUILDTOP)\util\support\$(OUTPRE)k5sprt64.lib +!endif + SDEF = k5sprt32.def CDEF = comerr32.def PDEF = xpprof32.def @@ -44,6 +50,8 @@ GDEF = gssapi32.def K4DEF = krb4_32.def + + KRB5RC = krb5.rc VERSIONRC = $(BUILDTOP)\windows\version.rc @@ -91,7 +99,7 @@ ##WIN32##$(SLIB): $(SDEF) $(SLIBS) $(SGLUE) $(SRES) ##WIN32## link $(WINDLLFLAGS) -def:$(SDEF) -out:$*.dll \ -##WIN32## $(SLIBS) $(SGLUE) $(SRES) $(WINLIBS) +##WIN32## $(SLIBS) $(SGLUE) $(SRES) $(WINLIBS) $(SCLIB) $(SDEF): ..\util\support\libkrb5support.exports echo EXPORTS > $(SDEF).new type ..\util\support\libkrb5support.exports >> $(SDEF).new @@ -100,7 +108,7 @@ ##WIN32##$(CLIB): $(CDEF) $(CLIBS) $(CGLUE) $(CRES) $(SLIB) ##WIN32## link $(WINDLLFLAGS) -def:$(CDEF) -out:$*.dll \ -##WIN32## $(CLIBS) $(CGLUE) $(CRES) $(SLIB) $(WINLIBS) +##WIN32## $(CLIBS) $(CGLUE) $(CRES) $(SLIB) $(WINLIBS) $(SCLIB) ##WIN32##$(PLIB): $(PDEF) $(PLIBS) $(PGLUE) $(PRES) $(CLIB) $(SLIB) ##WIN32## link $(WINDLLFLAGS) -def:$(PDEF) -out:$*.dll \ @@ -108,15 +116,15 @@ ##WIN32##$(KLIB): $(KDEF) $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(SLIB) $(MITLIBS) $(DNSLIBS) ##WIN32## link $(WINDLLFLAGS) -def:$(KDEF) -out:$*.dll \ -##WIN32## $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(SLIB) $(MITLIBS) $(DNSLIBS) $(WINLIBS) +##WIN32## $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(SLIB) $(MITLIBS) $(DNSLIBS) $(WINLIBS) $(SCLIB) ##WIN32##$(GLIB): $(GDEF) $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(SLIB) ##WIN32## link $(WINDLLFLAGS) -def:$(GDEF) -out:$*.dll \ -##WIN32## $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(SLIB) $(WINLIBS) +##WIN32## $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(SLIB) $(WINLIBS) $(SCLIB) ##WIN32##$(K4LIB): $(K4DEF) $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB) ##WIN32## link $(WINDLLFLAGS) -def:$(K4DEF) -out:$*.dll \ -##WIN32## $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB) $(WINLIBS) +##WIN32## $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB) $(WINLIBS) $(SCLIB) $(K5_GLUE): win_glue.c $(CC) $(ALL_CFLAGS) $(MITFLAGS) /c /DKRB5=1 /Fo$@ $** Index: lib/gssapi/krb5/ChangeLog =================================================================== --- lib/gssapi/krb5/ChangeLog (revision 17672) +++ lib/gssapi/krb5/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2006-02-24 Jeffrey Altman + + * set_ccache.c: k5-int.h to top of file for Microsoft VS8 + compiler + 2005-11-14 Jeffrey Altman * gssapi_krb5.hin: include k5-int.h instead of krb5.h Index: lib/gssapi/krb5/set_ccache.c =================================================================== --- lib/gssapi/krb5/set_ccache.c (revision 17672) +++ lib/gssapi/krb5/set_ccache.c (working copy) @@ -27,6 +27,7 @@ * name. Caller should not free returned name. */ +#include "k5-int.h" #include #include "gssapiP_krb5.h" Index: lib/ChangeLog =================================================================== --- lib/ChangeLog (revision 17672) +++ lib/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2005-10-31 Jeffrey Altman * gssapi32.def: export missing functions Index: lib/krb5/os/gmt_mktime.c =================================================================== --- lib/krb5/os/gmt_mktime.c (revision 17672) +++ lib/krb5/os/gmt_mktime.c (working copy) @@ -1,7 +1,7 @@ /* This code placed in the public domain by Mark W. Eichin */ +#include "k5-int.h" #include -#include "k5-int.h" #ifdef HAVE_SYS_TYPES_H #include Index: lib/krb5/os/ChangeLog =================================================================== --- lib/krb5/os/ChangeLog (revision 17672) +++ lib/krb5/os/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2006-02-24 Jeffrey Altman + + * gmt_mktime.c, read_pwd.c: changes to support 64-bit builds + on Windows + 2005-11-14 Jeffrey Altman * toffset.c: (krb5_set_real_time, krb5_set_debugging_time, Index: lib/krb5/os/read_pwd.c =================================================================== --- lib/krb5/os/read_pwd.c (revision 17672) +++ lib/krb5/os/read_pwd.c (working copy) @@ -209,7 +209,7 @@ switch(msg) { case WM_INITDIALOG: dp = (pwd_params *) lParam; - SetWindowLong(hdlg, DWL_USER, lParam); + SetWindowLongPtr(hdlg, DWLP_USER, lParam); SetDlgItemText(hdlg, ID_READ_PWD_PROMPT, dp->pwd_prompt); SetDlgItemText(hdlg, ID_READ_PWD_PROMPT2, dp->pwd_prompt2); SetDlgItemText(hdlg, ID_READ_PWD_PWD, ""); @@ -217,7 +217,7 @@ return TRUE; case WM_COMMAND: - dp = (pwd_params *) GetWindowLong(hdlg, DWL_USER); + dp = (pwd_params *) GetWindowLongPtr(hdlg, DWLP_USER); switch (wParam) { case IDOK: *(dp->pwd_size_return) = Index: lib/krb5/ccache/ccapi/winccld.c =================================================================== --- lib/krb5/ccache/ccapi/winccld.c (revision 17672) +++ lib/krb5/ccache/ccapi/winccld.c (working copy) @@ -4,9 +4,9 @@ * it's present. */ +#include "k5-int.h" #include #include -#include "k5-int.h" #include "stdcc.h" /* from fcc-proto.h */ Index: lib/krb5/ccache/ccapi/ChangeLog =================================================================== --- lib/krb5/ccache/ccapi/ChangeLog (revision 17672) +++ lib/krb5/ccache/ccapi/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * winccld.c: move k5-int.h before windows.h + 2005-11-14 Jeffrey Altman * winccld.c, stdcc.c: include k5-int.h before stdcc.h Index: lib/krb5/krb/chpw.c =================================================================== --- lib/krb5/krb/chpw.c (revision 17672) +++ lib/krb5/krb/chpw.c (working copy) @@ -1,9 +1,9 @@ /* ** set password functions added by Paul W. Nelson, Thursby Software Systems, Inc. */ -#include #include "k5-int.h" +#include #include "krb5_err.h" #include "auth_con.h" Index: lib/krb5/krb/ChangeLog =================================================================== --- lib/krb5/krb/ChangeLog (revision 17672) +++ lib/krb5/krb/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2006-02-24 Jeffrey Altman + + * chpw.c, get_in_tkt.c, appdefault.c, deltat.c: Move k5-int.h + to top of file to allow building with Microsoft VS8 compiler + 2006-01-17 Ken Raeburn * Makefile.in (t_deltat): Include support library. Index: lib/krb5/krb/get_in_tkt.c =================================================================== --- lib/krb5/krb/get_in_tkt.c (revision 17672) +++ lib/krb5/krb/get_in_tkt.c (working copy) @@ -27,11 +27,10 @@ * krb5_get_in_tkt() */ -#include - #include "k5-int.h" #include "int-proto.h" #include "os-proto.h" +#include /* All-purpose initial ticket routine, usually called via Index: lib/krb5/krb/appdefault.c =================================================================== --- lib/krb5/krb/appdefault.c (revision 17672) +++ lib/krb5/krb/appdefault.c (working copy) @@ -3,9 +3,9 @@ * handle the [appdefaults] profile section */ +#include "k5-int.h" #include #include -#include "k5-int.h" Index: lib/krb5/krb/deltat.c =================================================================== --- lib/krb5/krb/deltat.c (revision 17672) +++ lib/krb5/krb/deltat.c (working copy) @@ -71,9 +71,9 @@ #line 38 "x-deltat.y" +#include "k5-int.h" #include #include -#include "k5-int.h" struct param { krb5_int32 delta; Index: lib/des425/key_sched.c =================================================================== --- lib/des425/key_sched.c (revision 17672) +++ lib/des425/key_sched.c (working copy) @@ -27,6 +27,7 @@ */ +#include "k5-int.h" #include #include "des_int.h" #include "des.h" Index: lib/des425/ChangeLog =================================================================== --- lib/des425/ChangeLog (revision 17672) +++ lib/des425/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2006-02-24 Jeffrey Altman + + * key_sched.c, util.c, str_to_key.c, quad_cksum.c: Move k5-int.h + to top of file to allow building with Microsoft VS8 compiler + 2006-01-17 Ken Raeburn * Makefile.in (t_quad): Include support library. Index: lib/des425/util.c =================================================================== --- lib/des425/util.c (revision 17672) +++ lib/des425/util.c (working copy) @@ -9,10 +9,10 @@ * Miscellaneous debug printing utilities */ +#include "k5-int.h" #include /* Application include files */ -#include "k5-int.h" #include "des_int.h" #include "des.h" Index: lib/des425/str_to_key.c =================================================================== --- lib/des425/str_to_key.c (revision 17672) +++ lib/des425/str_to_key.c (working copy) @@ -40,7 +40,7 @@ * spm 8/85 MIT project athena */ - +#include "k5-int.h" #include #include #include "des_int.h" Index: lib/des425/quad_cksum.c =================================================================== --- lib/des425/quad_cksum.c (revision 17672) +++ lib/des425/quad_cksum.c (working copy) @@ -101,6 +101,7 @@ * --Ken Raeburn 2001-04-06 */ +#include "k5-int.h" /* System include files */ #include Index: krb524/Makefile.in =================================================================== --- krb524/Makefile.in (revision 17672) +++ krb524/Makefile.in (working copy) @@ -89,7 +89,7 @@ link $(DLL_LINKOPTS) -def:$(K524DEF) -out:$*.dll $** $(WINLIBS) $(OUTPRE)k524init.exe: $(OUTPRE)k524init.$(OBJEXT) $(KLIB) $(K4LIB) $(CLIB) $(BUILDTOP)\util\windows\$(OUTPRE)getopt.lib - link $(EXE_LINKOPTS) -out:$@ $** $(WINLIBS) + link $(EXE_LINKOPTS) -out:$@ $** $(WINLIBS) $(SCLIB) install-unix:: $(INSTALL_PROGRAM) krb524d $(DESTDIR)$(SERVER_BINDIR)/krb524d Index: krb524/ChangeLog =================================================================== --- krb524/ChangeLog (revision 17672) +++ krb524/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2005-11-17 Ken Raeburn * krb524d.c: Include k5-int.h instead of krb5.h. Index: util/windows/Makefile.in =================================================================== --- util/windows/Makefile.in (revision 17672) +++ util/windows/Makefile.in (working copy) @@ -3,7 +3,7 @@ all-windows:: $(OUTPRE)libecho.exe $(OUTPRE)getopt.lib $(OUTPRE)libecho.exe: $(OUTPRE)libecho.obj - link -out:$@ $** + link -out:$@ $** $(SCLIB) $(OUTPRE)getopt.lib: $(OUTPRE)getopt.obj $(OUTPRE)getopt_long.obj lib -out:$@ $** Index: util/windows/ChangeLog =================================================================== --- util/windows/ChangeLog (revision 17672) +++ util/windows/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2000-02-04 Danilo Almeida * getopt.c, getopt_long.c, getopt.h: Update to latest BSD code Index: util/support/Makefile.in =================================================================== --- util/support/Makefile.in (revision 17672) +++ util/support/Makefile.in (working copy) @@ -6,8 +6,10 @@ ##DOS##BUILDTOP = ..\.. ##DOS##LIBNAME=$(OUTPRE)k5sprt32.lib +##DOS##WIN64LIBNAME=$(OUTPRE)k5sprt64.lib ##DOS##XTRA= ##DOS##OBJFILE=$(OUTPRE)k5sprt32.lst +##DOS##WIN64OBJFILE=$(OUTPRE)k5sprt64.lst SED = sed Index: util/support/ChangeLog =================================================================== --- util/support/ChangeLog (revision 17672) +++ util/support/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2006-01-25 Ken Raeburn * threads.c (krb5int_mutex_alloc, krb5int_mutex_free,