Sprinkle vp->type = VT_DATA in more places, this will be needed later

FreeRADIUS · Jul 9, 2013 · 0de7d43 · 0de7d43
1 parent ff6ae7d
commit 0de7d43
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 1 deletion.
diff --git a/src/lib/radius.c b/src/lib/radius.c
@@ -3797,7 +3797,7 @@ static ssize_t data2vp(RADIUS_PACKET *packet,
 		fr_strerror_printf("Internal sanity check %d", __LINE__);
 		return -1;
 	}
-
+	vp->type = VT_DATA;
 	*pvp = vp;
 
 	return attrlen;

diff --git a/src/lib/valuepair.c b/src/lib/valuepair.c
@@ -1939,6 +1939,7 @@ static VALUE_PAIR *pairmake_any(TALLOC_CTX *ctx,
 	}
 
 	vp->vp_octets = data;
+	vp->type = VT_DATA;
 	return vp;
 }
 
@@ -2821,6 +2822,7 @@ void pairstrcpy(VALUE_PAIR *vp, char const *src)
 	talloc_free(q);
 
 	vp->vp_strvalue = p;
+	vp->type = VT_DATA;
 	vp->length = strlen(vp->vp_strvalue);
 }
 
@@ -2847,6 +2849,7 @@ void pairsprintf(VALUE_PAIR *vp, char const *fmt, ...)
 	talloc_free(q);
 
 	vp->vp_strvalue = p;
+	vp->type = VT_DATA;
 
 	/*
 	 *	vsnprintf returns random things on different platforms

diff --git a/src/main/detail.c b/src/main/detail.c
@@ -562,6 +562,7 @@ int detail_recv(rad_listen_t *listener)
 			vp = paircreate(data, PW_PACKET_ORIGINAL_TIMESTAMP, 0);
 			if (vp) {
 				vp->vp_date = (uint32_t) data->timestamp;
+				vp->type = VT_DATA;
 		    		pairinsert(&cursor, vp);
 			}
 			continue;

diff --git a/src/main/soh.c b/src/main/soh.c
@@ -248,6 +248,7 @@ static int eapsoh_mstlv(REQUEST *request, uint8_t const *p, unsigned int data_le
 				if (!vp) return 0;
 
 				vp->vp_strvalue = q = talloc_array(vp, char, t);
+				vp->type = VT_DATA;
 
 				memcpy(q, p, t);
 				q[t] = 0;

diff --git a/src/modules/proto_dhcp/dhcp.c b/src/modules/proto_dhcp/dhcp.c
@@ -553,6 +553,7 @@ static int fr_dhcp_attr2vp(RADIUS_PACKET *packet, VALUE_PAIR *vp, uint8_t const
 
 	case PW_TYPE_STRING:
 		vp->vp_strvalue = q = talloc_array(vp, char, alen + 1);
+		vp->type = VT_DATA;
 		memcpy(q, p , alen);
 		q[alen] = '\0';
 		break;
@@ -767,6 +768,7 @@ int fr_dhcp_decode(RADIUS_PACKET *packet)
 
 		case PW_TYPE_STRING:
 			vp->vp_strvalue = q = talloc_array(vp, char, dhcp_header_sizes[i] + 1);
+			vp->type = VT_DATA;
 			memcpy(q, p, dhcp_header_sizes[i]);
 			q[dhcp_header_sizes[i]] = '\0';
 			vp->length = strlen(vp->vp_strvalue);
@@ -1286,6 +1288,7 @@ int fr_dhcp_encode(RADIUS_PACKET *packet)
 
 			case PW_TYPE_STRING:
 				vp->vp_strvalue = q = talloc_array(vp, char, dhcp_header_sizes[i]);
+				vp->type = VT_DATA;
 				memcpy(q, p, dhcp_header_sizes[i]);
 				q[dhcp_header_sizes[i]] = '\0';
 				vp->length = strlen(vp->vp_strvalue);

diff --git a/src/modules/proto_vmps/vqp.c b/src/modules/proto_vmps/vqp.c
@@ -513,6 +513,7 @@ int vqp_decode(RADIUS_PACKET *packet)
 		case PW_TYPE_STRING:
 			vp->length = length;
 			vp->vp_strvalue = p = talloc_array(vp, char, vp->length + 1);
+			vp->type = VT_DATA;
 			memcpy(p, ptr, vp->length);
 			p[vp->length] = '\0';
 			break;

diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
@@ -695,6 +695,7 @@ static rlm_rcode_t mod_post_proxy(void *inst, REQUEST *request)
 			    request->packet->vector);
 //	talloc_free(vp->vp_strvalue);
 	vp->vp_strvalue = p;
+	vp->type = VT_DATA;
 
 	return RLM_MODULE_UPDATED;
 }

diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
@@ -212,6 +212,7 @@ static int mod_authenticate(void *instance, eap_handler_t *handler)
 		}
 		vp->length = eap_ds->response->type.length;
 		vp->vp_strvalue = p = talloc_array(vp, char, vp->length + 1);
+		vp->type = VT_DATA;
 		memcpy(p, eap_ds->response->type.data, vp->length);
 		p[vp->length] = 0;
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c b/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c
@@ -350,6 +350,7 @@ leap_packet_t *eapleap_stage6(leap_packet_t *packet, REQUEST *request,
 	vp->length = 17 + i;
 //	talloc_free(vp->vp_strvalue);
 	vp->vp_strvalue = q;
+	vp->type = VT_DATA;
 
 	return reply;
 }

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
@@ -352,6 +352,7 @@ static VALUE_PAIR *diameter2vp(REQUEST *request, REQUEST *fake, SSL *ssl,
 			 */
 		case PW_TYPE_STRING:
 			vp->vp_strvalue = p = talloc_array(vp, char, size + 1);
+			vp->type = VT_DATA;
 			memcpy(p, data, size);
 			p[size] = '\0';
 			vp->length = strlen(p);

diff --git a/src/modules/rlm_otp/rlm_otp.c b/src/modules/rlm_otp/rlm_otp.c
@@ -279,6 +279,7 @@ static rlm_rcode_t mod_authorize(void *instance, REQUEST *request)
 		vp->vp_strvalue = expanded;
 		vp->length = len;
 		vp->op = T_OP_SET;
+		vp->type = VT_DATA;
 
 		pairadd(&request->reply->vps, vp);
 	}

diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c
@@ -72,6 +72,7 @@ static rlm_rcode_t mod_authorize(UNUSED void *instance, UNUSED REQUEST *request)
 		memcpy(buffer, vp->vp_strvalue, 6);
 		vp->length = (5*3)+2;
 		vp->vp_strvalue = p = talloc_array(vp, char, vp->length + 1);
+		vp->type = VT_DATA;
 
 		/*
 		 *	RFC 3580 Section 3.20 says this is the preferred