diff options
| author | Kevin Koch <kpkoch@mit.edu> | 2008-03-31 20:38:55 +0000 |
|---|---|---|
| committer | Kevin Koch <kpkoch@mit.edu> | 2008-03-31 20:38:55 +0000 |
| commit | 214fc297ca9043e4638ca564ad9e137ab13cc00d (patch) | |
| tree | 637874f8bdc028e4077db0f60a1c4c49ed89edda | |
| parent | 87db15066d97b500a9a6d9d8acf6c15b8b230cdb (diff) | |
| download | krb5-214fc297ca9043e4638ca564ad9e137ab13cc00d.zip krb5-214fc297ca9043e4638ca564ad9e137ab13cc00d.tar.gz krb5-214fc297ca9043e4638ca564ad9e137ab13cc00d.tar.bz2 | |
Snapshot. Krb4 mostly removed
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/kpkoch-ccapi@20301 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/ccapi/lib/win/Makefile.in | 3 | ||||
| -rw-r--r-- | src/ccapi/server/win/Makefile.in | 6 | ||||
| -rw-r--r-- | src/clients/klist/Makefile.in | 1 | ||||
| -rw-r--r-- | src/krb524/Makefile.in | 2 | ||||
| -rw-r--r-- | src/windows/build/copyfiles.xml | 20 | ||||
| -rw-r--r-- | src/windows/build/corebinaryfiles.xml | 7 | ||||
| -rw-r--r-- | src/windows/build/sdkfiles.xml | 3 | ||||
| -rw-r--r-- | src/windows/identity/config/Makefile.w32 | 2 | ||||
| -rw-r--r-- | src/windows/identity/plugins/common/Makefile | 1 | ||||
| -rw-r--r-- | src/windows/identity/plugins/common/dynimport.c | 6 | ||||
| -rw-r--r-- | src/windows/installer/nsis/kfw-fixed.nsi | 36 | ||||
| -rw-r--r-- | src/windows/installer/wix/features.wxi | 9 | ||||
| -rw-r--r-- | src/windows/installer/wix/files.wxi | 59 | ||||
| -rw-r--r-- | src/windows/installer/wix/platform.wxi | 16 | ||||
| -rw-r--r-- | src/windows/installer/wix/site-local-tagged.wxi | 4 |
15 files changed, 20 insertions, 155 deletions
diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in index 1d0024c..1160a8b 100644 --- a/src/ccapi/lib/win/Makefile.in +++ b/src/ccapi/lib/win/Makefile.in @@ -52,6 +52,9 @@ TARGET = krbcc32 KFWINC= /I$(BUILDTOP)\..\..\krbcc\include
!endif
+CPPFLAGS = $(CPPFLAGS) /EHsc -D_CRTAPI1=_cdecl -D_CRTAPI2=_cdecl -DWINVER=0x0501 \
+-D_WIN32_WINNT=0x0501 -D_CRT_SECURE_NO_WARNINGS
+
# Because all the sources are pulled together into the temp directory SRCTMP,
# the only includes we need are to directories outside of ccapi.
LOCALINCLUDES = /I..\$(BUILDTOP) /I..\$(BUILDTOP)\include /I..\$(BUILDTOP)\include\krb5 $(KFWINC) \
diff --git a/src/ccapi/server/win/Makefile.in b/src/ccapi/server/win/Makefile.in index 436f6dd..791713e 100644 --- a/src/ccapi/server/win/Makefile.in +++ b/src/ccapi/server/win/Makefile.in @@ -102,8 +102,10 @@ copysrc : midl : ccs_request.h ccs_reply.h
$(OUTPRE)$(TARGET).exe: $(OBJS)
- echo $(LFLAGS)
- $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(LIBS) $(conlibsdll) $(conflags)
+ echo LFLAGS: $(LFLAGS)
+ echo _VC_MANIFEST_EMBED_EXE: $(_VC_MANIFEST_EMBED_EXE)
+ $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(LIBS) $(conlibsdll) $(conflags)
+ $(_VC_MANIFEST_EMBED_EXE)
$(BINPLACE_CMD) $(DBGSYM) --optional $@
finish :
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in index 66d0c4a..a669d5c 100644 --- a/src/clients/klist/Makefile.in +++ b/src/clients/klist/Makefile.in @@ -28,6 +28,7 @@ klist: klist.o $(KRB4COMPAT_DEPLIBS) ##WIN32##$(KLIST): $(OUTPRE)klist.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.lib $(SLIB) $(KLIB) $(CLIB) $(EXERES) ##WIN32## link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(SCLIB) ##WIN32## $(_VC_MANIFEST_EMBED_EXE) +##WIN32## echo PLACE: $(PLACE), NO_PLACE: $(NO_PLACE), NO_BNC: $(NO_BNC) clean-unix:: $(RM) klist.o klist diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in index a4f31d4..0a5e220 100644 --- a/src/krb524/Makefile.in +++ b/src/krb524/Makefile.in @@ -157,7 +157,7 @@ $(OUTPRE)k524init.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(OUTPRE)krb524d.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ - $(BUILDTOP)/include/kadm5/kadm_err.h $(KRB_ERR_H_DEP) \ + $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/adm_proto.h \ $(SRCTOP)/include/gssrpc/auth.h $(SRCTOP)/include/gssrpc/auth_gss.h \ diff --git a/src/windows/build/copyfiles.xml b/src/windows/build/copyfiles.xml index 11809ca..6b819cd 100644 --- a/src/windows/build/copyfiles.xml +++ b/src/windows/build/copyfiles.xml @@ -39,11 +39,8 @@ <File name="wshelp32.lib" from="..\target\lib\i386\%bldtype%\" to="\lib\i386" /> <File name="loadfuncs.lib" from="..\target\lib\i386\%bldtype%\" to="\lib\i386" /> <File name="leashw32.lib" from="..\target\lib\i386\%bldtype%\" to="\lib\i386" /> - <File name="krbv4w32.lib" from="..\target\lib\i386\%bldtype%\" to="\lib\i386" /> <File name="krbcc32.lib" from="..\target\lib\i386\%bldtype%\" to="\lib\i386" /> <File name="krb5_32.lib" from="..\target\lib\i386\%bldtype%\" to="\lib\i386" /> - <File name="krb524.lib" from="..\target\lib\i386\%bldtype%\" to="\lib\i386" /> - <File name="kclnt32.lib" from="..\target\lib\i386\%bldtype%\" to="\lib\i386" /> <File name="gssapi32.lib" from="..\target\lib\i386\%bldtype%\" to="\lib\i386" /> <File name="getopt.lib" from="..\target\lib\i386\%bldtype%\" to="\lib\i386" /> <File name="delaydlls.lib" from="..\target\lib\i386\%bldtype%\" to="\lib\i386" /> @@ -69,7 +66,6 @@ <File name="leash32.chm" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="kpasswd.pdb" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="kvno.pdb" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> - <File name="krbv4w32.pdb" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="krbcc32s.pdb" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="krbcc32.pdb" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="k5sprt32.pdb" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> @@ -78,7 +74,6 @@ <File name="klist.pdb" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="kinit.pdb" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="kdestroy.pdb" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> - <File name="kclnt32.pdb" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="k524init.pdb" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="gssapi32.pdb" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="gss-server.pdb" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> @@ -104,7 +99,6 @@ <File name="leash32.exe" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="kpasswd.exe" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="kvno.exe" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> - <File name="krbv4w32.dll" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="krbcc32s.exe" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="krbcc32.dll" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="k5sprt32.dll" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> @@ -113,7 +107,6 @@ <File name="klist.exe" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="kinit.exe" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="kdestroy.exe" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> - <File name="kclnt32.dll" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="k524init.exe" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="gssapi32.dll" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> <File name="gss-server.exe" from="..\target\bin\i386\%bldtype%\" to="\bin\i386" /> @@ -132,17 +125,6 @@ <File name="*" from="auth\krb5\src\windows\identity\sample\templates\credprov\images\" to="\sample\templates\credprov\images" /> <File name="*" from="auth\krb5\src\windows\identity\sample\templates\credprov\lang\" to="\sample\templates\credprov\lang" /> <File name="*" from="auth\krb5\src\windows\identity\sample\templates\credprov\lang\en_us\" to="\sample\templates\credprov\lang\en_us" /> - <File name="kclient.h" from="auth\krb4\kclient\include\" to="\inc\kclient" /> - <File name="kcmacerr.h" from="auth\krb4\kclient\include\" to="\inc\kclient" /> - <File name="com_err.h" from="auth\krb4\include\" to="\inc\krb4" /> - <File name="conf-pc.h" from="auth\krb4\include\" to="\inc\krb4" /> - <File name="conf.h" from="auth\krb4\include\" to="\inc\krb4" /> - <File name="des.h" from="auth\krb4\include\" to="\inc\krb4" /> - <File name="kadm_err.h" from="auth\krb4\include\" to="\inc\krb4" /> - <File name="krb.h" from="auth\krb4\include\" to="\inc\krb4" /> - <File name="krberr.h" from="auth\krb4\include\" to="\inc\krb4" /> - <File name="mit_copy.h" from="auth\krb4\include\" to="\inc\krb4" /> - <File name="osconf.h" from="auth\krb4\include\" to="\inc\krb4" /> <File name="com_err.h" from="auth\krb5\src\include\" to="\inc\krb5" /> <File name="krb5.h" from="auth\krb5\src\include\" to="\inc\krb5" /> <File name="profile.h" from="auth\krb5\src\include\" to="\inc\krb5" /> @@ -152,11 +134,9 @@ <File name="gssapi_generic.h" from="auth\krb5\src\include\gssapi\" to="\inc\krb5\gssapi" /> <File name="gssapi_krb5.h" from="auth\krb5\src\include\gssapi\" to="\inc\krb5\gssapi" /> <File name="des.h" from="auth\krb5\src\include\KerberosIV\" to="\inc\krb5\KerberosIV" /> - <File name="kadm_err.h" from="auth\krb5\src\include\KerberosIV\" to="\inc\krb5\KerberosIV" /> <File name="krb_err.h" from="auth\krb5\src\include\KerberosIV\" to="\inc\krb5\KerberosIV" /> <File name="krb.h" from="auth\krb5\src\include\KerberosIV\" to="\inc\krb5\KerberosIV" /> <File name="mit-copyright.h" from="auth\krb5\src\include\KerberosIV\" to="\inc\krb5\KerberosIV" /> - <File name="cacheapi.h" from="auth\krbcc\include\" to="\inc\krbcc" /> <File name="leasherr.h" from="auth\leash\include\" to="\inc\leash" /> <File name="leashinfo.h" from="auth\leash\include\" to="\inc\leash" /> <File name="leashwin.h" from="auth\leash\include\" to="\inc\leash" /> diff --git a/src/windows/build/corebinaryfiles.xml b/src/windows/build/corebinaryfiles.xml index 9fcf8aa..a0f4b83 100644 --- a/src/windows/build/corebinaryfiles.xml +++ b/src/windows/build/corebinaryfiles.xml @@ -23,8 +23,6 @@ <File name="k524init.pdb" from="staging\bin\i386" to="\bin\i386\" /> <File name="k5sprt32.dll" from="staging\bin\i386" to="\bin\i386\" /> <File name="k5sprt32.pdb" from="staging\bin\i386" to="\bin\i386\" /> - <File name="kclnt32.dll" from="staging\bin\i386" to="\bin\i386\" /> - <File name="kclnt32.pdb" from="staging\bin\i386" to="\bin\i386\" /> <File name="kcpytkt.exe" from="staging\bin\i386" to="\bin\i386\" /> <File name="kcpytkt.pdb" from="staging\bin\i386" to="\bin\i386\" /> <File name="kdeltkt.exe" from="staging\bin\i386" to="\bin\i386\" /> @@ -41,9 +39,6 @@ <File name="klist.pdb" from="staging\bin\i386" to="\bin\i386\" /> <File name="kpasswd.exe" from="staging\bin\i386" to="\bin\i386\" /> <File name="kpasswd.pdb" from="staging\bin\i386" to="\bin\i386\" /> - <File name="krb4cred.dll" from="staging\bin\i386" to="\bin\i386\" /> - <File name="krb4cred.pdb" from="staging\bin\i386" to="\bin\i386\" /> - <File name="krb4cred_en_us.dll" from="staging\bin\i386" to="\bin\i386\" /> <File name="krb524.dll" from="staging\bin\i386" to="\bin\i386\" /> <File name="krb524.pdb" from="staging\bin\i386" to="\bin\i386\" /> <File name="krb5cred.dll" from="staging\bin\i386" to="\bin\i386\" /> @@ -55,8 +50,6 @@ <File name="krbcc32.pdb" from="staging\bin\i386" to="\bin\i386\" /> <File name="krbcc32s.exe" from="staging\bin\i386" to="\bin\i386\" /> <File name="krbcc32s.pdb" from="staging\bin\i386" to="\bin\i386\" /> - <File name="krbv4w32.dll" from="staging\bin\i386" to="\bin\i386\" /> - <File name="krbv4w32.pdb" from="staging\bin\i386" to="\bin\i386\" /> <File name="kvno.exe" from="staging\bin\i386" to="\bin\i386\" /> <File name="kvno.pdb" from="staging\bin\i386" to="\bin\i386\" /> <File name="leash32.chm" from="staging\bin\i386" to="\bin\i386\" /> diff --git a/src/windows/build/sdkfiles.xml b/src/windows/build/sdkfiles.xml index c938107..9dd9ff4 100644 --- a/src/windows/build/sdkfiles.xml +++ b/src/windows/build/sdkfiles.xml @@ -6,8 +6,7 @@ <!-- Without this, XML::Simple does not make an anonymous array and I can't figure out how to iterate over it. --> <File name="relnotes.html" from="doc\kerberos" to="doc" /> - <File name="kclient.rtf" from="athena\auth\krb4\kclient\doc" to="doc" /> - <File name="msi-deployment-guide.txt" from="athena\auth\krb5\src\windows\installer\wix\" to="\doc" /> + <File name="msi-deployment-guide.txt" from="athena\auth\krb5\src\windows\installer\wix\" to="\doc" /> <File name="*.*" from="staging\inc" to="inc" /> <!-- loadfuncs.c is deliberately here. Otherwise, *.h would work. --> diff --git a/src/windows/identity/config/Makefile.w32 b/src/windows/identity/config/Makefile.w32 index eda4970..e815c5a 100644 --- a/src/windows/identity/config/Makefile.w32 +++ b/src/windows/identity/config/Makefile.w32 @@ -238,7 +238,7 @@ lndeflibflag=/NODEFAULTLIB:MSVCRT lndeflibflag=/NODEFAULTLIB:MSVCRTD !endif -khcflags=$(cdebug) $(cflags) $(incflags) $(khdefines) $(khcwarn) +khcflags=$(cdebug) $(cflags) -DNO_KRB4 $(incflags) $(khdefines) $(khcwarn) khlguiflags=$(ldebug) $(guilflags) $(lndeflibflag) khlconflags=$(ldebug) $(conlflags) $(lndeflibflag) khldllguiflags=$(ldebug) $(dlllflags) $(lndeflibflag) diff --git a/src/windows/identity/plugins/common/Makefile b/src/windows/identity/plugins/common/Makefile index 6b827dc..15ed8a1 100644 --- a/src/windows/identity/plugins/common/Makefile +++ b/src/windows/identity/plugins/common/Makefile @@ -35,6 +35,7 @@ OBJFILES= \ $(LIBDIR)\dynimport.obj all: mkdirs $(INCFILES) $(OBJFILES) + echo KPK: DEFS:$(DEFS) DEFINES:$(DEFINES) clean:: if exist "$(INCDIR)" $(RM) $(INCFILES) diff --git a/src/windows/identity/plugins/common/dynimport.c b/src/windows/identity/plugins/common/dynimport.c index ea8bbf9..acfb9d9 100644 --- a/src/windows/identity/plugins/common/dynimport.c +++ b/src/windows/identity/plugins/common/dynimport.c @@ -21,7 +21,7 @@ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. -*/ +*/ /* $Id$ */ @@ -379,9 +379,11 @@ khm_int32 init_imports(void) { } while (FALSE) #ifndef _WIN64 +#ifndef NO_KRB4 imp_rv = LoadFuncs(KRB4_DLL, k4_fi, &hKrb4, 0, 1, 0, 0); CKRV(KRB4_DLL); #endif +#endif imp_rv = LoadFuncs(KRB5_DLL, k5_fi, &hKrb5, 0, 1, 0, 0); CKRV(KRB5_DLL); @@ -396,9 +398,11 @@ khm_int32 init_imports(void) { CKRV(SECUR32_DLL); #ifndef _WIN64 +#ifndef NO_KRB4 imp_rv = LoadFuncs(KRB524_DLL, k524_fi, &hKrb524, 0, 1, 1, 1); CKRV(KRB524_DLL); #endif +#endif imp_rv = LoadFuncs(PROFILE_DLL, profile_fi, &hProfile, 0, 1, 0, 0); CKRV(PROFILE_DLL); diff --git a/src/windows/installer/nsis/kfw-fixed.nsi b/src/windows/installer/nsis/kfw-fixed.nsi index cef8b60..08700ad 100644 --- a/src/windows/installer/nsis/kfw-fixed.nsi +++ b/src/windows/installer/nsis/kfw-fixed.nsi @@ -195,7 +195,6 @@ Section "KfW Client" secClient !insertmacro ReplaceDLL "${KFW_BIN_DIR}\gss-server.exe" "$INSTDIR\bin\gss-server.exe" "$INSTDIR" !insertmacro ReplaceDLL "${KFW_BIN_DIR}\gssapi32.dll" "$INSTDIR\bin\gssapi32.dll" "$INSTDIR" !insertmacro ReplaceDLL "${KFW_BIN_DIR}\k524init.exe" "$INSTDIR\bin\k524init.exe" "$INSTDIR" - !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kclnt32.dll" "$INSTDIR\bin\kclnt32.dll" "$INSTDIR" !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kdestroy.exe" "$INSTDIR\bin\kdestroy.exe" "$INSTDIR" !insertmacro ReplaceDLL "${KFW_BIN_DIR}\kinit.exe" "$INSTDIR\bin\kinit.exe" "$INSTDIR" !insertmacro ReplaceDLL "${KFW_BIN_DIR}\klist.exe" "$INSTDIR\bin\klist.exe" "$INSTDIR" @@ -206,11 +205,8 @@ Section "KfW Client" secClient !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb524.dll" "$INSTDIR\bin\krb524.dll" "$INSTDIR" !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krbcc32.dll" "$INSTDIR\bin\krbcc32.dll" "$INSTDIR" !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krbcc32s.exe" "$INSTDIR\bin\krbcc32s.exe" "$INSTDIR" - !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krbv4w32.dll" "$INSTDIR\bin\krbv4w32.dll" "$INSTDIR" !insertmacro ReplaceDLL "${KFW_BIN_DIR}\netidmgr.chm" "$INSTDIR\bin\netidmgr.chm" "$INSTDIR" - !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb4cred.dll" "$INSTDIR\bin\krb4cred.dll" "$INSTDIR" !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb5cred.dll" "$INSTDIR\bin\krb5cred.dll" "$INSTDIR" - !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb4cred_en_us.dll" "$INSTDIR\bin\krb4cred_en_us.dll" "$INSTDIR" !insertmacro ReplaceDLL "${KFW_BIN_DIR}\krb5cred_en_us.dll" "$INSTDIR\bin\krb5cred_en_us.dll" "$INSTDIR" !insertmacro ReplaceDLL "${KFW_BIN_DIR}\leashw32.dll" "$INSTDIR\bin\leashw32.dll" "$INSTDIR" !insertmacro ReplaceDLL "${KFW_BIN_DIR}\ms2mit.exe" "$INSTDIR\bin\ms2mit.exe" "$INSTDIR" @@ -402,16 +398,7 @@ nid_done: WriteRegStr HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Ident" "Dependencies" "Krb5Cred" WriteRegDWORD HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Ident" "Type" 2 WriteRegDWORD HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Ident" "Flags" 0 - - WriteRegStr HKLM "Software\MIT\NetIDMgr\PluginManager\Modules\MITKrb4" "ImagePath" "$INSTDIR\bin\krb4cred.dll" - WriteRegStr HKLM "Software\MIT\NetIDMgr\PluginManager\Modules\MITKrb4" "PluginList" "Krb4Cred" - - WriteRegStr HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" "Module" "MITKrb4" - WriteRegStr HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" "Description" "Kerberos v4 Credentials Provider" - WriteRegStr HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" "Dependencies" "Krb5Cred" - WriteRegDWORD HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" "Type" 1 - WriteRegDWORD HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" "Flags" 0 - + ;Write start menu entries CreateDirectory "$SMPROGRAMS\${PROGRAM_NAME}" SetOutPath "$INSTDIR\bin" @@ -494,7 +481,6 @@ Section "Debug Symbols" secDebug File "${KFW_BIN_DIR}\gss-server.pdb" File "${KFW_BIN_DIR}\gssapi32.pdb" File "${KFW_BIN_DIR}\k524init.pdb" - File "${KFW_BIN_DIR}\kclnt32.pdb" File "${KFW_BIN_DIR}\kdestroy.pdb" File "${KFW_BIN_DIR}\kinit.pdb" File "${KFW_BIN_DIR}\klist.pdb" @@ -505,9 +491,7 @@ Section "Debug Symbols" secDebug File "${KFW_BIN_DIR}\krb524.pdb" File "${KFW_BIN_DIR}\krbcc32.pdb" File "${KFW_BIN_DIR}\krbcc32s.pdb" - File "${KFW_BIN_DIR}\krbv4w32.pdb" File "${KFW_BIN_DIR}\leashw32.pdb" - File "${KFW_BIN_DIR}\krb4cred.pdb" File "${KFW_BIN_DIR}\krb5cred.pdb" File "${KFW_BIN_DIR}\ms2mit.pdb" File "${KFW_BIN_DIR}\mit2ms.pdb" @@ -569,18 +553,9 @@ Section "KfW SDK" secSDK SetOutPath "$INSTDIR\doc" File /r "${KFW_DOC_DIR}\netiddev.chm" - SetOutPath "$INSTDIR\inc\kclient" - File /r "${KFW_INC_DIR}\kclient\*" - - SetOutPath "$INSTDIR\inc\krb4" - File /r "${KFW_INC_DIR}\krb4\*" - SetOutPath "$INSTDIR\inc\krb5" File /r "${KFW_INC_DIR}\krb5\*" - SetOutPath "$INSTDIR\inc\krbcc" - File /r "${KFW_INC_DIR}\krbcc\*" - SetOutPath "$INSTDIR\inc\leash" File /r "${KFW_INC_DIR}\leash\*" @@ -1169,7 +1144,6 @@ StartRemove: Delete /REBOOTOK "$INSTDIR\bin\gss-server.exe" Delete /REBOOTOK "$INSTDIR\bin\gssapi32.dll" Delete /REBOOTOK "$INSTDIR\bin\k524init.exe" - Delete /REBOOTOK "$INSTDIR\bin\kclnt32.dll" Delete /REBOOTOK "$INSTDIR\bin\kdestroy.exe" Delete /REBOOTOK "$INSTDIR\bin\kinit.exe" Delete /REBOOTOK "$INSTDIR\bin\klist.exe" @@ -1180,13 +1154,10 @@ StartRemove: Delete /REBOOTOK "$INSTDIR\bin\krb524.dll" Delete /REBOOTOK "$INSTDIR\bin\krbcc32.dll" Delete /REBOOTOK "$INSTDIR\bin\krbcc32s.exe" - Delete /REBOOTOK "$INSTDIR\bin\krbv4w32.dll" Delete /REBOOTOK "$INSTDIR\bin\netidmgr.exe" Delete /REBOOTOK "$INSTDIR\bin\netidmgr.chm" Delete /REBOOTOK "$INSTDIR\bin\nidmgr32.dll" - Delete /REBOOTOK "$INSTDIR\bin\krb4cred.dll" Delete /REBOOTOK "$INSTDIR\bin\krb5cred.dll" - Delete /REBOOTOK "$INSTDIR\bin\krb4cred_en_us.dll" Delete /REBOOTOK "$INSTDIR\bin\krb5cred_en_us.dll" Delete /REBOOTOK "$INSTDIR\bin\leashw32.dll" Delete /REBOOTOK "$INSTDIR\bin\ms2mit.exe" @@ -1204,7 +1175,6 @@ StartRemove: Delete /REBOOTOK "$INSTDIR\bin\gss-server.pdb" Delete /REBOOTOK "$INSTDIR\bin\gssapi32.pdb" Delete /REBOOTOK "$INSTDIR\bin\k524init.pdb" - Delete /REBOOTOK "$INSTDIR\bin\kclnt32.pdb" Delete /REBOOTOK "$INSTDIR\bin\kdestroy.pdb" Delete /REBOOTOK "$INSTDIR\bin\kinit.pdb" Delete /REBOOTOK "$INSTDIR\bin\klist.pdb" @@ -1215,10 +1185,8 @@ StartRemove: Delete /REBOOTOK "$INSTDIR\bin\krb524.pdb" Delete /REBOOTOK "$INSTDIR\bin\krbcc32.pdb" Delete /REBOOTOK "$INSTDIR\bin\krbcc32s.pdb" - Delete /REBOOTOK "$INSTDIR\bin\krbv4w32.pdb" Delete /REBOOTOK "$INSTDIR\bin\netidmgr.pdb" Delete /REBOOTOK "$INSTDIR\bin\nidmgr32.pdb" - Delete /REBOOTOK "$INSTDIR\bin\krb4cred.pdb" Delete /REBOOTOK "$INSTDIR\bin\krb5cred.pdb" Delete /REBOOTOK "$INSTDIR\bin\leashw32.pdb" Delete /REBOOTOK "$INSTDIR\bin\ms2mit.pdb" @@ -1378,10 +1346,8 @@ StartRemove: ; NIM Registry Keys DeleteRegKey HKLM "${NIM_REGKEY_ROOT}\PluginManager\Modules\MITKrb5" - DeleteRegKey HKLM "${NIM_REGKEY_ROOT}\PluginManager\Modules\MITKrb4" DeleteRegKey HKLM "${NIM_REGKEY_ROOT}\PluginManager\Plugins\Krb5Cred" DeleteRegKey HKLM "${NIM_REGKEY_ROOT}\PluginManager\Plugins\Krb5Ident" - DeleteRegKey HKLM "${NIM_REGKEY_ROOT}\PluginManager\Plugins\Krb4Cred" DeleteRegKey /ifempty HKLM "${NIM_REGKEY_ROOT}\PluginManager\Modules" DeleteRegKey /ifempty HKLM "${NIM_REGKEY_ROOT}\PluginManager\Plugins" DeleteRegKey /ifempty HKLM "${NIM_REGKEY_ROOT}\PluginManager" diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi index a15cfcd..abe0f22 100644 --- a/src/windows/installer/wix/features.wxi +++ b/src/windows/installer/wix/features.wxi @@ -84,9 +84,7 @@ <ComponentRef Id="csc_leash32_exe" /> <ComponentRef Id="cmf_k524init_exe" /> - <ComponentRef Id="cmf_kclnt32_dll" /> <ComponentRef Id="cmf_krb524_dll" /> - <ComponentRef Id="cmf_krbv4w32_dll" /> <?endif?> <ComponentRef Id="cmf_nidmgr32_dll" /> @@ -95,10 +93,6 @@ <?endif?> <ComponentRef Id="cmf_krb5cred_dll" /> <ComponentRef Id="cmf_krb5cred_en_us_dll" /> - <?if $(var.Platform) = "Intel" ?> - <ComponentRef Id="cmf_krb4cred_dll" /> - <ComponentRef Id="cmf_krb4cred_en_us_dll" /> - <?endif?> <ComponentRef Id="cmf_netidmgr_exe" /> <?if $(var.Platform) = "Intel" ?> <ComponentRef Id="cmf_netidmgr_exe_w2k" /> @@ -182,8 +176,6 @@ <ComponentRef Id="cmp_dirdoc_netid" /> <?if $(var.Platform) = "Intel" ?> - <ComponentRef Id="cmp_dirinc_kclient" /> - <ComponentRef Id="cmp_dirinc_krb4" /> <ComponentRef Id="cmp_dirlib_i386" /> <?else?> <ComponentRef Id="cmp_dirlib_amd64" /> @@ -192,7 +184,6 @@ <ComponentRef Id="cmp_dirinc_krb5_KerberosIV" /> <ComponentRef Id="cmp_dirinc_krb5_krb5" /> <ComponentRef Id="cmp_dirinc_krb5" /> - <ComponentRef Id="cmp_dirinc_krbcc" /> <ComponentRef Id="cmp_dirinc_leash" /> <ComponentRef Id="cmp_dirinc_loadfuncs" /> <ComponentRef Id="cmp_dirinc_wshelper" /> diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi index 5a391d0..e7cb415 100644 --- a/src/windows/installer/wix/files.wxi +++ b/src/windows/installer/wix/files.wxi @@ -119,9 +119,6 @@ <Registry Id="reg_ts_k524init_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\k524init" Action="createKeyAndRemoveKeyOnUninstall" /> <Registry Id="reg_ts_k524init_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\k524init" Name="Flags" Type="integer" Value="1032" /> </Component> - <Component Win64="$(var.Win64)" Id="cmf_kclnt32_dll" Guid="$(var.cmf_kclnt32_dll_guid)" DiskId="1"> - <File Id="fil_kclnt32_dll" LongName="$(var.cmf_kclnt32_dll_name)" Name="$(var.cmf_kclnt32_dll_name)" KeyPath="yes" /> - </Component> <?endif?> <Component Win64="$(var.Win64)" Id="cmf_kdestroy_exe" Guid="$(var.cmf_kdestroy_exe_guid)" DiskId="1"> <File Id="fil_kdestroy_exe" LongName="kdestroy.exe" Name="kdestroy.exe" KeyPath="yes" /> @@ -179,10 +176,6 @@ <Registry Id="reg_ts_krbcc32s_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\krbcc32s" Name="Flags" Type="integer" Value="1032" /> </Component> <?if $(var.Platform) = "Intel" ?> - <Component Win64="$(var.Win64)" Id="cmf_krbv4w32_dll" Guid="$(var.cmf_krbv4w32_dll_guid)" DiskId="1"> - <File Id="fil_krbv4w32_dll" LongName="$(var.cmf_krbv4w32_dll_name)" Name="$(var.cmf_krbv4w32_dll_name)" KeyPath="yes" /> - </Component> - <Component Win64="$(var.Win64)" Id="cmf_leash32_exe" Guid="$(var.cmf_leash32_exe_guid)" DiskId="1"> <File Id="fil_leash32_exe" LongName="leash32.exe" Name="leash32.exe" KeyPath="yes" /> <Registry Id="reg_ts_leash32_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Action="createKeyAndRemoveKeyOnUninstall" /> @@ -360,23 +353,6 @@ <Component Win64="$(var.Win64)" Id="cmf_krb5cred_en_us_dll" Guid="$(var.cmf_krb5cred_en_us_dll_guid)" DiskId="1"> <File Id="fil_krb5cred_en_us_dll" LongName="$(var.cmf_krb5cred_en_us_dll_name)" Name="krb5cenu.dll" KeyPath="yes" /> </Component> - <?if $(var.Platform) = "Intel" ?> - <Component Win64="$(var.Win64)" Id="cmf_krb4cred_dll" Guid="$(var.cmf_krb4cred_dll_guid)" DiskId="1"> - <File Id="fil_krb4cred_dll" LongName="$(var.cmf_krb4cred_dll_name)" Name="$(var.cmf_krb4cred_dll_name)" KeyPath="yes" /> - <Registry Id="reg_krb4cred_1" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Modules\MITKrb4" Action="createKeyAndRemoveKeyOnUninstall" /> - <Registry Id="reg_krb4cred_2" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Modules\MITKrb4" Name="ImagePath" Type="string" Value="[#fil_krb4cred_dll]" /> - <Registry Id="reg_krb4cred_3" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Modules\MITKrb4" Name="PluginList" Type="string" Value="Krb4Cred" /> - <Registry Id="reg_krb4cred_4" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" Action="createKeyAndRemoveKeyOnUninstall" /> - <Registry Id="reg_krb4cred_5" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" Name="Module" Type="string" Value="MITKrb4" /> - <Registry Id="reg_krb4cred_6" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" Name="Description" Type="string" Value="Kerberos v4 Credentials Provider" /> - <Registry Id="reg_krb4cred_7" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" Name="Dependencies" Type="string" Value="Krb5Cred" /> - <Registry Id="reg_krb4cred_8" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" Name="Type" Type="integer" Value="1" /> - <Registry Id="reg_krb4cred_9" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" Name="Flags" Type="integer" Value="0" /> - </Component> - <Component Win64="$(var.Win64)" Id="cmf_krb4cred_en_us_dll" Guid="$(var.cmf_krb4cred_en_us_dll_guid)" DiskId="1"> - <File Id="fil_krb4cred_en_us_dll" LongName="$(var.cmf_krb4cred_en_us_dll_name)" Name="krb4cenu.dll" KeyPath="yes" /> - </Component> - <?endif?> <Component Win64="$(var.Win64)" Id="cmf_netidmgr_exe" Guid="$(var.cmf_netidmgr_exe_guid)" DiskId="1" Transitive="yes"> <File Id="fil_netidmgr_exe" LongName="netidmgr.exe" Name="netidmgr.exe" KeyPath="yes" /> <File Id="fil_netidmgr_chm" LongName="netidmgr.chm" Name="netidmgr.chm" /> @@ -410,7 +386,6 @@ <?if $(var.Platform) = "Intel" ?> <File Id="fil_k524init_pdb" LongName="k524init.pdb" Name="k524init.pdb" /> <File Id="fil_krb524_pdb" LongName="krb524.pdb" Name="krb524.pdb" /> - <File Id="fil_kclnt32_pdb" LongName="kclnt32.pdb" Name="kclnt32.pdb" /> <File Id="fil_leash32_pdb" LongName="leash32.pdb" Name="leash32.pdb" /> <File Id="fil_comerr32_pdb" LongName="comerr32.pdb" Name="comerr32.pdb" /> @@ -419,11 +394,9 @@ <File Id="fil_k5sprt32_pdb" LongName="k5sprt32.pdb" Name="k5sprt32.pdb" /> <File Id="fil_krbcc32_pdb" LongName="krbcc32.pdb" Name="krbcc32.pdb" /> <File Id="fil_krbcc32s_pdb" LongName="krbcc32s.pdb" Name="krbcc32s.pdb" /> - <File Id="fil_krbv4w32_pdb" LongName="krbv4w32.pdb" Name="krbv4w32.pdb" /> <File Id="fil_leashw32_pdb" LongName="leashw32.pdb" Name="leashw32.pdb" /> <File Id="fil_wshelp32_pdb" LongName="wshelp32.pdb" Name="wshelp32.pdb" /> <File Id="fil_xpprof32_pdb" LongName="xpprof32.pdb" Name="xpprof32.pdb" /> - <File Id="fil_krb4cred_pdb" LongName="krb4cred.pdb" Name="krb4cred.pdb" /> <File Id="fil_krb5cred_pdb" LongName="krb5cred.pdb" Name="krb5cred.pdb" /> <File Id="fil_nidmgr32_pdb" LongName="nidmgr32.pdb" Name="nidmgr32.pdb" /> <?else?> @@ -656,27 +629,6 @@ </Directory> <!-- /bin --> <Directory Id="dirinc" Name="inc" src="$(var.IncDir)"> - <?if $(var.Platform) = "Intel"?> - <Directory Id="dirinc_kclient" Name="kclient" src="$(var.IncDir)kclient\"> - <Component Win64="$(var.Win64)" Id="cmp_dirinc_kclient" Guid="96215203-7FF5-4576-AAC5-F5035B64CC37" DiskId="1"> - <File Id="fil_kclient_h" LongName="kclient.h" Name="kclient.h" KeyPath="yes" /> - <File Id="fil_kcmacerr_h" LongName="kcmacerr.h" Name="kcmacerr.h" /> - </Component> - </Directory> - <Directory Id="dirinc_krb4" Name="krb4" src="$(var.IncDir)krb4\"> - <Component Win64="$(var.Win64)" Id="cmp_dirinc_krb4" Guid="5D2E3F2E-87AE-4905-84AC-AC503662D1B0" DiskId="1"> - <File Id="fil_com_err_h" LongName="com_err.h" Name="com_err.h" /> - <File Id="fil_conf_pc_h" LongName="conf-pc.h" Name="conf-pc.h" /> - <File Id="fil_conf_h" LongName="conf.h" Name="conf.h" /> - <File Id="fil_des_h" LongName="des.h" Name="des.h" /> - <File Id="fil_kadm_err_h" LongName="kadm_err.h" Name="kadm_err.h" /> - <File Id="fil_krb_h" LongName="krb.h" Name="krb.h" KeyPath="yes" /> - <File Id="fil_krberr_h" LongName="krberr.h" Name="krberr.h" /> - <File Id="fil_mit_copy_h" LongName="mit_copy.h" Name="mit_copy.h" /> - <File Id="fil_osconf_h" LongName="osconf.h" Name="osconf.h" /> - </Component> - </Directory> - <?endif?> <Directory Id="dirinc_krb5" Name="krb5" src="$(var.IncDir)krb5\"> <Directory Id="dirinc_krb5_gssapi" Name="gssapi" src="$(var.IncDir)\krb5\gssapi\"> <Component Win64="$(var.Win64)" Id="cmp_dirinc_krb5_gssapi" Guid="BD3C190B-1EBB-4d14-81DD-B2000DC4EAC7" DiskId="1"> @@ -687,9 +639,6 @@ </Directory> <Directory Id="dirinc_krb5_KerberosIV" LongName="KerberosIV" Name="krb4" src="$(var.IncDir)\krb5\KerberosIV\"> <Component Win64="$(var.Win64)" Id="cmp_dirinc_krb5_KerberosIV" Guid="307B8031-2589-4f92-A303-EF4231328490" DiskId="1"> - <File Id="fil_des_.h" LongName="des.h" Name="des.h" /> - <File Id="fil_kadm_err_.h" LongName="kadm_err.h" Name="kadm_err.h" /> - <File Id="fil_krb_.h" LongName="krb.h" Name="krb.h" KeyPath="yes" /> <File Id="fil_krb_err_.h" LongName="krb_err.h" Name="krb_err.h" /> <File Id="fil_mit_copyright_.h" LongName="mit-copyright.h" Name="MIT-COPY.H" /> </Component> @@ -706,11 +655,6 @@ <File Id="fil_win_mac_.h" LongName="win-mac.h" Name="win-mac.h" /> </Component> </Directory> - <Directory Id="dirinc_krbcc" Name="krbcc" src="$(var.IncDir)krbcc\"> - <Component Win64="$(var.Win64)" Id="cmp_dirinc_krbcc" Guid="2CE4B708-7D45-41e4-8A53-BF2D78451A81" DiskId="1"> - <File Id="fil_cacheapi_h" LongName="cacheapi.h" Name="cacheapi.h" KeyPath="yes" /> - </Component> - </Directory> <Directory Id="dirinc_leash" Name="leash" src="$(var.IncDir)leash\"> <Component Win64="$(var.Win64)" Id="cmp_dirinc_leash" Guid="FCF269AB-D9BC-49bd-B9F3-D6EA9697D8D7" DiskId="1"> <File Id="fil_leasherr_h" LongName="leasherr.h" Name="leasherr.h" /> @@ -789,9 +733,6 @@ <File Id="fil_delaydlls_32_lib" LongName="delaydlls.lib" Name="DELAYDLL.LIB" /> <File Id="fil_getopt_32_lib" LongName="getopt.lib" Name="getopt.lib" /> <File Id="fil_gssapi32_lib" LongName="gssapi32.lib" Name="gssapi32.lib" /> - <File Id="fil_kclnt32_lib" LongName="kclnt32.lib" Name="kclnt32.lib" /> - <File Id="fil_krb524_32_lib" LongName="krb524.lib" Name="krb524.lib" /> - <File Id="fil_krbv4w32_lib" LongName="krbv4w32.lib" Name="krbv4w32.lib" /> <File Id="fil_krb5_32_lib" LongName="krb5_32.lib" Name="krb5_32.lib" KeyPath="yes" /> <File Id="fil_krbcc32_lib" LongName="krbcc32.lib" Name="krbcc32.lib" /> <File Id="fil_leashw32_lib" LongName="leashw32.lib" Name="leashw32.lib" /> diff --git a/src/windows/installer/wix/platform.wxi b/src/windows/installer/wix/platform.wxi index 65de105..19abf31 100644 --- a/src/windows/installer/wix/platform.wxi +++ b/src/windows/installer/wix/platform.wxi @@ -24,8 +24,6 @@ <?define cmf_gssapi32_dll_guid="ACD1D3FA-3E96-47a6-8A39-88BDA2EA3C9D"?> <?define cmf_gssapi32_dll_name="gssapi64.dll"?> <?define cmf_k524init_exe_guid="63630B70-D9B1-47bc-905D-E4DFA6F9D0D1"?> - <?define cmf_kclnt32_dll_guid="C26B3CAA-607C-42db-956C-9AA379CCE892"?> - <?define cmf_kclnt32_dll_name="kclnt64.dll"?> <?define cmf_kdestroy_exe_guid="58AB2858-3513-4e4d-B76C-915B0D0DEE82"?> <?define cmf_kcpytkt_exe_guid="B2BA9697-4E42-433d-BA85-79A49A622D84"?> <?define cmf_kdeltkt_exe_guid="998BF60D-75EF-4807-BDA3-7DDE47C4F00F"?> @@ -43,8 +41,6 @@ <?define cmf_krbcc32_dll_name="krbcc64.dll"?> <?define cmf_krbcc32s_exe_guid="0192F58B-9129-426d-A271-E18455EDC80E"?> <?define cmf_krbcc32s_exe_name="krbcc64s.exe"?> - <?define cmf_krbv4w32_dll_guid="D195FADB-A3B0-4023-A824-8895552CDC56"?> - <?define cmf_krbv4w32_dll_name="krbv4w64.dll"?> <?define cmf_leash32_exe_guid="D195FADB-A3B0-4023-A824-8895552CDC56"?> <?define csc_leash32_exe_guid="9D43350A-A8AE-4405-AB82-64E90E5A1A70"?> <?define rcm_leash_1_guid="7E5517FF-FB76-431f-A92B-2895C9BE7E98"?> @@ -88,10 +84,6 @@ <?define cmf_krb5cred_dll_name="krb5cred.dll"?> <?define cmf_krb5cred_en_us_dll_guid="223B7E9D-290F-40b8-89B3-F8337A8E082D"?> <?define cmf_krb5cred_en_us_dll_name="krb5cred_en_us.dll"?> - <?define cmf_krb4cred_dll_guid="AF3DB848-786B-4e0b-9D8F-F9074D0631F2"?> - <?define cmf_krb4cred_dll_name="krb4cred.dll"?> - <?define cmf_krb4cred_en_us_dll_guid="4D180CEF-59CD-4c39-872C-F84F58008107"?> - <?define cmf_krb4cred_en_us_dll_name="krb4cred_en_us.dll"?> <?define cmf_netidmgr_exe_guid="487545C9-F145-4fb9-8610-5652A6C3FE48"?> <?define cmf_netidmgr_exe_w2k_guid="F9D3A2A1-8BAE-41ff-BB50-2E6923D3368B"?> <?define csc_NetIDMgrStartup_guid="7081976D-E9D5-424a-9564-917E0529E4D0"?> @@ -119,8 +111,6 @@ <?define cmf_gssapi32_dll_guid="5B0F2989-BB85-40BF-BB7A-E77693972CF9"?> <?define cmf_gssapi32_dll_name="gssapi32.dll"?> <?define cmf_k524init_exe_guid="20BE4EA5-C465-4AF3-9A4F-BB80934167E3"?> - <?define cmf_kclnt32_dll_guid="D396C1E7-080E-49F5-92BA-73BCEDF09C8E"?> - <?define cmf_kclnt32_dll_name="kclnt32.dll"?> <?define cmf_kdestroy_exe_guid="D1E9C111-7760-4EE6-86CF-D4B4064B0ABA"?> <?define cmf_kcpytkt_exe_guid="6B20E57C-0033-4dcf-B3C9-74ED0B2CF46E"?> <?define cmf_kdeltkt_exe_guid="C7528C87-9B61-439a-8EA8-AD4BE3D758F9"?> @@ -138,8 +128,6 @@ <?define cmf_krbcc32_dll_name="krbcc32.dll"?> <?define cmf_krbcc32s_exe_guid="7D5F0817-DACF-4B54-BB8D-94DD63626DB5"?> <?define cmf_krbcc32s_exe_name="krbcc32s.exe"?> - <?define cmf_krbv4w32_dll_guid="DFA23F6C-5297-4876-AF52-6F7CF2CB34AC"?> - <?define cmf_krbv4w32_dll_name="krbv4w32.dll"?> <?define cmf_leash32_exe_guid="990D5F6B-4CEE-4706-96F4-F7AF12F97DF7"?> <?define csc_leash32_exe_guid="8A096700-47B1-4A0B-B7B5-44F75086DEAE"?> <?define rcm_leash_1_guid="B91648A0-26F7-43BB-A954-202FF3811E3C"?> @@ -183,10 +171,6 @@ <?define cmf_krb5cred_dll_name="krb5cred.dll"?> <?define cmf_krb5cred_en_us_dll_guid="EA9ABE05-A85B-43BB-8741-50D3C3128632"?> <?define cmf_krb5cred_en_us_dll_name="krb5cred_en_us.dll"?> - <?define cmf_krb4cred_dll_guid="E3B86954-9D5D-4929-A5E6-B22ED03E6D6C"?> - <?define cmf_krb4cred_dll_name="krb4cred.dll"?> - <?define cmf_krb4cred_en_us_dll_guid="3FF40A29-E2C3-40F3-B81C-2948494BE4B0"?> - <?define cmf_krb4cred_en_us_dll_name="krb4cred_en_us.dll"?> <?define cmf_netidmgr_exe_guid="AEB06D67-B4F3-45B1-AC1E-5C1AFF747756"?> <?define cmf_netidmgr_exe_w2k_guid="0F85D4F3-7897-4FE3-8501-AD0C383CCB4F"?> <?define csc_NetIDMgrStartup_guid="669227E3-0ADC-4173-90C3-631FCFC8EBC3"?> diff --git a/src/windows/installer/wix/site-local-tagged.wxi b/src/windows/installer/wix/site-local-tagged.wxi index 26d6d7e..221fbb7 100644 --- a/src/windows/installer/wix/site-local-tagged.wxi +++ b/src/windows/installer/wix/site-local-tagged.wxi @@ -46,8 +46,8 @@ <!-- <?define CL1200?> --> <!-- <?define CL1300?> --> - <?define CL1310?> - <!-- <?define CL1400?> --> + <!-- <?define CL1310?> --> + <?define CL1400?> <!-- At most one of the following could be defined and must correspond to the type of build performed. --> |