From 47e08f4f6d785e0a1dfa1ad61223b833ac8066ea Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 2 Feb 2023 21:52:40 +0100 Subject: [PATCH] [bitnami/openldap] Release 2.6.3-debian-11-r72 (#22651) Signed-off-by: Bitnami Containers --- bitnami/openldap/2.6/debian-11/Dockerfile | 2 +- .../rootfs/opt/bitnami/scripts/libopenldap.sh | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/bitnami/openldap/2.6/debian-11/Dockerfile b/bitnami/openldap/2.6/debian-11/Dockerfile index 21fdde6b7710..e1d8f2277d5e 100644 --- a/bitnami/openldap/2.6/debian-11/Dockerfile +++ b/bitnami/openldap/2.6/debian-11/Dockerfile @@ -5,7 +5,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.6.3-debian-11-r71" \ + org.opencontainers.image.ref.name="2.6.3-debian-11-r72" \ 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.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh b/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh index bcc3f6a65e3d..3b2a650ec888 100644 --- a/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh +++ b/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh @@ -150,18 +150,6 @@ ldap_validate() { [[ "$error_code" -eq 0 ]] || exit "$error_code" } -######################## -# Check if OpenLDAP is ready to answer -# Arguments: -# None -# Returns: -# Whether slapd is ready to answer -######################### -is_ldap_ready() { - # shellcheck disable=SC2015 - is_ldap_running && debug_execute ldapsearch -Y EXTERNAL -H "ldapi:///" -b cn=config -s base || false -} - ######################## # Check if OpenLDAP is running # Globals: @@ -209,7 +197,7 @@ ldap_start_bg() { ulimit -n "$LDAP_ULIMIT_NOFILES" am_i_root && flags=("-u" "$LDAP_DAEMON_USER" "${flags[@]}") debug_execute slapd "${flags[@]}" & - if ! retry_while is_ldap_ready "$retries" "$sleep_time"; then + if ! retry_while is_ldap_running "$retries" "$sleep_time"; then error "OpenLDAP failed to start" return 1 fi