From: Christian Franke <chris@opensourcerouting.org>
Date: Wed, 11 Apr 2018 20:14:56 +0000 (+0200)
Subject: lib: fix pathspace option -N
X-Git-Tag: frr-5.0-dev~50^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b39404c1897bdafc972cb3dd4ed87c793cec416f;p=mirror%2Ffrr.git

lib: fix pathspace option -N

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
---

diff --git a/lib/libfrr.c b/lib/libfrr.c
index 8d4a3ff8df..9931183634 100644
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -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);