From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 1 Jul 2017 09:34:44 +0000 (+1200)
Subject: selftest: Use tree_delete control in idmap_rfc2307 test
X-Git-Tag: samba-4.7.0rc1~58
X-Git-Url: http://git.samba.org/samba.git/?p=gd%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=8b97a0af326edc275eb6ede9b2edc7720dc808ff

selftest: Use tree_delete control in idmap_rfc2307 test

This control removes an entire subtree, which was the intention of the previouse code
but much more effectively.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/nsswitch/tests/test_idmap_rfc2307.sh b/nsswitch/tests/test_idmap_rfc2307.sh
index c62da5d3061..2e1727487f5 100755
--- a/nsswitch/tests/test_idmap_rfc2307.sh
+++ b/nsswitch/tests/test_idmap_rfc2307.sh
@@ -47,12 +47,7 @@ failed=0
 . `dirname $0`/../../testprogs/blackbox/subunit.sh
 
 # Delete LDAP records
-$VALGRIND $ldbsearch -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD \
-	  -s one -b "$LDAPPREFIX" | grep '^dn:' | cut -d ' ' -f 2- |
-    xargs -d '\n' -n 1 -IDEL_DN \
-	  $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD \
-	  "DEL_DN"
-$VALGRIND $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD "$LDAPPREFIX"
+$VALGRIND $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD "$LDAPPREFIX" --controls="tree_delete:1"
 
 # Add id mapping information to LDAP
 
@@ -215,11 +210,6 @@ while [ ${i} -lt ${NUMGROUPS} ] ; do
 done
 
 # Delete LDAP records
-$VALGRIND $ldbsearch -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD \
-	  -s one -b "$LDAPPREFIX" | grep '^dn:' | cut -d ' ' -f 2- |
-    xargs -d '\n' -n 1 -IDEL_DN \
-	  $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD \
-	  "DEL_DN"
-$VALGRIND $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD "$LDAPPREFIX"
+$VALGRIND $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD "$LDAPPREFIX" --controls="tree_delete:1"
 
 exit $failed