From 123d889d14b861d256bd8f8630d97f7fae5ccd6e Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Fri, 6 Jun 2008 12:13:42 +0000
Subject: [PATCH] Change "idpdisco.url.saml2" to "idpdisco.url.saml20", to be
consistent with the rest of simpleSAMLphp. Also include a forgotten change
from the last patch.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@616 44740490-163a-0410-bde0-09ae8108e29a
---
config-templates/config.php | 2 +-
docs/source/simplesamlphp-sp.xml | 2 +-
www/saml2/sp/initSSO.php | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/config-templates/config.php b/config-templates/config.php
index 386d58f61..3d1609c8b 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -181,7 +181,7 @@ $config = array (
* By default simpleSAMLphp will use its builtin IdP discovery service.
*/
'idpdisco.url.shib13' => NULL,
- 'idpdisco.url.saml2' => NULL,
+ 'idpdisco.url.saml20' => NULL,
/*
* IdP Discovery service look configuration.
diff --git a/docs/source/simplesamlphp-sp.xml b/docs/source/simplesamlphp-sp.xml
index bfb6d04ca..8f8178b9a 100644
--- a/docs/source/simplesamlphp-sp.xml
+++ b/docs/source/simplesamlphp-sp.xml
@@ -293,7 +293,7 @@
<glossdef>
<para>Set which IdP discovery service this SP should use. If
this is unset, the IdP discovery service specified in the global
- option <literal>idpdisco.url.saml2</literal> in
+ option <literal>idpdisco.url.saml20</literal> in
<filename>config/config.php</filename> will be used. If that one
is also unset, the builtin default discovery service will be
used.</para>
diff --git a/www/saml2/sp/initSSO.php b/www/saml2/sp/initSSO.php
index 1e0a77f5a..61c3d9f19 100644
--- a/www/saml2/sp/initSSO.php
+++ b/www/saml2/sp/initSSO.php
@@ -31,7 +31,7 @@ try {
if($idpentityid === NULL) {
/* We are going to need the SP metadata to determine which IdP discovery service we should use. */
- $spmetadata = $metadata->getMetaData($spentityid);
+ $spmetadata = $metadata->getMetaDataCurrent('saml20-sp-hosted');
}
} catch (Exception $exception) {
@@ -51,8 +51,8 @@ if ($idpentityid == null) {
*/
if(array_key_exists('idpdisco.url', $spmetadata)) {
$discourl = $spmetadata['idpdisco.url'];
- } elseif($config->getValue('idpdisco.url.saml2', NULL) !== NULL) {
- $discourl = $config->getValue('idpdisco.url.saml2', NULL);
+ } elseif($config->getValue('idpdisco.url.saml20', NULL) !== NULL) {
+ $discourl = $config->getValue('idpdisco.url.saml20', NULL);
} else {
$discourl = '/' . $config->getBaseURL() . 'saml2/sp/idpdisco.php';
}
--
GitLab