From e3891a4b7683d47869b42ca90885e8322f4453eb Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 2 Sep 2022 17:36:40 +0200
Subject: [PATCH] [bitnami/openldap] Release 2.5.13-debian-11-r22 (#4991)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/openldap/2.5/debian-11/Dockerfile             |  2 +-
 .../rootfs/opt/bitnami/scripts/libopenldap.sh         | 11 +++++++++--
 bitnami/openldap/README.md                            |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bitnami/openldap/2.5/debian-11/Dockerfile b/bitnami/openldap/2.5/debian-11/Dockerfile
index 9491b9ac3bcb..6bb86ea1c1d3 100644
--- a/bitnami/openldap/2.5/debian-11/Dockerfile
+++ b/bitnami/openldap/2.5/debian-11/Dockerfile
@@ -6,7 +6,7 @@ ENV HOME="/" \
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="2.5.13-debian-11-r21" \
+      org.opencontainers.image.ref.name="2.5.13-debian-11-r22" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/openldap" \
       org.opencontainers.image.title="openldap" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh b/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
index 13bfb2546917..9dbb22d7dd6c 100644
--- a/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
+++ b/bitnami/openldap/2.5/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh
@@ -196,12 +196,19 @@ is_ldap_not_running() {
 #   None
 #########################
 ldap_start_bg() {
-    local -a flags=("-h" "ldap://:${LDAP_PORT_NUMBER}/ ldapi:/// " "-F" "${LDAP_CONF_DIR}/slapd.d")
+    local -r retries="${1:-12}"
+    local -r sleep_time="${2:-1}"
+    local -a flags=("-h" "ldap://:${LDAP_PORT_NUMBER}/ ldapi:/// " "-F" "${LDAP_CONF_DIR}/slapd.d" "-d" "$LDAP_LOGLEVEL")
+
     if is_ldap_not_running; then
         info "Starting OpenLDAP server in background"
         ulimit -n "$LDAP_ULIMIT_NOFILES"
         am_i_root && flags=("-u" "$LDAP_DAEMON_USER" "${flags[@]}")
-        debug_execute slapd "${flags[@]}"
+        debug_execute slapd "${flags[@]}" &
+        if ! retry_while is_ldap_running "$retries" "$sleep_time"; then
+            error "OpenLDAP failed to start"
+            return 1
+        fi
     fi
 }
 
diff --git a/bitnami/openldap/README.md b/bitnami/openldap/README.md
index c3f1ce48d7a1..79e5858dcca0 100644
--- a/bitnami/openldap/README.md
+++ b/bitnami/openldap/README.md
@@ -40,7 +40,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`2.6`, `2.6-debian-11`, `2.6.3`, `2.6.3-debian-11-r17`, `latest` (2.6/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/openldap/2.6/debian-11/Dockerfile)
-* [`2.5`, `2.5-debian-11`, `2.5.13`, `2.5.13-debian-11-r21` (2.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/openldap/2.5/debian-11/Dockerfile)
+* [`2.5`, `2.5-debian-11`, `2.5.13`, `2.5.13-debian-11-r22` (2.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/openldap/2.5/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).