This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via a98b79f878cea1b45695e6754d73492a0497a379 (commit) via bf9d6ad62ad2bc3d7249873b7822d0acdf7ffcce (commit) via 435076bbb0f6d69c15510e08f6698c61524d011c (commit) from d08fb579282307f4db936996c6e6110d442d79f4 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit a98b79f878cea1b45695e6754d73492a0497a379 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 22 15:25:20 2023 +0000

misc-progs: Fix path to killall binary in openvpnctrl

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit bf9d6ad62ad2bc3d7249873b7822d0acdf7ffcce Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 22 15:24:36 2023 +0000

core173: Ensure that the OpenVPN authenticator definitely does not run any more

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 435076bbb0f6d69c15510e08f6698c61524d011c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 22 15:01:58 2023 +0000

misc-progs: Kill OpenVPN Authenticator before OpenVPN

There used to be a time where the authenticator crashed when the OpenVPN daemon went away which is causing issues.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/173/update.sh | 3 +++ src/misc-progs/openvpnctrl.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/173/update.sh b/config/rootfiles/core/173/update.sh index 24d89c30a..98fea5a86 100644 --- a/config/rootfiles/core/173/update.sh +++ b/config/rootfiles/core/173/update.sh @@ -51,6 +51,9 @@ done /etc/rc.d/init.d/sshd stop /etc/rc.d/init.d/suricata stop

+# Make sure the OpenVPN authenticator is actually dead +killall -9 openvpn-authenticator + KVER="xxxKVERxxx"

# Backup uEnv.txt if exist diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index 92b5989e9..0659aa6b1 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -463,12 +463,15 @@ static void stopAuthenticator() { NULL, };

- run("/sbin/killall", argv); + run("/bin/killall", argv); }

void stopDaemon(void) { char command[STRING_SIZE];

+ // Stop OpenVPN authenticator + stopAuthenticator(); + int pid = readPidFile("/var/run/openvpn.pid"); if (!pid > 0) { exit(1); @@ -479,9 +482,6 @@ void stopDaemon(void) {

snprintf(command, STRING_SIZE - 1, "/bin/rm -f /var/run/openvpn.pid"); executeCommand(command); - - // Stop OpenVPN authenticator - stopAuthenticator(); }

static int startAuthenticator(void) {

hooks/post-receive -- IPFire 2.x development tree