From b8c1fde3cb210137549d81e2971120a30d6b6bf2 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 3 Aug 2017 06:02:45 +0200 Subject: [PATCH] lib: don't mkdir state paths in watchfrr watchfrr doesn't know if there will be -u/-g options on the individual daemons, so it doesn't know what the appropriate ownership is. Signed-off-by: David Lamparter --- lib/libfrr.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/libfrr.c b/lib/libfrr.c index aa21a143ba..31d93009fa 100644 --- a/lib/libfrr.c +++ b/lib/libfrr.c @@ -399,12 +399,15 @@ struct thread_master *frr_init(void) zlog_set_level(ZLOG_DEST_SYSLOG, zlog_default->default_lvl); #endif - if (!di->pid_file || !di->vty_path) - frr_mkdir(frr_vtydir, false); - if (di->pid_file) - frr_mkdir(di->pid_file, true); - if (di->vty_path) - frr_mkdir(di->vty_path, true); + /* don't mkdir these as root... */ + if (!(di->flags & FRR_NO_PRIVSEP)) { + if (!di->pid_file || !di->vty_path) + frr_mkdir(frr_vtydir, false); + if (di->pid_file) + frr_mkdir(di->pid_file, true); + if (di->vty_path) + frr_mkdir(di->vty_path, true); + } frrmod_init(di->module); while (modules) { -- 2.39.5