[cpp-sp] branch main updated: Rename default config to agent.ini
Scott Cantor
cantor.2 at osu.edu
Wed Jul 16 23:21:25 UTC 2025
This is an automated email from the git hooks/post-receive script.
scantor 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=fad332a74f2d5fade1a37b81e91e6d05ad8bf884
The following commit(s) were added to refs/heads/main by this push:
new fad332a7 Rename default config to agent.ini
fad332a7 is described below
commit fad332a74f2d5fade1a37b81e91e6d05ad8bf884
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jul 16 19:21:17 2025 -0400
Rename default config to agent.ini
---
Projects/vc22/Tests.vcxproj | 26 ++++++++++----------
Projects/vc22/Tests.vcxproj.filters | 26 ++++++++++----------
apache/mod_shib_24.cpp | 2 +-
configs/Makefile.am | 2 +-
configs/{shibboleth.ini => agent.ini} | 1 -
configs/attributes.ini | 2 +-
shibsp/base.h | 2 +-
shibsp/util/ReloadableXMLFile.cpp | 4 +++-
tests/AgentConfigTests.cpp | 28 +++++++++++-----------
.../{console-shibboleth.ini => console-agent.ini} | 0
...operty_shibboleth.ini => dupproperty-agent.ini} | 0
...section_shibboleth.ini => dupsection-agent.ini} | 0
...al-exts-shibboleth.ini => fatal-exts-agent.ini} | 0
.../{console-shibboleth.ini => console-agent.ini} | 0
...egex-shibboleth.ini => partial-regex-agent.ini} | 0
...{noequals_shibboleth.ini => noequals-agent.ini} | 0
.../data/{nokey_shibboleth.ini => nokey-agent.ini} | 0
...exts-shibboleth.ini => nonfatal-exts-agent.ini} | 0
.../{console-shibboleth.ini => console-agent.ini} | 0
.../remoting/impl/{shibboleth.ini => agent.ini} | 0
...m-shibboleth.ini => bogus-filesystem-agent.ini} | 0
...esystem-shibboleth.ini => filesystem-agent.ini} | 0
.../{memory-shibboleth.ini => memory-agent.ini} | 0
.../{syslog-shibboleth.ini => syslog-agent.ini} | 0
...nmatched_shibboleth.ini => unmatched-agent.ini} | 0
.../{console-shibboleth.ini => console-agent.ini} | 0
tests/impl/XMLAccessControlTests.cpp | 4 ++--
tests/impl/XMLRequestMapperTests.cpp | 2 +-
tests/platform/iis/ModuleConfigTests.cpp | 2 +-
tests/remoting/impl/RemotingServiceTests.cpp | 2 +-
tests/remoting/impl/SecretSourceTests.cpp | 2 +-
tests/session/impl/FilesystemSessionCacheTests.cpp | 4 ++--
tests/session/impl/MemorySessionCacheTests.cpp | 2 +-
tests/util/ReloadableXMLFileTests.cpp | 2 +-
34 files changed, 57 insertions(+), 56 deletions(-)
diff --git a/Projects/vc22/Tests.vcxproj b/Projects/vc22/Tests.vcxproj
index dcfb75d6..a47efba6 100644
--- a/Projects/vc22/Tests.vcxproj
+++ b/Projects/vc22/Tests.vcxproj
@@ -52,27 +52,27 @@
<ClCompile Include="..\..\tests\util\ReloadableXMLFileTests.cpp" />
</ItemGroup>
<ItemGroup>
- <None Include="..\..\tests\data\console-shibboleth.ini" />
- <None Include="..\..\tests\data\dupproperty_shibboleth.ini" />
- <None Include="..\..\tests\data\dupsection_shibboleth.ini" />
- <None Include="..\..\tests\data\fatal-exts-shibboleth.ini" />
- <None Include="..\..\tests\data\impl\console-shibboleth.ini" />
- <None Include="..\..\tests\data\noequals_shibboleth.ini" />
- <None Include="..\..\tests\data\nokey_shibboleth.ini" />
- <None Include="..\..\tests\data\nonfatal-exts-shibboleth.ini" />
- <None Include="..\..\tests\data\platform\iis\console-shibboleth.ini" />
+ <None Include="..\..\tests\data\console-agent.ini" />
+ <None Include="..\..\tests\data\dupproperty_agent.ini" />
+ <None Include="..\..\tests\data\dupsection_agent.ini" />
+ <None Include="..\..\tests\data\fatal-exts-agent.ini" />
+ <None Include="..\..\tests\data\impl\console-agent.ini" />
+ <None Include="..\..\tests\data\noequals_agent.ini" />
+ <None Include="..\..\tests\data\nokey_agent.ini" />
+ <None Include="..\..\tests\data\nonfatal-exts-agent.ini" />
+ <None Include="..\..\tests\data\platform\iis\console-agent.ini" />
<None Include="..\..\tests\data\platform\iis\iis-bad.ini" />
<None Include="..\..\tests\data\platform\iis\iis.ini" />
<None Include="..\..\tests\data\remoting\impl\env.ini" />
<None Include="..\..\tests\data\remoting\impl\file-missing.ini" />
<None Include="..\..\tests\data\remoting\impl\file.ini" />
<None Include="..\..\tests\data\remoting\impl\invalid.ini" />
- <None Include="..\..\tests\data\remoting\impl\shibboleth.ini" />
+ <None Include="..\..\tests\data\remoting\impl\agent.ini" />
<None Include="..\..\tests\data\remoting\impl\trustfile.pem" />
- <None Include="..\..\tests\data\syslog-shibboleth.ini" />
- <None Include="..\..\tests\data\unmatched_shibboleth.ini" />
+ <None Include="..\..\tests\data\syslog-agent.ini" />
+ <None Include="..\..\tests\data\unmatched_agent.ini" />
<None Include="..\..\tests\data\util\boostpropset\attributes.ini" />
- <None Include="..\..\tests\data\util\reloadablefile\console-shibboleth.ini" />
+ <None Include="..\..\tests\data\util\reloadablefile\console-agent.ini" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\tests\data\impl\acl\acl-badxml.xml" />
diff --git a/Projects/vc22/Tests.vcxproj.filters b/Projects/vc22/Tests.vcxproj.filters
index 2791228e..06d1b418 100644
--- a/Projects/vc22/Tests.vcxproj.filters
+++ b/Projects/vc22/Tests.vcxproj.filters
@@ -89,34 +89,34 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <None Include="..\..\tests\data\console-shibboleth.ini">
+ <None Include="..\..\tests\data\console-agent.ini">
<Filter>Data</Filter>
</None>
- <None Include="..\..\tests\data\dupproperty_shibboleth.ini">
+ <None Include="..\..\tests\data\dupproperty_agent.ini">
<Filter>Data</Filter>
</None>
- <None Include="..\..\tests\data\dupsection_shibboleth.ini">
+ <None Include="..\..\tests\data\dupsection_agent.ini">
<Filter>Data</Filter>
</None>
- <None Include="..\..\tests\data\fatal-exts-shibboleth.ini">
+ <None Include="..\..\tests\data\fatal-exts-agent.ini">
<Filter>Data</Filter>
</None>
- <None Include="..\..\tests\data\noequals_shibboleth.ini">
+ <None Include="..\..\tests\data\noequals_agent.ini">
<Filter>Data</Filter>
</None>
- <None Include="..\..\tests\data\nokey_shibboleth.ini">
+ <None Include="..\..\tests\data\nokey_agent.ini">
<Filter>Data</Filter>
</None>
- <None Include="..\..\tests\data\nonfatal-exts-shibboleth.ini">
+ <None Include="..\..\tests\data\nonfatal-exts-agent.ini">
<Filter>Data</Filter>
</None>
- <None Include="..\..\tests\data\syslog-shibboleth.ini">
+ <None Include="..\..\tests\data\syslog-agent.ini">
<Filter>Data</Filter>
</None>
- <None Include="..\..\tests\data\unmatched_shibboleth.ini">
+ <None Include="..\..\tests\data\unmatched_agent.ini">
<Filter>Data</Filter>
</None>
- <None Include="..\..\tests\data\impl\console-shibboleth.ini">
+ <None Include="..\..\tests\data\impl\console-agent.ini">
<Filter>Data\impl</Filter>
</None>
<None Include="..\..\tests\data\impl\acl\acl-badxml.xml">
@@ -191,7 +191,7 @@
<None Include="..\..\tests\data\impl\reqmap\internal-with-acl.xml">
<Filter>Data\impl\reqmap</Filter>
</None>
- <None Include="..\..\tests\data\platform\iis\console-shibboleth.ini">
+ <None Include="..\..\tests\data\platform\iis\console-agent.ini">
<Filter>Data\platform\iis</Filter>
</None>
<None Include="..\..\tests\data\platform\iis\iis.ini">
@@ -218,7 +218,7 @@
<None Include="..\..\tests\data\remoting\impl\invalid.ini">
<Filter>Data\remoting\impl</Filter>
</None>
- <None Include="..\..\tests\data\remoting\impl\shibboleth.ini">
+ <None Include="..\..\tests\data\remoting\impl\agent.ini">
<Filter>Data\remoting\impl</Filter>
</None>
<None Include="..\..\tests\data\remoting\impl\trustfile.pem">
@@ -233,7 +233,7 @@
<None Include="..\..\tests\data\util\boostpropset\tree.xml">
<Filter>Data\util\boospropset</Filter>
</None>
- <None Include="..\..\tests\data\util\reloadablefile\console-shibboleth.ini">
+ <None Include="..\..\tests\data\util\reloadablefile\console-agent.ini">
<Filter>Data\util\reloadablefile</Filter>
</None>
<None Include="..\..\tests\data\util\reloadablefile\external.xml">
diff --git a/apache/mod_shib_24.cpp b/apache/mod_shib_24.cpp
index 9b76e841..17b5a67e 100644
--- a/apache/mod_shib_24.cpp
+++ b/apache/mod_shib_24.cpp
@@ -1566,7 +1566,7 @@ static command_rec shib_cmds[] = {
AP_INIT_TAKE1("ShibPrefix", (config_fn_t)ap_set_global_string_slot, &g_szPrefix,
RSRC_CONF, "Shibboleth installation directory"),
AP_INIT_TAKE1("ShibConfig", (config_fn_t)ap_set_global_string_slot, &g_szConfigFile,
- RSRC_CONF, "Path to shibboleth.ini config file"),
+ RSRC_CONF, "Path to agent.ini config file"),
AP_INIT_TAKE1("ShibURLScheme", (config_fn_t)shib_set_server_string_slot,
(void *) offsetof (shib_server_config, szScheme),
diff --git a/configs/Makefile.am b/configs/Makefile.am
index 74e10f46..2d585b09 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -18,7 +18,7 @@ CONFIGFILES = \
localLogout.html \
globalLogout.html \
partialLogout.html \
- shibboleth.ini \
+ agent.ini \
attributes.ini \
handlers.ini \
request-map.xml
diff --git a/configs/shibboleth.ini b/configs/agent.ini
similarity index 94%
rename from configs/shibboleth.ini
rename to configs/agent.ini
index 461e4dfc..81667989 100644
--- a/configs/shibboleth.ini
+++ b/configs/agent.ini
@@ -24,5 +24,4 @@ type = filesystem
[request-mapper]
path = request-map.xml
reloadChanges = true
-#partialRegexMatching = false
diff --git a/configs/attributes.ini b/configs/attributes.ini
index 2cd82b20..2a108a1d 100644
--- a/configs/attributes.ini
+++ b/configs/attributes.ini
@@ -1,7 +1,7 @@
[settings]
#scopeDelimiter = @
#exportDuplicateValues = true
-#caseSensitiveAttributes = foo bar
+#caseInsensitiveAttributes = foo bar
#legacyClassRefAttribute = Shib-AuthnContext-Class
#legacyAuthnTimeAttribute = Shib-Authentication-Instant
# Set to URL to apply URL encoding on export
diff --git a/shibsp/base.h b/shibsp/base.h
index 647b919e..2720a0cc 100644
--- a/shibsp/base.h
+++ b/shibsp/base.h
@@ -80,7 +80,7 @@
#define SHIBSP_TX_LOGCAT "Shibboleth-TRANSACTION"
/** Default name of configuration file. */
-# define SHIBSP_CONFIG "shibboleth.ini"
+# define SHIBSP_CONFIG "agent.ini"
#ifdef WIN32
diff --git a/shibsp/util/ReloadableXMLFile.cpp b/shibsp/util/ReloadableXMLFile.cpp
index 315d0b91..997959a0 100644
--- a/shibsp/util/ReloadableXMLFile.cpp
+++ b/shibsp/util/ReloadableXMLFile.cpp
@@ -37,6 +37,8 @@ using namespace std;
const char ReloadableXMLFile::PATH_PROP_NAME[] = "path";
const char ReloadableXMLFile::RELOAD_CHANGES_PROP_NAME[] = "reloadChanges";
+static bool RELOAD_CHANGES_PROP_DEFAULT = false;
+
ReloadableXMLFile::ReloadableXMLFile(const string& rootElementName, ptree& pt, Category& log)
: m_root(pt), m_log(log), m_rootElementName(rootElementName), m_filestamp(0)
#ifdef HAVE_CXX17
@@ -54,7 +56,7 @@ ReloadableXMLFile::ReloadableXMLFile(const string& rootElementName, ptree& pt, C
AgentConfig::getConfig().getPathResolver().resolve(m_source, PathResolver::SHIBSP_CFG_FILE);
string_to_bool_translator tr;
- bool reloadChanges = property_root.get(RELOAD_CHANGES_PROP_NAME, false, tr);
+ bool reloadChanges = property_root.get(RELOAD_CHANGES_PROP_NAME, RELOAD_CHANGES_PROP_DEFAULT, tr);
#ifndef HAVE_CXX14
if (reloadChanges) {
log.warn("C++ compiler level does not allow for reloadChanges, ignoring");
diff --git a/tests/AgentConfigTests.cpp b/tests/AgentConfigTests.cpp
index eb455401..d74cd749 100644
--- a/tests/AgentConfigTests.cpp
+++ b/tests/AgentConfigTests.cpp
@@ -57,24 +57,24 @@ BOOST_FIXTURE_TEST_CASE(AgentConfig_init_bad_path, AC_Fixture)
BOOST_FIXTURE_TEST_CASE(AgentConfig_init_bad_format, AC_Fixture)
{
- exceptionCheck checker_unmatched("./data/unmatched_shibboleth.ini(1): unmatched '['");
- BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (data_path + "unmatched_shibboleth.ini").c_str(), true),
+ exceptionCheck checker_unmatched("./data/unmatched-agent.ini(1): unmatched '['");
+ BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (data_path + "unmatched-agent.ini").c_str(), true),
ini_parser_error, checker_unmatched.check_message);
- exceptionCheck checker_dupsection("./data/dupsection_shibboleth.ini(4): duplicate section name");
- BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (data_path + "dupsection_shibboleth.ini").c_str(), true),
+ exceptionCheck checker_dupsection("./data/dupsection-agent.ini(4): duplicate section name");
+ BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (data_path + "dupsection-agent.ini").c_str(), true),
ini_parser_error, checker_dupsection.check_message);
- exceptionCheck checker_noequals("./data/noequals_shibboleth.ini(2): '=' character not found in line");
- BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (data_path + "noequals_shibboleth.ini").c_str(), true),
+ exceptionCheck checker_noequals("./data/noequals-agent.ini(2): '=' character not found in line");
+ BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (data_path + "noequals-agent.ini").c_str(), true),
ini_parser_error, checker_noequals.check_message);
- exceptionCheck checker_dupproperty("./data/dupproperty_shibboleth.ini(3): duplicate key name");
- BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (data_path + "dupproperty_shibboleth.ini").c_str(), true),
+ exceptionCheck checker_dupproperty("./data/dupproperty-agent.ini(3): duplicate key name");
+ BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (data_path + "dupproperty-agent.ini").c_str(), true),
ini_parser_error, checker_dupproperty.check_message);
- exceptionCheck checker_nokey("./data/nokey_shibboleth.ini(2): key expected");
- BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (data_path + "nokey_shibboleth.ini").c_str(), true),
+ exceptionCheck checker_nokey("./data/nokey-agent.ini(2): key expected");
+ BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (data_path + "nokey-agent.ini").c_str(), true),
ini_parser_error, checker_nokey.check_message);
}
@@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE(AgentConfig_term_without_init)
BOOST_FIXTURE_TEST_CASE(AgentConfig_init_console, AC_Fixture)
{
- BOOST_CHECK(AgentConfig::getConfig().init(nullptr, (data_path + "console-shibboleth.ini").c_str(), true));
+ BOOST_CHECK(AgentConfig::getConfig().init(nullptr, (data_path + "console-agent.ini").c_str(), true));
AgentConfig::getConfig().term();
}
@@ -96,7 +96,7 @@ BOOST_FIXTURE_TEST_CASE(AgentConfig_init_console, AC_Fixture)
#else
BOOST_FIXTURE_TEST_CASE(AgentConfig_init_syslog, AC_Fixture)
{
- BOOST_CHECK(AgentConfig::getConfig().init(nullptr, (data_path + "syslog-shibboleth.ini").c_str(), true));
+ BOOST_CHECK(AgentConfig::getConfig().init(nullptr, (data_path + "syslog-agent.ini").c_str(), true));
AgentConfig::getConfig().term();
}
#endif // !WIN32
@@ -109,13 +109,13 @@ BOOST_FIXTURE_TEST_CASE(AgentConfig_init_fatal_exts, AC_Fixture)
#else
exceptionCheck checker_fatal("dlopen(/path/to/extension.so, 0x0001): tried: ");
#endif // !WIN32
- BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (data_path + "fatal-exts-shibboleth.ini").c_str(), true),
+ BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (data_path + "fatal-exts-agent.ini").c_str(), true),
runtime_error, checker_fatal.check_message);
}
BOOST_FIXTURE_TEST_CASE(AgentConfig_init_nonfatal_exts, AC_Fixture)
{
- BOOST_CHECK(AgentConfig::getConfig().init(nullptr, (data_path + "nonfatal-exts-shibboleth.ini").c_str(), true));
+ BOOST_CHECK(AgentConfig::getConfig().init(nullptr, (data_path + "nonfatal-exts-agent.ini").c_str(), true));
AgentConfig::getConfig().term();
}
diff --git a/tests/data/console-shibboleth.ini b/tests/data/console-agent.ini
similarity index 100%
rename from tests/data/console-shibboleth.ini
rename to tests/data/console-agent.ini
diff --git a/tests/data/dupproperty_shibboleth.ini b/tests/data/dupproperty-agent.ini
similarity index 100%
rename from tests/data/dupproperty_shibboleth.ini
rename to tests/data/dupproperty-agent.ini
diff --git a/tests/data/dupsection_shibboleth.ini b/tests/data/dupsection-agent.ini
similarity index 100%
rename from tests/data/dupsection_shibboleth.ini
rename to tests/data/dupsection-agent.ini
diff --git a/tests/data/fatal-exts-shibboleth.ini b/tests/data/fatal-exts-agent.ini
similarity index 100%
rename from tests/data/fatal-exts-shibboleth.ini
rename to tests/data/fatal-exts-agent.ini
diff --git a/tests/data/impl/console-shibboleth.ini b/tests/data/impl/console-agent.ini
similarity index 100%
rename from tests/data/impl/console-shibboleth.ini
rename to tests/data/impl/console-agent.ini
diff --git a/tests/data/impl/partial-regex-shibboleth.ini b/tests/data/impl/partial-regex-agent.ini
similarity index 100%
rename from tests/data/impl/partial-regex-shibboleth.ini
rename to tests/data/impl/partial-regex-agent.ini
diff --git a/tests/data/noequals_shibboleth.ini b/tests/data/noequals-agent.ini
similarity index 100%
rename from tests/data/noequals_shibboleth.ini
rename to tests/data/noequals-agent.ini
diff --git a/tests/data/nokey_shibboleth.ini b/tests/data/nokey-agent.ini
similarity index 100%
rename from tests/data/nokey_shibboleth.ini
rename to tests/data/nokey-agent.ini
diff --git a/tests/data/nonfatal-exts-shibboleth.ini b/tests/data/nonfatal-exts-agent.ini
similarity index 100%
rename from tests/data/nonfatal-exts-shibboleth.ini
rename to tests/data/nonfatal-exts-agent.ini
diff --git a/tests/data/platform/iis/console-shibboleth.ini b/tests/data/platform/iis/console-agent.ini
similarity index 100%
rename from tests/data/platform/iis/console-shibboleth.ini
rename to tests/data/platform/iis/console-agent.ini
diff --git a/tests/data/remoting/impl/shibboleth.ini b/tests/data/remoting/impl/agent.ini
similarity index 100%
rename from tests/data/remoting/impl/shibboleth.ini
rename to tests/data/remoting/impl/agent.ini
diff --git a/tests/data/session/impl/bogus-filesystem-shibboleth.ini b/tests/data/session/impl/bogus-filesystem-agent.ini
similarity index 100%
rename from tests/data/session/impl/bogus-filesystem-shibboleth.ini
rename to tests/data/session/impl/bogus-filesystem-agent.ini
diff --git a/tests/data/session/impl/filesystem-shibboleth.ini b/tests/data/session/impl/filesystem-agent.ini
similarity index 100%
rename from tests/data/session/impl/filesystem-shibboleth.ini
rename to tests/data/session/impl/filesystem-agent.ini
diff --git a/tests/data/session/impl/memory-shibboleth.ini b/tests/data/session/impl/memory-agent.ini
similarity index 100%
rename from tests/data/session/impl/memory-shibboleth.ini
rename to tests/data/session/impl/memory-agent.ini
diff --git a/tests/data/syslog-shibboleth.ini b/tests/data/syslog-agent.ini
similarity index 100%
rename from tests/data/syslog-shibboleth.ini
rename to tests/data/syslog-agent.ini
diff --git a/tests/data/unmatched_shibboleth.ini b/tests/data/unmatched-agent.ini
similarity index 100%
rename from tests/data/unmatched_shibboleth.ini
rename to tests/data/unmatched-agent.ini
diff --git a/tests/data/util/reloadablefile/console-shibboleth.ini b/tests/data/util/reloadablefile/console-agent.ini
similarity index 100%
rename from tests/data/util/reloadablefile/console-shibboleth.ini
rename to tests/data/util/reloadablefile/console-agent.ini
diff --git a/tests/impl/XMLAccessControlTests.cpp b/tests/impl/XMLAccessControlTests.cpp
index acc4d737..aaa7cdeb 100644
--- a/tests/impl/XMLAccessControlTests.cpp
+++ b/tests/impl/XMLAccessControlTests.cpp
@@ -95,7 +95,7 @@ private:
struct XMLAccessControlFixture
{
XMLAccessControlFixture() : data_path(DATA_PATH) {
- AgentConfig::getConfig().init(nullptr, (data_path + "../console-shibboleth.ini").c_str(), true);
+ AgentConfig::getConfig().init(nullptr, (data_path + "../console-agent.ini").c_str(), true);
}
~XMLAccessControlFixture() {
AgentConfig::getConfig().term();
@@ -112,7 +112,7 @@ struct XMLAccessControlFixture
struct PartialRegexXMLAccessControlFixture
{
PartialRegexXMLAccessControlFixture() : data_path(DATA_PATH) {
- AgentConfig::getConfig().init(nullptr, (data_path + "../partial-regex-shibboleth.ini").c_str(), true);
+ AgentConfig::getConfig().init(nullptr, (data_path + "../partial-regex-agent.ini").c_str(), true);
}
~PartialRegexXMLAccessControlFixture() {
AgentConfig::getConfig().term();
diff --git a/tests/impl/XMLRequestMapperTests.cpp b/tests/impl/XMLRequestMapperTests.cpp
index f0b19d25..6f33b4ac 100644
--- a/tests/impl/XMLRequestMapperTests.cpp
+++ b/tests/impl/XMLRequestMapperTests.cpp
@@ -88,7 +88,7 @@ private:
struct XMLRequestMapperFixture
{
XMLRequestMapperFixture() : data_path(DATA_PATH) {
- AgentConfig::getConfig().init(nullptr, (data_path + "../console-shibboleth.ini").c_str(), true);
+ AgentConfig::getConfig().init(nullptr, (data_path + "../console-agent.ini").c_str(), true);
}
~XMLRequestMapperFixture() {
AgentConfig::getConfig().term();
diff --git a/tests/platform/iis/ModuleConfigTests.cpp b/tests/platform/iis/ModuleConfigTests.cpp
index 3e301dd2..f3d43771 100644
--- a/tests/platform/iis/ModuleConfigTests.cpp
+++ b/tests/platform/iis/ModuleConfigTests.cpp
@@ -51,7 +51,7 @@ private:
struct ModuleConfigFixture
{
ModuleConfigFixture() : data_path(DATA_PATH) {
- AgentConfig::getConfig().init(nullptr, (data_path + "./console-shibboleth.ini").c_str(), true);
+ AgentConfig::getConfig().init(nullptr, (data_path + "./console-agent.ini").c_str(), true);
}
~ModuleConfigFixture() {
AgentConfig::getConfig().term();
diff --git a/tests/remoting/impl/RemotingServiceTests.cpp b/tests/remoting/impl/RemotingServiceTests.cpp
index a26d8a84..46ef2882 100644
--- a/tests/remoting/impl/RemotingServiceTests.cpp
+++ b/tests/remoting/impl/RemotingServiceTests.cpp
@@ -52,7 +52,7 @@ struct RemotingFixture
{
RemotingFixture() : data_path(DATA_PATH) {
setenv("SHIBSP_AGENT_SECRET", "foo", true);
- AgentConfig::getConfig().init(nullptr, (data_path + "./shibboleth.ini").c_str(), true);
+ AgentConfig::getConfig().init(nullptr, (data_path + "./agent.ini").c_str(), true);
}
~RemotingFixture() {
AgentConfig::getConfig().term();
diff --git a/tests/remoting/impl/SecretSourceTests.cpp b/tests/remoting/impl/SecretSourceTests.cpp
index d251052b..6625cde8 100644
--- a/tests/remoting/impl/SecretSourceTests.cpp
+++ b/tests/remoting/impl/SecretSourceTests.cpp
@@ -43,7 +43,7 @@ namespace {
struct SecretSourceFixture
{
SecretSourceFixture() : data_path(DATA_PATH) {
- AgentConfig::getConfig().init(nullptr, (data_path + "../../console-shibboleth.ini").c_str(), true);
+ AgentConfig::getConfig().init(nullptr, (data_path + "../../console-agent.ini").c_str(), true);
}
~SecretSourceFixture() {
AgentConfig::getConfig().term();
diff --git a/tests/session/impl/FilesystemSessionCacheTests.cpp b/tests/session/impl/FilesystemSessionCacheTests.cpp
index 747f7eee..db08f0a6 100644
--- a/tests/session/impl/FilesystemSessionCacheTests.cpp
+++ b/tests/session/impl/FilesystemSessionCacheTests.cpp
@@ -55,7 +55,7 @@ private:
BOOST_AUTO_TEST_CASE(BogusFilesystemSessionCache)
{
exceptionCheck checker("Configured session cache directory was inaccessible to agent process.");
- BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (string(DATA_PATH) + "bogus-filesystem-shibboleth.ini").c_str(), true),
+ BOOST_CHECK_EXCEPTION(AgentConfig::getConfig().init(nullptr, (string(DATA_PATH) + "bogus-filesystem-agent.ini").c_str(), true),
ConfigurationException, checker.check_message);
}
@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(BogusFilesystemSessionCache)
struct FilesystemFixture
{
FilesystemFixture() : data_path(DATA_PATH) {
- AgentConfig::getConfig().init(nullptr, (data_path + "filesystem-shibboleth.ini").c_str(), true);
+ AgentConfig::getConfig().init(nullptr, (data_path + "filesystem-agent.ini").c_str(), true);
}
~FilesystemFixture() {
AgentConfig::getConfig().term();
diff --git a/tests/session/impl/MemorySessionCacheTests.cpp b/tests/session/impl/MemorySessionCacheTests.cpp
index a6915f58..d8aeee04 100644
--- a/tests/session/impl/MemorySessionCacheTests.cpp
+++ b/tests/session/impl/MemorySessionCacheTests.cpp
@@ -43,7 +43,7 @@ namespace {
struct MemoryFixture
{
MemoryFixture() : data_path(DATA_PATH) {
- AgentConfig::getConfig().init(nullptr, (data_path + "memory-shibboleth.ini").c_str(), true);
+ AgentConfig::getConfig().init(nullptr, (data_path + "memory-agent.ini").c_str(), true);
}
~MemoryFixture() {
AgentConfig::getConfig().term();
diff --git a/tests/util/ReloadableXMLFileTests.cpp b/tests/util/ReloadableXMLFileTests.cpp
index 00755522..aef43de1 100644
--- a/tests/util/ReloadableXMLFileTests.cpp
+++ b/tests/util/ReloadableXMLFileTests.cpp
@@ -116,7 +116,7 @@ private:
struct ReloadableXMLFileFixture
{
ReloadableXMLFileFixture() : data_path(DATA_PATH) {
- AgentConfig::getConfig().init(nullptr, (data_path + "console-shibboleth.ini").c_str(), true);
+ AgentConfig::getConfig().init(nullptr, (data_path + "console-agent.ini").c_str(), true);
}
~ReloadableXMLFileFixture() {
AgentConfig::getConfig().term();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list