[cpp-sp] branch main updated: Windows: fix build

Rod Widdowson rdw at steadingsoftware.com
Thu May 8 14:50:17 UTC 2025


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

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

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

The following commit(s) were added to refs/heads/main by this push:
     new 97470708 Windows:  fix build
97470708 is described below

commit 974707080caf1299c78a83aae00f99e8ec5f2105
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu May 8 15:45:53 2025 +0100

    Windows:  fix build
---
 shibsp/io/impl/CookieManager.cpp                | 3 ++-
 shibsp/remoting/impl/WinHTTPRemotingService.cpp | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/shibsp/io/impl/CookieManager.cpp b/shibsp/io/impl/CookieManager.cpp
index a1f18080..fb1eb078 100644
--- a/shibsp/io/impl/CookieManager.cpp
+++ b/shibsp/io/impl/CookieManager.cpp
@@ -26,7 +26,7 @@
 #include "io/CookieManager.h"
 #include "util/PropertySet.h"
 
-#include <boost/lexical_cast.hpp>>
+#include <boost/lexical_cast.hpp>
 
 using namespace shibsp;
 using namespace std;
@@ -146,6 +146,7 @@ void CookieManager::outputHeader(SPRequest& request, int maxAge) const
                 header += "; SameSite=Strict";
                 break;
             default:
+                break;
         }
     }
 
diff --git a/shibsp/remoting/impl/WinHTTPRemotingService.cpp b/shibsp/remoting/impl/WinHTTPRemotingService.cpp
index 3f7c7793..a85db303 100644
--- a/shibsp/remoting/impl/WinHTTPRemotingService.cpp
+++ b/shibsp/remoting/impl/WinHTTPRemotingService.cpp
@@ -23,6 +23,8 @@
 #include <Windows.h>
 #include <winhttp.h>
 
+#include "Agent.h"
+#include "AgentConfig.h"
 #include "logging/Category.h"
 #include "remoting/SecretSource.h"
 #include "remoting/impl/AbstractHTTPRemotingService.h"
@@ -187,7 +189,7 @@ WinHTTPRemotingService::WinHTTPRemotingService(ptree& pt)
 
     m_chunked = props.getBool(CHUNKED_PROP_NAME, defaultChunking);
     m_ciphers = props.getString(CIPHER_LIST_PROP_NAME, "");
-    m_username = utf8ToUtf16(getAgentID());
+    m_username = utf8ToUtf16(AgentConfig::getConfig().getAgent().getID());
     switch (getAuthMethod()) {
         case agent_auth_basic:  m_authScheme = WINHTTP_AUTH_SCHEME_BASIC; break;
         case agent_auth_digest: m_authScheme = WINHTTP_AUTH_SCHEME_DIGEST; break;
@@ -255,7 +257,7 @@ WinHTTPRemotingService::WinHTTPRemotingService(ptree& pt)
         throw runtime_error("WinHHHTP failed to initialize: Could no");
     }
 
-    m_log.info("WinHTTP RemotingService installed for agent (%s), baseURL (%s)", getAgentID(), getBaseURL());
+    m_log.info("WinHTTP RemotingService installed for agent (%s), baseURL (%s)", AgentConfig::getConfig().getAgent().getID(), getBaseURL());
 }
 
 WinHTTPRemotingService::~WinHTTPRemotingService()

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


More information about the commits mailing list