Move more enum values inline

diff --git a/share/dictionary/radius/dictionary.hp b/share/dictionary/radius/dictionary.hp
index 4fb4c736fa9b671a529f5f088175f723d7b67d88..126e19b6b67d42f3144431fba1b6bd64799166b3 100644 (file)
--- a/share/dictionary/radius/dictionary.hp
+++ b/share/dictionary/radius/dictionary.hp
@@ -19,13 +19,24 @@ BEGIN-VENDOR        HP
 ATTRIBUTE      HP-Privilege-Level                      1       integer
 ATTRIBUTE      HP-Command-String                       2       string
 ATTRIBUTE      HP-Command-Exception                    3       integer
+
+VALUE  HP-Command-Exception            Permit-List             0
+VALUE  HP-Command-Exception            Deny-List               1
+
 ATTRIBUTE      HP-Management-Protocol                  26      integer
 
+VALUE  HP-Management-Protocol          HTTP                    5
+VALUE  HP-Management-Protocol          HTTPS                   6
+
 # Dynamic port-access attributes
 ATTRIBUTE      HP-Port-Client-Limit-Dot1x              10      integer
 ATTRIBUTE      HP-Port-Client-Limit-MA                 11      integer
 ATTRIBUTE      HP-Port-Client-Limit-WA                 12      integer
 ATTRIBUTE      HP-Port-Auth-Mode-Dot1x                 13      integer
+
+VALUE  HP-Port-Auth-Mode-Dot1x         Port-Based              1
+VALUE  HP-Port-Auth-Mode-Dot1x         User-Based              2
+
 ATTRIBUTE      HP-Port-MA-Port-Mode                    14      integer
 
 VALUE  HPE-Port-MA-Port-Mode           User-Based                      0
@@ -61,17 +72,7 @@ ATTRIBUTE    HP-VC-groups                            192     string
 # See http://wiki.freeradius.org/vendor/HP#Capability-advertisements
 ATTRIBUTE      HP-Capability-Advert                    255     octets
 
-# HP-Port-Auth-Mode-Dot1x Attribute Values
-VALUE  HP-Port-Auth-Mode-Dot1x         Port-Based              1
-VALUE  HP-Port-Auth-Mode-Dot1x         User-Based              2
-
-# HP-Command-Exception Attribute Values
-VALUE  HP-Command-Exception            Permit-List             0
-VALUE  HP-Command-Exception            Deny-List               1
-
 # HP-Management-Protocol
-VALUE  HP-Management-Protocol          HTTP                    5
-VALUE  HP-Management-Protocol          HTTPS                   6
 
 #
 #  Conflicting attributes are commented out.