Fix xlat expansion of values assigned in rlm_attr_filter
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Thu, 7 Jul 2011 11:33:48 +0000 (13:33 +0200)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Thu, 7 Jul 2011 11:36:42 +0000 (13:36 +0200)
Remove comparison that was generating compiler warning

src/modules/rlm_attr_filter/rlm_attr_filter.c

index 2c5cd3d..a3559fd 100644 (file)
@@ -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);
                        }
                }