Add support for inline BEGIN keyword for protocols

FreeRADIUS · Nov 29, 2024 · 9c4e97a · 9c4e97a
1 parent 344ff9c
commit 9c4e97a
Show file tree

Hide file tree

Showing 20 changed files with 151 additions and 66 deletions.
diff --git a/share/dictionary/README.md b/share/dictionary/README.md
@@ -29,7 +29,7 @@ The following is a list of protocols currently supported in the
 dictionaries.  It is here for informational purposes only.
 
 ```
-git grep -h '^PROTOCOL' | sort -nk 3
+git grep -E -h '^(BEGIN )?PROTOCOL' | sort -nk 3
 ```
 
 ## Current Protocols

diff --git a/share/dictionary/arp/dictionary b/share/dictionary/arp/dictionary
@@ -8,8 +8,7 @@
 # Version:	$Id$
 #
 
-PROTOCOL	ARP		8
-BEGIN-PROTOCOL	ARP
+BEGIN PROTOCOL	ARP		8
 
 $INCLUDE dictionary.freeradius.internal
 $INCLUDE dictionary.rfc826

diff --git a/share/dictionary/bfd/dictionary b/share/dictionary/bfd/dictionary
@@ -8,8 +8,7 @@
 # Version:	$Id$
 #
 
-PROTOCOL	BFD		13
-BEGIN-PROTOCOL	BFD
+BEGIN PROTOCOL	BFD		13
 
 $INCLUDE dictionary.freeradius.internal
 $INCLUDE dictionary.rfc5880

diff --git a/share/dictionary/dhcpv4/dictionary b/share/dictionary/dhcpv4/dictionary
@@ -16,8 +16,7 @@
 #
 ##############################################################################
 
-PROTOCOL	DHCPv4		2	verify=lib
-BEGIN-PROTOCOL	DHCPv4
+BEGIN PROTOCOL	DHCPv4		2	verify=lib
 
 $INCLUDE dictionary.freeradius.internal
 

diff --git a/share/dictionary/dhcpv6/dictionary b/share/dictionary/dhcpv6/dictionary
@@ -10,8 +10,7 @@
 #
 ##############################################################################
 
-PROTOCOL	DHCPv6		3	verify=lib
-BEGIN-PROTOCOL	DHCPv6
+BEGIN PROTOCOL	DHCPv6		3	verify=lib
 
 $INCLUDE dictionary.freeradius.internal
 $INCLUDE dictionary.rfc3315

diff --git a/share/dictionary/dns/dictionary b/share/dictionary/dns/dictionary
@@ -8,8 +8,7 @@
 # Version:	$Id$
 #
 
-PROTOCOL	DNS		11	format=2
-BEGIN-PROTOCOL	DNS
+BEGIN PROTOCOL	DNS		11	format=2
 
 $INCLUDE dictionary.freeradius.internal
 $INCLUDE dictionary.rfc1034

diff --git a/share/dictionary/eap/aka-sim/dictionary b/share/dictionary/eap/aka-sim/dictionary
@@ -6,8 +6,7 @@
 #	Protocol dictionary for EAP-AKA, EAP-AKA', and EAP-SIM
 #
 #
-PROTOCOL	EAP-AKA-SIM	102
-BEGIN-PROTOCOL	EAP-AKA-SIM
+BEGIN PROTOCOL	EAP-AKA-SIM	102
 
 $INCLUDE dictionary.freeradius
 $INCLUDE dictionary.rfc4187

diff --git a/share/dictionary/eap/fast/dictionary b/share/dictionary/eap/fast/dictionary
@@ -6,8 +6,7 @@
 #	Protocol dictionary for EAP-FAST
 #
 #
-PROTOCOL	EAP-FAST	103
-BEGIN-PROTOCOL	EAP-FAST
+BEGIN PROTOCOL	EAP-FAST	103
 
 $INCLUDE dictionary.freeradius
 

diff --git a/share/dictionary/ethernet/dictionary b/share/dictionary/ethernet/dictionary
@@ -17,8 +17,7 @@
 #	On top of that, a number of options are really TLV's.
 #	We need to be able to understand them, too.
 #
-PROTOCOL	Ethernet	4
-BEGIN-PROTOCOL	Ethernet
+BEGIN PROTOCOL	Ethernet	4
 
 $INCLUDE dictionary.ethernet
 

diff --git a/share/dictionary/ldap/dictionary b/share/dictionary/ldap/dictionary
@@ -8,8 +8,7 @@
 # Version:	$Id$
 #
 
-PROTOCOL	LDAP		12
-BEGIN-PROTOCOL	LDAP
+BEGIN PROTOCOL	LDAP		12
 
 $INCLUDE dictionary.freeradius.internal
 

diff --git a/share/dictionary/radius/dictionary b/share/dictionary/radius/dictionary
@@ -4,8 +4,7 @@
 # Version $Id$
 #
 
-PROTOCOL	RADIUS		1	verify=lib
-BEGIN-PROTOCOL	RADIUS
+BEGIN PROTOCOL	RADIUS		1	verify=lib
 
 #
 #	These are mostly ALIASes

diff --git a/share/dictionary/snmp/dictionary b/share/dictionary/snmp/dictionary
@@ -8,8 +8,7 @@
 # Version:	$Id$
 #
 
-PROTOCOL	SNMP		7	format=4
-BEGIN-PROTOCOL	SNMP
+BEGIN PROTOCOL	SNMP		7	format=4
 
 $INCLUDE dictionary.freeradius
 

diff --git a/share/dictionary/tacacs/dictionary b/share/dictionary/tacacs/dictionary
@@ -8,8 +8,7 @@
 # Version:	$Id$
 #
 
-PROTOCOL	TACACS		5	format=string
-BEGIN-PROTOCOL TACACS
+BEGIN PROTOCOL	TACACS		5	format=string
 
 $INCLUDE dictionary.freeradius.internal
 $INCLUDE dictionary.tacacs

diff --git a/share/dictionary/tftp/dictionary b/share/dictionary/tftp/dictionary
@@ -8,8 +8,7 @@
 # Version:	$Id$
 #
 
-PROTOCOL	TFTP		9
-BEGIN-PROTOCOL	TFTP
+BEGIN PROTOCOL	TFTP		9
 
 $INCLUDE dictionary.freeradius.internal
 $INCLUDE dictionary.rfc1350

diff --git a/share/dictionary/tls/dictionary b/share/dictionary/tls/dictionary
@@ -8,8 +8,7 @@
 # Version:	$Id$
 #
 
-PROTOCOL	TLS		10
-BEGIN-PROTOCOL	TLS
+BEGIN PROTOCOL	TLS		10
 
 $INCLUDE dictionary.freeradius
 

diff --git a/share/dictionary/vmps/dictionary b/share/dictionary/vmps/dictionary
@@ -8,8 +8,7 @@
 # Version:	$Id$
 #
 
-PROTOCOL	VMPS		6	format=2
-BEGIN-PROTOCOL	VMPS
+BEGIN PROTOCOL	VMPS		6	format=2
 
 $INCLUDE dictionary.vmps