Allow support for subdomains
Added 2 more test cases to enforce proper behaviour
diff --git a/image/service/slapd/startup.sh b/image/service/slapd/startup.sh
index affc2e8..c6d9d9b 100755
--- a/image/service/slapd/startup.sh
+++ b/image/service/slapd/startup.sh
@@ -53,7 +53,8 @@
fi
# Check that LDAP_BASE_DN and LDAP_DOMAIN are in sync
domain_from_base_dn=$(echo $LDAP_BASE_DN | tr ',' '\n' | sed -e 's/^.*=//' | tr '\n' '.' | sed -e 's/\.$//')
- if [ "$domain_from_base_dn" != "$LDAP_DOMAIN" ]; then
+ echo "$domain_from_base_dn" | egrep -q ".*$LDAP_DOMAIN\$"
+ if [ $? -ne 0 ]; then
log-helper error "Error: domain $domain_from_base_dn derived from LDAP_BASE_DN $LDAP_BASE_DN does not match LDAP_DOMAIN $LDAP_DOMAIN"
exit 1
fi
diff --git a/test/test.bats b/test/test.bats
index 6826544..66ed5d1 100644
--- a/test/test.bats
+++ b/test/test.bats
@@ -32,6 +32,32 @@
}
+@test "ldap domain with ldap base dn subdomain" {
+
+ run_image -h ldap.example.fr -e LDAP_TLS=false -e LDAP_DOMAIN=example.fr -e LDAP_BASE_DN="ou=myou,o=example,c=fr"
+
+ sleep 2
+
+ CSTATUS=$(check_container)
+ clear_container
+
+ [ "$CSTATUS" == "running 0" ]
+
+}
+
+@test "ldap domain with ldap base dn subdomain included" {
+
+ run_image -h ldap.example.com -e LDAP_TLS=false -e LDAP_DOMAIN=example.com -e LDAP_BASE_DN="ou=myou,o=example,dc=com,c=fr"
+
+ sleep 2
+
+ CSTATUS=$(check_container)
+ clear_container
+
+ [ "$CSTATUS" != "running 0" ]
+
+}
+
@test "ldapsearch database from created volumes" {
rm -rf VOLUMES && mkdir -p VOLUMES/config VOLUMES/database
