diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2010-06-06 14:03:52 +0000 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2010-06-06 14:03:52 +0000 |
| commit | 652698534263d9b92c0297b6ca8ba27c8a37e150 (patch) | |
| tree | 60774743699de349919bc0f0049167933da230ce | |
| parent | 64dd61b1a8e09cf2f12caf0d0d0a2d0937d8a5fe (diff) | |
| download | lasso-652698534263d9b92c0297b6ca8ba27c8a37e150.tar.gz lasso-652698534263d9b92c0297b6ca8ba27c8a37e150.tar.xz lasso-652698534263d9b92c0297b6ca8ba27c8a37e150.zip | |
SAMLv2: make role checking inactive for LassoServer
* LassoServer have no role defined, so checking breaks loading of
metadata for LassoServer.
| -rw-r--r-- | lasso/saml-2.0/provider.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lasso/saml-2.0/provider.c b/lasso/saml-2.0/provider.c index 9cf4eefa..65bd579b 100644 --- a/lasso/saml-2.0/provider.c +++ b/lasso/saml-2.0/provider.c @@ -29,6 +29,7 @@ #include <xmlsec/xmltree.h> #include "providerprivate.h" +#include "../id-ff/server.h" #include "../id-ff/providerprivate.h" #include "../utils.h" #include "./provider.h" @@ -339,7 +340,7 @@ lasso_saml20_provider_load_metadata(LassoProvider *provider, xmlNode *root_node) LASSO_PROVIDER_ROLE_AUTHN_AUTHORITY }, { NULL, 0 } }; - gboolean loaded_one_or_more_descriptor = False; + gboolean loaded_one_or_more_descriptor = FALSE; /* find a root node for the metadata file */ if (xmlSecCheckNodeName(root_node, @@ -391,7 +392,8 @@ lasso_saml20_provider_load_metadata(LassoProvider *provider, xmlNode *root_node) descriptor_node = xmlSecGetNextElementNode(descriptor_node->next); } - if (! loaded_one_or_more_descriptor || (pdata->roles & provider->role) == 0) { + if (! LASSO_IS_SERVER(provider) && + (! loaded_one_or_more_descriptor || (pdata->roles & provider->role) == 0)) { /* We must at least load one descriptor, and we must load a descriptor for our * assigned role or we fail. */ return FALSE; |