mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-09-01 06:55:30 +00:00
Merge branch '2569-nsupdate-on-solaris-produces-different-failure-text-than-expected' into 'main'
Resolve "nsupdate on Solaris produces different failure text than expected" Closes #2569 See merge request isc-projects/bind9!4804
This commit is contained in:
@@ -1079,7 +1079,7 @@ echo_i "ensure unresolvable server name is fatal in non-interactive mode ($n)"
|
|||||||
$NSUPDATE <<END > nsupdate.out 2>&1 && ret=1
|
$NSUPDATE <<END > nsupdate.out 2>&1 && ret=1
|
||||||
server unresolvable..
|
server unresolvable..
|
||||||
END
|
END
|
||||||
grep "couldn't get address for 'unresolvable..': not found" nsupdate.out > /dev/null || ret=1
|
grep "couldn't get address for 'unresolvable..':" nsupdate.out > /dev/null || ret=1
|
||||||
grep "syntax error" nsupdate.out > /dev/null || ret=1
|
grep "syntax error" nsupdate.out > /dev/null || ret=1
|
||||||
[ $ret = 0 ] || { echo_i "failed"; status=1; }
|
[ $ret = 0 ] || { echo_i "failed"; status=1; }
|
||||||
|
|
||||||
@@ -1089,7 +1089,8 @@ echo_i "ensure unresolvable server name is not fatal in interactive mode ($n)"
|
|||||||
$NSUPDATE -i <<END > nsupdate.out 2>&1 || ret=1
|
$NSUPDATE -i <<END > nsupdate.out 2>&1 || ret=1
|
||||||
server unresolvable..
|
server unresolvable..
|
||||||
END
|
END
|
||||||
grep "couldn't get address for 'unresolvable..': not found" nsupdate.out > /dev/null || ret=1
|
grep "couldn't get address for 'unresolvable..':" nsupdate.out > /dev/null || ret=1
|
||||||
|
grep "syntax error" nsupdate.out > /dev/null && ret=1
|
||||||
[ $ret = 0 ] || { echo_i "failed"; status=1; }
|
[ $ret = 0 ] || { echo_i "failed"; status=1; }
|
||||||
|
|
||||||
n=`expr $n + 1`
|
n=`expr $n + 1`
|
||||||
|
Reference in New Issue
Block a user