diff options
Diffstat (limited to 'src/windows')
-rw-r--r-- | src/windows/kfwlogon/Makefile.in | 26 | ||||
-rw-r--r-- | src/windows/kfwlogon/kfwcpcc.rc | 10 | ||||
-rw-r--r-- | src/windows/kfwlogon/kfwlogon.rc | 10 | ||||
-rw-r--r-- | src/windows/ms2mit/Makefile.in | 24 | ||||
-rw-r--r-- | src/windows/version.rc | 108 |
5 files changed, 143 insertions, 35 deletions
diff --git a/src/windows/kfwlogon/Makefile.in b/src/windows/kfwlogon/Makefile.in index 96562ec36b..0d7fcc565b 100644 --- a/src/windows/kfwlogon/Makefile.in +++ b/src/windows/kfwlogon/Makefile.in @@ -13,21 +13,29 @@ LOCALINCLUDES = -I$(BUILDTOP) -I$(PISMERE)\athena\util\loadfuncs \ PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR) SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib userenv.lib -RFLAGS = $(LOCALINCLUDES) -RCFLAGS = $(RFLAGS) -D_WIN32 -all-windows:: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe +VERSIONRC = $(BUILDTOP)\windows\version.rc +RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY + +KFWLOGON=$(OUTPRE)kfwlogon.dll +KFWCPCC=$(OUTPRE)kfwcpcc.exe -$(OUTPRE)kfwlogon.res: kfwlogon.rc ..\version.rc +LIBRES=$(KFWLOGON:.dll=.res) +EXERES=$(KFWCPCC:.exe=.res) -$(OUTPRE)kfwcpcc.res: kfwcpcc.rc ..\version.rc +$(LIBRES): $(VERSIONRC) + $(RC) $(RCFLAGS) -DKFWLOGON_LIB -fo $@ -r $** +$(EXERES): $(VERSIONRC) + $(RC) $(RCFLAGS) -DKFWCPCC_APP -fo $@ -r $** + +all-windows:: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe -$(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) +$(KFWLOGON): $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj $(LIBRES) + link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB) $(LIBRES) $(_VC_MANIFEST_EMBED_DLL) -$(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) +$(KFWCPCC): $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(EXERES) + link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) $(EXERES) $(_VC_MANIFEST_EMBED_EXE) install:: diff --git a/src/windows/kfwlogon/kfwcpcc.rc b/src/windows/kfwlogon/kfwcpcc.rc deleted file mode 100644 index 5b0bbf217e..0000000000 --- a/src/windows/kfwlogon/kfwcpcc.rc +++ /dev/null @@ -1,10 +0,0 @@ -#include <windows.h>
-#include <winver.h>
-#include "patchlevel.h"
-
-#define K5_DESCRIPTION "Kerberos for Windows Logon Network Provider\0"
-#define K5_FILETYPE VFT_APP
-#define K5_INTERNAL_NAME "KFWLOGON\0"
-#define K5_ORIGINAL_NAME "kfwcpcc.exe\0"
-
-#include "..\version.rc"
diff --git a/src/windows/kfwlogon/kfwlogon.rc b/src/windows/kfwlogon/kfwlogon.rc deleted file mode 100644 index 1a3cb15eea..0000000000 --- a/src/windows/kfwlogon/kfwlogon.rc +++ /dev/null @@ -1,10 +0,0 @@ -#include <windows.h>
-#include <winver.h>
-#include "patchlevel.h"
-
-#define K5_DESCRIPTION "Kerberos for Windows Logon Network Provider\0"
-#define K5_FILETYPE VFT_DLL
-#define K5_INTERNAL_NAME "KFWLOGON\0"
-#define K5_ORIGINAL_NAME "kfwlogon.dll\0"
-
-#include "..\version.rc"
diff --git a/src/windows/ms2mit/Makefile.in b/src/windows/ms2mit/Makefile.in index 6162eb08e1..0bb4d8d702 100644 --- a/src/windows/ms2mit/Makefile.in +++ b/src/windows/ms2mit/Makefile.in @@ -9,14 +9,28 @@ BUILDTOP=$(REL)..$(S).. DEFINES = PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR) -all-windows:: $(OUTPRE)ms2mit.exe $(OUTPRE)mit2ms.exe +VERSIONRC = $(BUILDTOP)\windows\version.rc +RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY -$(OUTPRE)ms2mit.exe: $(OUTPRE)ms2mit.obj - link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)ms2mit.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj user32.lib advapi32.lib $(KLIB) $(CLIB) +MS2MIT=$(OUTPRE)ms2mit.exe +MIT2MS=$(OUTPRE)mit2ms.exe + +MS2MITRES=$(MS2MIT:.exe=.res) +MIT2MSRES=$(MIT2MS:.exe=.res) + +$(MS2MITRES): $(VERSIONRC) + $(RC) $(RCFLAGS) -DMS2MIT_APP -fo $@ -r $** +$(MIT2MSRES): $(VERSIONRC) + $(RC) $(RCFLAGS) -DMIT2MS_APP -fo $@ -r $** + +all-windows:: $(MS2MIT) $(MIT2MS) + +$(MS2MIT): $(OUTPRE)ms2mit.obj $(MS2MITRES) + link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)ms2mit.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj user32.lib advapi32.lib $(KLIB) $(CLIB) $(MS2MITRES) $(_VC_MANIFEST_EMBED_EXE) -$(OUTPRE)mit2ms.exe: $(OUTPRE)mit2ms.obj - link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)mit2ms.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj user32.lib advapi32.lib $(KLIB) $(CLIB) +$(MIT2MS): $(OUTPRE)mit2ms.obj $(MIT2MSRES) + link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)mit2ms.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj user32.lib advapi32.lib $(KLIB) $(CLIB) $(MIT2MSRES) $(_VC_MANIFEST_EMBED_EXE) install:: diff --git a/src/windows/version.rc b/src/windows/version.rc index 3f5b1af6f6..de4daff7ec 100644 --- a/src/windows/version.rc +++ b/src/windows/version.rc @@ -41,7 +41,7 @@ #define K5_PRODUCT_VERSION_STRING MAJOR_MINOR MAYBE_PATCH RELTAIL "\0" #define K5_PRODUCT_VERSION KRB5_MAJOR_RELEASE, KRB5_MINOR_RELEASE, KRB5_PATCHLEVEL, KRB5_BUILDLEVEL -#define K5_COPYRIGHT "Copyright (C) 1997-2006 by the Massachusetts Institute of Technology\0" +#define K5_COPYRIGHT "Copyright (C) 1997-2007 by the Massachusetts Institute of Technology\0" #define K5_COMPANY_NAME "Massachusetts Institute of Technology.\0" /* @@ -162,6 +162,112 @@ #define K5_ORIGINAL_NAME "telnet.exe\0" #endif +#ifdef KRB524_LIB +#define K5_DESCRIPTION "Kerberos v5 to v4 - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "krb524\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "krb524.dll\0" +#endif /* KRB524_LIB */ + +#ifdef KRB524_INIT +#define K5_DESCRIPTION "Kerberos v5 to v4 Application - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "krb524_init\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "krb524_init.exe\0" +#endif /* KRB524_INIT */ + +#ifdef MS2MIT_APP +#define K5_DESCRIPTION "Microsoft LSA to MIT Credential Cache Application - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "ms2mit\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "ms2mit.exe\0" +#endif /* MS2MIT_APP */ + +#ifdef MIT2MS_APP +#define K5_DESCRIPTION "MIT to Microsoft LSA Credential Cache Application - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "mit2ms\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "mit2ms.exe\0" +#endif /* MIT2MS_APP */ + +#ifdef KVNO_APP +#define K5_DESCRIPTION "Key Version Number Application - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "kvno\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "kvno.exe\0" +#endif /* KVNO_APP */ + +#ifdef KPASSWD_APP +#define K5_DESCRIPTION "Kerberos Change Password Application - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "kpasswd\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "kpasswd.exe\0" +#endif /* KPASSWD_APP */ + +#ifdef KFWLOGON_LIB +#define K5_DESCRIPTION "Kerberos Network Provider - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "kfwlogon\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "kfwlogon.dll\0" +#endif /* KFWLOGON_LIB */ + +#ifdef KFWCPCC_APP +#define K5_DESCRIPTION "Copy Credential Cache Application - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "kfwcpcc\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "kfwcpcc.exe\0" +#endif /* KFWCPCC_APP */ + +#ifdef KCPYTKT_APP +#define K5_DESCRIPTION "Kerberos Copy Ticket Application - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "kcpytkt\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "kcpytkt.exe\0" +#endif /* KCPYTKT_APP */ + +#ifdef KDELTKT_APP +#define K5_DESCRIPTION "Kerberos Delete Ticket Application - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "kdeltkt\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "kdeltkt.exe\0" +#endif /* KDELTKT_APP */ + +#ifdef KDESTROY_APP +#define K5_DESCRIPTION "Kerberos Destroy Credential Cache Application - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "kdestroy\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "kdestroy.exe\0" +#endif /* KDESTROY_APP */ + +#ifdef KINIT_APP +#define K5_DESCRIPTION "Kerberos Initialize Credential Cache Application - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "kinit\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "kinit.exe\0" +#endif /* KINIT_APP */ + +#ifdef KLIST_APP +#define K5_DESCRIPTION "Kerberos List Credential Cache Application - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "klist\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "klist.exe\0" +#endif /* KLIST_APP */ + +#ifdef GSS_CLIENT_APP +#define K5_DESCRIPTION "GSS Sample Client Application - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "gss-client\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "gss-client.exe\0" +#endif /* GSS_CLIENT_APP */ + +#ifdef GSS_SERVER_APP +#define K5_DESCRIPTION "GSS Sample Server Application - MIT GSS / Kerberos v5 distribution\0" +#define K5_INTERNAL_NAME "gss-server\0" +#define K5_FILETYPE VFT_DLL +#define K5_ORIGINAL_NAME "gss-server.exe\0" +#endif /* GSS_SERVER_APP */ + + /* * END SPECIFIC VERSION INFO */ |