summaryrefslogtreecommitdiffstats
path: root/lib/vty.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2018-09-12 21:58:39 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2018-09-12 21:58:39 +0200
commite991eff5b5773e8a85c3f4c4f92c09fe30cf680b (patch)
treeab98bf44cfc7611ad7cc699396674554f150db43 /lib/vty.c
parentzebra: fix includes (diff)
parentMerge pull request #3005 from patrasar/indentation_warnings (diff)
downloadfrr-e991eff5b5773e8a85c3f4c4f92c09fe30cf680b.tar.xz
frr-e991eff5b5773e8a85c3f4c4f92c09fe30cf680b.zip
Merge remote-tracking branch 'frr/master' into warnings
Conflicts: zebra/if_ioctl_solaris.c zebra/rtread_getmsg.c Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'lib/vty.c')
-rw-r--r--lib/vty.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/vty.c b/lib/vty.c
index afcb4edaa..921f92df1 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -813,6 +813,7 @@ static void vty_end_config(struct vty *vty)
case LDP_L2VPN_NODE:
case LDP_PSEUDOWIRE_NODE:
case ISIS_NODE:
+ case OPENFABRIC_NODE:
case KEYCHAIN_NODE:
case KEYCHAIN_KEY_NODE:
case VTY_NODE:
@@ -1212,6 +1213,7 @@ static void vty_stop_input(struct vty *vty)
case LDP_L2VPN_NODE:
case LDP_PSEUDOWIRE_NODE:
case ISIS_NODE:
+ case OPENFABRIC_NODE:
case KEYCHAIN_NODE:
case KEYCHAIN_KEY_NODE:
case VTY_NODE: