diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-05-29 19:36:46 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-05-30 02:37:18 +0000 |
| commit | efcf07cf867b5c9b71967ca9dffb34b6026c3e23 (patch) | |
| tree | 7c013e00e404c712d626a584046e0aa201c8a0f0 /radius | |
| parent | 7e60677992b7a42e969019da117df3008c5d9c75 (diff) | |
Merge with FreeRADIUS.
They changed some names and added an attribute.
They also removed Aruba-AP-Name with no obvious indication of why; we
leave it in for now.
Give new URLs for attribute lists.
Change-Id: I270573b7d29f47572042abe46e4a531003e6a48e
Reviewed-on: https://code.wireshark.org/review/21811
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'radius')
| -rw-r--r-- | radius/README.radius_dictionary | 4 | ||||
| -rw-r--r-- | radius/dictionary.aruba | 28 |
2 files changed, 23 insertions, 9 deletions
diff --git a/radius/README.radius_dictionary b/radius/README.radius_dictionary index 7fdd81b217..52dccb2b04 100644 --- a/radius/README.radius_dictionary +++ b/radius/README.radius_dictionary @@ -49,9 +49,7 @@ with the following changes: Additions from the FreeRadius version are marked with "## [wireshark]". 8. dictionary.aruba - - FreeRadius 2.1.6 dictionary.aruba plus additions: - See Wireshark Bug #3104 and SVN #26945; - See also: https://airheads.arubanetworks.com/vBulletin/showthread.php?t=910 + - FreeRADIUS version, but with one attribute they removed left in. 9. dictionary.3gpp2 - FreeRadius 2.1.6 dictionary.3gpp2 plus updates based upon diff --git a/radius/dictionary.aruba b/radius/dictionary.aruba index a6d315229f..d2b3fa51a7 100644 --- a/radius/dictionary.aruba +++ b/radius/dictionary.aruba @@ -1,18 +1,36 @@ # -*- text -*- +# Copyright (C) 2015 The FreeRADIUS Server project and contributors # -# Version: $Id$ +# Version: $Id: 816b5b15dba8cf77b9b7ffab200b3716e09f8d62 $ # VENDOR Aruba 14823 BEGIN-VENDOR Aruba +# +# See +# +# https://community.arubanetworks.com/t5/Security/Microsoft-NPS-custom-attributes/td-p/95999 +# https://community.arubanetworks.com/t5/Wireless-Access/Assigning-users-different-vlan-subnet-based-on-AD-group/td-p/59210 +# +# for lists of Aruba attributes. +# +# XXX - FreeRADIUS removed Aruba-AP-Name in revision +# +# Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org> +# Date: Mon Apr 22 15:35:20 2013 -0400 +# +# Updates as provided by Giles Scott +# +# with no indication of why it was removed. +# ATTRIBUTE Aruba-User-Role 1 string ATTRIBUTE Aruba-User-Vlan 2 integer ATTRIBUTE Aruba-Priv-Admin-User 3 integer ATTRIBUTE Aruba-Admin-Role 4 string ATTRIBUTE Aruba-Essid-Name 5 string ATTRIBUTE Aruba-Location-Id 6 string -ATTRIBUTE Aruba-Port-Id 7 string -ATTRIBUTE Aruba-Template-User 8 string +ATTRIBUTE Aruba-Port-Identifier 7 string +ATTRIBUTE Aruba-MMS-User-Template 8 string ATTRIBUTE Aruba-Named-User-Vlan 9 string ATTRIBUTE Aruba-AP-Group 10 string @@ -41,14 +59,12 @@ ATTRIBUTE Aruba-AS-Credential-Hash 30 string ATTRIBUTE Aruba-WorkSpace-App-Name 31 string ATTRIBUTE Aruba-Mdps-Provisioning-Settings 32 string ATTRIBUTE Aruba-Mdps-Device-Profile 33 string - ATTRIBUTE Aruba-AP-IP-Address 34 ipaddr - ATTRIBUTE Aruba-AirGroup-Shared-Group 35 string ATTRIBUTE Aruba-User-Group 36 string ATTRIBUTE Aruba-Network-SSO-Token 37 string ATTRIBUTE Aruba-AirGroup-Version 38 integer - +ATTRIBUTE Aruba-Auth-SurvMethod 39 integer ATTRIBUTE Aruba-Port-Bounce-Host 40 integer ATTRIBUTE Aruba-Calea-Server-Ip 41 ipaddr |