Index: avpair.c
===================================================================
RCS file: /source/radiusclient/lib/avpair.c,v
retrieving revision 1.24
diff -u -r1.24 avpair.c
--- avpair.c	4 Feb 2010 10:30:26 -0000	1.24
+++ avpair.c	21 Apr 2010 08:12:32 -0000
@@ -212,7 +212,7 @@
 		memcpy(&lvalue, ptr, 4);
 		vendorpec = ntohl(lvalue);
 		if (rc_dict_getvend(rh, vendorpec) == NULL) {
-			/* Warn and skip over the unknown VSA */
+			/* Warn the unknown VSA */
 			rc_log(LOG_WARNING, "rc_avpair_gen: received VSA "
 			    "attribute with unknown Vendor-Id %d", vendorpec);
 			return pair;
@@ -238,10 +238,10 @@
 		} else {
 			rc_log(LOG_WARNING, "rc_avpair_gen: received "
 			    "unknown VSA attribute %d, vendor %d of "
-			    "length %d: 0x%s", attribute & 0xffff,
-			    VENDOR(attribute), attrlen + 2, buffer);
+			    "length %d: 0x%s", ATTRID(attribute),
+			    VENDOR(attribute), attrlen, buffer);
 		}
-		goto shithappens;
+		return pair;
 	}
 
 	rpair = malloc(sizeof(*rpair));