From 6a395231cbea5c6d5a66403a6820173acce0e6c5 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Mon, 22 Feb 2010 13:02:01 +0000
Subject: [PATCH] Add SASL to LDAPMulti.
Patch by Emmanuel Dreyfus <manu@netbsd.org>.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2188 44740490-163a-0410-bde0-09ae8108e29a
---
modules/ldap/lib/Auth/Source/LDAPMulti.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/ldap/lib/Auth/Source/LDAPMulti.php b/modules/ldap/lib/Auth/Source/LDAPMulti.php
index 45356946b..7e6f3ad99 100644
--- a/modules/ldap/lib/Auth/Source/LDAPMulti.php
+++ b/modules/ldap/lib/Auth/Source/LDAPMulti.php
@@ -89,7 +89,7 @@ class sspmod_ldap_Auth_Source_LDAPMulti extends sspmod_core_Auth_UserPassOrgBase
* @param string $org The organization the user chose.
* @return array Associative array with the users attributes.
*/
- protected function login($username, $password, $org) {
+ protected function login($username, $password, $org, array $sasl_args = NULL) {
assert('is_string($username)');
assert('is_string($password)');
assert('is_string($org)');
@@ -106,7 +106,7 @@ class sspmod_ldap_Auth_Source_LDAPMulti extends sspmod_core_Auth_UserPassOrgBase
$username = $username . '@' . $org;
}
- return $this->ldapOrgs[$org]->login($username, $password);
+ return $this->ldapOrgs[$org]->login($username, $password, $sasl_args);
}
--
GitLab