Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / lib / vty.c

diff --git a/lib/vty.c b/lib/vty.c
index 502d2c9d04bdf35b72d640ede49c1bb9814d784a..cf161338520471264518bd749644c6515da745fb 100644 (file)
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -89,7 +89,7 @@ static char *vty_ipv6_accesslist_name = NULL;
 static vector Vvty_serv_thread;
 
 /* Current directory. */
-char vty_cwd[MAXPATHLEN];
+static char vty_cwd[MAXPATHLEN];
 
 /* Login password check. */
 static int no_password_check = 0;
@@ -2341,8 +2341,7 @@ static void vty_read_file(struct nb_config *config, FILE *confp)
         * Automatically commit the candidate configuration after
         * reading the configuration file.
         */
-       if (config == NULL && vty->candidate_config
-           && frr_get_cli_mode() == FRR_CLI_TRANSACTIONAL) {
+       if (config == NULL) {
                ret = nb_candidate_commit(vty->candidate_config, NB_CLIENT_CLI,
                                          vty, true, "Read configuration file",
                                          NULL);
@@ -3012,15 +3011,8 @@ void vty_reset(void)
 
        vty_timeout_val = VTY_TIMEOUT_DEFAULT;
 
-       if (vty_accesslist_name) {
-               XFREE(MTYPE_VTY, vty_accesslist_name);
-               vty_accesslist_name = NULL;
-       }
-
-       if (vty_ipv6_accesslist_name) {
-               XFREE(MTYPE_VTY, vty_ipv6_accesslist_name);
-               vty_ipv6_accesslist_name = NULL;
-       }
+       XFREE(MTYPE_VTY, vty_accesslist_name);
+       XFREE(MTYPE_VTY, vty_ipv6_accesslist_name);
 }
 
 static void vty_save_cwd(void)