aboutsummaryrefslogtreecommitdiffstats
path: root/radius/dictionary.merit
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2009-07-07 17:52:03 +0000
committerBill Meier <wmeier@newsguy.com>2009-07-07 17:52:03 +0000
commit9ab444404fdc25ac85e7ae4ee9680bfda59e25ea (patch)
treed66958ba5286bda5b23be9748532f66b0ae5de9f /radius/dictionary.merit
parentfd6bcf67a753510606a8349ea871a29a829edd64 (diff)
Update dictionary files from FreeRadius 2.1.6 [5/18/09]: part 2:
Modified files w/o conflicts with current Wireshark radius dictionary files. svn path=/trunk/; revision=28996
Diffstat (limited to 'radius/dictionary.merit')
-rw-r--r--radius/dictionary.merit12
1 files changed, 7 insertions, 5 deletions
diff --git a/radius/dictionary.merit b/radius/dictionary.merit
index 2188bad8f5..3940bb4520 100644
--- a/radius/dictionary.merit
+++ b/radius/dictionary.merit
@@ -1,13 +1,15 @@
+# -*- text -*-
#
# For Merit.
#
# $Id$
#
-VENDOR Merit 61
-
-ATTRIBUTE Merit-Proxy-Action 211 string Merit
-ATTRIBUTE Merit-User-Id 222 string Merit
-ATTRIBUTE Merit-User-Realm 223 string Merit
+VENDOR Merit 61
+BEGIN-VENDOR Merit
+ATTRIBUTE Merit-Proxy-Action 211 string
+ATTRIBUTE Merit-User-Id 222 string
+ATTRIBUTE Merit-User-Realm 223 string
+END-VENDOR Merit