diff options
| author | Florian Westphal <fw@strlen.de> | 2023-12-14 17:47:21 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-12-14 17:51:24 +0100 |
| commit | 21657008dd4b4094eac017a175f2a3056af36b17 (patch) | |
| tree | e97435da4497c829a8fc2dc63f8a1356567b33b7 /src/evaluate.c | |
| parent | 060ed8655d64874a92e6fba2ba9452b2aa94849e (diff) | |
Revert "evaluate: error out when existing set has incompatible key"
This breaks existing behaviour, add a test case so this is caught in
the future.
The reverted test case will be brought back once a better fix
is available.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'src/evaluate.c')
| -rw-r--r-- | src/evaluate.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 0e0e0c00..70d80eb4 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -4768,9 +4768,6 @@ static int set_evaluate(struct eval_ctx *ctx, struct set *set) existing_set = set_cache_find(table, set->handle.set.name); if (!existing_set) set_cache_add(set_get(set), table); - else if (!datatype_equal(existing_set->key->dtype, set->key->dtype)) - return set_error(ctx, set, "%s definition has conflicting key (%s vs %s)\n", - type, set->key->dtype->name, existing_set->key->dtype->name); if (existing_set && existing_set->flags & NFT_SET_EVAL) { uint32_t existing_flags = existing_set->flags & ~NFT_SET_EVAL; |