From: Daniel F. Dickinson <redacted>
Date: Sun, 23 Dec 2018 05:14:53 +0000 (-0500)
Subject: nut: really run upsd as non-root
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=2d87aa40c84799c2ccf6f8b5593a390670aaff06;p=openwrt-packages.git

nut: really run upsd as non-root

One local removal was missed in last push of this fix, so
in certain circumstances upsd would run as root even when
it shouldn't.

Fixes f48b060fa752 ("nut: Fix upsd runs as root")
Closes: #6697 (properly)

Signed-off-by: Daniel F. Dickinson <redacted>
---

diff --git a/net/nut/files/nut-server.init b/net/nut/files/nut-server.init
index 2cdeb96cf..a1df01645 100755
--- a/net/nut/files/nut-server.init
+++ b/net/nut/files/nut-server.init
@@ -225,7 +225,6 @@ build_global_driver_config() {
 }
 
 build_config() {
-	local RUNAS=nut
 	local STATEPATH=/var/run/nut
 
         mkdir -m 0755 -p "$(dirname "$UPS_C")"
@@ -281,7 +280,7 @@ start_driver_instance() {
 }
 
 start_server_instance() {
-	local RUNAS
+	local RUNAS=nut
 	build_config
 
 	[ "$haveserver" != 1 ] && return