summaryrefslogtreecommitdiff
path: root/radius
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-05-28 20:12:16 -0700
committerGuy Harris <guy@alum.mit.edu>2017-05-29 03:12:50 +0000
commitd3af1613ddcc813f2203ea1c06fbbdb3e19ed104 (patch)
tree9bccf115708cd67cfec54aceef8ff6eb5cd2d008 /radius
parent39edfaa3d8b26000642be7c596a965486e61e12a (diff)
downloadwireshark-d3af1613ddcc813f2203ea1c06fbbdb3e19ed104.tar.gz
Update some comments.
We're no longer commenting out dictionary.rfc6929 or dictionary.rfc6930, as we now support those extensions. Make other comments more closely resemble the tip of the master branch in FreeRADIUS. Change-Id: I19144bc6c6ff478d6637bf9679df2c737db82186 Reviewed-on: https://code.wireshark.org/review/21779 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'radius')
-rw-r--r--radius/dictionary22
1 files changed, 12 insertions, 10 deletions
diff --git a/radius/dictionary b/radius/dictionary
index b92b76fca3..2b2f713026 100644
--- a/radius/dictionary
+++ b/radius/dictionary
@@ -2,8 +2,6 @@
#
# Version $Id$
# 2014-11-03 Comment out
-# dictionary.rfc6929
-# dictionary.rfc6930
# dictionary.rfc7155
# dictionary.rfc7268
# As they give errors in the test, something may have changed in the free rasdius syntax
@@ -43,7 +41,7 @@
# This file contains dictionary translations for parsing
# requests and generating responses. All transactions are
# composed of Attribute/Value Pairs. The value of each attribute
-# is specified as one of 4 data types. Valid data types are:
+# is specified as one of a few data types. Valid data types are:
#
# text - printable, generally UTF-8 encoded (subset of 'string')
# string - 0-253 octets
@@ -55,16 +53,20 @@
# ifid - 8 octets in network byte order
# ipv6addr - 16 octets in network byte order
# ipv6prefix - 18 octets in network byte order
-# ether - 6 octets of hh:hh:hh:hh:hh:hh
-# where 'h' is hex digits, upper or lowercase.
#
-# FreeRADIUS includes extended data types which are not defined
+# FreeRADIUS includes data types which are not defined
# in the RFC's. These data types are:
#
# abinary - Ascend's binary filter format.
+# ether - 6 octets of hh:hh:hh:hh:hh:hh
+# where 'h' is hex digits, upper or lowercase.
# octets - raw octets, printed and input as hex strings.
# e.g.: 0x123456789abcdef
#
+# FreeRADIUS uses a number of data types which are defined in
+# RFC 6929. These data types should NEVER be used in any other
+# dictionary. We won't even list them here.
+#
#
# Enumerated values are stored in the user file with dictionary
# VALUE translations for easy administration.
@@ -80,12 +82,13 @@
#
# Include compatibility dictionary for older users file. Move
# this directive to the end of this file if you want to see the
-# old names in the logfiles, INSTEAD OF the new names.
+# old names in the logfiles, instead of the new names.
#
$INCLUDE dictionary.compat
#
-# Include the RFC dictionaries next.
+# IETF allocated attributes and values. Split out into
+# the RFC which defined them.
#
# For a complete list of the standard attributes and values,
# see:
@@ -123,7 +126,6 @@ $INCLUDE dictionary.rfc7055
$INCLUDE dictionary.rfc7499
$INCLUDE dictionary.rfc7930
-
#
# Mostly values which have been allocated by IANA under
# "expert review", but which don't have an RFC associated with them.
@@ -131,7 +133,7 @@ $INCLUDE dictionary.rfc7930
$INCLUDE dictionary.iana
#
-# Include vendor dictionaries after the standard ones.
+# Vendor dictionaries are listed after the standard ones.
#
$INCLUDE dictionary.3com
$INCLUDE dictionary.3gpp