From d0d022ef0ffca5db7096ce7519d9a507f6124ffa Mon Sep 17 00:00:00 2001
From: Mauro Torrez <mauro@qom>
Date: Wed, 25 Sep 2019 19:50:53 -0300
Subject: [PATCH] fix pidfile + no SASL messages

---
 entrypoint.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 65d2c9a..140d226 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -9,8 +9,8 @@ ulimit -n 8192
 slapd -u openldap -g openldap -h ldapi:///
 assert "FATAL: sldapd died unexpectedly!"
 
-PIDFILE=$(ldapsearch -LLL -Y EXTERNAL -H ldapi:/// -b "cn=config" -s base \
-		     "" olcPidFile | grep olcPidFile | awk "{print $2}")
+PIDFILE=$(ldapsearch -LLL -QY EXTERNAL -H ldapi:/// -b "cn=config" -s base \
+			 olcPidFile | grep olcPidFile | awk '{print $2}')
 echo "slapd running. pidfile = ${PIDFILE}"
 
 [[ -n "${LDAP_DOMAIN}" ]]
@@ -31,7 +31,7 @@ LDAP_ADMIN_PWHASH=$(slappasswd -h "{SSHA}" -s "${LDAP_ADMIN_PASSWORD}")
 # TODO: verify password before updating =======================================
 
 echo "Setting cn=admin,cn=config password"
-ldapmodify -Y EXTERNAL -H ldapi:/// <<EOF
+ldapmodify -QY EXTERNAL -H ldapi:/// <<EOF
 dn: olcDatabase={0}config,cn=config
 changetype: modify
 replace: olcRootPW
@@ -41,7 +41,7 @@ EOF
 assert "FATAL: error setting cn=admin,cn=config password"
 
 # SCHEMAS ---------------------------------------------------------------------
-eval "declare -A LOADED_SCHEMAS=( $(ldapsearch -LLL -Y EXTERNAL -H ldapi:/// \
+eval "declare -A LOADED_SCHEMAS=( $(ldapsearch -QLLL -Y EXTERNAL -H ldapi:/// \
                                      -b "cn=schema,cn=config" -s one cn \
                           | sed -n 's/^cn:.*[{].*[}]\(.*\)$/[\1]=loaded/p') )"
 echo "Loaded schemas: ${!LOADED_SCHEMAS[@]}"
@@ -58,7 +58,7 @@ do
     [[ -f /etc/ldap/schema/${schema}.ldif ]]
     assert "FATAL: schema file /etc/ldap/schema/${schema}.ldif not found!"
 
-    ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/${schema}.ldif
+    ldapadd -QY EXTERNAL -H ldapi:/// -f /etc/ldap/schema/${schema}.ldif
     assert "FATAL: error loading schema ${schema}!"
 done
 # END SCHEMAS -----------------------------------------------------------------
@@ -67,7 +67,7 @@ done
 if ${LDAP_MEMBEROF}
 then
     echo "Enabling memberof module"
-    ldapmodify -Y EXTERNAL -H ldapi:/// <<-EOF
+    ldapmodify -QY EXTERNAL -H ldapi:/// <<-EOF
 	dn: cn=module{0},cn=config
 	changetype: modify
 	add: olcModuleLoad
@@ -82,7 +82,7 @@ fi
 # END MEMBEROF MODULE ---------------------------------------------------------
 
 # DOMAIN SETUP ----------------------------------------------------------------
-if ldapsearch -LLL -H ldapi:/// -Y EXTERNAL -s one -b "cn=config" \
+if ldapsearch -LLL -H ldapi:/// -QY EXTERNAL -s one -b "cn=config" \
 	      "(&(olcSuffix=\"${LDAP_DOMAIN_DN}\")(olcDatabase=mdb))" | \
 	egrep -q '^dn: '
 then
@@ -95,7 +95,7 @@ else
 
     echo "Creating cn=config entry for ${LDAP_DOMAIN_DN}"
 
-    ldapadd -Y EXTERNAL -H ldapi:/// <<-EOF
+    ldapadd -QY EXTERNAL -H ldapi:/// <<-EOF
 	dn: olcDatabase=mdb,cn=config
 	objectClass: olcDatabaseConfig
 	objectClass: olcMdbConfig
@@ -113,7 +113,7 @@ else
 fi
 
 echo "Get cn=config entry for ${LDAP_DOMAIN_DN}"
-CN_CONFIG_DN=$(ldapsearch -LLL -H ldapi:/// -Y EXTERNAL -s one -b "cn=config" \
+CN_CONFIG_DN=$(ldapsearch -LLL -H ldapi:/// -QY EXTERNAL -s one -b "cn=config" \
 			  "(&(olcSuffix=${LDAP_DOMAIN_DN})(olcDatabase=mdb))" \
 		   | egrep '^dn: ' | sed -e 's/^dn: //g')
 
@@ -128,7 +128,7 @@ fi
 # TODO: verify admin password before updating =================================
 
 echo "Setting domain administrator password"
-ldapmodify -Y EXTERNAL -H ldapi:/// <<EOF
+ldapmodify -QY EXTERNAL -H ldapi:/// <<EOF
 dn: ${CN_CONFIG_DN}
 changetype: modify
 replace: olcRootPW
@@ -142,7 +142,7 @@ assert "FATAL: could not set administrator password!"
 if [[ ${LDAP_MEMBEROF} ]]
 then
     echo "Check if memberOf overlay is enabled"
-    MEMBEROF_DN=$(ldapsearch -LLL -H ldapi:/// -Y EXTERNAL -s one -b \
+    MEMBEROF_DN=$(ldapsearch -LLL -H ldapi:/// -QY EXTERNAL -s one -b \
 			     "${CN_CONFIG_DN}" "(olcOverlay=memberOf)" | \
 		      egrep '^dn: ' | sed -e 's/^dn: //g')
 
@@ -150,7 +150,7 @@ then
     then echo "memberOf overlay already enabled for ${CN_CONFIG_DN}"
     else
 	echo "Enabling memberOf overlay"
-	ldapadd -Y EXTERNAL -H ldapi:/// <<-EOF
+	ldapadd -QY EXTERNAL -H ldapi:/// <<-EOF
 	dn: olcOverlay=memberof,${CN_CONFIG_DN}
 	objectClass: olcOverlayConfig
 	objectClass: olcConfig