From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 19 Nov 2021 14:16:30 +0000 (-0500)
Subject: remove duplicate flags merge.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0578ee04182183414dd08d2f7bfc1e3672f786e;p=thirdparty%2Ffreeradius-server.git

remove duplicate flags merge.

it's already done at the bottom of the loop
---

diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
index d17f49f4a69..3d3413d0f3a 100644
--- a/src/lib/unlang/xlat_tokenize.c
+++ b/src/lib/unlang/xlat_tokenize.c
@@ -1637,7 +1637,6 @@ int xlat_resolve(xlat_exp_t **head, xlat_flags_t *flags, xlat_res_rules_t const
 		 */
 		case XLAT_FUNC:
 			if (xlat_resolve(&node->child, &node->flags, xr_rules) < 0) return -1;
-			xlat_flags_merge(&our_flags, &node->flags);
 			break;
 
 		/*