diff options
| author | Volker Lendecke <vl@samba.org> | 2017-04-04 15:12:02 +0200 |
|---|---|---|
| committer | Christof Schmitt <cs@samba.org> | 2017-05-08 21:08:23 +0200 |
| commit | 1f5097e3fbf9931c830880637622bb0b05863466 (patch) | |
| tree | d774eaac90bdbe858e23275c931e92c5fcf100a5 /nsswitch | |
| parent | f34ff621edbfd8b7c99cdadec166a80ae9c5646c (diff) | |
| download | samba-1f5097e3fbf9931c830880637622bb0b05863466.tar.gz | |
test_idmap_rfc2307: Do a recursive delete in ou=idmap
We'll create more posix objects soon
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12757
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
Diffstat (limited to 'nsswitch')
| -rwxr-xr-x | nsswitch/tests/test_idmap_rfc2307.sh | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/nsswitch/tests/test_idmap_rfc2307.sh b/nsswitch/tests/test_idmap_rfc2307.sh index 6e4e041d90d..e0f550d739b 100755 --- a/nsswitch/tests/test_idmap_rfc2307.sh +++ b/nsswitch/tests/test_idmap_rfc2307.sh @@ -22,6 +22,11 @@ DC_PASSWORD="$4" wbinfo="$VALGRIND $BINDIR/wbinfo" +ldbsearch="ldbsearch" +if [ -x "$BINDIR/ldbsearch" ]; then + ldbsearch="$BINDIR/ldbsearch" +fi + ldbadd="ldbadd" if [ -x "$BINDIR/ldbadd" ]; then ldbadd="$BINDIR/ldbadd" @@ -37,10 +42,11 @@ failed=0 . `dirname $0`/../../testprogs/blackbox/subunit.sh # Delete LDAP records -$VALGRIND $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD "cn=$USERNAME,$LDAPPREFIX" -$VALGRIND $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD "cn=$USERNAME2,$LDAPPREFIX" -$VALGRIND $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD "cn=$GROUPNAME,$LDAPPREFIX" -$VALGRIND $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD "cn=$GROUPNAME2,$LDAPPREFIX" +$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" # Add id mapping information to LDAP @@ -141,10 +147,11 @@ echo "SID $group_sid2 resolved to $group_name2" testit "test $group_name2 = $DOMAIN/$GROUPNAME2" test "$(echo $group_name2 | tr A-Z a-z)" = "$(echo $DOMAIN/$GROUPNAME2 | tr A-Z a-z)" || failed=$(expr $failed + 1) # Delete LDAP records -$VALGRIND $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD "cn=$USERNAME,$LDAPPREFIX" -$VALGRIND $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD "cn=$USERNAME2,$LDAPPREFIX" -$VALGRIND $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD "cn=$GROUPNAME,$LDAPPREFIX" -$VALGRIND $ldbdel -H ldap://$DC_SERVER -U$DOMAIN/$DC_USERNAME%$DC_PASSWORD "cn=$GROUPNAME2,$LDAPPREFIX" +$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" exit $failed |