]> git.puffer.fish Git - mirror/frr.git/commitdiff
lib: remove extra / in other paths 1255/head
authorQuentin Young <qlyoung@cumulusnetworks.com>
Fri, 29 Sep 2017 15:26:11 +0000 (11:26 -0400)
committerQuentin Young <qlyoung@cumulusnetworks.com>
Fri, 29 Sep 2017 15:26:11 +0000 (11:26 -0400)
Non-integrated config paths need the treatment as well.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
lib/libfrr.c

index 3e2e0082234b395d8e860bf6175822f46cb8b275..307d9c2e3800aa8cc221003f5c00d64ae43b562e 100644 (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);