fix last commit
authorAlan T. DeKok <aland@freeradius.org>
Thu, 14 Jan 2016 22:08:08 +0000 (17:08 -0500)
committerAlan T. DeKok <aland@freeradius.org>
Thu, 14 Jan 2016 22:08:08 +0000 (17:08 -0500)
src/lib/radius.c

index 964eb00..f0b82ed 100644 (file)
@@ -1845,11 +1845,12 @@ int rad_encode(RADIUS_PACKET *packet, RADIUS_PACKET const *original,
                 *      skip them (except for CUI, thanks WiMAX!) on
                 *      all other attributes.
                 */
-               if ((reply->vp_length == 0) &&
-                   (reply->da->vendor == 0) &&
-                   (reply->da->attr != PW_CHARGEABLE_USER_IDENTITY)) {
-                       reply = reply->next;
-                       continue;
+               if (reply->vp_length == 0) {
+                       if ((reply->da->vendor != 0) ||
+                           (reply->da->attr != PW_CHARGEABLE_USER_IDENTITY)) {
+                               reply = reply->next;
+                               continue;
+                       }
                }
 
                /*