[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 313403043c5f0f5f053f8fe179b1ec7089cb31a1

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 313403043c5f0f5f053f8fe179b1ec7089cb31a1

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 2559 bytes --]

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, next has been updated
       via  313403043c5f0f5f053f8fe179b1ec7089cb31a1 (commit)
       via  a98b79f878cea1b45695e6754d73492a0497a379 (commit)
       via  bf9d6ad62ad2bc3d7249873b7822d0acdf7ffcce (commit)
       via  435076bbb0f6d69c15510e08f6698c61524d011c (commit)
      from  216def69c187e2e230456efbb315e479d9359c8a (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 313403043c5f0f5f053f8fe179b1ec7089cb31a1
Merge: 216def69c a98b79f87
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Thu Feb 23 16:58:40 2023 +0000

    Merge branch 'master' into next

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

Summary of changes:
 config/rootfiles/oldcore/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/oldcore/173/update.sh b/config/rootfiles/oldcore/173/update.sh
index 24d89c30a..98fea5a86 100644
--- a/config/rootfiles/oldcore/173/update.sh
+++ b/config/rootfiles/oldcore/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