summaryrefslogtreecommitdiff
path: root/lib/command.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/command.c')
-rw-r--r--lib/command.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/command.c b/lib/command.c
index fc43cce189..159ed07b38 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -841,9 +841,6 @@ enum node_type node_parent(enum node_type node)
case BFD_PROFILE_NODE:
ret = BFD_NODE;
break;
- case RPKI_VRF_NODE:
- ret = VRF_NODE;
- break;
default:
ret = CONFIG_NODE;
break;
@@ -907,6 +904,13 @@ static int cmd_execute_command_real(vector vline, enum cmd_filter_type filter,
> vty->candidate_config->version)
nb_config_replace(vty->candidate_config,
running_config, true);
+
+ /*
+ * Perform pending commit (if any) before executing
+ * non-YANG command.
+ */
+ if (matched_element->attr != CMD_ATTR_YANG)
+ nb_cli_pending_commit_check(vty);
}
ret = matched_element->func(matched_element, vty, argc, argv);