Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
7122b578
Commit
7122b578
authored
Jan 14, 2019
by
Mark Andrews
Committed by
Evan Hunt
Jan 14, 2019
Browse files
add multi-view server and tests
parent
3175ea9a
Changes
4
Hide whitespace changes
Inline
Side-by-side
bin/tests/system/mkeys/clean.sh
View file @
7122b578
...
...
@@ -10,14 +10,15 @@
# information regarding copyright ownership.
rm
-f
*
/K
*
*
/
*
.signed
*
/trusted.conf
*
/
*
.jnl
*
/
*
.bk
rm
-f
dsset-. ns1/dsset-.
rm
-f
ns
*
/named.lock
rm
-f
*
/managed-keys.bind
*
*
/named.secroots
rm
-f
*
/managed
*
.conf ns1/managed.key ns1/managed.key.id
rm
-f
*
/managed-keys.bind
*
*
/named.secroots
rm
-f
*
/named.conf
rm
-f
*
/named.memstats
*
/named.run
*
/named.run.prev
rm
-f
dig.out
*
delv.out
*
rndc.out
*
signer.out
*
rm
-f
dsset-. ns1/dsset-.
rm
-f
ns
*
/managed-keys.bind
*
rm
-f
ns
*
/named.lock
rm
-f
ns1/named.secroots ns1/root.db.signed
*
ns1/root.db.tmp
rm
-f
*
/named.conf
rm
-rf
ns4/nope
rm
-f
ns5/named.args
rm
-f
ns
*
/managed-keys.bind
*
rm
-f
ns6/view1.mkeys ns6/view2.mkeys
rm
-rf
ns4/nope
bin/tests/system/mkeys/ns6/named.conf.in
0 → 100644
View file @
7122b578
/*
* 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.
*/
// NS6
options {
query-source address 10.53.0.6;
notify-source 10.53.0.6;
transfer-source 10.53.0.6;
port @PORT@;
pid-file "named.pid";
listen-on { 10.53.0.6; };
listen-on-v6 { none; };
recursion yes;
notify no;
dnssec-enable yes;
dnssec-validation auto;
bindkeys-file "managed.conf";
};
key rndc_key {
secret "1234abcd8765";
algorithm hmac-sha256;
};
controls {
inet 10.53.0.6 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
view view1 {
zone "." {
type hint;
file "../../common/root.hint";
};
};
view view2 {
zone "." {
type hint;
file "../../common/root.hint";
};
};
bin/tests/system/mkeys/setup.sh
View file @
7122b578
...
...
@@ -19,6 +19,7 @@ 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
copy_setports ns6/named.conf.in ns6/named.conf
cp
ns5/named1.args ns5/named.args
...
...
bin/tests/system/mkeys/tests.sh
View file @
7122b578
...
...
@@ -755,5 +755,20 @@ grep "status: NOERROR" dig.out.ns5.b.test$n > /dev/null || ret=1
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
status
=
`
expr
$status
+
$ret
`
n
=
`
expr
$n
+ 1
`
echo_i
"check 'rndc managed-keys' and views (
$n
)"
ret
=
0
$RNDCCMD
10.53.0.6 managed-keys refresh
in
view1
>
rndc.out.ns6.view1.test
$n
||
ret
=
1
grep
"refreshing managed keys for 'view1'"
rndc.out.ns6.view1.test
$n
>
/dev/null
||
ret
=
1
lines
=
`
wc
-l
< rndc.out.ns6.view1.test
$n
`
[
$lines
-eq
1
]
||
ret
=
1
$RNDCCMD
10.53.0.6 managed-keys refresh
>
rndc.out.ns6.view2.test
$n
||
ret
=
1
lines
=
`
wc
-l
< rndc.out.ns6.view2.test
$n
`
grep
"refreshing managed keys for 'view1'"
rndc.out.ns6.view2.test
$n
>
/dev/null
||
ret
=
1
grep
"refreshing managed keys for 'view2'"
rndc.out.ns6.view2.test
$n
>
/dev/null
||
ret
=
1
[
$lines
-eq
2
]
||
ret
=
1
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
status
=
`
expr
$status
+
$ret
`
echo_i
"exit status:
$status
"
[
$status
-eq
0
]
||
exit
1
Mark Andrews
@marka
mentioned in commit
fedaf115
·
Jan 15, 2019
mentioned in commit
fedaf115
mentioned in commit fedaf1154a1268d0f721eebbbb090ac20255c627
Toggle commit list
Mark Andrews
@marka
mentioned in commit
22b77f45
·
Jan 15, 2019
mentioned in commit
22b77f45
mentioned in commit 22b77f45b739a211c9524ce2528a2b41a809f19e
Toggle commit list
Mark Andrews
@marka
mentioned in commit
06eb0a43
·
Jan 15, 2019
mentioned in commit
06eb0a43
mentioned in commit 06eb0a43675abdea66ed31cec222aa8ee34a8379
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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