proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 21:57:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix critical bugzilla #113. Make CMD_ERR_NOTHING_TODO nonfatal.

Browse Source
This commit is contained in:
hasso 2004-10-13 08:18:07 +00:00
parent 42d498658d
commit ddd85ed1af
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ChangeLog
View File

@ -1,3 +1,8 @@
2004-10-13 Hasso Tepper <hasso at quagga.net>
* command.c: Make CMD_ERR_NOTHING_TODO nonfatal if reading
configuration from file. Fixes critical bugzilla #113.
2004-10-13 Paul Jakma <paul@dishone.st> 2004-10-13 Paul Jakma <paul@dishone.st>
* (global) more const'ification. * (global) more const'ification.

11
lib/command.c
View File

@ -2238,15 +2238,16 @@ config_from_file (struct vty *vty, FILE *fp)
/* Try again with setting node to CONFIG_NODE */ /* Try again with setting node to CONFIG_NODE */
while (ret != CMD_SUCCESS && ret != CMD_WARNING while (ret != CMD_SUCCESS && ret != CMD_WARNING
&& vty->node != CONFIG_NODE) && ret != CMD_ERR_NOTHING_TODO && vty->node != CONFIG_NODE)
{ {
vty->node = node_parent(vty->node); vty->node = node_parent(vty->node);
ret = cmd_execute_command_strict (vline, vty, NULL); ret = cmd_execute_command_strict (vline, vty, NULL);
} }
cmd_free_strvec (vline); cmd_free_strvec (vline);
if (ret != CMD_SUCCESS && ret != CMD_WARNING) if (ret != CMD_SUCCESS && ret != CMD_WARNING
&& ret != CMD_ERR_NOTHING_TODO)
return ret; return ret;
} }
return CMD_SUCCESS; return CMD_SUCCESS;