Permalink
Browse files

MDL-24666 sync_users.php can throw db exception on sites upgraded fro…

…m 1.x

From 2.0 on we lowercase all the settings related to LDAP attributes
to cope with differences in LDAP servers when returning attribute
names as array indices (some lowercase them, some leave them as
specified in the query, some normalize them, etc.).

But we only lowercase them when saving the settings page. So on sites
that have been migrated from 1.x, it may happen that we still have
mixed-case attribute names. And this is fatal for the user_attribute
setting, as we might not detect it in the returned array from LDAP and
it will be empty (and the db layer throws and exception).

So we just make sure the attribute name is lowercased (and trimmed,
in case it's got some white space around it).

Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>
  • Loading branch information...
1 parent d64baec commit 7679e8d25609bf7264efd48249a31ec8fa9a1998 @iarenaza iarenaza committed Jul 4, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 auth/ldap/auth.php
View
@@ -1385,7 +1385,7 @@ function ldap_attributes () {
}
}
}
- $moodleattributes['username'] = $this->config->user_attribute;
+ $moodleattributes['username'] = moodle_strtolower(trim($this->config->user_attribute));
return $moodleattributes;
}

0 comments on commit 7679e8d

Please sign in to comment.