Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
9fc68285
Commit
9fc68285
authored
Dec 13, 2018
by
Curtis Blackburn
Committed by
Evan Hunt
Dec 14, 2018
Browse files
more CRLF fixes (dns64, rndc, rpzrecurse)
parent
bdbf6ede
Changes
3
Hide whitespace changes
Inline
Side-by-side
bin/tests/system/dns64/tests.sh
View file @
9fc68285
...
...
@@ -1278,7 +1278,7 @@ status=`expr $status + $ret`
echo_i
"checking reverse mapping (
$n
)"
ret
=
0
$DIG
$DIGOPTS
-x
2001:aaaa::10.0.0.1 @10.53.0.2
>
dig.out.ns2.test
$n
||
ret
=
1
grep
-i
"CNAME.1.0.0.10.IN-ADDR.ARPA.$"
dig.out.ns2.test
$n
>
/dev/null
||
ret
=
1
tr
-d
'\r'
< dig.out.ns2
$n
|
grep
-i
"CNAME.1.0.0.10.IN-ADDR.ARPA.$"
>
/dev/null
||
ret
=
1
n
=
`
expr
$n
+ 1
`
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
status
=
`
expr
$status
+
$ret
`
...
...
bin/tests/system/rndc/tests.sh
View file @
9fc68285
...
...
@@ -452,7 +452,7 @@ $RNDC -s 10.53.0.4 -p ${EXTRAPORT6} -c ns4/key6.conf querylog on >/dev/null 2>&1
grep
"query logging is now on"
ns4/named.run
>
/dev/null
||
ret
=
1
# query for builtin and check if query was logged (without +subnet)
$DIG
@10.53.0.4
-p
${
PORT
}
-c
ch
-t
txt foo12345.bind
>
/dev/null
||
ret
=
1
grep
"query: foo12345.bind CH TXT.*(.*)$"
ns4/named.run
>
/dev/null
||
ret
=
1
tr
-d
'\r'
< ns4/named.run |
grep
"query: foo12345.bind CH TXT.*(.*)$"
>
/dev/null
||
ret
=
1
# query for another builtin zone and check if query was logged (with +subnet=127.0.0.1)
$DIG
+subnet
=
127.0.0.1 @10.53.0.4
-p
${
PORT
}
-c
ch
-t
txt foo12346.bind
>
/dev/null
||
ret
=
1
grep
"query: foo12346.bind CH TXT.*
\[
ECS 127
\.
0
\.
0
\.
1
\/
32
\/
0]"
ns4/named.run
>
/dev/null
||
ret
=
1
...
...
@@ -467,7 +467,7 @@ $RNDC -s 10.53.0.4 -p ${EXTRAPORT6} -c ns4/key6.conf querylog > /dev/null 2>&1 |
grep
"query logging is now off"
ns4/named.run
>
/dev/null
||
ret
=
1
# query for another builtin zone and check if query was logged (without +subnet)
$DIG
@10.53.0.4
-p
${
PORT
}
-c
ch
-t
txt foo9876.bind
>
/dev/null
||
ret
=
1
grep
"query: foo9876.bind CH TXT.*(.*)$"
ns4/named.run
>
/dev/null
&&
ret
=
1
tr
-d
'\r'
< ns4/named.run |
grep
"query: foo9876.bind CH TXT.*(.*)$"
>
/dev/null
&&
ret
=
1
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
status
=
`
expr
$status
+
$ret
`
...
...
bin/tests/system/rpzrecurse/tests.sh
View file @
9fc68285
...
...
@@ -478,7 +478,7 @@ for mode in native dnsrps; do
echo_i
"testing for invalid prefix length error (
${
t
}
)"
add_test_marker 10.53.0.2
run_server invalidprefixlength
grep
"invalid rpz IP address
\"
1000.4.0.53.10.rpz-client-ip.invalidprefixlength
\"
; invalid prefix length of 1000$"
ns2/named.run
>
/dev/null
||
{
tr
-d
'\r'
< ns2/named.run |
grep
"invalid rpz IP address
\"
1000.4.0.53.10.rpz-client-ip.invalidprefixlength
\"
; invalid prefix length of 1000$"
>
/dev/null
||
{
echo_i
" failed: expected that invalid prefix length error would be logged"
status
=
1
}
...
...
Curtis Blackburn
@ckb
mentioned in commit
bb731398
·
Dec 15, 2018
mentioned in commit
bb731398
mentioned in commit bb731398e0407fa0e2b6eab5ff429187e18142cf
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment