From 88db1dea04530c681ed8aa2ec853125fa771acb0 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Wed, 22 Feb 2012 17:55:17 +0000 Subject: [PATCH] https://issues.shibboleth.net/jira/browse/CPPOST-73 --- saml/Makefile.am | 1 - saml/saml2/metadata/MetadataFilter.h | 3 --- saml/saml2/metadata/impl/MetadataProvider.cpp | 3 --- 3 files changed, 7 deletions(-) diff --git a/saml/Makefile.am b/saml/Makefile.am index 4c34286..1dab792 100644 --- a/saml/Makefile.am +++ b/saml/Makefile.am @@ -146,7 +146,6 @@ libsaml_la_SOURCES = \ saml2/metadata/impl/ChainingMetadataProvider.cpp \ saml2/metadata/impl/DiscoverableMetadataProvider.cpp \ saml2/metadata/impl/DynamicMetadataProvider.cpp \ - saml2/metadata/impl/EntityAttributesMetadataFilter.cpp \ saml2/metadata/impl/EntityRoleMetadataFilter.cpp \ saml2/metadata/impl/FolderMetadataProvider.cpp \ saml2/metadata/impl/MetadataCredentialContext.cpp \ diff --git a/saml/saml2/metadata/MetadataFilter.h b/saml/saml2/metadata/MetadataFilter.h index ed89cbb..c6b5ff9 100644 --- a/saml/saml2/metadata/MetadataFilter.h +++ b/saml/saml2/metadata/MetadataFilter.h @@ -83,9 +83,6 @@ namespace opensaml { /** MetadataFilter that removes non-retained roles. */ #define ENTITYROLE_METADATA_FILTER "EntityRoleWhiteList" - /** MetadataFilter that adds EntityAttributes extension. */ - #define ENTITYATTR_METADATA_FILTER "EntityAttributes" - DECL_XMLTOOLING_EXCEPTION(MetadataFilterException,SAML_EXCEPTIONAPI(SAML_API),opensaml::saml2md,MetadataException,Exceptions related to metadata filtering); }; }; diff --git a/saml/saml2/metadata/impl/MetadataProvider.cpp b/saml/saml2/metadata/impl/MetadataProvider.cpp index f7b98d0..f606131 100644 --- a/saml/saml2/metadata/impl/MetadataProvider.cpp +++ b/saml/saml2/metadata/impl/MetadataProvider.cpp @@ -56,7 +56,6 @@ namespace opensaml { SAML_DLLLOCAL PluginManager::Factory SignatureMetadataFilterFactory; SAML_DLLLOCAL PluginManager::Factory RequireValidUntilMetadataFilterFactory; SAML_DLLLOCAL PluginManager::Factory EntityRoleMetadataFilterFactory; - SAML_DLLLOCAL PluginManager::Factory EntityAttributesMetadataFilterFactory; }; }; @@ -79,8 +78,6 @@ void SAML_API opensaml::saml2md::registerMetadataFilters() // additional name matching Java code SAMLConfig::getConfig().MetadataFilterManager.registerFactory("RequiredValidUntil", RequireValidUntilMetadataFilterFactory); SAMLConfig::getConfig().MetadataFilterManager.registerFactory(ENTITYROLE_METADATA_FILTER, EntityRoleMetadataFilterFactory); - SAMLConfig::getConfig().MetadataFilterManager.registerFactory(ENTITYATTR_METADATA_FILTER, EntityAttributesMetadataFilterFactory); - } static const XMLCh _MetadataFilter[] = UNICODE_LITERAL_14(M,e,t,a,d,a,t,a,F,i,l,t,e,r); -- 2.1.4