ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

[master] masterfile-style

Browse Source 
3814.	[func]		The "masterfile-style" zone option controls the
			formatting of dumped zone files. Options are
			"relative" (multiline format) and "full" (one
			record per line). The default is "relative".
			[RT #20798]
This commit is contained in:
Evan Hunt
2014-04-17 17:10:29 -07:00
parent 4e7973990c
commit ec3b216506
8 changed files with 100 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/tests/system/masterformat/ns1/named.conf
View File

@@ -14,8 +14,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named.conf,v 1.9 2012/02/14 23:47:15 tbox Exp $ */
// NS1
controls { /* empty */ };
@@ -70,6 +68,13 @@ zone "transfer3" {
allow-transfer { any; };
};
zone "transfer4" {
type master;
file "example.db";
allow-transfer { any; };
};
zone "large" {
type master;
file "large.db.raw";

10
bin/tests/system/masterformat/ns2/named.conf
View File

@@ -14,8 +14,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named.conf,v 1.8 2012/02/14 23:47:15 tbox Exp $ */
// NS2
controls { /* empty */ };
@@ -54,6 +52,14 @@ zone "transfer3" {
file "formerly-text.db";
};
zone "transfer4" {
type slave;
masters { 10.53.0.1; };
masterfile-format text;
masterfile-style full;
file "transfer.db.full";
};
zone "large" {
type slave;
masters { 10.53.0.1; };

18
bin/tests/system/masterformat/tests.sh
View File

@@ -14,8 +14,6 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id$
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
@@ -35,6 +33,15 @@ israw () {
return $?
}
isfull () {
# there should be no whitespace at the beginning of a line
if grep '^[ ][ ]*' $1 > /dev/null 2>&1; then
return 1
else
return 0
fi
}
rawversion () {
perl -e 'binmode STDIN;
read(STDIN, $input, 8);
@@ -132,6 +139,13 @@ status=`expr $status + $ret`
echo "I:checking that slave was saved in text format when configured"
ret=0
israw ns2/transfer.db.txt && ret=1
isfull ns2/transfer.db.txt && ret=1
[ $ret -eq 0 ] || echo "I:failed"
status=`expr $status + $ret`
echo "I:checking that slave was saved in 'full' style when configured"
ret=0
isfull ns2/transfer.db.full > /dev/null 2>&1 || ret=1
[ $ret -eq 0 ] || echo "I:failed"
status=`expr $status + $ret`