Remove the option of not installing shibd_default

[shibboleth/sp.git] / msi / WiX / ShibbolethSP-registry-x86.wxs

diff --git a/msi/WiX/ShibbolethSP-registry-x86.wxs b/msi/WiX/ShibbolethSP-registry-x86.wxs
index ee2f548..c9b4906 100644 (file)
--- a/msi/WiX/ShibbolethSP-registry-x86.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x86.wxs
@@ -70,11 +70,6 @@
                       Name='InstallDir' Type='directory' />\r
     </Property>\r
 \r
-    <Property Id='OLD_INSTALL_SHIBD_SERVICE' Secure='yes'>\r
-      <RegistrySearch Id='OldInstallShibd' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                      Name='InstallShibd' Type='raw' />\r
-    </Property>\r
-\r
     <Property Id='OLD_INSTALL_ISAPI_FILTER' Secure='yes'>\r
       <RegistrySearch Id='OldInstallIsapi' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
                       Name='InstallIsapi' Type='raw' />\r
@@ -93,11 +88,6 @@
                        Name='InstallDir' Value='[INSTALLDIR]' Type='string' KeyPath='yes' />\r
       </Component>\r
 \r
-      <Component Id='InstallShibd' Guid='{67ABE9AB-5ACF-44FE-8620-AEA676E88187}' >\r
-        <RegistryValue Id='InstallShibd'  Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                       Name='InstallShibd' Value='[INSTALL_SHIBD_SERVICE]' Type='string' KeyPath='yes' />\r
-      </Component>\r
-\r
       <Component Id='InstallIsapi' Guid='{4F81E47D-B406-42B6-A702-90ACA666075E}' >\r
         <Condition>IISMAJORVERSION</Condition>\r
         <RegistryValue Id='InstallIsapi'  Root='HKLM' Key='SOFTWARE\Shibboleth' \r