remove Autz-Type, etc.

We now only have Auth-Type left in the server.

The dictionary entries are commented out, for both
ATTRIBUTEs and VALUEs

The code no longer references any of these types.

diff --git a/share/dictionary/freeradius/dictionary.freeradius.internal b/share/dictionary/freeradius/dictionary.freeradius.internal
index 96c7e8cc0de8063eac597b6a298546737460b96a..de8dfae2ebbce2c8743e786684699c5763dc527e 100644 (file)
--- a/share/dictionary/freeradius/dictionary.freeradius.internal
+++ b/share/dictionary/freeradius/dictionary.freeradius.internal
@@ -53,13 +53,13 @@ ATTRIBUTE   Connect-Rate                            1007    integer
 ATTRIBUTE      Add-Prefix                              1008    string
 ATTRIBUTE      Add-Suffix                              1009    string
 ATTRIBUTE      Expiration                              1010    date
-ATTRIBUTE      Autz-Type                               1011    integer
-ATTRIBUTE      Acct-Type                               1012    integer
-ATTRIBUTE      Session-Type                            1013    integer
-ATTRIBUTE      Post-Auth-Type                          1014    integer
-ATTRIBUTE      Pre-Proxy-Type                          1015    integer
-ATTRIBUTE      Post-Proxy-Type                         1016    integer
-ATTRIBUTE      Pre-Acct-Type                           1017    integer
+#ATTRIBUTE     Autz-Type                               1011    integer
+#ATTRIBUTE     Acct-Type                               1012    integer
+#ATTRIBUTE     Session-Type                            1013    integer
+#ATTRIBUTE     Post-Auth-Type                          1014    integer
+#ATTRIBUTE     Pre-Proxy-Type                          1015    integer
+#ATTRIBUTE     Post-Proxy-Type                         1016    integer
+#ATTRIBUTE     Pre-Acct-Type                           1017    integer
 
 #
 #      This is the EAP type of authentication, which is set
@@ -223,8 +223,8 @@ ATTRIBUTE   EAP-EMSK                                1130    octets
 #
 #      For send/recv CoA packets (like Auth-Type, Acct-Type, etc.)
 #
-ATTRIBUTE      Recv-CoA-Type                           1131    integer
-ATTRIBUTE      Send-CoA-Type                           1132    integer
+#ATTRIBUTE     Recv-CoA-Type                           1131    integer
+#ATTRIBUTE     Send-CoA-Type                           1132    integer
 
 ATTRIBUTE      MS-CHAP-Password                        1133    string
 ATTRIBUTE      Packet-Transmit-Counter                 1134    integer
@@ -770,46 +770,46 @@ VALUE     Auth-Type                       Accept                  254
 #
 #      Authorization type, too.
 #
-VALUE  Autz-Type                       Local                   1
+#VALUE Autz-Type                       Local                   1
 
 #
 #      And accounting
 #
-VALUE  Acct-Type                       Local                   1
+#VALUE Acct-Type                       Local                   1
 
 #
 #      And Session handling
 #
-VALUE  Session-Type                    Local                   1
+#VALUE Session-Type                    Local                   1
 
 #
 #      And Post-Auth
-VALUE  Post-Auth-Type                  Local                   1
-VALUE  Post-Auth-Type                  Reject                  2
-VALUE  Post-Auth-Type                  Challenge               3
+#VALUE Post-Auth-Type                  Local                   1
+#VALUE Post-Auth-Type                  Reject                  2
+#VALUE Post-Auth-Type                  Challenge               3
 
 #
 #      And Post-Proxy
-VALUE  Post-Proxy-Type                 Fail-Access-Request     1
-VALUE  Post-Proxy-Type                 Fail-Authentication     1
+#VALUE Post-Proxy-Type                 Fail-Access-Request     1
+#VALUE Post-Proxy-Type                 Fail-Authentication     1
 
-VALUE  Post-Proxy-Type                 Access-Reject           3
-VALUE  Post-Proxy-Type                 Reject                  3
+#VALUE Post-Proxy-Type                 Access-Reject           3
+#VALUE Post-Proxy-Type                 Reject                  3
 
-VALUE  Post-Proxy-Type                 Fail-Accounting-Request 4
-VALUE  Post-Proxy-Type                 Fail-Accounting         4
+#VALUE Post-Proxy-Type                 Fail-Accounting-Request 4
+#VALUE Post-Proxy-Type                 Fail-Accounting         4
 
-VALUE  Post-Proxy-Type                 Fail-Disconnect-Request 40
-VALUE  Post-Proxy-Type                 Fail-Disconnect         40
+#VALUE Post-Proxy-Type                 Fail-Disconnect-Request 40
+#VALUE Post-Proxy-Type                 Fail-Disconnect         40
 
-VALUE  Post-Proxy-Type                 Disconnect-NAK          42
+#VALUE Post-Proxy-Type                 Disconnect-NAK          42
 
-VALUE  Post-Proxy-Type                 Fail-CoA-Request        43
-VALUE  Post-Proxy-Type                 Fail-CoA                43
+#VALUE Post-Proxy-Type                 Fail-CoA-Request        43
+#VALUE Post-Proxy-Type                 Fail-CoA                43
 
-VALUE  Post-Proxy-Type                 CoA-NAK                 45
+#VALUE Post-Proxy-Type                 CoA-NAK                 45
 
-VALUE  Post-Proxy-Type                 Fail                    256
+#VALUE Post-Proxy-Type                 Fail                    256
 
 #
 #      Experimental Non-Protocol Integer Translations for FreeRADIUS

diff --git a/src/lib/server/cond_tokenize.c b/src/lib/server/cond_tokenize.c
index d7993cba7125c486e434a734f2b14e093d2681e6..3964f01c36c5a73aa5a6b247ee6d2bbbbcc13af1 100644 (file)
--- a/src/lib/server/cond_tokenize.c
+++ b/src/lib/server/cond_tokenize.c
@@ -1126,15 +1126,6 @@ static ssize_t cond_tokenize(TALLOC_CTX *ctx, fr_cond_t **pcond, char const **er
 
                                                switch (da->attr) {
                                                case FR_AUTH_TYPE:
-                                               case FR_AUTZ_TYPE:
-                                               case FR_ACCT_TYPE:
-                                               case FR_SESSION_TYPE:
-                                               case FR_POST_AUTH_TYPE:
-                                               case FR_PRE_PROXY_TYPE:
-                                               case FR_POST_PROXY_TYPE:
-                                               case FR_PRE_ACCT_TYPE:
-                                               case FR_RECV_COA_TYPE:
-                                               case FR_SEND_COA_TYPE:
                                                        /*
                                                         *      The types for these attributes are dynamically allocated
                                                         *      by module.c, so we can't enforce strictness here.