L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip_25_mdl-32724' of https://github.com/iarenaza/moodle into MOODLE_25_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2014-02-10 15:26:18 +13:00
parent 36803e0f78 5448b6b94f
commit f7dea8ae75
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
auth/ldap/auth.php
+8 -3
View File
@@ -1143,6 +1143,7 @@ class auth_plugin_ldap extends auth_plugin_base {
return false;
}
$success = true;
$user_info_result = ldap_read($ldapconnection, $user_dn, '(objectClass=*)', $search_attribs);
if ($user_info_result) {
$user_entry = ldap_get_entries_moodle($ldapconnection, $user_info_result);
@@ -1189,8 +1190,10 @@ class auth_plugin_ldap extends auth_plugin_base {
if ($nuvalue !== $ldapvalue) {
// This might fail due to schema validation
if (@ldap_modify($ldapconnection, $user_dn, array($ldapkey => $nuvalue))) {
$changed = true;
continue;
} else {
$success = false;
error_log($this->errorlogtag.get_string ('updateremfail', 'auth_ldap',
array('errno'=>ldap_errno($ldapconnection),
'errstring'=>ldap_err2str(ldap_errno($ldapconnection)),
@@ -1209,6 +1212,7 @@ class auth_plugin_ldap extends auth_plugin_base {
$changed = true;
continue;
} else {
$success = false;
error_log($this->errorlogtag.get_string ('updateremfail', 'auth_ldap',
array('errno'=>ldap_errno($ldapconnection),
'errstring'=>ldap_err2str(ldap_errno($ldapconnection)),
@@ -1226,6 +1230,7 @@ class auth_plugin_ldap extends auth_plugin_base {
$changed = true;
continue;
} else {
$success = false;
error_log($this->errorlogtag.get_string ('updateremfail', 'auth_ldap',
array('errno'=>ldap_errno($ldapconnection),
'errstring'=>ldap_err2str(ldap_errno($ldapconnection)),
@@ -1239,6 +1244,7 @@ class auth_plugin_ldap extends auth_plugin_base {
}
if ($ambiguous and !$changed) {
$success = false;
error_log($this->errorlogtag.get_string ('updateremfailamb', 'auth_ldap',
array('key'=>$key,
'ouvalue'=>$ouvalue,
@@ -1248,12 +1254,11 @@ class auth_plugin_ldap extends auth_plugin_base {
}
} else {
error_log($this->errorlogtag.get_string ('usernotfound', 'auth_ldap'));
$this->ldap_close();
return false;
$success = false;
}
$this->ldap_close();
return true;
return $success;
}