Merge branch 'cmaster-next' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	ospfd/ospf_ri.c
	zebra/zebra_vty.c

1 files changed, 5 insertions, 0 deletions

diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c
index 43b0b0ebfa..80156e81f6 100644
--- a/ospfd/ospf_te.c
+++ b/ospfd/ospf_te.c
@@ -2452,6 +2452,11 @@ set_inter_as_mode (struct vty *vty, const char *mode_name,
           return CMD_WARNING;
         }
     }
+  else
+    {
+      vty_out (vty, "mpls-te has not been turned on%s", VTY_NEWLINE);
+      return CMD_WARNING;
+    }
   return CMD_SUCCESS;
 }