From: Mark Andrews <marka@isc.org>
Date: Sun, 11 Jun 2017 12:03:51 +0000 (+1000)
Subject: 4634.   [contrib]       check5011.pl needs to handle optional space before
X-Git-Tag: v9.12.0a1~255
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=ed2659c9747d917a3cbec336790e7583056bc563;p=thirdparty%2Fbind9.git

4634.   [contrib]       check5011.pl needs to handle optional space before
                        semi-colon in +multi-line output. [RT #45352]
---

diff --git a/CHANGES b/CHANGES
index 4bea921cef5..a6fa30332a2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4634.	[contrib]	check5011.pl needs to handle optional space before
+			semi-colon in +multi-line output. [RT #45352]
+
 4633.	[maint]		Updated AAAA (2001:500:200::b) for B.ROOT-SERVERS.NET.
 
 4632.	[security]	The BIND installer on Windows used an unquoted
diff --git a/contrib/scripts/check5011.pl b/contrib/scripts/check5011.pl
index d4f2d3f1eb4..0751a80d49e 100644
--- a/contrib/scripts/check5011.pl
+++ b/contrib/scripts/check5011.pl
@@ -27,7 +27,7 @@ sub getkey ($$) {
 		last if m{^[)]};
 		$data .= $_;
 	}
-	m{ alg = (\S+); key id = (\d+)};
+	m{ alg = (\S+)\s*; key id = (\d+)};
 	$k->{alg}  = $1;
 	$k->{id}   = $2;
 	$k->{data} = $data;