From a189f24bc45beb474570828533e8c07a59fa77d2 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Fri, 10 Dec 2010 14:08:08 +0000
Subject: [PATCH] saml2/idp: Do not include technical contact in metadata
unless it is configured.
Thanks to Andjelko Horvat for providing this patch!
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2683 44740490-163a-0410-bde0-09ae8108e29a
---
www/saml2/idp/metadata.php | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 2d3360b75..359a6d8b0 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -95,10 +95,13 @@ try {
$metaBuilder = new SimpleSAML_Metadata_SAMLBuilder($idpentityid);
$metaBuilder->addMetadataIdP20($metaArray);
$metaBuilder->addOrganizationInfo($metaArray);
- $metaBuilder->addContact('technical', array(
- 'emailAddress' => $config->getString('technicalcontact_email', NULL),
- 'name' => $config->getString('technicalcontact_name', NULL),
- ));
+ $technicalContactEmail = $config->getString('technicalcontact_email', NULL);
+ if ($technicalContactEmail && $technicalContactEmail !== 'na@example.org') {
+ $metaBuilder->addContact('technical', array(
+ 'emailAddress' => $technicalContactEmail,
+ 'name' => $config->getString('technicalcontact_name', NULL),
+ ));
+ }
$metaxml = $metaBuilder->getEntityDescriptorText();
/* Sign the metadata if enabled. */
--
GitLab