[cpp-sp] 01/03: SSPCPP-818 Force native.logger to the the "right" file.

[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=801efec50b82c37765c3046aef99737abf3356c6

commit 801efec50b82c37765c3046aef99737abf3356c6
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jul 12 11:40:03 2018 +0100

    SSPCPP-818 Force native.logger to the the "right" file.
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-818
    
    See case notes for the grubby details.
---
 msi/WiX/ShibbolethSP-defs-x86.wxi          | 1 +
 msi/WiX/ShibbolethSP-noarch.wxs            | 6 ++++++
 msi/scripts/shib_edit_config_files.vbs-wix | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 151cc0b..39d56b4 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -33,6 +33,7 @@
   <ComponentRef Id="apache24.config.in" />
   <ComponentRef Id="metadataError.html" />
   <ComponentRef Id="win_native.logger" />
+  <ComponentRef Id="win_native.logger_in" />
   <ComponentRef Id="sessionError.html" />
   <ComponentRef Id="shibd.logger.in" />
   <ComponentRef Id="var_cache_shibboleth_folder" />
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index c0ec1ad..da6e91c 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -120,9 +120,15 @@
             <Component Id="metadataError.html" Guid="{8C46D04A-A943-4FA4-AFCB-9B040306C2C0}">
               <File KeyPath="yes" Name="metadataError.html" />
             </Component>
+            <!-- native.logger used to be edited in place so this will never fire, but
+                 removing this will cause it to go away.  So we put it in two places and overwrite
+                 this with the known good one (via the script) -->
             <Component Id="win_native.logger" Guid="{B2EBC853-279B-4EA1-BC84-A0EC0E5F3676}">
               <File KeyPath="yes" Name="native.logger" Source="$(var.SPBuildDirectory)\cpp-sp\configs\win-native.logger" />
             </Component>
+            <Component Id="win_native.logger_in" Guid="{B081C55E-8C30-4D5D-BAC0-CF0F24026E23}">
+              <File KeyPath="yes" Name="win-native.logger" />
+            </Component>
             <Component Id="sessionError.html" Guid="{8AA240B3-DC5D-4687-B321-4F5E1BAEA820}">
               <File KeyPath="yes" Name="sessionError.html" />
             </Component>
diff --git a/msi/scripts/shib_edit_config_files.vbs-wix b/msi/scripts/shib_edit_config_files.vbs-wix
index 58e959c..58eff51 100644
--- a/msi/scripts/shib_edit_config_files.vbs-wix
+++ b/msi/scripts/shib_edit_config_files.vbs-wix
@@ -138,6 +138,9 @@ if (Err = 0) then
     FileSystemObj.CopyFile DistDir & "shibboleth2.xml", ConfigDir, false
   End If
 
+  ' native.logger used to be edited in place, so we cannot update it
+  ' copy it from a known good place
+  FileSystemObj.CopyFile  DistDir & "win-native.logger",  DistDir & "native.logger", true
   If (NOT FileSystemObj.FileExists(ConfigDir & "native.logger")) then
     FileSystemObj.CopyFile DistDir & "native.logger", ConfigDir, false
   End If

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