tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-30 01:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ldap connection port setting

Browse Source 
refs #4941
This commit is contained in:
Marius Hein 2013-10-22 14:25:56 +02:00
parent 2561177765
commit 439168ecfb
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Authentication/Backend/LdapUserBackend.php
View File

@ -70,7 +70,7 @@ class LdapUserBackend implements UserBackend
*/ */
public function __construct(Zend_Config $config) public function __construct(Zend_Config $config)
{ {
$this->connection = new Ldap\Connection($config); $this->connection = new Connection($config);
$this->config = $config; $this->config = $config;
$this->name = $config->name; $this->name = $config->name;
} }

35
library/Icinga/Protocol/Ldap/Connection.php
View File

@ -1,13 +1,37 @@
<?php <?php
// {{{ICINGA_LICENSE_HEADER}}}
/** /**
* LDAP connection handler * This file is part of Icinga 2 Web.
*
* Icinga 2 Web - Head for multiple monitoring backends.
* Copyright (C) 2013 Icinga Development Team
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* @copyright 2013 Icinga Development Team <info@icinga.org>
* @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
* @author Icinga Development Team <info@icinga.org>
*/ */
// {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Protocol\Ldap; namespace Icinga\Protocol\Ldap;
use Icinga\Application\Platform; use Icinga\Application\Platform;
use \Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Application\Logger as Log; use Icinga\Application\Logger as Log;
use \Zend_Config;
/** /**
* Backend class managing all the LDAP stuff for you. * Backend class managing all the LDAP stuff for you.
@ -89,14 +113,15 @@ class Connection
* *
* TODO: Allow to pass port and SSL options * TODO: Allow to pass port and SSL options
* *
* @param array LDAP connection credentials * @param Zend_Config $config
*/ */
public function __construct($config) public function __construct(Zend_Config $config)
{ {
$this->hostname = $config->hostname; $this->hostname = $config->hostname;
$this->bind_dn = $config->bind_dn; $this->bind_dn = $config->bind_dn;
$this->bind_pw = $config->bind_pw; $this->bind_pw = $config->bind_pw;
$this->root_dn = $config->root_dn; $this->root_dn = $config->root_dn;
$this->port = $config->get('port', $this->port);
} }