diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2017-07-01 21:34:44 +1200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2017-07-02 17:35:20 +0200 |
| commit | 8b97a0af326edc275eb6ede9b2edc7720dc808ff (patch) | |
| tree | 7c5d7b8f9f5c8d438d53ac242aaf84c63bad1ad5 /nsswitch | |
| parent | c0a7d2bacdacc7a43e04f3b450ea069c000b3d8d (diff) | |
| download | samba-8b97a0af326edc275eb6ede9b2edc7720dc808ff.tar.gz | |
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>
Diffstat (limited to 'nsswitch')
| -rwxr-xr-x | nsswitch/tests/test_idmap_rfc2307.sh | 14 |
1 files changed, 2 insertions, 12 deletions
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 |