From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 20 May 2023 18:11:57 +0000 (-0400)
Subject: make ldapadd verbose
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1220608e1266cd37d12b82fe79638103cc7f7767;p=thirdparty%2Ffreeradius-server.git

make ldapadd verbose
---

diff --git a/scripts/ci/389ds-setup.sh b/scripts/ci/389ds-setup.sh
index 9964d423034..27b6f7213b6 100755
--- a/scripts/ci/389ds-setup.sh
+++ b/scripts/ci/389ds-setup.sh
@@ -3,8 +3,8 @@
 ROOTDN="cn=Directory Manager"
 
 if [ "x$USE_DOCKER" = "xtrue" ]; then
-	dsconf -D "${ROOTDN}" -w "secret123" "${PERSISTENT_SEARCH_TEST_SERVER}" backend create --suffix 'dc=example,dc=com' --be-name localhost
-	dsidm -D "${ROOTDN}" -w "secret123" "${PERSISTENT_SEARCH_TEST_SERVER}" -b 'dc=example,dc=com' initialise
+    dsconf -D "${ROOTDN}" -w "secret123" "${PERSISTENT_SEARCH_TEST_SERVER}" backend create --suffix 'dc=example,dc=com' --be-name localhost
+    dsidm -D "${ROOTDN}" -w "secret123" "${PERSISTENT_SEARCH_TEST_SERVER}" -b 'dc=example,dc=com' initialise
 
 else
 
@@ -34,9 +34,10 @@ fi
 # Load base entries
 count=0
 while [ $count -lt 10 ] ; do
-    if ldapadd -x -H "${PERSISTENT_SEARCH_TEST_SERVER}" -D "${ROOTDN}" -w "secret123" -f src/tests/salt-test-server/salt/ldap/base3.ldif ; then
+    if ldapadd -v -x -H "${PERSISTENT_SEARCH_TEST_SERVER}" -D "${ROOTDN}" -w "secret123" -f src/tests/salt-test-server/salt/ldap/base3.ldif ; then
         break 2
     else
+        echo "ldap add failed, retrying..."
         count=$((count+1))
         sleep 1
     fi
@@ -44,8 +45,8 @@ done
 
 # Exit code gets overwritten, so we check for failure using count
 if [ $count -eq 10 ]; then
-	echo "Error configuring server"
-	exit 1
+    echo "Error configuring server"
+    exit 1
 fi
 
 
diff --git a/scripts/ci/ldap-setup.sh b/scripts/ci/ldap-setup.sh
index f624154bcd4..651de6d6939 100755
--- a/scripts/ci/ldap-setup.sh
+++ b/scripts/ci/ldap-setup.sh
@@ -37,9 +37,10 @@ sleep 1
 # Add test data
 count=0
 while [ $count -lt 10 ] ; do
-    if ldapadd -x -H ldap://127.0.0.1:3890/ -D "cn=admin,cn=config" -w secret -f src/tests/salt-test-server/salt/ldap/base.ldif ; then
+    if ldapadd -v -x -H ldap://127.0.0.1:3890/ -D "cn=admin,cn=config" -w secret -f src/tests/salt-test-server/salt/ldap/base.ldif ; then
         break 2
     else
+        echo "ldap add failed, retrying..."
         count=$((count+1))
         sleep 1
     fi
@@ -47,7 +48,7 @@ done
 
 # Exit code gets overwritten, so we check for failure using count
 if [ $count -eq 10 ]; then
-	echo "Error configuring server"
-	cat /tmp/ldap/slapd.log
-	exit 1
+    echo "Error configuring server"
+    cat /tmp/ldap/slapd.log
+    exit 1
 fi
diff --git a/scripts/ci/ldap2-setup.sh b/scripts/ci/ldap2-setup.sh
index d5cce24c22c..cca4b65b069 100755
--- a/scripts/ci/ldap2-setup.sh
+++ b/scripts/ci/ldap2-setup.sh
@@ -50,9 +50,10 @@ sleep 1
 # Add test data
 count=0
 while [ $count -lt 10 ] ; do
-    if ldapadd -x -H ldap://127.0.0.1:3891/ -D "cn=admin,cn=config" -w secret -f src/tests/salt-test-server/salt/ldap/base2.ldif ; then
+    if ldapadd -x -v -H ldap://127.0.0.1:3891/ -D "cn=admin,cn=config" -w secret -f src/tests/salt-test-server/salt/ldap/base2.ldif ; then
         break 2
     else
+        echo "ldap add failed, retrying..."
         count=$((count+1))
         sleep 1
     fi
@@ -60,7 +61,7 @@ done
 
 # Exit code gets overwritten, so we check for failure using count
 if [ $count -eq 10 ]; then
-	echo "Error configuring server"
-	cat /tmp/ldap/slapd.log
-	exit 1
+    echo "Error configuring server"
+    cat /tmp/ldap/slapd.log
+    exit 1
 fi