projects
/
moonshot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make possible build without OpenSAML and/or Shib
[moonshot.git]
/
moonshot
/
mech_eap
/
util_saml.cpp
diff --git
a/moonshot/mech_eap/util_saml.cpp
b/moonshot/mech_eap/util_saml.cpp
index
494aeb9
..
9a3862a
100644
(file)
--- a/
moonshot/mech_eap/util_saml.cpp
+++ b/
moonshot/mech_eap/util_saml.cpp
@@
-46,6
+46,7
@@
#include <xmltooling/util/DateTime.h>
#include <saml/exceptions.h>
#include <xmltooling/util/DateTime.h>
#include <saml/exceptions.h>
+#include <saml/SAMLConfig.h>
#include <saml/saml1/core/Assertions.h>
#include <saml/saml2/core/Assertions.h>
#include <saml/saml2/metadata/Metadata.h>
#include <saml/saml1/core/Assertions.h>
#include <saml/saml2/core/Assertions.h>
#include <saml/saml2/metadata/Metadata.h>
@@
-322,8
+323,17
@@
gss_eap_saml_assertion_provider::prefix(void) const
bool
gss_eap_saml_assertion_provider::init(void)
{
bool
gss_eap_saml_assertion_provider::init(void)
{
- gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML_ASSERTION, createAttrContext);
- return true;
+ bool ret = false;
+
+ try {
+ ret = SAMLConfig::getConfig().init();
+ } catch (exception &e) {
+ }
+
+ if (ret)
+ gss_eap_attr_ctx::registerProvider(ATTR_TYPE_SAML_ASSERTION, createAttrContext);
+
+ return ret;
}
void
}
void
@@
-363,7
+373,7
@@
gss_eap_saml_attr_provider::getAssertion(int *authenticated,
if (pAssertion != NULL)
*pAssertion = NULL;
if (pAssertion != NULL)
*pAssertion = NULL;
- saml = static_cast<
const
gss_eap_saml_assertion_provider *>
+ saml = static_cast<gss_eap_saml_assertion_provider *>
(m_manager->getProvider(ATTR_TYPE_SAML_ASSERTION));
if (saml == NULL)
return false;
(m_manager->getProvider(ATTR_TYPE_SAML_ASSERTION));
if (saml == NULL)
return false;