From 87d683b071dc7abfb30b666960ec480e64e19ce4 Mon Sep 17 00:00:00 2001 From: hasso Date: Sun, 16 Jan 2005 23:31:54 +0000 Subject: * command.[ch], vty.c: cmd_execute_command() function must not attempt to walk up in the node tree if called from vtysh. Different daemons might have commands with same syntax in different nodes (for example "router-id x.x.x.x" commands in zebra/ospfd/ospf6d daemons). * vtysh.c: Reflect changes in lib. cmd_execute_command() should know now that it's called from vtysh and must not attempt to walk up in the node tree. [pullup candidate] --- vtysh/ChangeLog | 6 ++++++ vtysh/vtysh.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'vtysh') diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog index de0b1a80..d0cd068e 100644 --- a/vtysh/ChangeLog +++ b/vtysh/ChangeLog @@ -1,3 +1,9 @@ +2005-01-10 Hasso Tepper + + * vtysh.c: Reflect changes in lib. cmd_execute_command() should know + now that it's called from vtysh and must not attempt to walk up in + the node tree. + 2004-12-22 Hasso Tepper * vtysh_config.c: No delimiter between "ip forwarding" and "ipv6 diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 04d9d7d2..6ece45f8 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -262,7 +262,7 @@ vtysh_execute_func (const char *line, int pager) if (vline == NULL) return; - ret = cmd_execute_command (vline, vty, &cmd); + ret = cmd_execute_command (vline, vty, &cmd, 1); cmd_free_strvec (vline); @@ -340,7 +340,7 @@ vtysh_execute_func (const char *line, int pager) return; } - ret = cmd_execute_command (vline, vty, &cmd); + ret = cmd_execute_command (vline, vty, &cmd, 1); cmd_free_strvec (vline); if (ret != CMD_SUCCESS_DAEMON) break; -- cgit v1.2.1