From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 12 Aug 2009 09:12:49 +0000 (+0200)
Subject: Remove final restrictions on attributes > 32767
X-Git-Tag: release_2_1_7~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92e0d149bd40cf1e1a58298926d16c26ba51fdd8;p=thirdparty%2Ffreeradius-server.git

Remove final restrictions on attributes > 32767
---

diff --git a/src/include/libradius.h b/src/include/libradius.h
index a01780240bb..95535446390 100644
--- a/src/include/libradius.h
+++ b/src/include/libradius.h
@@ -59,7 +59,7 @@ RCSIDH(libradius_h, "$Id$")
 #define CHAP_VALUE_LENGTH       16
 #define MAX_STRING_LEN		254	/* RFC2138: string 0-253 octets */
 
-#  define VENDOR(x)		((x >> 16) & 0x7fff)
+#  define VENDOR(x)		((x >> 16) & 0xffff)
 
 #ifdef _LIBRADIUS
 #  define AUTH_HDR_LEN		20
diff --git a/src/lib/dict.c b/src/lib/dict.c
index ac28b176f15..3fa2f0da8f9 100644
--- a/src/lib/dict.c
+++ b/src/lib/dict.c
@@ -1725,7 +1725,7 @@ DICT_ATTR *dict_attrbyvalue(unsigned int attr)
 	if ((attr > 0) && (attr < 256)) return dict_base_attrs[attr];
 
 	dattr.attr = attr;
-	dattr.vendor = VENDOR(attr) & 0x7fff;
+	dattr.vendor = VENDOR(attr);
 
 	return fr_hash_table_finddata(attributes_byvalue, &dattr);
 }