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 <equinox@opensourcerouting.org>

diff --git a/lib/libfrr.c b/lib/libfrr.c
index aa21a143bae95d8804356e811b586507e5a292fe..31d93009fa13e86a8514623fa304ac8ec2602665 100644 (file)
--- 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) {