From c46f65e23f2bc95236777bc20b05a32cad33e6ee Mon Sep 17 00:00:00 2001
From: Michael Magill <magill.michael@idsi.com>
Date: Fri, 25 Apr 2014 20:36:48 +0000
Subject: [PATCH 1/2] changed default security.ldap.subDn parameter to include
 "ou="

---
 wise-webapp/src/main/webapp/WEB-INF/app.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties
index 38e6d08d..ce732333 100755
--- a/wise-webapp/src/main/webapp/WEB-INF/app.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties
@@ -128,9 +128,9 @@ security.ldap.server.password=password
 security.ldap.basedn=dc=wisemapping,dc=com
 
 
-# This will be concatenated as part of the DN. In this case, I will be ou="people".
+# This will be concatenated as part of the DN. In this case, I will be "ou=people".
 # In case this need to be changed, modify the wisemapping-security-ldap.xml.
-security.ldap.subDn=people
+security.ldap.subDn=ou=people
 
 # Attribute used as authentication login (Eg: in this case, the user email will be used)
 security.ldap.auth.attribute=mail

From 1bfbd8ea60bd04d35ebacfc57fd83187226a5ff5 Mon Sep 17 00:00:00 2001
From: Michael Magill <magill.michael@idsi.com>
Date: Fri, 25 Apr 2014 20:41:50 +0000
Subject: [PATCH 2/2] removed "ou=" from LDAP user search since it is now
 integrated with security.ldap.subDn

---
 .../src/main/webapp/WEB-INF/wisemapping-security-ldap.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml
index 0085bf71..0307c5e7 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml
@@ -45,7 +45,7 @@
 
     <bean id="ldapUserSearch"
           class="org.springframework.security.ldap.search.FilterBasedLdapUserSearch">
-        <constructor-arg index="0" value="ou=${security.ldap.subDn}"/>
+        <constructor-arg index="0" value="${security.ldap.subDn}"/>
         <constructor-arg index="1" value="(${security.ldap.auth.attribute}={0})"/>
         <constructor-arg index="2" ref="contextSource"/>
         <property name="searchSubtree" value="true"/>