upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 19:10:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

'nextpart' and 'grep -q' don't work together

Browse source 
'nextpart file | grep -q' doesn't work as expected.  'grep -q' is not
required to read all of the input and that causes 'nextpart' to fail.

(cherry picked from commit 5beba4d292)
This commit is contained in:
Mark Andrews 2025-10-14 16:41:50 +11:00
parent dcc981f81f
commit c349771211
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/tests/system/ixfr/tests.sh
View file

@ -243,7 +243,7 @@ $DIG $DIGOPTS test.nil. TXT @10.53.0.1 >dig.out.test$n.2 || ret=1
grep -q -F "serial 4, fallback AXFR" dig.out.test$n.2 || ret=1
# Ensure the expected error is logged.
nextpart ns1/named.run | grep -q -F "SOA name mismatch" || ret=1
nextpart ns1/named.run | grep -F "SOA name mismatch" >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))

4
bin/tests/system/rpz/tests.sh
View file

@ -622,7 +622,7 @@ nochange_ns10 a3-1.static-stub-nomatch # 16
if [ "$MODE" = dnsrps ]; then
addr 12.12.12.12 as-ns.tld5. # 17 qname-as-ns
fi
nextpart ns3/named.run | grep -q "unrecognized NS rpz_rrset_find() failed: glue" \
nextpart ns3/named.run | grep -F "unrecognized NS rpz_rrset_find() failed: glue" >/dev/null \
&& setret "seen: unrecognized NS rpz_rrset_find() failed: glue"
end_group
if [ "$MODE" = dnsrps ]; then
@ -645,7 +645,7 @@ nochange_ns10 a4-1.static-stub-nomatch # 8
if [ "$MODE" = dnsrps ]; then
addr 12.12.12.12 as-ns.tld5. # 9 ip-as-ns
fi
nextpart ns3/named.run | grep -q "unrecognized NS rpz_rrset_find() failed: glue" \
nextpart ns3/named.run | grep -F "unrecognized NS rpz_rrset_find() failed: glue" >/dev/null \
&& setret "seen: unrecognized NS rpz_rrset_find() failed: glue"
end_group