From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 23 Oct 2024 05:28:24 +0000 (-0600)
Subject: Alias the "Compatible" vendor to cisco.vpn5000 to avoid conflicts
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1b7d911c7b141d70ff287584797c1394dc8bf06;p=thirdparty%2Ffreeradius-server.git

Alias the "Compatible" vendor to cisco.vpn5000 to avoid conflicts
---

diff --git a/share/dictionary/bfd/dictionary.freeradius.internal b/share/dictionary/bfd/dictionary.freeradius.internal
index a1326e5d4c5..be8ec2f9e6f 100644
--- a/share/dictionary/bfd/dictionary.freeradius.internal
+++ b/share/dictionary/bfd/dictionary.freeradius.internal
@@ -27,4 +27,5 @@ VALUE	Packet-Type			Up				3
 #
 #  Additional data which gets added to the end of the BFD packet.
 #
-DEFINE	Additional-Data				group
+DEFINE		Additional-Data				group
+ATTRIBUTE	More-Data		1		string
diff --git a/share/dictionary/radius/dictionary b/share/dictionary/radius/dictionary
index 2680b2709ce..2466bac432b 100644
--- a/share/dictionary/radius/dictionary
+++ b/share/dictionary/radius/dictionary
@@ -134,7 +134,6 @@ $INCLUDE dictionary.ckey
 $INCLUDE dictionary.clavister
 $INCLUDE dictionary.cnergee
 $INCLUDE dictionary.colubris
-$INCLUDE dictionary.compatible
 $INCLUDE dictionary.cosine
 $INCLUDE dictionary.covaro
 $INCLUDE dictionary.dante
diff --git a/share/dictionary/radius/dictionary.cisco.vpn5000 b/share/dictionary/radius/dictionary.cisco.vpn5000
index 3651593d1bf..18f9e18abb6 100644
--- a/share/dictionary/radius/dictionary.cisco.vpn5000
+++ b/share/dictionary/radius/dictionary.cisco.vpn5000
@@ -12,6 +12,7 @@
 VENDOR		Cisco-VPN5000			255
 
 BEGIN-VENDOR	Cisco-VPN5000
+ATTRIBUTE	Tunnel-Delay				0	integer
 ATTRIBUTE	Tunnel-Throughput			1	integer
 ATTRIBUTE	Client-Assigned-IP			2	string
 ATTRIBUTE	Client-Real-IP				3	ipaddr
@@ -21,3 +22,4 @@ ATTRIBUTE	Echo					6	integer
 ATTRIBUTE	Client-Assigned-IPX			7	integer
 END-VENDOR  Cisco-VPN5000
 ALIAS		Cisco-VPN5000				Vendor-Specific.Cisco-VPN5000
+ALIAS		Compatible				Vendor-Specific.Cisco-VPN5000
diff --git a/share/dictionary/radius/dictionary.compatible b/share/dictionary/radius/dictionary.compatible
deleted file mode 100644
index 972073ae740..00000000000
--- a/share/dictionary/radius/dictionary.compatible
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- text -*-
-# Copyright (C) 2023 The FreeRADIUS Server project and contributors
-# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0
-# Version $Id$
-#
-#	Compatible Systems Corporation dictionary
-#
-#	Compatible Systems was acquired by Cisco in 2000.
-#
-
-VENDOR		Compatible			255
-
-BEGIN-VENDOR	Compatible
-
-ATTRIBUTE	Tunnel-Delay				0	integer
-ATTRIBUTE	Tunnel-Throughput			1	integer
-ATTRIBUTE	Tunnel-Server-Endpoint			3	ipaddr
-ATTRIBUTE	Tunnel-Group-Info			4	string
-ATTRIBUTE	Tunnel-Password				5	string
-ATTRIBUTE	Echo					6	integer
-ATTRIBUTE	Tunnel-IPX				7	integer
-
-END-VENDOR      Compatible