Merge branch 'master' of https://github.com/thepoch/SoftEtherVPN into thepoch-master

centos/SOURCES/init.d/vpnserver

@@ -40,7 +40,7 @@ start() {
 
 stop() {
 	echo -n $"Stopping $prog: "
-	$exec stop
+	/usr/bin/timeout 30 $exec stop || /usr/bin/killall -q -9 $prog
 	retval=$?
 	echo
 	[ $retval -eq 0 ] && rm -f $lockfile