From: Evan Hunt <each@isc.org>
Date: Fri, 1 Jun 2012 18:40:52 +0000 (-0700)
Subject: fix solaris portability problem
X-Git-Tag: v9.10.0a1~1168
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3787f2ec8a31db88ffa025118be3c3686aca2c47;p=thirdparty%2Fbind9.git

fix solaris portability problem
---

diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index 2df240f762b..d500e5cfbcc 100644
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -48,12 +48,10 @@ RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p 9953 -s"
 
 digcmd () {
     digcmd_args="+noadd +nosearch +time=1 +tries=1 -p 5300 $*"
-    if ! expr "$digcmd_args" : '.*@' >/dev/null; then
+    expr "$digcmd_args" : '.*@' >/dev/null || \
 	digcmd_args="$digcmd_args @$ns3"
-    fi
-    if ! expr "$digcmd_args" : '.*+[no]*auth' >/dev/null; then
+    expr "$digcmd_args" : '.*+[no]*auth' >/dev/null || \
 	digcmd_args="+noauth $digcmd_args"
-    fi
     #echo I:dig $digcmd_args 1>&2
     $DIG $digcmd_args
 }