diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-01-16 09:26:24 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-16 09:26:24 +1100 |
| commit | e02e67ec36ecc5f5af2fcf3a7c6b0282173df8aa (patch) | |
| tree | 0e615183dba95d8268b8e9bd553928581eca1ccb /testprogs | |
| parent | 9ff39862266f19c2a8e0243ec97ea8d7c463c3ef (diff) | |
| parent | c92a1d0752abf42a76e16e7c19229841ac35dc81 (diff) | |
| download | samba-e02e67ec36ecc5f5af2fcf3a7c6b0282173df8aa.tar.gz samba-e02e67ec36ecc5f5af2fcf3a7c6b0282173df8aa.tar.bz2 samba-e02e67ec36ecc5f5af2fcf3a7c6b0282173df8aa.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit c4aba5ad01f5095ad7a9d0d0f1e3c6afedbbd9b7)
Diffstat (limited to 'testprogs')
| -rwxr-xr-x | testprogs/blackbox/test_ldb.sh | 7 | ||||
| -rwxr-xr-x | testprogs/ejs/ldap.js | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/testprogs/blackbox/test_ldb.sh b/testprogs/blackbox/test_ldb.sh index e35d3547d9..4067a7fc43 100755 --- a/testprogs/blackbox/test_ldb.sh +++ b/testprogs/blackbox/test_ldb.sh @@ -108,5 +108,12 @@ echo "Search Options Control Query test returned 0 items" failed=`expr $failed + 1` fi +echo "Test Search Options Control with Domain Scope Control" +nentries=`bin/ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=search_options:1:2,domain_scope:1 '(objectclass=crossRef)' | grep crossRef | wc -l` +if [ $nentries -lt 1 ]; then +echo "Search Options Control Query test returned 0 items" +failed=`expr $failed + 1` +fi + exit $failed diff --git a/testprogs/ejs/ldap.js b/testprogs/ejs/ldap.js index c03dbe9ce2..836b726ad9 100755 --- a/testprogs/ejs/ldap.js +++ b/testprogs/ejs/ldap.js @@ -30,7 +30,12 @@ function basic_tests(ldb, gc_ldb, base_dn, configuration_dn, schema_dn) println("Running basic tests"); ldb.del("cn=ldaptestuser,cn=users," + base_dn); - + ldb.del("cn=ldaptestuser2,cn=users," + base_dn); + ldb.del("cn=ldaptestuser3,cn=users," + base_dn); + ldb.del("cn=ldaptestuser4,cn=users," + base_dn); + ldb.del("cn=ldaptestuser5,cn=users," + base_dn); + ldb.del("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn); + ldb.del("CN=ldaptestcontainer2," + base_dn); ldb.del("cn=ldaptestgroup,cn=users," + base_dn); println("Testing group add with invalid member"); |