From ef098828d691f48490a4529b47774e74d10b18a5 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Mon, 1 Oct 2007 23:18:10 +0000 Subject: [PATCH] pull up r20022 from trunk r20022@cathode-dark-space: jaltman | 2007-09-30 00:44:31 -0400 ticket: 5753 Remove Krb5Cred, Krb5Ident, and Krb4Cred default configuration data from the KMM Schema. Require that modules that are installed be properly installed. Add NIM Module Registry values to the NSIS installer. These values were already being set by the Wix installer. By removing the ImagePath default, unable to load module errors will not be generated when the module has not in fact been installed. ticket: 5753 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20062 dc483132-0cff-0310-8789-dd5450dbe970 --- src/windows/identity/kmm/kmmconfig.csv | 16 +++++----- src/windows/installer/nsis/kfw-fixed.nsi | 38 +++++++++++++++++++++++- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/src/windows/identity/kmm/kmmconfig.csv b/src/windows/identity/kmm/kmmconfig.csv index dc812565e..32c334b26 100644 --- a/src/windows/identity/kmm/kmmconfig.csv +++ b/src/windows/identity/kmm/kmmconfig.csv @@ -35,13 +35,13 @@ PluginManager,KC_SPACE,0,Plugin Manager Configuration # ImagePath,KC_STRING,afscred.dll, # PluginList,KC_STRING,AfsCred, # OpenAFS,KC_ENDSPACE,0, - MITKrb5,KC_SPACE,0,MIT Kerberos V - ImagePath,KC_STRING,krb5cred.dll, - PluginList,KC_STRING,Krb5Cred, - MITKrb5,KC_ENDSPACE,0, - MITKrb4,KC_SPACE,0,MIT Kerberos IV - ImagePath,KC_STRING,krb4cred.dll, - PluginList,KC_STRING,Krb4Cred, - MITKrb4,KC_ENDSPACE,0, +# MITKrb5,KC_SPACE,0,MIT Kerberos V +# ImagePath,KC_STRING,krb5cred.dll, +# PluginList,KC_STRING,Krb5Cred, +# MITKrb5,KC_ENDSPACE,0, +# MITKrb4,KC_SPACE,0,MIT Kerberos IV +# ImagePath,KC_STRING,krb4cred.dll, +# PluginList,KC_STRING,Krb4Cred, +# MITKrb4,KC_ENDSPACE,0, Modules,KC_ENDSPACE,0, PluginManager,KC_ENDSPACE,0, diff --git a/src/windows/installer/nsis/kfw-fixed.nsi b/src/windows/installer/nsis/kfw-fixed.nsi index df8018766..cef8b60dd 100644 --- a/src/windows/installer/nsis/kfw-fixed.nsi +++ b/src/windows/installer/nsis/kfw-fixed.nsi @@ -57,6 +57,7 @@ VIAddVersionKey "PrivateBuild" "Checked/Debug" !define KFW_COMPANY_NAME "Massachusetts Institute of Technology" !define KFW_PRODUCT_NAME "${PROGRAM_NAME}" !define KFW_REGKEY_ROOT "Software\MIT\Kerberos\" + !define NIM_REGKEY_ROOT "Software\MIT\NetIDMgr\" CRCCheck force !define REPLACEDLL_NOREGISTER @@ -387,6 +388,30 @@ nid_done: WriteRegStr HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\MIT_KFW" "DLLName" "kfwlogon.dll" WriteRegStr HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\MIT_KFW" "Logon" "KFW_Logon_Event" + ; NetIdMgr Reg entries + WriteRegStr HKLM "Software\MIT\NetIDMgr\PluginManager\Modules\MITKrb5" "ImagePath" "$INSTDIR\bin\krb5cred.dll" + WriteRegStr HKLM "Software\MIT\NetIDMgr\PluginManager\Modules\MITKrb5" "PluginList" "Krb5Cred,Krb5Ident" + + WriteRegStr HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Cred" "Module" "MITKrb5" + WriteRegStr HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Cred" "Description" "Kerberos v5 Credentials Provider" + WriteRegDWORD HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Cred" "Type" 1 + WriteRegDWORD HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Cred" "Flags" 0 + + WriteRegStr HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Ident" "Module" "MITKrb5" + WriteRegStr HKLM "Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Ident" "Description" "Kerberos v5 Identity Provider" + 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" @@ -602,7 +627,7 @@ Section "KfW SDK" secSDK WriteRegDWORD HKLM "${KFW_REGKEY_ROOT}\SDK\${KFW_VERSION}" "MinorVersion" ${KFW_MINORVERSION} WriteRegDWORD HKLM "${KFW_REGKEY_ROOT}\SDK\${KFW_VERSION}" "PatchLevel" ${KFW_PATCHLEVEL} WriteRegDWORD HKLM "${KFW_REGKEY_ROOT}\SDK\${KFW_VERSION}" "PatchLevel" ${KFW_PATCHLEVEL} - + SectionEnd ;---------------------- @@ -1350,6 +1375,17 @@ StartRemove: DeleteRegKey HKLM "${KFW_REGKEY_ROOT}\SDK" DeleteRegKey /ifempty HKLM "${KFW_REGKEY_ROOT}" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PROGRAM_NAME}" + + ; 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" + DeleteRegKey /ifempty HKLM "${NIM_REGKEY_ROOT}" ; WinLogon Event Notification DeleteRegKey HKLM "Software\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\MIT_KFW" -- 2.26.2