From 8b97a0af326edc275eb6ede9b2edc7720dc808ff Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 1 Jul 2017 21:34:44 +1200 Subject: 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 Reviewed-by: Stefan Metzmacher --- nsswitch/tests/test_idmap_rfc2307.sh | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'nsswitch') 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 -- cgit v1.2.1