From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 8 Oct 2010 15:21:10 +0000 (+0200)
Subject: Fixes for porting to "stable" branch
X-Git-Tag: release_3_0_0_beta0~1203
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=5f29680b14b6188a9d0e0d217b969d6e3ca8853e

Fixes for porting to "stable" branch
---

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
index 9d4d81c..9917800 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -1000,7 +1000,7 @@ int eappeap_process(EAP_HANDLER *handler, tls_session_t *tls_session)
 
 	setup_fake_request(request, fake, t);
 
-	if ((vp = pairfind(request->config_items, PW_VIRTUAL_SERVER)) != NULL) {
+	if ((vp = pairfind(request->config_items, PW_VIRTUAL_SERVER, 0)) != NULL) {
 		fake->server = vp->vp_strvalue;
 
 	} else if (t->virtual_server) {
@@ -1300,7 +1300,7 @@ static int setup_fake_request(REQUEST *request, REQUEST *fake, peap_tunnel_t *t)
 			 *	Don't copy from the head, we've already
 			 *	checked it.
 			 */
-			copy = paircopy2(vp, vp->attribute);
+			copy = paircopy2(vp, vp->attribute, vp->vendor);
 			pairadd(&fake->packet->vps, copy);
 		}
 	}