From: Olivier Lamy <olamy@apache.org>
Date: Mon, 11 Feb 2013 17:13:39 +0000 (+0000)
Subject: verify ldap groups dn too
X-Git-Tag: archiva-1.4-M4~208
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=317934b70945bf77e8bc50deb93dbdda6e554be8;p=archiva.git

verify ldap groups dn too

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1444882 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
index 1752aad0d..e6694dc90 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
@@ -151,7 +151,6 @@ public class DefaultRedbackRuntimeConfigurationService
             usersCache.setMaxElementsOnDisk(
                 redbackRuntimeConfiguration.getUsersCacheConfiguration().getMaxElementsOnDisk() );
 
-
             ldapUserMapper.initialize();
 
             return Boolean.TRUE;
@@ -237,6 +236,20 @@ public class DefaultRedbackRuntimeConfigurationService
                                                  toProperties( ldapConfiguration.getExtraProperties() ) );
 
             ldapConnection = ldapConnectionFactory.getConnection( ldapConnectionConfiguration );
+
+            ldapConnection.close();
+
+            // verify groups dn value too
+
+            ldapConnectionConfiguration =
+                new LdapConnectionConfiguration( ldapConfiguration.getHostName(), ldapConfiguration.getPort(),
+                                                 ldapConfiguration.getBaseGroupsDn(),
+                                                 ldapConfiguration.getContextFactory(), ldapConfiguration.getBindDn(),
+                                                 ldapConfiguration.getPassword(),
+                                                 ldapConfiguration.getAuthenticationMethod(),
+                                                 toProperties( ldapConfiguration.getExtraProperties() ) );
+
+            ldapConnection = ldapConnectionFactory.getConnection( ldapConnectionConfiguration );
         }
         catch ( InvalidNameException e )
         {