From 83dd1610727f4b4f2c67e3864763b2a09a296989 Mon Sep 17 00:00:00 2001 From: scantor Date: Wed, 15 Jun 2011 20:40:59 +0000 Subject: [PATCH] Change license header. git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3460 cb58f699-b61c-0410-a6fe-9272a202ed29 --- adfs/adfs.cpp | 26 ++- adfs/resource.h | 20 ++ apache/mod_apache.cpp | 26 ++- apache/mod_shib_13.cpp | 28 +-- apache/mod_shib_20.cpp | 28 +-- apache/mod_shib_22.cpp | 28 +-- apache/resource.h | 20 ++ config_win32.h | 20 ++ fastcgi/resource.h | 20 ++ fastcgi/shibauthorizer.cpp | 26 ++- fastcgi/shibresponder.cpp | 26 ++- isapi_shib/directive_class.h | 233 --------------------- isapi_shib/directives.h | 45 ---- isapi_shib/isapi_shib.cpp | 26 ++- isapi_shib/resource.h | 20 ++ memcache-store/memcache-store.cpp | 28 +-- memcache-store/resource.h | 20 ++ nsapi_shib/nsapi_shib.cpp | 26 ++- nsapi_shib/resource.h | 20 ++ odbc-store/odbc-store.cpp | 27 +-- odbc-store/resource.h | 20 ++ plugins/GSSAPIAttributeExtractor.cpp | 26 ++- plugins/internal.h | 28 +-- plugins/plugins.cpp | 26 ++- plugins/resource.h | 20 ++ shibd/resource.h | 20 ++ shibd/shibd.cpp | 26 ++- shibd/shibd_win32.cpp | 28 +-- shibsp/AbstractSPRequest.cpp | 26 ++- shibsp/AbstractSPRequest.h | 28 +-- shibsp/AccessControl.h | 26 ++- shibsp/Application.cpp | 26 ++- shibsp/Application.h | 26 ++- shibsp/GSSRequest.h | 26 ++- shibsp/RequestMapper.h | 28 +-- shibsp/SPConfig.cpp | 27 +-- shibsp/SPConfig.h | 26 ++- shibsp/SPRequest.h | 26 ++- shibsp/ServiceProvider.cpp | 26 ++- shibsp/ServiceProvider.h | 28 +-- shibsp/SessionCache.h | 26 ++- shibsp/SessionCacheEx.h | 28 +-- shibsp/TransactionLog.h | 28 +-- shibsp/attribute/Attribute.cpp | 26 ++- shibsp/attribute/Attribute.h | 26 ++- shibsp/attribute/AttributeDecoder.h | 26 ++- shibsp/attribute/Base64AttributeDecoder.cpp | 26 ++- shibsp/attribute/BinaryAttribute.cpp | 26 ++- shibsp/attribute/BinaryAttribute.h | 28 +-- shibsp/attribute/DOMAttributeDecoder.cpp | 26 ++- shibsp/attribute/ExtensibleAttribute.cpp | 26 ++- shibsp/attribute/ExtensibleAttribute.h | 26 ++- shibsp/attribute/KeyInfoAttributeDecoder.cpp | 26 ++- shibsp/attribute/NameIDAttribute.cpp | 26 ++- shibsp/attribute/NameIDAttribute.h | 28 +-- shibsp/attribute/NameIDAttributeDecoder.cpp | 26 ++- .../attribute/NameIDFromScopedAttributeDecoder.cpp | 26 ++- shibsp/attribute/ScopedAttribute.cpp | 26 ++- shibsp/attribute/ScopedAttribute.h | 28 +-- shibsp/attribute/ScopedAttributeDecoder.cpp | 26 ++- shibsp/attribute/SimpleAttribute.cpp | 26 ++- shibsp/attribute/SimpleAttribute.h | 28 +-- shibsp/attribute/StringAttributeDecoder.cpp | 26 ++- shibsp/attribute/XMLAttribute.cpp | 26 ++- shibsp/attribute/XMLAttribute.h | 26 ++- shibsp/attribute/XMLAttributeDecoder.cpp | 26 ++- shibsp/attribute/filtering/AttributeFilter.h | 28 +-- shibsp/attribute/filtering/BasicFilteringContext.h | 28 +-- shibsp/attribute/filtering/FilterPolicyContext.h | 28 +-- shibsp/attribute/filtering/FilteringContext.h | 28 +-- shibsp/attribute/filtering/MatchFunctor.h | 28 +-- .../attribute/filtering/impl/AndMatchFunctor.cpp | 28 +-- .../attribute/filtering/impl/AnyMatchFunctor.cpp | 28 +-- .../attribute/filtering/impl/AttributeFilter.cpp | 28 +-- .../impl/AttributeIssuerInEntityGroupFunctor.cpp | 28 +-- .../filtering/impl/AttributeIssuerRegexFunctor.cpp | 28 +-- .../impl/AttributeIssuerStringFunctor.cpp | 28 +-- .../AttributeRequesterInEntityGroupFunctor.cpp | 28 +-- .../impl/AttributeRequesterRegexFunctor.cpp | 28 +-- .../impl/AttributeRequesterStringFunctor.cpp | 28 +-- .../AttributeScopeMatchesShibMDScopeFunctor.cpp | 28 +-- .../filtering/impl/AttributeScopeRegexFunctor.cpp | 28 +-- .../filtering/impl/AttributeScopeStringFunctor.cpp | 28 +-- .../filtering/impl/AttributeValueRegexFunctor.cpp | 28 +-- .../filtering/impl/AttributeValueStringFunctor.cpp | 28 +-- .../impl/AuthenticationMethodRegexFunctor.cpp | 28 +-- .../impl/AuthenticationMethodStringFunctor.cpp | 28 +-- .../filtering/impl/BasicFilteringContext.cpp | 28 +-- .../filtering/impl/ChainingAttributeFilter.cpp | 28 +-- .../filtering/impl/DummyAttributeFilter.cpp | 32 +-- shibsp/attribute/filtering/impl/MatchFunctor.cpp | 28 +-- .../impl/NameIDQualifierStringFunctor.cpp | 32 +-- .../attribute/filtering/impl/NotMatchFunctor.cpp | 28 +-- .../impl/NumberOfAttributeValuesFunctor.cpp | 28 +-- shibsp/attribute/filtering/impl/OrMatchFunctor.cpp | 28 +-- .../filtering/impl/XMLAttributeFilter.cpp | 26 ++- shibsp/attribute/resolver/AttributeExtractor.h | 26 ++- shibsp/attribute/resolver/AttributeResolver.h | 26 ++- shibsp/attribute/resolver/ResolutionContext.h | 28 +-- .../resolver/impl/ChainingAttributeExtractor.cpp | 26 ++- .../resolver/impl/ChainingAttributeResolver.cpp | 26 ++- .../resolver/impl/DelegationAttributeExtractor.cpp | 26 ++- .../impl/KeyDescriptorAttributeExtractor.cpp | 26 ++- .../resolver/impl/QueryAttributeResolver.cpp | 26 ++- .../impl/SimpleAggregationAttributeResolver.cpp | 26 ++- .../resolver/impl/XMLAttributeExtractor.cpp | 26 ++- shibsp/base.h | 26 ++- shibsp/binding/ArtifactResolver.h | 28 +-- shibsp/binding/ProtocolProvider.h | 32 +-- shibsp/binding/SOAPClient.h | 28 +-- shibsp/binding/impl/ArtifactResolver.cpp | 28 +-- shibsp/binding/impl/SOAPClient.cpp | 28 +-- shibsp/binding/impl/XMLProtocolProvider.cpp | 32 +-- shibsp/config_pub_win32.h | 20 ++ shibsp/exceptions.h | 28 +-- shibsp/handler/AbstractHandler.h | 28 +-- shibsp/handler/AssertionConsumerService.h | 28 +-- shibsp/handler/Handler.h | 28 +-- shibsp/handler/LogoutHandler.h | 28 +-- shibsp/handler/LogoutInitiator.h | 28 +-- shibsp/handler/RemotedHandler.h | 28 +-- shibsp/handler/SessionInitiator.h | 28 +-- shibsp/handler/impl/AbstractHandler.cpp | 26 ++- shibsp/handler/impl/AssertionConsumerService.cpp | 26 ++- shibsp/handler/impl/AssertionLookup.cpp | 26 ++- shibsp/handler/impl/ChainingLogoutInitiator.cpp | 28 +-- shibsp/handler/impl/ChainingSessionInitiator.cpp | 28 +-- shibsp/handler/impl/CookieSessionInitiator.cpp | 28 +-- shibsp/handler/impl/DiscoveryFeed.cpp | 26 ++- shibsp/handler/impl/FormSessionInitiator.cpp | 28 +-- shibsp/handler/impl/LocalLogoutInitiator.cpp | 28 +-- shibsp/handler/impl/LogoutHandler.cpp | 26 ++- shibsp/handler/impl/LogoutInitiator.cpp | 28 +-- shibsp/handler/impl/MetadataGenerator.cpp | 26 ++- shibsp/handler/impl/RemotedHandler.cpp | 28 +-- shibsp/handler/impl/SAML1Consumer.cpp | 26 ++- shibsp/handler/impl/SAML2ArtifactResolution.cpp | 28 +-- shibsp/handler/impl/SAML2Consumer.cpp | 26 ++- shibsp/handler/impl/SAML2Logout.cpp | 26 ++- shibsp/handler/impl/SAML2LogoutInitiator.cpp | 26 ++- shibsp/handler/impl/SAML2NameIDMgmt.cpp | 26 ++- shibsp/handler/impl/SAML2SessionInitiator.cpp | 26 ++- shibsp/handler/impl/SAMLDSSessionInitiator.cpp | 26 ++- shibsp/handler/impl/SessionHandler.cpp | 26 ++- shibsp/handler/impl/SessionInitiator.cpp | 28 +-- shibsp/handler/impl/Shib1SessionInitiator.cpp | 26 ++- shibsp/handler/impl/StatusHandler.cpp | 27 +-- shibsp/handler/impl/TransformSessionInitiator.cpp | 28 +-- shibsp/handler/impl/WAYFSessionInitiator.cpp | 28 +-- shibsp/impl/ChainingAccessControl.cpp | 26 ++- shibsp/impl/StorageServiceSessionCache.cpp | 26 ++- shibsp/impl/XMLAccessControl.cpp | 26 ++- shibsp/impl/XMLRequestMapper.cpp | 26 ++- shibsp/impl/XMLSecurityPolicyProvider.cpp | 32 +-- shibsp/impl/XMLServiceProvider.cpp | 27 +-- shibsp/internal.h | 28 +-- shibsp/lite/CommonDomainCookie.cpp | 26 ++- shibsp/lite/CommonDomainCookie.h | 28 +-- shibsp/lite/SAMLConstants.cpp | 26 ++- shibsp/lite/SAMLConstants.h | 26 ++- shibsp/metadata/DynamicMetadataProvider.cpp | 26 ++- shibsp/metadata/MetadataExt.h | 28 +-- shibsp/metadata/MetadataExtImpl.cpp | 28 +-- shibsp/metadata/MetadataExtSchemaValidators.cpp | 28 +-- shibsp/metadata/MetadataProviderCriteria.cpp | 26 ++- shibsp/metadata/MetadataProviderCriteria.h | 26 ++- shibsp/paths.h.in | 28 +-- shibsp/remoting/ListenerService.h | 26 ++- shibsp/remoting/ddf.h | 26 ++- shibsp/remoting/impl/ListenerService.cpp | 26 ++- shibsp/remoting/impl/SocketListener.cpp | 26 ++- shibsp/remoting/impl/SocketListener.h | 26 ++- shibsp/remoting/impl/TCPListener.cpp | 26 ++- shibsp/remoting/impl/UnixListener.cpp | 28 +-- shibsp/remoting/impl/ddf.cpp | 26 ++- shibsp/resource.h | 20 ++ shibsp/security/PKIXTrustEngine.cpp | 28 +-- shibsp/security/PKIXTrustEngine.h | 28 +-- shibsp/security/SecurityPolicy.cpp | 26 ++- shibsp/security/SecurityPolicy.h | 26 ++- shibsp/security/SecurityPolicyProvider.h | 32 +-- shibsp/util/CGIParser.cpp | 28 +-- shibsp/util/CGIParser.h | 28 +-- shibsp/util/DOMPropertySet.cpp | 28 +-- shibsp/util/DOMPropertySet.h | 28 +-- shibsp/util/PropertySet.h | 28 +-- shibsp/util/SPConstants.cpp | 28 +-- shibsp/util/SPConstants.h | 28 +-- shibsp/util/TemplateParameters.cpp | 28 +-- shibsp/util/TemplateParameters.h | 28 +-- shibsp/version.cpp | 33 +-- shibsp/version.h | 27 +-- util/mdquery.cpp | 28 +-- util/resolvertest.cpp | 28 +-- 194 files changed, 3047 insertions(+), 2371 deletions(-) delete mode 100644 isapi_shib/directive_class.h delete mode 100644 isapi_shib/directives.h diff --git a/adfs/adfs.cpp b/adfs/adfs.cpp index 156cdb1..5d89ecb 100644 --- a/adfs/adfs.cpp +++ b/adfs/adfs.cpp @@ -1,17 +1,21 @@ -/* - * Copyright 2001-2010 Internet2 +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. * - * 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 + * UCAID licenses this file to you 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 + * 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. + * 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. */ /** diff --git a/adfs/resource.h b/adfs/resource.h index 3ba1cce..213fc9a 100644 --- a/adfs/resource.h +++ b/adfs/resource.h @@ -1,3 +1,23 @@ +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + * + * UCAID licenses this file to you 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. + */ + //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by adfs.rc diff --git a/apache/mod_apache.cpp b/apache/mod_apache.cpp index 2a1d464..baeb994 100644 --- a/apache/mod_apache.cpp +++ b/apache/mod_apache.cpp @@ -1,17 +1,21 @@ -/* - * Copyright 2001-2011 Internet2 +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. * - * 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 + * UCAID licenses this file to you 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 + * 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. + * 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. */ /** diff --git a/apache/mod_shib_13.cpp b/apache/mod_shib_13.cpp index 0497568..3be0704 100644 --- a/apache/mod_shib_13.cpp +++ b/apache/mod_shib_13.cpp @@ -1,17 +1,21 @@ -/* - * 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 +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. * - * http://www.apache.org/licenses/LICENSE-2.0 + * UCAID licenses this file to you 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 * - * 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. + * 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. */ /* mod_shib_13.cpp -- a wrapper around the apache module code to diff --git a/apache/mod_shib_20.cpp b/apache/mod_shib_20.cpp index 47e8999..eae5824 100644 --- a/apache/mod_shib_20.cpp +++ b/apache/mod_shib_20.cpp @@ -1,17 +1,21 @@ -/* - * Copyright 2001-2010 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 +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. * - * http://www.apache.org/licenses/LICENSE-2.0 + * UCAID licenses this file to you 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 * - * 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. + * 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. */ /* mod_shib_20.cpp -- a wrapper around the apache module code to diff --git a/apache/mod_shib_22.cpp b/apache/mod_shib_22.cpp index 478351a..a25d402 100644 --- a/apache/mod_shib_22.cpp +++ b/apache/mod_shib_22.cpp @@ -1,17 +1,21 @@ -/* - * Copyright 2001-2010 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 +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. * - * http://www.apache.org/licenses/LICENSE-2.0 + * UCAID licenses this file to you 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 * - * 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. + * 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. */ /* mod_shib_22.cpp -- a wrapper around the apache module code to diff --git a/apache/resource.h b/apache/resource.h index 547174f..1c3c68d 100644 --- a/apache/resource.h +++ b/apache/resource.h @@ -1,3 +1,23 @@ +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + * + * UCAID licenses this file to you 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. + */ + //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by mod_shib_20.rc diff --git a/config_win32.h b/config_win32.h index 3533c9f..1d74f7a 100644 --- a/config_win32.h +++ b/config_win32.h @@ -1,3 +1,23 @@ +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + * + * UCAID licenses this file to you 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. + */ + /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ diff --git a/fastcgi/resource.h b/fastcgi/resource.h index f3772c1..7473232 100644 --- a/fastcgi/resource.h +++ b/fastcgi/resource.h @@ -1,3 +1,23 @@ +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + * + * UCAID licenses this file to you 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. + */ + //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by isapi_shib.rc diff --git a/fastcgi/shibauthorizer.cpp b/fastcgi/shibauthorizer.cpp index b905ab5..a0f5e7c 100644 --- a/fastcgi/shibauthorizer.cpp +++ b/fastcgi/shibauthorizer.cpp @@ -1,17 +1,21 @@ -/* - * Copyright 2001-2010 Internet2 +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. * - * 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 + * UCAID licenses this file to you 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 + * 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. + * 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. */ /* shibauthorizer.cpp - Shibboleth FastCGI Authorizer diff --git a/fastcgi/shibresponder.cpp b/fastcgi/shibresponder.cpp index 8cedbfd..2709187 100644 --- a/fastcgi/shibresponder.cpp +++ b/fastcgi/shibresponder.cpp @@ -1,17 +1,21 @@ -/* - * Copyright 2001-2010 Internet2 +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. * - * 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 + * UCAID licenses this file to you 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 + * 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. + * 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. */ /* shibresponder.cpp - Shibboleth FastCGI Responder/Handler diff --git a/isapi_shib/directive_class.h b/isapi_shib/directive_class.h deleted file mode 100644 index 88313f9..0000000 --- a/isapi_shib/directive_class.h +++ /dev/null @@ -1,233 +0,0 @@ -#include -#include -#define STR_PENDING_DELETION "(Pending Removal)" - -using namespace std; - -class Directive -{ -public: - - Directive() { - } - - ~Directive() { - } - - Directive(unsigned int which_directive) { - Init_Directive(which_directive); - } - - string name; - unsigned short type; - string value; - string new_value; - string defined_in; - string description; - string bound_val[NUM_BOUND_VAL]; - string MachineName; - unsigned int d_index; - - bool Set_Path(string new_path) - { - if (new_path.length() && new_path.at(0) == '/') { - path = new_path; - } else { - path = "/"; - path += new_path; - } - Get_Value(); - return true; - } - - bool WriteValue(string RegPath) - { - if (type == D_BOUND_INT || type == D_FREE_INT) { - return WriteRegInt(RegPath.c_str(), name.c_str(), new_value.c_str()); - } else { - return WriteRegString(RegPath.c_str(), name.c_str(), new_value.c_str()); - } - } - - void Directive::Init_Directive(unsigned int w) { - - if (w >= NUM_DIRECTIVES) { - return; - } - d_index = w; - name = directives[w].name; - type = directives[w].type; - value = directives[w].value; - defined_in = directives[w].defined_in; - description = directives[w].description; - for (int i=0;i