From 1ffe8007e662b1779c1c828ebe665f5a02118f35 Mon Sep 17 00:00:00 2001
From: madness-inc <matthias.mueller@appng.org>
Date: Wed, 13 Oct 2021 09:46:02 +0200
Subject: [PATCH] MGR-125

---
 pom.xml                                                |  2 +-
 .../appng/application/manager/business/LdapUsers.java  |  1 +
 src/test/resources/xml/LdapUsersTest-testSettings.xml  | 10 +++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1b50f3f..af5bf1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.appng</groupId>
 		<artifactId>appng-application-parent</artifactId>
-		<version>1.23.0-SNAPSHOT</version>
+		<version>1.23.0</version>
 	</parent>
 
 	<scm>
diff --git a/src/main/java/org/appng/application/manager/business/LdapUsers.java b/src/main/java/org/appng/application/manager/business/LdapUsers.java
index 35b889b..50fbe87 100644
--- a/src/main/java/org/appng/application/manager/business/LdapUsers.java
+++ b/src/main/java/org/appng/application/manager/business/LdapUsers.java
@@ -67,6 +67,7 @@ public DataContainer getData(Site site, Application application, Environment env
 			ldapProps.add(ldapHost);
 			ldapProps.add(getProperty(siteProps, LdapService.LDAP_DOMAIN));
 			ldapProps.add(getProperty(siteProps, LdapService.LDAP_GROUP_BASE_DN));
+			ldapProps.add(getProperty(siteProps, LdapService.LDAP_USER_BASE_DN));
 			SimpleProperty ldapUser = getProperty(siteProps, LdapService.LDAP_USER);
 			ldapProps.add(ldapUser);
 			ldapProps.add(getProperty(siteProps, LdapService.LDAP_ID_ATTRIBUTE));
diff --git a/src/test/resources/xml/LdapUsersTest-testSettings.xml b/src/test/resources/xml/LdapUsersTest-testSettings.xml
index 48bb78d..abeeb54 100644
--- a/src/test/resources/xml/LdapUsersTest-testSettings.xml
+++ b/src/test/resources/xml/LdapUsersTest-testSettings.xml
@@ -12,7 +12,7 @@
 		</meta-data>
 	</config>
 	<data paginate="false">
-		<resultset chunk="0" chunkname="ldapSettings" chunksize="8" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="0" hits="8">
+		<resultset chunk="0" chunkname="ldapSettings" chunksize="9" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="0" hits="9">
 			<result>
 				<field name="name" type="text">
 					<value>ldapDisabled</value>
@@ -45,6 +45,14 @@
 					<value></value>
 				</field>
 			</result>
+			<result>
+				<field name="name" type="text">
+					<value>ldapUserBaseDn</value>
+				</field>
+				<field name="value" type="text">
+					<value></value>
+				</field>
+			</result>
 			<result>
 				<field name="name" type="text">
 					<value>ldapUser</value>