projects
/
shibboleth
/
cpp-sp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SSPCPP-616 - clean up concatenated string literals
[shibboleth/cpp-sp.git]
/
shibsp
/
impl
/
XMLServiceProvider.cpp
diff --git
a/shibsp/impl/XMLServiceProvider.cpp
b/shibsp/impl/XMLServiceProvider.cpp
index
73ef00a
..
f729ed2
100644
(file)
--- a/
shibsp/impl/XMLServiceProvider.cpp
+++ b/
shibsp/impl/XMLServiceProvider.cpp
@@
-335,7
+335,7
@@
namespace {
#endif
{
public:
#endif
{
public:
- XMLConfig(const DOMElement* e) : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT".Config")) {}
+ XMLConfig(const DOMElement* e) : ReloadableXMLFile(e, Category::getInstance(SHIBSP_LOGCAT
".Config")) {}
void init() {
background_load();
void init() {
background_load();
@@
-544,7
+544,7
@@
XMLApplication::XMLApplication(
#ifdef _DEBUG
xmltooling::NDC ndc("XMLApplication");
#endif
#ifdef _DEBUG
xmltooling::NDC ndc("XMLApplication");
#endif
- Category& log = Category::getInstance(SHIBSP_LOGCAT".Application");
+ Category& log = Category::getInstance(SHIBSP_LOGCAT
".Application");
// First load any property sets.
map<string,string> remapper;
// First load any property sets.
map<string,string> remapper;
@@
-1796,7
+1796,7
@@
void XMLApplication::limitRedirect(const GenericRequest& request, const char* ur
boost::bind(startsWithI, url, boost::bind(&string::c_str, _1))) != m_redirectWhitelist.end()) {
return;
}
boost::bind(startsWithI, url, boost::bind(&string::c_str, _1))) != m_redirectWhitelist.end()) {
return;
}
- Category::getInstance(SHIBSP_LOGCAT".Application").warn("redirectLimit policy enforced, blocked redirect to (%s)", url);
+ Category::getInstance(SHIBSP_LOGCAT
".Application").warn("redirectLimit policy enforced, blocked redirect to (%s)", url);
throw opensaml::SecurityPolicyException("Blocked unacceptable redirect location.");
}
}
throw opensaml::SecurityPolicyException("Blocked unacceptable redirect location.");
}
}
@@
-2271,7
+2271,7
@@
void XMLConfig::receive(DDF& in, ostream& out)
}
}
else {
}
}
else {
- Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").error(
+ Category::getInstance(SHIBSP_LOGCAT
".ServiceProvider").error(
"Storage-backed RelayState with invalid StorageService ID (%s)", id
);
}
"Storage-backed RelayState with invalid StorageService ID (%s)", id
);
}
@@
-2298,7
+2298,7
@@
void XMLConfig::receive(DDF& in, ostream& out)
storage->createText("RelayState", rsKey.c_str(), value, time(nullptr) + 600);
}
else {
storage->createText("RelayState", rsKey.c_str(), value, time(nullptr) + 600);
}
else {
- Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").error(
+ Category::getInstance(SHIBSP_LOGCAT
".ServiceProvider").error(
"Storage-backed RelayState with invalid StorageService ID (%s)", id
);
}
"Storage-backed RelayState with invalid StorageService ID (%s)", id
);
}
@@
-2322,7
+2322,7
@@
void XMLConfig::receive(DDF& in, ostream& out)
}
}
else {
}
}
else {
- Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").error(
+ Category::getInstance(SHIBSP_LOGCAT
".ServiceProvider").error(
"Storage-backed PostData with invalid StorageService ID (%s)", id
);
}
"Storage-backed PostData with invalid StorageService ID (%s)", id
);
}
@@
-2352,7
+2352,7
@@
void XMLConfig::receive(DDF& in, ostream& out)
storage->createText("PostData", rsKey.c_str(), params.str().c_str(), time(nullptr) + 600);
}
else {
storage->createText("PostData", rsKey.c_str(), params.str().c_str(), time(nullptr) + 600);
}
else {
- Category::getInstance(SHIBSP_LOGCAT".ServiceProvider").error(
+ Category::getInstance(SHIBSP_LOGCAT
".ServiceProvider").error(
"Storage-backed PostData with invalid StorageService ID (%s)", id
);
}
"Storage-backed PostData with invalid StorageService ID (%s)", id
);
}