From: Luke Howard <lukeh@padl.com>
Date: Sat, 12 Mar 2011 04:18:50 +0000 (+1100)
Subject: cleanup commit 87b8bd5ef53b7813f138949b6cd2a1712f14eef5
X-Git-Tag: dvd/201105~12^2~118^2~3
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.orig;a=commitdiff_plain;h=360166c7359173c01758a2d24aa7e8985c1190c7

cleanup commit 87b8bd5ef53b7813f138949b6cd2a1712f14eef5
---

diff --git a/util_radius.cpp b/util_radius.cpp
index a680741..90ce876 100644
--- a/util_radius.cpp
+++ b/util_radius.cpp
@@ -479,10 +479,12 @@ gssEapRadiusAddAvp(OM_uint32 *minor,
         VALUE_PAIR *vp;
         size_t n = remain;
 
-	/*There's an extra byte of padding; RADIUS AVPS can only
-	 * be 253 octets*/
-        if (n > MAX_STRING_LEN-1)
-            n = MAX_STRING_LEN-1;
+	/*
+         * There's an extra byte of padding; RADIUS AVPs can only
+         * be 253 octets.
+         */
+        if (n >= MAX_STRING_LEN)
+            n = MAX_STRING_LEN - 1;
 
         vp = paircreate(attrid, PW_TYPE_OCTETS);
         if (vp == NULL) {
@@ -683,13 +685,8 @@ avpImport(VALUE_PAIR **pVp,
         remain -= 5;
         break;
     case PW_TYPE_STRING:
-        /* check enough room to NUL terminate */
-        if (p[0] == MAX_STRING_LEN)
-            goto fail;
-        else
-        /* fallthrough */
     default:
-        if (p[0] > MAX_STRING_LEN)
+        if (p[0] >= MAX_STRING_LEN)
             goto fail;
 
         vp->length = (uint32_t)p[0];