From 5f23ebc31c8f000ac0d991a12f0e49fe0a56dbcc Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 3 Jun 2012 08:50:26 +0000 Subject: [PATCH] Merged r9755 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9756 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- extra/svn/Redmine.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm index 3125d510e..fbaf177a3 100644 --- a/extra/svn/Redmine.pm +++ b/extra/svn/Redmine.pm @@ -366,12 +366,19 @@ sub is_member { ); $sthldap->execute($auth_source_id); while (my @rowldap = $sthldap->fetchrow_array) { + my $bind_as = $rowldap[3] ? $rowldap[3] : ""; + my $bind_pw = $rowldap[4] ? $rowldap[4] : ""; + if ($bind_as =~ m/\$login/) { + # replace $login with $redmine_user and use $redmine_pass + $bind_as =~ s/\$login/$redmine_user/g; + $bind_pw = $redmine_pass + } my $ldap = Authen::Simple::LDAP->new( host => ($rowldap[2] eq "1" || $rowldap[2] eq "t") ? "ldaps://$rowldap[0]:$rowldap[1]" : $rowldap[0], port => $rowldap[1], basedn => $rowldap[5], - binddn => $rowldap[3] ? $rowldap[3] : "", - bindpw => $rowldap[4] ? $rowldap[4] : "", + binddn => $bind_as, + bindpw => $bind_pw, filter => "(".$rowldap[6]."=%s)" ); my $method = $r->method; -- 2.39.5