Update Mikrotik dictionary

Based on https://wiki.mikrotik.com/wiki/Manual:RADIUS_Client/reference_dictionary

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0c7d6149230824294b17e2c613148aed9d183244..1f9451e9d75c136885172f85b6130f407b56aafa 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -38,6 +38,7 @@ FreeRADIUS 3.0.22 Tue 24 Mar 2020 12:00:00 EDT urgency=low
        * More RFC complaince for various corner cases of DHCP,
        * Treat DHCP Discover and Request differently for lease allocation times.
        * Add support for PBKDF2 keys. Fixes #2649
+       * Update dictionary.mikrotik
 
        Bug fixes
        * Respect the "log_reject" configuration item in more places.

diff --git a/share/dictionary.mikrotik b/share/dictionary.mikrotik
index 5516b967038401e37230d717f2a7e43c3e70b01b..778b35a38f1a6f38847a5be34df3076e7f64cfa2 100644 (file)
--- a/share/dictionary.mikrotik
+++ b/share/dictionary.mikrotik
@@ -45,9 +45,11 @@ ATTRIBUTE    Mikrotik-Wireless-Comment               21      string
 ATTRIBUTE      Mikrotik-Delegated-IPv6-Pool            22      string
 ATTRIBUTE      Mikrotik-DHCP-Option-Set                23      string
 ATTRIBUTE      Mikrotik-DHCP-Option-Param-STR1         24      string
-ATTRIBUTE      Mikrotik-DHCP-Option-ParamSTR2          25      string
+ATTRIBUTE      Mikrotik-DHCP-Option-Param-STR2         25      string
+ATTRIBUTE      Mikrotik-DHCP-Option-ParamSTR2          25      string
 ATTRIBUTE      Mikrotik-Wireless-VLANID                26      integer
-ATTRIBUTE      Mikrotik-Wireless-VLANID-Type           27      integer
+ATTRIBUTE      Mikrotik-Wireless-VLANIDtype            27      integer
+ATTRIBUTE      Mikrotik-Wireless-VLANID-Type           27      integer
 ATTRIBUTE      Mikrotik-Wireless-Minsignal             28      string
 ATTRIBUTE      Mikrotik-Wireless-Maxsignal             29      string
 ATTRIBUTE      Mikrotik-Switching-Filter               30      string
@@ -60,4 +62,7 @@ VALUE Mikrotik-Wireless-Enc-Algo      104-bit-WEP             2
 VALUE  Mikrotik-Wireless-Enc-Algo      AES-CCM                 3
 VALUE  Mikrotik-Wireless-Enc-Algo      TKIP                    4
 
+VALUE  Mikrotik-Wireless-VLANIDtype    802.1q                  0
+VALUE  Mikrotik-Wireless-VLANIDtype    802.1ad                 1
+
 END-VENDOR     Mikrotik