Skip to content

GitLab

Commit 7ed4399c authored by Evan Hunt's avatar Evan Hunt
Browse files

remove 'grep -q' from acl test script, some platforms don't 

support it. [rt18253]
parent 321b1c05
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 21 deletions
CHANGES
View file @ 7ed4399c
2391 [port] hpux: cover additional recvmsg() error codes.
2392. [bug] remove 'grep -q' from acl test script, some platforms
don't support it. [RT #18253]
2391. [port] hpux: cover additional recvmsg() error codes.
[RT #18301]
2390 [bug] dispatch.c could make a false warning on 'odd socket'.
2390. [bug] dispatch.c could make a false warning on 'odd socket'.
[RT #18301].
2389 [bug] Move the "working directory writable" check to after
2389. [bug] Move the "working directory writable" check to after
the ns_os_changeuser() call. [RT #18326]
2388. [bug] Avoid using tables for layout purposes in
......
bin/tests/system/acl/tests.sh
View file @ 7ed4399c
......@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.3 2008/01/10 23:47:01 tbox Exp $
# $Id: tests.sh,v 1.4 2008/07/19 00:02:14 each Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
......@@ -29,13 +29,13 @@ echo "I:testing basic ACL processing"
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 10.53.0.1 axfr -y one:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out || { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 || { echo "I:test $t failed" ; status=1; }
# any other key should be fine
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 10.53.0.1 axfr -y two:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out && { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 && { echo "I:test $t failed" ; status=1; }
cp -f ns2/named2.conf ns2/named.conf
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
......@@ -45,18 +45,18 @@ sleep 5
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 10.53.0.1 axfr -y one:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out || { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 || { echo "I:test $t failed" ; status=1; }
# any other address should work, as long as it sends key "one"
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 127.0.0.1 axfr -y two:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out || { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 || { echo "I:test $t failed" ; status=1; }
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 127.0.0.1 axfr -y one:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out && { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 && { echo "I:test $t failed" ; status=1; }
echo "I:testing nested ACL processing"
# all combinations of 10.53.0.{1|2} with key {one|two}, should succeed
......@@ -68,42 +68,42 @@ sleep 5
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 10.53.0.2 axfr -y two:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out && { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 && { echo "I:test $t failed" ; status=1; }
# should succeed
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 10.53.0.2 axfr -y one:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out && { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 && { echo "I:test $t failed" ; status=1; }
# should succeed
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 10.53.0.1 axfr -y two:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out && { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 && { echo "I:test $t failed" ; status=1; }
# should succeed
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 10.53.0.1 axfr -y two:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out && { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 && { echo "I:test $t failed" ; status=1; }
# but only one or the other should fail
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 127.0.0.1 axfr -y one:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out || { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 || { echo "I:test $t failed" ; status=1; }
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 10.53.0.2 axfr -p 5300 > dig.out
grep -q "^;" dig.out || { echo "I:test $tt failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 || { echo "I:test $tt failed" ; status=1; }
# and other values? right out
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 127.0.0.1 axfr -y three:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out || { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 || { echo "I:test $t failed" ; status=1; }
# now we only allow 10.53.0.1 *and* key one, or 10.53.0.2 *and* key two
cp -f ns2/named4.conf ns2/named.conf
......@@ -114,31 +114,31 @@ sleep 5
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 10.53.0.2 axfr -y two:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out && { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 && { echo "I:test $t failed" ; status=1; }
# should succeed
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 10.53.0.1 axfr -y one:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out && { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 && { echo "I:test $t failed" ; status=1; }
# should fail
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 10.53.0.2 axfr -y one:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out || { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 || { echo "I:test $t failed" ; status=1; }
# should fail
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 10.53.0.1 axfr -y two:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out || { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 || { echo "I:test $t failed" ; status=1; }
# should fail
t=`expr $t + 1`
$DIG $DIGOPTS tsigzone. \
@10.53.0.2 -b 10.53.0.3 axfr -y one:1234abcd8765 -p 5300 > dig.out
grep -q "^;" dig.out || { echo "I:test $t failed" ; status=1; }
grep "^;" dig.out > /dev/null 2>&1 || { echo "I:test $t failed" ; status=1; }
echo "I:exit status: $status"
exit $status
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment