From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 25 Aug 2022 14:59:24 +0000 (+0100)
Subject: Shorten the name of the protocol encapsulation attribute
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6a7301745e81e7555a059c4a542113a7613860a;p=thirdparty%2Ffreeradius-server.git

Shorten the name of the protocol encapsulation attribute
---

diff --git a/share/dictionary/freeradius/dictionary.freeradius.internal b/share/dictionary/freeradius/dictionary.freeradius.internal
index e578adb2638..97d155b3860 100644
--- a/share/dictionary/freeradius/dictionary.freeradius.internal
+++ b/share/dictionary/freeradius/dictionary.freeradius.internal
@@ -281,7 +281,7 @@ VALUE	Listen-Socket-Type		coa			8
 ATTRIBUTE	Outer-Realm-Name			1251	string
 ATTRIBUTE	Inner-Realm-Name			1252	string
 ATTRIBUTE	Request-Lifetime			1253	integer
-ATTRIBUTE	Protocol-Encapsulation			1254	tlv
+ATTRIBUTE	Proto					1254	tlv
 
 #
 #	Range:	1255 - 1699
diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c
index fd3c5f553a8..dde5faa40c0 100644
--- a/src/lib/util/dict_util.c
+++ b/src/lib/util/dict_util.c
@@ -890,7 +890,7 @@ int dict_protocol_add(fr_dict_t *dict)
 		fr_dict_attr_t const *da;
 		fr_dict_attr_flags_t flags = { 0 };
 
-		if (!dict_gctx->attr_protocol_encapsulation) dict_gctx->attr_protocol_encapsulation = fr_dict_attr_by_name(NULL, dict_gctx->internal->root, "Protocol-Encapsulation");
+		if (!dict_gctx->attr_protocol_encapsulation) dict_gctx->attr_protocol_encapsulation = fr_dict_attr_by_name(NULL, dict_gctx->internal->root, "Proto");
 		fr_assert(dict_gctx->attr_protocol_encapsulation != NULL);
 
 		da = fr_dict_attr_child_by_num(dict_gctx->attr_protocol_encapsulation, dict->root->attr);