Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / northbound_cli.c

diff --git a/lib/northbound_cli.c b/lib/northbound_cli.c
index c5582fc21c2338edb3036e28a00cf75ed32d14cf..e9c89d202906dfac18c38d70b086cb7c6adee212 100644 (file)
--- a/lib/northbound_cli.c
+++ b/lib/northbound_cli.c
@@ -195,9 +195,12 @@ int nb_cli_apply_changes(struct vty *vty, const char *xpath_base_fmt, ...)
                va_end(ap);
        }
 
-       if (vty_mgmt_fe_enabled()) {
+       if (vty_mgmt_should_process_cli_apply_changes(vty)) {
                VTY_CHECK_XPATH;
 
+               if (vty->type == VTY_FILE)
+                       return CMD_SUCCESS;
+
                implicit_commit = vty_needs_implicit_commit(vty);
                ret = vty_mgmt_send_config_data(vty);
                if (ret >= 0 && !implicit_commit)
@@ -224,7 +227,7 @@ int nb_cli_apply_changes_clear_pending(struct vty *vty,
                va_end(ap);
        }
 
-       if (vty_mgmt_fe_enabled()) {
+       if (vty_mgmt_should_process_cli_apply_changes(vty)) {
                VTY_CHECK_XPATH;
 
                implicit_commit = vty_needs_implicit_commit(vty);