build: use configfile mode in init script

This only applies for split-config;  the init script would create an
empty config file with default permissions.

Reported-by: Robert Scheck <robert@fedoraproject.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
(cherry picked from commit 5c9063771195bb51a8cc1c64f9924e53a0602817)

diff --git a/configure.ac b/configure.ac
index 745c5355e4acd373a2367dfd5cbb77610e77da5d..17136b6de70e0d9bd9222c0143313a323e5dc3bf 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -736,6 +736,7 @@ AC_SUBST([enable_vty_group])
 
 enable_configfile_mask=${enable_configfile_mask:-0600}
 AC_DEFINE_UNQUOTED([CONFIGFILE_MASK], [${enable_configfile_mask}], [Mask for config files])
+AC_SUBST([enable_configfile_mask])
 
 enable_logfile_mask=${enable_logfile_mask:-0600}
 AC_DEFINE_UNQUOTED([LOGFILE_MASK], [${enable_logfile_mask}], [Mask for log files])

diff --git a/tools/frr.in b/tools/frr.in
index 50f7ecaa9f61b2640d77f085edd38aa93a91b9e6..6380326d6aaa1ea1ebce2341499a32a5054bdcf3 100755 (executable)
--- a/tools/frr.in
+++ b/tools/frr.in
@@ -21,6 +21,7 @@ VTYSH="@vtysh_bin@" # /usr/bin/vtysh
 FRR_USER="@enable_user@" # frr
 FRR_GROUP="@enable_group@" # frr
 FRR_VTY_GROUP="@enable_vty_group@" # frrvty
+FRR_CONFIG_MODE="@enable_configfile_mask@" # 0600
 
 # Local Daemon selection may be done by using /etc/frr/daemons.
 # See /usr/share/doc/frr/README.Debian.gz for further information.
@@ -55,6 +56,7 @@ chownfrr()
 {
        test -n "$FRR_USER" && chown "$FRR_USER" "$1"
        test -n "$FRR_GROUP" && chgrp "$FRR_GROUP" "$1"
+       test -n "$FRR_CONFIG_MODE" && chmod "$FRR_CONFIG_MODE" "$1"
 }
 
 # Check if daemon is started by using the pidfile.

diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in
index 3fc38d4bed807bedd3149d7f2beafbf42cee14f3..34d3a44257dcc75f88a8ca849b34af55e4fe13e8 100644 (file)
--- a/tools/frrcommon.sh.in
+++ b/tools/frrcommon.sh.in
@@ -24,6 +24,7 @@ VTYSH="@vtysh_bin@" # /usr/bin/vtysh
 FRR_USER="@enable_user@" # frr
 FRR_GROUP="@enable_group@" # frr
 FRR_VTY_GROUP="@enable_vty_group@" # frrvty
+FRR_CONFIG_MODE="@enable_configfile_mask@" # 0600
 
 # ORDER MATTERS FOR $DAEMONS!
 # - keep zebra first
@@ -52,6 +53,7 @@ debug() {
 chownfrr() {
        [ -n "$FRR_USER" ] && chown "$FRR_USER" "$1"
        [ -n "$FRR_GROUP" ] && chgrp "$FRR_GROUP" "$1"
+       [ -n "$FRR_CONFIG_MODE" ] && chmod "$FRR_CONFIG_MODE" "$1"
 }
 
 vtysh_b () {