BUG10730: fix permissions of ovpnserver.log

diff --git a/config/rootfiles/common/sysklogd b/config/rootfiles/common/sysklogd
index 14320a6a90c71c8755fbe6107ce5178365887e46..9792097ceb67807bdc8d1a6b2c6f0582e5b4e568 100644 (file)
--- a/config/rootfiles/common/sysklogd
+++ b/config/rootfiles/common/sysklogd
@@ -4,4 +4,3 @@ usr/sbin/syslogd
 #usr/share/man/man8/sysklogd.8
 var/log/dhcpcd.log
 var/log/messages
-var/log/ovpnserver.log

diff --git a/lfs/sysklogd b/lfs/sysklogd
index 9c9dd0d556808565f3838edbd9ffd0f2211ca884..ca6110a6d584c5930671ab33e67ff68546364cb6 100644 (file)
--- a/lfs/sysklogd
+++ b/lfs/sysklogd
@@ -75,8 +75,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_xen_empty_buffer_check.patch
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       touch /var/log/{dhcpcd.log,messages,ovpnserver.log}
-       chmod 664 /var/log/{dhcpcd.log,messages,ovpnserver.log}
-       chown 0:105 /var/log/{dhcpcd.log,messages,ovpnserver.log}
+       touch /var/log/{dhcpcd.log,messages}
+       chmod 664 /var/log/{dhcpcd.log,messages}
+       chown 0:105 /var/log/{dhcpcd.log,messages}
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c
index da5ee2356e8b7fcf448c225bb585b628f71eea29..d20cced7743b80bdfc91c1875b54c2e33d0ca337 100644 (file)
--- a/src/misc-progs/openvpnctrl.c
+++ b/src/misc-progs/openvpnctrl.c
@@ -469,6 +469,10 @@ void startDaemon(void) {
                executeCommand(command);
                snprintf(command, STRING_SIZE-1, "/usr/sbin/openvpn --config /var/ipfire/ovpn/server.conf");
                executeCommand(command);
+               snprintf(command, STRING_SIZE-1, "/bin/chown root.nobody /var/run/ovpnserver.log");
+               executeCommand(command);
+               snprintf(command, STRING_SIZE-1, "/bin/chmod 644 /var/run/ovpnserver.log");
+               executeCommand(command);
        }
 }