Move restrictions on vendor ID from 32767 to 65535

Now that "attr" is stored as an unsigned integer.

Based on a patch from Rafael Ugolini

diff --git a/src/lib/dict.c b/src/lib/dict.c
index 262c110e41124d0fcf12f2fbe1dd6321cb21c1d2..ac28b176f157ef68fae382fefc8c3f81ed23a27a 100644 (file)
--- a/src/lib/dict.c
+++ b/src/lib/dict.c
@@ -421,7 +421,7 @@ int dict_addvendor(const char *name, int value)
        size_t length;
        DICT_VENDOR *dv;
 
-       if (value >= 32767) {
+       if (value > 65535) {
                fr_strerror_printf("dict_addvendor: Cannot handle vendor ID larger than 65535");
                return -1;
        }

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
index 3f0bad694fa2c6f6d971ef019b0f6af9c55194c3..e4d8fb66d7b47af0d929d87a93e7a7e301936dde 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
@@ -226,8 +226,8 @@ static VALUE_PAIR *diameter2vp(REQUEST *request, SSL *ssl,
                                return NULL;
                        }
 
-                       if (vendor > 32767) {
-                               RDEBUG2("Cannot handle vendor Id greater than 32767");
+                       if (vendor > 65535) {
+                               RDEBUG2("Cannot handle vendor Id greater than 65535");
                                pairfree(&first);
                                return NULL;
                        }