lib: Adjust only `any` flag for prefix-list entries if destroying

Before this patch, if we destroy `any` flag for a prefix-list entry, we always
set destination as 0.0.0.0/0 and/or ::/0.

This means that, if we switch from `ip prefix-list r1-2 seq 5 deny any` to
`ip prefix-list r1-2 seq 5 permit 10.10.10.10/32` we will have
`permit any` eventually, which broke ACLs.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 61c07b9d43529f69f48ca54f4f0213cff52b5d0a)

diff --git a/lib/filter_cli.c b/lib/filter_cli.c
index 9a877a57041d8778ac0b6ad1ad7fd53cb8b68385..5c31757c2fe496f34dffb7fa726853de24f77b9e 100644 (file)
--- a/lib/filter_cli.c
+++ b/lib/filter_cli.c
@@ -1319,6 +1319,7 @@ DEFPY_YANG(
                                vty, "./ipv4-prefix-length-lesser-or-equal",
                                NB_OP_DESTROY, NULL);
                }
+               nb_cli_enqueue_change(vty, "./any", NB_OP_DESTROY, NULL);
        } else {
                nb_cli_enqueue_change(vty, "./any", NB_OP_CREATE, NULL);
        }

diff --git a/lib/filter_nb.c b/lib/filter_nb.c
index 3ed1f3e03e96dc6737150d4799d6114e3e5e9a88..215a33d3946e51c388b1182764ed13716997b1d1 100644 (file)
--- a/lib/filter_nb.c
+++ b/lib/filter_nb.c
@@ -1643,7 +1643,7 @@ static int lib_prefix_list_entry_any_destroy(struct nb_cb_destroy_args *args)
        /* Start prefix entry update procedure. */
        prefix_list_entry_update_start(ple);
 
-       prefix_list_entry_set_empty(ple);
+       ple->any = false;
 
        /* Finish prefix entry update procedure. */
        prefix_list_entry_update_finish(ple);