From 52ce631439307046698edd9faab12d163e411880 Mon Sep 17 00:00:00 2001 From: aland Date: Sun, 24 Jun 2007 19:44:14 +0000 Subject: [PATCH] Don't check for appending attributes if the attribute was already moved. --- src/main/evaluate.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/evaluate.c b/src/main/evaluate.c index 3d1e3fd..9ca1041 100644 --- a/src/main/evaluate.c +++ b/src/main/evaluate.c @@ -847,10 +847,11 @@ static void my_pairmove(REQUEST *request, VALUE_PAIR **to, VALUE_PAIR *from) /* * We were asked to add it if it didn't exist, - * and it doesn't exist. Move it over to the tail - * of the "to" list. + * and it doesn't exist. Move it over to the + * tail of the "to" list, UNLESS it was already + * moved by another operator. */ - if (!found) { + if (!found && from_list[i]) { if ((from_list[i]->operator == T_OP_EQ) || (from_list[i]->operator == T_OP_LE) || (from_list[i]->operator == T_OP_GE) || -- 2.1.4