From a65faa161159541e50769469852667549ea1d72e Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bertrand.gouny@osixia.net>
Date: Tue, 13 Oct 2026 22:04:51 +0200
Subject: [PATCH] fix(bootstrap): remove temporary files on exit

The RETURN traps overwrote each other and left the generated config
LDIF in /tmp. Use a single temporary directory removed by an EXIT trap.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 services/openldap-bootstrap/startup.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/services/openldap-bootstrap/startup.sh b/services/openldap-bootstrap/startup.sh
index 355b3a0..411e60f 100755
--- a/services/openldap-bootstrap/startup.sh
+++ b/services/openldap-bootstrap/startup.sh
@@ -16,11 +16,13 @@ fi
 
 container log info "Bootstrapping OpenLDAP ..."
 
+BOOTSTRAP_TMP_DIR="$(mktemp -d)"
+trap 'rm -rf "${BOOTSTRAP_TMP_DIR}"' EXIT
+
 bootstrap_env() {
     local tmp_file
 
-    tmp_file="$(mktemp)"
-    trap 'rm -f "${tmp_file}"' RETURN
+    tmp_file="$(mktemp -p "${BOOTSTRAP_TMP_DIR}")"
 
     for script in "${OPENLDAP_BOOTSTRAP_SCRIPTS_DIR}"/*.sh; do
         "${script}" "env" "${tmp_file}"
@@ -38,8 +40,7 @@ bootstrap_ldif() {
     local tmp_dir
     local tmp
 
-    tmp_dir=$(mktemp -d)
-    trap 'rm -rf "${tmp_dir:-}"; rm -f "${tmp:-}"' RETURN
+    tmp_dir=$(mktemp -d -p "${BOOTSTRAP_TMP_DIR}")
 
     for script in "${OPENLDAP_BOOTSTRAP_SCRIPTS_DIR}"/*.sh; do
         "${script}" "ldif" "${source_dir}" "${tmp_dir}"
@@ -66,7 +67,7 @@ bootstrap_ldif() {
             echo >> "${tmp_file}" # add empty line
         else
             # remove trailing empty lines
-            tmp=$(mktemp)
+            tmp=$(mktemp -p "${BOOTSTRAP_TMP_DIR}")
             awk '
             { lines[NR] = $0 }
             $0 ~ /[^[:space:]]/ {
@@ -93,8 +94,7 @@ bootstrap_database() {
     local db_number="$2"
     local tmp_file
 
-    tmp_file="$(mktemp)"
-    trap 'rm -f "${tmp_file}"' RETURN
+    tmp_file="$(mktemp -p "${BOOTSTRAP_TMP_DIR}")"
 
     bootstrap_ldif "${source_dir}" "${tmp_file}"