Move &foo -> &foo[*] fix to the update section fix function

FreeRADIUS · Jan 25, 2018 · 2351346 · 2351346
1 parent 003833d
commit 2351346
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/src/main/map.c b/src/main/map.c
@@ -294,32 +294,6 @@ int map_afrom_cp(TALLOC_CTX *ctx, vp_map_t **out, CONF_PAIR *cp,
 	}
 
 
-	/*
-	 *	Fixup LHS attribute references to change NUM_ANY to NUM_ALL.
-	 */
-	switch (map->lhs->type) {
-	case TMPL_TYPE_ATTR:
-	case TMPL_TYPE_LIST:
-		if (map->lhs->tmpl_num == NUM_ANY) map->lhs->tmpl_num = NUM_ALL;
-		break;
-
-	default:
-		break;
-	}
-
-	/*
-	 *	Fixup RHS attribute references to change NUM_ANY to NUM_ALL.
-	 */
-	switch (map->rhs->type) {
-	case TMPL_TYPE_ATTR:
-	case TMPL_TYPE_LIST:
-		if (map->rhs->tmpl_num == NUM_ANY) map->rhs->tmpl_num = NUM_ALL;
-		break;
-
-	default:
-		break;
-	}
-
 	MAP_VERIFY(map);
 
 	*out = map;

diff --git a/src/main/unlang_compile.c b/src/main/unlang_compile.c
@@ -1090,6 +1090,32 @@ int unlang_fixup_update(vp_map_t *map, UNUSED void *ctx)
 		}
 	}
 
+	/*
+	 *	Fixup LHS attribute references to change NUM_ANY to NUM_ALL.
+	 */
+	switch (map->lhs->type) {
+	case TMPL_TYPE_ATTR:
+	case TMPL_TYPE_LIST:
+		if (map->lhs->tmpl_num == NUM_ANY) map->lhs->tmpl_num = NUM_ALL;
+		break;
+
+	default:
+		break;
+	}
+
+	/*
+	 *	Fixup RHS attribute references to change NUM_ANY to NUM_ALL.
+	 */
+	switch (map->rhs->type) {
+	case TMPL_TYPE_ATTR:
+	case TMPL_TYPE_LIST:
+		if (map->rhs->tmpl_num == NUM_ANY) map->rhs->tmpl_num = NUM_ALL;
+		break;
+
+	default:
+		break;
+	}
+
 	/*
 	 *	Values used by unary operators should be literal ANY
 	 *