[cpp-sp] 08/34: Merge branch 'upstream' into debian
Scott Cantor
cantor.2 at osu.edu
Thu Dec 20 19:43:14 EST 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to annotated tag debian/2.3+dfsg-1
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=adcb97428d45b0782af2d88552c78ce86fc17d30
commit adcb97428d45b0782af2d88552c78ce86fc17d30
Merge: eea70e5 2b8daf0
Author: Russ Allbery <rra at debian.org>
AuthorDate: Tue Nov 10 15:06:21 2009 -0800
Merge branch 'upstream' into debian
Conflicts:
shibsp/paths.h
Makefile.in | 2 +
Portfile | 2 +-
adfs/Makefile.am | 50 +-
adfs/Makefile.in | 2 +
adfs/adfs.cpp | 70 +-
adfs/adfs.rc | 10 +-
adfs/resource.h | 30 +-
apache/Makefile.in | 2 +
apache/mod_apache.cpp | 3 +
apache/mod_shib20.vcproj | 16 +-
apache/mod_shib22.vcproj | 12 +-
apache/mod_shib_13.rc | 10 +-
apache/mod_shib_20.rc | 10 +-
apache/mod_shib_22.rc | 10 +-
config.guess | 614 ++--
config.h.in | 3 +
config.sub | 185 +-
config_win32.h | 6 +-
configs/Makefile.am | 3 +-
configs/Makefile.in | 3 +
configs/accessError.html | 8 +-
configs/apache.config.in | 21 +-
configs/apache2.config.in | 21 +-
configs/apache22.config.in | 21 +-
configs/globalLogout.html | 19 +-
configs/keygen.bat | 196 +-
configs/keygen.sh | 5 +-
configs/localLogout.html | 2 +-
configs/metadataError.html | 2 +-
configs/{localLogout.html => partialLogout.html} | 14 +-
configs/sessionError.html | 6 +-
configs/shibboleth2.xml | 34 +-
configs/shibd-debian.in | 3 +
configs/shibd-redhat.in | 15 +-
configs/shibd-suse.in | 3 +
configs/sslError.html | 9 +-
configure | 293 +-
configure.ac | 66 +-
doc/CREDITS.txt | 0
doc/Makefile.in | 2 +
doc/README.txt | 2 +-
doc/RELEASE.txt | 4 +-
fastcgi/Makefile.am | 60 +-
fastcgi/Makefile.in | 2 +
fastcgi/resource.h | 30 +-
fastcgi/shibauthorizer.cpp | 854 ++---
fastcgi/shibauthorizer.rc | 10 +-
fastcgi/shibresponder.cpp | 798 ++---
fastcgi/shibresponder.rc | 10 +-
isapi_shib/isapi_shib.cpp | 45 +-
isapi_shib/isapi_shib.cpp.mine | 993 ------
isapi_shib/isapi_shib.cpp.r3059 | 950 ------
isapi_shib/isapi_shib.cpp.r3097 | 1008 ------
isapi_shib/isapi_shib.rc | 10 +-
ltmain.sh | 1402 +++++---
memcache-store/Makefile.am | 40 +-
memcache-store/Makefile.in | 2 +
memcache-store/memcache-store.cpp | 1578 ++++-----
memcache-store/memcache-store.rc | 10 +-
memcache-store/resource.h | 28 +-
nsapi_shib/Makefile.in | 2 +
nsapi_shib/nsapi_shib.cpp | 14 +-
nsapi_shib/nsapi_shib.rc | 10 +-
odbc-store/Makefile.in | 2 +
odbc-store/odbc-store.cpp | 5 +-
odbc-store/odbc-store.rc | 10 +-
odbc-store/resource.h | 28 +-
pkginfo | 2 +-
postinstall | 1 +
schemas/Makefile.am | 2 +-
schemas/Makefile.in | 2 +
schemas/shibboleth-2.0-afp.xsd | 26 +-
schemas/shibboleth-2.0-attribute-map.xsd | 82 +-
schemas/shibboleth-2.0-native-sp-config.xsd | 52 +-
selinux/Makefile.am | 2 +-
selinux/Makefile.in | 2 +
shibboleth.spec | 68 +-
shibboleth.spec.in | 66 +-
shibd/Makefile.am | 2 +-
shibd/Makefile.in | 2 +
shibd/shibd.cpp | 806 ++---
shibd/shibd.rc | 10 +-
shibd/shibd_win32.cpp | 1058 +++---
shibsp/AbstractSPRequest.cpp | 31 +-
shibsp/AbstractSPRequest.h | 30 +-
shibsp/AccessControl.h | 4 +-
shibsp/Application.cpp | 13 +-
shibsp/Application.h | 33 +-
shibsp/Makefile.am | 10 +-
shibsp/Makefile.in | 108 +-
shibsp/RequestMapper.h | 11 +-
shibsp/SPConfig.cpp | 68 +-
shibsp/SPConfig.h | 34 +-
shibsp/SPRequest.h | 15 +-
shibsp/ServiceProvider.cpp | 41 +-
shibsp/ServiceProvider.h | 21 +-
shibsp/SessionCache.h | 37 +-
shibsp/SessionCacheEx.h | 6 +-
shibsp/TransactionLog.h | 25 +-
shibsp/attribute/Attribute.cpp | 170 +-
shibsp/attribute/Attribute.h | 67 +-
shibsp/attribute/AttributeDecoder.h | 24 +-
shibsp/attribute/DOMAttributeDecoder.cpp | 452 +--
shibsp/attribute/ExtensibleAttribute.cpp | 64 +
shibsp/attribute/ExtensibleAttribute.h | 58 +-
shibsp/attribute/KeyInfoAttributeDecoder.cpp | 326 +-
shibsp/attribute/NameIDAttribute.cpp | 153 +
shibsp/attribute/NameIDAttribute.h | 115 +-
shibsp/attribute/NameIDAttributeDecoder.cpp | 468 +--
shibsp/attribute/ScopedAttribute.cpp | 113 +
shibsp/attribute/ScopedAttribute.h | 77 +-
shibsp/attribute/ScopedAttributeDecoder.cpp | 24 +-
shibsp/attribute/SimpleAttribute.cpp | 69 +
shibsp/attribute/SimpleAttribute.h | 32 +-
shibsp/attribute/StringAttributeDecoder.cpp | 296 +-
shibsp/attribute/XMLAttribute.cpp | 122 +
shibsp/attribute/XMLAttribute.h | 53 +-
shibsp/attribute/XMLAttributeDecoder.cpp | 276 +-
shibsp/attribute/filtering/AttributeFilter.h | 12 +-
shibsp/attribute/filtering/BasicFilteringContext.h | 46 +-
shibsp/attribute/filtering/FilterPolicyContext.h | 15 +-
shibsp/attribute/filtering/FilteringContext.h | 15 +-
shibsp/attribute/filtering/MatchFunctor.h | 6 +-
.../attribute/filtering/impl/AndMatchFunctor.cpp | 3 +-
.../attribute/filtering/impl/AnyMatchFunctor.cpp | 3 +-
.../attribute/filtering/impl/AttributeFilter.cpp | 10 +-
.../impl/AttributeIssuerInEntityGroupFunctor.cpp | 5 +-
.../filtering/impl/AttributeIssuerRegexFunctor.cpp | 3 +-
.../impl/AttributeIssuerStringFunctor.cpp | 3 +-
.../AttributeRequesterInEntityGroupFunctor.cpp | 9 +-
.../impl/AttributeRequesterRegexFunctor.cpp | 3 +-
.../impl/AttributeRequesterStringFunctor.cpp | 3 +-
.../AttributeScopeMatchesShibMDScopeFunctor.cpp | 4 +-
.../filtering/impl/AttributeScopeRegexFunctor.cpp | 3 +-
.../filtering/impl/AttributeScopeStringFunctor.cpp | 3 +-
.../filtering/impl/AttributeValueRegexFunctor.cpp | 3 +-
.../filtering/impl/AttributeValueStringFunctor.cpp | 3 +-
.../impl/AuthenticationMethodRegexFunctor.cpp | 3 +-
.../impl/AuthenticationMethodStringFunctor.cpp | 3 +-
.../filtering/impl/BasicFilteringContext.cpp | 98 +
shibsp/attribute/filtering/impl/MatchFunctor.cpp | 24 +-
.../attribute/filtering/impl/NotMatchFunctor.cpp | 3 +-
.../impl/NumberOfAttributeValuesFunctor.cpp | 3 +-
shibsp/attribute/filtering/impl/OrMatchFunctor.cpp | 3 +-
.../filtering/impl/XMLAttributeFilter.cpp | 5 +-
shibsp/attribute/resolver/AttributeExtractor.h | 18 +-
shibsp/attribute/resolver/AttributeResolver.h | 18 +-
shibsp/attribute/resolver/ResolutionContext.h | 12 +-
.../resolver/impl/ChainingAttributeExtractor.cpp | 8 +
.../resolver/impl/ChainingAttributeResolver.cpp | 17 +
.../resolver/impl/DelegationAttributeExtractor.cpp | 49 +-
.../impl/KeyDescriptorAttributeExtractor.cpp | 12 +-
.../resolver/impl/QueryAttributeResolver.cpp | 5 +-
.../impl/SimpleAggregationAttributeResolver.cpp | 7 +-
.../resolver/impl/XMLAttributeExtractor.cpp | 7 +
shibsp/binding/ArtifactResolver.h | 6 +-
shibsp/binding/SOAPClient.h | 10 +-
shibsp/binding/impl/ArtifactResolver.cpp | 13 +-
shibsp/binding/impl/SOAPClient.cpp | 13 +-
shibsp/exceptions.h | 10 +-
shibsp/handler/AbstractHandler.h | 27 +-
shibsp/handler/AssertionConsumerService.h | 39 +-
shibsp/handler/Handler.h | 19 +-
shibsp/handler/LogoutHandler.h | 23 +-
shibsp/handler/RemotedHandler.h | 10 +-
shibsp/handler/SessionInitiator.h | 14 +-
shibsp/handler/impl/AbstractHandler.cpp | 1330 ++++----
shibsp/handler/impl/AssertionConsumerService.cpp | 15 +-
shibsp/handler/impl/AssertionLookup.cpp | 13 +-
shibsp/handler/impl/LocalLogoutInitiator.cpp | 14 +-
shibsp/handler/impl/LogoutHandler.cpp | 58 +-
shibsp/handler/impl/MetadataGenerator.cpp | 20 +-
shibsp/handler/impl/RemotedHandler.cpp | 5 +
shibsp/handler/impl/SAML1Consumer.cpp | 6 +-
shibsp/handler/impl/SAML2ArtifactResolution.cpp | 8 +-
shibsp/handler/impl/SAML2Consumer.cpp | 6 +-
shibsp/handler/impl/SAML2Logout.cpp | 14 +-
shibsp/handler/impl/SAML2LogoutInitiator.cpp | 42 +-
shibsp/handler/impl/SAML2NameIDMgmt.cpp | 5 +-
shibsp/handler/impl/SAML2SessionInitiator.cpp | 58 +-
shibsp/handler/impl/SAMLDSSessionInitiator.cpp | 14 +-
shibsp/handler/impl/SessionInitiator.cpp | 21 +-
shibsp/handler/impl/Shib1SessionInitiator.cpp | 19 +-
shibsp/handler/impl/StatusHandler.cpp | 4 +
shibsp/handler/impl/WAYFSessionInitiator.cpp | 34 +-
shibsp/impl/ChainingAccessControl.cpp | 282 +-
shibsp/impl/StorageServiceSessionCache.cpp | 36 +-
shibsp/impl/XMLAccessControl.cpp | 888 ++---
shibsp/impl/XMLRequestMapper.cpp | 13 +-
shibsp/impl/XMLServiceProvider.cpp | 3386 ++++++++++----------
shibsp/lite/CommonDomainCookie.cpp | 9 +
shibsp/lite/CommonDomainCookie.h | 8 +-
shibsp/lite/SAMLConstants.h | 3 +-
shibsp/metadata/DynamicMetadataProvider.cpp | 14 +-
shibsp/metadata/MetadataExt.h | 15 +-
shibsp/metadata/MetadataExtImpl.cpp | 3 +-
shibsp/metadata/MetadataExtSchemaValidators.cpp | 5 +-
shibsp/metadata/MetadataProviderCriteria.cpp | 55 +
shibsp/metadata/MetadataProviderCriteria.h | 32 +-
shibsp/paths.h | 106 +-
shibsp/paths.h.in | 106 +-
shibsp/remoting/ListenerService.h | 15 +-
shibsp/remoting/ddf.h | 12 +-
shibsp/remoting/impl/ListenerService.cpp | 25 +
shibsp/remoting/impl/ddf.cpp | 22 +-
shibsp/resource.h | 30 +-
shibsp/security/PKIXTrustEngine.cpp | 1 +
shibsp/security/SecurityPolicy.cpp | 9 +
shibsp/security/SecurityPolicy.h | 6 +-
shibsp/shibsp-lite.vcproj | 24 +-
shibsp/shibsp.rc | 26 +-
shibsp/shibsp.vcproj | 32 +-
shibsp/util/CGIParser.cpp | 1 +
shibsp/util/CGIParser.h | 8 +-
shibsp/util/DOMPropertySet.cpp | 33 +-
shibsp/util/DOMPropertySet.h | 20 +-
shibsp/util/PropertySet.h | 8 +-
shibsp/util/SPConstants.cpp | 232 +-
shibsp/util/SPConstants.h | 8 +-
shibsp/util/TemplateParameters.cpp | 18 +-
shibsp/util/TemplateParameters.h | 18 +-
shibsp/version.h | 4 +-
util/Makefile.in | 2 +
util/mdquery.cpp | 322 +-
util/resolvertest.cpp | 7 +-
225 files changed, 11342 insertions(+), 12138 deletions(-)
diff --cc shibsp/paths.h
index 6ad2036,2f9ac99..c319ac6
--- a/shibsp/paths.h
+++ b/shibsp/paths.h
@@@ -1,53 -1,53 +1,53 @@@
- /*
- * Copyright 2001-2009 Internet2
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
- /**
- * @file shibsp/paths.h
- *
- * Default configuration paths.
- */
-
- #ifndef __shibsp_paths_h__
- #define __shibsp_paths_h__
-
- /** Default schema catalogs. */
- #define SHIBSP_SCHEMAS "/usr/share/xml/xmltooling/catalog.xml:/usr/share/xml/opensaml/saml20-catalog.xml:/usr/share/xml/opensaml/saml11-catalog.xml:/usr/share/xml/shibboleth/catalog.xml"
-
- /** Default name of SP configuration file. */
- #define SHIBSP_CONFIG "shibboleth2.xml"
-
- /** Default name of SP console tool logging file. */
- #define SHIBSP_LOGGING "console.logger"
-
- /** Default prefix for installation (used to resolve relative paths). */
- #define SHIBSP_PREFIX "/usr"
-
- /** Library directory for installation (used to resolve relative paths). */
- #define SHIBSP_LIBDIR "/usr/lib"
-
- /** Log directory for installation (used to resolve relative paths). */
- #define SHIBSP_LOGDIR "/var/log/shibboleth"
-
- /** Configuration directory for installation (used to resolve relative paths). */
- #define SHIBSP_CFGDIR "/etc/shibboleth"
-
- /** Runtime state directory for installation (used to resolve relative paths). */
- #define SHIBSP_RUNDIR "/var/run/shibboleth"
-
- /** XML directory for installation (used to resolve relative paths). */
- #define SHIBSP_XMLDIR "/usr/share/xml/shibboleth"
-
- #endif /* __shibsp_paths_h__ */
+ /*
+ * Copyright 2001-2009 Internet2
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ /**
+ * @file shibsp/paths.h
+ *
+ * Default configuration paths.
+ */
+
+ #ifndef __shibsp_paths_h__
+ #define __shibsp_paths_h__
+
+ /** Default schema catalogs. */
-#define SHIBSP_SCHEMAS "/opt/shibboleth-sp/share/xml/xmltooling/catalog.xml:/opt/shibboleth-sp/share/xml/opensaml/saml20-catalog.xml:/opt/shibboleth-sp/share/xml/opensaml/saml11-catalog.xml:/opt/shibboleth-sp/share/xml/shibboleth/catalog.xml"
++#define SHIBSP_SCHEMAS "/usr/share/xml/xmltooling/catalog.xml:/usr/share/xml/opensaml/saml20-catalog.xml:/usr/share/xml/opensaml/saml11-catalog.xml:/usr/share/xml/shibboleth/catalog.xml"
+
+ /** Default name of SP configuration file. */
+ #define SHIBSP_CONFIG "shibboleth2.xml"
+
+ /** Default name of SP console tool logging file. */
+ #define SHIBSP_LOGGING "console.logger"
+
+ /** Default prefix for installation (used to resolve relative paths). */
-#define SHIBSP_PREFIX "/opt/shibboleth-sp"
++#define SHIBSP_PREFIX "/usr"
+
+ /** Library directory for installation (used to resolve relative paths). */
-#define SHIBSP_LIBDIR "/opt/shibboleth-sp/lib"
++#define SHIBSP_LIBDIR "/usr/lib"
+
+ /** Log directory for installation (used to resolve relative paths). */
-#define SHIBSP_LOGDIR "/opt/shibboleth-sp/var/log"
++#define SHIBSP_LOGDIR "/var/log/shibboleth"
+
+ /** Configuration directory for installation (used to resolve relative paths). */
-#define SHIBSP_CFGDIR "/opt/shibboleth-sp/etc"
++#define SHIBSP_CFGDIR "/etc/shibboleth"
+
+ /** Runtime state directory for installation (used to resolve relative paths). */
-#define SHIBSP_RUNDIR "/opt/shibboleth-sp/var/run"
++#define SHIBSP_RUNDIR "/var/run/shibboleth"
+
+ /** XML directory for installation (used to resolve relative paths). */
-#define SHIBSP_XMLDIR "/opt/shibboleth-sp/share/xml"
++#define SHIBSP_XMLDIR "/usr/share/xml/shibboleth"
+
+ #endif /* __shibsp_paths_h__ */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list