From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 3 Nov 2010 14:04:03 +0000 (-0400)
Subject: Fix typos in previous commit
X-Git-Tag: release_3_0_0_beta0~1178
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=af0d0d6c06a39ba7c40697cb5cb6595328a22f32

Fix typos in previous commit
---

diff --git a/src/main/evaluate.c b/src/main/evaluate.c
index 365e463..10aeac4 100644
--- a/src/main/evaluate.c
+++ b/src/main/evaluate.c
@@ -882,7 +882,7 @@ static void fix_up(REQUEST *request)
 	request->password = NULL;
 	
 	for (vp = request->packet->vps; vp != NULL; vp = vp->next) {
-		if (vp->vendor) continue;
+		if (vp->vendor != 0) continue;
 
 		if ((vp->attribute == PW_USER_NAME) &&
 		    !request->username) {
@@ -895,7 +895,7 @@ static void fix_up(REQUEST *request)
 			request->password = vp;
 		}
 
-		if (request->username && request->password) continue;
+		if (request->username && request->password) break;
 	}
 }
 
@@ -989,7 +989,7 @@ void radius_pairmove(REQUEST *request, VALUE_PAIR **to, VALUE_PAIR *from)
 			/*
 			 *	Attributes aren't the same, skip them.
 			 */
-			if ((from_list[i]->attribute != to_list[j]->attribute) &&
+			if ((from_list[i]->attribute != to_list[j]->attribute) ||
 			    (from_list[i]->vendor != to_list[j]->vendor)) {
 				continue;
 			}