Merge branch 'master' into next

diff --git a/config/rootfiles/oldcore/173/update.sh b/config/rootfiles/oldcore/173/update.sh
index 24d89c30aa9d9ca7a2390bc42d3c12aef4d8d561..98fea5a86d35952e13e871818b26d8e80814e1ca 100644 (file)
--- 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 92b5989e9005f73e58947a1c419efb49dd32b317..0659aa6b14fd174a0b0e4376f8d86083e45ffbb2 100644 (file)
--- 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) {