[cpp-sp] branch master updated: SSPCPP-801 Changes in support of W2K8/x86 testing

Rod Widdowson rdw at steadingsoftware.com
Fri May 11 10:57:15 EDT 2018 

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=ebc9f1767d48ee9d4683f262091d99785cc2f4fd

The following commit(s) were added to refs/heads/master by this push:
       new  ebc9f17   SSPCPP-801  Changes in support of W2K8/x86 testing
ebc9f17 is described below

commit ebc9f1767d48ee9d4683f262091d99785cc2f4fd
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed May 9 15:01:03 2018 +0100

    SSPCPP-801  Changes in support of W2K8/x86 testing
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-801
    
    - Revert https://issues.shibboleth.net/jira/browse/SSPCPP-650
    - Fix DLL export name
    - Change logging catgeory for IIS7 Filter (to Shibboleth.IIS7Native)
    - Tidy up warning message
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-801
---
 Projects/vc15/iis7_shib/iis7_shib.vcxproj | 14 ++++++++++++--
 iis7_shib/IIS7Request.cpp                 |  2 +-
 iis7_shib/register.cpp                    |  1 -
 msi/WiX/ShibbolethSP-defs-x86.wxi         |  1 -
 msi/WiX/ShibbolethSP-noarch.wxs           |  7 -------
 util/message.mc                           |  2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Projects/vc15/iis7_shib/iis7_shib.vcxproj b/Projects/vc15/iis7_shib/iis7_shib.vcxproj
index ec8128b..e33e97c 100644
--- a/Projects/vc15/iis7_shib/iis7_shib.vcxproj
+++ b/Projects/vc15/iis7_shib/iis7_shib.vcxproj
@@ -119,6 +119,9 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <AdditionalOptions>/export:RegisterModule</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -144,6 +147,9 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <AdditionalOptions>/export:RegisterModule</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -167,6 +173,9 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <AdditionalOptions>/export:RegisterModule</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -184,14 +193,15 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <AdditionalOptions>/export:RegisterModule</AdditionalOptions>
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite3D.lib;log4shib1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC15\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/iis7_shib/IIS7Request.cpp b/iis7_shib/IIS7Request.cpp
index 50e1917..ed21e3a 100644
--- a/iis7_shib/IIS7Request.cpp
+++ b/iis7_shib/IIS7Request.cpp
@@ -36,7 +36,7 @@
 using namespace Config;
 using xmltooling::logging::Priority;
 
-IIS7Request::IIS7Request(IHttpContext *pHttpContext, IHttpEventProvider *pEventProvider, bool checkUser) : AbstractSPRequest(SHIBSP_LOGCAT ".NATIVE"),
+IIS7Request::IIS7Request(IHttpContext *pHttpContext, IHttpEventProvider *pEventProvider, bool checkUser) : AbstractSPRequest(SHIBSP_LOGCAT ".IISNative"),
     m_ctx(pHttpContext), m_request(pHttpContext->GetRequest()), m_response(pHttpContext->GetResponse()),
     m_firsttime(true), m_gotBody(false), m_event(pEventProvider)
 {
diff --git a/iis7_shib/register.cpp b/iis7_shib/register.cpp
index 09af594..80153d9 100644
--- a/iis7_shib/register.cpp
+++ b/iis7_shib/register.cpp
@@ -83,7 +83,6 @@ public:
 };
 
 extern "C"
-_declspec(dllexport)
 HRESULT
 __stdcall
 RegisterModule(
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 1de6007..161e8b2 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -9,7 +9,6 @@
   <ComponentRef Id="README.txt" />
   <ComponentRef Id="RELEASE.txt" />
 
-  <ComponentRef Id="SetPermissions" />
   <ComponentRef Id="example_metadata.xml" />
   <ComponentRef Id="example_shibboleth2.xml" />
   <ComponentRef Id="keygen.bat" />
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 994a210..3451103 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -50,13 +50,6 @@
       </Directory><!-- doc -->
       <Directory Id="etc" Name="etc">
         <Directory Id="etc_shibboleth" Name="shibboleth" FileSource="$(var.SPBuildDirectory)\cpp-sp\configs">
-          <Component Id="SetPermissions" Guid="{14FBE93B-B06B-4BDE-AF6C-C34289CA98F9}">
-            <RegistryValue Id="SetPermissions" Root="HKLM" Key="SOFTWARE\Shibboleth\SP" Name="SetPermissions" Value="TRUE" Type="string" KeyPath="yes" />
-            <CreateFolder>
-              <Permission User="Administrators" GenericAll="yes" />
-            </CreateFolder>
-            <Condition>(NOT Installed) AND (NOT ALREADYINSTALLED)</Condition>
-          </Component>
           <Component Id="example_metadata.xml" Guid="{D9852008-249D-405D-8059-5DAD307D2723}" Permanent="yes">
             <File KeyPath="yes" Name="example-metadata.xml" />
           </Component>
diff --git a/util/message.mc b/util/message.mc
index 64f159f..a209e35 100644
--- a/util/message.mc
+++ b/util/message.mc
@@ -173,7 +173,7 @@ Severity=Error
 Facility=ShibbolethISAPI
 SymbolicName=SHIB_ISAPI_CANNOT_CHECK_SIGNATURE
 Language=Neutral
-Shibboleth ISAPI filter: Failed when looking for signature (check the status).
+Shibboleth ISAPI filter: Failed when looking for signature.
 .
 
 MessageId=

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

More information about the commits mailing list