From 37da655dd3b688b56841b6d4bd08ed0d3ad7de81 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Mon, 3 Dec 2012 12:27:53 +0000
Subject: [PATCH] Fix inconsistency in email NameID format.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3208 44740490-163a-0410-bde0-09ae8108e29a
---
docs/simplesamlphp-googleapps.txt | 2 +-
docs/simplesamlphp-reference-sp-remote.txt | 2 +-
metadata-templates/saml20-sp-remote.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/simplesamlphp-googleapps.txt b/docs/simplesamlphp-googleapps.txt
index 9b6e4f170..03f3cd0ca 100644
--- a/docs/simplesamlphp-googleapps.txt
+++ b/docs/simplesamlphp-googleapps.txt
@@ -163,7 +163,7 @@ In the (`saml20-sp-remote.php`) file we will configure an entry for Google Apps
*/
'google.com' => array(
'AssertionConsumerService' => 'https://www.google.com/a/g.feide.no/acs',
- 'NameIDFormat' => 'urn:oasis:names:tc:SAML:2.0:nameid-format:email',
+ 'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
'simplesaml.nameidattribute' => 'uid',
'simplesaml.attributes' => false
);
diff --git a/docs/simplesamlphp-reference-sp-remote.txt b/docs/simplesamlphp-reference-sp-remote.txt
index 73eca20c8..052cf3c1f 100644
--- a/docs/simplesamlphp-reference-sp-remote.txt
+++ b/docs/simplesamlphp-reference-sp-remote.txt
@@ -173,7 +173,7 @@ The following SAML 2.0 options are available:
: 1. `urn:oasis:names:tc:SAML:2.0:nameid-format:transient`
2. `urn:oasis:names:tc:SAML:2.0:nameid-format:persistent`
- 3. `urn:oasis:names:tc:SAML:2.0:nameid-format:email`
+ 3. `urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress`
: The `transient` format will generate a new unique ID every time
the SP logs in.
diff --git a/metadata-templates/saml20-sp-remote.php b/metadata-templates/saml20-sp-remote.php
index 9d80f8f4b..f2cff56a7 100644
--- a/metadata-templates/saml20-sp-remote.php
+++ b/metadata-templates/saml20-sp-remote.php
@@ -21,7 +21,7 @@ $metadata['https://saml2sp.example.org'] = array(
*/
$metadata['google.com'] = array(
'AssertionConsumerService' => 'https://www.google.com/a/g.feide.no/acs',
- 'NameIDFormat' => 'urn:oasis:names:tc:SAML:2.0:nameid-format:email',
+ 'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
'simplesaml.nameidattribute' => 'uid',
'simplesaml.attributes' => FALSE,
);
--
GitLab