diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-25 14:18:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:48 -0500 |
| commit | 033def25afb8830679650e6e6abe0926ef7e9bf2 (patch) | |
| tree | f321ba619cfc4b598367bfabaf5dce1c6eed8783 | |
| parent | f0b6563e3399821e381ecacbfa76b65806bf2c04 (diff) | |
| download | samba-033def25afb8830679650e6e6abe0926ef7e9bf2.tar.gz samba-033def25afb8830679650e6e6abe0926ef7e9bf2.tar.bz2 samba-033def25afb8830679650e6e6abe0926ef7e9bf2.zip | |
r7906: some portability fixes for ldap testing on solaris (solaris grep doesn't handle ^)
(This used to be commit b196502ffbe24c8dcdce17dfcea79cd98e7ad3cb)
| -rwxr-xr-x | source4/script/tests/test_ldap.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/script/tests/test_ldap.sh b/source4/script/tests/test_ldap.sh index 481bc51dd3..2ccb02b8b8 100755 --- a/source4/script/tests/test_ldap.sh +++ b/source4/script/tests/test_ldap.sh @@ -29,14 +29,14 @@ for p in $PROTOCOLS; do testit "RootDSE" bin/ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER -s base DUMMY=x dnsHostName highestCommittedUSN || failed=`expr $failed + 1` echo "Getting defaultNamingContext" - BASEDN=`bin/ldbsearch $CONFIGURATION $options -b '' -H $p://$SERVER -s base DUMMY=x defaultNamingContext | grep ^defaultNamingContext | awk '{print $2}'` + BASEDN=`bin/ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER -s base DUMMY=x defaultNamingContext | grep defaultNamingContext | awk '{print $2}'` echo "BASEDN is $BASEDN" testit "Listing Users" bin/ldbsearch $options $CONFIGURATION -H $p://$SERVER '(objectclass=user)' sAMAccountName || failed=`expr $failed + 1` testit "Listing Groups" bin/ldbsearch $options $CONFIGURATION -H $p://$SERVER '(objectclass=group)' sAMAccountName || failed=`expr $failed + 1` - nusers=`bin/ldbsearch $options -H $p://$SERVER $CONFIGURATION '(|(|(&(!(groupType:1.2.840.113556.1.4.803:=1))(groupType:1.2.840.113556.1.4.803:=2147483648)(groupType:1.2.840.113556.1.4.804:=10))(samAccountType=805306368))(samAccountType=805306369))' sAMAccountName | grep ^sAMAccountName | wc -l` + nusers=`bin/ldbsearch $options -H $p://$SERVER $CONFIGURATION '(|(|(&(!(groupType:1.2.840.113556.1.4.803:=1))(groupType:1.2.840.113556.1.4.803:=2147483648)(groupType:1.2.840.113556.1.4.804:=10))(samAccountType=805306368))(samAccountType=805306369))' sAMAccountName | grep sAMAccountName | wc -l` echo "Found $nusers users" if [ $nusers -lt 10 ]; then echo "Should have found at least 10 users" |