summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-11-26 20:08:07 +0100
committerAnders Broman <a.broman58@gmail.com>2014-11-28 04:43:17 +0000
commit3f8576157be83d746cc200991f6fc5149833e8ce (patch)
tree423e4ab9cce2a3ac66b614d2c029965b90282f50 /Makefile.am
parent8839d7b4526656a04ef563651bbd03ac001c3a66 (diff)
downloadwireshark-3f8576157be83d746cc200991f6fc5149833e8ce.tar.gz
RADIUS: Sync with FreeRADIUS Master
commit 30dac6d3dc87aaaa9c29ecdb33874fa57c2bcbc6 Author: Alan T. DeKok <aland@freeradius.org> Date: Tue Nov 25 16:45:45 2014 -0500 as found on the net commit ee79c59d3a1cae76fcb1940710d9a0f7fbdf8427 Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org> Date: Thu Nov 13 17:39:46 2014 -0500 Add memcached rlm_cache_driver commit 6277960bc830891123b00400af56912e51d4d311 Author: Alan T. DeKok <aland@freeradius.org> Date: Tue Oct 28 17:01:49 2014 -0400 Add FreeRADIUS-Response-Delay-USec Change-Id: I705d0e852d38eaace4f71cfc0a38ecdd41c0b58f Reviewed-on: https://code.wireshark.org/review/5510 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index df97d1fbaa..2731d79d16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -139,6 +139,7 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
radius/dictionary.alvarion.wimax.v2_2 \
radius/dictionary.apc \
radius/dictionary.aptis \
+ radius/dictionary.arbor \
radius/dictionary.aruba \
radius/dictionary.ascend \
radius/dictionary.asn \
@@ -213,6 +214,7 @@ dist_radius_DATA = $(_CUSTOM_radius_dict_) \
radius/dictionary.localweb \
radius/dictionary.lucent \
radius/dictionary.manzara \
+ radius/dictionary.meinberg \
radius/dictionary.merit \
radius/dictionary.meru \
radius/dictionary.microsoft \