From eaaa47081892099bfdbe5b173dd712f870ce7243 Mon Sep 17 00:00:00 2001 From: iliajie Date: Mon, 3 Apr 2023 18:50:58 +0300 Subject: [PATCH] Fix to properly stop Usermin https://github.com/webmin/usermin/issues/89 --- usermin/usermin-lib.pl | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/usermin/usermin-lib.pl b/usermin/usermin-lib.pl index 96ad74649..37d0b0558 100755 --- a/usermin/usermin-lib.pl +++ b/usermin/usermin-lib.pl @@ -864,22 +864,12 @@ sub flush_modules_cache =head2 stop_usermin -Kills the running Usermin server process, returning undef on success or an -error message on failure. +Kills the running Usermin server process. Return value is always undef. =cut sub stop_usermin { -local %miniserv; -&get_usermin_miniserv_config(\%miniserv); -local $pid; -if (open(PID, "<".$miniserv{'pidfile'}) && ($pid = int())) { - &kill_logged('TERM', $pid) || return &text('stop_ekill', $!); - close(PID); - } -else { - return $text{'stop_efile'}; - } +&system_logged("$config{'usermin_dir'}/stop >/dev/null 2>&1