From: Gert Doering Date: Wed, 18 Sep 2024 16:29:17 +0000 (+0200) Subject: make t_server_null 'server alive?' check more robust X-Git-Tag: v2.7_alpha1~193 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b322690394b75a9d4987d4b27107ccb01bbcd90e;p=thirdparty%2Fopenvpn.git make t_server_null 'server alive?' check more robust - use "$RUN_SUDO kill -0 $pid" to test if a given process is running, not "ps -p $pid" - the latter will not work if security.bsd.see_other_uids=0 is set - produce proper error messages if pid files can not be found or are empty at server shutdown time Acked-by: Frank Lichtenheld Message-Id: <20240918162917.6809-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29314.html Signed-off-by: Gert Doering --- diff --git a/tests/t_server_null_client.sh b/tests/t_server_null_client.sh index e7dd3324..c1a25dfc 100755 --- a/tests/t_server_null_client.sh +++ b/tests/t_server_null_client.sh @@ -87,7 +87,10 @@ while [ $count -lt $server_max_wait ]; do # the active server count as the processes won't be running. for i in `set|grep 'SERVER_NAME_'|cut -d "=" -f 2|tr -d "[\']"`; do server_pid=$(cat $i.pid 2> /dev/null) - if ps -p $server_pid > /dev/null 2>&1; then + if [ -z "$server_pid" ] ; then + continue + fi + if $RUN_SUDO kill -0 $server_pid > /dev/null 2>&1; then servers_up=$(( $servers_up + 1 )) fi done diff --git a/tests/t_server_null_server.sh b/tests/t_server_null_server.sh index e5906eec..10bb44bf 100755 --- a/tests/t_server_null_server.sh +++ b/tests/t_server_null_server.sh @@ -82,6 +82,11 @@ for PID_FILE in $server_pid_files do SERVER_PID=$(cat "${PID_FILE}") + if [ -z "$SERVER_PID" ] ; then + echo "WARNING: could not kill server ${PID_FILE}!" + continue + fi + if [ -z "${RUN_SUDO}" ]; then $KILL_EXEC "${SERVER_PID}" else