From 5923b7434eff59bf161c2cff8b685d85663dbb8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez?= <jaime.perez@uninett.no>
Date: Tue, 22 Nov 2016 10:35:25 +0100
Subject: [PATCH] bugfix: When generating a NameID from a multivalued
 attribute, a warning was logged but the NameID was still generated.

---
 modules/saml/lib/Auth/Process/AttributeNameID.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/saml/lib/Auth/Process/AttributeNameID.php b/modules/saml/lib/Auth/Process/AttributeNameID.php
index e9ada90a7..356cab5b2 100644
--- a/modules/saml/lib/Auth/Process/AttributeNameID.php
+++ b/modules/saml/lib/Auth/Process/AttributeNameID.php
@@ -63,6 +63,7 @@ class sspmod_saml_Auth_Process_AttributeNameID extends sspmod_saml_BaseNameIDGen
                 'More than one value in attribute '.var_export($this->attribute, true).
                 ' on user - not generating attribute NameID.'
             );
+            return null;
         }
         $value = array_values($state['Attributes'][$this->attribute]); // just in case the first index is no longer 0
         $value = $value[0];
-- 
GitLab