Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / ldpd / ldp_vty_conf.c

diff --git a/ldpd/ldp_vty_conf.c b/ldpd/ldp_vty_conf.c
index b35d3dfa00793e6d5e2b9bafa0a8049d3d892417..ffff67683d082779a6551fdafdd5a65e2adce909 100644 (file)
--- a/ldpd/ldp_vty_conf.c
+++ b/ldpd/ldp_vty_conf.c
@@ -1,20 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2016 by Open Source Routing.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -133,6 +119,8 @@ ldp_af_iface_config_write(struct vty *vty, int af)
                    ia->hello_interval != 0)
                        vty_out (vty, "   discovery hello interval %u\n",
                            ia->hello_interval);
+
+               vty_out (vty, "  exit\n");
        }
 }
 
@@ -314,6 +302,7 @@ ldp_config_write(struct vty *vty)
        ldp_af_config_write(vty, AF_INET, ldpd_conf, &ldpd_conf->ipv4);
        ldp_af_config_write(vty, AF_INET6, ldpd_conf, &ldpd_conf->ipv6);
        vty_out (vty, " !\n");
+       vty_out (vty, "exit\n");
        vty_out (vty, "!\n");
 
        return (1);
@@ -353,6 +342,8 @@ ldp_l2vpn_pw_config_write(struct vty *vty, struct l2vpn_pw *pw)
                          "  ! Incomplete config, specify a neighbor lsr-id\n");
        if (missing_pwid)
                vty_out (vty,"  ! Incomplete config, specify a pw-id\n");
+
+       vty_out (vty, " exit\n");
 }
 
 static int
@@ -383,6 +374,7 @@ ldp_l2vpn_config_write(struct vty *vty)
                        ldp_l2vpn_pw_config_write(vty, pw);
 
                vty_out (vty, " !\n");
+               vty_out (vty, "exit\n");
                vty_out (vty, "!\n");
        }