[cpp-sp] 03/03: SSPCPP-815 Force DisplayName for daemon

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=24c1bb8d8a647d5863369e55433096f28772558d

commit 24c1bb8d8a647d5863369e55433096f28772558d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jul 12 12:19:20 2018 +0100

    SSPCPP-815 Force DisplayName for daemon
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-815
---
 msi/WiX/ShibbolethSP-main-x64.wxs | 4 +++-
 msi/WiX/ShibbolethSP-main-x86.wxs | 2 ++
 msi/WiX/ShibbolethSP-noarch.wxs   | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 9f339cf..6cce224 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -190,7 +190,7 @@
       <Component Id="shibd64.exe" Guid="{707B57A2-CCA0-48A6-9F66-275EB04474AA}" Win64="yes" Directory="sbin64">
         <File KeyPath="yes" Checksum="yes" Id="shibd64.exe" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Release\shibd.exe" />
         <!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
-        <ServiceInstall Id="shibd" Name="shibd_Default" DisplayName="Shibboleth $(var.ShibbolethVersion) Daemon (Default)" Description="Manages shared state and offloads SAML processing from Shibboleth web server modules." Arguments="-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"" Type="ownProcess" Start="auto" ErrorControl="ignore" />
+        <ServiceInstall Id="shibd" Name="shibd_Default" DisplayName="Shibboleth Daemon (Default)" Description="Manages shared state and offloads SAML processing from Shibboleth web server modules." Arguments="-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"" Type="ownProcess" Start="auto" ErrorControl="ignore" />
         <ServiceControl Id="shibd_Default" Name="shibd_Default" Stop="both" Remove="uninstall" Start="install" Wait="no" />
         <!-- We put in the messages for Isapi and Shibd in this module since all others are shared with x64 -->
         <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Shibboleth\Shibboleth Service Provider">
@@ -217,6 +217,8 @@
     <CustomAction Id="QtUninstallIIS32" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" />
     <CustomAction Id="QtUninstallIIS64" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" />
 
+    <CustomAction Id="SetDisplayName" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" Return="ignore"/>
+
     <InstallExecuteSequence>
       <!-- Install IIS if
            - this is an install
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index e3cb6b9..c7c9d1e 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -121,6 +121,8 @@
     <CustomAction Id="SetQtUninstallIIS" Property="QtUninstallIIS" Value=""[WindowsFolder]\System32\InetSrv\appcmd.exe" uninstall module ShibNative" />
     <CustomAction Id="QtUninstallIIS" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
 
+    <CustomAction Id="SetDisplayName" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore"/>
+
     <InstallExecuteSequence>
       <!-- Install IIS if
            - this is an install
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index da6e91c..9b81410 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -179,6 +179,8 @@
     <CustomAction Id="KeyGenEncrypt" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" />
     <CustomAction Id="SetKeyGenEncrypt" Property="KeyGenEncrypt" Value=""[INSTALLDIR]etc\shibboleth\keygen.bat" -n sp-encrypt [KEYGEN_EXTRA]" />
 
+    <CustomAction Id="SetSetDisplayName" Property="SetDisplayName" Value=""[WindowsFolder]\System32\sc" config shibd_default DisplayName= "Shibboleth Daemon (Default)""  />
+
     <!-- Inherit the installation dir if one was set -->
     <CustomAction Id="InheritInstallDir" Property="INSTALLDIR" Value="[OLD_INSTALLDIR]" />
     <CustomAction Id="InheritInstallDir64" Property="INSTALLDIR" Value="[OLD_INSTALLDIR64]" />
@@ -201,10 +203,15 @@
 
       <Custom Action="SetKeyGenSigning" Before="CostInitialize">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
       <Custom Action="SetKeyGenEncrypt" Before="CostInitialize">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
+
       <!-- Run KeyGen after WriteEnvironmentStrings so the path is set -->
       <Custom Action="KeyGenSigning" After="WriteEnvironmentStrings">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
       <Custom Action="KeyGenEncrypt" After="WriteEnvironmentStrings">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
 
+      <!-- Set name only on upgrade and after ServiceInstall -->
+      <Custom Action="SetSetDisplayName" Before="CostInitialize">ALREADYINSTALLED</Custom>
+      <Custom Action="SetDisplayName" After="InstallServices">ALREADYINSTALLED</Custom>
+
       <!-- IIS handling is no longer architecture independent and happens in ShibbolethSP-main-x?? -->
 
       <!-- Duplicate actions from the UI case -->

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.