From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 22 Nov 2009 08:18:16 +0000 (+0100)
Subject: As posted to the list
X-Git-Tag: release_2_1_8~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8221e07ccab3412c5be7a804f18ee1cceddf29a6;p=thirdparty%2Ffreeradius-server.git

As posted to the list
---

diff --git a/src/modules/rlm_jradius/rlm_jradius.c b/src/modules/rlm_jradius/rlm_jradius.c
index 5a3e6a5b880..572f00e0cb0 100644
--- 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
      */