As posted to the list

diff --git a/src/modules/rlm_jradius/rlm_jradius.c b/src/modules/rlm_jradius/rlm_jradius.c
index 5a3e6a5b880cbaa5ff4efda4313933851192ace8..572f00e0cb065cc56db61e5a04fe19c1645e1ec8 100644 (file)
--- a/src/modules/rlm_jradius/rlm_jradius.c
+++ b/src/modules/rlm_jradius/rlm_jradius.c
@@ -796,6 +796,22 @@ static int read_vps(JRADIUS *inst, JRSOCK *jrsock, VALUE_PAIR **pl, int plen)
       continue;
     }
 
+    /*
+     *     WiMAX combo-ip address
+     *     paircreate() cannot recognize the real type of the address.
+     *     ..ugly code...
+     */
+    if (vp->type==PW_TYPE_COMBO_IP) {
+        switch (alen) {
+            case 4:
+                vp->type = PW_TYPE_IPADDR;
+                break;
+            case 16:
+                vp->type = PW_TYPE_IPV6ADDR;
+                break;
+        }
+    }
+
     /*
      *     Fill in the attribute value based on type
      */