]> git.puffer.fish Git - mirror/frr.git/commitdiff
lib: fix pathspace option -N
authorChristian Franke <chris@opensourcerouting.org>
Wed, 11 Apr 2018 20:14:56 +0000 (22:14 +0200)
committerChristian Franke <chris@opensourcerouting.org>
Wed, 11 Apr 2018 20:14:56 +0000 (22:14 +0200)
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
lib/libfrr.c

index 8d4a3ff8dfced094969453e7d1bde944779bad1e..99311836340993adf117da00a7367014c9254d25 100644 (file)
@@ -531,12 +531,12 @@ struct thread_master *frr_init(void)
                snprintf(p_instance, sizeof(p_instance), "-%d", di->instance);
        }
        if (di->pathspace)
-               snprintf(p_pathspace, sizeof(p_pathspace), "/%s",
+               snprintf(p_pathspace, sizeof(p_pathspace), "%s/",
                         di->pathspace);
 
        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",
+       snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s%s%s.pid",
                 frr_vtydir, p_pathspace, di->name, p_instance);
 
        zprivs_preinit(di->privs);