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
e8154b50
Commit
e8154b50
authored
Jun 15, 2018
by
Mark Andrews
Browse files
Restore default rrset-order to random.
parent
e495999c
Pipeline
#2454
passed with stages
in 8 minutes and 6 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
e8154b50
4974. [bug] Restore default rrset-order to random. [GL #336]
4973. [func] verifyzone() and the functions it uses were moved to
libdns and refactored to prevent exit() from being
called upon failure. A side effect of that is that
...
...
bin/named/config.c
View file @
e8154b50
...
...
@@ -96,6 +96,7 @@ options {\n\
request-nsid false;
\n
\
reserved-sockets 512;
\n
\
resolver-query-timeout 10;
\n
\
rrset-order { order random; };
\n
\
secroots-file
\"
named.secroots
\"
;
\n
\
send-cookie true;
\n
\
# serial-queries <obsolete>;
\n
\
...
...
bin/tests/system/rrsetorder/ns5/named.conf.in
0 → 100644
View file @
e8154b50
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
options {
query-source address 10.53.0.5;
notify-source 10.53.0.5;
transfer-source 10.53.0.5;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.5; };
listen-on-v6 { none; };
recursion yes;
dnssec-validation yes;
notify yes;
};
zone "." {
type hint;
file "../../common/root.hint";
};
bin/tests/system/rrsetorder/setup.sh
View file @
e8154b50
...
...
@@ -17,3 +17,4 @@ copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
copy_setports ns3/named.conf.in ns3/named.conf
copy_setports ns4/named.conf.in ns4/named.conf
copy_setports ns5/named.conf.in ns5/named.conf
bin/tests/system/rrsetorder/tests.sh
View file @
e8154b50
...
...
@@ -136,7 +136,7 @@ do
eval
"match=
\`
expr
\$
match +
\$
match
$i
\`
"
done
echo_i
"Random selection return
$match
of 24 possible orders in 36 samples"
if
[
$match
-lt
8
]
;
then
echo
ret
=
1
;
fi
if
[
$match
-lt
8
]
;
then
ret
=
1
;
fi
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
status
=
`
expr
$status
+
$ret
`
...
...
@@ -230,7 +230,7 @@ do
eval
"match=
\`
expr
\$
match +
\$
match
$i
\`
"
done
echo_i
"Random selection return
$match
of 24 possible orders in 36 samples"
if
[
$match
-lt
8
]
;
then
echo
ret
=
1
;
fi
if
[
$match
-lt
8
]
;
then
ret
=
1
;
fi
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
status
=
`
expr
$status
+
$ret
`
...
...
@@ -340,7 +340,7 @@ do
eval
"match=
\`
expr
\$
match +
\$
match
$i
\`
"
done
echo_i
"Random selection return
$match
of 24 possible orders in 36 samples"
if
[
$match
-lt
8
]
;
then
echo
ret
=
1
;
fi
if
[
$match
-lt
8
]
;
then
ret
=
1
;
fi
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
status
=
`
expr
$status
+
$ret
`
...
...
@@ -438,7 +438,33 @@ do
eval
"match=
\`
expr
\$
match +
\$
match
$i
\`
"
done
echo_i
"Random selection return
$match
of 24 possible orders in 36 samples"
if
[
$match
-lt
8
]
;
then
echo
ret
=
1
;
fi
if
[
$match
-lt
8
]
;
then
ret
=
1
;
fi
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
echo_i
"Checking default order (cache)"
ret
=
0
for
i
in
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
do
eval
match
$i
=
0
done
for
i
in
a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9
do
$DIGCMD
@10.53.0.5 random.example
>
dig.out.random
||
ret
=
1
match
=
0
for
j
in
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
do
eval
"
$DIFF
dig.out.random dig.out.random.good
$j
>/dev/null && match
$j
=1 match=1"
if
[
$match
-eq
1
]
;
then
break
;
fi
done
if
[
$match
-eq
0
]
;
then
ret
=
1
;
fi
done
match
=
0
for
i
in
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
do
eval
"match=
\`
expr
\$
match +
\$
match
$i
\`
"
done
echo_i
"Default selection return
$match
of 24 possible orders in 36 samples"
if
[
$match
-lt
8
]
;
then
ret
=
1
;
fi
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
echo_i
"Checking default order no match in rrset-order (no shuffling)"
...
...
@@ -464,7 +490,7 @@ do
eval
"match=
\`
expr
\$
match +
\$
match
$i
\`
"
done
echo_i
"Consistent selection return
$match
of 24 possible orders in 36 samples"
if
[
$match
-ne
1
]
;
then
echo
ret
=
1
;
fi
if
[
$match
-ne
1
]
;
then
ret
=
1
;
fi
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
status
=
`
expr
$status
+
$ret
`
...
...
util/copyrights
View file @
e8154b50
...
...
@@ -1992,6 +1992,7 @@
./bin/tests/system/rrsetorder/ns2/named.conf.in CONF-C 2006,2007,2016,2018
./bin/tests/system/rrsetorder/ns3/named.conf.in CONF-C 2006,2007,2016,2017,2018
./bin/tests/system/rrsetorder/ns4/named.conf.in CONF-C 2015,2016,2017,2018
./bin/tests/system/rrsetorder/ns5/named.conf.in CONF-C 2018
./bin/tests/system/rrsetorder/setup.sh SH 2018
./bin/tests/system/rrsetorder/tests.sh SH 2006,2007,2008,2011,2012,2014,2015,2016,2017,2018
./bin/tests/system/rsabigexponent/.gitignore X 2013,2018
...
...
Mark Andrews
@marka
mentioned in commit
4f332dc9
·
Jun 19, 2018
mentioned in commit
4f332dc9
mentioned in commit 4f332dc93668234d648ddcf9f243d8fafe75cdac
Toggle commit list
Mark Andrews
@marka
mentioned in merge request
!387 (merged)
·
Jun 19, 2018
mentioned in merge request
!387 (merged)
mentioned in merge request !387
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