- Made a change to LDAP auth that adds an OR to that query so that it also searches for a row with fieldData REGEXP '^uid=(value-from-ldap-directory-server),'.
This commit is contained in:
parent
b26e0bae9f
commit
fa97bbc58c
2 changed files with 6 additions and 2 deletions
|
|
@ -1,4 +1,5 @@
|
|||
7.7.10
|
||||
- Made a change to LDAP auth that adds an OR to that query so that it also searches for a row with fieldData REGEXP '^uid=(value-from-ldap-directory-server),'. (Wes Morgan)
|
||||
|
||||
7.7.9
|
||||
- fixed #10266: Public Profile overrides Able to be friend
|
||||
|
|
|
|||
|
|
@ -804,11 +804,14 @@ sub getLDAPUsers {
|
|||
foreach my $person (@{$people}) {
|
||||
$person =~ s/\s*,\s*/,/g;
|
||||
$person = lc($person);
|
||||
my ($userId) = $self->session->db->quickArray("select userId from authentication where authMethod='LDAP' and fieldName='connectDN' and lower(fieldData)=?",[$person]);
|
||||
my $personRegExp = "^uid=$person,";
|
||||
|
||||
my ($userId) = $self->session->db->quickArray("select userId from authentication where authMethod='LDAP' and fieldName='connectDN' and lower(fieldData) = ? OR lower(fieldData) REGEXP ?",[$person,$personRegExp]);
|
||||
|
||||
if($userId) {
|
||||
push(@ldapUsers,$userId);
|
||||
} else {
|
||||
$self->session->errorHandler->warn("Could not find matching userId for dn $person in WebGUI for group $gid");
|
||||
$self->session->errorHandler->warn("Could not find matching userId for dn/uid $person in WebGUI for group $gid");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue