lasso/0001-Fix-license-boilerplates.patch

From 3a6b2fdee76b5f782094b6b268bfdf895263eda8 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Wed, 27 Nov 2013 14:04:51 -0500
Subject: [PATCH] Fix license boilerplates

Instad of referring to an old FSF address, point the reader to the FSF
website where the latest licenses and addresses are published.

Signed-off-by: Simo Sorce <simo@redhat.com>
---
 COPYING                                                         | 2 +-
 README                                                          | 2 +-
 bindings/bindings.py                                            | 3 +--
 bindings/java/lang.py                                           | 3 +--
 bindings/java/tests/BindingTests.java                           | 3 +--
 bindings/java/tests/LoginTest.java                              | 3 +--
 bindings/perl/ghashtable_handling.c                             | 3 +--
 bindings/perl/glist_handling.c                                  | 3 +--
 bindings/perl/gobject_handling.c                                | 3 +--
 bindings/perl/lang.py                                           | 3 +--
 bindings/php5/lang.py                                           | 3 +--
 bindings/php5/php_code.py                                       | 3 +--
 bindings/php5/tests/binding_tests.php                           | 3 +--
 bindings/php5/tests/profile_tests.php                           | 3 +--
 bindings/php5/wrapper_header.py                                 | 3 +--
 bindings/php5/wrapper_source.py                                 | 3 +--
 bindings/python/lang.py                                         | 3 +--
 bindings/python/tests/XmlTestRunner.py                          | 3 +--
 bindings/python/tests/binding_tests.py                          | 3 +--
 bindings/python/tests/idwsf1_tests.py                           | 3 +--
 bindings/python/tests/idwsf2_tests.py                           | 3 +--
 bindings/python/tests/profiles_tests.py                         | 3 +--
 bindings/python/tests/tests.py                                  | 3 +--
 bindings/utils.py                                               | 3 +--
 lasso/backward_comp.h                                           | 3 +--
 lasso/ctypes.h                                                  | 3 +--
 lasso/debug.h                                                   | 3 +--
 lasso/errors.c                                                  | 3 +--
 lasso/errors.c.in                                               | 3 +--
 lasso/errors.h                                                  | 3 +--
 lasso/export.h                                                  | 3 +--
 lasso/id-ff/defederation.c                                      | 3 +--
 lasso/id-ff/defederation.h                                      | 3 +--
 lasso/id-ff/federation.c                                        | 3 +--
 lasso/id-ff/federation.h                                        | 3 +--
 lasso/id-ff/identity.c                                          | 3 +--
 lasso/id-ff/identity.h                                          | 3 +--
 lasso/id-ff/identityprivate.h                                   | 3 +--
 lasso/id-ff/lecp.c                                              | 3 +--
 lasso/id-ff/lecp.h                                              | 3 +--
 lasso/id-ff/login.c                                             | 3 +--
 lasso/id-ff/login.h                                             | 3 +--
 lasso/id-ff/loginprivate.h                                      | 3 +--
 lasso/id-ff/logout.c                                            | 3 +--
 lasso/id-ff/logout.h                                            | 3 +--
 lasso/id-ff/logoutprivate.h                                     | 3 +--
 lasso/id-ff/name_identifier_mapping.c                           | 3 +--
 lasso/id-ff/name_identifier_mapping.h                           | 3 +--
 lasso/id-ff/name_registration.c                                 | 3 +--
 lasso/id-ff/name_registration.h                                 | 3 +--
 lasso/id-ff/profile.c                                           | 3 +--
 lasso/id-ff/profile.h                                           | 3 +--
 lasso/id-ff/profileprivate.h                                    | 3 +--
 lasso/id-ff/provider.c                                          | 3 +--
 lasso/id-ff/provider.h                                          | 3 +--
 lasso/id-ff/providerprivate.h                                   | 3 +--
 lasso/id-ff/server.c                                            | 3 +--
 lasso/id-ff/server.h                                            | 3 +--
 lasso/id-ff/serverprivate.h                                     | 3 +--
 lasso/id-ff/session.c                                           | 3 +--
 lasso/id-ff/session.h                                           | 3 +--
 lasso/id-ff/sessionprivate.h                                    | 3 +--
 lasso/id-wsf-2.0/data_service.c                                 | 3 +--
 lasso/id-wsf-2.0/data_service.h                                 | 3 +--
 lasso/id-wsf-2.0/discovery.c                                    | 3 +--
 lasso/id-wsf-2.0/discovery.h                                    | 3 +--
 lasso/id-wsf-2.0/id_wsf_2.h                                     | 3 +--
 lasso/id-wsf-2.0/identity.c                                     | 3 +--
 lasso/id-wsf-2.0/identity.h                                     | 3 +--
 lasso/id-wsf-2.0/idwsf2_helper.c                                | 3 +--
 lasso/id-wsf-2.0/idwsf2_helper.h                                | 3 +--
 lasso/id-wsf-2.0/private.h                                      | 3 +--
 lasso/id-wsf-2.0/profile.c                                      | 3 +--
 lasso/id-wsf-2.0/profile.h                                      | 3 +--
 lasso/id-wsf-2.0/saml2_login.c                                  | 3 +--
 lasso/id-wsf-2.0/saml2_login.h                                  | 3 +--
 lasso/id-wsf-2.0/server.c                                       | 3 +--
 lasso/id-wsf-2.0/server.h                                       | 3 +--
 lasso/id-wsf-2.0/serverprivate.h                                | 3 +--
 lasso/id-wsf-2.0/session.c                                      | 3 +--
 lasso/id-wsf-2.0/session.h                                      | 3 +--
 lasso/id-wsf-2.0/sessionprivate.h                               | 3 +--
 lasso/id-wsf-2.0/soap_binding.c                                 | 3 +--
 lasso/id-wsf-2.0/soap_binding.h                                 | 3 +--
 lasso/id-wsf/authentication.c                                   | 3 +--
 lasso/id-wsf/authentication.h                                   | 3 +--
 lasso/id-wsf/data_service.c                                     | 3 +--
 lasso/id-wsf/data_service.h                                     | 3 +--
 lasso/id-wsf/discovery.c                                        | 3 +--
 lasso/id-wsf/discovery.h                                        | 3 +--
 lasso/id-wsf/id_ff_extensions.c                                 | 3 +--
 lasso/id-wsf/id_ff_extensions.h                                 | 3 +--
 lasso/id-wsf/id_ff_extensions_private.h                         | 3 +--
 lasso/id-wsf/id_wsf.h                                           | 3 +--
 lasso/id-wsf/interaction_profile_service.c                      | 3 +--
 lasso/id-wsf/interaction_profile_service.h                      | 3 +--
 lasso/id-wsf/personal_profile_service.c                         | 3 +--
 lasso/id-wsf/personal_profile_service.h                         | 3 +--
 lasso/id-wsf/wsf_profile.c                                      | 3 +--
 lasso/id-wsf/wsf_profile.h                                      | 3 +--
 lasso/id-wsf/wsf_profile_private.h                              | 3 +--
 lasso/id-wsf/wsf_utils.c                                        | 3 +--
 lasso/id-wsf/wsf_utils.h                                        | 3 +--
 lasso/key.c                                                     | 3 +--
 lasso/key.h                                                     | 3 +--
 lasso/keyprivate.h                                              | 3 +--
 lasso/lasso.c                                                   | 3 +--
 lasso/lasso.h                                                   | 3 +--
 lasso/logging.c                                                 | 3 +--
 lasso/logging.h                                                 | 3 +--
 lasso/registry-private.h                                        | 3 +--
 lasso/registry.c                                                | 3 +--
 lasso/registry.h                                                | 3 +--
 lasso/saml-2.0/assertion_query.c                                | 3 +--
 lasso/saml-2.0/assertion_query.h                                | 3 +--
 lasso/saml-2.0/ecp.c                                            | 3 +--
 lasso/saml-2.0/ecp.h                                            | 3 +--
 lasso/saml-2.0/ecpprivate.h                                     | 3 +--
 lasso/saml-2.0/federation.c                                     | 3 +--
 lasso/saml-2.0/federationprivate.h                              | 3 +--
 lasso/saml-2.0/login.c                                          | 3 +--
 lasso/saml-2.0/loginprivate.h                                   | 3 +--
 lasso/saml-2.0/logout.c                                         | 3 +--
 lasso/saml-2.0/logoutprivate.h                                  | 3 +--
 lasso/saml-2.0/name_id_management.c                             | 3 +--
 lasso/saml-2.0/name_id_management.h                             | 3 +--
 lasso/saml-2.0/profile.c                                        | 3 +--
 lasso/saml-2.0/profile.h                                        | 3 +--
 lasso/saml-2.0/profileprivate.h                                 | 3 +--
 lasso/saml-2.0/provider.c                                       | 3 +--
 lasso/saml-2.0/provider.h                                       | 3 +--
 lasso/saml-2.0/providerprivate.h                                | 3 +--
 lasso/saml-2.0/saml2_helper.c                                   | 3 +--
 lasso/saml-2.0/saml2_helper.h                                   | 3 +--
 lasso/saml-2.0/server.c                                         | 3 +--
 lasso/saml-2.0/serverprivate.h                                  | 3 +--
 lasso/utils.c                                                   | 3 +--
 lasso/utils.h                                                   | 3 +--
 lasso/xml/disco_authenticate_requester.c                        | 3 +--
 lasso/xml/disco_authenticate_requester.h                        | 3 +--
 lasso/xml/disco_authenticate_session_context.c                  | 3 +--
 lasso/xml/disco_authenticate_session_context.h                  | 3 +--
 lasso/xml/disco_authorize_requester.c                           | 3 +--
 lasso/xml/disco_authorize_requester.h                           | 3 +--
 lasso/xml/disco_credentials.c                                   | 3 +--
 lasso/xml/disco_credentials.h                                   | 3 +--
 lasso/xml/disco_description.c                                   | 3 +--
 lasso/xml/disco_description.h                                   | 3 +--
 lasso/xml/disco_encrypt_resource_id.c                           | 3 +--
 lasso/xml/disco_encrypt_resource_id.h                           | 3 +--
 lasso/xml/disco_encrypted_resource_id.c                         | 3 +--
 lasso/xml/disco_encrypted_resource_id.h                         | 3 +--
 lasso/xml/disco_generate_bearer_token.c                         | 3 +--
 lasso/xml/disco_generate_bearer_token.h                         | 3 +--
 lasso/xml/disco_insert_entry.c                                  | 3 +--
 lasso/xml/disco_insert_entry.h                                  | 3 +--
 lasso/xml/disco_modify.c                                        | 3 +--
 lasso/xml/disco_modify.h                                        | 3 +--
 lasso/xml/disco_modify_response.c                               | 3 +--
 lasso/xml/disco_modify_response.h                               | 3 +--
 lasso/xml/disco_options.c                                       | 3 +--
 lasso/xml/disco_options.h                                       | 3 +--
 lasso/xml/disco_query.c                                         | 3 +--
 lasso/xml/disco_query.h                                         | 3 +--
 lasso/xml/disco_query_response.c                                | 3 +--
 lasso/xml/disco_query_response.h                                | 3 +--
 lasso/xml/disco_remove_entry.c                                  | 3 +--
 lasso/xml/disco_remove_entry.h                                  | 3 +--
 lasso/xml/disco_requested_service_type.c                        | 3 +--
 lasso/xml/disco_requested_service_type.h                        | 3 +--
 lasso/xml/disco_resource_id.c                                   | 3 +--
 lasso/xml/disco_resource_id.h                                   | 3 +--
 lasso/xml/disco_resource_offering.c                             | 3 +--
 lasso/xml/disco_resource_offering.h                             | 3 +--
 lasso/xml/disco_send_single_logout.c                            | 3 +--
 lasso/xml/disco_send_single_logout.h                            | 3 +--
 lasso/xml/disco_service_instance.c                              | 3 +--
 lasso/xml/disco_service_instance.h                              | 3 +--
 lasso/xml/dsig/ds_key_info.c                                    | 3 +--
 lasso/xml/dsig/ds_key_info.h                                    | 3 +--
 lasso/xml/dsig/ds_key_value.c                                   | 3 +--
 lasso/xml/dsig/ds_key_value.h                                   | 3 +--
 lasso/xml/dsig/ds_rsa_key_value.c                               | 3 +--
 lasso/xml/dsig/ds_rsa_key_value.h                               | 3 +--
 lasso/xml/dsig/ds_x509_data.c                                   | 3 +--
 lasso/xml/dsig/ds_x509_data.h                                   | 3 +--
 lasso/xml/dsig/strings.h                                        | 3 +--
 lasso/xml/dsig/xml_dsig.h                                       | 3 +--
 lasso/xml/dst_data.c                                            | 3 +--
 lasso/xml/dst_data.h                                            | 3 +--
 lasso/xml/dst_modification.c                                    | 3 +--
 lasso/xml/dst_modification.h                                    | 3 +--
 lasso/xml/dst_modify.c                                          | 3 +--
 lasso/xml/dst_modify.h                                          | 3 +--
 lasso/xml/dst_modify_response.c                                 | 3 +--
 lasso/xml/dst_modify_response.h                                 | 3 +--
 lasso/xml/dst_new_data.c                                        | 3 +--
 lasso/xml/dst_new_data.h                                        | 3 +--
 lasso/xml/dst_query.c                                           | 3 +--
 lasso/xml/dst_query.h                                           | 3 +--
 lasso/xml/dst_query_item.c                                      | 3 +--
 lasso/xml/dst_query_item.h                                      | 3 +--
 lasso/xml/dst_query_response.c                                  | 3 +--
 lasso/xml/dst_query_response.h                                  | 3 +--
 lasso/xml/id-wsf-2.0/disco_abstract.c                           | 3 +--
 lasso/xml/id-wsf-2.0/disco_abstract.h                           | 3 +--
 lasso/xml/id-wsf-2.0/disco_endpoint_context.c                   | 3 +--
 lasso/xml/id-wsf-2.0/disco_endpoint_context.h                   | 3 +--
 lasso/xml/id-wsf-2.0/disco_keys.c                               | 3 +--
 lasso/xml/id-wsf-2.0/disco_keys.h                               | 3 +--
 lasso/xml/id-wsf-2.0/disco_options.c                            | 3 +--
 lasso/xml/id-wsf-2.0/disco_options.h                            | 3 +--
 lasso/xml/id-wsf-2.0/disco_provider_id.c                        | 3 +--
 lasso/xml/id-wsf-2.0/disco_provider_id.h                        | 3 +--
 lasso/xml/id-wsf-2.0/disco_query.c                              | 3 +--
 lasso/xml/id-wsf-2.0/disco_query.h                              | 3 +--
 lasso/xml/id-wsf-2.0/disco_query_response.c                     | 3 +--
 lasso/xml/id-wsf-2.0/disco_query_response.h                     | 3 +--
 lasso/xml/id-wsf-2.0/disco_requested_service.c                  | 3 +--
 lasso/xml/id-wsf-2.0/disco_requested_service.h                  | 3 +--
 lasso/xml/id-wsf-2.0/disco_security_context.c                   | 3 +--
 lasso/xml/id-wsf-2.0/disco_security_context.h                   | 3 +--
 lasso/xml/id-wsf-2.0/disco_service_context.c                    | 3 +--
 lasso/xml/id-wsf-2.0/disco_service_context.h                    | 3 +--
 lasso/xml/id-wsf-2.0/disco_service_type.c                       | 3 +--
 lasso/xml/id-wsf-2.0/disco_service_type.h                       | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c             | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h             | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c    | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h    | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c          | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h          | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c           | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h           | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c  | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h  | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_delete.c                      | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_delete.h                      | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c             | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h             | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_query.c                       | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_query.h                       | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c              | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h              | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_register.c                    | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_register.h                    | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c           | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h           | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_replace.c                     | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_replace.h                     | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c            | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h            | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_metadata.c                       | 3 +--
 lasso/xml/id-wsf-2.0/disco_svc_metadata.h                       | 3 +--
 lasso/xml/id-wsf-2.0/dst_data_response_base.c                   | 3 +--
 lasso/xml/id-wsf-2.0/dst_data_response_base.h                   | 3 +--
 lasso/xml/id-wsf-2.0/dst_delete_item_base.c                     | 3 +--
 lasso/xml/id-wsf-2.0/dst_delete_item_base.h                     | 3 +--
 lasso/xml/id-wsf-2.0/dst_delete_response.c                      | 3 +--
 lasso/xml/id-wsf-2.0/dst_delete_response.h                      | 3 +--
 lasso/xml/id-wsf-2.0/dst_request.c                              | 3 +--
 lasso/xml/id-wsf-2.0/dst_request.h                              | 3 +--
 lasso/xml/id-wsf-2.0/dst_result_query_base.c                    | 3 +--
 lasso/xml/id-wsf-2.0/dst_result_query_base.h                    | 3 +--
 lasso/xml/id-wsf-2.0/dst_test_item_base.c                       | 3 +--
 lasso/xml/id-wsf-2.0/dst_test_item_base.h                       | 3 +--
 lasso/xml/id-wsf-2.0/dstref_app_data.c                          | 3 +--
 lasso/xml/id-wsf-2.0/dstref_app_data.h                          | 3 +--
 lasso/xml/id-wsf-2.0/dstref_create.c                            | 3 +--
 lasso/xml/id-wsf-2.0/dstref_create.h                            | 3 +--
 lasso/xml/id-wsf-2.0/dstref_create_item.c                       | 3 +--
 lasso/xml/id-wsf-2.0/dstref_create_item.h                       | 3 +--
 lasso/xml/id-wsf-2.0/dstref_create_response.c                   | 3 +--
 lasso/xml/id-wsf-2.0/dstref_create_response.h                   | 3 +--
 lasso/xml/id-wsf-2.0/dstref_data.c                              | 3 +--
 lasso/xml/id-wsf-2.0/dstref_data.h                              | 3 +--
 lasso/xml/id-wsf-2.0/dstref_data_response.c                     | 3 +--
 lasso/xml/id-wsf-2.0/dstref_data_response.h                     | 3 +--
 lasso/xml/id-wsf-2.0/dstref_delete.c                            | 3 +--
 lasso/xml/id-wsf-2.0/dstref_delete.h                            | 3 +--
 lasso/xml/id-wsf-2.0/dstref_delete_item.c                       | 3 +--
 lasso/xml/id-wsf-2.0/dstref_delete_item.h                       | 3 +--
 lasso/xml/id-wsf-2.0/dstref_delete_response.c                   | 3 +--
 lasso/xml/id-wsf-2.0/dstref_delete_response.h                   | 3 +--
 lasso/xml/id-wsf-2.0/dstref_item_data.c                         | 3 +--
 lasso/xml/id-wsf-2.0/dstref_item_data.h                         | 3 +--
 lasso/xml/id-wsf-2.0/dstref_modify.c                            | 3 +--
 lasso/xml/id-wsf-2.0/dstref_modify.h                            | 3 +--
 lasso/xml/id-wsf-2.0/dstref_modify_item.c                       | 3 +--
 lasso/xml/id-wsf-2.0/dstref_modify_item.h                       | 3 +--
 lasso/xml/id-wsf-2.0/dstref_modify_response.c                   | 3 +--
 lasso/xml/id-wsf-2.0/dstref_modify_response.h                   | 3 +--
 lasso/xml/id-wsf-2.0/dstref_query.c                             | 3 +--
 lasso/xml/id-wsf-2.0/dstref_query.h                             | 3 +--
 lasso/xml/id-wsf-2.0/dstref_query_item.c                        | 3 +--
 lasso/xml/id-wsf-2.0/dstref_query_item.h                        | 3 +--
 lasso/xml/id-wsf-2.0/dstref_query_response.c                    | 3 +--
 lasso/xml/id-wsf-2.0/dstref_query_response.h                    | 3 +--
 lasso/xml/id-wsf-2.0/dstref_result_query.c                      | 3 +--
 lasso/xml/id-wsf-2.0/dstref_result_query.h                      | 3 +--
 lasso/xml/id-wsf-2.0/dstref_test_item.c                         | 3 +--
 lasso/xml/id-wsf-2.0/dstref_test_item.h                         | 3 +--
 lasso/xml/id-wsf-2.0/idwsf2_strings.h                           | 3 +--
 lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c             | 3 +--
 lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h             | 3 +--
 lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c            | 3 +--
 lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h            | 3 +--
 lasso/xml/id-wsf-2.0/ims_mapping_input.c                        | 3 +--
 lasso/xml/id-wsf-2.0/ims_mapping_input.h                        | 3 +--
 lasso/xml/id-wsf-2.0/ims_mapping_output.c                       | 3 +--
 lasso/xml/id-wsf-2.0/ims_mapping_output.h                       | 3 +--
 lasso/xml/id-wsf-2.0/is_help.c                                  | 3 +--
 lasso/xml/id-wsf-2.0/is_help.h                                  | 3 +--
 lasso/xml/id-wsf-2.0/is_inquiry.c                               | 3 +--
 lasso/xml/id-wsf-2.0/is_inquiry.h                               | 3 +--
 lasso/xml/id-wsf-2.0/is_inquiry_element.c                       | 3 +--
 lasso/xml/id-wsf-2.0/is_inquiry_element.h                       | 3 +--
 lasso/xml/id-wsf-2.0/is_interaction_request.c                   | 3 +--
 lasso/xml/id-wsf-2.0/is_interaction_request.h                   | 3 +--
 lasso/xml/id-wsf-2.0/is_interaction_response.c                  | 3 +--
 lasso/xml/id-wsf-2.0/is_interaction_response.h                  | 3 +--
 lasso/xml/id-wsf-2.0/is_interaction_statement.c                 | 3 +--
 lasso/xml/id-wsf-2.0/is_interaction_statement.h                 | 3 +--
 lasso/xml/id-wsf-2.0/is_item.c                                  | 3 +--
 lasso/xml/id-wsf-2.0/is_item.h                                  | 3 +--
 lasso/xml/id-wsf-2.0/is_parameter.c                             | 3 +--
 lasso/xml/id-wsf-2.0/is_parameter.h                             | 3 +--
 lasso/xml/id-wsf-2.0/is_select.c                                | 3 +--
 lasso/xml/id-wsf-2.0/is_select.h                                | 3 +--
 lasso/xml/id-wsf-2.0/is_text.c                                  | 3 +--
 lasso/xml/id-wsf-2.0/is_text.h                                  | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_collection_request.c                | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_collection_request.h                | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_collection_response.c               | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_collection_response.h               | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_entity_request.c                    | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_entity_request.h                    | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_entity_response.c                   | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_entity_response.h                   | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c              | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h              | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c             | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h             | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c             | 3 +--
 lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h             | 3 +--
 lasso/xml/id-wsf-2.0/ps_get_object_info_request.c               | 3 +--
 lasso/xml/id-wsf-2.0/ps_get_object_info_request.h               | 3 +--
 lasso/xml/id-wsf-2.0/ps_get_object_info_response.c              | 3 +--
 lasso/xml/id-wsf-2.0/ps_get_object_info_response.h              | 3 +--
 lasso/xml/id-wsf-2.0/ps_item_data.c                             | 3 +--
 lasso/xml/id-wsf-2.0/ps_item_data.h                             | 3 +--
 lasso/xml/id-wsf-2.0/ps_list_members_request.c                  | 3 +--
 lasso/xml/id-wsf-2.0/ps_list_members_request.h                  | 3 +--
 lasso/xml/id-wsf-2.0/ps_list_members_response.c                 | 3 +--
 lasso/xml/id-wsf-2.0/ps_list_members_response.h                 | 3 +--
 lasso/xml/id-wsf-2.0/ps_notification.c                          | 3 +--
 lasso/xml/id-wsf-2.0/ps_notification.h                          | 3 +--
 lasso/xml/id-wsf-2.0/ps_notify.c                                | 3 +--
 lasso/xml/id-wsf-2.0/ps_notify.h                                | 3 +--
 lasso/xml/id-wsf-2.0/ps_object.c                                | 3 +--
 lasso/xml/id-wsf-2.0/ps_object.h                                | 3 +--
 lasso/xml/id-wsf-2.0/ps_query_objects_request.c                 | 3 +--
 lasso/xml/id-wsf-2.0/ps_query_objects_request.h                 | 3 +--
 lasso/xml/id-wsf-2.0/ps_query_objects_response.c                | 3 +--
 lasso/xml/id-wsf-2.0/ps_query_objects_response.h                | 3 +--
 lasso/xml/id-wsf-2.0/ps_remove_collection_request.c             | 3 +--
 lasso/xml/id-wsf-2.0/ps_remove_collection_request.h             | 3 +--
 lasso/xml/id-wsf-2.0/ps_remove_entity_request.c                 | 3 +--
 lasso/xml/id-wsf-2.0/ps_remove_entity_request.h                 | 3 +--
 lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c        | 3 +--
 lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h        | 3 +--
 lasso/xml/id-wsf-2.0/ps_request_abstract.c                      | 3 +--
 lasso/xml/id-wsf-2.0/ps_request_abstract.h                      | 3 +--
 lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c            | 3 +--
 lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h            | 3 +--
 lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c           | 3 +--
 lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h           | 3 +--
 lasso/xml/id-wsf-2.0/ps_resolve_input.c                         | 3 +--
 lasso/xml/id-wsf-2.0/ps_resolve_input.h                         | 3 +--
 lasso/xml/id-wsf-2.0/ps_response_abstract.c                     | 3 +--
 lasso/xml/id-wsf-2.0/ps_response_abstract.h                     | 3 +--
 lasso/xml/id-wsf-2.0/ps_set_object_info_request.c               | 3 +--
 lasso/xml/id-wsf-2.0/ps_set_object_info_request.h               | 3 +--
 lasso/xml/id-wsf-2.0/ps_test_membership_request.c               | 3 +--
 lasso/xml/id-wsf-2.0/ps_test_membership_request.h               | 3 +--
 lasso/xml/id-wsf-2.0/ps_test_membership_response.c              | 3 +--
 lasso/xml/id-wsf-2.0/ps_test_membership_response.h              | 3 +--
 lasso/xml/id-wsf-2.0/sb2_consent.c                              | 3 +--
 lasso/xml/id-wsf-2.0/sb2_consent.h                              | 3 +--
 lasso/xml/id-wsf-2.0/sb2_credentials_context.c                  | 3 +--
 lasso/xml/id-wsf-2.0/sb2_credentials_context.h                  | 3 +--
 lasso/xml/id-wsf-2.0/sb2_endpoint_update.c                      | 3 +--
 lasso/xml/id-wsf-2.0/sb2_endpoint_update.h                      | 3 +--
 lasso/xml/id-wsf-2.0/sb2_redirect_request.c                     | 3 +--
 lasso/xml/id-wsf-2.0/sb2_redirect_request.h                     | 3 +--
 lasso/xml/id-wsf-2.0/sb2_sender.c                               | 3 +--
 lasso/xml/id-wsf-2.0/sb2_sender.h                               | 3 +--
 lasso/xml/id-wsf-2.0/sb2_target_identity.c                      | 3 +--
 lasso/xml/id-wsf-2.0/sb2_target_identity.h                      | 3 +--
 lasso/xml/id-wsf-2.0/sb2_timeout.c                              | 3 +--
 lasso/xml/id-wsf-2.0/sb2_timeout.h                              | 3 +--
 lasso/xml/id-wsf-2.0/sb2_usage_directive.c                      | 3 +--
 lasso/xml/id-wsf-2.0/sb2_usage_directive.h                      | 3 +--
 lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c              | 3 +--
 lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h              | 3 +--
 lasso/xml/id-wsf-2.0/sbf_framework.c                            | 3 +--
 lasso/xml/id-wsf-2.0/sbf_framework.h                            | 3 +--
 lasso/xml/id-wsf-2.0/sec_token.c                                | 3 +--
 lasso/xml/id-wsf-2.0/sec_token.h                                | 3 +--
 lasso/xml/id-wsf-2.0/sec_token_policy.c                         | 3 +--
 lasso/xml/id-wsf-2.0/sec_token_policy.h                         | 3 +--
 lasso/xml/id-wsf-2.0/sec_transited_provider_path.c              | 3 +--
 lasso/xml/id-wsf-2.0/sec_transited_provider_path.h              | 3 +--
 lasso/xml/id-wsf-2.0/subs_notification.c                        | 3 +--
 lasso/xml/id-wsf-2.0/subs_notification.h                        | 3 +--
 lasso/xml/id-wsf-2.0/subs_notify_response.c                     | 3 +--
 lasso/xml/id-wsf-2.0/subs_notify_response.h                     | 3 +--
 lasso/xml/id-wsf-2.0/subs_ref_item.c                            | 3 +--
 lasso/xml/id-wsf-2.0/subs_ref_item.h                            | 3 +--
 lasso/xml/id-wsf-2.0/subs_subscription.c                        | 3 +--
 lasso/xml/id-wsf-2.0/subs_subscription.h                        | 3 +--
 lasso/xml/id-wsf-2.0/subsref_app_data.c                         | 3 +--
 lasso/xml/id-wsf-2.0/subsref_app_data.h                         | 3 +--
 lasso/xml/id-wsf-2.0/subsref_create.c                           | 3 +--
 lasso/xml/id-wsf-2.0/subsref_create.h                           | 3 +--
 lasso/xml/id-wsf-2.0/subsref_create_item.c                      | 3 +--
 lasso/xml/id-wsf-2.0/subsref_create_item.h                      | 3 +--
 lasso/xml/id-wsf-2.0/subsref_create_response.c                  | 3 +--
 lasso/xml/id-wsf-2.0/subsref_create_response.h                  | 3 +--
 lasso/xml/id-wsf-2.0/subsref_data.c                             | 3 +--
 lasso/xml/id-wsf-2.0/subsref_data.h                             | 3 +--
 lasso/xml/id-wsf-2.0/subsref_data_response.c                    | 3 +--
 lasso/xml/id-wsf-2.0/subsref_data_response.h                    | 3 +--
 lasso/xml/id-wsf-2.0/subsref_delete.c                           | 3 +--
 lasso/xml/id-wsf-2.0/subsref_delete.h                           | 3 +--
 lasso/xml/id-wsf-2.0/subsref_delete_item.c                      | 3 +--
 lasso/xml/id-wsf-2.0/subsref_delete_item.h                      | 3 +--
 lasso/xml/id-wsf-2.0/subsref_delete_response.c                  | 3 +--
 lasso/xml/id-wsf-2.0/subsref_delete_response.h                  | 3 +--
 lasso/xml/id-wsf-2.0/subsref_item_data.c                        | 3 +--
 lasso/xml/id-wsf-2.0/subsref_item_data.h                        | 3 +--
 lasso/xml/id-wsf-2.0/subsref_modify.c                           | 3 +--
 lasso/xml/id-wsf-2.0/subsref_modify.h                           | 3 +--
 lasso/xml/id-wsf-2.0/subsref_modify_item.c                      | 3 +--
 lasso/xml/id-wsf-2.0/subsref_modify_item.h                      | 3 +--
 lasso/xml/id-wsf-2.0/subsref_modify_response.c                  | 3 +--
 lasso/xml/id-wsf-2.0/subsref_modify_response.h                  | 3 +--
 lasso/xml/id-wsf-2.0/subsref_notification.c                     | 3 +--
 lasso/xml/id-wsf-2.0/subsref_notification.h                     | 3 +--
 lasso/xml/id-wsf-2.0/subsref_notify.c                           | 3 +--
 lasso/xml/id-wsf-2.0/subsref_notify.h                           | 3 +--
 lasso/xml/id-wsf-2.0/subsref_notify_response.c                  | 3 +--
 lasso/xml/id-wsf-2.0/subsref_notify_response.h                  | 3 +--
 lasso/xml/id-wsf-2.0/subsref_query.c                            | 3 +--
 lasso/xml/id-wsf-2.0/subsref_query.h                            | 3 +--
 lasso/xml/id-wsf-2.0/subsref_query_item.c                       | 3 +--
 lasso/xml/id-wsf-2.0/subsref_query_item.h                       | 3 +--
 lasso/xml/id-wsf-2.0/subsref_query_response.c                   | 3 +--
 lasso/xml/id-wsf-2.0/subsref_query_response.h                   | 3 +--
 lasso/xml/id-wsf-2.0/subsref_result_query.c                     | 3 +--
 lasso/xml/id-wsf-2.0/subsref_result_query.h                     | 3 +--
 lasso/xml/id-wsf-2.0/subsref_subscription.c                     | 3 +--
 lasso/xml/id-wsf-2.0/subsref_subscription.h                     | 3 +--
 lasso/xml/id-wsf-2.0/subsref_test_item.c                        | 3 +--
 lasso/xml/id-wsf-2.0/subsref_test_item.h                        | 3 +--
 lasso/xml/id-wsf-2.0/util_empty.c                               | 3 +--
 lasso/xml/id-wsf-2.0/util_empty.h                               | 3 +--
 lasso/xml/id-wsf-2.0/util_extension.c                           | 3 +--
 lasso/xml/id-wsf-2.0/util_extension.h                           | 3 +--
 lasso/xml/id-wsf-2.0/util_response.c                            | 3 +--
 lasso/xml/id-wsf-2.0/util_response.h                            | 3 +--
 lasso/xml/id-wsf-2.0/util_status.c                              | 3 +--
 lasso/xml/id-wsf-2.0/util_status.h                              | 3 +--
 lasso/xml/id-wsf-2.0/xml_idwsf2.h                               | 3 +--
 lasso/xml/idwsf_strings.h                                       | 3 +--
 lasso/xml/is_help.c                                             | 3 +--
 lasso/xml/is_help.h                                             | 3 +--
 lasso/xml/is_inquiry.c                                          | 3 +--
 lasso/xml/is_inquiry.h                                          | 3 +--
 lasso/xml/is_inquiry_element.c                                  | 3 +--
 lasso/xml/is_inquiry_element.h                                  | 3 +--
 lasso/xml/is_interaction_request.c                              | 3 +--
 lasso/xml/is_interaction_request.h                              | 3 +--
 lasso/xml/is_interaction_response.c                             | 3 +--
 lasso/xml/is_interaction_response.h                             | 3 +--
 lasso/xml/is_interaction_statement.c                            | 3 +--
 lasso/xml/is_interaction_statement.h                            | 3 +--
 lasso/xml/is_item.c                                             | 3 +--
 lasso/xml/is_item.h                                             | 3 +--
 lasso/xml/is_parameter.c                                        | 3 +--
 lasso/xml/is_parameter.h                                        | 3 +--
 lasso/xml/is_redirect_request.c                                 | 3 +--
 lasso/xml/is_redirect_request.h                                 | 3 +--
 lasso/xml/is_select.c                                           | 3 +--
 lasso/xml/is_select.h                                           | 3 +--
 lasso/xml/is_text.c                                             | 3 +--
 lasso/xml/is_text.h                                             | 3 +--
 lasso/xml/is_user_interaction.c                                 | 3 +--
 lasso/xml/is_user_interaction.h                                 | 3 +--
 lasso/xml/lib_assertion.c                                       | 3 +--
 lasso/xml/lib_assertion.h                                       | 3 +--
 lasso/xml/lib_authentication_statement.c                        | 3 +--
 lasso/xml/lib_authentication_statement.h                        | 3 +--
 lasso/xml/lib_authn_context.c                                   | 3 +--
 lasso/xml/lib_authn_context.h                                   | 3 +--
 lasso/xml/lib_authn_request.c                                   | 3 +--
 lasso/xml/lib_authn_request.h                                   | 3 +--
 lasso/xml/lib_authn_request_envelope.c                          | 3 +--
 lasso/xml/lib_authn_request_envelope.h                          | 3 +--
 lasso/xml/lib_authn_response.c                                  | 3 +--
 lasso/xml/lib_authn_response.h                                  | 3 +--
 lasso/xml/lib_authn_response_envelope.c                         | 3 +--
 lasso/xml/lib_authn_response_envelope.h                         | 3 +--
 lasso/xml/lib_federation_termination_notification.c             | 3 +--
 lasso/xml/lib_federation_termination_notification.h             | 3 +--
 lasso/xml/lib_idp_entries.c                                     | 3 +--
 lasso/xml/lib_idp_entries.h                                     | 3 +--
 lasso/xml/lib_idp_entry.c                                       | 3 +--
 lasso/xml/lib_idp_entry.h                                       | 3 +--
 lasso/xml/lib_idp_list.c                                        | 3 +--
 lasso/xml/lib_idp_list.h                                        | 3 +--
 lasso/xml/lib_logout_request.c                                  | 3 +--
 lasso/xml/lib_logout_request.h                                  | 3 +--
 lasso/xml/lib_logout_response.c                                 | 3 +--
 lasso/xml/lib_logout_response.h                                 | 3 +--
 lasso/xml/lib_name_identifier_mapping_request.c                 | 3 +--
 lasso/xml/lib_name_identifier_mapping_request.h                 | 3 +--
 lasso/xml/lib_name_identifier_mapping_response.c                | 3 +--
 lasso/xml/lib_name_identifier_mapping_response.h                | 3 +--
 lasso/xml/lib_register_name_identifier_request.c                | 3 +--
 lasso/xml/lib_register_name_identifier_request.h                | 3 +--
 lasso/xml/lib_register_name_identifier_response.c               | 3 +--
 lasso/xml/lib_register_name_identifier_response.h               | 3 +--
 lasso/xml/lib_request_authn_context.c                           | 3 +--
 lasso/xml/lib_request_authn_context.h                           | 3 +--
 lasso/xml/lib_scoping.c                                         | 3 +--
 lasso/xml/lib_scoping.h                                         | 3 +--
 lasso/xml/lib_status_response.c                                 | 3 +--
 lasso/xml/lib_status_response.h                                 | 3 +--
 lasso/xml/lib_subject.c                                         | 3 +--
 lasso/xml/lib_subject.h                                         | 3 +--
 lasso/xml/misc_text_node.c                                      | 3 +--
 lasso/xml/misc_text_node.h                                      | 3 +--
 lasso/xml/private.h                                             | 3 +--
 lasso/xml/sa_credentials.c                                      | 3 +--
 lasso/xml/sa_credentials.h                                      | 3 +--
 lasso/xml/sa_parameter.c                                        | 3 +--
 lasso/xml/sa_parameter.h                                        | 3 +--
 lasso/xml/sa_password_transforms.c                              | 3 +--
 lasso/xml/sa_password_transforms.h                              | 3 +--
 lasso/xml/sa_sasl_request.c                                     | 3 +--
 lasso/xml/sa_sasl_request.h                                     | 3 +--
 lasso/xml/sa_sasl_response.c                                    | 3 +--
 lasso/xml/sa_sasl_response.h                                    | 3 +--
 lasso/xml/sa_transform.c                                        | 3 +--
 lasso/xml/sa_transform.h                                        | 3 +--
 lasso/xml/saml-2.0/saml2_action.c                               | 3 +--
 lasso/xml/saml-2.0/saml2_action.h                               | 3 +--
 lasso/xml/saml-2.0/saml2_advice.c                               | 3 +--
 lasso/xml/saml-2.0/saml2_advice.h                               | 3 +--
 lasso/xml/saml-2.0/saml2_assertion.c                            | 3 +--
 lasso/xml/saml-2.0/saml2_assertion.h                            | 3 +--
 lasso/xml/saml-2.0/saml2_attribute.c                            | 3 +--
 lasso/xml/saml-2.0/saml2_attribute.h                            | 3 +--
 lasso/xml/saml-2.0/saml2_attribute_statement.c                  | 3 +--
 lasso/xml/saml-2.0/saml2_attribute_statement.h                  | 3 +--
 lasso/xml/saml-2.0/saml2_attribute_value.c                      | 3 +--
 lasso/xml/saml-2.0/saml2_attribute_value.h                      | 3 +--
 lasso/xml/saml-2.0/saml2_audience_restriction.c                 | 3 +--
 lasso/xml/saml-2.0/saml2_audience_restriction.h                 | 3 +--
 lasso/xml/saml-2.0/saml2_authn_context.c                        | 3 +--
 lasso/xml/saml-2.0/saml2_authn_context.h                        | 3 +--
 lasso/xml/saml-2.0/saml2_authn_statement.c                      | 3 +--
 lasso/xml/saml-2.0/saml2_authn_statement.h                      | 3 +--
 lasso/xml/saml-2.0/saml2_authz_decision_statement.c             | 3 +--
 lasso/xml/saml-2.0/saml2_authz_decision_statement.h             | 3 +--
 lasso/xml/saml-2.0/saml2_base_idabstract.c                      | 3 +--
 lasso/xml/saml-2.0/saml2_base_idabstract.h                      | 3 +--
 lasso/xml/saml-2.0/saml2_condition_abstract.c                   | 3 +--
 lasso/xml/saml-2.0/saml2_condition_abstract.h                   | 3 +--
 lasso/xml/saml-2.0/saml2_conditions.c                           | 3 +--
 lasso/xml/saml-2.0/saml2_conditions.h                           | 3 +--
 lasso/xml/saml-2.0/saml2_encrypted_element.c                    | 3 +--
 lasso/xml/saml-2.0/saml2_encrypted_element.h                    | 3 +--
 lasso/xml/saml-2.0/saml2_evidence.c                             | 3 +--
 lasso/xml/saml-2.0/saml2_evidence.h                             | 3 +--
 lasso/xml/saml-2.0/saml2_key_info_confirmation_data.c           | 3 +--
 lasso/xml/saml-2.0/saml2_key_info_confirmation_data.h           | 3 +--
 lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.c      | 3 +--
 lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.h      | 3 +--
 lasso/xml/saml-2.0/saml2_name_id.c                              | 3 +--
 lasso/xml/saml-2.0/saml2_name_id.h                              | 3 +--
 lasso/xml/saml-2.0/saml2_one_time_use.c                         | 3 +--
 lasso/xml/saml-2.0/saml2_one_time_use.h                         | 3 +--
 lasso/xml/saml-2.0/saml2_proxy_restriction.c                    | 3 +--
 lasso/xml/saml-2.0/saml2_proxy_restriction.h                    | 3 +--
 lasso/xml/saml-2.0/saml2_statement_abstract.c                   | 3 +--
 lasso/xml/saml-2.0/saml2_statement_abstract.h                   | 3 +--
 lasso/xml/saml-2.0/saml2_strings.h                              | 3 +--
 lasso/xml/saml-2.0/saml2_subject.c                              | 3 +--
 lasso/xml/saml-2.0/saml2_subject.h                              | 3 +--
 lasso/xml/saml-2.0/saml2_subject_confirmation.c                 | 3 +--
 lasso/xml/saml-2.0/saml2_subject_confirmation.h                 | 3 +--
 lasso/xml/saml-2.0/saml2_subject_confirmation_data.c            | 3 +--
 lasso/xml/saml-2.0/saml2_subject_confirmation_data.h            | 3 +--
 lasso/xml/saml-2.0/saml2_subject_locality.c                     | 3 +--
 lasso/xml/saml-2.0/saml2_subject_locality.h                     | 3 +--
 lasso/xml/saml-2.0/saml2_xsd.h                                  | 3 +--
 lasso/xml/saml-2.0/samlp2_artifact_resolve.c                    | 3 +--
 lasso/xml/saml-2.0/samlp2_artifact_resolve.h                    | 3 +--
 lasso/xml/saml-2.0/samlp2_artifact_response.c                   | 3 +--
 lasso/xml/saml-2.0/samlp2_artifact_response.h                   | 3 +--
 lasso/xml/saml-2.0/samlp2_assertion_id_request.c                | 3 +--
 lasso/xml/saml-2.0/samlp2_assertion_id_request.h                | 3 +--
 lasso/xml/saml-2.0/samlp2_attribute_query.c                     | 3 +--
 lasso/xml/saml-2.0/samlp2_attribute_query.h                     | 3 +--
 lasso/xml/saml-2.0/samlp2_authn_query.c                         | 3 +--
 lasso/xml/saml-2.0/samlp2_authn_query.h                         | 3 +--
 lasso/xml/saml-2.0/samlp2_authn_request.c                       | 3 +--
 lasso/xml/saml-2.0/samlp2_authn_request.h                       | 3 +--
 lasso/xml/saml-2.0/samlp2_authz_decision_query.c                | 3 +--
 lasso/xml/saml-2.0/samlp2_authz_decision_query.h                | 3 +--
 lasso/xml/saml-2.0/samlp2_extensions.c                          | 3 +--
 lasso/xml/saml-2.0/samlp2_extensions.h                          | 3 +--
 lasso/xml/saml-2.0/samlp2_idp_entry.c                           | 3 +--
 lasso/xml/saml-2.0/samlp2_idp_entry.h                           | 3 +--
 lasso/xml/saml-2.0/samlp2_idp_list.c                            | 3 +--
 lasso/xml/saml-2.0/samlp2_idp_list.h                            | 3 +--
 lasso/xml/saml-2.0/samlp2_logout_request.c                      | 3 +--
 lasso/xml/saml-2.0/samlp2_logout_request.h                      | 3 +--
 lasso/xml/saml-2.0/samlp2_logout_response.c                     | 3 +--
 lasso/xml/saml-2.0/samlp2_logout_response.h                     | 3 +--
 lasso/xml/saml-2.0/samlp2_manage_name_id_request.c              | 3 +--
 lasso/xml/saml-2.0/samlp2_manage_name_id_request.h              | 3 +--
 lasso/xml/saml-2.0/samlp2_manage_name_id_response.c             | 3 +--
 lasso/xml/saml-2.0/samlp2_manage_name_id_response.h             | 3 +--
 lasso/xml/saml-2.0/samlp2_name_id_mapping_request.c             | 3 +--
 lasso/xml/saml-2.0/samlp2_name_id_mapping_request.h             | 3 +--
 lasso/xml/saml-2.0/samlp2_name_id_mapping_response.c            | 3 +--
 lasso/xml/saml-2.0/samlp2_name_id_mapping_response.h            | 3 +--
 lasso/xml/saml-2.0/samlp2_name_id_policy.c                      | 3 +--
 lasso/xml/saml-2.0/samlp2_name_id_policy.h                      | 3 +--
 lasso/xml/saml-2.0/samlp2_request_abstract.c                    | 3 +--
 lasso/xml/saml-2.0/samlp2_request_abstract.h                    | 3 +--
 lasso/xml/saml-2.0/samlp2_requested_authn_context.c             | 3 +--
 lasso/xml/saml-2.0/samlp2_requested_authn_context.h             | 3 +--
 lasso/xml/saml-2.0/samlp2_response.c                            | 3 +--
 lasso/xml/saml-2.0/samlp2_response.h                            | 3 +--
 lasso/xml/saml-2.0/samlp2_scoping.c                             | 3 +--
 lasso/xml/saml-2.0/samlp2_scoping.h                             | 3 +--
 lasso/xml/saml-2.0/samlp2_status.c                              | 3 +--
 lasso/xml/saml-2.0/samlp2_status.h                              | 3 +--
 lasso/xml/saml-2.0/samlp2_status_code.c                         | 3 +--
 lasso/xml/saml-2.0/samlp2_status_code.h                         | 3 +--
 lasso/xml/saml-2.0/samlp2_status_detail.c                       | 3 +--
 lasso/xml/saml-2.0/samlp2_status_detail.h                       | 3 +--
 lasso/xml/saml-2.0/samlp2_status_response.c                     | 3 +--
 lasso/xml/saml-2.0/samlp2_status_response.h                     | 3 +--
 lasso/xml/saml-2.0/samlp2_subject_query_abstract.c              | 3 +--
 lasso/xml/saml-2.0/samlp2_subject_query_abstract.h              | 3 +--
 lasso/xml/saml-2.0/samlp2_terminate.c                           | 3 +--
 lasso/xml/saml-2.0/samlp2_terminate.h                           | 3 +--
 lasso/xml/saml-2.0/xml_saml2.h                                  | 3 +--
 lasso/xml/saml_advice.c                                         | 3 +--
 lasso/xml/saml_advice.h                                         | 3 +--
 lasso/xml/saml_assertion.c                                      | 3 +--
 lasso/xml/saml_assertion.h                                      | 3 +--
 lasso/xml/saml_attribute.c                                      | 3 +--
 lasso/xml/saml_attribute.h                                      | 3 +--
 lasso/xml/saml_attribute_designator.c                           | 3 +--
 lasso/xml/saml_attribute_designator.h                           | 3 +--
 lasso/xml/saml_attribute_statement.c                            | 3 +--
 lasso/xml/saml_attribute_statement.h                            | 3 +--
 lasso/xml/saml_attribute_value.c                                | 3 +--
 lasso/xml/saml_attribute_value.h                                | 3 +--
 lasso/xml/saml_audience_restriction_condition.c                 | 3 +--
 lasso/xml/saml_audience_restriction_condition.h                 | 3 +--
 lasso/xml/saml_authentication_statement.c                       | 3 +--
 lasso/xml/saml_authentication_statement.h                       | 3 +--
 lasso/xml/saml_authority_binding.c                              | 3 +--
 lasso/xml/saml_authority_binding.h                              | 3 +--
 lasso/xml/saml_condition_abstract.c                             | 3 +--
 lasso/xml/saml_condition_abstract.h                             | 3 +--
 lasso/xml/saml_conditions.c                                     | 3 +--
 lasso/xml/saml_conditions.h                                     | 3 +--
 lasso/xml/saml_name_identifier.c                                | 3 +--
 lasso/xml/saml_name_identifier.h                                | 3 +--
 lasso/xml/saml_statement_abstract.c                             | 3 +--
 lasso/xml/saml_statement_abstract.h                             | 3 +--
 lasso/xml/saml_subject.c                                        | 3 +--
 lasso/xml/saml_subject.h                                        | 3 +--
 lasso/xml/saml_subject_confirmation.c                           | 3 +--
 lasso/xml/saml_subject_confirmation.h                           | 3 +--
 lasso/xml/saml_subject_locality.c                               | 3 +--
 lasso/xml/saml_subject_locality.h                               | 3 +--
 lasso/xml/saml_subject_statement.c                              | 3 +--
 lasso/xml/saml_subject_statement.h                              | 3 +--
 lasso/xml/saml_subject_statement_abstract.c                     | 3 +--
 lasso/xml/saml_subject_statement_abstract.h                     | 3 +--
 lasso/xml/samlp_request.c                                       | 3 +--
 lasso/xml/samlp_request.h                                       | 3 +--
 lasso/xml/samlp_request_abstract.c                              | 3 +--
 lasso/xml/samlp_request_abstract.h                              | 3 +--
 lasso/xml/samlp_response.c                                      | 3 +--
 lasso/xml/samlp_response.h                                      | 3 +--
 lasso/xml/samlp_response_abstract.c                             | 3 +--
 lasso/xml/samlp_response_abstract.h                             | 3 +--
 lasso/xml/samlp_status.c                                        | 3 +--
 lasso/xml/samlp_status.h                                        | 3 +--
 lasso/xml/samlp_status_code.c                                   | 3 +--
 lasso/xml/samlp_status_code.h                                   | 3 +--
 lasso/xml/sec_resource_access_statement.c                       | 3 +--
 lasso/xml/sec_resource_access_statement.h                       | 3 +--
 lasso/xml/soap-1.1/soap_body.c                                  | 3 +--
 lasso/xml/soap-1.1/soap_body.h                                  | 3 +--
 lasso/xml/soap-1.1/soap_detail.c                                | 3 +--
 lasso/xml/soap-1.1/soap_detail.h                                | 3 +--
 lasso/xml/soap-1.1/soap_envelope.c                              | 3 +--
 lasso/xml/soap-1.1/soap_envelope.h                              | 3 +--
 lasso/xml/soap-1.1/soap_fault.c                                 | 3 +--
 lasso/xml/soap-1.1/soap_fault.h                                 | 3 +--
 lasso/xml/soap-1.1/soap_header.c                                | 3 +--
 lasso/xml/soap-1.1/soap_header.h                                | 3 +--
 lasso/xml/soap-1.1/xml_soap11.h                                 | 3 +--
 lasso/xml/soap_binding.c                                        | 3 +--
 lasso/xml/soap_binding.h                                        | 3 +--
 lasso/xml/soap_binding_consent.c                                | 3 +--
 lasso/xml/soap_binding_consent.h                                | 3 +--
 lasso/xml/soap_binding_correlation.c                            | 3 +--
 lasso/xml/soap_binding_correlation.h                            | 3 +--
 lasso/xml/soap_binding_ext_credential.c                         | 3 +--
 lasso/xml/soap_binding_ext_credential.h                         | 3 +--
 lasso/xml/soap_binding_ext_credentials_context.c                | 3 +--
 lasso/xml/soap_binding_ext_credentials_context.h                | 3 +--
 lasso/xml/soap_binding_ext_service_instance_update.c            | 3 +--
 lasso/xml/soap_binding_ext_service_instance_update.h            | 3 +--
 lasso/xml/soap_binding_ext_timeout.c                            | 3 +--
 lasso/xml/soap_binding_ext_timeout.h                            | 3 +--
 lasso/xml/soap_binding_processing_context.c                     | 3 +--
 lasso/xml/soap_binding_processing_context.h                     | 3 +--
 lasso/xml/soap_binding_provider.c                               | 3 +--
 lasso/xml/soap_binding_provider.h                               | 3 +--
 lasso/xml/soap_binding_usage_directive.c                        | 3 +--
 lasso/xml/soap_binding_usage_directive.h                        | 3 +--
 lasso/xml/strings.h                                             | 3 +--
 lasso/xml/tools.c                                               | 3 +--
 lasso/xml/tools.h                                               | 3 +--
 lasso/xml/utility_status.c                                      | 3 +--
 lasso/xml/utility_status.h                                      | 3 +--
 lasso/xml/ws/wsa_attributed_any.c                               | 3 +--
 lasso/xml/ws/wsa_attributed_any.h                               | 3 +--
 lasso/xml/ws/wsa_attributed_qname.c                             | 3 +--
 lasso/xml/ws/wsa_attributed_qname.h                             | 3 +--
 lasso/xml/ws/wsa_attributed_unsigned_long.c                     | 3 +--
 lasso/xml/ws/wsa_attributed_unsigned_long.h                     | 3 +--
 lasso/xml/ws/wsa_attributed_uri.c                               | 3 +--
 lasso/xml/ws/wsa_attributed_uri.h                               | 3 +--
 lasso/xml/ws/wsa_endpoint_reference.c                           | 3 +--
 lasso/xml/ws/wsa_endpoint_reference.h                           | 3 +--
 lasso/xml/ws/wsa_metadata.c                                     | 3 +--
 lasso/xml/ws/wsa_metadata.h                                     | 3 +--
 lasso/xml/ws/wsa_problem_action.c                               | 3 +--
 lasso/xml/ws/wsa_problem_action.h                               | 3 +--
 lasso/xml/ws/wsa_reference_parameters.c                         | 3 +--
 lasso/xml/ws/wsa_reference_parameters.h                         | 3 +--
 lasso/xml/ws/wsa_relates_to.c                                   | 3 +--
 lasso/xml/ws/wsa_relates_to.h                                   | 3 +--
 lasso/xml/ws/wsse_embedded.c                                    | 3 +--
 lasso/xml/ws/wsse_embedded.h                                    | 3 +--
 lasso/xml/ws/wsse_reference.c                                   | 3 +--
 lasso/xml/ws/wsse_reference.h                                   | 3 +--
 lasso/xml/ws/wsse_security_header.c                             | 3 +--
 lasso/xml/ws/wsse_security_header.h                             | 3 +--
 lasso/xml/ws/wsse_security_token_reference.c                    | 3 +--
 lasso/xml/ws/wsse_security_token_reference.h                    | 3 +--
 lasso/xml/ws/wsse_transformation_parameters.c                   | 3 +--
 lasso/xml/ws/wsse_transformation_parameters.h                   | 3 +--
 lasso/xml/ws/wsse_username_token.c                              | 3 +--
 lasso/xml/ws/wsse_username_token.h                              | 3 +--
 lasso/xml/ws/wsu_timestamp.c                                    | 3 +--
 lasso/xml/ws/wsu_timestamp.h                                    | 3 +--
 lasso/xml/ws/xml_ws.h                                           | 3 +--
 lasso/xml/xml.c                                                 | 3 +--
 lasso/xml/xml.h                                                 | 3 +--
 lasso/xml/xml_enc.h                                             | 3 +--
 lasso/xml/xml_idff.h                                            | 3 +--
 lasso/xml/xml_idwsf.h                                           | 3 +--
 m4/ac_check_class.m4                                            | 4 +---
 m4/ac_check_classpath.m4                                        | 4 +---
 m4/ac_check_java_home.m4                                        | 4 +---
 m4/ac_check_rqrd_class.m4                                       | 4 +---
 m4/ac_prog_java.m4                                              | 4 +---
 m4/ac_prog_java_cc.m4                                           | 4 +---
 m4/ac_prog_java_works.m4                                        | 4 +---
 m4/ac_prog_javac.m4                                             | 4 +---
 m4/ac_prog_javac_works.m4                                       | 4 +---
 m4/dps_java_check_class.m4                                      | 4 +---
 m4/dps_libgcj_jar.m4                                            | 4 +---
 m4/dps_xtra_classpath.m4                                        | 4 +---
 tests/assertion_query_saml2.c                                   | 3 +--
 tests/basic_tests.c                                             | 3 +--
 tests/idwsf2_tests.c                                            | 3 +--
 tests/login_tests.c                                             | 3 +--
 tests/login_tests_saml2.c                                       | 3 +--
 tests/metadata_tests.c                                          | 3 +--
 tests/non_regression_tests.c                                    | 3 +--
 tests/perfs.c                                                   | 3 +--
 tests/random_tests.c                                            | 3 +--
 tests/tests.c                                                   | 3 +--
 tests/tests.h                                                   | 3 +--
 tools/generate_idwsf2_classes.py                                | 9 +++------
 website/web/license.xml                                         | 4 ++--
 win32/lasso.rc.in                                               | 3 +--
 815 files changed, 818 insertions(+), 1644 deletions(-)

diff --git a/COPYING b/COPYING
index e59c717e07b54eca54cba98fe364b35aef9741fa..65e1355d7c7494f28bd748384b9e8a1d83aba753 100644
--- a/COPYING
+++ b/COPYING
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/README b/README
index b672ec6c226d4e234cbc97c2efa728c74aa03d9f..4f9af34a6391c4d0bbaac88502f23403a7847dbf 100644
--- a/README
+++ b/README
@@ -59,7 +59,7 @@ for a detailed listing of all contributions.
 
   You should have received a copy of the GNU General Public License along
   with this program; if not, write to the Free Software Foundation, Inc.,
-  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
   In addition, as a special exception, Entr'ouvert gives permission to link
   the code of its release of Lasso with the OpenSSL project's "OpenSSL"
diff --git a/bindings/bindings.py b/bindings/bindings.py
index 0caf114aab5da06df45d2741f1e901e02402fc12..d7687ff1a7c9f702eb9fae06bb84068f4542f2c0 100644
--- a/bindings/bindings.py
+++ b/bindings/bindings.py
@@ -18,8 +18,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 import os
diff --git a/bindings/java/lang.py b/bindings/java/lang.py
index 47d5a3b596982dcb6394e31759cdc41fc7be272b..aa09823b6b9c05292fcc69b347df7f85a793b85a 100644
--- a/bindings/java/lang.py
+++ b/bindings/java/lang.py
@@ -16,8 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import os
 import sys
diff --git a/bindings/java/tests/BindingTests.java b/bindings/java/tests/BindingTests.java
index 6cc9bd464ac980e9b72faf532c828dafe8427dd3..ebd1a6391d32d8c1463d346feab1a5a9d92ce13d 100644
--- a/bindings/java/tests/BindingTests.java
+++ b/bindings/java/tests/BindingTests.java
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 import junit.framework.Test;
diff --git a/bindings/java/tests/LoginTest.java b/bindings/java/tests/LoginTest.java
index 33d0d8ca72932211037053289d4c64e33a523de5..01b5be412453f2cfbf58201a285e3d2d0c3689a0 100644
--- a/bindings/java/tests/LoginTest.java
+++ b/bindings/java/tests/LoginTest.java
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 // To run it:
diff --git a/bindings/perl/ghashtable_handling.c b/bindings/perl/ghashtable_handling.c
index 8479a59e38a50305f7ef0ce2d228f1359ff1b74d..be7b11e3404889880729ea4dedcce379dd95e0f6 100644
--- a/bindings/perl/ghashtable_handling.c
+++ b/bindings/perl/ghashtable_handling.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/bindings/perl/glist_handling.c b/bindings/perl/glist_handling.c
index 3a044d19a1f9853b5cfd454d1a4ed2f036ba02bd..e51cc6cb9302b11f4f0ef07c10dde228b8fa83d8 100644
--- a/bindings/perl/glist_handling.c
+++ b/bindings/perl/glist_handling.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/bindings/perl/gobject_handling.c b/bindings/perl/gobject_handling.c
index 6689029cc600dafe0a16ec1dc8158e9df7f2c9d2..f07af440ee4850bf3b3a3ed26c764533941425ed 100644
--- a/bindings/perl/gobject_handling.c
+++ b/bindings/perl/gobject_handling.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/bindings/perl/lang.py b/bindings/perl/lang.py
index 133db50ce008a2dd3e10ef7488f9879e9a5af1c4..0582675ea1eaec9b3dc705ae7e156cefe89712a1 100644
--- a/bindings/perl/lang.py
+++ b/bindings/perl/lang.py
@@ -16,8 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import os
 import os.path
diff --git a/bindings/php5/lang.py b/bindings/php5/lang.py
index 32d9246517431e47302894704d20847c3338f798..4695e957d916b39b335f5a6da84146efcda918a7 100644
--- a/bindings/php5/lang.py
+++ b/bindings/php5/lang.py
@@ -16,8 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import os
 from wrapper_source import WrapperSource
diff --git a/bindings/php5/php_code.py b/bindings/php5/php_code.py
index 091ae982b837b9bb6af53ae81dec6196371dc3ca..114a1b93e2ef9a16840008f4fa1a0ce3e912e1ca 100644
--- a/bindings/php5/php_code.py
+++ b/bindings/php5/php_code.py
@@ -16,8 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import re
 import sys
diff --git a/bindings/php5/tests/binding_tests.php b/bindings/php5/tests/binding_tests.php
index ff9d05e60094c3918b38d116a0ca6c884055489c..21efc0bcf7e64df5998aa646f56b9d463f1d9ff1 100755
--- a/bindings/php5/tests/binding_tests.php
+++ b/bindings/php5/tests/binding_tests.php
@@ -18,8 +18,7 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 require("../lasso.php");
 
diff --git a/bindings/php5/tests/profile_tests.php b/bindings/php5/tests/profile_tests.php
index 58414213893185333b46e76746590e79241c7301..3f8a91ededf018c19fdff217c4822d0ecbd062b0 100755
--- a/bindings/php5/tests/profile_tests.php
+++ b/bindings/php5/tests/profile_tests.php
@@ -18,8 +18,7 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 require("../lasso.php");
 
diff --git a/bindings/php5/wrapper_header.py b/bindings/php5/wrapper_header.py
index 5f55f6b0242b969eae3019cd3ecb795552a42d58..9b6c949477863debb54741560d42c1bbba512c95 100644
--- a/bindings/php5/wrapper_header.py
+++ b/bindings/php5/wrapper_header.py
@@ -16,8 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 class WrapperHeader:
     def __init__(self, binding_data, fd, functions_list):
diff --git a/bindings/php5/wrapper_source.py b/bindings/php5/wrapper_source.py
index f8211ffdbbb274853907065a150f1fd68cf806b5..2ed9b29c4605e549f014496747792748e03e46f0 100644
--- a/bindings/php5/wrapper_source.py
+++ b/bindings/php5/wrapper_source.py
@@ -16,8 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import sys
 import os
diff --git a/bindings/python/lang.py b/bindings/python/lang.py
index 72c2911c95242be41c8931d00cd16ca6f34faecc..1e3c89ccacc49058148b9f0d7445c735430569ac 100644
--- a/bindings/python/lang.py
+++ b/bindings/python/lang.py
@@ -16,8 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import os
 import sys
diff --git a/bindings/python/tests/XmlTestRunner.py b/bindings/python/tests/XmlTestRunner.py
index 3fa8a23950bf6ee3fb97c21c541409cc6ac88d76..cb1486cf75a3e8bf5400cec78c98175e32d4764b 100644
--- a/bindings/python/tests/XmlTestRunner.py
+++ b/bindings/python/tests/XmlTestRunner.py
@@ -19,8 +19,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 import unittest
diff --git a/bindings/python/tests/binding_tests.py b/bindings/python/tests/binding_tests.py
index ba732f37809c49992eb1d73aeb13a1b69a5840a5..edbfc19f09e21ad5a7d2b055ab93d2a16dee9710 100755
--- a/bindings/python/tests/binding_tests.py
+++ b/bindings/python/tests/binding_tests.py
@@ -21,8 +21,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 import unittest
diff --git a/bindings/python/tests/idwsf1_tests.py b/bindings/python/tests/idwsf1_tests.py
index 9ace6200829d124384966dea6966ea6eed3d61b3..89832b9b548f31e358c6926f68499572952585b4 100755
--- a/bindings/python/tests/idwsf1_tests.py
+++ b/bindings/python/tests/idwsf1_tests.py
@@ -19,8 +19,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import os
 import unittest
diff --git a/bindings/python/tests/idwsf2_tests.py b/bindings/python/tests/idwsf2_tests.py
index 6d43a428bf97f31e82a3fd1c3acfdf2256102682..6f80c53d882373821ae3898d5ea05d1ce0885108 100755
--- a/bindings/python/tests/idwsf2_tests.py
+++ b/bindings/python/tests/idwsf2_tests.py
@@ -21,8 +21,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 import os
diff --git a/bindings/python/tests/profiles_tests.py b/bindings/python/tests/profiles_tests.py
index e86a61954691d3b0e89218ffa18fb7718c76bb9f..4d00f18d1c547e284796df1c97b3561d7aa36141 100755
--- a/bindings/python/tests/profiles_tests.py
+++ b/bindings/python/tests/profiles_tests.py
@@ -21,8 +21,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 import os
diff --git a/bindings/python/tests/tests.py b/bindings/python/tests/tests.py
index 14c8c864594cd5591809688056ac66fcd307cffc..4a66b7fbae6c6a77ef90f09e9c23c26bdd122e79 100755
--- a/bindings/python/tests/tests.py
+++ b/bindings/python/tests/tests.py
@@ -21,8 +21,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 import __builtin__
diff --git a/bindings/utils.py b/bindings/utils.py
index a916e7789311248e5cff3b176dff56bf0385726f..6c99057232255d207d504cb3d08c5cacd54f9f38 100644
--- a/bindings/utils.py
+++ b/bindings/utils.py
@@ -16,8 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import re
 import string
diff --git a/lasso/backward_comp.h b/lasso/backward_comp.h
index 9e61e706e3f7f61f58dece291cb642136464d561..55686fcd0517e8ea5e2e2b9abe206647272680a4 100644
--- a/lasso/backward_comp.h
+++ b/lasso/backward_comp.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/lasso/ctypes.h b/lasso/ctypes.h
index 4c987a2a5946e6c1d1062a10f6a651c70cac4e69..8ad781a9b9f322c733bf116d03cf24d5ca3e6f85 100644
--- a/lasso/ctypes.h
+++ b/lasso/ctypes.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_CTYPES_H__
diff --git a/lasso/debug.h b/lasso/debug.h
index f98f7882e6bcf619c3a8daa8f0e06af813dd9054..805a6ef55bd4e62d21579cdbc97207347daac63e 100644
--- a/lasso/debug.h
+++ b/lasso/debug.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DEBUG_H__
diff --git a/lasso/errors.c b/lasso/errors.c
index 778c6e3ca1d563b1cdece3aeffe228682703ab58..9a551eaa01f98f3cb39c50698a0faea2641f55a0 100644
--- a/lasso/errors.c
+++ b/lasso/errors.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/lasso/errors.c.in b/lasso/errors.c.in
index 1787ee90f63c38262ae25b00f5c3833fad3f38f6..fdc29856b2b812f516ffdb1bcb2a1834d834ed6c 100644
--- a/lasso/errors.c.in
+++ b/lasso/errors.c.in
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/lasso/errors.h b/lasso/errors.h
index ae801be0fa5a276ce11b642fedb88b5315e63e44..ffa2c388eb4dbff362d1b4798d34e747ec9dff64 100644
--- a/lasso/errors.h
+++ b/lasso/errors.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/export.h b/lasso/export.h
index d55cadb74015fb1c41657eb40933a4e3a4b530b8..c027a6e7ced42602d022df26c3c0373b2f6cc175 100644
--- a/lasso/export.h
+++ b/lasso/export.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_EXPORT_H__
diff --git a/lasso/id-ff/defederation.c b/lasso/id-ff/defederation.c
index 4cf3aadae903abe0b3691bc68f4ccbea52530901..33c9321780dca340999bc5c7006d13f0c63c0176 100644
--- a/lasso/id-ff/defederation.c
+++ b/lasso/id-ff/defederation.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-ff/defederation.h b/lasso/id-ff/defederation.h
index ea6bf08ddd65148f61bb87d6a40b744ffd4e2c9c..67467d4b76f2b9d816a2facbfb195191ab8f24fe 100644
--- a/lasso/id-ff/defederation.h
+++ b/lasso/id-ff/defederation.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DEFEDERATION_H__
diff --git a/lasso/id-ff/federation.c b/lasso/id-ff/federation.c
index 4dbea978fa8fce283f27baf7ff7ba998b13676a7..fc0c2e2dca92b2277c7332e3fb0a7b68e9cdee73 100644
--- a/lasso/id-ff/federation.c
+++ b/lasso/id-ff/federation.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-ff/federation.h b/lasso/id-ff/federation.h
index 9842cfcdb3116354f4bec8599bc565cbd0ee1ad8..966afe6b79ba29fa33b92dfb4e92fae427abbd08 100644
--- a/lasso/id-ff/federation.h
+++ b/lasso/id-ff/federation.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_FEDERATION_H__
diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c
index a2d35d9245b7dc6fd031b7aeaf434844eba05360..ddddb4c752cb9da530c0736f8d1520f0df897b1e 100644
--- a/lasso/id-ff/identity.c
+++ b/lasso/id-ff/identity.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-ff/identity.h b/lasso/id-ff/identity.h
index 9987e162a1e8f80eff205f8e904d387719ea7ac2..a45a6a3cee2833ccf759e0d7dbc6afa4c77e5973 100644
--- a/lasso/id-ff/identity.h
+++ b/lasso/id-ff/identity.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDENTITY_H__
diff --git a/lasso/id-ff/identityprivate.h b/lasso/id-ff/identityprivate.h
index 01d0cbf28a419a8d2d097d0e10a917831e45f2b6..0cd7187cc9f965790d50ccbf591e33c048f43723 100644
--- a/lasso/id-ff/identityprivate.h
+++ b/lasso/id-ff/identityprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDENTITY_PRIVATE_H__
diff --git a/lasso/id-ff/lecp.c b/lasso/id-ff/lecp.c
index cdff031467218d457dff362248390ad8c9e25dd8..dc41a229c38e466c5a95c6c9a6f134c9c30375b9 100644
--- a/lasso/id-ff/lecp.c
+++ b/lasso/id-ff/lecp.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-ff/lecp.h b/lasso/id-ff/lecp.h
index 98ecc2162df4a7b3f63538169c7d9745e93ec887..f838f47cf54f63cf17ac3d86ab847a3ce6e059a5 100644
--- a/lasso/id-ff/lecp.h
+++ b/lasso/id-ff/lecp.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LECP_H__
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index 3210fa04d01046bc573d72f7e09519513629a3f3..9e1a137c425b6696ede3494095579e96386c7c16 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-ff/login.h b/lasso/id-ff/login.h
index 3f1f3d562f0af55d8a1b47c7fdf1ac8cbdb97a18..485e4a489aee8f445d7cc165404a68eaf104ac96 100644
--- a/lasso/id-ff/login.h
+++ b/lasso/id-ff/login.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LOGIN_H__
diff --git a/lasso/id-ff/loginprivate.h b/lasso/id-ff/loginprivate.h
index 0169ee220f4d72c86d42ed911dbe09b00d0546b0..5575fce013f5984c550272731403fc6dd2af8368 100644
--- a/lasso/id-ff/loginprivate.h
+++ b/lasso/id-ff/loginprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LOGIN_PRIVATE_H__
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index 1feca4af44c1a8bfc1df4b80931b6df0bfaddd01..406e5b983de684614937d19b0981c97c77376f3e 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-ff/logout.h b/lasso/id-ff/logout.h
index 0a63a01eb481ee81d1167be85fcbb9b7c2a69fdf..d799df36fd974339b21442dae07adcaed9132eb4 100644
--- a/lasso/id-ff/logout.h
+++ b/lasso/id-ff/logout.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LOGOUT_H__
diff --git a/lasso/id-ff/logoutprivate.h b/lasso/id-ff/logoutprivate.h
index 3e44b593f4031ec915256c80fda7191e90459ed4..5f6fdeb3676ceb400010c65ee936ddcbf9099d17 100644
--- a/lasso/id-ff/logoutprivate.h
+++ b/lasso/id-ff/logoutprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LOGOUT_PRIVATE_H__
diff --git a/lasso/id-ff/name_identifier_mapping.c b/lasso/id-ff/name_identifier_mapping.c
index a893d6a505ca12dfaf5f4d08bd2d205a6d75ed70..0375855af65ef3d5a0f4875516c4be692937d088 100644
--- a/lasso/id-ff/name_identifier_mapping.c
+++ b/lasso/id-ff/name_identifier_mapping.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-ff/name_identifier_mapping.h b/lasso/id-ff/name_identifier_mapping.h
index 61972b1d036cde74c8f6df318f92e49c1d819f1d..102ae872b153722029535d996aaaef4c611b3821 100644
--- a/lasso/id-ff/name_identifier_mapping.h
+++ b/lasso/id-ff/name_identifier_mapping.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_NAME_IDENTIFIER_MAPPING_H__
diff --git a/lasso/id-ff/name_registration.c b/lasso/id-ff/name_registration.c
index ab325c8912ed46694d0c68d4b4bbc6c5eceb7040..a262878ad78b1c3383a9d588346001207837afdf 100644
--- a/lasso/id-ff/name_registration.c
+++ b/lasso/id-ff/name_registration.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-ff/name_registration.h b/lasso/id-ff/name_registration.h
index 650f454f99bf47bd0f058f60b51dbda74b6e8d88..9df4b34c26dd251967c48bd81f88073e01fa9956 100644
--- a/lasso/id-ff/name_registration.h
+++ b/lasso/id-ff/name_registration.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_NAME_REGISTRATION_H__
diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c
index 768c3ea2c9a1353ad9ced3d845770b550e73f71f..fbdab768b575f77ff22569744d5727819f15d440 100644
--- a/lasso/id-ff/profile.c
+++ b/lasso/id-ff/profile.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-ff/profile.h b/lasso/id-ff/profile.h
index 096d2f92176cf6c7c7940444998e0525eaf056ee..7fb3e7291284a3cc49d0fafec25953234f87e95f 100644
--- a/lasso/id-ff/profile.h
+++ b/lasso/id-ff/profile.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_PROFILE_H__
diff --git a/lasso/id-ff/profileprivate.h b/lasso/id-ff/profileprivate.h
index 25b64d1f5a717a1d132229f31faa803508b3b625..58210573724d1ecaed2ddc3e0f3b0541fa46027e 100644
--- a/lasso/id-ff/profileprivate.h
+++ b/lasso/id-ff/profileprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_PROFILE_PRIVATE_H__
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c
index 3f9e6173e82cdf85fea0192c0556a241969fc937..8a022968a8a5c9158e4a28484c3b10918e0b7775 100644
--- a/lasso/id-ff/provider.c
+++ b/lasso/id-ff/provider.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-ff/provider.h b/lasso/id-ff/provider.h
index 470b921b287085288e14b457838c3d971f7b9c25..58a102524e2fd20196dc9cf2040f8d63ea00408a 100644
--- a/lasso/id-ff/provider.h
+++ b/lasso/id-ff/provider.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_PROVIDER_H__
diff --git a/lasso/id-ff/providerprivate.h b/lasso/id-ff/providerprivate.h
index ff186adf0d1870fc7beb77a2babc8cf2ec7a727b..cc2eb39b3c0e9098981643fe4ee700275563f142 100644
--- a/lasso/id-ff/providerprivate.h
+++ b/lasso/id-ff/providerprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_PROVIDER_PRIVATE_H__
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 390a55b7531024fe1639e11bb8aeba17b23e9a4f..2641363ebdabc3e0cf9538a1efee5f3f7b9bdcdc 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-ff/server.h b/lasso/id-ff/server.h
index e13db433dd4b04333ef4873560f59b9db1418b76..75c7aa83210a2f33812f4ea8c8abac8fad4dec22 100644
--- a/lasso/id-ff/server.h
+++ b/lasso/id-ff/server.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SERVER_H__
diff --git a/lasso/id-ff/serverprivate.h b/lasso/id-ff/serverprivate.h
index 7ebf865f99291e4a1e73e255d8c4ffe71c791654..4a96b79f06efa0e8243eb6c412bd72c28b5bdefe 100644
--- a/lasso/id-ff/serverprivate.h
+++ b/lasso/id-ff/serverprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SERVER_PRIVATE_H__
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
index 67b0147f90bc79ee8426036043a18d8c647a8d20..94f655246d5bd22e766e07d0a1a2f18b6d8477d6 100644
--- a/lasso/id-ff/session.c
+++ b/lasso/id-ff/session.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-ff/session.h b/lasso/id-ff/session.h
index 62fe323d47a412a6ec3e2d9185ba4e42190cb1ad..92603b6a35b725b498e7605c00c7c86843189faa 100644
--- a/lasso/id-ff/session.h
+++ b/lasso/id-ff/session.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SESSION_H__
diff --git a/lasso/id-ff/sessionprivate.h b/lasso/id-ff/sessionprivate.h
index 03af335aa5f88377c3cad306b12b3513528eb027..cfe8969b75064a02c3dce5309ab9c66deb91eca7 100644
--- a/lasso/id-ff/sessionprivate.h
+++ b/lasso/id-ff/sessionprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SESSION_PRIVATE_H__
diff --git a/lasso/id-wsf-2.0/data_service.c b/lasso/id-wsf-2.0/data_service.c
index 3d46417f912bd452b0264a5640700e84f8f90320..4159b204564f8aab119c5a6f7e649dc0a95cae5f 100644
--- a/lasso/id-wsf-2.0/data_service.c
+++ b/lasso/id-wsf-2.0/data_service.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-wsf-2.0/data_service.h b/lasso/id-wsf-2.0/data_service.h
index 28d8d7445d5793c0bb275f9cc2c2e676e2e99a08..f806d356a709a47d402dbbea4028e8319c3849ea 100644
--- a/lasso/id-wsf-2.0/data_service.h
+++ b/lasso/id-wsf-2.0/data_service.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DATA_SERVICE_H__
diff --git a/lasso/id-wsf-2.0/discovery.c b/lasso/id-wsf-2.0/discovery.c
index be1bd7f47bd72a6efb4a106fc079eb8265f26e1b..785053f47fa5f632357acd52717a3302e953ca70 100644
--- a/lasso/id-wsf-2.0/discovery.c
+++ b/lasso/id-wsf-2.0/discovery.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-wsf-2.0/discovery.h b/lasso/id-wsf-2.0/discovery.h
index 1b830763f4c36a72879b25ea79d8752dde071f89..e4bf85e27394614fa63a83f738534c9f0542c92a 100644
--- a/lasso/id-wsf-2.0/discovery.h
+++ b/lasso/id-wsf-2.0/discovery.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCOVERY_H__
diff --git a/lasso/id-wsf-2.0/id_wsf_2.h b/lasso/id-wsf-2.0/id_wsf_2.h
index 23bca6336917fec810a4c6b70e8280503561e577..5bca4d9c2d653eb80c8f0ba0646fd16b764a2762 100644
--- a/lasso/id-wsf-2.0/id_wsf_2.h
+++ b/lasso/id-wsf-2.0/id_wsf_2.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_ID_WSF_2_H__
diff --git a/lasso/id-wsf-2.0/identity.c b/lasso/id-wsf-2.0/identity.c
index dadbff8dcc6c9bcae2fa39fd21d59e2bc1760248..a38a070fb36d55d3bd5e2d74e44aa578d440a98e 100644
--- a/lasso/id-wsf-2.0/identity.c
+++ b/lasso/id-wsf-2.0/identity.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "identity.h"
diff --git a/lasso/id-wsf-2.0/identity.h b/lasso/id-wsf-2.0/identity.h
index 84d37c2638f0f75371712487601bb8fd1f616699..418bb915b2a85265ee52e644a607e81e94ad9beb 100644
--- a/lasso/id-wsf-2.0/identity.h
+++ b/lasso/id-wsf-2.0/identity.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IDENTITY_H__
diff --git a/lasso/id-wsf-2.0/idwsf2_helper.c b/lasso/id-wsf-2.0/idwsf2_helper.c
index 0c656370ee07d530615b3062490217cae08ef219..f0bd7d3c9c195fe371b81bf21eb9dabc8d576e13 100644
--- a/lasso/id-wsf-2.0/idwsf2_helper.c
+++ b/lasso/id-wsf-2.0/idwsf2_helper.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "idwsf2_helper.h"
diff --git a/lasso/id-wsf-2.0/idwsf2_helper.h b/lasso/id-wsf-2.0/idwsf2_helper.h
index 54e0e8728c7a548c3568c96cfabdb489201ba04f..8d7eb75b97c1fedf56a5e4d7b3838a7b1f3497d1 100644
--- a/lasso/id-wsf-2.0/idwsf2_helper.h
+++ b/lasso/id-wsf-2.0/idwsf2_helper.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_HELPER_H__
diff --git a/lasso/id-wsf-2.0/private.h b/lasso/id-wsf-2.0/private.h
index 7a6de634c42dd7594e9d1ce0c6b633a260a5b620..a0bb81045ceae48255d6ee747cef590e61b43dff 100644
--- a/lasso/id-wsf-2.0/private.h
+++ b/lasso/id-wsf-2.0/private.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_ID_WSF_20_PRIVATE_H__
diff --git a/lasso/id-wsf-2.0/profile.c b/lasso/id-wsf-2.0/profile.c
index 69fc268c268b27e7c8953fba27fa99616a5daf51..963555ae0f21bec191e4e49bf7ace44032ae89ab 100644
--- a/lasso/id-wsf-2.0/profile.c
+++ b/lasso/id-wsf-2.0/profile.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
diff --git a/lasso/id-wsf-2.0/profile.h b/lasso/id-wsf-2.0/profile.h
index 0517afde1c6e1cc59ccfd149cb96b95abe9124ad..079342ddaabbaa9cdaf2efa41f54b358bcc24eba 100644
--- a/lasso/id-wsf-2.0/profile.h
+++ b/lasso/id-wsf-2.0/profile.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PROFILE_H__
diff --git a/lasso/id-wsf-2.0/saml2_login.c b/lasso/id-wsf-2.0/saml2_login.c
index 80346557962d76a343dbf639f256403942524616..dda37dc5605e3c18296d26832d6864a1b888371a 100644
--- a/lasso/id-wsf-2.0/saml2_login.c
+++ b/lasso/id-wsf-2.0/saml2_login.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "saml2_login.h"
diff --git a/lasso/id-wsf-2.0/saml2_login.h b/lasso/id-wsf-2.0/saml2_login.h
index d186ae990488be5176fd5c3b6a7ab62f832337b5..9d5eaafc68bd16512c07b4348ec6aaccaee5d3f6 100644
--- a/lasso/id-wsf-2.0/saml2_login.h
+++ b/lasso/id-wsf-2.0/saml2_login.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SAML2_LOGIN_PRIVATE_H__
diff --git a/lasso/id-wsf-2.0/server.c b/lasso/id-wsf-2.0/server.c
index dbe04d125f20d815feeb7fbb71e05fa365c02e33..26c6eddc2e100f8de006136d8695c867e3fcbf71 100644
--- a/lasso/id-wsf-2.0/server.c
+++ b/lasso/id-wsf-2.0/server.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "server.h"
diff --git a/lasso/id-wsf-2.0/server.h b/lasso/id-wsf-2.0/server.h
index 012c6672dc51a7d56e16832c9e05b9ce8e43bc8f..7a05fef0e45718e57f082f2769ed805611caabe9 100644
--- a/lasso/id-wsf-2.0/server.h
+++ b/lasso/id-wsf-2.0/server.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SERVER_H__
diff --git a/lasso/id-wsf-2.0/serverprivate.h b/lasso/id-wsf-2.0/serverprivate.h
index 6b287ae419bbd0f6c583302cf4c48b928525b5ce..85345dd1c311c1bb7d246a8aeeb60bcbc4401359 100644
--- a/lasso/id-wsf-2.0/serverprivate.h
+++ b/lasso/id-wsf-2.0/serverprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SERVERPRIVATE_H__
diff --git a/lasso/id-wsf-2.0/session.c b/lasso/id-wsf-2.0/session.c
index d226cabc022ed617d16d9c3e163ab27ef17e7907..ce23ec3225b621f62f7480e33949491a8db42d8e 100644
--- a/lasso/id-wsf-2.0/session.c
+++ b/lasso/id-wsf-2.0/session.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-wsf-2.0/session.h b/lasso/id-wsf-2.0/session.h
index ea36db9e6cea04a2f421f0ab7ee0df64cb249dee..509dbff87756b696f94eb86e9532454f39f623b2 100644
--- a/lasso/id-wsf-2.0/session.h
+++ b/lasso/id-wsf-2.0/session.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SESSION_H__
diff --git a/lasso/id-wsf-2.0/sessionprivate.h b/lasso/id-wsf-2.0/sessionprivate.h
index 951368b57a493b33035cf5f9583d6ff434d7252c..76ba2c0e16b27be52f6c982f874581455f560de9 100644
--- a/lasso/id-wsf-2.0/sessionprivate.h
+++ b/lasso/id-wsf-2.0/sessionprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SERVERPRIVATE_H__
diff --git a/lasso/id-wsf-2.0/soap_binding.c b/lasso/id-wsf-2.0/soap_binding.c
index 5e54b0360e7480340b29cb17f695d77f3ce2192c..c61cb73276383cc0155d52cc97ce9855f8e51c9c 100644
--- a/lasso/id-wsf-2.0/soap_binding.c
+++ b/lasso/id-wsf-2.0/soap_binding.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "soap_binding.h"
diff --git a/lasso/id-wsf-2.0/soap_binding.h b/lasso/id-wsf-2.0/soap_binding.h
index 39a443dd6aa5fb866fca81ed65b923df620d26f9..b533a50c4d111932c21a5f8b54e3d6c0b7954809 100644
--- a/lasso/id-wsf-2.0/soap_binding.h
+++ b/lasso/id-wsf-2.0/soap_binding.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SOAP_BINDING_H__
diff --git a/lasso/id-wsf/authentication.c b/lasso/id-wsf/authentication.c
index 5d997f4bba14e054c18fce2b1660e4e864d83023..55f249dde61dddad4110dbfa24de88543fda99f6 100644
--- a/lasso/id-wsf/authentication.c
+++ b/lasso/id-wsf/authentication.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../utils.h"
diff --git a/lasso/id-wsf/authentication.h b/lasso/id-wsf/authentication.h
index f83495017bcfefd5ab18e58afb8b36f5d9e67ced..968b1acb41b8ab2884b910834af8c1b931d5f54f 100644
--- a/lasso/id-wsf/authentication.h
+++ b/lasso/id-wsf/authentication.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_AUTHENTICATION_H__
diff --git a/lasso/id-wsf/data_service.c b/lasso/id-wsf/data_service.c
index bbed73b55d810392300bf5681e5ffef2b8f92a88..d69fece94a093eb5c917211b953597b572d9c661 100644
--- a/lasso/id-wsf/data_service.c
+++ b/lasso/id-wsf/data_service.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-wsf/data_service.h b/lasso/id-wsf/data_service.h
index 48520d860f1ed9af15ad7d7b4dee6a88f12fd966..f3f95e67cfe6296254b6777055ff4b55482a17db 100644
--- a/lasso/id-wsf/data_service.h
+++ b/lasso/id-wsf/data_service.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DATA_SERVICE_H__
diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c
index f30a00e9d89468e24847f2c83bddf87a923e02cb..c8c7cd8664a4d66866e1e84231f2bedd928bbae4 100644
--- a/lasso/id-wsf/discovery.c
+++ b/lasso/id-wsf/discovery.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-wsf/discovery.h b/lasso/id-wsf/discovery.h
index 9f3e34ad8fb984270e11ca2ebc1e964cfe1fd999..9d48f7a52b4c7530a6333e66ace0c6bed05eb069 100644
--- a/lasso/id-wsf/discovery.h
+++ b/lasso/id-wsf/discovery.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCOVERY_H__
diff --git a/lasso/id-wsf/id_ff_extensions.c b/lasso/id-wsf/id_ff_extensions.c
index 503cc4095e8d37dfdfc8085d6eaa06e8da2c926b..878c7971d9cc4d9fd7a578aa661e40cb766bf41e 100644
--- a/lasso/id-wsf/id_ff_extensions.c
+++ b/lasso/id-wsf/id_ff_extensions.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "id_ff_extensions.h"
diff --git a/lasso/id-wsf/id_ff_extensions.h b/lasso/id-wsf/id_ff_extensions.h
index ab39d2516570c5e66cc008ae5bf8158f46621474..6d968aa9232aa1d29b6fb5fbde8f9142fe0b4cc4 100644
--- a/lasso/id-wsf/id_ff_extensions.h
+++ b/lasso/id-wsf/id_ff_extensions.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSF_ID_FF_EXTENSIONS_H__
diff --git a/lasso/id-wsf/id_ff_extensions_private.h b/lasso/id-wsf/id_ff_extensions_private.h
index e076300b21aceeca1b3e14fd3754a06278b138ad..fbe723df5a093619f66cb46d0b4568289d51aa98 100644
--- a/lasso/id-wsf/id_ff_extensions_private.h
+++ b/lasso/id-wsf/id_ff_extensions_private.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSF_ID_FF_EXTENSIONS_H__
diff --git a/lasso/id-wsf/id_wsf.h b/lasso/id-wsf/id_wsf.h
index 44513be2ec17de1c610c4cc0f84ef41d3f0c779b..1e0d94c143994153e86b1a2a1d6a7e3550384c76 100644
--- a/lasso/id-wsf/id_wsf.h
+++ b/lasso/id-wsf/id_wsf.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDSWF_H__
diff --git a/lasso/id-wsf/interaction_profile_service.c b/lasso/id-wsf/interaction_profile_service.c
index 46c4018ee51b917dd3c8958c76be8067ba0dfcab..fb479daebb6177693d03967db20c2a728a2aad39 100644
--- a/lasso/id-wsf/interaction_profile_service.c
+++ b/lasso/id-wsf/interaction_profile_service.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "interaction_profile_service.h"
diff --git a/lasso/id-wsf/interaction_profile_service.h b/lasso/id-wsf/interaction_profile_service.h
index c8ea409225875c84213039f15876f4a0a53b7439..d06288ce091cdbe488cf1c12902ce189b2c0c418 100644
--- a/lasso/id-wsf/interaction_profile_service.h
+++ b/lasso/id-wsf/interaction_profile_service.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_INTERACTION_PROFILE_SERVICE_H__
diff --git a/lasso/id-wsf/personal_profile_service.c b/lasso/id-wsf/personal_profile_service.c
index ec6539c948fbf5bc1cbf771aa5c71b382b6f5025..5bd61b3f56a786667370b699cb9362c7b5dc5c18 100644
--- a/lasso/id-wsf/personal_profile_service.c
+++ b/lasso/id-wsf/personal_profile_service.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../xml/private.h"
diff --git a/lasso/id-wsf/personal_profile_service.h b/lasso/id-wsf/personal_profile_service.h
index 4f00133f7b6911d1b92e8c370f12bee86aeeeab3..e0f86cefbf0ed8df94616d59603e2a2e736701be 100644
--- a/lasso/id-wsf/personal_profile_service.h
+++ b/lasso/id-wsf/personal_profile_service.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_PERSONAL_PROFILE_SERVICE_H__
diff --git a/lasso/id-wsf/wsf_profile.c b/lasso/id-wsf/wsf_profile.c
index 72fc866a9c4ddff3be9b18396b74298c04a3634f..8cfe5a272c2e5008b799ebee03000a00cd5d312e 100644
--- a/lasso/id-wsf/wsf_profile.c
+++ b/lasso/id-wsf/wsf_profile.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../xml/private.h"
diff --git a/lasso/id-wsf/wsf_profile.h b/lasso/id-wsf/wsf_profile.h
index 2de27da223b148ee8675d896fef70f1dd28bdf03..aafd4dee0333042b22571f335e2e5a0f9136c5b4 100644
--- a/lasso/id-wsf/wsf_profile.h
+++ b/lasso/id-wsf/wsf_profile.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSF_PROFILE_H__
diff --git a/lasso/id-wsf/wsf_profile_private.h b/lasso/id-wsf/wsf_profile_private.h
index 70f2eb00c7b73b8fd58eb624bbaede71221c8c6f..340f3b8edf359a202d6a37b21624ab4b771866e6 100644
--- a/lasso/id-wsf/wsf_profile_private.h
+++ b/lasso/id-wsf/wsf_profile_private.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSF_PROFILE_PRIVATE_H__
diff --git a/lasso/id-wsf/wsf_utils.c b/lasso/id-wsf/wsf_utils.c
index efa889954b45e3796a6a91bf798af2b8b4e15eea..e4cdb4cba3ba6be200991e9eef18aa3ebefca144 100644
--- a/lasso/id-wsf/wsf_utils.c
+++ b/lasso/id-wsf/wsf_utils.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/id-wsf/wsf_utils.h b/lasso/id-wsf/wsf_utils.h
index 4ceac9fd6b693397fcd11473e5936052799fdadd..a585cdc678a27104a8363e910f1319f86b4f282e 100644
--- a/lasso/id-wsf/wsf_utils.h
+++ b/lasso/id-wsf/wsf_utils.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDSWF_UTILS_H__
diff --git a/lasso/key.c b/lasso/key.c
index 747492c6d84cf5e717b6bdd349993e91296587d3..1993cd551160efda6b471d5b353a02c962b640b9 100644
--- a/lasso/key.c
+++ b/lasso/key.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "key.h"
diff --git a/lasso/key.h b/lasso/key.h
index ca6241ad0fe9115bff1222ee52ef0b0c3f13f766..75309d6b6b61e3dc860b16f58b283ee0d41ca44f 100644
--- a/lasso/key.h
+++ b/lasso/key.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_KEY_H__
diff --git a/lasso/keyprivate.h b/lasso/keyprivate.h
index 22361680e69fcb108d67f4cfaff2dc1e4e055015..a59ab9356111d8fd26a7f96a547e1b756305c3aa 100644
--- a/lasso/keyprivate.h
+++ b/lasso/keyprivate.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_KEY_PRIVATE_H__
diff --git a/lasso/lasso.c b/lasso/lasso.c
index 3d127f9b53ae88e5e2c34c56da5c75c78ac8ff92..671c9adbe8d08f9cab09af6711223577de1b5bff 100644
--- a/lasso/lasso.c
+++ b/lasso/lasso.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/lasso.h b/lasso/lasso.h
index 614cdcf7037336c68c564cbe2ec0aefd9f707422..bf1036a1cc1554019ac11d42d55e45bea40bff59 100644
--- a/lasso/lasso.h
+++ b/lasso/lasso.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_H__
diff --git a/lasso/logging.c b/lasso/logging.c
index 180432e5689d8a3666bc75a351fe65db3ae5d900..33c7bfa9b8532dc6cd9f6eee4887b2cb6bf378c8 100644
--- a/lasso/logging.c
+++ b/lasso/logging.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "logging.h"
diff --git a/lasso/logging.h b/lasso/logging.h
index 5fe25ec9246d054b30b2ab753d4ee6fc534c5de1..d008a73b284942d9b33d3c174d42b22f731c2c16 100644
--- a/lasso/logging.h
+++ b/lasso/logging.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LOGGING_H__
diff --git a/lasso/registry-private.h b/lasso/registry-private.h
index fcb50aabcd99f847ddafe25b099c76f858a92717..413c1ad4690e1c116c18efc6ddd23340d3b345b5 100644
--- a/lasso/registry-private.h
+++ b/lasso/registry-private.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/lasso/registry.c b/lasso/registry.c
index 8eefd0cffc2bb6ddeeb648ceaa6d050ddeb8196e..0e998640a0852db396deec7b63814804a17de6f0 100644
--- a/lasso/registry.c
+++ b/lasso/registry.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/lasso/registry.h b/lasso/registry.h
index c570e8d74a26df7803dbf9a12ab9c59e611d7165..c70255bdc505bb706edf6e0fed44a01c29c499e9 100644
--- a/lasso/registry.h
+++ b/lasso/registry.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/lasso/saml-2.0/assertion_query.c b/lasso/saml-2.0/assertion_query.c
index 27288ccc4c64f54528208f39562293f603042fac..40fa47d808adfd8b7c289aea99aba685b54997f1 100644
--- a/lasso/saml-2.0/assertion_query.c
+++ b/lasso/saml-2.0/assertion_query.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../id-ff/session.h"
diff --git a/lasso/saml-2.0/assertion_query.h b/lasso/saml-2.0/assertion_query.h
index 7a7278fbd7714837fef3d3f8c260f0c0933f4e75..e2461628d776bfd4e866dc833979c41ac0117c67 100644
--- a/lasso/saml-2.0/assertion_query.h
+++ b/lasso/saml-2.0/assertion_query.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_ASSERTION_QUERY_H__
diff --git a/lasso/saml-2.0/ecp.c b/lasso/saml-2.0/ecp.c
index 52c909bd5d9b71d1e428172229533a170c1a109b..1bd6bf062f705bde15c0dd741d9a6c11587e1c78 100644
--- a/lasso/saml-2.0/ecp.c
+++ b/lasso/saml-2.0/ecp.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/saml-2.0/ecp.h b/lasso/saml-2.0/ecp.h
index 9936fc1a64d86d9f9f901cb39bbe954aa2aa511e..19bcac55841936d0132bd823cbd2fe4a615115c1 100644
--- a/lasso/saml-2.0/ecp.h
+++ b/lasso/saml-2.0/ecp.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_ECP_H__
diff --git a/lasso/saml-2.0/ecpprivate.h b/lasso/saml-2.0/ecpprivate.h
index 306c7edc4fda63a0223d0bff91822f2ea67471a2..ea318a3294ae60107c2f1080f782650632f618a3 100644
--- a/lasso/saml-2.0/ecpprivate.h
+++ b/lasso/saml-2.0/ecpprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_ECP_PRIVATE_H__
diff --git a/lasso/saml-2.0/federation.c b/lasso/saml-2.0/federation.c
index a1a6de8b05398041b229992b404e4b03303dabd3..5f51e312d1962522bbe670bcb9457e951b1f1f51 100644
--- a/lasso/saml-2.0/federation.c
+++ b/lasso/saml-2.0/federation.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/lasso/saml-2.0/federationprivate.h b/lasso/saml-2.0/federationprivate.h
index 58856ce6f64974e9a3596ff64466eccecc5bde4c..fbb863947e79e25ebc64ec546e18d0232bc7e202 100644
--- a/lasso/saml-2.0/federationprivate.h
+++ b/lasso/saml-2.0/federationprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML20_FEDERATION_PRIVATE_H__
diff --git a/lasso/saml-2.0/login.c b/lasso/saml-2.0/login.c
index ddd773b96aea83c33017b86156356754f0f29dba..4462f3c78312e8e707f53ae58445cf801752f2cb 100644
--- a/lasso/saml-2.0/login.c
+++ b/lasso/saml-2.0/login.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../xml/private.h"
diff --git a/lasso/saml-2.0/loginprivate.h b/lasso/saml-2.0/loginprivate.h
index b17a4b99e49c0da03cd908338ccf74befa5b34bc..7d73b7eb670d57a4228467374fc1ed980a583a0c 100644
--- a/lasso/saml-2.0/loginprivate.h
+++ b/lasso/saml-2.0/loginprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML20_LOGIN_PRIVATE_H__
diff --git a/lasso/saml-2.0/logout.c b/lasso/saml-2.0/logout.c
index ab47e357db41acfde9e5ef96e796b35515ac6c82..0e94eac0b24fe8020e18a42d885953c585e7fa25 100644
--- a/lasso/saml-2.0/logout.c
+++ b/lasso/saml-2.0/logout.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../xml/private.h"
diff --git a/lasso/saml-2.0/logoutprivate.h b/lasso/saml-2.0/logoutprivate.h
index ae10d9188962d9ab90d5321b458415b6eef9b3e6..2fe4f84dd0b047f23a6501373bc12d3b3e18b453 100644
--- a/lasso/saml-2.0/logoutprivate.h
+++ b/lasso/saml-2.0/logoutprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML20_LOGOUT_PRIVATE_H__
diff --git a/lasso/saml-2.0/name_id_management.c b/lasso/saml-2.0/name_id_management.c
index f633b561946ba1f3f239e38aa52c3ef81b818fd7..a679d1d7978367386a2d35ed8b40c86f59c117c6 100644
--- a/lasso/saml-2.0/name_id_management.c
+++ b/lasso/saml-2.0/name_id_management.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../xml/private.h"
diff --git a/lasso/saml-2.0/name_id_management.h b/lasso/saml-2.0/name_id_management.h
index 2e804c97729deccb91ff9c3212c52702fae6037c..cfabcbe38ccff56ce416f1c8d92f014375454636 100644
--- a/lasso/saml-2.0/name_id_management.h
+++ b/lasso/saml-2.0/name_id_management.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_NAME_ID_MANAGEMENT_H__
diff --git a/lasso/saml-2.0/profile.c b/lasso/saml-2.0/profile.c
index 6f51500fed661325c7a6055efe02e27c50e9159f..22a2fe3ba61e50058e388b309e2097344edc8d1c 100644
--- a/lasso/saml-2.0/profile.c
+++ b/lasso/saml-2.0/profile.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../xml/private.h"
diff --git a/lasso/saml-2.0/profile.h b/lasso/saml-2.0/profile.h
index 11916ce307e4ab1c413466faf91f4fd68f1ee365..d33cab703e69f610e1abc67798cee1c47f609b0a 100644
--- a/lasso/saml-2.0/profile.h
+++ b/lasso/saml-2.0/profile.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_PROFIL_H__
diff --git a/lasso/saml-2.0/profileprivate.h b/lasso/saml-2.0/profileprivate.h
index ce2479e5c9a57be00ce75299329494aff49627d4..afc86aaffcd85d14001c538d35d9fe0fc416bd48 100644
--- a/lasso/saml-2.0/profileprivate.h
+++ b/lasso/saml-2.0/profileprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML20_PROFILE_PRIVATE_H__
diff --git a/lasso/saml-2.0/provider.c b/lasso/saml-2.0/provider.c
index 9371d286a8b9f204d1d79764c312a3452e099298..314ca038beed34b67e32bec6e1c082cc800bd64d 100644
--- a/lasso/saml-2.0/provider.c
+++ b/lasso/saml-2.0/provider.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #define _POSIX_SOURCE
diff --git a/lasso/saml-2.0/provider.h b/lasso/saml-2.0/provider.h
index 25a6735e21559100b317c114c31be039afe92954..ac0c45fcccde3771414addc0897dbd1790319427 100644
--- a/lasso/saml-2.0/provider.h
+++ b/lasso/saml-2.0/provider.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML20_PROVIDER_H__
diff --git a/lasso/saml-2.0/providerprivate.h b/lasso/saml-2.0/providerprivate.h
index c26375acce9be3203c2086ed92cc43860cfdb0da..451fb92eb841d05326ee58d8719385dac5f4050e 100644
--- a/lasso/saml-2.0/providerprivate.h
+++ b/lasso/saml-2.0/providerprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML20_PROVIDER_PRIVATE_H__
diff --git a/lasso/saml-2.0/saml2_helper.c b/lasso/saml-2.0/saml2_helper.c
index 2fb3e9195960afa67450b92d10fe5fe64bbaafa2..729df7a5084532315d255f2460ff5164b8821621 100644
--- a/lasso/saml-2.0/saml2_helper.c
+++ b/lasso/saml-2.0/saml2_helper.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "saml2_helper.h"
diff --git a/lasso/saml-2.0/saml2_helper.h b/lasso/saml-2.0/saml2_helper.h
index 28d47ad8f5ef0e7cbd59190b3d9b59d7dfdbf7fd..704ba6041616311b2fc56a23f31a99856958fa42 100644
--- a/lasso/saml-2.0/saml2_helper.h
+++ b/lasso/saml-2.0/saml2_helper.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML20_SAML2_HELPER_H__
diff --git a/lasso/saml-2.0/server.c b/lasso/saml-2.0/server.c
index cac2d89bcfef246f9ae5bc5e2d1ad2d5a4a6690a..0d157cc8f928aea836868a1fd02791adeed0127b 100644
--- a/lasso/saml-2.0/server.c
+++ b/lasso/saml-2.0/server.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <xmlsec/xmltree.h>
diff --git a/lasso/saml-2.0/serverprivate.h b/lasso/saml-2.0/serverprivate.h
index aab2a85ed67d6b3a75e9062798a8aec7c5350aac..5315ed505690192924d335094f573df73446779c 100644
--- a/lasso/saml-2.0/serverprivate.h
+++ b/lasso/saml-2.0/serverprivate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML20_SERVER_PRIVATE_H__
diff --git a/lasso/utils.c b/lasso/utils.c
index 7c81f65007f7996f11ad6085e9f9a64b1161cdff..f7a305b92c5545f7b2f60ff4f1d870d8fbf4d831 100644
--- a/lasso/utils.c
+++ b/lasso/utils.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
diff --git a/lasso/utils.h b/lasso/utils.h
index 9526e0ed1c4ba97faede0064e5f60f08d7bd0dc3..b366b2d1d78cee974fc0166a39d839e8125905f2 100644
--- a/lasso/utils.h
+++ b/lasso/utils.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_UTILS_H__
diff --git a/lasso/xml/disco_authenticate_requester.c b/lasso/xml/disco_authenticate_requester.c
index 57849221c9180ddcfd5664a138129fa1c3a27afb..71459464ae137d1c4118794d797bc60f42569b31 100644
--- a/lasso/xml/disco_authenticate_requester.c
+++ b/lasso/xml/disco_authenticate_requester.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_authenticate_requester.h b/lasso/xml/disco_authenticate_requester.h
index a913938e2c108ac43d6e3156a9cd7b3912c08506..5b1cdc94683503b93cf1b4f37ab99a2c36d51426 100644
--- a/lasso/xml/disco_authenticate_requester.h
+++ b/lasso/xml/disco_authenticate_requester.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_AUTHENTICATE_REQUESTER_H__
diff --git a/lasso/xml/disco_authenticate_session_context.c b/lasso/xml/disco_authenticate_session_context.c
index 9434b858dc07effcef312b48ae524db3be690e77..9f2495dce9dca3c1fb178bc09967e91f90392c84 100644
--- a/lasso/xml/disco_authenticate_session_context.c
+++ b/lasso/xml/disco_authenticate_session_context.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_authenticate_session_context.h b/lasso/xml/disco_authenticate_session_context.h
index 219c366b609b147bc35c4f64149be36191cdb3d6..8e717be8339cc8f9159a26a76cdf7ad91b141e21 100644
--- a/lasso/xml/disco_authenticate_session_context.h
+++ b/lasso/xml/disco_authenticate_session_context.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_AUTHENTICATE_SESSION_CONTEXT_H__
diff --git a/lasso/xml/disco_authorize_requester.c b/lasso/xml/disco_authorize_requester.c
index 70daaaee5f9818f87725954d2651bbb03220eb67..b566ab5e35f34a1d078ddacc3153310223c2827a 100644
--- a/lasso/xml/disco_authorize_requester.c
+++ b/lasso/xml/disco_authorize_requester.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_authorize_requester.h b/lasso/xml/disco_authorize_requester.h
index 0439c0562467bfa950a96717a9f372c11e44ca85..d527e2e2aef8ce119732951cbf14c846d9bdef0d 100644
--- a/lasso/xml/disco_authorize_requester.h
+++ b/lasso/xml/disco_authorize_requester.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_AUTHORIZE_REQUESTER_H__
diff --git a/lasso/xml/disco_credentials.c b/lasso/xml/disco_credentials.c
index 6d8c8856c283d5c353abf093db85a46500f1f245..0115d8617a62477a8fcff08f64835f3afe5ad18c 100644
--- a/lasso/xml/disco_credentials.c
+++ b/lasso/xml/disco_credentials.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_credentials.h b/lasso/xml/disco_credentials.h
index d18d9c10f8aad9bd2fef713499093c490ce4676f..d47930bd41849b6f753b1325e5ef61202ccd58fb 100644
--- a/lasso/xml/disco_credentials.h
+++ b/lasso/xml/disco_credentials.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_CREDENTIALS_H__
diff --git a/lasso/xml/disco_description.c b/lasso/xml/disco_description.c
index 30af079b4e94c844845199934479222f5c691fed..5c202ecb17025ffa3b3c2af267a0c43eb9bac8aa 100644
--- a/lasso/xml/disco_description.c
+++ b/lasso/xml/disco_description.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_description.h b/lasso/xml/disco_description.h
index dd3614821bdfd8585caa60489681efb71f0cfb50..41ce59f69b7e4180f9ef2fc12de5fe563f7b48a3 100644
--- a/lasso/xml/disco_description.h
+++ b/lasso/xml/disco_description.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_DESCRIPTION_H__
diff --git a/lasso/xml/disco_encrypt_resource_id.c b/lasso/xml/disco_encrypt_resource_id.c
index 3707635b303c666e956e98c140e102a259b0c905..970b704f1f1b21ee4fe7d7c996bb47303dacf5c7 100644
--- a/lasso/xml/disco_encrypt_resource_id.c
+++ b/lasso/xml/disco_encrypt_resource_id.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_encrypt_resource_id.h b/lasso/xml/disco_encrypt_resource_id.h
index 571af40d22cbcd353a4dad3f1465d2b267b8c02b..2d5c1ee7721f607bedec10884da8ce068f5e2893 100644
--- a/lasso/xml/disco_encrypt_resource_id.h
+++ b/lasso/xml/disco_encrypt_resource_id.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_ENCRYPT_RESOURCE_ID_H__
diff --git a/lasso/xml/disco_encrypted_resource_id.c b/lasso/xml/disco_encrypted_resource_id.c
index 0c40aace0dc37528d755d55f168cec91fba06fe9..ad56e36a6a050b6e8a79e258da4abde090802294 100644
--- a/lasso/xml/disco_encrypted_resource_id.c
+++ b/lasso/xml/disco_encrypted_resource_id.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_encrypted_resource_id.h b/lasso/xml/disco_encrypted_resource_id.h
index b4098808ea4ebc212986b2a55754ff80f81db16d..d48693bec41872459fb9de275160772b4eec1081 100644
--- a/lasso/xml/disco_encrypted_resource_id.h
+++ b/lasso/xml/disco_encrypted_resource_id.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_ENCRYPTED_RESOURCE_ID_H__
diff --git a/lasso/xml/disco_generate_bearer_token.c b/lasso/xml/disco_generate_bearer_token.c
index e5e17c8a1dc92e881b3e8ef8317008ac283652cc..bc349662262c95ad5cf564d15e1bc26d8f8b4a62 100644
--- a/lasso/xml/disco_generate_bearer_token.c
+++ b/lasso/xml/disco_generate_bearer_token.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_generate_bearer_token.h b/lasso/xml/disco_generate_bearer_token.h
index 3fbd39c10d2fb0aac2a9330492c08d869d4404f7..2480f09d87ecdf454526bb9f6be38d7d8d417d47 100644
--- a/lasso/xml/disco_generate_bearer_token.h
+++ b/lasso/xml/disco_generate_bearer_token.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_GENERATE_BEARER_TOKEN_H__
diff --git a/lasso/xml/disco_insert_entry.c b/lasso/xml/disco_insert_entry.c
index d2da5707cfa11338070c5d9088eac10a0b0a0595..e7287b26fa854877266f872b72ddc8db865a885f 100644
--- a/lasso/xml/disco_insert_entry.c
+++ b/lasso/xml/disco_insert_entry.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_insert_entry.h b/lasso/xml/disco_insert_entry.h
index d9a0aebda7f0f35b3b556ce7c36847d878be7c9b..0d67bbe5a25cfd587c3f1aeb38b59b5e54b52565 100644
--- a/lasso/xml/disco_insert_entry.h
+++ b/lasso/xml/disco_insert_entry.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_INSERT_ENTRY_H__
diff --git a/lasso/xml/disco_modify.c b/lasso/xml/disco_modify.c
index 7618dc935c54ab584d680376e69f0d66b44f602c..6b376fb9fd2a489a20139bef3dcdd477f31379b2 100644
--- a/lasso/xml/disco_modify.c
+++ b/lasso/xml/disco_modify.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_modify.h b/lasso/xml/disco_modify.h
index 9121ef544550ec66e69fc8e07945ae1d66c7fe08..cba5e7aa3b40f1e5df54b2948e9e6191a8033222 100644
--- a/lasso/xml/disco_modify.h
+++ b/lasso/xml/disco_modify.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_MODIFY_H__
diff --git a/lasso/xml/disco_modify_response.c b/lasso/xml/disco_modify_response.c
index 63a876bc216f15b862eb872113751d8eb5dde475..acc182fde5153763fd7c17cee6155f5d1c1f8759 100644
--- a/lasso/xml/disco_modify_response.c
+++ b/lasso/xml/disco_modify_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_modify_response.h b/lasso/xml/disco_modify_response.h
index e2decc5212416c03fdc4bf33d2e7acc35f5b17a8..effe7f8f2db2f55a8b482939d574ac5d64909144 100644
--- a/lasso/xml/disco_modify_response.h
+++ b/lasso/xml/disco_modify_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_MODIFY_RESPONSE_H__
diff --git a/lasso/xml/disco_options.c b/lasso/xml/disco_options.c
index d91f340b587c86b87445eff04283c6110ddca6e4..64aec4006788efeda8adb148c8737dae6ee91597 100644
--- a/lasso/xml/disco_options.c
+++ b/lasso/xml/disco_options.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_options.h b/lasso/xml/disco_options.h
index 1ce12b53546ba8efa356264eee3ee64c68a46729..06503a7652858fb956cbd946331bbacbdfcdc7a7 100644
--- a/lasso/xml/disco_options.h
+++ b/lasso/xml/disco_options.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_OPTIONS_H__
diff --git a/lasso/xml/disco_query.c b/lasso/xml/disco_query.c
index fe9e57b2783cedbd8f15cad36e187ccf2aead9d3..358c736ecba6d635ffa3909b7232d534fe1bba50 100644
--- a/lasso/xml/disco_query.c
+++ b/lasso/xml/disco_query.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_query.h b/lasso/xml/disco_query.h
index a56732e5808eab50ff5f67f3c36e7fd3261409fb..ca41fd613942889ca9ff1b4c8730c5b2313d75a3 100644
--- a/lasso/xml/disco_query.h
+++ b/lasso/xml/disco_query.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_QUERY_H__
diff --git a/lasso/xml/disco_query_response.c b/lasso/xml/disco_query_response.c
index 0d9c45b20bcbda65b420ce1ba9147b2978e4c824..98a18006e1bb27f6d043af638ac5e9a60c59d1c5 100644
--- a/lasso/xml/disco_query_response.c
+++ b/lasso/xml/disco_query_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_query_response.h b/lasso/xml/disco_query_response.h
index 669c11f41f5e807dc77865dce79a2436288f6a8a..79047f1788b998e9470d4d42027491dd76dabeb8 100644
--- a/lasso/xml/disco_query_response.h
+++ b/lasso/xml/disco_query_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_QUERY_RESPONSE_H__
diff --git a/lasso/xml/disco_remove_entry.c b/lasso/xml/disco_remove_entry.c
index c146b1186fa90091b41c9b1b3ba18303cf831ddd..7a01f07da2114b7b2180d273c0f46b1741faf43f 100644
--- a/lasso/xml/disco_remove_entry.c
+++ b/lasso/xml/disco_remove_entry.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_remove_entry.h b/lasso/xml/disco_remove_entry.h
index 8798fecbe1a0e6cb86d936e4cc156103e8384389..80697197d5b09f587982e1af8a5dbcd6f5950178 100644
--- a/lasso/xml/disco_remove_entry.h
+++ b/lasso/xml/disco_remove_entry.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_REMOVE_ENTRY_H__
diff --git a/lasso/xml/disco_requested_service_type.c b/lasso/xml/disco_requested_service_type.c
index 79d9eb77ee078ff95a8cf915bb0c0ef08aac930e..82abc72ce79d840a3d2d00295e8afe64b564e434 100644
--- a/lasso/xml/disco_requested_service_type.c
+++ b/lasso/xml/disco_requested_service_type.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_requested_service_type.h b/lasso/xml/disco_requested_service_type.h
index 63a9d675245c725238b191391cdadfc3dfa276cd..b0efc8210cc2cf21129341484dd85424132dd13f 100644
--- a/lasso/xml/disco_requested_service_type.h
+++ b/lasso/xml/disco_requested_service_type.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_REQUESTED_SERVICE_TYPE_H__
diff --git a/lasso/xml/disco_resource_id.c b/lasso/xml/disco_resource_id.c
index 7831f32f9c9cee98067e0761c4eda4f4cb06875b..3159ca8cd62fb9dd3fd60f473b2eafbc9805e16c 100644
--- a/lasso/xml/disco_resource_id.c
+++ b/lasso/xml/disco_resource_id.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_resource_id.h b/lasso/xml/disco_resource_id.h
index 5fb1241974039ebfb9fb50aa48532a65d0908e7b..38ba802893e44621a8c7996e75ec022bec8dd149 100644
--- a/lasso/xml/disco_resource_id.h
+++ b/lasso/xml/disco_resource_id.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_RESOURCE_ID_H__
diff --git a/lasso/xml/disco_resource_offering.c b/lasso/xml/disco_resource_offering.c
index d18d6946f65607c22a3596b73ad527b04828fdc1..e83494272d9327bc6e625dd5d6f49925a25f14b5 100644
--- a/lasso/xml/disco_resource_offering.c
+++ b/lasso/xml/disco_resource_offering.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_resource_offering.h b/lasso/xml/disco_resource_offering.h
index 0b0fef90829280906963601166ad129ed894f9d6..5573d5ff5c4b5eaa09e7b3a514335c7a7be7195a 100644
--- a/lasso/xml/disco_resource_offering.h
+++ b/lasso/xml/disco_resource_offering.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_RESOURCE_OFFERING_H__
diff --git a/lasso/xml/disco_send_single_logout.c b/lasso/xml/disco_send_single_logout.c
index 0c58fca66299c9f00c31e3787ea16864a1576844..e6e86d7993b0d7daece5d04e012b7d41fca00ab0 100644
--- a/lasso/xml/disco_send_single_logout.c
+++ b/lasso/xml/disco_send_single_logout.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_send_single_logout.h b/lasso/xml/disco_send_single_logout.h
index dbb16c42df9be37ddfab0379d467c2729d964863..9b4f5b3123f30781ceec63d9964b9e72481d7ce0 100644
--- a/lasso/xml/disco_send_single_logout.h
+++ b/lasso/xml/disco_send_single_logout.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_SEND_SINGLE_LOGOUT_H__
diff --git a/lasso/xml/disco_service_instance.c b/lasso/xml/disco_service_instance.c
index 171fe167c0692db135e466a144d148eb21a58345..dba54085bd0f6c8dee0b462083dd2a5b7850ed30 100644
--- a/lasso/xml/disco_service_instance.c
+++ b/lasso/xml/disco_service_instance.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/disco_service_instance.h b/lasso/xml/disco_service_instance.h
index 10999818607e901afb35d68bb40f3e8141e9c1db..ecd0ccb0a33f405bc4b6bbb1552c796780a4ad28 100644
--- a/lasso/xml/disco_service_instance.h
+++ b/lasso/xml/disco_service_instance.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DISCO_SERVICE_INSTANCE_H__
diff --git a/lasso/xml/dsig/ds_key_info.c b/lasso/xml/dsig/ds_key_info.c
index f47494898492b77911d92565eabfc9843c132d91..4247544905e7842a15cd4a674a65afc19f6b53e2 100644
--- a/lasso/xml/dsig/ds_key_info.c
+++ b/lasso/xml/dsig/ds_key_info.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/dsig/ds_key_info.h b/lasso/xml/dsig/ds_key_info.h
index 003d1da248bc036f09d6bf9ace55d3477c75f3bd..d485743440b1b62055f4d4a840d7584aef899ffe 100644
--- a/lasso/xml/dsig/ds_key_info.h
+++ b/lasso/xml/dsig/ds_key_info.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DS_KEY_INFO_H__
diff --git a/lasso/xml/dsig/ds_key_value.c b/lasso/xml/dsig/ds_key_value.c
index ab7b2cf433d11912fee6a4d2aa0b7d6b0fe28737..765caa7806b1d092975d139c3e37c3125a495284 100644
--- a/lasso/xml/dsig/ds_key_value.c
+++ b/lasso/xml/dsig/ds_key_value.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/dsig/ds_key_value.h b/lasso/xml/dsig/ds_key_value.h
index bb5ff338354af9a035a9c6a77e3555a557e70fc3..f6d390667f25ffd435365882af07ccc1d29e5648 100644
--- a/lasso/xml/dsig/ds_key_value.h
+++ b/lasso/xml/dsig/ds_key_value.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DS_KEY_VALUE_H__
diff --git a/lasso/xml/dsig/ds_rsa_key_value.c b/lasso/xml/dsig/ds_rsa_key_value.c
index f61666528768a3a3f0d43c408512f403becaa646..8b3049ac9875116ee95c80bf838c3826966d65a5 100644
--- a/lasso/xml/dsig/ds_rsa_key_value.c
+++ b/lasso/xml/dsig/ds_rsa_key_value.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/dsig/ds_rsa_key_value.h b/lasso/xml/dsig/ds_rsa_key_value.h
index 51bf4f70181cb98711e96f6892dfa2b684f0a61e..e849e58ee974acb8e5ddacaaf37c1a6337760cc8 100644
--- a/lasso/xml/dsig/ds_rsa_key_value.h
+++ b/lasso/xml/dsig/ds_rsa_key_value.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DS_RSA_KEY_VALUE_H__
diff --git a/lasso/xml/dsig/ds_x509_data.c b/lasso/xml/dsig/ds_x509_data.c
index ef3a88c793aeef7d0e9f3ced25df9102adfeef27..01b50f7fff41099261e54853488e58ae6b850358 100644
--- a/lasso/xml/dsig/ds_x509_data.c
+++ b/lasso/xml/dsig/ds_x509_data.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/dsig/ds_x509_data.h b/lasso/xml/dsig/ds_x509_data.h
index a6d2e4512fe2fa67e1a4ab45f515dd95f0b5f036..1ff34fb4bfe14d5dfd2ebc66fea4bae2cf49eae2 100644
--- a/lasso/xml/dsig/ds_x509_data.h
+++ b/lasso/xml/dsig/ds_x509_data.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DS_X509_DATA_H__
diff --git a/lasso/xml/dsig/strings.h b/lasso/xml/dsig/strings.h
index a4c534a840ecac63053e414795212e92a9998a19..8408a85f3a6e3f589f93e1ae52f3d4c0f1849156 100644
--- a/lasso/xml/dsig/strings.h
+++ b/lasso/xml/dsig/strings.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/lasso/xml/dsig/xml_dsig.h b/lasso/xml/dsig/xml_dsig.h
index dcafcc6be5d0609b29033d1a22167160ef4c02db..69065c11d49f1a6c629fb3a8931240ba6fd982b2 100644
--- a/lasso/xml/dsig/xml_dsig.h
+++ b/lasso/xml/dsig/xml_dsig.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_XML_DSIG_H__
diff --git a/lasso/xml/dst_data.c b/lasso/xml/dst_data.c
index 04cc53ff9f247a392d6e72402398267bc5cadcd2..1e27c333b785929a87fd6a296c7d6d2ecea42115 100644
--- a/lasso/xml/dst_data.c
+++ b/lasso/xml/dst_data.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/dst_data.h b/lasso/xml/dst_data.h
index 160aafbe24d256feeeabafa268619e217328b27a..d6e87ba530eba4084c416e24d3fe17a14c7feb52 100644
--- a/lasso/xml/dst_data.h
+++ b/lasso/xml/dst_data.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DST_DATA_H__
diff --git a/lasso/xml/dst_modification.c b/lasso/xml/dst_modification.c
index 8b0ce21ade50a7359eacd330aa4c5dcf6d513944..aac7e38d30cbf373feb4f24f76ef2f2a48f8c75a 100644
--- a/lasso/xml/dst_modification.c
+++ b/lasso/xml/dst_modification.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/dst_modification.h b/lasso/xml/dst_modification.h
index 6d8ab58e86387cbce3c9709ee4e60c0d793aeb09..6374beb9c155b06d1c68acc1e53283e816676a63 100644
--- a/lasso/xml/dst_modification.h
+++ b/lasso/xml/dst_modification.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DST_MODIFICATION_H__
diff --git a/lasso/xml/dst_modify.c b/lasso/xml/dst_modify.c
index 506ab344e1a9abea670e2a7242437571203164dd..e5ad80959056311232a52ff680b062e27b6b67fe 100644
--- a/lasso/xml/dst_modify.c
+++ b/lasso/xml/dst_modify.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/dst_modify.h b/lasso/xml/dst_modify.h
index 7a32ab7f7507b2ad8912debc28639f1333a8a98f..b1ae2eea8f08348ae6f6355e49004ebf9fa034a3 100644
--- a/lasso/xml/dst_modify.h
+++ b/lasso/xml/dst_modify.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DST_MODIFY_H__
diff --git a/lasso/xml/dst_modify_response.c b/lasso/xml/dst_modify_response.c
index 20b1c257bc0f204d8b1dec4796b95d2c0c323b25..d9ab8c76e568e8eac74dbcb2a6d72abbeba0bdb1 100644
--- a/lasso/xml/dst_modify_response.c
+++ b/lasso/xml/dst_modify_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/dst_modify_response.h b/lasso/xml/dst_modify_response.h
index 5ceed477febc7f37a8d2c1ff08d5ad5aafece615..595aa83855b695561149feacf1cb1794a209391e 100644
--- a/lasso/xml/dst_modify_response.h
+++ b/lasso/xml/dst_modify_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DST_MODIFY_RESPONSE_H__
diff --git a/lasso/xml/dst_new_data.c b/lasso/xml/dst_new_data.c
index 64680cbbc3eaee0769743422865e03f04cd35c6c..83780166f68c40f243b1f88d757f18233b7b5e78 100644
--- a/lasso/xml/dst_new_data.c
+++ b/lasso/xml/dst_new_data.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/dst_new_data.h b/lasso/xml/dst_new_data.h
index 64c972c01744aa0d86b0e68547c1812eac57afe0..2f96f7cce10b5b5d338dccfca0dcbdec90874b85 100644
--- a/lasso/xml/dst_new_data.h
+++ b/lasso/xml/dst_new_data.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DST_NEW_DATA_H__
diff --git a/lasso/xml/dst_query.c b/lasso/xml/dst_query.c
index f6efd880d5ab2aad0efba2274fd77c17f758d8ab..9f7e0b60c75c1efc6755033018c1c4e3d554e1d4 100644
--- a/lasso/xml/dst_query.c
+++ b/lasso/xml/dst_query.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/dst_query.h b/lasso/xml/dst_query.h
index 97076281e27df0226e2bd1a8b9e9c0ee73dcebb1..6c84284e2dd9fab9aa5f1050fc5502aac7a52785 100644
--- a/lasso/xml/dst_query.h
+++ b/lasso/xml/dst_query.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DST_QUERY_H__
diff --git a/lasso/xml/dst_query_item.c b/lasso/xml/dst_query_item.c
index 552b04ac0a987afdcd05f9527b302d888f252693..49518c6106569aa34c8802f9b61e3a2d50eab2b2 100644
--- a/lasso/xml/dst_query_item.c
+++ b/lasso/xml/dst_query_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/dst_query_item.h b/lasso/xml/dst_query_item.h
index 90e12f75e0fb5b9fd1f5c0c8660369e785a81e88..1e8db1c38e2526ab624a216fd9513f6acc5499c3 100644
--- a/lasso/xml/dst_query_item.h
+++ b/lasso/xml/dst_query_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DST_QUERY_ITEM_H__
diff --git a/lasso/xml/dst_query_response.c b/lasso/xml/dst_query_response.c
index e4848bb61f26f54346788e363213e14a090b8d03..6944bcf12598f8e5af86b0f998c25eea232a8bd1 100644
--- a/lasso/xml/dst_query_response.c
+++ b/lasso/xml/dst_query_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/dst_query_response.h b/lasso/xml/dst_query_response.h
index 7835ed540b92eda6e01a25349d4f30611a934382..da26bb3d59710dfaa6ffc3383ec29c32e2598355 100644
--- a/lasso/xml/dst_query_response.h
+++ b/lasso/xml/dst_query_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_DST_QUERY_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_abstract.c b/lasso/xml/id-wsf-2.0/disco_abstract.c
index 9cf3019c7533c2b16b969c085041b0412a869de2..e6452bcfd0842e51ccc95c736acfbc8596f067e8 100644
--- a/lasso/xml/id-wsf-2.0/disco_abstract.c
+++ b/lasso/xml/id-wsf-2.0/disco_abstract.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_abstract.h b/lasso/xml/id-wsf-2.0/disco_abstract.h
index 242939327898563ace418cbf7a81737871fb480e..6d0f5d2c37e6d0f2366ccc597d58073c6a94e482 100644
--- a/lasso/xml/id-wsf-2.0/disco_abstract.h
+++ b/lasso/xml/id-wsf-2.0/disco_abstract.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_ABSTRACT_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
index cf9aae6faac1b7e92820698581793e02642b0971..368696121f5ee925736132223f42c02c38882d34 100644
--- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_endpoint_context.h b/lasso/xml/id-wsf-2.0/disco_endpoint_context.h
index a2510a115bc71ca1fdeee43f393823f6bc44a6d0..88531db7e510c80f1e4246eaee812775da05d805 100644
--- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.h
+++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_keys.c b/lasso/xml/id-wsf-2.0/disco_keys.c
index d6519c3ab18a6642a7e1ad16ebdf36574d2f58d9..9cd41cea9d2842b7bd9d99f56aab3664970d2ed0 100644
--- a/lasso/xml/id-wsf-2.0/disco_keys.c
+++ b/lasso/xml/id-wsf-2.0/disco_keys.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_keys.h b/lasso/xml/id-wsf-2.0/disco_keys.h
index 3d867068e207356597eac730eeb4a3fce75196a9..0fd83b025e825f049af7d8eb85b91d939f1c68dd 100644
--- a/lasso/xml/id-wsf-2.0/disco_keys.h
+++ b/lasso/xml/id-wsf-2.0/disco_keys.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_KEYS_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_options.c b/lasso/xml/id-wsf-2.0/disco_options.c
index a82b1d1d897fb4cd2a96d1bea3ffe4a4d7eed976..bb534543ccbcbe72d72e0a0a7ff82bd4181ddb8a 100644
--- a/lasso/xml/id-wsf-2.0/disco_options.c
+++ b/lasso/xml/id-wsf-2.0/disco_options.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_options.h b/lasso/xml/id-wsf-2.0/disco_options.h
index 3e3c5a23466cccfae82beca1235b9b9be015722b..d77545923ec44e9a1326f73cf41b53a32c6fa8b7 100644
--- a/lasso/xml/id-wsf-2.0/disco_options.h
+++ b/lasso/xml/id-wsf-2.0/disco_options.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_OPTIONS_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_provider_id.c b/lasso/xml/id-wsf-2.0/disco_provider_id.c
index edb2023eb33f4bac16350f57d99655f1c205f67e..5f7ab78a2b3c72ba3a9858e042944cb27320473c 100644
--- a/lasso/xml/id-wsf-2.0/disco_provider_id.c
+++ b/lasso/xml/id-wsf-2.0/disco_provider_id.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_provider_id.h b/lasso/xml/id-wsf-2.0/disco_provider_id.h
index 0bc90777657931b21a35ecca128a9510cabf798d..b6d6612d476cd3086dfff648d5d9d02ccfe2c5e0 100644
--- a/lasso/xml/id-wsf-2.0/disco_provider_id.h
+++ b/lasso/xml/id-wsf-2.0/disco_provider_id.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_PROVIDER_ID_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_query.c b/lasso/xml/id-wsf-2.0/disco_query.c
index 5e72e417e715190e2ade5439c73bfd87e74ad114..b81e4f360f04086795932a6d8555bfc07391f441 100644
--- a/lasso/xml/id-wsf-2.0/disco_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_query.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_query.h b/lasso/xml/id-wsf-2.0/disco_query.h
index ac078059d683476cae224e34f773faabe66262c8..67d23698ab48c023fd948b48b65e58179ffdee87 100644
--- a/lasso/xml/id-wsf-2.0/disco_query.h
+++ b/lasso/xml/id-wsf-2.0/disco_query.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_QUERY_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_query_response.c b/lasso/xml/id-wsf-2.0/disco_query_response.c
index 628ae26e4745f6bfaf25070991b01c1b323ed86d..8cb21d25a5c93fc952681304c2210f551fcd8b9a 100644
--- a/lasso/xml/id-wsf-2.0/disco_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_query_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_query_response.h b/lasso/xml/id-wsf-2.0/disco_query_response.h
index 1588bf759bc9af5e580b1515472bee80b12d2766..69d73d5fa027cead29efe64e257339e7da043cce 100644
--- a/lasso/xml/id-wsf-2.0/disco_query_response.h
+++ b/lasso/xml/id-wsf-2.0/disco_query_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_QUERY_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_requested_service.c b/lasso/xml/id-wsf-2.0/disco_requested_service.c
index 0f79ce476af517a5a96d7cac3a9da3103742f450..de0373ae7533fac31541519e2aa0431636a75573 100644
--- a/lasso/xml/id-wsf-2.0/disco_requested_service.c
+++ b/lasso/xml/id-wsf-2.0/disco_requested_service.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_requested_service.h b/lasso/xml/id-wsf-2.0/disco_requested_service.h
index eef48e598e5b2178dfb70ac07a06e67cfaffd754..3aede2e7d435983421e5975ab0b3f9798ac04e39 100644
--- a/lasso/xml/id-wsf-2.0/disco_requested_service.h
+++ b/lasso/xml/id-wsf-2.0/disco_requested_service.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_REQUESTED_SERVICE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_security_context.c b/lasso/xml/id-wsf-2.0/disco_security_context.c
index ec81254effc6176d8954ea14012ece819ac7dd2b..42518a829e9d7aa95efe873e7cdf24ec8ce75153 100644
--- a/lasso/xml/id-wsf-2.0/disco_security_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_security_context.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_security_context.h b/lasso/xml/id-wsf-2.0/disco_security_context.h
index 3491cb41785c00e4ac0f744df71fc5575ad49fb9..a2c2e7d6e83424d238f3fe5c196419bd7d17c30c 100644
--- a/lasso/xml/id-wsf-2.0/disco_security_context.h
+++ b/lasso/xml/id-wsf-2.0/disco_security_context.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SECURITY_CONTEXT_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_service_context.c b/lasso/xml/id-wsf-2.0/disco_service_context.c
index ebb51cd16ff6b16f46081ecf5182020fb301c90e..c51be7bb3e7b42c3f331e54e2c89e62d50c94f66 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_service_context.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_service_context.h b/lasso/xml/id-wsf-2.0/disco_service_context.h
index 6ad08583758d1eb77413d129fcb4104b1f8632a9..c2f92526bf3ed3603d0ec4020c86544d4d4bc6ce 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_context.h
+++ b/lasso/xml/id-wsf-2.0/disco_service_context.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SERVICE_CONTEXT_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_service_type.c b/lasso/xml/id-wsf-2.0/disco_service_type.c
index 23b4086b42b1e40c3aa276700e82e0ee97dfd897..a93881f1513be88a31f27efc4d49ce9458496b53 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_type.c
+++ b/lasso/xml/id-wsf-2.0/disco_service_type.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_service_type.h b/lasso/xml/id-wsf-2.0/disco_service_type.h
index a3525748cceba9d11c49d33171fd62b33c57e4aa..d4c4c8283822a5793bd0ff63e7c80724e3ffe562 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_type.h
+++ b/lasso/xml/id-wsf-2.0/disco_service_type.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SERVICE_TYPE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c
index 11422a62c9d25f094dec5cf4188b1ee407a23b28..1aa9217f62744b0bc817f16649423a58ef57ca03 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h
index a4e8f66dd797dfe0457382aea365c32ba081d264..d42a125b1e153c80900e31c4671e3af6a16be412 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_ADD_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c
index 262e4dd4aa56070b0313748e704c611265a4ed8a..575f0f0c4455a51263c2bbd27c91b860a80b903a 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h
index 8d474aa9c0ec155a871bf9fcaf67e300fa14b144..e1ed74a842c2d20b3b9f718af36ff79f04912241 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_ADD_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c
index 040421067f7ead6510aab2a49258dd4f514f9004..d17134f7159eed6d7e908113ad3529845c661bd8 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h
index 4e6f16f57381e1f3658880db227ad88ba77d2128..53a957c8b34c928def6a6b06263166a63cb6e816 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c
index 287affc7496071f431fe0be58ecb32883e738ef1..c17c7b076cada73046c0066973cfae483dd9b39a 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h
index 5aa51fc77ef92bff43af251fc6891f7320a6ab32..54afd3df31b8744fc55ac3279cf56b5d323f5a40 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c
index 9b1918b6b76ceb11eb9425e12eed721c95b033d8..2ff348877063b5aa96bf04af86de7e96a3fd1d7e 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h
index 00a74f38827cbf4804a68c8f0d8035d8dc92559b..9b738870c4427467ee66de225739a94520560be5 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c
index 774820a1c09042b4e94c9a0bb1c606053e87bd37..0369509f68c7d9e68b1938c46bee691c53d60791 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h
index e7abeac151cfc90a7fa69b912aa29384b0dc090c..b0f5f3cfaa2b492bc1c5a7d78d08841182bf1eb3 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c
index 580c98c204e1e05d2b84eb30d70d627bbb8dfc5b..07293e7083971c20b8d1c93b0e099e5cadc59d01 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete.h b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.h
index a6546f8b7aab560ce21d82c9416c6c4b1e03ffed..26e9a7d0240ba0b70b25e3daca847f457b31308c 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_delete.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_DELETE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c
index bbb9993014e2001e52939596aac980b685f084ff..8cc3da3b1a2be27fca9ed707bd7d5aff3dfab16b 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h
index f1e20748b0218b20ba2b5b6d0119bdb3f4027d37..cad270e1169120e43764626576b76d96c51894e7 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query.c b/lasso/xml/id-wsf-2.0/disco_svc_md_query.c
index cbaef8d662ce5aee82edbb84cf57ace289027506..9d00ecdbd1acd73f6caf8b50d017ac385d7d76b6 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query.h b/lasso/xml/id-wsf-2.0/disco_svc_md_query.h
index 48ad1f6ffafbc472ae45edc4c2a43015e66a9bff..bd6de38660771862ec5c803fecc7a6726e2eb1af 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_query.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_QUERY_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c
index e39b16860381694027302daf96effef319b64df4..bbd8129bd21cea385b7fe2963524637563e2e254 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h
index 5853b756c0d37ecc8dc4c0838603d3d0731ae591..8f6f42ad668299455cb5df5eaf4d429d36fec30b 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register.c b/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
index c1193730366bcd0f2cc0057780bff414c55e4a10..8911d79509834e12d113d09ca9c5afb1fe074d7f 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register.h b/lasso/xml/id-wsf-2.0/disco_svc_md_register.h
index 8b530cc042c24fdc973650d40bb1389b6420d5fa..55b31b810d233c833a58a3beb6d0bf50220223aa 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c
index e89a94e738be19d5d3a6ae485c9a58539657a6bd..8e0a1c96959dd5adc89a2c5de711d2daeb4e21c4 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h
index b8063aa514825b914551de2f7c338f269f9d6e46..0724fd55127dffe0789880d3efb71e5546b0ac85 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c
index 959ef868a1fc48bd3b93ea914ef4bd330f751ba3..82af1f1f55648d8c154c72536d7817dbff6b7f01 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace.h b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.h
index d33ee1f6d269e2f39b9fa580fc8dce39f830a21e..6fe23baaa277165df10eaba62f01ffe3ee76d680 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_replace.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_REPLACE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c
index 2fc3ca7263ff96bbc135ef02cdf0214be8e992cf..79603fc426b95033ea2fd5e857dd0e9d5966822b 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h
index f6ee268e1fb5f23bcf3ce44cec6d1d2a26340556..f68781ef658a9afe8067b86c8d08e0e874ec7ce1 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_metadata.c b/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
index f56b328f801516194274fef16a18037efb09641b..a4b770adcebd2f20e6d0c38da6195fe624663f36 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_metadata.h b/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
index 2d23e006e4f4d4b113bde5656041faaee3021901..24e9c2e16ce65790901cfc29817d010973586f9b 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DISCO_SVC_METADATA_H__
diff --git a/lasso/xml/id-wsf-2.0/dst_data_response_base.c b/lasso/xml/id-wsf-2.0/dst_data_response_base.c
index 62fb4460186e13c0da35193ae9b2e989744c7710..a1c0a879b899976a27b23148e972d97dcfa07627 100644
--- a/lasso/xml/id-wsf-2.0/dst_data_response_base.c
+++ b/lasso/xml/id-wsf-2.0/dst_data_response_base.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dst_data_response_base.h b/lasso/xml/id-wsf-2.0/dst_data_response_base.h
index 64fffb9c3c14b24bda2467dc0237b12b47f37468..b6c6223ceac7be5a8795003f52f9c7381bd3adf5 100644
--- a/lasso/xml/id-wsf-2.0/dst_data_response_base.h
+++ b/lasso/xml/id-wsf-2.0/dst_data_response_base.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DST_DATA_RESPONSE_BASE_H__
diff --git a/lasso/xml/id-wsf-2.0/dst_delete_item_base.c b/lasso/xml/id-wsf-2.0/dst_delete_item_base.c
index ea06ca6a6735d3eabf8a17f35e633d6bd418d113..321caaac13ecc6440772c99351e7eab8b3c113a5 100644
--- a/lasso/xml/id-wsf-2.0/dst_delete_item_base.c
+++ b/lasso/xml/id-wsf-2.0/dst_delete_item_base.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dst_delete_item_base.h b/lasso/xml/id-wsf-2.0/dst_delete_item_base.h
index ad960feded3928b549cf7c73658cf17a6963fe92..529df194ac6011d1b2945f6e70974a5bb7bd99ba 100644
--- a/lasso/xml/id-wsf-2.0/dst_delete_item_base.h
+++ b/lasso/xml/id-wsf-2.0/dst_delete_item_base.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DST_DELETE_ITEM_BASE_H__
diff --git a/lasso/xml/id-wsf-2.0/dst_delete_response.c b/lasso/xml/id-wsf-2.0/dst_delete_response.c
index 03a901a806d40ee0ad253b09c7fc87b0b082aef4..c03760749d2001937b58dfc62775321907e56e2e 100644
--- a/lasso/xml/id-wsf-2.0/dst_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/dst_delete_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dst_delete_response.h b/lasso/xml/id-wsf-2.0/dst_delete_response.h
index 713a77cf911688bdbe4875ed5d70f10049561674..ef3abc9433e4549acbc7b1580a318c4972e689c0 100644
--- a/lasso/xml/id-wsf-2.0/dst_delete_response.h
+++ b/lasso/xml/id-wsf-2.0/dst_delete_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DST_DELETE_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/dst_request.c b/lasso/xml/id-wsf-2.0/dst_request.c
index e78318e93974a3ddb356a75cc37810d196c043f1..a43a54182f7cc0d2da7b0c71c136e202d205eb70 100644
--- a/lasso/xml/id-wsf-2.0/dst_request.c
+++ b/lasso/xml/id-wsf-2.0/dst_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dst_request.h b/lasso/xml/id-wsf-2.0/dst_request.h
index 7dd8777f13e29d571a838c69aff239d3480b3d7e..2af3e637d41d83fef3bed6865c462ffbbd6162dc 100644
--- a/lasso/xml/id-wsf-2.0/dst_request.h
+++ b/lasso/xml/id-wsf-2.0/dst_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DST_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/dst_result_query_base.c b/lasso/xml/id-wsf-2.0/dst_result_query_base.c
index e3c70e7f217761ac699cb69ae8c320d9f037d0c5..5bab954c5a830596aa4f4808270894625ac79250 100644
--- a/lasso/xml/id-wsf-2.0/dst_result_query_base.c
+++ b/lasso/xml/id-wsf-2.0/dst_result_query_base.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dst_result_query_base.h b/lasso/xml/id-wsf-2.0/dst_result_query_base.h
index cdbe73f032758886f525da266662b9d5da80e657..94b811d2c543062e3a4a3a8d59f558d1f8eb9f3f 100644
--- a/lasso/xml/id-wsf-2.0/dst_result_query_base.h
+++ b/lasso/xml/id-wsf-2.0/dst_result_query_base.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DST_RESULT_QUERY_BASE_H__
diff --git a/lasso/xml/id-wsf-2.0/dst_test_item_base.c b/lasso/xml/id-wsf-2.0/dst_test_item_base.c
index 8f3d68e267a1e7a3740efaa8bd0e8c1adee65430..26c6727d44e93562fd91dc5cce926ebd013690ed 100644
--- a/lasso/xml/id-wsf-2.0/dst_test_item_base.c
+++ b/lasso/xml/id-wsf-2.0/dst_test_item_base.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dst_test_item_base.h b/lasso/xml/id-wsf-2.0/dst_test_item_base.h
index cd45cdb9e55935c0333a138203b52c98ea493756..a71819e519847f9fd490cf3364fd5bfa134c644f 100644
--- a/lasso/xml/id-wsf-2.0/dst_test_item_base.h
+++ b/lasso/xml/id-wsf-2.0/dst_test_item_base.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DST_TEST_ITEM_BASE_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_app_data.c b/lasso/xml/id-wsf-2.0/dstref_app_data.c
index 769f39955e288a7dacb9ae8f82b738cc0c16a657..3b95f0fcfd7ce7fc4ce23a6dd1c92464d7a020ca 100644
--- a/lasso/xml/id-wsf-2.0/dstref_app_data.c
+++ b/lasso/xml/id-wsf-2.0/dstref_app_data.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_app_data.h b/lasso/xml/id-wsf-2.0/dstref_app_data.h
index 4c16a114957e7e588fa62707a11d868612616329..69f85c6aeff89cea4b24c27da6320743402ebc22 100644
--- a/lasso/xml/id-wsf-2.0/dstref_app_data.h
+++ b/lasso/xml/id-wsf-2.0/dstref_app_data.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_APP_DATA_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_create.c b/lasso/xml/id-wsf-2.0/dstref_create.c
index 6d09f097eec8779c7b8bec5f077589d47e5161e0..a3b570c70bff5e246ab75e0fe436c1a4722715a4 100644
--- a/lasso/xml/id-wsf-2.0/dstref_create.c
+++ b/lasso/xml/id-wsf-2.0/dstref_create.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_create.h b/lasso/xml/id-wsf-2.0/dstref_create.h
index d64da23b42ec1006d265a27b70cc9a2c9ce15eba..9322e3d28f22cf593b5465bbcfea0554f227bb48 100644
--- a/lasso/xml/id-wsf-2.0/dstref_create.h
+++ b/lasso/xml/id-wsf-2.0/dstref_create.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_CREATE_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_create_item.c b/lasso/xml/id-wsf-2.0/dstref_create_item.c
index 928ce0d54c24a1514a74659997d62ee282bd6cb6..bc245a30660c952b641819d502e615e23ebe8aec 100644
--- a/lasso/xml/id-wsf-2.0/dstref_create_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_create_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_create_item.h b/lasso/xml/id-wsf-2.0/dstref_create_item.h
index f943550da3ca665f41133c201ae8533a660923d2..0e6f87f699b9ea0efd21d6c0f8d4550ea4a5b268 100644
--- a/lasso/xml/id-wsf-2.0/dstref_create_item.h
+++ b/lasso/xml/id-wsf-2.0/dstref_create_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_CREATE_ITEM_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_create_response.c b/lasso/xml/id-wsf-2.0/dstref_create_response.c
index cf459f571f0561709fc762a5af39d3a7d97cba68..e0dc24eb4b34189afc4b493cd86ba143907a4f6e 100644
--- a/lasso/xml/id-wsf-2.0/dstref_create_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_create_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_create_response.h b/lasso/xml/id-wsf-2.0/dstref_create_response.h
index f7b1f8f080c60cc67cb5836545de7b18f643d3e7..6d7236b5613f5f83c858037711d20e0cae52c0ad 100644
--- a/lasso/xml/id-wsf-2.0/dstref_create_response.h
+++ b/lasso/xml/id-wsf-2.0/dstref_create_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_CREATE_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_data.c b/lasso/xml/id-wsf-2.0/dstref_data.c
index aa72912d807538edecc3ac3a3fe55f166895fd17..10a64d96e05a15959c8f9c77fea60eb4556ecee4 100644
--- a/lasso/xml/id-wsf-2.0/dstref_data.c
+++ b/lasso/xml/id-wsf-2.0/dstref_data.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_data.h b/lasso/xml/id-wsf-2.0/dstref_data.h
index 79f9a93685ad49fa98772ca2abdbf71e12d27d3c..17bb839a0889036bd3667e03f046bb2eb718480f 100644
--- a/lasso/xml/id-wsf-2.0/dstref_data.h
+++ b/lasso/xml/id-wsf-2.0/dstref_data.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_DATA_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_data_response.c b/lasso/xml/id-wsf-2.0/dstref_data_response.c
index ce3a219d2feb058d9cb996bf6ce97fa8e300e1cd..3b9ba31ebc06371f9ff929da16b614165656c346 100644
--- a/lasso/xml/id-wsf-2.0/dstref_data_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_data_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_data_response.h b/lasso/xml/id-wsf-2.0/dstref_data_response.h
index 388548d24cc004a4a69f60d5653e558275e6db2e..91e6807d521058e1461d0f5747583655bce520b0 100644
--- a/lasso/xml/id-wsf-2.0/dstref_data_response.h
+++ b/lasso/xml/id-wsf-2.0/dstref_data_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_DATA_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete.c b/lasso/xml/id-wsf-2.0/dstref_delete.c
index 27b994cda76efdbdd286bb16186647bd5841ab4c..77bf80b144a214d1f61e401177f46377f9a03f75 100644
--- a/lasso/xml/id-wsf-2.0/dstref_delete.c
+++ b/lasso/xml/id-wsf-2.0/dstref_delete.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete.h b/lasso/xml/id-wsf-2.0/dstref_delete.h
index 3a07582de6fe92c567ab743e19d57b44871066b7..852afb4a8ade9d99b6f4f9f10d3f1c4973ebb35b 100644
--- a/lasso/xml/id-wsf-2.0/dstref_delete.h
+++ b/lasso/xml/id-wsf-2.0/dstref_delete.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_DELETE_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_item.c b/lasso/xml/id-wsf-2.0/dstref_delete_item.c
index 46fba3140441b48676b464a9d5e8f9b7edb66a01..ca8b7d2a68b063ef17cdfc1278ec8fe7ddac35ed 100644
--- a/lasso/xml/id-wsf-2.0/dstref_delete_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_delete_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_item.h b/lasso/xml/id-wsf-2.0/dstref_delete_item.h
index 14afa07819b8fd5f61f511eb36c31a98be006c85..31d3cf2bf98488147a4c330fd461eca74f8560cb 100644
--- a/lasso/xml/id-wsf-2.0/dstref_delete_item.h
+++ b/lasso/xml/id-wsf-2.0/dstref_delete_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_DELETE_ITEM_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_response.c b/lasso/xml/id-wsf-2.0/dstref_delete_response.c
index 6dd26d69dda0eb879ceddea3434e5cc67db411f1..0d4ad90eb75be259c6e787fe866d52b57bffab86 100644
--- a/lasso/xml/id-wsf-2.0/dstref_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_delete_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_response.h b/lasso/xml/id-wsf-2.0/dstref_delete_response.h
index 91432f1220c23479925157d34f8505fef9cd7fa4..f316841b96a9df9173eb6ceeeffef0bc8557b871 100644
--- a/lasso/xml/id-wsf-2.0/dstref_delete_response.h
+++ b/lasso/xml/id-wsf-2.0/dstref_delete_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_DELETE_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_item_data.c b/lasso/xml/id-wsf-2.0/dstref_item_data.c
index 4d85ae74995e953c6e5279e5c7c391eeffabe477..952bd8d522f546f38440b8a476a42891d87bb5b9 100644
--- a/lasso/xml/id-wsf-2.0/dstref_item_data.c
+++ b/lasso/xml/id-wsf-2.0/dstref_item_data.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_item_data.h b/lasso/xml/id-wsf-2.0/dstref_item_data.h
index 9f87d977ccb973293b7571a86b3b05be0dd1c17c..32d98032a787e3e59622221053de7379b08ed24e 100644
--- a/lasso/xml/id-wsf-2.0/dstref_item_data.h
+++ b/lasso/xml/id-wsf-2.0/dstref_item_data.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_ITEM_DATA_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify.c b/lasso/xml/id-wsf-2.0/dstref_modify.c
index 8c79817459fc92f13fe96c5c4ec0521796c57fcb..10b0f64a36ca721b8a3c477359ed0e37cc141ca5 100644
--- a/lasso/xml/id-wsf-2.0/dstref_modify.c
+++ b/lasso/xml/id-wsf-2.0/dstref_modify.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify.h b/lasso/xml/id-wsf-2.0/dstref_modify.h
index 1e4cc32a6ccc24d1564c06dde3dc1c856fe4943b..fe3d1a87476da92eebff92526e22a0bb78b1d52c 100644
--- a/lasso/xml/id-wsf-2.0/dstref_modify.h
+++ b/lasso/xml/id-wsf-2.0/dstref_modify.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_MODIFY_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_item.c b/lasso/xml/id-wsf-2.0/dstref_modify_item.c
index 66f77e328fe0b662c10d5518e1319b9c9cf96904..230807759dcc42314e215de966e747c72ccbccc0 100644
--- a/lasso/xml/id-wsf-2.0/dstref_modify_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_modify_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_item.h b/lasso/xml/id-wsf-2.0/dstref_modify_item.h
index 2690da1035ea348f70eb4b15fdd924e753c8e9d4..2ee7c91c7b8c7325158a2922f57d9ed4932a8d0f 100644
--- a/lasso/xml/id-wsf-2.0/dstref_modify_item.h
+++ b/lasso/xml/id-wsf-2.0/dstref_modify_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_MODIFY_ITEM_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_response.c b/lasso/xml/id-wsf-2.0/dstref_modify_response.c
index a6c5e27665f04993914516e818fd5f234e9a4087..679aefd3e9d304197fa21430be21eba08b0df5e4 100644
--- a/lasso/xml/id-wsf-2.0/dstref_modify_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_modify_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_response.h b/lasso/xml/id-wsf-2.0/dstref_modify_response.h
index fc187e8c1255252146c90d515afdf282b09a9c1e..d4976376624e1deccba98b2af498b2424c4151e2 100644
--- a/lasso/xml/id-wsf-2.0/dstref_modify_response.h
+++ b/lasso/xml/id-wsf-2.0/dstref_modify_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_MODIFY_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_query.c b/lasso/xml/id-wsf-2.0/dstref_query.c
index f1c9d712dd0aa22c2515e101052ffb4e0e3efabf..eb8be3a38a3d12bcb6c1ebe9d2569fee300f9e9e 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query.c
+++ b/lasso/xml/id-wsf-2.0/dstref_query.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_query.h b/lasso/xml/id-wsf-2.0/dstref_query.h
index 2ba287aced937122211ae8444246db9376b677cb..265fac2d59e14f41c48daffa0c709e41ca959f8c 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query.h
+++ b/lasso/xml/id-wsf-2.0/dstref_query.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_QUERY_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_query_item.c b/lasso/xml/id-wsf-2.0/dstref_query_item.c
index 29c7cce395c54e1bea333adef7627d90e3ae9f69..9d4baa72a82f36288491ae3823a13f61410d3272 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_query_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_query_item.h b/lasso/xml/id-wsf-2.0/dstref_query_item.h
index 257e0c49faa13514cd7e243199b40fa85a2622b6..a2583b325561995491633d1d9065444a3f2d2b83 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query_item.h
+++ b/lasso/xml/id-wsf-2.0/dstref_query_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_QUERY_ITEM_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_query_response.c b/lasso/xml/id-wsf-2.0/dstref_query_response.c
index 77e70d3dff26c062a7748ac80bc8f6f8c0b5becf..e80a1f24123baa180e712d68ba5a7b8349422716 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_query_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_query_response.h b/lasso/xml/id-wsf-2.0/dstref_query_response.h
index 0ad4a156319b2337afc7d72a289d5b1d898a349a..9ba4f08cd926257207cbfb7b3a9c28a77b511efb 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query_response.h
+++ b/lasso/xml/id-wsf-2.0/dstref_query_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_QUERY_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_result_query.c b/lasso/xml/id-wsf-2.0/dstref_result_query.c
index ba052b4c0e17b829d0be246f30a5aa6fe1d70ed2..9f9ea0b3501dc12eaf664881cc426fea7b6cbc31 100644
--- a/lasso/xml/id-wsf-2.0/dstref_result_query.c
+++ b/lasso/xml/id-wsf-2.0/dstref_result_query.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_result_query.h b/lasso/xml/id-wsf-2.0/dstref_result_query.h
index ed2800713e5bf16658a0515623e4797057ad0f92..e47b5452ce9db8da6d9596f227c0f2c5e2973427 100644
--- a/lasso/xml/id-wsf-2.0/dstref_result_query.h
+++ b/lasso/xml/id-wsf-2.0/dstref_result_query.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_RESULT_QUERY_H__
diff --git a/lasso/xml/id-wsf-2.0/dstref_test_item.c b/lasso/xml/id-wsf-2.0/dstref_test_item.c
index 27693c8af82aabff5f847561105ae58f4109aac7..085f95307e7b12cb2e1b1371634622e9e11de3ab 100644
--- a/lasso/xml/id-wsf-2.0/dstref_test_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_test_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/dstref_test_item.h b/lasso/xml/id-wsf-2.0/dstref_test_item.h
index a8889c51e9829021dc8ed693c8d06a10b27422ee..74061cf55421f8f8ceba09d95b9c14902ca01645 100644
--- a/lasso/xml/id-wsf-2.0/dstref_test_item.h
+++ b/lasso/xml/id-wsf-2.0/dstref_test_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_DSTREF_TEST_ITEM_H__
diff --git a/lasso/xml/id-wsf-2.0/idwsf2_strings.h b/lasso/xml/id-wsf-2.0/idwsf2_strings.h
index 9d4dc29f897d7c80a2f93c2c0fa07828d0542248..b60fb6bdcc6b36a1f10bdf5131c7f8f5a13ab0f3 100644
--- a/lasso/xml/id-wsf-2.0/idwsf2_strings.h
+++ b/lasso/xml/id-wsf-2.0/idwsf2_strings.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c b/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c
index fd4c8866743a07473ef0140c78e36ce674e2293e..afbcd48f807befb287acec4b489407cdda3fcbe0 100644
--- a/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c
+++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h b/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h
index 7e6885c2e434435fd51c18d3b316182c1aed2bb3..968008ec6cbe1499f05d55fa158a374ff90b38ab 100644
--- a/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h
+++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c
index 6f2f02849bfa588eff9d98e060fd1c1d423e126f..8fdc9d7bdf949b345015d57a544a67908262fac7 100644
--- a/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c
+++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h
index 53abd71160498891e001f09fad66862d342146b4..90d32fd946b06c04c26a0cbddaad921308396f15 100644
--- a/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h
+++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_input.c b/lasso/xml/id-wsf-2.0/ims_mapping_input.c
index 05d2f3f3bb5b6f3df4b289afdf7503e5597e647c..d01fa37a1ba64983c9e81bb9fe4f3f07ea9971c8 100644
--- a/lasso/xml/id-wsf-2.0/ims_mapping_input.c
+++ b/lasso/xml/id-wsf-2.0/ims_mapping_input.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_input.h b/lasso/xml/id-wsf-2.0/ims_mapping_input.h
index 71198f2e1ba49f07a5ee9fcc0e325594d276fb6f..57b10d6215af4d646344f5221b4a9796fbe08a65 100644
--- a/lasso/xml/id-wsf-2.0/ims_mapping_input.h
+++ b/lasso/xml/id-wsf-2.0/ims_mapping_input.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IMS_MAPPING_INPUT_H__
diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_output.c b/lasso/xml/id-wsf-2.0/ims_mapping_output.c
index c12bf4b8ee29766fc3d28004a59f343cb1c45e9d..1479671bdc91985e96612e58b972ad73f5ccce1b 100644
--- a/lasso/xml/id-wsf-2.0/ims_mapping_output.c
+++ b/lasso/xml/id-wsf-2.0/ims_mapping_output.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_output.h b/lasso/xml/id-wsf-2.0/ims_mapping_output.h
index b586fee3547ed66019bdf112086fbeecfac71102..2f88a8ae94ae0ae69ec5e1566b4577c9cbeffa4d 100644
--- a/lasso/xml/id-wsf-2.0/ims_mapping_output.h
+++ b/lasso/xml/id-wsf-2.0/ims_mapping_output.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IMS_MAPPING_OUTPUT_H__
diff --git a/lasso/xml/id-wsf-2.0/is_help.c b/lasso/xml/id-wsf-2.0/is_help.c
index 8f1c3279844a2644247387e615e45cbf36046280..f1934fe42aed6d865ae5bc486b30db6d0ca2cdcc 100644
--- a/lasso/xml/id-wsf-2.0/is_help.c
+++ b/lasso/xml/id-wsf-2.0/is_help.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/is_help.h b/lasso/xml/id-wsf-2.0/is_help.h
index bcce2bc12700e9275be71e9798a19646f1c8d491..6a65eda462b1288de9d3d08ca16b43dd089612e2 100644
--- a/lasso/xml/id-wsf-2.0/is_help.h
+++ b/lasso/xml/id-wsf-2.0/is_help.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IS_HELP_H__
diff --git a/lasso/xml/id-wsf-2.0/is_inquiry.c b/lasso/xml/id-wsf-2.0/is_inquiry.c
index 7d9277f5823cd2025069577b3a8a39f351269eca..96d498d6765b5fbdaef9ef158d3691e13c8db41b 100644
--- a/lasso/xml/id-wsf-2.0/is_inquiry.c
+++ b/lasso/xml/id-wsf-2.0/is_inquiry.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/is_inquiry.h b/lasso/xml/id-wsf-2.0/is_inquiry.h
index 1f3c6e43e522e5d0731a7ed40da9ca8f9669e1ca..2db09e9565cba1b1fcd307f66dc00f13e3483f6c 100644
--- a/lasso/xml/id-wsf-2.0/is_inquiry.h
+++ b/lasso/xml/id-wsf-2.0/is_inquiry.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IS_INQUIRY_H__
diff --git a/lasso/xml/id-wsf-2.0/is_inquiry_element.c b/lasso/xml/id-wsf-2.0/is_inquiry_element.c
index c0220ca42b9376021898866f8d4aac26b8e02d44..1a988ac4a92a4563302ba781daae63d36f8145ec 100644
--- a/lasso/xml/id-wsf-2.0/is_inquiry_element.c
+++ b/lasso/xml/id-wsf-2.0/is_inquiry_element.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/is_inquiry_element.h b/lasso/xml/id-wsf-2.0/is_inquiry_element.h
index 79f75d4143a1c6953365908ba7ae53e930d2af9f..3782897f6c9445f5045da071a21e260405c9efca 100644
--- a/lasso/xml/id-wsf-2.0/is_inquiry_element.h
+++ b/lasso/xml/id-wsf-2.0/is_inquiry_element.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IS_INQUIRY_ELEMENT_H__
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_request.c b/lasso/xml/id-wsf-2.0/is_interaction_request.c
index ab87a39c14f51c28f8406c365905077ffad18134..96b7383122accb7de56e9ba78bbfeb768558f827 100644
--- a/lasso/xml/id-wsf-2.0/is_interaction_request.c
+++ b/lasso/xml/id-wsf-2.0/is_interaction_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_request.h b/lasso/xml/id-wsf-2.0/is_interaction_request.h
index 891a6b5735aa997b742d0f3cd8637cca6c042657..5b72ac4d2c43890b69512654f89c3bc896d9acd9 100644
--- a/lasso/xml/id-wsf-2.0/is_interaction_request.h
+++ b/lasso/xml/id-wsf-2.0/is_interaction_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IS_INTERACTION_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_response.c b/lasso/xml/id-wsf-2.0/is_interaction_response.c
index 2dc6dc841d4eddddf760acc5744847702608a3d0..0da58ee6c473deb5e1a07c363375b719f8a8fab9 100644
--- a/lasso/xml/id-wsf-2.0/is_interaction_response.c
+++ b/lasso/xml/id-wsf-2.0/is_interaction_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_response.h b/lasso/xml/id-wsf-2.0/is_interaction_response.h
index 7bb53f3de35be12ba27a62ddcbbe4675438bd83a..0758ffd2cdd1a624caf6865a4920eaa3d90998f5 100644
--- a/lasso/xml/id-wsf-2.0/is_interaction_response.h
+++ b/lasso/xml/id-wsf-2.0/is_interaction_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IS_INTERACTION_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_statement.c b/lasso/xml/id-wsf-2.0/is_interaction_statement.c
index 938d007ce87f1f853c0b87683f33a2f9a3c290ad..11d9eb039b16d4f904d8745a7d2bcdc157535acf 100644
--- a/lasso/xml/id-wsf-2.0/is_interaction_statement.c
+++ b/lasso/xml/id-wsf-2.0/is_interaction_statement.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_statement.h b/lasso/xml/id-wsf-2.0/is_interaction_statement.h
index f51ba5a967ce2f645aec72d2e38613f0a64491cb..4158d8a2b250a76c85fd104b3694a55eb734731f 100644
--- a/lasso/xml/id-wsf-2.0/is_interaction_statement.h
+++ b/lasso/xml/id-wsf-2.0/is_interaction_statement.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IS_INTERACTION_STATEMENT_H__
diff --git a/lasso/xml/id-wsf-2.0/is_item.c b/lasso/xml/id-wsf-2.0/is_item.c
index 41e800351808e63c3c5e83957ac229a137dcc449..7a9c851d9c257c080093e4ecae8e53c0dbbcdbc9 100644
--- a/lasso/xml/id-wsf-2.0/is_item.c
+++ b/lasso/xml/id-wsf-2.0/is_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/is_item.h b/lasso/xml/id-wsf-2.0/is_item.h
index c6820ad9b482282f1274021497bcb2564b8be54d..7718048253a854fa274adb8ad08354002f9b6e52 100644
--- a/lasso/xml/id-wsf-2.0/is_item.h
+++ b/lasso/xml/id-wsf-2.0/is_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IS_ITEM_H__
diff --git a/lasso/xml/id-wsf-2.0/is_parameter.c b/lasso/xml/id-wsf-2.0/is_parameter.c
index 790db97f199a3c4854278db8200932fc052706be..c3d47711f768df60ea8195481e9ad7c2672d8540 100644
--- a/lasso/xml/id-wsf-2.0/is_parameter.c
+++ b/lasso/xml/id-wsf-2.0/is_parameter.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/is_parameter.h b/lasso/xml/id-wsf-2.0/is_parameter.h
index 5ab187c190072c254af925d78b2326ea918f3e43..438ea88a6006ef5ef6c3156fc680246d23b0afd6 100644
--- a/lasso/xml/id-wsf-2.0/is_parameter.h
+++ b/lasso/xml/id-wsf-2.0/is_parameter.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IS_PARAMETER_H__
diff --git a/lasso/xml/id-wsf-2.0/is_select.c b/lasso/xml/id-wsf-2.0/is_select.c
index 35a22272f212469bb6732a290903717802226005..84aec590932faf79df5fb65874e0a89676172fb1 100644
--- a/lasso/xml/id-wsf-2.0/is_select.c
+++ b/lasso/xml/id-wsf-2.0/is_select.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/is_select.h b/lasso/xml/id-wsf-2.0/is_select.h
index 4707b5b749cfccb31fd0373c4bf5d4db07db4f1b..d71c80236d800f208d0b8075b154639c1faf487c 100644
--- a/lasso/xml/id-wsf-2.0/is_select.h
+++ b/lasso/xml/id-wsf-2.0/is_select.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IS_SELECT_H__
diff --git a/lasso/xml/id-wsf-2.0/is_text.c b/lasso/xml/id-wsf-2.0/is_text.c
index 5825ab61f2af4561d9e61e6985468859c7e177a4..ed5677188827cd5a69815d384d1579e14a71f854 100644
--- a/lasso/xml/id-wsf-2.0/is_text.c
+++ b/lasso/xml/id-wsf-2.0/is_text.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/is_text.h b/lasso/xml/id-wsf-2.0/is_text.h
index 777b7027bd1f3e8a2eba31a41a57b74416cac971..dd534e84aa7d1d75d7dcfe34241d26ef992d1ca6 100644
--- a/lasso/xml/id-wsf-2.0/is_text.h
+++ b/lasso/xml/id-wsf-2.0/is_text.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_IS_TEXT_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_add_collection_request.c b/lasso/xml/id-wsf-2.0/ps_add_collection_request.c
index e5a93f0c47f2c83f0fc9c00ea7b4fee273428cb9..95fcaf842378b54ef03956cae42b0a9747ed7b8b 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_collection_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_collection_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_add_collection_request.h b/lasso/xml/id-wsf-2.0/ps_add_collection_request.h
index 084087db571301865610552a997438597f3967fe..dfff8e63ece85a7a994982e523f6b19d2abf52bf 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_collection_request.h
+++ b/lasso/xml/id-wsf-2.0/ps_add_collection_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_ADD_COLLECTION_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_add_collection_response.c b/lasso/xml/id-wsf-2.0/ps_add_collection_response.c
index d5531cd642f9cd6fb305655ed2dd648c8dda4ef2..58b13d16c59a0e93e1c769710cf4e62153016a8b 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_collection_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_collection_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_add_collection_response.h b/lasso/xml/id-wsf-2.0/ps_add_collection_response.h
index caba79aba6db5d8ea2795fb07d71fefd0f914447..8c0c80ea2832414370b3b8eb06cbce69e3b11372 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_collection_response.h
+++ b/lasso/xml/id-wsf-2.0/ps_add_collection_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_ADD_COLLECTION_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_add_entity_request.c b/lasso/xml/id-wsf-2.0/ps_add_entity_request.c
index b83ca7aeae41e8e586e5d7e2ee4618944b1d9943..6ca84b3cf2c655cb2b9528edf9f42aaa5a06e361 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_entity_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_entity_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_add_entity_request.h b/lasso/xml/id-wsf-2.0/ps_add_entity_request.h
index 018ce71f84e03f9612c2f498bcbdcf3dcfdba3de..5da064353d03b75efdc7ef306e6a404b7d12f1e5 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_entity_request.h
+++ b/lasso/xml/id-wsf-2.0/ps_add_entity_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_ADD_ENTITY_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_add_entity_response.c b/lasso/xml/id-wsf-2.0/ps_add_entity_response.c
index 7dad158a66ef34f220157329be95d5ca75a02cde..9c2ccfa763a247ab718af2e2321b75fe51862377 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_entity_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_entity_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_add_entity_response.h b/lasso/xml/id-wsf-2.0/ps_add_entity_response.h
index 88bff742db5e79cf4ed416be943bd274f8ae7217..97d4b16ffb141a4f1ead64832d516b831e0a77ea 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_entity_response.h
+++ b/lasso/xml/id-wsf-2.0/ps_add_entity_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_ADD_ENTITY_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c
index a8bb936085ab2e40c59c2d9be37bf8e195d295a9..8f90f2ec14cb9585918dd22a286fbb55df35ee27 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h
index fa9b73c6a1ccf0042ed7cca1d7cc18765feeaa44..4e207300a684e294ab729dceeb73bda63397e1b7 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h
+++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c b/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c
index 2c02635748fb8caacdaf0c89f2ac8c968a14f0f1..83ab003c36ddf0ce79d245b528c5739f1bd213d1 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h b/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h
index ecedd318bdd22f1211da74d0373bfcd40478a8c8..cfff0c980af50dc727d16e1a33c5c265421a5ca9 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h
+++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c b/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c
index 36801b49e4162a63768b563011ad7a10bcef3feb..b153e526aff88504c99af658ad75b44da6e19a9c 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h b/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h
index 23e446d86bcc1c5198351542a7edecf45e89b5b8..c54beec46c5925cfc50ef8a092d3224595d89514 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h
+++ b/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_get_object_info_request.c b/lasso/xml/id-wsf-2.0/ps_get_object_info_request.c
index 4f72579211b91fb4bba4b2c535c456c2757d7336..46c74699d29de19494ccb360864ba14454b5ed86 100644
--- a/lasso/xml/id-wsf-2.0/ps_get_object_info_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_get_object_info_request.h b/lasso/xml/id-wsf-2.0/ps_get_object_info_request.h
index c4361e40b0b7dfa16753cd0c75419e6f1390faab..df795e544f1e86cb3002fe03c897e68f78d48803 100644
--- a/lasso/xml/id-wsf-2.0/ps_get_object_info_request.h
+++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_GET_OBJECT_INFO_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_get_object_info_response.c b/lasso/xml/id-wsf-2.0/ps_get_object_info_response.c
index b58b45b8041f86e39eb79e19c45a54697556bd06..2f8dc3974bda4e8135cc32ac149b479a9d0f9c47 100644
--- a/lasso/xml/id-wsf-2.0/ps_get_object_info_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_get_object_info_response.h b/lasso/xml/id-wsf-2.0/ps_get_object_info_response.h
index ed892c017b84d6cc097d2a47b5e7255c0147cd2f..386c4f2bf513f4ccf14d01aae976a15141e54566 100644
--- a/lasso/xml/id-wsf-2.0/ps_get_object_info_response.h
+++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_item_data.c b/lasso/xml/id-wsf-2.0/ps_item_data.c
index 23c01c011719b9b3eb21976f176d8e4f0cd1c46b..20db594840f05c5d4982a4c4a2072dc6ef578d3a 100644
--- a/lasso/xml/id-wsf-2.0/ps_item_data.c
+++ b/lasso/xml/id-wsf-2.0/ps_item_data.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_item_data.h b/lasso/xml/id-wsf-2.0/ps_item_data.h
index 733c21bdda449668245924accc27ecbea3a19688..acc98260c0b7f044690051be3c1c21a9b96b7497 100644
--- a/lasso/xml/id-wsf-2.0/ps_item_data.h
+++ b/lasso/xml/id-wsf-2.0/ps_item_data.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_ITEM_DATA_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_list_members_request.c b/lasso/xml/id-wsf-2.0/ps_list_members_request.c
index f717d1b7595f9bd59525a1930b70ceef6cbfedd3..5df0f356cdcfce4d5bf7e7e51d4c405c7f3cbb9f 100644
--- a/lasso/xml/id-wsf-2.0/ps_list_members_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_list_members_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_list_members_request.h b/lasso/xml/id-wsf-2.0/ps_list_members_request.h
index e9f7763083e53695430768125bdf9bf68431e962..e294aac96035fcd5c7b325bd0421c902711e1d5e 100644
--- a/lasso/xml/id-wsf-2.0/ps_list_members_request.h
+++ b/lasso/xml/id-wsf-2.0/ps_list_members_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_LIST_MEMBERS_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_list_members_response.c b/lasso/xml/id-wsf-2.0/ps_list_members_response.c
index cb0c0f385ee0f31981ea4a340d91ffd68cc180ff..e911176caf4bccc94e98c7da505a51a222a97d50 100644
--- a/lasso/xml/id-wsf-2.0/ps_list_members_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_list_members_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_list_members_response.h b/lasso/xml/id-wsf-2.0/ps_list_members_response.h
index 378188e721f18fd1d77bd571bfe505d8395910ab..65e52cdf87e0438453639e791712c74a341ac0e3 100644
--- a/lasso/xml/id-wsf-2.0/ps_list_members_response.h
+++ b/lasso/xml/id-wsf-2.0/ps_list_members_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_LIST_MEMBERS_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_notification.c b/lasso/xml/id-wsf-2.0/ps_notification.c
index e4c324095123a1da5dc3c3ccc4bc7db4609e5818..3e6a4b0c4011ce418d0eec6681449922f7b81a7d 100644
--- a/lasso/xml/id-wsf-2.0/ps_notification.c
+++ b/lasso/xml/id-wsf-2.0/ps_notification.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_notification.h b/lasso/xml/id-wsf-2.0/ps_notification.h
index 7647efe50b2d838144c5cf7ddf5a9b5a57853030..d03635dae1f8f527f247e51159c211ebfb7f5696 100644
--- a/lasso/xml/id-wsf-2.0/ps_notification.h
+++ b/lasso/xml/id-wsf-2.0/ps_notification.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_NOTIFICATION_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_notify.c b/lasso/xml/id-wsf-2.0/ps_notify.c
index e13168c76f6e738ae0682e38e60b9d9dc8348c6b..cd22a207f6a11ddc99349712eebcae7175bc2df5 100644
--- a/lasso/xml/id-wsf-2.0/ps_notify.c
+++ b/lasso/xml/id-wsf-2.0/ps_notify.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_notify.h b/lasso/xml/id-wsf-2.0/ps_notify.h
index 08756adc02a7766bb1790908c77464ea1b8ce28d..0999ea1ab426e2521490aa677885660ad04c42ee 100644
--- a/lasso/xml/id-wsf-2.0/ps_notify.h
+++ b/lasso/xml/id-wsf-2.0/ps_notify.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_NOTIFY_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_object.c b/lasso/xml/id-wsf-2.0/ps_object.c
index 553640fc7ecfa8c0857c96c79db8049a24820e06..afc071027f6eb8c54bfeb705677c27b35e762656 100644
--- a/lasso/xml/id-wsf-2.0/ps_object.c
+++ b/lasso/xml/id-wsf-2.0/ps_object.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_object.h b/lasso/xml/id-wsf-2.0/ps_object.h
index bd05cf5ca44ec4359397a5798d20a91b91c6fb49..10e166481d476fad122df4dd690a3454d12cab11 100644
--- a/lasso/xml/id-wsf-2.0/ps_object.h
+++ b/lasso/xml/id-wsf-2.0/ps_object.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_OBJECT_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_query_objects_request.c b/lasso/xml/id-wsf-2.0/ps_query_objects_request.c
index 412078f19afa89aeb409301aeaba0ac05be7d426..bcd4048f52a14041a5a3782644e36245eac87150 100644
--- a/lasso/xml/id-wsf-2.0/ps_query_objects_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_query_objects_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_query_objects_request.h b/lasso/xml/id-wsf-2.0/ps_query_objects_request.h
index cc380a880a56491f26a83fdda4dc6cd5f8d3beb0..1ed7342d69d88809ac5e6831142982e4ac715962 100644
--- a/lasso/xml/id-wsf-2.0/ps_query_objects_request.h
+++ b/lasso/xml/id-wsf-2.0/ps_query_objects_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_QUERY_OBJECTS_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_query_objects_response.c b/lasso/xml/id-wsf-2.0/ps_query_objects_response.c
index 0ede56d2760c70e6e853fc7ca2bbf5b8d7965126..5ac035a525c1d93096e9971d712457baa6c96350 100644
--- a/lasso/xml/id-wsf-2.0/ps_query_objects_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_query_objects_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_query_objects_response.h b/lasso/xml/id-wsf-2.0/ps_query_objects_response.h
index 4a4c9bfa59b5f5dd7f6ea77006201ba8f4252bce..71a83bc1c8aff4e380f65c71a85ef8fa10e2b994 100644
--- a/lasso/xml/id-wsf-2.0/ps_query_objects_response.h
+++ b/lasso/xml/id-wsf-2.0/ps_query_objects_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_QUERY_OBJECTS_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_collection_request.c b/lasso/xml/id-wsf-2.0/ps_remove_collection_request.c
index 04a1616f1c7c937f10c53404a40c60c990a9d760..562540831a228a3c63963cb8a01c10d655dd05ea 100644
--- a/lasso/xml/id-wsf-2.0/ps_remove_collection_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_remove_collection_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_collection_request.h b/lasso/xml/id-wsf-2.0/ps_remove_collection_request.h
index 4ecd28a8887b21f8c88abff28f16bb37f362e90e..99716018af8a5ff5f9bc8fae91f93e3091d4e8cc 100644
--- a/lasso/xml/id-wsf-2.0/ps_remove_collection_request.h
+++ b/lasso/xml/id-wsf-2.0/ps_remove_collection_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_REMOVE_COLLECTION_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_entity_request.c b/lasso/xml/id-wsf-2.0/ps_remove_entity_request.c
index 8ece01ffefbbb350784104b707c92865eebdb912..4329d07263f4dc20cf25ed503727860e272ac9ad 100644
--- a/lasso/xml/id-wsf-2.0/ps_remove_entity_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_remove_entity_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_entity_request.h b/lasso/xml/id-wsf-2.0/ps_remove_entity_request.h
index 33576bc7680ea6b272b332d3dca613ec059d12ec..af2cdd6ac8aa1377525c7a0013735578cec1256c 100644
--- a/lasso/xml/id-wsf-2.0/ps_remove_entity_request.h
+++ b/lasso/xml/id-wsf-2.0/ps_remove_entity_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_REMOVE_ENTITY_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c b/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c
index 2f438e809c923e719f99eb4962770f2b8d63d16d..6e174e769657aaf66d4e49335a7a4a772715251e 100644
--- a/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h b/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h
index 210eb7fc84867460e9a9f52ffc53f19caf9edd0e..926c332ae8fb7b8712ec4b1b9d91fb13b4247910 100644
--- a/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h
+++ b/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_request_abstract.c b/lasso/xml/id-wsf-2.0/ps_request_abstract.c
index 13a7efff0f947d15f82d6d5c806c8910f0a749ca..662627a709f684e21264b655b66c6a10a15b33a5 100644
--- a/lasso/xml/id-wsf-2.0/ps_request_abstract.c
+++ b/lasso/xml/id-wsf-2.0/ps_request_abstract.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_request_abstract.h b/lasso/xml/id-wsf-2.0/ps_request_abstract.h
index 982a10cc316cf1db84e555d762fc047d11249878..f2792551deaf673679a3f481b758c39da10b5c4a 100644
--- a/lasso/xml/id-wsf-2.0/ps_request_abstract.h
+++ b/lasso/xml/id-wsf-2.0/ps_request_abstract.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_REQUEST_ABSTRACT_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c
index 7704b97109b536e7a74b85dd9780bd413c4cea13..22d2a4fa287c95f06b14fb47df7c2e63319ebf6a 100644
--- a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h
index 823f105af5ee8347594874264ed2fd6cbc8cd599..8e3910b13a8c1e8ec58b86ebf779fba181e9d1ec 100644
--- a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c
index 7e2280e291fd90b0f9037a88f0621888d5543785..a7f7c9e9033729f6ac6361360a7aebc0d4141a44 100644
--- a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h
index 9a0e22de10335f9b8327cf52076a207f4494ca22..3d51c95c9552873ed291b155147f4b5438471c4d 100644
--- a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_input.c b/lasso/xml/id-wsf-2.0/ps_resolve_input.c
index be50123f82618e380185ca37b330be0a9be1f6da..8be7f889711670bf47152f3660749c5a55c72143 100644
--- a/lasso/xml/id-wsf-2.0/ps_resolve_input.c
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_input.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_input.h b/lasso/xml/id-wsf-2.0/ps_resolve_input.h
index 8cd24cda5330ca6ac24d03b43a02fd9de1113fd9..8413862fc10c2bd3103d8717a8ec23f15bb04cfb 100644
--- a/lasso/xml/id-wsf-2.0/ps_resolve_input.h
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_input.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_RESOLVE_INPUT_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_response_abstract.c b/lasso/xml/id-wsf-2.0/ps_response_abstract.c
index 3e825e681b872a50c8221ff7417cc5578487e0bd..6fa60dce602552773f309f7b474db4ce81e8a34b 100644
--- a/lasso/xml/id-wsf-2.0/ps_response_abstract.c
+++ b/lasso/xml/id-wsf-2.0/ps_response_abstract.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_response_abstract.h b/lasso/xml/id-wsf-2.0/ps_response_abstract.h
index f9e1d6ad1b2b93c654f52ca53e3e879865895fda..c0133dfeb76348fecb0a8c0428cc886b3c201e78 100644
--- a/lasso/xml/id-wsf-2.0/ps_response_abstract.h
+++ b/lasso/xml/id-wsf-2.0/ps_response_abstract.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_RESPONSE_ABSTRACT_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_set_object_info_request.c b/lasso/xml/id-wsf-2.0/ps_set_object_info_request.c
index a8739ebc031057966ae6600551242d8fdb53d4c6..38027cefaac31a10238b7c07a7c62dc8528989bf 100644
--- a/lasso/xml/id-wsf-2.0/ps_set_object_info_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_set_object_info_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_set_object_info_request.h b/lasso/xml/id-wsf-2.0/ps_set_object_info_request.h
index 310997f1c0c4dbe192ba7a729ea4352325e0e49f..f6b544597eff748f079c96c58cf6f56c84de0609 100644
--- a/lasso/xml/id-wsf-2.0/ps_set_object_info_request.h
+++ b/lasso/xml/id-wsf-2.0/ps_set_object_info_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_SET_OBJECT_INFO_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_test_membership_request.c b/lasso/xml/id-wsf-2.0/ps_test_membership_request.c
index 6dfd10274475f55520babba74a6207c8f715c147..3db438249e0fa0735dc22e221c420900c656b4e2 100644
--- a/lasso/xml/id-wsf-2.0/ps_test_membership_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_test_membership_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_test_membership_request.h b/lasso/xml/id-wsf-2.0/ps_test_membership_request.h
index c4113f42700957248e60ca59629da73f191bcc10..9f83dc26eb29a8bae2148f1f095b38aeb78c9e33 100644
--- a/lasso/xml/id-wsf-2.0/ps_test_membership_request.h
+++ b/lasso/xml/id-wsf-2.0/ps_test_membership_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/ps_test_membership_response.c b/lasso/xml/id-wsf-2.0/ps_test_membership_response.c
index a30efab6a4938be18b0fdb667ac63f24153977a4..20b8bf199b4e4ef41606d9743fb3cc82df0bfffd 100644
--- a/lasso/xml/id-wsf-2.0/ps_test_membership_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_test_membership_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/ps_test_membership_response.h b/lasso/xml/id-wsf-2.0/ps_test_membership_response.h
index e7b629a662e403097bfb709669f2b7d925cd8fde..e7ff171f706595b509f94f48809b08660da434b6 100644
--- a/lasso/xml/id-wsf-2.0/ps_test_membership_response.h
+++ b/lasso/xml/id-wsf-2.0/ps_test_membership_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/sb2_consent.c b/lasso/xml/id-wsf-2.0/sb2_consent.c
index 87f479370102edb2d05a896d5f1a39b4819dded9..23fcbfc508639473b70f28e30d5a3a383a7698fa 100644
--- a/lasso/xml/id-wsf-2.0/sb2_consent.c
+++ b/lasso/xml/id-wsf-2.0/sb2_consent.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/sb2_consent.h b/lasso/xml/id-wsf-2.0/sb2_consent.h
index 14f0cadda8a2a1251fe81de2297cd845675d1c1b..7ef8af541ef5fd388916fb43b1da6491610bb828 100644
--- a/lasso/xml/id-wsf-2.0/sb2_consent.h
+++ b/lasso/xml/id-wsf-2.0/sb2_consent.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SB2_CONSENT_H__
diff --git a/lasso/xml/id-wsf-2.0/sb2_credentials_context.c b/lasso/xml/id-wsf-2.0/sb2_credentials_context.c
index 7bcc89e767b936c4a4c6e4045e0b1c3ac3500d77..cf834f58e5ab6d0625d787e8b984855ae7fe373e 100644
--- a/lasso/xml/id-wsf-2.0/sb2_credentials_context.c
+++ b/lasso/xml/id-wsf-2.0/sb2_credentials_context.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/sb2_credentials_context.h b/lasso/xml/id-wsf-2.0/sb2_credentials_context.h
index c8b41d0383f8ecaf2a25ab49ad077d50b41fd6aa..f0135ae043d3021e80c8de2e5d62ee82d2d9e0aa 100644
--- a/lasso/xml/id-wsf-2.0/sb2_credentials_context.h
+++ b/lasso/xml/id-wsf-2.0/sb2_credentials_context.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SB2_CREDENTIALS_CONTEXT_H__
diff --git a/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c
index dd900ea9f2c6a84cacc9135c7f9396e072bd1013..9ebffd975ebf6f7b933209b2fb0d0a6a012d84c3 100644
--- a/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c
+++ b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/sb2_endpoint_update.h b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.h
index e7f7e7aca3b7f652533cf2ed9c03a929b911a61a..5da0dad88e1b6b06976818fcde0d759ef963a7aa 100644
--- a/lasso/xml/id-wsf-2.0/sb2_endpoint_update.h
+++ b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SB2_ENDPOINT_UPDATE_H__
diff --git a/lasso/xml/id-wsf-2.0/sb2_redirect_request.c b/lasso/xml/id-wsf-2.0/sb2_redirect_request.c
index 07102d44e31c46483b1f4267c89fe641150f6e9c..b514dfd87c29add3a60c8b05c1f6997dda6f62c7 100644
--- a/lasso/xml/id-wsf-2.0/sb2_redirect_request.c
+++ b/lasso/xml/id-wsf-2.0/sb2_redirect_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/sb2_redirect_request.h b/lasso/xml/id-wsf-2.0/sb2_redirect_request.h
index bf8a455fa7d706404a755b5952478924c4ce5bb3..3c72344725933f850a84a9757361fce0a2a6a3c0 100644
--- a/lasso/xml/id-wsf-2.0/sb2_redirect_request.h
+++ b/lasso/xml/id-wsf-2.0/sb2_redirect_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SB2_REDIRECT_REQUEST_H__
diff --git a/lasso/xml/id-wsf-2.0/sb2_sender.c b/lasso/xml/id-wsf-2.0/sb2_sender.c
index c61aaed13841cb53713468b949e2054d74980bf9..ad8d4a4dbe3a645db209bd717db5d707e008c7a2 100644
--- a/lasso/xml/id-wsf-2.0/sb2_sender.c
+++ b/lasso/xml/id-wsf-2.0/sb2_sender.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/sb2_sender.h b/lasso/xml/id-wsf-2.0/sb2_sender.h
index e47a20709607c6a325ebabc849f6a57e69f93706..1db16b3097906d13ec51c342c6f1a8c14dac9cd6 100644
--- a/lasso/xml/id-wsf-2.0/sb2_sender.h
+++ b/lasso/xml/id-wsf-2.0/sb2_sender.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SB2_SENDER_H__
diff --git a/lasso/xml/id-wsf-2.0/sb2_target_identity.c b/lasso/xml/id-wsf-2.0/sb2_target_identity.c
index a0caec1710d9e5b4c808efcbbe32a9352cfb63ff..d65c34de1447e2187c8aeef01ca1eb0ddcdb6cd9 100644
--- a/lasso/xml/id-wsf-2.0/sb2_target_identity.c
+++ b/lasso/xml/id-wsf-2.0/sb2_target_identity.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/sb2_target_identity.h b/lasso/xml/id-wsf-2.0/sb2_target_identity.h
index 476e4a52e6b49a00d9575918db2ed6951cbfbc1f..63b20f0fe6bdcca6029743fdf9dfc2961b86a36b 100644
--- a/lasso/xml/id-wsf-2.0/sb2_target_identity.h
+++ b/lasso/xml/id-wsf-2.0/sb2_target_identity.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SB2_TARGET_IDENTITY_H__
diff --git a/lasso/xml/id-wsf-2.0/sb2_timeout.c b/lasso/xml/id-wsf-2.0/sb2_timeout.c
index 7690e766a642c080744a49b4723a160ff17bb89c..a9bd59afb0bcb62fd80b15494e9e902a369260cd 100644
--- a/lasso/xml/id-wsf-2.0/sb2_timeout.c
+++ b/lasso/xml/id-wsf-2.0/sb2_timeout.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/sb2_timeout.h b/lasso/xml/id-wsf-2.0/sb2_timeout.h
index f14672cea0da7bad0f31425deae0f17f3cdb14f1..ceebc26e4a023cf1771bd5bfc5d1f06b87835e99 100644
--- a/lasso/xml/id-wsf-2.0/sb2_timeout.h
+++ b/lasso/xml/id-wsf-2.0/sb2_timeout.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SB2_TIMEOUT_H__
diff --git a/lasso/xml/id-wsf-2.0/sb2_usage_directive.c b/lasso/xml/id-wsf-2.0/sb2_usage_directive.c
index b1c676cb838960e5fd1ae7d124e27c1ffa2130be..b5c38116343c1f9be03b0b8b5b54700f33db71b2 100644
--- a/lasso/xml/id-wsf-2.0/sb2_usage_directive.c
+++ b/lasso/xml/id-wsf-2.0/sb2_usage_directive.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/sb2_usage_directive.h b/lasso/xml/id-wsf-2.0/sb2_usage_directive.h
index c40cc988f19b6fc1e9670bc5fba545610c27f872..32f77ad244a96b42ef93f479b043106640f17b6b 100644
--- a/lasso/xml/id-wsf-2.0/sb2_usage_directive.h
+++ b/lasso/xml/id-wsf-2.0/sb2_usage_directive.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SB2_USAGE_DIRECTIVE_H__
diff --git a/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c b/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c
index cd0e9b1b698e7db3257b5eb11263a674ea615554..cd93f68adc5b6eaa8e3a9efb984d4b78c5af7ccd 100644
--- a/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c
+++ b/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h b/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h
index d5a1a31b9ffeeddc7e712c219f7160e001dec67d..8bae32d3a74496b3af06b5e2b60b23cde55c8cf9 100644
--- a/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h
+++ b/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SB2_USER_INTERACTION_HEADER_H__
diff --git a/lasso/xml/id-wsf-2.0/sbf_framework.c b/lasso/xml/id-wsf-2.0/sbf_framework.c
index ab08828e9f5eee3771bb10c403b8e373e24a06ca..86919c5f9dbb040fad7c8159b1c4ea2ddeb1674c 100644
--- a/lasso/xml/id-wsf-2.0/sbf_framework.c
+++ b/lasso/xml/id-wsf-2.0/sbf_framework.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/sbf_framework.h b/lasso/xml/id-wsf-2.0/sbf_framework.h
index 8a093f873f1e4aa9c198e89bc6f6cfb84f1d5ae9..954391f9609ac9b251c942ca9fe4e5b4ab7d460b 100644
--- a/lasso/xml/id-wsf-2.0/sbf_framework.h
+++ b/lasso/xml/id-wsf-2.0/sbf_framework.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SBF_FRAMEWORK_H__
diff --git a/lasso/xml/id-wsf-2.0/sec_token.c b/lasso/xml/id-wsf-2.0/sec_token.c
index 472a739c1520b53e4c19143eb165e542ab2f3937..81c759e84f10e5ede71767ef9d16660677d93940 100644
--- a/lasso/xml/id-wsf-2.0/sec_token.c
+++ b/lasso/xml/id-wsf-2.0/sec_token.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/sec_token.h b/lasso/xml/id-wsf-2.0/sec_token.h
index 1c3e3570e040fff7a9e2b3d9587e14751515f32e..f710d2ef45b8967288ce4573b6f69604cf7d71da 100644
--- a/lasso/xml/id-wsf-2.0/sec_token.h
+++ b/lasso/xml/id-wsf-2.0/sec_token.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SEC_TOKEN_H__
diff --git a/lasso/xml/id-wsf-2.0/sec_token_policy.c b/lasso/xml/id-wsf-2.0/sec_token_policy.c
index d163ee61551e851decdfa5a36c7a7b2fe601ebbe..b6a0a9f62cd2e08ced9a651c54e1459a0432144e 100644
--- a/lasso/xml/id-wsf-2.0/sec_token_policy.c
+++ b/lasso/xml/id-wsf-2.0/sec_token_policy.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/sec_token_policy.h b/lasso/xml/id-wsf-2.0/sec_token_policy.h
index 6c038fb5428b8bd883d43d0a9e8bbf4e2ec03638..3fe64fcbd248d6784fd079195f4e3aa182483c30 100644
--- a/lasso/xml/id-wsf-2.0/sec_token_policy.h
+++ b/lasso/xml/id-wsf-2.0/sec_token_policy.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SEC_TOKEN_POLICY_H__
diff --git a/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c
index 3b58ca6fe70a0b76c115021341f21115c5207ebd..1f3a6bac13d472bb2e19bb8b9054680b029a69bf 100644
--- a/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c
+++ b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/sec_transited_provider_path.h b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.h
index 02e780952251ee4e1d13c87336d2f8fc4d2e12c1..59b03cf04e0d028dffda67c58c1ddec988874865 100644
--- a/lasso/xml/id-wsf-2.0/sec_transited_provider_path.h
+++ b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SEC_TRANSITED_PROVIDER_PATH_H__
diff --git a/lasso/xml/id-wsf-2.0/subs_notification.c b/lasso/xml/id-wsf-2.0/subs_notification.c
index 3ef4920c733c98275839e73b070e02bfc4de018f..1b8714724b8b9ec11b7d7cbfb46aeb8d7e0ced0e 100644
--- a/lasso/xml/id-wsf-2.0/subs_notification.c
+++ b/lasso/xml/id-wsf-2.0/subs_notification.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subs_notification.h b/lasso/xml/id-wsf-2.0/subs_notification.h
index 8d0b30a5a1eff31bd1918a17c9c660f7a4535cea..d816389af6bb2d016b0f418bcf83044e34571a32 100644
--- a/lasso/xml/id-wsf-2.0/subs_notification.h
+++ b/lasso/xml/id-wsf-2.0/subs_notification.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBS_NOTIFICATION_H__
diff --git a/lasso/xml/id-wsf-2.0/subs_notify_response.c b/lasso/xml/id-wsf-2.0/subs_notify_response.c
index 40683a6ab326d6889e4f7f963913b7c7d56c4b53..82e571eff262939369e8a87614a612759800cfc1 100644
--- a/lasso/xml/id-wsf-2.0/subs_notify_response.c
+++ b/lasso/xml/id-wsf-2.0/subs_notify_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subs_notify_response.h b/lasso/xml/id-wsf-2.0/subs_notify_response.h
index 0cf6285842df9b6bbf5145e9df9367c186d585ba..9a83be40d50a7405a0b4fef6d808f155963d443b 100644
--- a/lasso/xml/id-wsf-2.0/subs_notify_response.h
+++ b/lasso/xml/id-wsf-2.0/subs_notify_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBS_NOTIFY_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/subs_ref_item.c b/lasso/xml/id-wsf-2.0/subs_ref_item.c
index 52b53ad0e4e8777a1365ca74bbf593a0bcbd58a0..20039f5702ab89f80e21debaebffbd8965b67a51 100644
--- a/lasso/xml/id-wsf-2.0/subs_ref_item.c
+++ b/lasso/xml/id-wsf-2.0/subs_ref_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subs_ref_item.h b/lasso/xml/id-wsf-2.0/subs_ref_item.h
index 1b6124223ca4c2c92c66cd5fe61cc6d9e7e610eb..6d48a425081a90828b637eea280cc16479118e9a 100644
--- a/lasso/xml/id-wsf-2.0/subs_ref_item.h
+++ b/lasso/xml/id-wsf-2.0/subs_ref_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBS_REF_ITEM_H__
diff --git a/lasso/xml/id-wsf-2.0/subs_subscription.c b/lasso/xml/id-wsf-2.0/subs_subscription.c
index 2ba65aa23024125fb098a8d67762e1a55cbd351d..fd7e013e67ba95404e058efa46fefb42d07b0f4a 100644
--- a/lasso/xml/id-wsf-2.0/subs_subscription.c
+++ b/lasso/xml/id-wsf-2.0/subs_subscription.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subs_subscription.h b/lasso/xml/id-wsf-2.0/subs_subscription.h
index 9ba42f28b6a3ddd35323760c332d2d463d21a207..32b4328f83ff7dc428279729186c962c19613593 100644
--- a/lasso/xml/id-wsf-2.0/subs_subscription.h
+++ b/lasso/xml/id-wsf-2.0/subs_subscription.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBS_SUBSCRIPTION_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_app_data.c b/lasso/xml/id-wsf-2.0/subsref_app_data.c
index 7607d44e39f32fd90b4ffbe52b8a62fbc89bc265..f782ea2694c639b8df4c1654bb95145c45dfa770 100644
--- a/lasso/xml/id-wsf-2.0/subsref_app_data.c
+++ b/lasso/xml/id-wsf-2.0/subsref_app_data.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_app_data.h b/lasso/xml/id-wsf-2.0/subsref_app_data.h
index b2c9b8a7c45115811637b0cf19186b697f0901e8..e35d082e6ef60e305bf86672dc8947ff259ccc65 100644
--- a/lasso/xml/id-wsf-2.0/subsref_app_data.h
+++ b/lasso/xml/id-wsf-2.0/subsref_app_data.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_APP_DATA_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_create.c b/lasso/xml/id-wsf-2.0/subsref_create.c
index fe6512c00f757d4a675ad8b41513c52cf7a0cc10..e239bacd7b81adb7d5308fd33718a262d34f976f 100644
--- a/lasso/xml/id-wsf-2.0/subsref_create.c
+++ b/lasso/xml/id-wsf-2.0/subsref_create.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_create.h b/lasso/xml/id-wsf-2.0/subsref_create.h
index 26c7fda88de24b976754289dc461eef162c2a637..778e46c8977065472a71108418d79e0e48cf4501 100644
--- a/lasso/xml/id-wsf-2.0/subsref_create.h
+++ b/lasso/xml/id-wsf-2.0/subsref_create.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_CREATE_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_create_item.c b/lasso/xml/id-wsf-2.0/subsref_create_item.c
index 2d39f440cd9938a3ab8f3eb6b46762de70eddc1e..0f85d0d9cc679ecbe4aa9d5680bf0fc457bfc24c 100644
--- a/lasso/xml/id-wsf-2.0/subsref_create_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_create_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_create_item.h b/lasso/xml/id-wsf-2.0/subsref_create_item.h
index fe1a2c992c40aa93eae71f61532ff1a310a7415b..b3636d84dfc85fe35c6e05ae1afeb0488ba85aef 100644
--- a/lasso/xml/id-wsf-2.0/subsref_create_item.h
+++ b/lasso/xml/id-wsf-2.0/subsref_create_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_CREATE_ITEM_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_create_response.c b/lasso/xml/id-wsf-2.0/subsref_create_response.c
index f80b6cb44741119835c80e1df4ccd3a541c3f0e0..7467b2b2deea4ebfd5a3c55ab03f6faca7f9c3bc 100644
--- a/lasso/xml/id-wsf-2.0/subsref_create_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_create_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_create_response.h b/lasso/xml/id-wsf-2.0/subsref_create_response.h
index 465d77ec7a42bd0af8c88d8a219a95766869f093..9f637f34ae8c3d156cbe9464709c91d3dac863b4 100644
--- a/lasso/xml/id-wsf-2.0/subsref_create_response.h
+++ b/lasso/xml/id-wsf-2.0/subsref_create_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_CREATE_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_data.c b/lasso/xml/id-wsf-2.0/subsref_data.c
index 516301c53155dde7d10d681b4de8764ba3a480b0..7b4d4572aa736543d4369ffa602de0396fe86835 100644
--- a/lasso/xml/id-wsf-2.0/subsref_data.c
+++ b/lasso/xml/id-wsf-2.0/subsref_data.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_data.h b/lasso/xml/id-wsf-2.0/subsref_data.h
index 0f4ee1733f6acaeae03f1a461cdaccf8599fc040..293fdcbd753a8f895f00e4516e8b76a5872ba531 100644
--- a/lasso/xml/id-wsf-2.0/subsref_data.h
+++ b/lasso/xml/id-wsf-2.0/subsref_data.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_DATA_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_data_response.c b/lasso/xml/id-wsf-2.0/subsref_data_response.c
index d3097d6a4a99eba2878473eb382353fe44848976..e293dd9c726cbe1029b26722e6bd142d4a3801e2 100644
--- a/lasso/xml/id-wsf-2.0/subsref_data_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_data_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_data_response.h b/lasso/xml/id-wsf-2.0/subsref_data_response.h
index f8a95f454561a25eadc9fd334dbbea073abe4966..3ec09af48e3ec476626218ed1782250bac51f231 100644
--- a/lasso/xml/id-wsf-2.0/subsref_data_response.h
+++ b/lasso/xml/id-wsf-2.0/subsref_data_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_DATA_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete.c b/lasso/xml/id-wsf-2.0/subsref_delete.c
index 6bb77c023bcad255bec1b1fb64c9757d8b53cbfb..d8a889a8f64a562e48f45680bc16a8a01aa77428 100644
--- a/lasso/xml/id-wsf-2.0/subsref_delete.c
+++ b/lasso/xml/id-wsf-2.0/subsref_delete.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete.h b/lasso/xml/id-wsf-2.0/subsref_delete.h
index 2934d5ca8351f873e1fbb9354368595447f2fcc1..3e159b0601f1ed166cbec4f84d7463a85c59d5cb 100644
--- a/lasso/xml/id-wsf-2.0/subsref_delete.h
+++ b/lasso/xml/id-wsf-2.0/subsref_delete.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_DELETE_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_item.c b/lasso/xml/id-wsf-2.0/subsref_delete_item.c
index d498059999f782ce581012a9932db089b587b496..a5f4c34bdb8fd56ff218e339ee9622cdf6f8f9a2 100644
--- a/lasso/xml/id-wsf-2.0/subsref_delete_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_delete_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_item.h b/lasso/xml/id-wsf-2.0/subsref_delete_item.h
index 18a79856d28da8ded6c7e0a08bfd0c1fc685b515..6dbbe40a46cc03560cc4167fce873ac4fafceafb 100644
--- a/lasso/xml/id-wsf-2.0/subsref_delete_item.h
+++ b/lasso/xml/id-wsf-2.0/subsref_delete_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_DELETE_ITEM_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_response.c b/lasso/xml/id-wsf-2.0/subsref_delete_response.c
index bf2f0f58773d709f28af68abf2a63fb604e01ebc..ccc5de20f8ea1fa353bbcc1bed67858f19bdb7e1 100644
--- a/lasso/xml/id-wsf-2.0/subsref_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_delete_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_response.h b/lasso/xml/id-wsf-2.0/subsref_delete_response.h
index eab23885de357e42114ac293d80025be9fb03a18..0025773afc59da53cfdec795e65dda1c2630572f 100644
--- a/lasso/xml/id-wsf-2.0/subsref_delete_response.h
+++ b/lasso/xml/id-wsf-2.0/subsref_delete_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_DELETE_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_item_data.c b/lasso/xml/id-wsf-2.0/subsref_item_data.c
index 32b17e3fa434ad3e2d7889982f968f7dc10337be..4322f0f577b462149defe3ab19d688ec26d13df2 100644
--- a/lasso/xml/id-wsf-2.0/subsref_item_data.c
+++ b/lasso/xml/id-wsf-2.0/subsref_item_data.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_item_data.h b/lasso/xml/id-wsf-2.0/subsref_item_data.h
index 9460fa366b9f865458e9ee3c4a484626ad819017..38769ad70420a72454b07373f1dae3097a91e057 100644
--- a/lasso/xml/id-wsf-2.0/subsref_item_data.h
+++ b/lasso/xml/id-wsf-2.0/subsref_item_data.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_ITEM_DATA_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify.c b/lasso/xml/id-wsf-2.0/subsref_modify.c
index 7e1e1c75ce73d3f042216db707d358b788db6129..eb5f2571c4f5c8bc0b0375891432493c4752593d 100644
--- a/lasso/xml/id-wsf-2.0/subsref_modify.c
+++ b/lasso/xml/id-wsf-2.0/subsref_modify.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify.h b/lasso/xml/id-wsf-2.0/subsref_modify.h
index 89174d3b89c395a7c9c6f417a16f3538722f8e6d..51640c5f49df555543ac178d1eae383d4bd389c5 100644
--- a/lasso/xml/id-wsf-2.0/subsref_modify.h
+++ b/lasso/xml/id-wsf-2.0/subsref_modify.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_MODIFY_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_item.c b/lasso/xml/id-wsf-2.0/subsref_modify_item.c
index 2fd87d00aaa68777384de382ca92a2eb479538f2..3e592244e2141772b7a7269a75f45bf5738176f7 100644
--- a/lasso/xml/id-wsf-2.0/subsref_modify_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_modify_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_item.h b/lasso/xml/id-wsf-2.0/subsref_modify_item.h
index e455698595201affe40524e929a5642209f962aa..e152767f6fd35cc6fff992770986e69e8edde804 100644
--- a/lasso/xml/id-wsf-2.0/subsref_modify_item.h
+++ b/lasso/xml/id-wsf-2.0/subsref_modify_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_MODIFY_ITEM_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_response.c b/lasso/xml/id-wsf-2.0/subsref_modify_response.c
index 2a10b9d9435090b2a2481c6f4582ce317031ca13..ac6492dc24d1b75a7911f95ce165174ad117323e 100644
--- a/lasso/xml/id-wsf-2.0/subsref_modify_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_modify_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_response.h b/lasso/xml/id-wsf-2.0/subsref_modify_response.h
index e7723143d71ec8ef7ae08e93d988d65b3ee5e67b..1058a8bad16433e2a5770760ca99460f23bcc59f 100644
--- a/lasso/xml/id-wsf-2.0/subsref_modify_response.h
+++ b/lasso/xml/id-wsf-2.0/subsref_modify_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_MODIFY_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_notification.c b/lasso/xml/id-wsf-2.0/subsref_notification.c
index 7615a5d6836988e2cede943a1326b31b1a46438f..d5bcb9e8fe519dc28c30185a9b2dbe53a70cb053 100644
--- a/lasso/xml/id-wsf-2.0/subsref_notification.c
+++ b/lasso/xml/id-wsf-2.0/subsref_notification.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_notification.h b/lasso/xml/id-wsf-2.0/subsref_notification.h
index 332b123f30bbec52e45d59965cd8d5488ea2cb4f..5d60378a555aa3fe64f773c376b6bcdece00de50 100644
--- a/lasso/xml/id-wsf-2.0/subsref_notification.h
+++ b/lasso/xml/id-wsf-2.0/subsref_notification.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_NOTIFICATION_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_notify.c b/lasso/xml/id-wsf-2.0/subsref_notify.c
index 793fb07c9bc04055e1b6126c8d374575d665324e..e55461ae4f04f4b5af765c15f9389f59af1f5cf0 100644
--- a/lasso/xml/id-wsf-2.0/subsref_notify.c
+++ b/lasso/xml/id-wsf-2.0/subsref_notify.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_notify.h b/lasso/xml/id-wsf-2.0/subsref_notify.h
index 69c3c4fa669b4350e8c480446ed0710223818ded..2182c338348badbe2f1d89c2bb9fdfe41af8fbc3 100644
--- a/lasso/xml/id-wsf-2.0/subsref_notify.h
+++ b/lasso/xml/id-wsf-2.0/subsref_notify.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_NOTIFY_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_notify_response.c b/lasso/xml/id-wsf-2.0/subsref_notify_response.c
index 55201c7fe0d9056f93e8680f4dfa366fcf111de4..e97a96dac31e3682e26b2e4123187274b2278eeb 100644
--- a/lasso/xml/id-wsf-2.0/subsref_notify_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_notify_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_notify_response.h b/lasso/xml/id-wsf-2.0/subsref_notify_response.h
index 6fe0d3ff56e29a9cb82588263d8fd78373f828f7..1f30a6280ce38fe4d86a15adb8c22bf3d520173e 100644
--- a/lasso/xml/id-wsf-2.0/subsref_notify_response.h
+++ b/lasso/xml/id-wsf-2.0/subsref_notify_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_NOTIFY_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_query.c b/lasso/xml/id-wsf-2.0/subsref_query.c
index 4f562410a169b4ef5c31babf45ae33198da9a36a..6de7826de2c66d80eff51c7f4c3af1e60f20d9f5 100644
--- a/lasso/xml/id-wsf-2.0/subsref_query.c
+++ b/lasso/xml/id-wsf-2.0/subsref_query.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_query.h b/lasso/xml/id-wsf-2.0/subsref_query.h
index 05a40a6a9094e90fce6e87f03d885972c073ed70..c86c7ca71e47ce64c63388f5327dcf7b1f96b524 100644
--- a/lasso/xml/id-wsf-2.0/subsref_query.h
+++ b/lasso/xml/id-wsf-2.0/subsref_query.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_QUERY_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_query_item.c b/lasso/xml/id-wsf-2.0/subsref_query_item.c
index beabd032ea05e35f86c7710a650e79d8b76d999b..279025e7dda7c14255a2e7682e9be3d0036713c7 100644
--- a/lasso/xml/id-wsf-2.0/subsref_query_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_query_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_query_item.h b/lasso/xml/id-wsf-2.0/subsref_query_item.h
index 4f1ac7303b90bae341adaae9568e8794e0ad47ea..6c5629f5492b9dddd4b2c13cf443801fd987a02d 100644
--- a/lasso/xml/id-wsf-2.0/subsref_query_item.h
+++ b/lasso/xml/id-wsf-2.0/subsref_query_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_QUERY_ITEM_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_query_response.c b/lasso/xml/id-wsf-2.0/subsref_query_response.c
index 4aacb9d380dff583160dd2339bb22ab417e5d6b0..fed817d9693b808299e50eee51b89182e7d38539 100644
--- a/lasso/xml/id-wsf-2.0/subsref_query_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_query_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_query_response.h b/lasso/xml/id-wsf-2.0/subsref_query_response.h
index 52013a8e5235642aa17f809a0e18c4f5135be7b2..a1de7db9ecb81149897e69d1a83b561f6281aeb5 100644
--- a/lasso/xml/id-wsf-2.0/subsref_query_response.h
+++ b/lasso/xml/id-wsf-2.0/subsref_query_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_QUERY_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_result_query.c b/lasso/xml/id-wsf-2.0/subsref_result_query.c
index e858c04287491b849e7742b6919701e44f8a8160..02c6668fb006866a9de668680fe74dd004e2a69f 100644
--- a/lasso/xml/id-wsf-2.0/subsref_result_query.c
+++ b/lasso/xml/id-wsf-2.0/subsref_result_query.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_result_query.h b/lasso/xml/id-wsf-2.0/subsref_result_query.h
index e954e2efba76d6bc761387179f0fdf5a055f7a84..a02ee4f6baea67bb560c43004380d86453527dc8 100644
--- a/lasso/xml/id-wsf-2.0/subsref_result_query.h
+++ b/lasso/xml/id-wsf-2.0/subsref_result_query.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_RESULT_QUERY_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_subscription.c b/lasso/xml/id-wsf-2.0/subsref_subscription.c
index 5dcbd6a526da4fedd151aaec51d2255226f0b139..605a9435750f13b5459b6343a062c029be2227f6 100644
--- a/lasso/xml/id-wsf-2.0/subsref_subscription.c
+++ b/lasso/xml/id-wsf-2.0/subsref_subscription.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_subscription.h b/lasso/xml/id-wsf-2.0/subsref_subscription.h
index 98e0c023922c81d4a8b9ddf610f5869bff8bea17..65d49e4b917a93cbaa66def2051cdef2e18a6a8e 100644
--- a/lasso/xml/id-wsf-2.0/subsref_subscription.h
+++ b/lasso/xml/id-wsf-2.0/subsref_subscription.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_SUBSCRIPTION_H__
diff --git a/lasso/xml/id-wsf-2.0/subsref_test_item.c b/lasso/xml/id-wsf-2.0/subsref_test_item.c
index 64554e972d940087ae17e9dbd5f12dd055915b66..27e68ea1dfeec9ab74846630e8319ac26cb4108d 100644
--- a/lasso/xml/id-wsf-2.0/subsref_test_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_test_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/subsref_test_item.h b/lasso/xml/id-wsf-2.0/subsref_test_item.h
index 8768ec25c31a875495d350f7f6604adee1aa1212..20fcd887fb563cf262247d8baee9d5cd34237cc4 100644
--- a/lasso/xml/id-wsf-2.0/subsref_test_item.h
+++ b/lasso/xml/id-wsf-2.0/subsref_test_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_SUBSREF_TEST_ITEM_H__
diff --git a/lasso/xml/id-wsf-2.0/util_empty.c b/lasso/xml/id-wsf-2.0/util_empty.c
index 9172f0b56a7bc89c1dd2b97d9338a0c4291e9682..6c44eeda77b97ee2e6f2c957185635ebbb482c79 100644
--- a/lasso/xml/id-wsf-2.0/util_empty.c
+++ b/lasso/xml/id-wsf-2.0/util_empty.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/util_empty.h b/lasso/xml/id-wsf-2.0/util_empty.h
index 33ce32c2c3393de8ea034ce6d619d25cfb1351dd..b78dfbda14b7f9656036a9176e45379164dec4fd 100644
--- a/lasso/xml/id-wsf-2.0/util_empty.h
+++ b/lasso/xml/id-wsf-2.0/util_empty.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_UTIL_EMPTY_H__
diff --git a/lasso/xml/id-wsf-2.0/util_extension.c b/lasso/xml/id-wsf-2.0/util_extension.c
index 289641d15a789baacb41993be2ed4c732891e788..bc9e1137bf8c645ff181cda6d1a7f5ae5cb2344b 100644
--- a/lasso/xml/id-wsf-2.0/util_extension.c
+++ b/lasso/xml/id-wsf-2.0/util_extension.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/util_extension.h b/lasso/xml/id-wsf-2.0/util_extension.h
index 1fc08965579ed0bc327ef1bf5b20b8401da60cda..51500799e7178b2d39242e83bf509fe25f11b59d 100644
--- a/lasso/xml/id-wsf-2.0/util_extension.h
+++ b/lasso/xml/id-wsf-2.0/util_extension.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_UTIL_EXTENSION_H__
diff --git a/lasso/xml/id-wsf-2.0/util_response.c b/lasso/xml/id-wsf-2.0/util_response.c
index 79fd5807f5989dd299f44acaf675aae2eabde42d..368727f19bff4eb97bae1dd4e8750384ccc378f3 100644
--- a/lasso/xml/id-wsf-2.0/util_response.c
+++ b/lasso/xml/id-wsf-2.0/util_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/util_response.h b/lasso/xml/id-wsf-2.0/util_response.h
index 78f0a3e24457f102e8dfb07ac89081cd0aefb02c..409402f753c9ee26a60e3de2085434224acc7447 100644
--- a/lasso/xml/id-wsf-2.0/util_response.h
+++ b/lasso/xml/id-wsf-2.0/util_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_UTIL_RESPONSE_H__
diff --git a/lasso/xml/id-wsf-2.0/util_status.c b/lasso/xml/id-wsf-2.0/util_status.c
index a0bce6634e73c9284c5728a5371f71b3a035bf89..04a74c9c33dc2e651eab96aee87b1fc3dd8e2939 100644
--- a/lasso/xml/id-wsf-2.0/util_status.c
+++ b/lasso/xml/id-wsf-2.0/util_status.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/id-wsf-2.0/util_status.h b/lasso/xml/id-wsf-2.0/util_status.h
index 77e0e63b580db825ac36863fa8320338df301748..5a52e08e1233290a607398e2ed1912393cb7586f 100644
--- a/lasso/xml/id-wsf-2.0/util_status.h
+++ b/lasso/xml/id-wsf-2.0/util_status.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IDWSF2_UTIL_STATUS_H__
diff --git a/lasso/xml/id-wsf-2.0/xml_idwsf2.h b/lasso/xml/id-wsf-2.0/xml_idwsf2.h
index d352a0e5a94f77218c4ed453e672bc578ba08a34..4c5b7cf540ad0181fcf68abb929d13384686f3e6 100644
--- a/lasso/xml/id-wsf-2.0/xml_idwsf2.h
+++ b/lasso/xml/id-wsf-2.0/xml_idwsf2.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_XML_IDWSF2_H__
diff --git a/lasso/xml/idwsf_strings.h b/lasso/xml/idwsf_strings.h
index e462f27ccaf3414f0812e34f5a8835bd9cfa9b88..3d1408f468f98d0cfc3d09b5fecd3b11b1992272 100644
--- a/lasso/xml/idwsf_strings.h
+++ b/lasso/xml/idwsf_strings.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/lasso/xml/is_help.c b/lasso/xml/is_help.c
index 19072d6a8ecaecd5f0e0783bb13287b05766accc..9c2cb4917c437ed7517b9dec2d03c173594d2104 100644
--- a/lasso/xml/is_help.c
+++ b/lasso/xml/is_help.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/is_help.h b/lasso/xml/is_help.h
index 7fb95a5331fdae9fad6187f41d103e66dacb00df..591e671dd94217dd8a38388e5e6be1f980f198a5 100644
--- a/lasso/xml/is_help.h
+++ b/lasso/xml/is_help.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IS_HELP_H__
diff --git a/lasso/xml/is_inquiry.c b/lasso/xml/is_inquiry.c
index 94002c7ff3229cfc2e81fa919294c0e2d436200f..1132a38012b7d3ba65476c535d9a290cdc6c30b0 100644
--- a/lasso/xml/is_inquiry.c
+++ b/lasso/xml/is_inquiry.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/is_inquiry.h b/lasso/xml/is_inquiry.h
index de18f5c3dfd0436f57379bdd8190c442c72611f0..618f101fd80d87acfbdd6e436ee4a8c6249b4afc 100644
--- a/lasso/xml/is_inquiry.h
+++ b/lasso/xml/is_inquiry.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IS_INQUIRY_H__
diff --git a/lasso/xml/is_inquiry_element.c b/lasso/xml/is_inquiry_element.c
index 47be92d7d20618fb397ec31174bde2f6a77af407..d9dd222dd3b9b6af55bc627d0cf64977c3f646a6 100644
--- a/lasso/xml/is_inquiry_element.c
+++ b/lasso/xml/is_inquiry_element.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/is_inquiry_element.h b/lasso/xml/is_inquiry_element.h
index a98e700d15f2a2d7caf467e3ec647730d65911fd..043c73306ed50b1cc342dbd39f2c1f5ee916fd4e 100644
--- a/lasso/xml/is_inquiry_element.h
+++ b/lasso/xml/is_inquiry_element.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IS_INQUIRY_ELEMENT_H__
diff --git a/lasso/xml/is_interaction_request.c b/lasso/xml/is_interaction_request.c
index 88047e869f0e4a4df0933605542325c9fb9f8b69..f03560c096dbcb401c4997483b959eeaa60c4d1b 100644
--- a/lasso/xml/is_interaction_request.c
+++ b/lasso/xml/is_interaction_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/is_interaction_request.h b/lasso/xml/is_interaction_request.h
index 9f635c2121d618f5632580dcbaf28ef6543ba97e..112ce0f749c4f65ad3ee6b75ee766be38bae1524 100644
--- a/lasso/xml/is_interaction_request.h
+++ b/lasso/xml/is_interaction_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IS_INTERACTION_REQUEST_H__
diff --git a/lasso/xml/is_interaction_response.c b/lasso/xml/is_interaction_response.c
index 17806de80b9f3f5808e8dd43ab7296c197692340..0656cbf0bdf804cb190f30a2ca38bcf959826f7d 100644
--- a/lasso/xml/is_interaction_response.c
+++ b/lasso/xml/is_interaction_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/is_interaction_response.h b/lasso/xml/is_interaction_response.h
index e428c68debd51034c1b25ca22007aa84cd17a7d9..a2a6413f9c2e1badf53cbba102556c582c0bb62a 100644
--- a/lasso/xml/is_interaction_response.h
+++ b/lasso/xml/is_interaction_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IS_INTERACTION_RESPONSE_H__
diff --git a/lasso/xml/is_interaction_statement.c b/lasso/xml/is_interaction_statement.c
index 623a9645058501cc881283201fd291c7035c79e3..3348c8323f728ba2ca7778ff8e5f6ae1f11f3490 100644
--- a/lasso/xml/is_interaction_statement.c
+++ b/lasso/xml/is_interaction_statement.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/is_interaction_statement.h b/lasso/xml/is_interaction_statement.h
index 3c858ea345a6c80642a9a746316145937e0e5899..ecd54ff32f308279a4b919c6760a398a1f924055 100644
--- a/lasso/xml/is_interaction_statement.h
+++ b/lasso/xml/is_interaction_statement.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IS_INTERACTION_STATEMENT_H__
diff --git a/lasso/xml/is_item.c b/lasso/xml/is_item.c
index 540714c77b5b15db23c06fa0041014427e1b69d3..009d117832d366907ac74b9a613675f9384e9978 100644
--- a/lasso/xml/is_item.c
+++ b/lasso/xml/is_item.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/is_item.h b/lasso/xml/is_item.h
index 80ef137bd1423cc8e5553ab42e4afafa1cf10620..c2cf23ebf8582b017f8095794f8091912a39f46c 100644
--- a/lasso/xml/is_item.h
+++ b/lasso/xml/is_item.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IS_ITEM_H__
diff --git a/lasso/xml/is_parameter.c b/lasso/xml/is_parameter.c
index 43e017c9eecb3c08b58917c92faa150489c2bd70..f44e5f569e412f1097ca3baf6f7a818acdb730fb 100644
--- a/lasso/xml/is_parameter.c
+++ b/lasso/xml/is_parameter.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/is_parameter.h b/lasso/xml/is_parameter.h
index 97b2b797aa6c7b0c91aa8c1d658cd32d5a9bbca2..3c70addd191d706d7690d3a861a954b4e66274cd 100644
--- a/lasso/xml/is_parameter.h
+++ b/lasso/xml/is_parameter.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IS_PARAMETER_H__
diff --git a/lasso/xml/is_redirect_request.c b/lasso/xml/is_redirect_request.c
index 34112ce5b06aa617e60c4d9d6712e317079c83a3..6465ae1925ab89661b941c6e372c10b87de7cfc8 100644
--- a/lasso/xml/is_redirect_request.c
+++ b/lasso/xml/is_redirect_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/is_redirect_request.h b/lasso/xml/is_redirect_request.h
index b9d9340a36ff8fef001bf9adabaa609ff46fa8b9..030c2404be0b8183b25b46810682fa020adae825 100644
--- a/lasso/xml/is_redirect_request.h
+++ b/lasso/xml/is_redirect_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IS_REDIRECT_REQUEST_H__
diff --git a/lasso/xml/is_select.c b/lasso/xml/is_select.c
index f69aa3ebda476b016dc4a7e0170ddd50d6f6c39d..f373b0fbd0c55b0df23de94079e299b5d17187a5 100644
--- a/lasso/xml/is_select.c
+++ b/lasso/xml/is_select.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/is_select.h b/lasso/xml/is_select.h
index 2ee86b65e31053c8c83eddec89beb8b14ad141a6..e554cb80c9fe7b8739c489c267da73d534eee8e4 100644
--- a/lasso/xml/is_select.h
+++ b/lasso/xml/is_select.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IS_SELECT_H__
diff --git a/lasso/xml/is_text.c b/lasso/xml/is_text.c
index 2b77541f138ffddfeace3f7dab3e1218bc710cae..c72afa7c6e3e186f8919eafc2b147bc5d97bfbad 100644
--- a/lasso/xml/is_text.c
+++ b/lasso/xml/is_text.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/is_text.h b/lasso/xml/is_text.h
index 1d6248e7516d14a5de9ad0facefd7e390a40499c..833fa418c4ade5aa2e039ab29a56517b78dc9b79 100644
--- a/lasso/xml/is_text.h
+++ b/lasso/xml/is_text.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IS_TEXT_H__
diff --git a/lasso/xml/is_user_interaction.c b/lasso/xml/is_user_interaction.c
index 312b5bc93e30cde5747a632e7c021c3d11ad4564..8a270b6c91d888ddaa89dad40390a7b1a77f00eb 100644
--- a/lasso/xml/is_user_interaction.c
+++ b/lasso/xml/is_user_interaction.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/is_user_interaction.h b/lasso/xml/is_user_interaction.h
index 3669b8ae0ebae39d18a31596aed2751d696c9349..7df05546a5bc6dcf735016bda4474e02b98b7aae 100644
--- a/lasso/xml/is_user_interaction.h
+++ b/lasso/xml/is_user_interaction.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_IS_USER_INTERACTION_H__
diff --git a/lasso/xml/lib_assertion.c b/lasso/xml/lib_assertion.c
index 17f71c14cdf2d20d2f7110ad7c22302b103ea540..92dd6b92a9b0228ede577c445fade48a63a7f08e 100644
--- a/lasso/xml/lib_assertion.c
+++ b/lasso/xml/lib_assertion.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_assertion.h b/lasso/xml/lib_assertion.h
index f23d080c4e8e75dbf4fcd2aadc8fc0b260176a72..98e3ada3efa398a2da05213102d93e72801a49a5 100644
--- a/lasso/xml/lib_assertion.h
+++ b/lasso/xml/lib_assertion.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_ASSERTION_H__
diff --git a/lasso/xml/lib_authentication_statement.c b/lasso/xml/lib_authentication_statement.c
index dff4be3a90a8abb31454a9333a8e7e0d1e61e1b4..8291dc03a6b4ea64645dfe9aed62a226bbe24236 100644
--- a/lasso/xml/lib_authentication_statement.c
+++ b/lasso/xml/lib_authentication_statement.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_authentication_statement.h b/lasso/xml/lib_authentication_statement.h
index 76bac5818ec1fe6b3c0c25f5c10c9c3805f38b71..8320488a07ff5fa4fa9bdad51207b735c3e810f2 100644
--- a/lasso/xml/lib_authentication_statement.h
+++ b/lasso/xml/lib_authentication_statement.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_AUTHENTICATION_STATEMENT_H__
diff --git a/lasso/xml/lib_authn_context.c b/lasso/xml/lib_authn_context.c
index f0d5431d953c408ee428974df65e028e1d965736..850416729cfa233292f2ecd31bf220389c15c287 100644
--- a/lasso/xml/lib_authn_context.c
+++ b/lasso/xml/lib_authn_context.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_authn_context.h b/lasso/xml/lib_authn_context.h
index 2742c30074d3697a17d92712205337d8b11feaac..9213d96eaafdc07e7f70a73f4ed9b7ad8a8495d9 100644
--- a/lasso/xml/lib_authn_context.h
+++ b/lasso/xml/lib_authn_context.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_AUTHN_CONTEXT_H__
diff --git a/lasso/xml/lib_authn_request.c b/lasso/xml/lib_authn_request.c
index d7afd0606340222cad6f213df2cafe4ed1dd966f..7c2bf8555d6b1733a178157a2f7dc29c7a712790 100644
--- a/lasso/xml/lib_authn_request.c
+++ b/lasso/xml/lib_authn_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_authn_request.h b/lasso/xml/lib_authn_request.h
index a9f5911d2a19f684bccfc30ef08fe127e6805769..b5d0bf93be7b0bc034bd5ede3124d03f94a11eee 100644
--- a/lasso/xml/lib_authn_request.h
+++ b/lasso/xml/lib_authn_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_AUTHN_REQUEST_H__
diff --git a/lasso/xml/lib_authn_request_envelope.c b/lasso/xml/lib_authn_request_envelope.c
index bb9e063ffd6efdfbd85483cc25b4b3904ef27777..1010dbb144b86dab3433d21e75dd71db2a308938 100644
--- a/lasso/xml/lib_authn_request_envelope.c
+++ b/lasso/xml/lib_authn_request_envelope.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_authn_request_envelope.h b/lasso/xml/lib_authn_request_envelope.h
index 8a5274eabc122c39f0c92242e4af3c23a63fbf1d..c01a529e53c1fb6aea55bf3f7c20e6f9a8b5dba6 100644
--- a/lasso/xml/lib_authn_request_envelope.h
+++ b/lasso/xml/lib_authn_request_envelope.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_AUTHN_REQUEST_ENVELOPE_H__
diff --git a/lasso/xml/lib_authn_response.c b/lasso/xml/lib_authn_response.c
index a7d0accf3f7bb32807f594cb4b9da8388eba7271..8abe70b5044f1fc3bd30b39239feae86d77341b6 100644
--- a/lasso/xml/lib_authn_response.c
+++ b/lasso/xml/lib_authn_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_authn_response.h b/lasso/xml/lib_authn_response.h
index a70ae9da05df81594ebb7593ad3fd6a3ac81e32d..bd3e1e8cb57e06a8f272781d59d4cdf39400ebc5 100644
--- a/lasso/xml/lib_authn_response.h
+++ b/lasso/xml/lib_authn_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_AUTHN_RESPONSE_H__
diff --git a/lasso/xml/lib_authn_response_envelope.c b/lasso/xml/lib_authn_response_envelope.c
index 38ab1f16656c9c1c4bad6edef734adc9d6a343b9..838529ab10e5101375d718cfaa378a18b846ed4c 100644
--- a/lasso/xml/lib_authn_response_envelope.c
+++ b/lasso/xml/lib_authn_response_envelope.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_authn_response_envelope.h b/lasso/xml/lib_authn_response_envelope.h
index 50e28cf4b8ed8143777c8637f6d1157b67446606..59f2af8f72edf3c40d7b96fd5263883c52aa3f6b 100644
--- a/lasso/xml/lib_authn_response_envelope.h
+++ b/lasso/xml/lib_authn_response_envelope.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef __LASSO_LIB_AUTHN_RESPONSE_ENVELOPE_H__
 #define __LASSO_LIB_AUTHN_RESPONSE_ENVELOPE_H__
diff --git a/lasso/xml/lib_federation_termination_notification.c b/lasso/xml/lib_federation_termination_notification.c
index 8a8fcb4eecb6e7c44529fb30c5da8594a0221c2f..9ea97dcac472a5943aacd7f0fbae344e9372d134 100644
--- a/lasso/xml/lib_federation_termination_notification.c
+++ b/lasso/xml/lib_federation_termination_notification.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "../utils.h"
 #include "private.h"
diff --git a/lasso/xml/lib_federation_termination_notification.h b/lasso/xml/lib_federation_termination_notification.h
index b3e776f5b3c8adfe43c806a1e918d8fdb8c5d933..cae7dbb86a59a4175b37e77e103c31ea00da2ead 100644
--- a/lasso/xml/lib_federation_termination_notification.h
+++ b/lasso/xml/lib_federation_termination_notification.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_FEDERATION_TERMINATION_NOTIFICATION_H__
diff --git a/lasso/xml/lib_idp_entries.c b/lasso/xml/lib_idp_entries.c
index bab525b7189bdbf864d0ae8ac03ab918e96e58ae..581126da72852d30bc6f3365be1570ae7f15d311 100644
--- a/lasso/xml/lib_idp_entries.c
+++ b/lasso/xml/lib_idp_entries.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_idp_entries.h b/lasso/xml/lib_idp_entries.h
index 4cfad581e9d4ca5eaa1379bc7110c5161f51898f..2695522ea7fce19cf27dc82159d695698e902f14 100644
--- a/lasso/xml/lib_idp_entries.h
+++ b/lasso/xml/lib_idp_entries.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_IDP_ENTRIES_H__
diff --git a/lasso/xml/lib_idp_entry.c b/lasso/xml/lib_idp_entry.c
index d3c0810a5413a167a254382e4af0bbcd09eafd3e..7ac39d140fa82da08e4dd9a7d7d5673394f19d60 100644
--- a/lasso/xml/lib_idp_entry.c
+++ b/lasso/xml/lib_idp_entry.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_idp_entry.h b/lasso/xml/lib_idp_entry.h
index d881860e7eb8fc0684bf99c4fc04812cc645a226..081e2d6071f6ded9c7e3c9a76da45309b4b1936c 100644
--- a/lasso/xml/lib_idp_entry.h
+++ b/lasso/xml/lib_idp_entry.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_IDP_ENTRY_H__
diff --git a/lasso/xml/lib_idp_list.c b/lasso/xml/lib_idp_list.c
index c7423e4498942be8a360cbab1ac45c01f1ea03ca..981a59d607a2708324ba5088b942f7c5470f9642 100644
--- a/lasso/xml/lib_idp_list.c
+++ b/lasso/xml/lib_idp_list.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_idp_list.h b/lasso/xml/lib_idp_list.h
index 7003330a8ae6cf6e1983e9935ebca611eb9d5d03..9da439eeceb3b51dc5b50a1ddd49ae18fd7bfdf7 100644
--- a/lasso/xml/lib_idp_list.h
+++ b/lasso/xml/lib_idp_list.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_IDP_LIST_H__
diff --git a/lasso/xml/lib_logout_request.c b/lasso/xml/lib_logout_request.c
index 143ec83e31b26ae334ef89312c2b67b4fb7d2399..d94d2c0a4b554d9eae5851ea905fbca22c672643 100644
--- a/lasso/xml/lib_logout_request.c
+++ b/lasso/xml/lib_logout_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_logout_request.h b/lasso/xml/lib_logout_request.h
index 757323095c3907c2446d007c284f46aa059c1488..1f9817cc27e54917e081de77bb117f09961a0076 100644
--- a/lasso/xml/lib_logout_request.h
+++ b/lasso/xml/lib_logout_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_LOGOUT_REQUEST_H__
diff --git a/lasso/xml/lib_logout_response.c b/lasso/xml/lib_logout_response.c
index 13e13940f1b41597db5821418c33aebb4f84c4c7..88cb6597f07040af7f1a3fe121807aafc873018c 100644
--- a/lasso/xml/lib_logout_response.c
+++ b/lasso/xml/lib_logout_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_logout_response.h b/lasso/xml/lib_logout_response.h
index 18164d2249e143780def76de683e33f88aa06f94..8fc62f0a4d285e9a50e49784a948521448eec94a 100644
--- a/lasso/xml/lib_logout_response.h
+++ b/lasso/xml/lib_logout_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_LOGOUT_RESPONSE_H__
diff --git a/lasso/xml/lib_name_identifier_mapping_request.c b/lasso/xml/lib_name_identifier_mapping_request.c
index 374a53801621bef2078a0aa0c9dfee4b6d392d7e..ff696a6b0527c3dee38762e557016ea6d9023a53 100644
--- a/lasso/xml/lib_name_identifier_mapping_request.c
+++ b/lasso/xml/lib_name_identifier_mapping_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_name_identifier_mapping_request.h b/lasso/xml/lib_name_identifier_mapping_request.h
index c2f2ff073c994d4270a254aef841824adcd5f638..aaeeeb6f33bce808ee273f013ba9799b4086e721 100644
--- a/lasso/xml/lib_name_identifier_mapping_request.h
+++ b/lasso/xml/lib_name_identifier_mapping_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_NAME_IDENTIFIER_MAPPING_REQUEST_H__
diff --git a/lasso/xml/lib_name_identifier_mapping_response.c b/lasso/xml/lib_name_identifier_mapping_response.c
index 1a758529dbb6a5abfdff7266741c035a7cf44e26..de8f9eb0b84410350c0ea607a22526e22890f7c2 100644
--- a/lasso/xml/lib_name_identifier_mapping_response.c
+++ b/lasso/xml/lib_name_identifier_mapping_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_name_identifier_mapping_response.h b/lasso/xml/lib_name_identifier_mapping_response.h
index dfe8442c5fc6a7718b610f842d7f2c2bc64ff138..cd5cf5b6cfb9532eb8e4c6fc689f624b8843de94 100644
--- a/lasso/xml/lib_name_identifier_mapping_response.h
+++ b/lasso/xml/lib_name_identifier_mapping_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE_H__
diff --git a/lasso/xml/lib_register_name_identifier_request.c b/lasso/xml/lib_register_name_identifier_request.c
index 61823324bb4674a2ab9cd563df27d28e182fb53b..729e61b70f3258d2d74d55ad30937f7a8c6a5a91 100644
--- a/lasso/xml/lib_register_name_identifier_request.c
+++ b/lasso/xml/lib_register_name_identifier_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_register_name_identifier_request.h b/lasso/xml/lib_register_name_identifier_request.h
index 9f6488bc858ac022244d9cb3c6811fbd6a3b5edc..b70058fc692bf0fc6648cb410f9f26ddf1d61722 100644
--- a/lasso/xml/lib_register_name_identifier_request.h
+++ b/lasso/xml/lib_register_name_identifier_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST_H__
diff --git a/lasso/xml/lib_register_name_identifier_response.c b/lasso/xml/lib_register_name_identifier_response.c
index ee86c1462e62910c07ed50c21ef8ca1ffa40e9c2..34d5220fa9d0e01bd712da5beee374b4df9a430c 100644
--- a/lasso/xml/lib_register_name_identifier_response.c
+++ b/lasso/xml/lib_register_name_identifier_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_register_name_identifier_response.h b/lasso/xml/lib_register_name_identifier_response.h
index a7954aa32a5d1f185bc7a991e5f01583e0f8e0ff..afaf9eee81eef0cee4bcadc0128567eb4e10c3ff 100644
--- a/lasso/xml/lib_register_name_identifier_response.h
+++ b/lasso/xml/lib_register_name_identifier_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE_H__
diff --git a/lasso/xml/lib_request_authn_context.c b/lasso/xml/lib_request_authn_context.c
index 4e4d7380033d6b50650c60671203ea14196778ec..a81c30206803dadd5a18954b5adae3945aaa9561 100644
--- a/lasso/xml/lib_request_authn_context.c
+++ b/lasso/xml/lib_request_authn_context.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_request_authn_context.h b/lasso/xml/lib_request_authn_context.h
index 720145cbfe75f5fa3c2ce01f2c4f713cfe6bbd06..db2f359e3301c08411c34bf774b28f7a8cd0ea19 100644
--- a/lasso/xml/lib_request_authn_context.h
+++ b/lasso/xml/lib_request_authn_context.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_REQUEST_AUTHN_CONTEXT_H__
diff --git a/lasso/xml/lib_scoping.c b/lasso/xml/lib_scoping.c
index f9fe0b7c587989e2233b080b0ccceeca670e3cec..07d14ed01cfb6e9f27de8e17918125514eedd9a8 100644
--- a/lasso/xml/lib_scoping.c
+++ b/lasso/xml/lib_scoping.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_scoping.h b/lasso/xml/lib_scoping.h
index 745ede5372c3cbd696a3491ec472c40eb55409f0..bce878e84675a6e56be7590835255f3394a0981f 100644
--- a/lasso/xml/lib_scoping.h
+++ b/lasso/xml/lib_scoping.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_SCOPING_H__
diff --git a/lasso/xml/lib_status_response.c b/lasso/xml/lib_status_response.c
index 20a73658afb375a28022d4c9a3ce26c4d5c2ebdc..8b9bbeff39c9c2ed86ec21862468225beb555b9b 100644
--- a/lasso/xml/lib_status_response.c
+++ b/lasso/xml/lib_status_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_status_response.h b/lasso/xml/lib_status_response.h
index 71dbc675a76796a9aa3dd06339754957168eb804..b3388bb548a34bf7d4e9a54f5d217c4731359f8f 100644
--- a/lasso/xml/lib_status_response.h
+++ b/lasso/xml/lib_status_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_STATUS_RESPONSE_H__
diff --git a/lasso/xml/lib_subject.c b/lasso/xml/lib_subject.c
index b44c99565dd53e9139aa61940a6ba0d4a23e775c..c2271c12bda17e5df33057609d8209333eac77e3 100644
--- a/lasso/xml/lib_subject.c
+++ b/lasso/xml/lib_subject.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/lib_subject.h b/lasso/xml/lib_subject.h
index 4882894c14fc98d79a0e33d24b42b8a0da9d2b0b..6c4225fb58bb7c1d2930d47333a809395030adee 100644
--- a/lasso/xml/lib_subject.h
+++ b/lasso/xml/lib_subject.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_LIB_SUBJECT_H__
diff --git a/lasso/xml/misc_text_node.c b/lasso/xml/misc_text_node.c
index 3a2016c99684d29ae6b017220cc5c2627e25e804..bb9b6b5aaec9d9f94338d2772cc44ac3128cf6f7 100644
--- a/lasso/xml/misc_text_node.c
+++ b/lasso/xml/misc_text_node.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <libxml/tree.h>
diff --git a/lasso/xml/misc_text_node.h b/lasso/xml/misc_text_node.h
index cafedb43a3615c2809e5066c5d51703df5e92cb0..011a38038750d8d59bcd4e04cca7c2c58687abdd 100644
--- a/lasso/xml/misc_text_node.h
+++ b/lasso/xml/misc_text_node.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_MISC_TEXT_NODE_H__
diff --git a/lasso/xml/private.h b/lasso/xml/private.h
index b1ec09791595a3e8ae4afa7fde2d3f9b66750936..450ec2644112d6a6931de21eea8b6d10441b90fb 100644
--- a/lasso/xml/private.h
+++ b/lasso/xml/private.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_XML_PRIVATE_H__
diff --git a/lasso/xml/sa_credentials.c b/lasso/xml/sa_credentials.c
index 1f33adb70fdae2b5a07bfc37d9dead3e3ed45dcf..e7bcb73cd4a9a38196c1796691197ce44ce5ae5b 100644
--- a/lasso/xml/sa_credentials.c
+++ b/lasso/xml/sa_credentials.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/sa_credentials.h b/lasso/xml/sa_credentials.h
index f9854fb8d8ce1489523cff3df4cff47c3a39509f..f43909dcc12a2da930367d41c356c994876f6f26 100644
--- a/lasso/xml/sa_credentials.h
+++ b/lasso/xml/sa_credentials.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SA_CREDENTIALS_H__
diff --git a/lasso/xml/sa_parameter.c b/lasso/xml/sa_parameter.c
index c90db61e4014113397be4dc3e2967d1054dd610e..6452d428973adf6912092dc6ea85b3583c059006 100644
--- a/lasso/xml/sa_parameter.c
+++ b/lasso/xml/sa_parameter.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/sa_parameter.h b/lasso/xml/sa_parameter.h
index 42623d9a4e6f86a3b1b8463cc33d5b95296a9dc9..ba6f915f3ed18b76793d0ccf82c27c93292ce60e 100644
--- a/lasso/xml/sa_parameter.h
+++ b/lasso/xml/sa_parameter.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SA_PARAMETER_H__
diff --git a/lasso/xml/sa_password_transforms.c b/lasso/xml/sa_password_transforms.c
index daff1ded8f277c9ec46f06564495c248c75adbd3..ad0f6943b0b5001d16eeee08ada46d06f23e4957 100644
--- a/lasso/xml/sa_password_transforms.c
+++ b/lasso/xml/sa_password_transforms.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/sa_password_transforms.h b/lasso/xml/sa_password_transforms.h
index 9281a4de52794f7dc7c554df0924d410d25f17a6..77235f11d7579f41753852ccefc05fe3d763f84d 100644
--- a/lasso/xml/sa_password_transforms.h
+++ b/lasso/xml/sa_password_transforms.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SA_PASSWORD_TRANSFORMS_H__
diff --git a/lasso/xml/sa_sasl_request.c b/lasso/xml/sa_sasl_request.c
index 453bc00f84402f6edd7f767f35d860d345c54958..fc839aa3434429a86add6c214b1093a1289dd352 100644
--- a/lasso/xml/sa_sasl_request.c
+++ b/lasso/xml/sa_sasl_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/sa_sasl_request.h b/lasso/xml/sa_sasl_request.h
index 094aa501f6ffbdd2f97f5584220aceeaab1ff92e..bb492e306c2ec588bb18c6e23da41649015051b9 100644
--- a/lasso/xml/sa_sasl_request.h
+++ b/lasso/xml/sa_sasl_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SA_SASL_REQUEST_H__
diff --git a/lasso/xml/sa_sasl_response.c b/lasso/xml/sa_sasl_response.c
index dd7c2161c06e63675043e41a9a8aff6eb128c572..fd6b4fdacc3b76378e326580291f72f66f780278 100644
--- a/lasso/xml/sa_sasl_response.c
+++ b/lasso/xml/sa_sasl_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/sa_sasl_response.h b/lasso/xml/sa_sasl_response.h
index a7c99ebee57b90b40688f8b5a901643362dfab56..7589cea811c537b6c0cfc8c3d3addd3177cf3fe1 100644
--- a/lasso/xml/sa_sasl_response.h
+++ b/lasso/xml/sa_sasl_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SA_SASL_RESPONSE_H__
diff --git a/lasso/xml/sa_transform.c b/lasso/xml/sa_transform.c
index 6758fb2354867554ccb5a446f39b2bb8ece519cc..0776861083ca8ffd42861b48be1ca63e4a185d21 100644
--- a/lasso/xml/sa_transform.c
+++ b/lasso/xml/sa_transform.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/sa_transform.h b/lasso/xml/sa_transform.h
index c1b955e0264327d25e1532973505dd379112ff4e..b2c1b775de59b3fb353c71d743838b94e3efba2b 100644
--- a/lasso/xml/sa_transform.h
+++ b/lasso/xml/sa_transform.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SA_TRANSFORM_H__
diff --git a/lasso/xml/saml-2.0/saml2_action.c b/lasso/xml/saml-2.0/saml2_action.c
index 69b4456093da8786401c6ee95b3807cc13aeda32..95e241172f2887e78b5fd21b9b4ed27ba31dd6ab 100644
--- a/lasso/xml/saml-2.0/saml2_action.c
+++ b/lasso/xml/saml-2.0/saml2_action.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_action.h b/lasso/xml/saml-2.0/saml2_action.h
index ef443e40fa8cfbcea57fe1a408b88ea511e97480..74fcf1e6cde0aedf32ba2370991e258ec5e8ad37 100644
--- a/lasso/xml/saml-2.0/saml2_action.h
+++ b/lasso/xml/saml-2.0/saml2_action.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_ACTION_H__
diff --git a/lasso/xml/saml-2.0/saml2_advice.c b/lasso/xml/saml-2.0/saml2_advice.c
index 8b8261fbfb86c9e55a79be5fbcd84aa4793bae0e..e5ea13d0bc8f3d34a8bd119f5c114f3df1340023 100644
--- a/lasso/xml/saml-2.0/saml2_advice.c
+++ b/lasso/xml/saml-2.0/saml2_advice.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_advice.h b/lasso/xml/saml-2.0/saml2_advice.h
index 02f19cdc2f3b69d33db9f9fd510c051e624c0956..2cb417830cc17c6dc60aca4cb44c98cf35078c62 100644
--- a/lasso/xml/saml-2.0/saml2_advice.h
+++ b/lasso/xml/saml-2.0/saml2_advice.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_ADVICE_H__
diff --git a/lasso/xml/saml-2.0/saml2_assertion.c b/lasso/xml/saml-2.0/saml2_assertion.c
index adf3cababafe7e679a5c2ac36acea8e055c67f7d..3346a86e0f2a7876f31db2cb1e03aedd17347a73 100644
--- a/lasso/xml/saml-2.0/saml2_assertion.c
+++ b/lasso/xml/saml-2.0/saml2_assertion.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/lasso/xml/saml-2.0/saml2_assertion.h b/lasso/xml/saml-2.0/saml2_assertion.h
index 465184c9c48905658933030976eb28109ee789af..534f7567f7fdf7c0fd505b5442eb9ba07b8a7ea0 100644
--- a/lasso/xml/saml-2.0/saml2_assertion.h
+++ b/lasso/xml/saml-2.0/saml2_assertion.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_ASSERTION_H__
diff --git a/lasso/xml/saml-2.0/saml2_attribute.c b/lasso/xml/saml-2.0/saml2_attribute.c
index c5dc64de741a723be387ddb590ba2261f94f59ac..ce4e7f37b6eb18d5246e0170a941ec52d8f7b44f 100644
--- a/lasso/xml/saml-2.0/saml2_attribute.c
+++ b/lasso/xml/saml-2.0/saml2_attribute.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_attribute.h b/lasso/xml/saml-2.0/saml2_attribute.h
index 926e1c5451ee2975d4f4d38982e5d18ed5639a64..b66c3ed5c1248a4c8ee9a686f0a993cc1b3298cd 100644
--- a/lasso/xml/saml-2.0/saml2_attribute.h
+++ b/lasso/xml/saml-2.0/saml2_attribute.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_ATTRIBUTE_H__
diff --git a/lasso/xml/saml-2.0/saml2_attribute_statement.c b/lasso/xml/saml-2.0/saml2_attribute_statement.c
index a7fa97b8f9ecab7ba4231949fd0f9717651ede93..b7303fee7cd0bd61a5b2ee5bda62335de3bf37c6 100644
--- a/lasso/xml/saml-2.0/saml2_attribute_statement.c
+++ b/lasso/xml/saml-2.0/saml2_attribute_statement.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_attribute_statement.h b/lasso/xml/saml-2.0/saml2_attribute_statement.h
index 64c91414748d1a185c77fc57d9e836c125303eab..79df700fcfd2f5975d76d76b85aeb8d34b0ff284 100644
--- a/lasso/xml/saml-2.0/saml2_attribute_statement.h
+++ b/lasso/xml/saml-2.0/saml2_attribute_statement.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_ATTRIBUTE_STATEMENT_H__
diff --git a/lasso/xml/saml-2.0/saml2_attribute_value.c b/lasso/xml/saml-2.0/saml2_attribute_value.c
index 7c4bbf7d1e10e90712c70eaac644e091d18e9e73..3598760840de0b7d2db0d93365ec972e8e9fb862 100644
--- a/lasso/xml/saml-2.0/saml2_attribute_value.c
+++ b/lasso/xml/saml-2.0/saml2_attribute_value.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_attribute_value.h b/lasso/xml/saml-2.0/saml2_attribute_value.h
index 98b96e1f36272fe08c08eb8faf78fb52d7fdc149..529ba5f493a606493584ed537c16eb5e3b0d1b48 100644
--- a/lasso/xml/saml-2.0/saml2_attribute_value.h
+++ b/lasso/xml/saml-2.0/saml2_attribute_value.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_ATTRIBUTE_VALUE_H__
diff --git a/lasso/xml/saml-2.0/saml2_audience_restriction.c b/lasso/xml/saml-2.0/saml2_audience_restriction.c
index cc1815bb8e2ac31157e3c477d9c7334e5b9922c9..569da73bb45650d1f62063b345cf65307a32daae 100644
--- a/lasso/xml/saml-2.0/saml2_audience_restriction.c
+++ b/lasso/xml/saml-2.0/saml2_audience_restriction.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_audience_restriction.h b/lasso/xml/saml-2.0/saml2_audience_restriction.h
index b880241513f676c64715d5b4399ff158b648ecdc..5f99a31822fb5c99166361e1e58836198f837c0b 100644
--- a/lasso/xml/saml-2.0/saml2_audience_restriction.h
+++ b/lasso/xml/saml-2.0/saml2_audience_restriction.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_AUDIENCE_RESTRICTION_H__
diff --git a/lasso/xml/saml-2.0/saml2_authn_context.c b/lasso/xml/saml-2.0/saml2_authn_context.c
index 9d58412e56cbbb43e605c8559234beb2cba77039..995a7ab311aaf742e3953f9dae39caf22ebbbae0 100644
--- a/lasso/xml/saml-2.0/saml2_authn_context.c
+++ b/lasso/xml/saml-2.0/saml2_authn_context.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_authn_context.h b/lasso/xml/saml-2.0/saml2_authn_context.h
index 9ba6af0817adb4767c6c31f9c7f85a7f920d2c7f..303fbedbd935aea1d1529bd9605e69d39e2262e3 100644
--- a/lasso/xml/saml-2.0/saml2_authn_context.h
+++ b/lasso/xml/saml-2.0/saml2_authn_context.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_AUTHN_CONTEXT_H__
diff --git a/lasso/xml/saml-2.0/saml2_authn_statement.c b/lasso/xml/saml-2.0/saml2_authn_statement.c
index 546d78ffd11df5c770c885dbbb82014a135c3dc0..5d23214a557452531cfbf8cd5cc5c396f4c74f71 100644
--- a/lasso/xml/saml-2.0/saml2_authn_statement.c
+++ b/lasso/xml/saml-2.0/saml2_authn_statement.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_authn_statement.h b/lasso/xml/saml-2.0/saml2_authn_statement.h
index 11a7794abf82a44dd418ee752bd148fac1cdee56..b6e58531c4eda024f7f0a32c15fea4cf1f8fa216 100644
--- a/lasso/xml/saml-2.0/saml2_authn_statement.h
+++ b/lasso/xml/saml-2.0/saml2_authn_statement.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_AUTHN_STATEMENT_H__
diff --git a/lasso/xml/saml-2.0/saml2_authz_decision_statement.c b/lasso/xml/saml-2.0/saml2_authz_decision_statement.c
index 877bc7a68e9c7ec5f39b7aba041ab3b07feb2f93..a0dfaf81eb450c2f0f287d66b3727a245d674914 100644
--- a/lasso/xml/saml-2.0/saml2_authz_decision_statement.c
+++ b/lasso/xml/saml-2.0/saml2_authz_decision_statement.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_authz_decision_statement.h b/lasso/xml/saml-2.0/saml2_authz_decision_statement.h
index e481033bdf61e500d969ac5a3833134dfdfe8d48..6abce87e70245d1e691676d9fe42f38d4800ee01 100644
--- a/lasso/xml/saml-2.0/saml2_authz_decision_statement.h
+++ b/lasso/xml/saml-2.0/saml2_authz_decision_statement.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_AUTHZ_DECISION_STATEMENT_H__
diff --git a/lasso/xml/saml-2.0/saml2_base_idabstract.c b/lasso/xml/saml-2.0/saml2_base_idabstract.c
index 46fbfca812b16a3c8b6c7c7f50f785714f46ae3f..fb5e1b111a0cc5d16bb7b21c4966a3534d6ec7a4 100644
--- a/lasso/xml/saml-2.0/saml2_base_idabstract.c
+++ b/lasso/xml/saml-2.0/saml2_base_idabstract.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_base_idabstract.h b/lasso/xml/saml-2.0/saml2_base_idabstract.h
index 2ab011b9f3b93b23398d4162ab2bf40969b52e1b..292afeaefa762d0a8f0a490dffaf6d4d5fc96926 100644
--- a/lasso/xml/saml-2.0/saml2_base_idabstract.h
+++ b/lasso/xml/saml-2.0/saml2_base_idabstract.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_BASE_IDABSTRACT_H__
diff --git a/lasso/xml/saml-2.0/saml2_condition_abstract.c b/lasso/xml/saml-2.0/saml2_condition_abstract.c
index b1fe8d99e3381307fd1f207e68d9e80cb5dfd9e1..93d77bc96831b79f369ef65092950c202f60d134 100644
--- a/lasso/xml/saml-2.0/saml2_condition_abstract.c
+++ b/lasso/xml/saml-2.0/saml2_condition_abstract.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_condition_abstract.h b/lasso/xml/saml-2.0/saml2_condition_abstract.h
index b101096e59e5ddef38364111bfcfcaa33036b443..128315f98730c6a47c7ac786bb6aa280da0ff62f 100644
--- a/lasso/xml/saml-2.0/saml2_condition_abstract.h
+++ b/lasso/xml/saml-2.0/saml2_condition_abstract.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_CONDITION_ABSTRACT_H__
diff --git a/lasso/xml/saml-2.0/saml2_conditions.c b/lasso/xml/saml-2.0/saml2_conditions.c
index 512556e32769625f62dbcb826893ad434467785e..37bff88093512c200b5f2ac1f2f4da86f2c994ea 100644
--- a/lasso/xml/saml-2.0/saml2_conditions.c
+++ b/lasso/xml/saml-2.0/saml2_conditions.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_conditions.h b/lasso/xml/saml-2.0/saml2_conditions.h
index 0ec65f6605aea7f7d59fa681818de2171be2792b..5de58fdd94cac4ec6529bf47ea4c101a1e4c26ad 100644
--- a/lasso/xml/saml-2.0/saml2_conditions.h
+++ b/lasso/xml/saml-2.0/saml2_conditions.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_CONDITIONS_H__
diff --git a/lasso/xml/saml-2.0/saml2_encrypted_element.c b/lasso/xml/saml-2.0/saml2_encrypted_element.c
index 04d7f226abfa5dec4f2603b42d29f2ee8c64801a..818e28e9444ec6ff42118deea0ecbcac24fcd026 100644
--- a/lasso/xml/saml-2.0/saml2_encrypted_element.c
+++ b/lasso/xml/saml-2.0/saml2_encrypted_element.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_encrypted_element.h b/lasso/xml/saml-2.0/saml2_encrypted_element.h
index 4b5e327053111cf3160928ec9d47d828c1224d47..3063f25aeaa46d93dd1331ea5b4ef7cde9937e21 100644
--- a/lasso/xml/saml-2.0/saml2_encrypted_element.h
+++ b/lasso/xml/saml-2.0/saml2_encrypted_element.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_ENCRYPTED_ELEMENT_H__
diff --git a/lasso/xml/saml-2.0/saml2_evidence.c b/lasso/xml/saml-2.0/saml2_evidence.c
index 0c13ff50e4fd7786cc2d7767d41ed6751caf15e4..986390c038db90b1f76f734ba163f71ee46f3858 100644
--- a/lasso/xml/saml-2.0/saml2_evidence.c
+++ b/lasso/xml/saml-2.0/saml2_evidence.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_evidence.h b/lasso/xml/saml-2.0/saml2_evidence.h
index 83af654d539a14cb67c8a1e5da771cacc60fbd89..c063f840eb94d03f1cd6829df6e3cbad4ba503fb 100644
--- a/lasso/xml/saml-2.0/saml2_evidence.h
+++ b/lasso/xml/saml-2.0/saml2_evidence.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_EVIDENCE_H__
diff --git a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.c b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.c
index 103b9024bac90bced3d1a969db2f52361b7a0afa..c8299362c5c8bc2b525f4395ead8d9f031e187a0 100644
--- a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.c
+++ b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.h b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.h
index 2745bc783df3ce72b61a014c623b8baf6530d10a..4f92ea3d6d3f2c5f2a35810faa209f71467fa6da 100644
--- a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.h
+++ b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_KEY_INFO_CONFIRMATION_DATA_H__
diff --git a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.c b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.c
index dbd0fb47111b6a4cc11af10b269f9e10b18f4d9f..1ae73e8009582a2ca42d5378b65be63a54515be9 100644
--- a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.c
+++ b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.h b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.h
index 24c2431dc13fd5e9c6245b9a121846b6ab0df794..799e5bc1de2c732b44ddac8dc8ad0c79eeb7a998 100644
--- a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.h
+++ b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_KEY_INFO_CONFIRMATION_DATA_TYPE_H__
diff --git a/lasso/xml/saml-2.0/saml2_name_id.c b/lasso/xml/saml-2.0/saml2_name_id.c
index 8405c47d40f1d5c17ba8d7e7da1770b78ac894bd..a473b8b724fbf62c2492edf6eeab97acf39ed45f 100644
--- a/lasso/xml/saml-2.0/saml2_name_id.c
+++ b/lasso/xml/saml-2.0/saml2_name_id.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_name_id.h b/lasso/xml/saml-2.0/saml2_name_id.h
index 74857fdd0e4a75dba568c274301f4ce1c903052d..98a803a374fe79db0791ccdc5cc9f20bff582f00 100644
--- a/lasso/xml/saml-2.0/saml2_name_id.h
+++ b/lasso/xml/saml-2.0/saml2_name_id.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_NAME_ID_H__
diff --git a/lasso/xml/saml-2.0/saml2_one_time_use.c b/lasso/xml/saml-2.0/saml2_one_time_use.c
index c5e36fec0329d918607146a0ba7f3f41e958535e..0677b199dcf0cb60564164754a388745e9372bfe 100644
--- a/lasso/xml/saml-2.0/saml2_one_time_use.c
+++ b/lasso/xml/saml-2.0/saml2_one_time_use.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_one_time_use.h b/lasso/xml/saml-2.0/saml2_one_time_use.h
index aef924a2e149a51f33c15e46a68d3e3047ffa2ee..602cabd2302b8d2e98b5231458bc8a9018a5f755 100644
--- a/lasso/xml/saml-2.0/saml2_one_time_use.h
+++ b/lasso/xml/saml-2.0/saml2_one_time_use.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_ONE_TIME_USE_H__
diff --git a/lasso/xml/saml-2.0/saml2_proxy_restriction.c b/lasso/xml/saml-2.0/saml2_proxy_restriction.c
index 98d7ad45d272584501380b4753cd502626b9452a..c4d95a87b588bc66f67fafe7ffe094e9464779ed 100644
--- a/lasso/xml/saml-2.0/saml2_proxy_restriction.c
+++ b/lasso/xml/saml-2.0/saml2_proxy_restriction.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_proxy_restriction.h b/lasso/xml/saml-2.0/saml2_proxy_restriction.h
index d2ffe4d2621744eeef03daa6e302d7c6a3b8cce9..9f89c6fb41ba610a14712a1a800a717ac0a8671a 100644
--- a/lasso/xml/saml-2.0/saml2_proxy_restriction.h
+++ b/lasso/xml/saml-2.0/saml2_proxy_restriction.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_PROXY_RESTRICTION_H__
diff --git a/lasso/xml/saml-2.0/saml2_statement_abstract.c b/lasso/xml/saml-2.0/saml2_statement_abstract.c
index 9164608033e08480fb08ce7e48ea29ec4b883af5..1eeab773a6796bd3184497ea8ecfa10a7744f43b 100644
--- a/lasso/xml/saml-2.0/saml2_statement_abstract.c
+++ b/lasso/xml/saml-2.0/saml2_statement_abstract.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_statement_abstract.h b/lasso/xml/saml-2.0/saml2_statement_abstract.h
index 2c2a319162f2d66b96b4e7de395dfda9e1c91486..a074ebee9bb48b9c3f4b4c0dacb6907adaec7842 100644
--- a/lasso/xml/saml-2.0/saml2_statement_abstract.h
+++ b/lasso/xml/saml-2.0/saml2_statement_abstract.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_STATEMENT_ABSTRACT_H__
diff --git a/lasso/xml/saml-2.0/saml2_strings.h b/lasso/xml/saml-2.0/saml2_strings.h
index 00443d62bcfcdfdfcb9dffc4642464c3324fbb7e..b05052868e41b056bb67916afc01d8b78adfc37f 100644
--- a/lasso/xml/saml-2.0/saml2_strings.h
+++ b/lasso/xml/saml-2.0/saml2_strings.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/lasso/xml/saml-2.0/saml2_subject.c b/lasso/xml/saml-2.0/saml2_subject.c
index da40a485255e9d2f70b516f0649c6bae66c5dfed..f9d865fbdbcaba3f415c4655b2d997eb05b8d5f8 100644
--- a/lasso/xml/saml-2.0/saml2_subject.c
+++ b/lasso/xml/saml-2.0/saml2_subject.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_subject.h b/lasso/xml/saml-2.0/saml2_subject.h
index 569f041b33c478f78259271d91232180fcf83bec..7fabcae6e2a0277e8cfe549ae9b6866a4d8a32ca 100644
--- a/lasso/xml/saml-2.0/saml2_subject.h
+++ b/lasso/xml/saml-2.0/saml2_subject.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_SUBJECT_H__
diff --git a/lasso/xml/saml-2.0/saml2_subject_confirmation.c b/lasso/xml/saml-2.0/saml2_subject_confirmation.c
index 0d8ea46e6000228b3b7ca2632ac97fe43198fb17..3a8f9047eba96ff9da55caca3ea75f689e9f94a5 100644
--- a/lasso/xml/saml-2.0/saml2_subject_confirmation.c
+++ b/lasso/xml/saml-2.0/saml2_subject_confirmation.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_subject_confirmation.h b/lasso/xml/saml-2.0/saml2_subject_confirmation.h
index 6d0e8f05d66809c8e532b663dc59874b6a2c2ecb..9e62b245d2412647b280408c69e7f6f8ae5b5ff0 100644
--- a/lasso/xml/saml-2.0/saml2_subject_confirmation.h
+++ b/lasso/xml/saml-2.0/saml2_subject_confirmation.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_SUBJECT_CONFIRMATION_H__
diff --git a/lasso/xml/saml-2.0/saml2_subject_confirmation_data.c b/lasso/xml/saml-2.0/saml2_subject_confirmation_data.c
index 69114b62704145e84c11ebb9e4d42ef771130189..2b6bd73306fdf82941e4ab8aba45a1465cdc0178 100644
--- a/lasso/xml/saml-2.0/saml2_subject_confirmation_data.c
+++ b/lasso/xml/saml-2.0/saml2_subject_confirmation_data.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_subject_confirmation_data.h b/lasso/xml/saml-2.0/saml2_subject_confirmation_data.h
index 24ddbd4e82f795d4ae119ab2363dd5095b9188c3..740b9fe674e81bcdc1b48e4d0140562ce68808cd 100644
--- a/lasso/xml/saml-2.0/saml2_subject_confirmation_data.h
+++ b/lasso/xml/saml-2.0/saml2_subject_confirmation_data.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_SUBJECT_CONFIRMATION_DATA_H__
diff --git a/lasso/xml/saml-2.0/saml2_subject_locality.c b/lasso/xml/saml-2.0/saml2_subject_locality.c
index 7b34220b8ab64fcd0b1d8146cfc76caa4680e8b3..ea79d85289ac5ba0eaabbb011ce933d6a95b40e3 100644
--- a/lasso/xml/saml-2.0/saml2_subject_locality.c
+++ b/lasso/xml/saml-2.0/saml2_subject_locality.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/saml2_subject_locality.h b/lasso/xml/saml-2.0/saml2_subject_locality.h
index 2b9d99b806c0984dd306973816b3baf7aa487628..9a3099aa8fe8b35a77f170762a63ff3e9478f227 100644
--- a/lasso/xml/saml-2.0/saml2_subject_locality.h
+++ b/lasso/xml/saml-2.0/saml2_subject_locality.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML2_SUBJECT_LOCALITY_H__
diff --git a/lasso/xml/saml-2.0/saml2_xsd.h b/lasso/xml/saml-2.0/saml2_xsd.h
index b482c1d069b67e3f8f6c85377f14ebb51c7ca4c8..abb40ff383438180e3238e73a475ae463ca09250 100644
--- a/lasso/xml/saml-2.0/saml2_xsd.h
+++ b/lasso/xml/saml-2.0/saml2_xsd.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/lasso/xml/saml-2.0/samlp2_artifact_resolve.c b/lasso/xml/saml-2.0/samlp2_artifact_resolve.c
index 20c7e28ded2aeeb4d9936c203b85020dedc65b6f..6917015b1ff2c54fb5a61d9e1a64bd4d2b4894d9 100644
--- a/lasso/xml/saml-2.0/samlp2_artifact_resolve.c
+++ b/lasso/xml/saml-2.0/samlp2_artifact_resolve.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_artifact_resolve.h b/lasso/xml/saml-2.0/samlp2_artifact_resolve.h
index 092f030b3f9bbf993e41b13f9ca64b4d8f4af01a..e03cc66b54089e300383d63a823c1638c48cb81d 100644
--- a/lasso/xml/saml-2.0/samlp2_artifact_resolve.h
+++ b/lasso/xml/saml-2.0/samlp2_artifact_resolve.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_ARTIFACT_RESOLVE_H__
diff --git a/lasso/xml/saml-2.0/samlp2_artifact_response.c b/lasso/xml/saml-2.0/samlp2_artifact_response.c
index 5f0537b9b0af4752d6d2393817a8a2c771980082..f048727ac459872ff981f37db0dec805098eac47 100644
--- a/lasso/xml/saml-2.0/samlp2_artifact_response.c
+++ b/lasso/xml/saml-2.0/samlp2_artifact_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_artifact_response.h b/lasso/xml/saml-2.0/samlp2_artifact_response.h
index ec3cd9b516870189c11d1a29f0d304555b96c975..3740ffa3991852feece30a96f13d5d1a7640a87b 100644
--- a/lasso/xml/saml-2.0/samlp2_artifact_response.h
+++ b/lasso/xml/saml-2.0/samlp2_artifact_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_ARTIFACT_RESPONSE_H__
diff --git a/lasso/xml/saml-2.0/samlp2_assertion_id_request.c b/lasso/xml/saml-2.0/samlp2_assertion_id_request.c
index 21fbc980332179944d9465f3b5e488611e92cce9..f2b6d50999d9ae62816ab96ea335ba41136bec91 100644
--- a/lasso/xml/saml-2.0/samlp2_assertion_id_request.c
+++ b/lasso/xml/saml-2.0/samlp2_assertion_id_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_assertion_id_request.h b/lasso/xml/saml-2.0/samlp2_assertion_id_request.h
index 3af9996c36cd648fc8f4918efff79ad1dca9713e..242e751b275be767437e943b3f39af5ca11e245f 100644
--- a/lasso/xml/saml-2.0/samlp2_assertion_id_request.h
+++ b/lasso/xml/saml-2.0/samlp2_assertion_id_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_ASSERTION_ID_REQUEST_H__
diff --git a/lasso/xml/saml-2.0/samlp2_attribute_query.c b/lasso/xml/saml-2.0/samlp2_attribute_query.c
index f6314b59259ac4a51e43a867c1d2121e99142525..87826e6dea80b94f61357eb79a053d618dcce659 100644
--- a/lasso/xml/saml-2.0/samlp2_attribute_query.c
+++ b/lasso/xml/saml-2.0/samlp2_attribute_query.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_attribute_query.h b/lasso/xml/saml-2.0/samlp2_attribute_query.h
index f02a1af06596bd63cb3076cf4342f5a0fb3e6b8e..df28e6ff6d7d52cd537943ef89103c5c98e5ef43 100644
--- a/lasso/xml/saml-2.0/samlp2_attribute_query.h
+++ b/lasso/xml/saml-2.0/samlp2_attribute_query.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_ATTRIBUTE_QUERY_H__
diff --git a/lasso/xml/saml-2.0/samlp2_authn_query.c b/lasso/xml/saml-2.0/samlp2_authn_query.c
index cbd58bff63f62343bcadb9644ebbbb563ccb1428..bfeb4595f9d76e0e0037c00be52877c68b73afe7 100644
--- a/lasso/xml/saml-2.0/samlp2_authn_query.c
+++ b/lasso/xml/saml-2.0/samlp2_authn_query.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_authn_query.h b/lasso/xml/saml-2.0/samlp2_authn_query.h
index 9acee9f55992b3c733d2c3c8a7ab3931be9fda4c..1d5824db47495d744af88501656e708f6ea15ee1 100644
--- a/lasso/xml/saml-2.0/samlp2_authn_query.h
+++ b/lasso/xml/saml-2.0/samlp2_authn_query.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_AUTHN_QUERY_H__
diff --git a/lasso/xml/saml-2.0/samlp2_authn_request.c b/lasso/xml/saml-2.0/samlp2_authn_request.c
index 22574a62fa2bc43566f8172856039757a2bb9573..409b4fb1cc23436f3fc08426f4796385374d3242 100644
--- a/lasso/xml/saml-2.0/samlp2_authn_request.c
+++ b/lasso/xml/saml-2.0/samlp2_authn_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_authn_request.h b/lasso/xml/saml-2.0/samlp2_authn_request.h
index f64925925b38234883665a565ef2aa6ee1ec7289..39f124a48be98c56eec651b4edde258508c631b8 100644
--- a/lasso/xml/saml-2.0/samlp2_authn_request.h
+++ b/lasso/xml/saml-2.0/samlp2_authn_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_AUTHN_REQUEST_H__
diff --git a/lasso/xml/saml-2.0/samlp2_authz_decision_query.c b/lasso/xml/saml-2.0/samlp2_authz_decision_query.c
index 51dc39d3cbbc46eb70a9dd13f6886558053a07dd..fa21b5f2ff40acf41a3fc642c7046f440cfdd2b4 100644
--- a/lasso/xml/saml-2.0/samlp2_authz_decision_query.c
+++ b/lasso/xml/saml-2.0/samlp2_authz_decision_query.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_authz_decision_query.h b/lasso/xml/saml-2.0/samlp2_authz_decision_query.h
index 2aa8dca104d6d07d5f7b9081ec4a10e7e0ef857c..2e3a821f693d64cbe5e79e5da09d78160e313157 100644
--- a/lasso/xml/saml-2.0/samlp2_authz_decision_query.h
+++ b/lasso/xml/saml-2.0/samlp2_authz_decision_query.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_AUTHZ_DECISION_QUERY_H__
diff --git a/lasso/xml/saml-2.0/samlp2_extensions.c b/lasso/xml/saml-2.0/samlp2_extensions.c
index e7359faf3e7588bb0070a86cdb46d70e3cf2d265..6dc342b3878d4f8ea2af2c481ce9036d7cfa4daf 100644
--- a/lasso/xml/saml-2.0/samlp2_extensions.c
+++ b/lasso/xml/saml-2.0/samlp2_extensions.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_extensions.h b/lasso/xml/saml-2.0/samlp2_extensions.h
index 72c62377c2b5433f58f2607cf3933f654256ba9b..37c33fcceb7d299c076602b98618c8156ffc034b 100644
--- a/lasso/xml/saml-2.0/samlp2_extensions.h
+++ b/lasso/xml/saml-2.0/samlp2_extensions.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_EXTENSIONS_H__
diff --git a/lasso/xml/saml-2.0/samlp2_idp_entry.c b/lasso/xml/saml-2.0/samlp2_idp_entry.c
index 04ea72552333610125e62bdd908d9ddd3e1df400..e9cabfc420720ded8a95e84518f22d954cad8bc8 100644
--- a/lasso/xml/saml-2.0/samlp2_idp_entry.c
+++ b/lasso/xml/saml-2.0/samlp2_idp_entry.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_idp_entry.h b/lasso/xml/saml-2.0/samlp2_idp_entry.h
index 76a1494e5b8a4b0ceb36ec632dde16029ef532b9..16558e1bae4eef868e4283100fa830870fca4421 100644
--- a/lasso/xml/saml-2.0/samlp2_idp_entry.h
+++ b/lasso/xml/saml-2.0/samlp2_idp_entry.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_IDP_ENTRY_H__
diff --git a/lasso/xml/saml-2.0/samlp2_idp_list.c b/lasso/xml/saml-2.0/samlp2_idp_list.c
index 1e9943fb069d0217dc081b5c9b401f68de1c0240..fad060a62cdede42771493f584ee2e5fc71ee6fe 100644
--- a/lasso/xml/saml-2.0/samlp2_idp_list.c
+++ b/lasso/xml/saml-2.0/samlp2_idp_list.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_idp_list.h b/lasso/xml/saml-2.0/samlp2_idp_list.h
index 059378bb88ad6cbcf26d27fd38c68df1082ad739..09622ab2b0a6da750e7386e4f11ced400aacd18f 100644
--- a/lasso/xml/saml-2.0/samlp2_idp_list.h
+++ b/lasso/xml/saml-2.0/samlp2_idp_list.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_IDP_LIST_H__
diff --git a/lasso/xml/saml-2.0/samlp2_logout_request.c b/lasso/xml/saml-2.0/samlp2_logout_request.c
index 3d123d65677cee389bcf8cc701b788c7d8e1f97f..4f374a891ba455dfd035f8920b1c033445477dd2 100644
--- a/lasso/xml/saml-2.0/samlp2_logout_request.c
+++ b/lasso/xml/saml-2.0/samlp2_logout_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_logout_request.h b/lasso/xml/saml-2.0/samlp2_logout_request.h
index 90f31124e1e7e1503e9e0b52d8fb213bf6aebccf..77dd346787a951759235d33197d92e730d606024 100644
--- a/lasso/xml/saml-2.0/samlp2_logout_request.h
+++ b/lasso/xml/saml-2.0/samlp2_logout_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_LOGOUT_REQUEST_H__
diff --git a/lasso/xml/saml-2.0/samlp2_logout_response.c b/lasso/xml/saml-2.0/samlp2_logout_response.c
index 4af6d29f6a9bb91264667ffe51fb88d563cf261f..2eaebbbd2b783ceb570eb33ac4836c18c5f2bc40 100644
--- a/lasso/xml/saml-2.0/samlp2_logout_response.c
+++ b/lasso/xml/saml-2.0/samlp2_logout_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/lasso/xml/saml-2.0/samlp2_logout_response.h b/lasso/xml/saml-2.0/samlp2_logout_response.h
index ce15494d675fd2f8549ce5d53331d2852af2680f..9cd2ab6d17d935de65a682fb2ec4e801be110267 100644
--- a/lasso/xml/saml-2.0/samlp2_logout_response.h
+++ b/lasso/xml/saml-2.0/samlp2_logout_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_LOGOUT_RESPONSE_H__
diff --git a/lasso/xml/saml-2.0/samlp2_manage_name_id_request.c b/lasso/xml/saml-2.0/samlp2_manage_name_id_request.c
index 678c6201328ca99b34f25f332c7d2c9645dd68a1..ff9dc34a10b94ce092b40c3b8060eba2444fb41d 100644
--- a/lasso/xml/saml-2.0/samlp2_manage_name_id_request.c
+++ b/lasso/xml/saml-2.0/samlp2_manage_name_id_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_manage_name_id_request.h b/lasso/xml/saml-2.0/samlp2_manage_name_id_request.h
index fe3585ce0118395124347dc27412d2f5e92d5e08..de0f26053c2cfd7c6c31ad7015dbee70e8c5ecf4 100644
--- a/lasso/xml/saml-2.0/samlp2_manage_name_id_request.h
+++ b/lasso/xml/saml-2.0/samlp2_manage_name_id_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_MANAGE_NAME_ID_REQUEST_H__
diff --git a/lasso/xml/saml-2.0/samlp2_manage_name_id_response.c b/lasso/xml/saml-2.0/samlp2_manage_name_id_response.c
index 766a7f841875c589e3408447347992b43fc534cc..b3f6b0c1d4f2f66d4c7e9f0d2ac3ade5e48a66fd 100644
--- a/lasso/xml/saml-2.0/samlp2_manage_name_id_response.c
+++ b/lasso/xml/saml-2.0/samlp2_manage_name_id_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_manage_name_id_response.h b/lasso/xml/saml-2.0/samlp2_manage_name_id_response.h
index b1b7e363098afb633ea45f787610d8aaa677790b..ad6951675790f8d294cea95fd950fc70ce66c4e6 100644
--- a/lasso/xml/saml-2.0/samlp2_manage_name_id_response.h
+++ b/lasso/xml/saml-2.0/samlp2_manage_name_id_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_MANAGE_NAME_ID_RESPONSE_H__
diff --git a/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.c b/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.c
index 559ef8c111bc6c0a65fe2f0cd09f2ac6bb1f8540..8b81d0090679bd89b7380a1e54807021c0d3442c 100644
--- a/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.c
+++ b/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.h b/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.h
index 78909544ac8b02efc8b6fb532898718048907205..ccbe286c074c063c13975caea9302415b279f3af 100644
--- a/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.h
+++ b/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_NAME_ID_MAPPING_REQUEST_H__
diff --git a/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.c b/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.c
index 1dffb0a96a4913a61e6c31bd9d5980033feb68c6..101aa86373c5aeac1a398a6de5daaa751796d1db 100644
--- a/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.c
+++ b/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.h b/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.h
index 052b679f2b345fa9bba26ad5fe5177dd83af8f92..eb132af68ee30d691dcb3c6553a823a477c148d6 100644
--- a/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.h
+++ b/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_NAME_ID_MAPPING_RESPONSE_H__
diff --git a/lasso/xml/saml-2.0/samlp2_name_id_policy.c b/lasso/xml/saml-2.0/samlp2_name_id_policy.c
index 3930920cd7e41a2437517832edc8d9eda749ee1a..431ee9fa584cd65ab89287a0e7337b29b8934270 100644
--- a/lasso/xml/saml-2.0/samlp2_name_id_policy.c
+++ b/lasso/xml/saml-2.0/samlp2_name_id_policy.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_name_id_policy.h b/lasso/xml/saml-2.0/samlp2_name_id_policy.h
index 2d545e65a5b59fadf39f8ddb83ce73931d422659..191e9376c61d1b741dc427509798e4f4319c7a0f 100644
--- a/lasso/xml/saml-2.0/samlp2_name_id_policy.h
+++ b/lasso/xml/saml-2.0/samlp2_name_id_policy.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_NAME_ID_POLICY_H__
diff --git a/lasso/xml/saml-2.0/samlp2_request_abstract.c b/lasso/xml/saml-2.0/samlp2_request_abstract.c
index 3d3e6c9c6e1619ef5bc12239de6124f434410322..1d8d2c2d8807f0ea5dfb96a3cc656b07533eab17 100644
--- a/lasso/xml/saml-2.0/samlp2_request_abstract.c
+++ b/lasso/xml/saml-2.0/samlp2_request_abstract.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/lasso/xml/saml-2.0/samlp2_request_abstract.h b/lasso/xml/saml-2.0/samlp2_request_abstract.h
index fdd87bf396d0c9fafc64a8d8aebf3bc21afd5f93..934f13d8f0225524100df68877a2ed68181ca564 100644
--- a/lasso/xml/saml-2.0/samlp2_request_abstract.h
+++ b/lasso/xml/saml-2.0/samlp2_request_abstract.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_REQUEST_ABSTRACT_H__
diff --git a/lasso/xml/saml-2.0/samlp2_requested_authn_context.c b/lasso/xml/saml-2.0/samlp2_requested_authn_context.c
index 9843f74ce745e70b3b62693a07c0599c9e857e48..c5afd625b0377f8ee848b75cfa58fc2604b46e75 100644
--- a/lasso/xml/saml-2.0/samlp2_requested_authn_context.c
+++ b/lasso/xml/saml-2.0/samlp2_requested_authn_context.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_requested_authn_context.h b/lasso/xml/saml-2.0/samlp2_requested_authn_context.h
index 7e17513a2be1c251c1be5960b73d10a43ddcee9b..ea97347fef5b3730f228210dfa826d79ad644eb4 100644
--- a/lasso/xml/saml-2.0/samlp2_requested_authn_context.h
+++ b/lasso/xml/saml-2.0/samlp2_requested_authn_context.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_REQUESTED_AUTHN_CONTEXT_H__
diff --git a/lasso/xml/saml-2.0/samlp2_response.c b/lasso/xml/saml-2.0/samlp2_response.c
index 0ebc11ce5348a35126a600728843aaa9cf2de560..411e8cc8d2d1d3d584b02358fde15f3a9efa43e5 100644
--- a/lasso/xml/saml-2.0/samlp2_response.c
+++ b/lasso/xml/saml-2.0/samlp2_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_response.h b/lasso/xml/saml-2.0/samlp2_response.h
index a0bcffb5521d8c1e44bf196b7620bdde20a40006..09c4e14c03ace01c544374f8030ee2556ef953aa 100644
--- a/lasso/xml/saml-2.0/samlp2_response.h
+++ b/lasso/xml/saml-2.0/samlp2_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_RESPONSE_H__
diff --git a/lasso/xml/saml-2.0/samlp2_scoping.c b/lasso/xml/saml-2.0/samlp2_scoping.c
index 2966b622a57a9b5c8df1c2400101f80fa20156d0..c7aa9d92ecbfa5dc83c0fdb098132363ef1e2213 100644
--- a/lasso/xml/saml-2.0/samlp2_scoping.c
+++ b/lasso/xml/saml-2.0/samlp2_scoping.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_scoping.h b/lasso/xml/saml-2.0/samlp2_scoping.h
index 8219279311c0dc78479d8942dc916366cbc87658..dd44e86be5fc5f588108481e278af43fe5d276fc 100644
--- a/lasso/xml/saml-2.0/samlp2_scoping.h
+++ b/lasso/xml/saml-2.0/samlp2_scoping.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_SCOPING_H__
diff --git a/lasso/xml/saml-2.0/samlp2_status.c b/lasso/xml/saml-2.0/samlp2_status.c
index 71058f4fe6c78138c731b78056688539ebfb880b..ddb5fc35296ac35dba92018a67515b053cddf255 100644
--- a/lasso/xml/saml-2.0/samlp2_status.c
+++ b/lasso/xml/saml-2.0/samlp2_status.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_status.h b/lasso/xml/saml-2.0/samlp2_status.h
index 4e3178a512c15d90e0ff356a042121eaa0a41b47..a927dd075530db114fe9e00b4c256344939823d5 100644
--- a/lasso/xml/saml-2.0/samlp2_status.h
+++ b/lasso/xml/saml-2.0/samlp2_status.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_STATUS_H__
diff --git a/lasso/xml/saml-2.0/samlp2_status_code.c b/lasso/xml/saml-2.0/samlp2_status_code.c
index ced8e042facc2eee289a29fb410ede320a551bbf..1cb93e7f4916b498abc755b5709e7e7795515c65 100644
--- a/lasso/xml/saml-2.0/samlp2_status_code.c
+++ b/lasso/xml/saml-2.0/samlp2_status_code.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_status_code.h b/lasso/xml/saml-2.0/samlp2_status_code.h
index 076835946993ad235ebc1d788b58bb80abdd3981..68a053471e6982317eb12f1edb337def39e6a051 100644
--- a/lasso/xml/saml-2.0/samlp2_status_code.h
+++ b/lasso/xml/saml-2.0/samlp2_status_code.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_STATUS_CODE_H__
diff --git a/lasso/xml/saml-2.0/samlp2_status_detail.c b/lasso/xml/saml-2.0/samlp2_status_detail.c
index 05cf3eaa75579950b504bc380f7a1db5035242e4..d94cd44c2b33ba6a2bbd95dfda33f091c22b286d 100644
--- a/lasso/xml/saml-2.0/samlp2_status_detail.c
+++ b/lasso/xml/saml-2.0/samlp2_status_detail.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_status_detail.h b/lasso/xml/saml-2.0/samlp2_status_detail.h
index 34c6f24169722a5cfb9fc4c0f165d3a398c300a0..f7596769604e194da4e3de1ea1e49499273b67b8 100644
--- a/lasso/xml/saml-2.0/samlp2_status_detail.h
+++ b/lasso/xml/saml-2.0/samlp2_status_detail.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_STATUS_DETAIL_H__
diff --git a/lasso/xml/saml-2.0/samlp2_status_response.c b/lasso/xml/saml-2.0/samlp2_status_response.c
index 3bcc90af88723964e96e436deda55bebb1a8eb55..dd81c0997f5b32ca327907fafd4b29b59d00ebc0 100644
--- a/lasso/xml/saml-2.0/samlp2_status_response.c
+++ b/lasso/xml/saml-2.0/samlp2_status_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/lasso/xml/saml-2.0/samlp2_status_response.h b/lasso/xml/saml-2.0/samlp2_status_response.h
index ad7d8986e8c2ea6d5ca8b37971394f759695564b..f7299580e1b787fd43162c413bae08ae0f83ed12 100644
--- a/lasso/xml/saml-2.0/samlp2_status_response.h
+++ b/lasso/xml/saml-2.0/samlp2_status_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_STATUS_RESPONSE_H__
diff --git a/lasso/xml/saml-2.0/samlp2_subject_query_abstract.c b/lasso/xml/saml-2.0/samlp2_subject_query_abstract.c
index 3db8016e290de2cf6f84297aa6a2226ab02cd592..a787c50d544ba03d4aeab3dce0b5c81d592b2456 100644
--- a/lasso/xml/saml-2.0/samlp2_subject_query_abstract.c
+++ b/lasso/xml/saml-2.0/samlp2_subject_query_abstract.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_subject_query_abstract.h b/lasso/xml/saml-2.0/samlp2_subject_query_abstract.h
index 94275eef39faba131b2de334812c36eaf452939a..80fcd5ee01f69d246a654d2bb3ed9180b976433f 100644
--- a/lasso/xml/saml-2.0/samlp2_subject_query_abstract.h
+++ b/lasso/xml/saml-2.0/samlp2_subject_query_abstract.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_SUBJECT_QUERY_ABSTRACT_H__
diff --git a/lasso/xml/saml-2.0/samlp2_terminate.c b/lasso/xml/saml-2.0/samlp2_terminate.c
index c9567d93a6409686fdc8ac3c47093c429cacc713..84cec4599bb1a474b3381bd4199a1ded4bd7f334 100644
--- a/lasso/xml/saml-2.0/samlp2_terminate.c
+++ b/lasso/xml/saml-2.0/samlp2_terminate.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/saml-2.0/samlp2_terminate.h b/lasso/xml/saml-2.0/samlp2_terminate.h
index 3ed8cfcff9e8aafe9986f719b3ec66c47df6ff94..eded6affcb2b868d86ff3d01152e7cc297dc1337 100644
--- a/lasso/xml/saml-2.0/samlp2_terminate.h
+++ b/lasso/xml/saml-2.0/samlp2_terminate.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP2_TERMINATE_H__
diff --git a/lasso/xml/saml-2.0/xml_saml2.h b/lasso/xml/saml-2.0/xml_saml2.h
index d99d1d72712bf68c31c205ca06c4f76767639a27..76f56108c059a061cb66b5c41a25e0b031e5341d 100644
--- a/lasso/xml/saml-2.0/xml_saml2.h
+++ b/lasso/xml/saml-2.0/xml_saml2.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_XML_SAML2_H__
diff --git a/lasso/xml/saml_advice.c b/lasso/xml/saml_advice.c
index 8c45cc2a4e5ab5d6549888cef9c1aeb6acacc63a..dd1fd6771ef15a9b7ade59fc198183f7b58cf472 100644
--- a/lasso/xml/saml_advice.c
+++ b/lasso/xml/saml_advice.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_advice.h b/lasso/xml/saml_advice.h
index 8216e9de98fdb9e858474310ee7b736083d32a9b..9e6a02cf6cc67790e26afdc1adb39073bf69ac55 100644
--- a/lasso/xml/saml_advice.h
+++ b/lasso/xml/saml_advice.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_ADVICE_H__
diff --git a/lasso/xml/saml_assertion.c b/lasso/xml/saml_assertion.c
index bc8d5d9e0e1ba0c090762268aac1ecfc6c830db7..c87fe81e3113449d0200dcae3ec51bbc6cda4319 100644
--- a/lasso/xml/saml_assertion.c
+++ b/lasso/xml/saml_assertion.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_assertion.h b/lasso/xml/saml_assertion.h
index 837b868c83558cdb9fb9cf0cf2eebcddaeabb710..e8c42ee024df3ee04dbd42d2ec8cc167cded25fb 100644
--- a/lasso/xml/saml_assertion.h
+++ b/lasso/xml/saml_assertion.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_ASSERTION_H__
diff --git a/lasso/xml/saml_attribute.c b/lasso/xml/saml_attribute.c
index 3f29dbe1cab35bf917852de24799c9d29744ea3e..ad44682a95538cf7d3c58ca329af22a0b5a48d76 100644
--- a/lasso/xml/saml_attribute.c
+++ b/lasso/xml/saml_attribute.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_attribute.h b/lasso/xml/saml_attribute.h
index 6c1b8e03a9bcdb06944e15529fe99e8ff80c7139..529c77e5fb4ddc65fa858e6adc94fede1df735b6 100644
--- a/lasso/xml/saml_attribute.h
+++ b/lasso/xml/saml_attribute.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_ATTRIBUTE_H__
diff --git a/lasso/xml/saml_attribute_designator.c b/lasso/xml/saml_attribute_designator.c
index f9b4effe38959a03da6641c17dcd7bf89a0a4cea..f3f42a942483046683a28d44726a67d115d5a3e0 100644
--- a/lasso/xml/saml_attribute_designator.c
+++ b/lasso/xml/saml_attribute_designator.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_attribute_designator.h b/lasso/xml/saml_attribute_designator.h
index 7d1f6192ddd18b1204171b44f458cc06cab84a37..16c74fbd49622c6ad5de1319b18b70a0b1717b30 100644
--- a/lasso/xml/saml_attribute_designator.h
+++ b/lasso/xml/saml_attribute_designator.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_ATTRIBUTE_DESIGNATOR_H__
diff --git a/lasso/xml/saml_attribute_statement.c b/lasso/xml/saml_attribute_statement.c
index ac04d3dc4a93545aa5141b4413be276c9929583d..966afc4213ce89a71263912280e66a65a35f79a8 100644
--- a/lasso/xml/saml_attribute_statement.c
+++ b/lasso/xml/saml_attribute_statement.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_attribute_statement.h b/lasso/xml/saml_attribute_statement.h
index 1feb66e569224b34fa9beb51767fd03811e451a2..a1c4aa9d95c335ca241b3af57e865730409ab4e6 100644
--- a/lasso/xml/saml_attribute_statement.h
+++ b/lasso/xml/saml_attribute_statement.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_ATTRIBUTE_STATEMENT_H__
diff --git a/lasso/xml/saml_attribute_value.c b/lasso/xml/saml_attribute_value.c
index a7af9bfa2803b50bac7180164396e3ee4bbafa49..2e62de4e5250d184ae859d0d02dae0ff26ca4a1e 100644
--- a/lasso/xml/saml_attribute_value.c
+++ b/lasso/xml/saml_attribute_value.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_attribute_value.h b/lasso/xml/saml_attribute_value.h
index ea7929d5c4724ea666ab6b69fc4b4108f7ba1468..0b55eed1d9970e4b250d98577f056eb92004585a 100644
--- a/lasso/xml/saml_attribute_value.h
+++ b/lasso/xml/saml_attribute_value.h
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_ATTRIBUTE_VALUE_H__
diff --git a/lasso/xml/saml_audience_restriction_condition.c b/lasso/xml/saml_audience_restriction_condition.c
index 4b567ca3be8d8481ec964fc945c823881bacfa10..02e4bd3053238ed45dae064aebb4b7d489ea14f6 100644
--- a/lasso/xml/saml_audience_restriction_condition.c
+++ b/lasso/xml/saml_audience_restriction_condition.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_audience_restriction_condition.h b/lasso/xml/saml_audience_restriction_condition.h
index e15dd47d00a6a705e3674eae09f6dd7b160c5272..7cad5aa6e8c7b4977c543a4edd3d789b517dd114 100644
--- a/lasso/xml/saml_audience_restriction_condition.h
+++ b/lasso/xml/saml_audience_restriction_condition.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_AUDIENCE_RESTRICTION_CONDITION_H__
diff --git a/lasso/xml/saml_authentication_statement.c b/lasso/xml/saml_authentication_statement.c
index c24012f37f31141c03e86d0609ed9b7f7895e949..f4b392e23db2e5976b7a2031a01882c5cb63dbc9 100644
--- a/lasso/xml/saml_authentication_statement.c
+++ b/lasso/xml/saml_authentication_statement.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_authentication_statement.h b/lasso/xml/saml_authentication_statement.h
index 5aa89773233ea8d6ef18a81d533dac5dc886a456..8d29bce19c904c1433a5fc14785996783b1e6143 100644
--- a/lasso/xml/saml_authentication_statement.h
+++ b/lasso/xml/saml_authentication_statement.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_AUTHENTICATION_STATEMENT_H__
diff --git a/lasso/xml/saml_authority_binding.c b/lasso/xml/saml_authority_binding.c
index 5561932add0a5a18c869ef9280e36b667849db42..bacefe79b812c05a2853358bfa2771715890e02e 100644
--- a/lasso/xml/saml_authority_binding.c
+++ b/lasso/xml/saml_authority_binding.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_authority_binding.h b/lasso/xml/saml_authority_binding.h
index 36b9958f74f021602c677b1c560fb45170b50a89..5f64b64d86314c410db1cb50a9aa6056b5c6be22 100644
--- a/lasso/xml/saml_authority_binding.h
+++ b/lasso/xml/saml_authority_binding.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_AUTHORITY_BINDING_H__
diff --git a/lasso/xml/saml_condition_abstract.c b/lasso/xml/saml_condition_abstract.c
index f88be52fa422c7fc9284ace7a6828ff2628a5a01..06e9f633ae0acb6609dea4a532eec663b638d1e0 100644
--- a/lasso/xml/saml_condition_abstract.c
+++ b/lasso/xml/saml_condition_abstract.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_condition_abstract.h b/lasso/xml/saml_condition_abstract.h
index 8132bc50fe57dfaefce3f91178f11e4824c3f0c8..26e72ca2410d8f68963684e95b0273752c752db6 100644
--- a/lasso/xml/saml_condition_abstract.h
+++ b/lasso/xml/saml_condition_abstract.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_CONDITION_ABSTRACT_H__
diff --git a/lasso/xml/saml_conditions.c b/lasso/xml/saml_conditions.c
index 765d1604b92e0757b552766f97c5be11ac5307a0..7739d76a5aca078e60967984cc6d9bf09ee7e41c 100644
--- a/lasso/xml/saml_conditions.c
+++ b/lasso/xml/saml_conditions.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_conditions.h b/lasso/xml/saml_conditions.h
index 830e654249a196217cc324cd22bd0f7748e4da45..409c7fe693e4ace2355c7581b6529da7abcf55f1 100644
--- a/lasso/xml/saml_conditions.h
+++ b/lasso/xml/saml_conditions.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_CONDITIONS_H__
diff --git a/lasso/xml/saml_name_identifier.c b/lasso/xml/saml_name_identifier.c
index a93c8f7c2407f14e8b901096fced72da7f1cbe9f..fbd4411405b5f7bc38c75e5c4b15dd271b43e4d5 100644
--- a/lasso/xml/saml_name_identifier.c
+++ b/lasso/xml/saml_name_identifier.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_name_identifier.h b/lasso/xml/saml_name_identifier.h
index ede9dbabad126f653a775b1625ea93d580e0c526..84824c283e8666ab74afa44c13061b3e17063ed6 100644
--- a/lasso/xml/saml_name_identifier.h
+++ b/lasso/xml/saml_name_identifier.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_NAME_IDENTIFIER_H__
diff --git a/lasso/xml/saml_statement_abstract.c b/lasso/xml/saml_statement_abstract.c
index 4bba5100cbc2f1cf4bb889e472d1da2f45750ae8..0408376e742bfc9f1e0bab995aab993907595c9c 100644
--- a/lasso/xml/saml_statement_abstract.c
+++ b/lasso/xml/saml_statement_abstract.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_statement_abstract.h b/lasso/xml/saml_statement_abstract.h
index c55be4dcafc24cb273287aceed3ac68bfd933b69..f756cefcf5c11c9e873a505e847f5ce63871ed45 100644
--- a/lasso/xml/saml_statement_abstract.h
+++ b/lasso/xml/saml_statement_abstract.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_STATEMENT_ABSTRACT_H__
diff --git a/lasso/xml/saml_subject.c b/lasso/xml/saml_subject.c
index b98079de6df448a6f698d36d7cc59ba51f68abfd..36226cb99adf4e24c3622b106eed20a83f3720d6 100644
--- a/lasso/xml/saml_subject.c
+++ b/lasso/xml/saml_subject.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_subject.h b/lasso/xml/saml_subject.h
index c230538716fe84932d258c0c5f932905abf44c2e..b881153342e365a94013a0041c967f73797be44d 100644
--- a/lasso/xml/saml_subject.h
+++ b/lasso/xml/saml_subject.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_SUBJECT_H__
diff --git a/lasso/xml/saml_subject_confirmation.c b/lasso/xml/saml_subject_confirmation.c
index d8ed56e8ba637663cff6a64ec670da71dc7acfaf..000aafecb7dac0dd72289ad0cbd07f335daaf9b4 100644
--- a/lasso/xml/saml_subject_confirmation.c
+++ b/lasso/xml/saml_subject_confirmation.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_subject_confirmation.h b/lasso/xml/saml_subject_confirmation.h
index 113e0e5786b87a93b42b84a1b65632242a85df91..e036e259c9ad9c341d897e0eca47a77f63af6821 100644
--- a/lasso/xml/saml_subject_confirmation.h
+++ b/lasso/xml/saml_subject_confirmation.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_SUBJECT_CONFIRMATION_H__
diff --git a/lasso/xml/saml_subject_locality.c b/lasso/xml/saml_subject_locality.c
index d08c5badf9955adfb49c77420a3248089fa3e9d8..b8baa28796cb435c546558ac4e3fa65eb2ded3e2 100644
--- a/lasso/xml/saml_subject_locality.c
+++ b/lasso/xml/saml_subject_locality.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_subject_locality.h b/lasso/xml/saml_subject_locality.h
index e0964a5bae05e4f47b03b59e427ab60fd4d8c18c..063e49d15de029d626550f62e79c6f9fca2cc080 100644
--- a/lasso/xml/saml_subject_locality.h
+++ b/lasso/xml/saml_subject_locality.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_SUBJECT_LOCALITY_H__
diff --git a/lasso/xml/saml_subject_statement.c b/lasso/xml/saml_subject_statement.c
index 40da63b306bd0210e69f75f2db09e410db7a5462..04b0a3b222f8356a5691b645fa38bf31d6788c11 100644
--- a/lasso/xml/saml_subject_statement.c
+++ b/lasso/xml/saml_subject_statement.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_subject_statement.h b/lasso/xml/saml_subject_statement.h
index 29d7d6bd90b35d2a952e78d2ab860e9be403ab7e..b628d86f49238fa135a3b20fe1db36e8aebbdd7d 100644
--- a/lasso/xml/saml_subject_statement.h
+++ b/lasso/xml/saml_subject_statement.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_SUBJECT_STATEMENT_H__
diff --git a/lasso/xml/saml_subject_statement_abstract.c b/lasso/xml/saml_subject_statement_abstract.c
index e294e5a4c9c469be7bf946ef421e2ebcb93b7ca6..a3cf9ef73a43334ed86ab650700d64820dc603e2 100644
--- a/lasso/xml/saml_subject_statement_abstract.c
+++ b/lasso/xml/saml_subject_statement_abstract.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/saml_subject_statement_abstract.h b/lasso/xml/saml_subject_statement_abstract.h
index 0318d963ecee782296fe55d956757c2a41eb9a86..a28f4e95891513b9713f5e47c679357d5fbd76e1 100644
--- a/lasso/xml/saml_subject_statement_abstract.h
+++ b/lasso/xml/saml_subject_statement_abstract.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAML_SUBJECT_STATEMENT_ABSTRACT_H__
diff --git a/lasso/xml/samlp_request.c b/lasso/xml/samlp_request.c
index 42a4ad6a16c9439ce662b700ab154f2372d55ea6..fa04796a65ad9ba8b6e3bbe361a05d3b66219905 100644
--- a/lasso/xml/samlp_request.c
+++ b/lasso/xml/samlp_request.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/samlp_request.h b/lasso/xml/samlp_request.h
index 980ed479d6558883e60aa1e4a807fcfc8c18cb66..04f9e5651e6cce8c710d787c4b8e419c46edbc24 100644
--- a/lasso/xml/samlp_request.h
+++ b/lasso/xml/samlp_request.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP_REQUEST_H__
diff --git a/lasso/xml/samlp_request_abstract.c b/lasso/xml/samlp_request_abstract.c
index 1e183f2ee01ec474d8b615283140dca4e74dde50..1704cb08fe13e2b402932238a8f7d76b99d1ddb8 100644
--- a/lasso/xml/samlp_request_abstract.c
+++ b/lasso/xml/samlp_request_abstract.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/samlp_request_abstract.h b/lasso/xml/samlp_request_abstract.h
index f2274232b2c24da6b9fe235889c48facb7218c2f..0229a9123d0774df452691731f9c1feef26457fa 100644
--- a/lasso/xml/samlp_request_abstract.h
+++ b/lasso/xml/samlp_request_abstract.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP_REQUEST_ABSTRACT_H__
diff --git a/lasso/xml/samlp_response.c b/lasso/xml/samlp_response.c
index 06413fca7afcf5e427aae7c16a751abce66a445f..bb877d2bb002e577ce99bdef0729840e1eeaea5b 100644
--- a/lasso/xml/samlp_response.c
+++ b/lasso/xml/samlp_response.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/samlp_response.h b/lasso/xml/samlp_response.h
index 6dde3c0926d6f601adadd18137e9ce214aa41ecd..6bf9a32f50c4785a5681397d6c789510111051ee 100644
--- a/lasso/xml/samlp_response.h
+++ b/lasso/xml/samlp_response.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP_RESPONSE_H__
diff --git a/lasso/xml/samlp_response_abstract.c b/lasso/xml/samlp_response_abstract.c
index 513396af4549764061156a574e56b163b42d396b..9e0563e63833a7db4a86417f983f218b8fa25607 100644
--- a/lasso/xml/samlp_response_abstract.c
+++ b/lasso/xml/samlp_response_abstract.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/samlp_response_abstract.h b/lasso/xml/samlp_response_abstract.h
index 45f261b8792cf893dcad85a616dc11b4e90c1fcf..fd651988a2aa85e379c184738a0e0622dde87ff6 100644
--- a/lasso/xml/samlp_response_abstract.h
+++ b/lasso/xml/samlp_response_abstract.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP_RESPONSE_ABSTRACT_H__
diff --git a/lasso/xml/samlp_status.c b/lasso/xml/samlp_status.c
index 515dc351011eb0b2862432b75fd887a36d2e5dc1..6a321271f9bd8021b813d36fa1aa15a6bb83dcc6 100644
--- a/lasso/xml/samlp_status.c
+++ b/lasso/xml/samlp_status.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../utils.h"
diff --git a/lasso/xml/samlp_status.h b/lasso/xml/samlp_status.h
index 7af106b078c6c707f04c858479cc512bbd3d7f7a..11e6888635be275745d6b1520c28fb9b1a5f5964 100644
--- a/lasso/xml/samlp_status.h
+++ b/lasso/xml/samlp_status.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP_STATUS_H__
diff --git a/lasso/xml/samlp_status_code.c b/lasso/xml/samlp_status_code.c
index 1fbe07191c64da6a330d08fed98e43512911dc32..89a5dbab6b9835dd722e5536223ead122cd2655c 100644
--- a/lasso/xml/samlp_status_code.c
+++ b/lasso/xml/samlp_status_code.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/samlp_status_code.h b/lasso/xml/samlp_status_code.h
index adb2596ba034f02b693703a97c8653ad6042c8f7..efec8b4fd80770a7ec600f7cf7da57f29f479d41 100644
--- a/lasso/xml/samlp_status_code.h
+++ b/lasso/xml/samlp_status_code.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SAMLP_STATUS_CODE_H__
diff --git a/lasso/xml/sec_resource_access_statement.c b/lasso/xml/sec_resource_access_statement.c
index 483ed844e74da9a8155ba97dddcaba2b95549ce8..7231e67f0fcbfb45e1564f38a63b29c0c14edfa2 100644
--- a/lasso/xml/sec_resource_access_statement.c
+++ b/lasso/xml/sec_resource_access_statement.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/sec_resource_access_statement.h b/lasso/xml/sec_resource_access_statement.h
index 4b54058c68c6330b3c7bd977019bf2af0a692dbf..0c3edb466b56200857cdf0ca4e4a8a3b35cd5ec6 100644
--- a/lasso/xml/sec_resource_access_statement.h
+++ b/lasso/xml/sec_resource_access_statement.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SEC_RESOURCE_ACCESS_STATEMENT_H__
diff --git a/lasso/xml/soap-1.1/soap_body.c b/lasso/xml/soap-1.1/soap_body.c
index 4385ad95422113e05734c6d8e90f8bbd4ba07635..5eefa44283663736c155c030642af5e368d37a4c 100644
--- a/lasso/xml/soap-1.1/soap_body.c
+++ b/lasso/xml/soap-1.1/soap_body.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/soap-1.1/soap_body.h b/lasso/xml/soap-1.1/soap_body.h
index 7658cea0e11e1cb1e9971f113bfaccb2187f7893..713cf083e6be580ee9a988f6c092bcba3204632d 100644
--- a/lasso/xml/soap-1.1/soap_body.h
+++ b/lasso/xml/soap-1.1/soap_body.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_BODY_H__
diff --git a/lasso/xml/soap-1.1/soap_detail.c b/lasso/xml/soap-1.1/soap_detail.c
index ad9c8032d2e68b29356f255f8f085570efe6e6a5..9685fb158633bbcb4cabb3772c6094f75442e3bf 100644
--- a/lasso/xml/soap-1.1/soap_detail.c
+++ b/lasso/xml/soap-1.1/soap_detail.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "soap_detail.h"
diff --git a/lasso/xml/soap-1.1/soap_detail.h b/lasso/xml/soap-1.1/soap_detail.h
index 862524ba2e9ff1b4537092996d32641fc7e4b616..918eaec484bff6a1c84cd439e86bfbb19c76d8e9 100644
--- a/lasso/xml/soap-1.1/soap_detail.h
+++ b/lasso/xml/soap-1.1/soap_detail.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_DETAIL_H__
diff --git a/lasso/xml/soap-1.1/soap_envelope.c b/lasso/xml/soap-1.1/soap_envelope.c
index b146c0d86904e6a9e5daf53dd6f2aa7620e01547..4a327f66fbe9197dcf1be36f7eb1bbf543eca965 100644
--- a/lasso/xml/soap-1.1/soap_envelope.c
+++ b/lasso/xml/soap-1.1/soap_envelope.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/soap-1.1/soap_envelope.h b/lasso/xml/soap-1.1/soap_envelope.h
index 3c783d412167f3152eb0e7893342d8e4972ae4ce..75b067e8d15cbeca8afc38fb73bd773b2a18b5ae 100644
--- a/lasso/xml/soap-1.1/soap_envelope.h
+++ b/lasso/xml/soap-1.1/soap_envelope.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_ENVELOPE_H__
diff --git a/lasso/xml/soap-1.1/soap_fault.c b/lasso/xml/soap-1.1/soap_fault.c
index 1fca2f4cb88b7b5ccf9ba9d485813cea761e2be5..6272db3e1440f84309ed042173a26a0ff74b53aa 100644
--- a/lasso/xml/soap-1.1/soap_fault.c
+++ b/lasso/xml/soap-1.1/soap_fault.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "soap_fault.h"
diff --git a/lasso/xml/soap-1.1/soap_fault.h b/lasso/xml/soap-1.1/soap_fault.h
index 49541ffca5810e46128e5e012679390738974e3b..882b969c61150494da1b7e6973d114df6306aaab 100644
--- a/lasso/xml/soap-1.1/soap_fault.h
+++ b/lasso/xml/soap-1.1/soap_fault.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_FAULT_H__
diff --git a/lasso/xml/soap-1.1/soap_header.c b/lasso/xml/soap-1.1/soap_header.c
index 53fb350a33dd11b8499d48c3cef569f5db5bcdab..5d0d37452b92dd66ec3a3819c423097886512161 100644
--- a/lasso/xml/soap-1.1/soap_header.c
+++ b/lasso/xml/soap-1.1/soap_header.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/soap-1.1/soap_header.h b/lasso/xml/soap-1.1/soap_header.h
index f9cf13917a0adc837dc3092d734a45f5c9eb9edc..e90c088182903863f56cd88ffef06b93878907c3 100644
--- a/lasso/xml/soap-1.1/soap_header.h
+++ b/lasso/xml/soap-1.1/soap_header.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_HEADER_H__
diff --git a/lasso/xml/soap-1.1/xml_soap11.h b/lasso/xml/soap-1.1/xml_soap11.h
index ca980c2e0ff3c36d1bc4f254cb9ce25c099b4477..858290ae6f42428e3489483fd0513b6f4195a67f 100644
--- a/lasso/xml/soap-1.1/xml_soap11.h
+++ b/lasso/xml/soap-1.1/xml_soap11.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_XML_SOAP11_H__
diff --git a/lasso/xml/soap_binding.c b/lasso/xml/soap_binding.c
index b62c980dafb412127fe1d5722bb02c8e36055f6e..f8f91275213db99d03fc4b5013388d84282d2cf9 100644
--- a/lasso/xml/soap_binding.c
+++ b/lasso/xml/soap_binding.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/soap_binding.h b/lasso/xml/soap_binding.h
index 08b8e731f7ccb62eaf7ea79f7476845396fa1cba..087c44caa2eb39633434938d3dedf981de01f989 100644
--- a/lasso/xml/soap_binding.h
+++ b/lasso/xml/soap_binding.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_BINDING_H__
diff --git a/lasso/xml/soap_binding_consent.c b/lasso/xml/soap_binding_consent.c
index e684d1c5e355ca3bb1727f6460de40cfe56159a3..0bf852bb060d892b72d1f49d66f773e59d53cea4 100644
--- a/lasso/xml/soap_binding_consent.c
+++ b/lasso/xml/soap_binding_consent.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/soap_binding_consent.h b/lasso/xml/soap_binding_consent.h
index 90127b39b9b5fae418cf5768650834e43716efc5..e92e78e39eb1178fc83e0215f5c926827477256b 100644
--- a/lasso/xml/soap_binding_consent.h
+++ b/lasso/xml/soap_binding_consent.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_BINDING_CONSENT_H__
diff --git a/lasso/xml/soap_binding_correlation.c b/lasso/xml/soap_binding_correlation.c
index ce04ea9e776ab07b46c1793554afab79fe3a5791..619bb48cc45158810e3ba060c9bd6099409be9ab 100644
--- a/lasso/xml/soap_binding_correlation.c
+++ b/lasso/xml/soap_binding_correlation.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/soap_binding_correlation.h b/lasso/xml/soap_binding_correlation.h
index cba83f8cb776ec40bc61c1ab0f52aa9e886f1d2b..1472b1d65a4d82ab22c9b5f2b4d9f5af485b1374 100644
--- a/lasso/xml/soap_binding_correlation.h
+++ b/lasso/xml/soap_binding_correlation.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_BINDING_CORRELATION_H__
diff --git a/lasso/xml/soap_binding_ext_credential.c b/lasso/xml/soap_binding_ext_credential.c
index 13d6573d1ea67abe10d475e77fca80f0e8ac85bd..00b9e9666b24fb5821993bf7dd953673a5aa9c04 100644
--- a/lasso/xml/soap_binding_ext_credential.c
+++ b/lasso/xml/soap_binding_ext_credential.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/soap_binding_ext_credential.h b/lasso/xml/soap_binding_ext_credential.h
index e1b25268c8cdf3adc653e213c33d150163c145f1..6dfce28caaa40fcebf76e39eac0c50fea1f94d7f 100644
--- a/lasso/xml/soap_binding_ext_credential.h
+++ b/lasso/xml/soap_binding_ext_credential.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_BINDING_EXT_CREDENTIAL_H__
diff --git a/lasso/xml/soap_binding_ext_credentials_context.c b/lasso/xml/soap_binding_ext_credentials_context.c
index 1d0f33b570c51c73ee80da7f16d50d914c48fae9..f349419d71edb22c285a774e018a70106aa59b5e 100644
--- a/lasso/xml/soap_binding_ext_credentials_context.c
+++ b/lasso/xml/soap_binding_ext_credentials_context.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/soap_binding_ext_credentials_context.h b/lasso/xml/soap_binding_ext_credentials_context.h
index 8cbccc2d9b7b303aac1851df6e6e300f979ef594..471c50127c31884eac5a369bff3bd92ce5b97bf0 100644
--- a/lasso/xml/soap_binding_ext_credentials_context.h
+++ b/lasso/xml/soap_binding_ext_credentials_context.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_BINDING_EXT_CREDENTIALS_CONTEXT_H__
diff --git a/lasso/xml/soap_binding_ext_service_instance_update.c b/lasso/xml/soap_binding_ext_service_instance_update.c
index c40121f40865f477c9476309371ccc352d938bd1..d3c04f0ac48ea78c396a7011ed1c90e44cb264da 100644
--- a/lasso/xml/soap_binding_ext_service_instance_update.c
+++ b/lasso/xml/soap_binding_ext_service_instance_update.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/soap_binding_ext_service_instance_update.h b/lasso/xml/soap_binding_ext_service_instance_update.h
index 3eb88716261d2633566887767ccbc5437768a238..19921a8f15026796298f5a67f816f62fce2d01f9 100644
--- a/lasso/xml/soap_binding_ext_service_instance_update.h
+++ b/lasso/xml/soap_binding_ext_service_instance_update.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_BINDING_EXT_SERVICE_INSTANCE_UPDATE_H__
diff --git a/lasso/xml/soap_binding_ext_timeout.c b/lasso/xml/soap_binding_ext_timeout.c
index 07dd823c9cb562571bdd9ece7293dddc65507603..988780f70dad02d72f05349638b0d9a67c2cc1c6 100644
--- a/lasso/xml/soap_binding_ext_timeout.c
+++ b/lasso/xml/soap_binding_ext_timeout.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/soap_binding_ext_timeout.h b/lasso/xml/soap_binding_ext_timeout.h
index 3020f8c1b849e8d97e1f8710c5ffa1dafb2e6fcd..4d81bf5a0e96150d1f47eb6cf92e74cd6afa5233 100644
--- a/lasso/xml/soap_binding_ext_timeout.h
+++ b/lasso/xml/soap_binding_ext_timeout.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_BINDING_EXT_TIMEOUT_H__
diff --git a/lasso/xml/soap_binding_processing_context.c b/lasso/xml/soap_binding_processing_context.c
index 312130a2e1bffa99d3a9e378d1320f746c4d29c3..70851947bd24af88d8d75a1acd3c7ac32799a17f 100644
--- a/lasso/xml/soap_binding_processing_context.c
+++ b/lasso/xml/soap_binding_processing_context.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/soap_binding_processing_context.h b/lasso/xml/soap_binding_processing_context.h
index b4250a989aeb3919fded72b13ef2594b1a1a5c06..b026f78dfcc80a0f5d7ea0f7613bb36e50c42680 100644
--- a/lasso/xml/soap_binding_processing_context.h
+++ b/lasso/xml/soap_binding_processing_context.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_BINDING_PROCESSING_CONTEXT_H__
diff --git a/lasso/xml/soap_binding_provider.c b/lasso/xml/soap_binding_provider.c
index 67cf9193e954d626f8732691deac5c40134e7216..0c4a94a196374bb901d9ed51b280b86fa5efa63a 100644
--- a/lasso/xml/soap_binding_provider.c
+++ b/lasso/xml/soap_binding_provider.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/soap_binding_provider.h b/lasso/xml/soap_binding_provider.h
index 397086cd3727e317c396560065654ef7183a616f..996f85b632c4c42cbf7b7201f526b8762653b060 100644
--- a/lasso/xml/soap_binding_provider.h
+++ b/lasso/xml/soap_binding_provider.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_BINDING_PROVIDER_H__
diff --git a/lasso/xml/soap_binding_usage_directive.c b/lasso/xml/soap_binding_usage_directive.c
index d41228dd64bbac873a08995aec6f93bb9b3bf908..7d2ac995a4a3c274aa65be52256dda15067d8a66 100644
--- a/lasso/xml/soap_binding_usage_directive.c
+++ b/lasso/xml/soap_binding_usage_directive.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/soap_binding_usage_directive.h b/lasso/xml/soap_binding_usage_directive.h
index 0617c77428c181aa93b043d43f1a83b02553c841..08393275ee6276bea1e27709bc9bae37f6f11579 100644
--- a/lasso/xml/soap_binding_usage_directive.h
+++ b/lasso/xml/soap_binding_usage_directive.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_SOAP_BINDING_USAGE_DIRECTIVE_H__
diff --git a/lasso/xml/strings.h b/lasso/xml/strings.h
index 7c7be75910856d9be4b3eb0a69dad121003ed2b8..14380535dc945fabf72cdc9b0571c6d302112285 100644
--- a/lasso/xml/strings.h
+++ b/lasso/xml/strings.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
index dc70594f82145d09f5cf71ed99b56b087a58c8ab..1bca8597437fbe6538747ff1602e553c01e14e10 100644
--- a/lasso/xml/tools.c
+++ b/lasso/xml/tools.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* permit importation of strptime for glibc2 */
diff --git a/lasso/xml/tools.h b/lasso/xml/tools.h
index 639269fb80b0801c8550e207f7bfc1e7af836e2e..bb64008ba76d2a94b6cc18604d47ac9158953ce1 100644
--- a/lasso/xml/tools.h
+++ b/lasso/xml/tools.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_TOOLS_H__
diff --git a/lasso/xml/utility_status.c b/lasso/xml/utility_status.c
index 2336c2f5092b3a216eb136331bdc3b4070e76f86..6046d01b0589bb3bc6994915eeb2d4f7eeda97b9 100644
--- a/lasso/xml/utility_status.c
+++ b/lasso/xml/utility_status.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "private.h"
diff --git a/lasso/xml/utility_status.h b/lasso/xml/utility_status.h
index a58e2ec3efc3f5bb67a7321956c6c18cebd642f3..9913261f91130714a4a2f7a33b3f978a55d8a9fa 100644
--- a/lasso/xml/utility_status.h
+++ b/lasso/xml/utility_status.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_UTILITY_STATUS_H__
diff --git a/lasso/xml/ws/wsa_attributed_any.c b/lasso/xml/ws/wsa_attributed_any.c
index dd47df5226f249ae5f366e70e95d658997df6d78..36cd235cdcb634889c19c00ccf3187aefc53b5a6 100644
--- a/lasso/xml/ws/wsa_attributed_any.c
+++ b/lasso/xml/ws/wsa_attributed_any.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsa_attributed_any.h b/lasso/xml/ws/wsa_attributed_any.h
index 63c5f69b9e426570f20b8139d57db889f42d2b73..acc18bdc58ba2d9427ce7c233f2975da17880ed9 100644
--- a/lasso/xml/ws/wsa_attributed_any.h
+++ b/lasso/xml/ws/wsa_attributed_any.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSA_ATTRIBUTED_ANY_H__
diff --git a/lasso/xml/ws/wsa_attributed_qname.c b/lasso/xml/ws/wsa_attributed_qname.c
index 5b71af9185dfa86925d1918d3d7f3a10dabf1737..4e7be20bde61e8e891446d167ba28ade32daaabb 100644
--- a/lasso/xml/ws/wsa_attributed_qname.c
+++ b/lasso/xml/ws/wsa_attributed_qname.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsa_attributed_qname.h b/lasso/xml/ws/wsa_attributed_qname.h
index 7ef8dc5ecc656b35501e9798ecee037fed47f834..ad81b99a796f4cbd50fe1607ab1089aee6a02bf1 100644
--- a/lasso/xml/ws/wsa_attributed_qname.h
+++ b/lasso/xml/ws/wsa_attributed_qname.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSA_ATTRIBUTED_QNAME_H__
diff --git a/lasso/xml/ws/wsa_attributed_unsigned_long.c b/lasso/xml/ws/wsa_attributed_unsigned_long.c
index 5d25bdaff2bcad6100549ed8f6d8e1314d79986f..dec253570b5a8e06e3a1e64892dbcaff9236c547 100644
--- a/lasso/xml/ws/wsa_attributed_unsigned_long.c
+++ b/lasso/xml/ws/wsa_attributed_unsigned_long.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsa_attributed_unsigned_long.h b/lasso/xml/ws/wsa_attributed_unsigned_long.h
index dcf35b3bc7f3c5d9d1cb2413c52ba03293db75ba..af00ff0b01b9fe9a67f9897a13283dccd8d782ea 100644
--- a/lasso/xml/ws/wsa_attributed_unsigned_long.h
+++ b/lasso/xml/ws/wsa_attributed_unsigned_long.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSA_ATTRIBUTED_UNSIGNED_LONG_H__
diff --git a/lasso/xml/ws/wsa_attributed_uri.c b/lasso/xml/ws/wsa_attributed_uri.c
index 37be4ab59afc9878c742ba89fa484f5e44874d22..2758a673cd53fd29d3a3a5a0745e5dc9be6ffc65 100644
--- a/lasso/xml/ws/wsa_attributed_uri.c
+++ b/lasso/xml/ws/wsa_attributed_uri.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsa_attributed_uri.h b/lasso/xml/ws/wsa_attributed_uri.h
index 019c0fea74a971fcc33178fe26c9a9d342db9840..807e4debb0806e4d0c05fa80ad517a33a9217196 100644
--- a/lasso/xml/ws/wsa_attributed_uri.h
+++ b/lasso/xml/ws/wsa_attributed_uri.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSA_ATTRIBUTED_URI_H__
diff --git a/lasso/xml/ws/wsa_endpoint_reference.c b/lasso/xml/ws/wsa_endpoint_reference.c
index 3bb1b1a4e0ee180279e8494a094b78ccba414133..3ff39b8a0ceb428992335241b347ac4f399e84c7 100644
--- a/lasso/xml/ws/wsa_endpoint_reference.c
+++ b/lasso/xml/ws/wsa_endpoint_reference.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsa_endpoint_reference.h b/lasso/xml/ws/wsa_endpoint_reference.h
index e7339c61570b89c9574d575366226a27f062fe7a..3faed05c85abc5da38ae0aeb3484b02cd7ba68ad 100644
--- a/lasso/xml/ws/wsa_endpoint_reference.h
+++ b/lasso/xml/ws/wsa_endpoint_reference.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSA_ENDPOINT_REFERENCE_H__
diff --git a/lasso/xml/ws/wsa_metadata.c b/lasso/xml/ws/wsa_metadata.c
index e3c4dc4b791d6852f7ba049bb26412a23be29661..11d40df6a295898e447b7c9c0c506526087c793d 100644
--- a/lasso/xml/ws/wsa_metadata.c
+++ b/lasso/xml/ws/wsa_metadata.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsa_metadata.h b/lasso/xml/ws/wsa_metadata.h
index d2237d667bbf5aae32ecc37755b111fba82ec434..e5ab8e78aa46a4bb1e1c8a955ab6fb15b056a262 100644
--- a/lasso/xml/ws/wsa_metadata.h
+++ b/lasso/xml/ws/wsa_metadata.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSA_METADATA_H__
diff --git a/lasso/xml/ws/wsa_problem_action.c b/lasso/xml/ws/wsa_problem_action.c
index 5ad135dab73d75adf3a8e7584249b0595d05b141..c8896b364a98e501fa44ec4695bfb42a25b72c3d 100644
--- a/lasso/xml/ws/wsa_problem_action.c
+++ b/lasso/xml/ws/wsa_problem_action.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsa_problem_action.h b/lasso/xml/ws/wsa_problem_action.h
index 3b4f6ecde7096221f46ebe661711a259bb9b68c1..23e4f873a49e3ec74a6ed16b1caca8c410304e33 100644
--- a/lasso/xml/ws/wsa_problem_action.h
+++ b/lasso/xml/ws/wsa_problem_action.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSA_PROBLEM_ACTION_H__
diff --git a/lasso/xml/ws/wsa_reference_parameters.c b/lasso/xml/ws/wsa_reference_parameters.c
index 8a4d95fe319a6499be93ff3e4ccbd95af6fcccf1..f4b69d893f242c531c98d33772553d36f4803a22 100644
--- a/lasso/xml/ws/wsa_reference_parameters.c
+++ b/lasso/xml/ws/wsa_reference_parameters.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsa_reference_parameters.h b/lasso/xml/ws/wsa_reference_parameters.h
index 9e6778ea343a0016fc576941fe221de1a2c5e21e..3f0efff0b8e716d36148bfbdbbfb9d11e9688b99 100644
--- a/lasso/xml/ws/wsa_reference_parameters.h
+++ b/lasso/xml/ws/wsa_reference_parameters.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSA_REFERENCE_PARAMETERS_H__
diff --git a/lasso/xml/ws/wsa_relates_to.c b/lasso/xml/ws/wsa_relates_to.c
index 13cb4aecf725fb4e5f95ccd16822613edf9e76fd..8c6f7e6630bb9744f854bb24f0ff6a0b0d948186 100644
--- a/lasso/xml/ws/wsa_relates_to.c
+++ b/lasso/xml/ws/wsa_relates_to.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsa_relates_to.h b/lasso/xml/ws/wsa_relates_to.h
index cbbfde5e95a8664b50e2383474378b8b56b7b077..9e819f048f27857b30d2fb13e375e176ae749650 100644
--- a/lasso/xml/ws/wsa_relates_to.h
+++ b/lasso/xml/ws/wsa_relates_to.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSA_RELATES_TO_H__
diff --git a/lasso/xml/ws/wsse_embedded.c b/lasso/xml/ws/wsse_embedded.c
index e219c1b6c1726cf2db7afbe43afe751f0edfc79b..45e8315f4ffd5c62699ec5d2024d3644045117af 100644
--- a/lasso/xml/ws/wsse_embedded.c
+++ b/lasso/xml/ws/wsse_embedded.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsse_embedded.h b/lasso/xml/ws/wsse_embedded.h
index 5e6648aabd31a46cac801c6df282d0eb467da4c1..b6aad1945e178199ea04c65345e4571be37d4907 100644
--- a/lasso/xml/ws/wsse_embedded.h
+++ b/lasso/xml/ws/wsse_embedded.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSSE_EMBEDDED_H__
diff --git a/lasso/xml/ws/wsse_reference.c b/lasso/xml/ws/wsse_reference.c
index 556dd4b4028556b6001274a053e578ea84d5be88..e21456d14b3f6e776e1691556d13e1eb20b22b1d 100644
--- a/lasso/xml/ws/wsse_reference.c
+++ b/lasso/xml/ws/wsse_reference.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsse_reference.h b/lasso/xml/ws/wsse_reference.h
index aab9d8584b36e6522143315ddd26bee84b97fbfe..34abdefc4b144a01eb8299bffa47ca9e1fb7930b 100644
--- a/lasso/xml/ws/wsse_reference.h
+++ b/lasso/xml/ws/wsse_reference.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSSE_REFERENCE_H__
diff --git a/lasso/xml/ws/wsse_security_header.c b/lasso/xml/ws/wsse_security_header.c
index 1d33f6e6bb903f5641e5590c7d052ec657cdc670..1ade802d694f75e3d6881196df31b3a3309e0f6d 100644
--- a/lasso/xml/ws/wsse_security_header.c
+++ b/lasso/xml/ws/wsse_security_header.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsse_security_header.h b/lasso/xml/ws/wsse_security_header.h
index 61b55983abdbf04434a53a3abf6f7104f18e6096..462c605070c59ea279bcf942ba5a6a05c73eb3e3 100644
--- a/lasso/xml/ws/wsse_security_header.h
+++ b/lasso/xml/ws/wsse_security_header.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSSE_SECURITY_HEADER_H__
diff --git a/lasso/xml/ws/wsse_security_token_reference.c b/lasso/xml/ws/wsse_security_token_reference.c
index 0748c77a3a9da17ab252cd30cf42e26b3bcf69d5..43ee1ba8420b6eaaeb5f382b08fb5102cd1dcc6b 100644
--- a/lasso/xml/ws/wsse_security_token_reference.c
+++ b/lasso/xml/ws/wsse_security_token_reference.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsse_security_token_reference.h b/lasso/xml/ws/wsse_security_token_reference.h
index f9db9a33bff72cf8591083e9984b3d9885b54b5b..0ed008536ce7004a8954f7df05b9560e806ff83e 100644
--- a/lasso/xml/ws/wsse_security_token_reference.h
+++ b/lasso/xml/ws/wsse_security_token_reference.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSSE_SECURITY_TOKEN_REFERENCE_H__
diff --git a/lasso/xml/ws/wsse_transformation_parameters.c b/lasso/xml/ws/wsse_transformation_parameters.c
index 4bc2d0b419355dcb06be6e5e061643f710118c5d..077c46cfddc59905e6ce534700cc4b295d555727 100644
--- a/lasso/xml/ws/wsse_transformation_parameters.c
+++ b/lasso/xml/ws/wsse_transformation_parameters.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsse_transformation_parameters.h b/lasso/xml/ws/wsse_transformation_parameters.h
index 5bdbcce4596eb1876acc4d3838a3f1b53a992a49..0038e9abf8eceeb0782442b5ff369a5f600c80b6 100644
--- a/lasso/xml/ws/wsse_transformation_parameters.h
+++ b/lasso/xml/ws/wsse_transformation_parameters.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSSE_TRANSFORMATION_PARAMETERS_H__
diff --git a/lasso/xml/ws/wsse_username_token.c b/lasso/xml/ws/wsse_username_token.c
index f411bbea4646f828586dc81c1fe71167cba9b2fe..a77ffe905d398471328642795de7e1a7f2a2d21e 100644
--- a/lasso/xml/ws/wsse_username_token.c
+++ b/lasso/xml/ws/wsse_username_token.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/xml/ws/wsse_username_token.h b/lasso/xml/ws/wsse_username_token.h
index 5489c1ae2d8b9e65e3027659814078f105f9ba1e..46024273384a2b8577f13e2f21e4015a05f0e178 100644
--- a/lasso/xml/ws/wsse_username_token.h
+++ b/lasso/xml/ws/wsse_username_token.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSSE_USERNAME_TOKEN_H__
diff --git a/lasso/xml/ws/wsu_timestamp.c b/lasso/xml/ws/wsu_timestamp.c
index e9bbed2c1e8d49ac0b138eb0985a008966166d77..3959797fb7400cdecf33590056385b5683da1007 100644
--- a/lasso/xml/ws/wsu_timestamp.c
+++ b/lasso/xml/ws/wsu_timestamp.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "../private.h"
diff --git a/lasso/xml/ws/wsu_timestamp.h b/lasso/xml/ws/wsu_timestamp.h
index 91c3af9353398ee5407bed9b84b988aaaf428eae..8e145add738c9c42dbc361cbe8499b682e99cb66 100644
--- a/lasso/xml/ws/wsu_timestamp.h
+++ b/lasso/xml/ws/wsu_timestamp.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_WSU_TIMESTAMP_H__
diff --git a/lasso/xml/ws/xml_ws.h b/lasso/xml/ws/xml_ws.h
index df26f2c3248add8a97c68b7c380c6172c0c77331..3580253b9dc44ddc578131a3018b9ad5d7f74b10 100644
--- a/lasso/xml/ws/xml_ws.h
+++ b/lasso/xml/ws/xml_ws.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_XML_WS_H__
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index 488cd5d81df40e4e8649eb9c8c7a0cfdd0b4ffd5..ba207f552cf5c6a587c1866adecab9f2ac9a339a 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lasso/xml/xml.h b/lasso/xml/xml.h
index 34a1caa87d30926528d761bdd14b7bed3ef24789..9750079b86c6ea00b595dc4788b1bf14fa5a0b08 100644
--- a/lasso/xml/xml.h
+++ b/lasso/xml/xml.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_XML_H__
diff --git a/lasso/xml/xml_enc.h b/lasso/xml/xml_enc.h
index 2a8b98da9f52cd6ae2ed8bc3f1fa828ebc455ae5..a09d59c54a5b04f25019828506e9e062cae15f7e 100644
--- a/lasso/xml/xml_enc.h
+++ b/lasso/xml/xml_enc.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_XML_ENC_H__
diff --git a/lasso/xml/xml_idff.h b/lasso/xml/xml_idff.h
index 82785c076492e9ce27d13c42d418848d83881735..bced912f8d75b8ba7f821c193a199a3c0b41233f 100644
--- a/lasso/xml/xml_idff.h
+++ b/lasso/xml/xml_idff.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_XML_IDFF_H__
diff --git a/lasso/xml/xml_idwsf.h b/lasso/xml/xml_idwsf.h
index 36f977933150d359278b111f1aa003ee34859cd6..4fd3f7fd4ead6b8b158c073468635cc3d97a2ef0 100644
--- a/lasso/xml/xml_idwsf.h
+++ b/lasso/xml/xml_idwsf.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_XML_IDWSF_H__
diff --git a/m4/ac_check_class.m4 b/m4/ac_check_class.m4
index 264ba4d9b4665662be2c72436fb2077b3ae4935b..08e7b3d2abaa098c93d23e4e63d2ccd3f17748b5 100644
--- a/m4/ac_check_class.m4
+++ b/m4/ac_check_class.m4
@@ -38,9 +38,7 @@
 #   General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright
 #   owner gives unlimited permission to copy, distribute and modify the
diff --git a/m4/ac_check_classpath.m4 b/m4/ac_check_classpath.m4
index bfbdda4a319fd57737835f0b1ffdb257eeadc636..82b9907edbe66e9ca541348941be8cd861f14b83 100644
--- a/m4/ac_check_classpath.m4
+++ b/m4/ac_check_classpath.m4
@@ -35,9 +35,7 @@
 #   General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright
 #   owner gives unlimited permission to copy, distribute and modify the
diff --git a/m4/ac_check_java_home.m4 b/m4/ac_check_java_home.m4
index 88bfbd18396e63db049d62379539711d23424d8f..38c359637a1af14daf5f7cb0ed797deacc926075 100644
--- a/m4/ac_check_java_home.m4
+++ b/m4/ac_check_java_home.m4
@@ -30,9 +30,7 @@
 #   General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright
 #   owner gives unlimited permission to copy, distribute and modify the
diff --git a/m4/ac_check_rqrd_class.m4 b/m4/ac_check_rqrd_class.m4
index fb13fff17890b9e4e89dfd22123f385bc604a734..6f71cb749c9e89cf430851fc8e27a84ad7ef572d 100644
--- a/m4/ac_check_rqrd_class.m4
+++ b/m4/ac_check_rqrd_class.m4
@@ -37,9 +37,7 @@
 #   General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright
 #   owner gives unlimited permission to copy, distribute and modify the
diff --git a/m4/ac_prog_java.m4 b/m4/ac_prog_java.m4
index af2b6cbd27ab79464aef84cc4558c11a812919ec..27e1c2240498bb848f68acfd9561421664b41d8c 100644
--- a/m4/ac_prog_java.m4
+++ b/m4/ac_prog_java.m4
@@ -90,9 +90,7 @@
 #   General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright
 #   owner gives unlimited permission to copy, distribute and modify the
diff --git a/m4/ac_prog_java_cc.m4 b/m4/ac_prog_java_cc.m4
index df127856951ce4d3676d7ac9846dad1041894633..17c9e72b1527960b720c99e9548667827e348a89 100644
--- a/m4/ac_prog_java_cc.m4
+++ b/m4/ac_prog_java_cc.m4
@@ -58,9 +58,7 @@
 #   General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright
 #   owner gives unlimited permission to copy, distribute and modify the
diff --git a/m4/ac_prog_java_works.m4 b/m4/ac_prog_java_works.m4
index e450c6c8013db224299fe948d7196b4f59b268af..341dba54fc9135b7174f68f91b82766e0891693d 100644
--- a/m4/ac_prog_java_works.m4
+++ b/m4/ac_prog_java_works.m4
@@ -34,9 +34,7 @@
 #   General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright
 #   owner gives unlimited permission to copy, distribute and modify the
diff --git a/m4/ac_prog_javac.m4 b/m4/ac_prog_javac.m4
index 630c3cfe4f0949fde8fe350a79fd2e093dfc0d2d..8922e6bf18399dd4984589f183210f6019383329 100644
--- a/m4/ac_prog_javac.m4
+++ b/m4/ac_prog_javac.m4
@@ -52,9 +52,7 @@
 #   General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright
 #   owner gives unlimited permission to copy, distribute and modify the
diff --git a/m4/ac_prog_javac_works.m4 b/m4/ac_prog_javac_works.m4
index d3ceb5cc5ccce87918df335aab1e2cbc65abdf2b..dd3a4f6f5166b9546f3e51518be1c0380309a17c 100644
--- a/m4/ac_prog_javac_works.m4
+++ b/m4/ac_prog_javac_works.m4
@@ -34,9 +34,7 @@
 #   General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright
 #   owner gives unlimited permission to copy, distribute and modify the
diff --git a/m4/dps_java_check_class.m4 b/m4/dps_java_check_class.m4
index a86d6416b910f86f8abe7677d586f7f499f56ae0..1f7ac7318f64da6eefb412d4c9a336b597b6b531 100644
--- a/m4/dps_java_check_class.m4
+++ b/m4/dps_java_check_class.m4
@@ -37,9 +37,7 @@
 #   General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright
 #   owner gives unlimited permission to copy, distribute and modify the
diff --git a/m4/dps_libgcj_jar.m4 b/m4/dps_libgcj_jar.m4
index 777cd5c685cbaf2959a73a28811320d68b83424b..328459b4817035dcdcd90c986947a234ff15eae3 100644
--- a/m4/dps_libgcj_jar.m4
+++ b/m4/dps_libgcj_jar.m4
@@ -28,9 +28,7 @@
 #   General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright
 #   owner gives unlimited permission to copy, distribute and modify the
diff --git a/m4/dps_xtra_classpath.m4 b/m4/dps_xtra_classpath.m4
index 83cc37e801787880a915704d5a4d14a45b0e6cfe..8d98dd0337cb20175b0fe80343bf0aa77efe045c 100644
--- a/m4/dps_xtra_classpath.m4
+++ b/m4/dps_xtra_classpath.m4
@@ -29,9 +29,7 @@
 #   General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright
 #   owner gives unlimited permission to copy, distribute and modify the
diff --git a/tests/assertion_query_saml2.c b/tests/assertion_query_saml2.c
index 2a6c9731cdf6acd03c5924b52c25464a3d506eec..f9c1a3ee1f5f18372f991ab91c117ed5715f5bd8 100644
--- a/tests/assertion_query_saml2.c
+++ b/tests/assertion_query_saml2.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
diff --git a/tests/basic_tests.c b/tests/basic_tests.c
index a75174ebf211e5cf4059abe96fe0c25a897ed7ed..f9fdf3a5159dff56d516fab320f3b8bba7be51ab 100644
--- a/tests/basic_tests.c
+++ b/tests/basic_tests.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
diff --git a/tests/idwsf2_tests.c b/tests/idwsf2_tests.c
index 6d27b462648ab6de9364045914fc260b0388d394..96d03c57157ba4aba08f642534071e99b41f36c1 100644
--- a/tests/idwsf2_tests.c
+++ b/tests/idwsf2_tests.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
diff --git a/tests/login_tests.c b/tests/login_tests.c
index 7cbacb739ef0ec88b9594ba106b5c574a791468b..199c58cb62edbcd025b83c25d6cbdec45b288ce1 100644
--- a/tests/login_tests.c
+++ b/tests/login_tests.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
diff --git a/tests/login_tests_saml2.c b/tests/login_tests_saml2.c
index 4b09b6a2c70426a167ee01817d82f0ddb710f65e..e1c578e0845dc5aa1d898f82d055caf963624344 100644
--- a/tests/login_tests_saml2.c
+++ b/tests/login_tests_saml2.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
diff --git a/tests/metadata_tests.c b/tests/metadata_tests.c
index 019bfd4c8ce9e996bfc7fa6e6a2b84c77d81d956..44526addae6a5d1dc83ad916e5f51456112df90c 100644
--- a/tests/metadata_tests.c
+++ b/tests/metadata_tests.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
diff --git a/tests/non_regression_tests.c b/tests/non_regression_tests.c
index 11cca518d1ee0d2dad52cd345df7c546c6938190..ef3043936b4bde6836ad2bf6df8ce2f316a47f8e 100644
--- a/tests/non_regression_tests.c
+++ b/tests/non_regression_tests.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
diff --git a/tests/perfs.c b/tests/perfs.c
index 0f932c0d283efa71c98018c2818f3fad40e0f422..87cffacad54bc694be8822a98ef222e19ebd9304 100644
--- a/tests/perfs.c
+++ b/tests/perfs.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <sys/time.h>
diff --git a/tests/random_tests.c b/tests/random_tests.c
index df3dde344e9af7a987a3540b3d4a245aa543377a..c4fe85883ec4c4e08a578f20583f3d77ad6f8277 100644
--- a/tests/random_tests.c
+++ b/tests/random_tests.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
diff --git a/tests/tests.c b/tests/tests.c
index 8ec4a40f3dc48852be22d936b4643db3c8eff8dc..7536c096767086042567c4d32a6792601b8fc530 100644
--- a/tests/tests.c
+++ b/tests/tests.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdlib.h>
diff --git a/tests/tests.h b/tests/tests.h
index 5c7ba4e49e7df55bb4a4bce2f17cef857daec205..3110e95a0692cc17179face649ecbb768159e466 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __TESTS_H__
diff --git a/tools/generate_idwsf2_classes.py b/tools/generate_idwsf2_classes.py
index fc42d6bd306a7760a02e883eb7fd76da8141bcb5..049c0ea870dc66c18467167ddd1c90f7cc943f2d 100644
--- a/tools/generate_idwsf2_classes.py
+++ b/tools/generate_idwsf2_classes.py
@@ -185,8 +185,7 @@ class LassoClass:
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __LASSO_%(category_upper)s%(file_name_upper)s_H__
@@ -435,8 +434,7 @@ LASSO_EXPORT Lasso%(prefix_cap)s%(name)s* lasso_%(category)s%(file_name)s_new(vo
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 """ % self.__dict__)
 
@@ -908,8 +906,7 @@ lasso_%(category)s%(file_name)s_new_with_int(int content)
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SWIGPHP4
diff --git a/website/web/license.xml b/website/web/license.xml
index 05e52f6fc57cc0d7c738814677d43a8b69d55827..936cf7294c46f04f1826f99abd1635697139ef2a 100644
--- a/website/web/license.xml
+++ b/website/web/license.xml
@@ -30,8 +30,8 @@
 
  <p>
   You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  with this program; if not, see <a href="http://www.gnu.org/licenses/">
+  http://www.gnu.org/licenses/</a>.
  </p>
 
  <p id="openssl">
diff --git a/win32/lasso.rc.in b/win32/lasso.rc.in
index 389c2c2d4aac209cf08c62b90c1a740bd82dc8d3..2574b987c0171acfa8049707e49e525ee87bc577 100644
--- a/win32/lasso.rc.in
+++ b/win32/lasso.rc.in
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <afxres.h>
-- 
1.8.4.2