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

Record types which support a empty rdata field were not handling the empty rdata field case.

Browse Source
This commit is contained in:
Mark Andrews
2018-10-27 09:58:23 +11:00
parent 9ff13b23f7
commit 2ff57d8a39
8 changed files with 111 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
bin/tests/system/digcomp.pl
View File

@@ -57,6 +57,28 @@ while (<FILE1>) {
} else {
$entry{"$name ; $class.$type ; $value"} = $_;
}
} elsif (/^(\S+)\s+\S+\s+(\S+)\s+(\S+)\s*$/) {
$name = $1;
$class = $2;
$type = $3;
$value = "";
if ($lc) {
$name = lc($name);
$value = lc($value);
}
if ($type eq "SOA") {
$firstname = $name if ($firstname eq "");
if ($name eq $firstname) {
$name = "$name$count";
$count++;
}
}
if ($entry{"$name ; $class.$type ; $value"} ne "") {
$line = $entry{"$name ; $class.$type ; $value"};
print("Duplicate entry in $file1:\n> $_\n< $line\n");
} else {
$entry{"$name ; $class.$type ; $value"} = $_;
}
}
}
close(FILE1);
@@ -93,6 +115,28 @@ while (<FILE2>) {
$printed++;
$status = 1;
}
} elsif (/^(\S+)\s+\S+\s+(\S+)\s+(\S+)\s*$/) {
$name = $1;
$class = $2;
$type = $3;
$value = "";
if ($lc) {
$name = lc($name);
$value = lc($value);
}
if (($name eq $firstname) && ($type eq "SOA")) {
$count--;
$name = "$name$count";
}
if ($entry{"$name ; $class.$type ; $value"} ne "") {
$entry{"$name ; $class.$type ; $value"} = "";
} else {
print("Only in $file2 (missing from $file1):\n")
if ($printed == 0);
print("> $_\n");
$printed++;
$status = 1;
}
}
}
close(FILE2);

1
bin/tests/system/genzone.sh
View File

@@ -236,6 +236,7 @@ sink02 SINK 8 0 2 l4ik
; type 42
apl01 APL !1:10.0.0.1/32 1:10.0.0.0/24
apl02 APL
; type 43
ds01 DS 12892 5 2 26584835CA80C81C91999F31CFAF2A0E89D4FF1C8FAFD0DDB31A85C7 19277C13

1
bin/tests/system/xfer/dig1.good
View File

@@ -12,6 +12,7 @@ aaaa02.example. 3600 IN AAAA fd92:7065:b8e:ffff::5
afsdb01.example. 3600 IN AFSDB 0 hostname.example.
afsdb02.example. 3600 IN AFSDB 65535 .
apl01.example. 3600 IN APL !1:10.0.0.1/32 1:10.0.0.0/24
apl02.example. 3600 IN APL
atma01.example. 3600 IN ATMA +61200000000
atma02.example. 3600 IN ATMA +61200000000
atma03.example. 3600 IN ATMA 1234567890abcdef

1
bin/tests/system/xfer/dig2.good
View File

@@ -12,6 +12,7 @@ aaaa02.example. 3600 IN AAAA fd92:7065:b8e:ffff::5
afsdb01.example. 3600 IN AFSDB 0 hostname.example.
afsdb02.example. 3600 IN AFSDB 65535 .
apl01.example. 3600 IN APL !1:10.0.0.1/32 1:10.0.0.1/24
apl02.example. 3600 IN APL
atma01.example. 3600 IN ATMA +61200000000
atma02.example. 3600 IN ATMA +61200000000
atma03.example. 3600 IN ATMA 1234567890abcdef