[cpp-sp] 01/02: CPPSP-28 Windows Installers for Sp4 Agents

[Codeberg]

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

codeberg pushed a commit to branch main
in repository cpp-sp.

View the commit online:
https://codeberg.org/Shibboleth/cpp-sp/commit/6ced3948a9be34dc30e6e9c73e60e59036927f86

commit 6ced3948a9be34dc30e6e9c73e60e59036927f86
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jan 13 20:26:09 2026 +0000

    CPPSP-28 Windows Installers for Sp4 Agents
    
    https://shibboleth.atlassian.net/browse/CPPSP-28
    
    Install and configure event logging
---
 msi/wix6/sp4.wxs                              | 18 ++++++++++++++++++
 shibsp/logging/impl/WindowsLoggingService.cpp | 13 -------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/msi/wix6/sp4.wxs b/msi/wix6/sp4.wxs
index 3ba20a50..74982442 100644
--- a/msi/wix6/sp4.wxs
+++ b/msi/wix6/sp4.wxs
@@ -138,6 +138,24 @@
                 <File Id="request_map.xml" KeyPath="yes" Checksum="yes" Source="$(var.RootDir)\configs\request-map.xml"/>
             </Component>
 
+            <Component Id="EventLog" Directory = "libShib" Guid="{7A23A641-C9F3-439A-BA26-265418F9B974}">
+                <?if $(sys.BUILDARCH) = "x64"?>
+                <File Id="NativeLogMessages" Checksum="yes" Source="$(var.RootDir)\Projects\vc22\x64\Release\NativeLogMessages.dll"/>
+                <?endif?>
+                <?if $(sys.BUILDARCH) = "arm"?>
+                <File Id="NativeLogMessages" Checksum="yes" Source="$(var.RootDir)\Projects\vc22\ARM64\Release\NativeLogMessages.dll"/>
+                <?endif?>
+                <?if ($(sys.BUILDARCH) != "arm") and ($(sys.BUILDARCH) != "x64") ?>
+                <File Id="NativeLogMessages" Checksum="yes" Source="$(var.RootDir)\Projects\vc22\Release\NativeLogMessages.dll"/>
+                <?endif?>
+                <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Shibboleth\ShibbolethSPAgent">
+                    <RegistryValue Name="CategoryCount" Type="integer" Value="8" />
+                    <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
+                    <RegistryValue Name="CategoryMessageFile" Type="string" Value="[#NativeLogMessages]" />
+                    <RegistryValue Name="EventMessageFile" Type="string" Value="[#NativeLogMessages]" />
+                </RegistryKey>
+            </Component>
+
             <!-- For some reason the id/elif/endif thing isnt working -->
             <Component Id="LibFiles" Directory = "libShib" Guid="{0B2F1FE1-53A8-4F25-A01A-9EBAD9FEDC69}">
             <?if $(sys.BUILDARCH) = "x64"?>
diff --git a/shibsp/logging/impl/WindowsLoggingService.cpp b/shibsp/logging/impl/WindowsLoggingService.cpp
index 38856985..4d19d3e9 100644
--- a/shibsp/logging/impl/WindowsLoggingService.cpp
+++ b/shibsp/logging/impl/WindowsLoggingService.cpp
@@ -127,16 +127,3 @@ void WindowsLoggingService::outputMessage(const Category& category, Priority::Va
     const char* msgs[2] {category.getName().c_str(),message};
     ::ReportEventA(m_EventSource, EventTypeFor(priority), EventCategoryFor(priority), EventIdFor(priority), NULL, 2, 0, msgs, NULL);
 }
-
-/* 
- This is the registry setting we need
-
-         <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\ShibbolethSPAgent">
-          <RegistryValue Name="CategoryCount" Type="integer" Value="8" />
-          <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
-          <RegistryValue Name="CategoryMessageFile" Type="string" Value="PATH\TO\NativeLogMessages.dll" />
-          <RegistryValue Name="EventMessageFile" Type="string" Value="PATH\TO\NativeLogMessages.dll" />
-        </RegistryKey>
-      </Component>
-
-*/

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