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

vtysh: funnel integrated write through watchquagga

Browse Source 
Running vtysh as normal user won't have permissions to write
Quagga.conf.  If we're connected to watchquagga, try "write integrated"
first.  In all cases if something fails, try directly.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2016-11-08 23:36:16 +01:00
parent 4a96e94474
commit e10ca9b6b8
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vtysh/vtysh.c
View File

@ -2579,7 +2579,23 @@ DEFUN (vtysh_write_memory,
/* If integrated Quagga.conf explicitely set. */
if (want_config_integrated())
return vtysh_write_config_integrated();
{
ret = CMD_WARNING;
for (i = 0; i < array_size(vtysh_client); i++)
if (vtysh_client[i].flag == VTYSH_WATCHQUAGGA)
break;
if (i < array_size(vtysh_client) && vtysh_client[i].fd != -1)
ret = vtysh_client_execute (&vtysh_client[i], "write integrated", stdout);
if (ret != CMD_SUCCESS)
{
printf("Warning: attempting direct configuration write without "
"watchquagga.\nFile permissions and ownership may be "
"incorrect, or write may fail.\n");
ret = vtysh_write_config_integrated();
}
return ret;
}
fprintf (stdout,"Building Configuration...\n");