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

Merge pull request #1255 from qlyoung/vtysh-remove-double-slash

Browse Source 
vtysh: remove extra / in config path
This commit is contained in:
Renato Westphal 2017-09-29 14:47:48 -03:00 committed by GitHub
commit 867be27151
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libfrr.c
View File

@ -534,7 +534,7 @@ struct thread_master *frr_init(void)
snprintf(p_pathspace, sizeof(p_pathspace), "/%s",
di->pathspace);
snprintf(config_default, sizeof(config_default), "%s%s/%s%s.conf",
snprintf(config_default, sizeof(config_default), "%s%s%s%s.conf",
frr_sysconfdir, p_pathspace, di->name, p_instance);
snprintf(pidfile_default, sizeof(pidfile_default), "%s%s/%s%s.pid",
frr_vtydir, p_pathspace, di->name, p_instance);

4
vtysh/vtysh_main.c
View File

@ -404,9 +404,9 @@ int main(int argc, char **argv, char **env)
"NOT SUPPORTED since its\nresults are inconsistent!\n");
}
snprintf(vtysh_config, sizeof(vtysh_config), "%s%s/%s", sysconfdir,
snprintf(vtysh_config, sizeof(vtysh_config), "%s%s%s", sysconfdir,
pathspace, VTYSH_CONFIG_NAME);
snprintf(frr_config, sizeof(frr_config), "%s%s/%s", sysconfdir,
snprintf(frr_config, sizeof(frr_config), "%s%s%s", sysconfdir,
pathspace, FRR_CONFIG_NAME);
strlcat(vtydir, pathspace, sizeof(vtydir));