From 0a6977794b0c262be39225ef1c2f6b2fecc805a8 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 29 Sep 2009 11:12:45 +0000
Subject: [PATCH] Depreceate saml2:SP.

Fixes issue 208

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1801 44740490-163a-0410-bde0-09ae8108e29a
---
 config-templates/authsources.php     | 5 -----
 docs/simplesamlphp-googleapps.txt    | 4 ++--
 docs/simplesamlphp-idp.txt           | 4 ++--
 modules/saml2/lib/Auth/Source/SP.php | 3 +++
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/config-templates/authsources.php b/config-templates/authsources.php
index 480e2446a..24719b678 100644
--- a/config-templates/authsources.php
+++ b/config-templates/authsources.php
@@ -79,11 +79,6 @@ $config = array(
 	'papi' => array(
 		'authpapi:PAPI',
 	),
-	
-	'saml2' => array(
-		'saml2:SP',
-	),
-	
 
 	/*
 	 * An authentication source which can authenticate against both SAML 2.0
diff --git a/docs/simplesamlphp-googleapps.txt b/docs/simplesamlphp-googleapps.txt
index 7331ebf8b..f1f77ef1b 100644
--- a/docs/simplesamlphp-googleapps.txt
+++ b/docs/simplesamlphp-googleapps.txt
@@ -101,8 +101,8 @@ The next step is to configure the way users authenticate on your IdP. Various mo
 `openid:OpenIDConsumer`
 : Authenticate against an OpenID provider.
 
-`saml2:SP`
-: Authenticate against a SAML 2.0 IdP. Can be used for bridging.
+`saml:SP`
+: Authenticate against a SAML 2.0. Can be used for bridging.
 
 `authYubiKey:YubiKey`
 : Authenticate with [an YubiKey](http://www.yubico.com/products/yubikey/).
diff --git a/docs/simplesamlphp-idp.txt b/docs/simplesamlphp-idp.txt
index f82266222..6b1557d74 100644
--- a/docs/simplesamlphp-idp.txt
+++ b/docs/simplesamlphp-idp.txt
@@ -51,8 +51,8 @@ The next step is to configure the way users authenticate on your IdP. Various mo
 `openid:OpenIDConsumer`
 : Authenticate against an OpenID provider.
 
-`saml2:SP`
-: Authenticate against a SAML 2.0 IdP. Can be used for bridging.
+`saml:SP`
+: Authenticate against a SAML IdP. Can be used for bridging.
 
 `authYubiKey:YubiKey`
 : Authenticate with [an YubiKey](http://www.yubico.com/products/yubikey/).
diff --git a/modules/saml2/lib/Auth/Source/SP.php b/modules/saml2/lib/Auth/Source/SP.php
index 530b1bd4f..c5320df1d 100644
--- a/modules/saml2/lib/Auth/Source/SP.php
+++ b/modules/saml2/lib/Auth/Source/SP.php
@@ -3,6 +3,9 @@
 /**
  * SAML 2.0 SP authentication client.
  *
+ * Note: This authentication source is depreceated. You should
+ * use saml:sp instead.
+ *
  * Example:
  * 'example-openidp' => array(
  *   'saml2:SP',
-- 
GitLab