Merge with FreeRADIUS version.
authorGuy Harris <guy@alum.mit.edu>
Tue, 30 May 2017 03:09:13 +0000 (20:09 -0700)
committerGuy Harris <guy@alum.mit.edu>
Tue, 30 May 2017 03:10:17 +0000 (03:10 +0000)
Pick up the copyright notice, whitespace changes, and other comment
changes.

Add a comment giving the Wireshark bug whence the additional entries
came.

Change-Id: Ibc188640efe73ca2f53d84bf995b5d7bf34752f9
Reviewed-on: https://code.wireshark.org/review/21815
Reviewed-by: Guy Harris <guy@alum.mit.edu>
radius/dictionary.iea

index cbfd7974c97406bfaac2b741fb539cc7dba50310..5695634857f1560c63a01cdeafda411866dab543 100644 (file)
@@ -1,31 +1,35 @@
 # -*- text -*-
+# Copyright (C) 2015 The FreeRADIUS Server project and contributors
+#
 # IEA Software, Inc.
 # RADIUS VSA Dictionary
 # http://www.iea-software.com
-#
-
-VENDOR IEA-Software 24023
-BEGIN-VENDOR IEA-Software
 
+VENDOR         IEA-Software                    24023
+BEGIN-VENDOR   IEA-Software
 
 # AirMarshal Attributes [1-30]
-ATTRIBUTE AM-Interrupt-HTMLFile                        1       string
-ATTRIBUTE AM-Interrupt-Interval                        2       integer
-ATTRIBUTE AM-Interrupt-Timeout                 3       integer
-ATTRIBUTE AM-Status-HTMLFile                   4       string
-ATTRIBUTE AM-HTTP-Proxy-Port                   5       integer
-ATTRIBUTE AM-ACK-HTMLFile                              6       string
-ATTRIBUTE AM-NAK-HTMLFile                              7       string
-ATTRIBUTE AM-Bandwidth-Pool                            8       string
-ATTRIBUTE AM-Bandwidth-Pool-Max-Up             9       integer
-ATTRIBUTE AM-Bandwidth-Pool-Max-Down   10      integer
-ATTRIBUTE AM-Mirroring                                 11      integer
-ATTRIBUTE AM-Disconnect-Access                 12      integer
+# Some added as per
+#
+#    https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6486
+#
+ATTRIBUTE      AM-Interrupt-HTMLFile                   1       string
+ATTRIBUTE      AM-Interrupt-Interval                   2       integer
+ATTRIBUTE      AM-Interrupt-Timeout                    3       integer
+ATTRIBUTE      AM-Status-HTMLFile                      4       string
+ATTRIBUTE      AM-HTTP-Proxy-Port                      5       integer
+ATTRIBUTE      AM-ACK-HTMLFile                         6       string
+ATTRIBUTE      AM-NAK-HTMLFile                         7       string
+ATTRIBUTE      AM-Bandwidth-Pool                       8       string
+ATTRIBUTE      AM-Bandwidth-Pool-Max-Up                9       integer
+ATTRIBUTE      AM-Bandwidth-Pool-Max-Down              10      integer
+ATTRIBUTE      AM-Mirroring                            11      integer
+ATTRIBUTE      AM-Disconnect-Access                    12      integer
 
-VALUE  AM-Mirroring    Disabled                                0
-VALUE  AM-Mirroring    Full-Packet-Local-PCAP  1
+VALUE  AM-Mirroring                    Disabled                0
+VALUE  AM-Mirroring                    Full-Packet-Local-PCAP  1
 
-VALUE  AM-Disconnect-Access    Allow-All               0
-VALUE  AM-Disconnect-Access    Deny-RADIUS             1
+VALUE  AM-Disconnect-Access            Allow-All               0
+VALUE  AM-Disconnect-Access            Deny-RADIUS             1
 
 END-VENDOR IEA-Software