From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 7 Jul 2011 11:33:48 +0000 (+0200)
Subject: Fix xlat expansion of values assigned in rlm_attr_filter
X-Git-Tag: release_2_1_12~68
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=e9a99514edb5152b25462bfa4131579d6953fb1f;p=freeradius.git

Fix xlat expansion of values assigned in rlm_attr_filter

Remove comparison that was generating compiler warning
---

diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
index 2c5cd3d..a3559fd 100644
--- a/src/modules/rlm_attr_filter/rlm_attr_filter.c
+++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c
@@ -239,11 +239,7 @@ static int attr_filter_common(void *instance, REQUEST *request,
 				continue;
 			}
 			else if (check_item->attribute == PW_RELAX_FILTER) {
-				if ( check_item->vp_integer != inst->relaxed ) {
-					DEBUG3("attr_filter: Overriding relaxed config-item with check-item value %d",
-						check_item->vp_integer);
-					relax_filter = check_item->vp_integer;
-				}
+				relax_filter = check_item->vp_integer;
 				continue;
 			}
 
@@ -257,8 +253,8 @@ static int attr_filter_common(void *instance, REQUEST *request,
 					pairfree(&output);
 					return RLM_MODULE_FAIL;
 				}
-				*output_tail = vp;
-				output_tail = &(vp->next);
+				pairxlatmove(request, output_tail, &vp);
+				output_tail = &((*output_tail)->next);
 			}
 		}