Fixed Github issue #5 to properly handle the 'dnstap-output' variants

Added a test file to exercise all variants of 'dnstap-output'

Author: steve

syntax/bind-named.vim

@@ -2336,36 +2336,46 @@ syn keyword namedO_DnstapOutputSuffixType contained
 \    increment
 \    timestamp
 \ skipwhite skipnl skipempty
-\ nextgroup=namedSemicolon
+\ nextgroup=namedSemicolon,
+\    namedO_DnstapOutputSize,
+\    namedO_DnstapOutputVersions
 
 hi link namedO_DnstapOutputSizeValue namedHL_Number
 syn match namedO_DnstapOutputSizeValue contained /[0-9]\{1,10}/
 \ skipwhite skipnl skipempty
-\ nextgroup=namedSemicolon
+\ nextgroup=namedSemicolon,
+\    namedO_DnstapOutputSuffix,
+\    namedO_DnstapOutputVersions
 
 hi link namedO_DnstapOutputSizeBuiltin namedHL_Builtin
 syn keyword namedO_DnstapOutputSizeBuiltin contained 
 \    unlimited
 \ skipwhite skipnl skipempty
-\ nextgroup=namedSemicolon
+\ nextgroup=namedSemicolon,
+\    namedO_DnstapOutputSuffix,
+\    namedO_DnstapOutputVersions
 
-hi link namedO_DnstapOutputVersionBuiltin namedHL_Builtin
-syn keyword namedO_DnstapOutputVersionBuiltin contained 
+hi link namedO_DnstapOutputVersionsBuiltin namedHL_Builtin
+syn keyword namedO_DnstapOutputVersionsBuiltin contained 
 \    unlimited
 \ skipwhite skipnl skipempty
-\ nextgroup=namedSemicolon
+\ nextgroup=namedSemicolon,
+\     namedO_DnstapOutputSuffix,
+\     namedO_DnstapOutputSize,
 
-hi link namedO_DnstapOutputVersionNumber namedHL_Number
-syn match namedO_DnstapOutputVersionNumber contained /\d\+/
+hi link namedO_DnstapOutputVersionsNumber namedHL_Number
+syn match namedO_DnstapOutputVersionsNumber contained /\d\+/
 \ skipwhite skipnl skipempty
-\ nextgroup=namedSemicolon
+\ nextgroup=namedSemicolon,
+\    namedO_DnstapOutputSuffix,
+\    namedO_DnstapOutputSize
 
-hi link namedO_DnstapOutputVersion namedHL_Clause
-syn keyword namedO_DnstapOutputVersion contained version 
+hi link namedO_DnstapOutputVersions namedHL_Clause
+syn keyword namedO_DnstapOutputVersions contained versions
 \ skipwhite skipnl skipempty
 \ nextgroup=
-\    namedO_DnstapOutputVersionBuiltin,
-\    namedO_DnstapOutputVersionNumber
+\    namedO_DnstapOutputVersionsBuiltin,
+\    namedO_DnstapOutputVersionsNumber
 
 hi link namedO_DnstapOutputSize namedHL_Clause
 syn keyword namedO_DnstapOutputSize contained size 
@@ -2379,24 +2389,20 @@ syn keyword namedO_DnstapOutputSuffix contained suffix
 \ skipwhite skipnl skipempty
 \ nextgroup=namedO_DnstapOutputSuffixType
 
-syn region namedO_DnstapOutputSection contained start=/\zs\S\ze/ end=/;/me=e-1
-\ skipwhite skipnl skipempty
-\ contains=
+hi link namedO_DnstapOutputFilespec namedHL_String
+syn match namedO_DnstapOutputFilespec contained /'[ a-zA-Z\]\-\[0-9\._,:;\/?<>|`~!@#$%\^&*\\(\\)+{}]\{1,256}'/hs=s+1,he=e-1 
+\ skipwhite skipempty skipnl
+\ nextgroup=namedSemicolon,
 \    namedO_DnstapOutputSuffix,
-\    namedO_DnstapOutputVersion,
-\    namedO_DnstapOutputSize
-\ nextgroup=namedSemicolon
+\    namedO_DnstapOutputSize,
+\    namedO_DnstapOutputVersions
 
-hi link namedO_DnstapOutputFilespec namedHL_String
-syn match namedO_DnstapOutputFilespec contained /[a-zA-Z\]\-\[0-9\._,:\/?<>|'"`~!@#$%\^&*\\(\\)+]\{1,1024}/ 
-\ skipwhite skipempty skipnl 
-\ nextgroup=namedO_DnstapOutputSection
-syn match namedO_DnstapOutputFilespec contained /'[ a-zA-Z\]\-\[0-9\._,:;\/?<>|"`~!@#$%\^&*\\(\\)+{}]\{1,1024}'/hs=s+1,he=e-1 
-\ skipwhite skipempty skipnl 
-\ nextgroup=namedO_DnstapOutputSection
-syn match namedO_DnstapOutputFilespec contained /"[ a-zA-Z\]\-\[0-9\._,:;\/?<>|'`~!@#$%\^&*\\(\\)+{}]\{1,1024}"/hs=s+1,he=e-1 
-\ skipwhite skipempty skipnl 
-\ nextgroup=namedO_DnstapOutputSection
+syn match namedO_DnstapOutputFilespec contained /"[ a-zA-Z\]\-\[0-9\._,:;\/?<>|`~!@#$%\^&*\\(\\)+{}]\{1,256}"/hs=s+1,he=e-1 
+\ skipwhite skipempty skipnl
+\ nextgroup=namedSemicolon,
+\     namedO_DnstapOutputSuffix,
+\     namedO_DnstapOutputSize,
+\     namedO_DnstapOutputVersions
 
 hi link namedO_DnstapOutputType namedHL_Clause
 syn keyword namedO_DnstapOutputType contained skipwhite skipnl skipempty

test/github-issue-5-named.conf

@@ -0,0 +1,33 @@
+options {
+	dnstap-output 'dnstap.out';
+	dnstap-output 'dnstap.out';
+	dnstap-output "dnstap.out" ; 
+	dnstap-output "dnstap.out" ; 
+	dnstap-output "dnstap.out" ; ; ;
+	dnstap-output "dnstap.out" ; ; ;
+	dnstap-output "dnstap.out" ; ; ; ;
+	dnstap-output "dnstap.out" ; ; ; ;
+	dnstap-output file 'dnstap.out';
+	dnstap-output file "dnstap.out"; ; ; ;
+	dnstap-output file "dnstap.out" size 123;
+	dnstap-output file "dnstap.out" size unlimited;
+	dnstap-output file "dnstap.out" suffix increment;
+	dnstap-output file "dnstap.out" suffix timestamp;
+	dnstap-output file "dnstap.out" versions 23;
+	dnstap-output file "dnstap.out" size unlimited suffix timestamp;
+	dnstap-output file "dnstap.out" size 345 versions 3;
+	dnstap-output file "dnstap.out" suffix increment versions 2;
+	dnstap-output file "dnstap.out" size unlimited suffix timestamp versions 2;
+	dnstap-output file "dnstap.out" versions 2 size 567 suffix increment;
+	dnstap-output file "dnstap.out" versions 2 suffix timestamp size 789;
+	dnstap { all; };
+	send-cookie no;
+	require-server-cookie no;
+	minimal-responses no;
+	dnssec-validation yes;
+	qname-minimization disabled;
+};
+
+view {
+    dnstap { all; };
+};