Don't encode zero-length attributes

except for CUI

diff --git a/src/lib/radius.c b/src/lib/radius.c
index 5509855..8972ee5 100644 (file)
--- a/src/lib/radius.c
+++ b/src/lib/radius.c
@@ -1301,6 +1301,11 @@ int rad_vp2rfc(const RADIUS_PACKET *packet,
                return -1;
        }
 
+       if ((vp->length == 0) &&
+           (vp->attribute != PW_CHARGEABLE_USER_IDENTITY)) {
+               return 0;
+       }
+
        return vp2attr_rfc(packet, original, secret, vp, vp->attribute,
                           ptr, room);
 }

diff --git a/src/tests/rfc.txt b/src/tests/rfc.txt
index 0866967..64833d0 100644 (file)
--- a/src/tests/rfc.txt
+++ b/src/tests/rfc.txt
@@ -14,10 +14,10 @@
 #
 #      encode - reads "Attribute-Name = value", encodes it, and prints
 #               the result as text.
+#              use "-" to encode the output of the last command
 #
 #      decode - reads hex, and decodes it "Attribute-Name = value"
-#               for now, "-" is the only allowed value, and makes it
-#               decode the last hex "data".
+#              use "-" to decode the output of the last command
 #
 #      data - the expected output of the previous command, in ASCII form.
 #             if the actual command output is different, an error message
@@ -93,6 +93,10 @@ data Attr-4 = 0xabcd
 decode 01 02
 data 
 
+# don't encode zero-length attributes
+encode User-Name = ""
+data 
+
 # except for CUI.  Thank you, WiMAX!
 decode 59 02
 data Chargeable-User-Identity = ""