manual merge from v3.0.x

diff --git a/share/dictionary/radius/dictionary b/share/dictionary/radius/dictionary
index 6998efba4120879dcc417b9af8ab001a79df62e2..13e75f856b4a1879e9d91430e393186dc383e7f4 100644 (file)
--- a/share/dictionary/radius/dictionary
+++ b/share/dictionary/radius/dictionary
@@ -261,6 +261,7 @@ $INCLUDE dictionary.paloalto
 $INCLUDE dictionary.patton
 $INCLUDE dictionary.perle
 $INCLUDE dictionary.pfsense
+$INCLUDE dictionary.pica8
 $INCLUDE dictionary.propel
 $INCLUDE dictionary.prosoft
 $INCLUDE dictionary.proxim

diff --git a/share/dictionary/radius/dictionary.pica8 b/share/dictionary/radius/dictionary.pica8
new file mode 100644 (file)
index 0000000..8a159ac
--- /dev/null
+++ b/share/dictionary/radius/dictionary.pica8
@@ -0,0 +1,16 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0#
+#
+# Pica8 RADIUS attributes
+# For general information please visit:
+# http://www.pica8.com
+#
+
+VENDOR         Pica8                           35098
+
+BEGIN-VENDOR   Pica8
+
+ATTRIBUTE      Pica8-AVPair                            1       string
+
+END-VENDOR     Pica8