From 52016d81b9b9d1e0e5b24c6cba9429e56e9e05a8 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 13 Oct 2014 09:34:22 +0200 Subject: [PATCH] Consider `root_dn' and `base_dn' when installing config files refs #7163 --- library/Icinga/Application/WebInstaller.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/Icinga/Application/WebInstaller.php b/library/Icinga/Application/WebInstaller.php index fa1506beed..d384e4f71e 100644 --- a/library/Icinga/Application/WebInstaller.php +++ b/library/Icinga/Application/WebInstaller.php @@ -163,6 +163,7 @@ protected function writeResourcesIni($configPath) $resourceConfig[$this->pageData['setup_ldap_resource']['name']] = array( 'hostname' => $this->pageData['setup_ldap_resource']['hostname'], 'port' => $this->pageData['setup_ldap_resource']['port'], + 'root_dn' => $this->pageData['setup_ldap_resource']['root_dn'], 'bind_dn' => $this->pageData['setup_ldap_resource']['bind_dn'], 'bind_pw' => $this->pageData['setup_ldap_resource']['bind_pw'] ); @@ -196,7 +197,7 @@ protected function writeAuthenticationIni($configPath) $backendConfig[$this->pageData['setup_authentication_backend']['backend']] = array( 'backend' => $this->pageData['setup_authentication_backend']['backend'], 'resource' => $this->pageData['setup_ldap_resource']['name'], - //'root_dn' => $this->pageData['setup_ldap_resource']['root_dn'], + 'base_dn' => $this->pageData['setup_authentication_backend']['base_dn'], 'user_class' => $this->pageData['setup_authentication_backend']['user_class'], 'user_name_attribute' => $this->pageData['setup_authentication_backend']['user_name_attribute'] );