diff options
Diffstat (limited to 'Bugzilla/Auth/Verify/LDAP.pm')
-rw-r--r-- | Bugzilla/Auth/Verify/LDAP.pm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Bugzilla/Auth/Verify/LDAP.pm b/Bugzilla/Auth/Verify/LDAP.pm index 343f7952c..0176abdcb 100644 --- a/Bugzilla/Auth/Verify/LDAP.pm +++ b/Bugzilla/Auth/Verify/LDAP.pm @@ -37,6 +37,7 @@ use fields qw( use Bugzilla::Constants; use Bugzilla::Error; +use Bugzilla::Util; use Net::LDAP; @@ -134,11 +135,15 @@ sub ldap { my ($self) = @_; return $self->{ldap} if $self->{ldap}; - my $server = Bugzilla->params->{"LDAPserver"}; - ThrowCodeError("ldap_server_not_defined") unless $server; + my @servers = split(/[\s,]+]/, Bugzilla->params->{"LDAPserver"}); + ThrowCodeError("ldap_server_not_defined") unless @servers; - $self->{ldap} = new Net::LDAP($server) - || ThrowCodeError("ldap_connect_failed", { server => $server }); + foreach (@servers) { + $self->{ldap} = new Net::LDAP(trim($_)); + last if $self->{ldap}; + } + ThrowCodeError("ldap_connect_failed", { server => join(", ", @servers) }) + unless $self->{ldap}; # try to start TLS if needed if (Bugzilla->params->{"LDAPstarttls"}) { |