summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--fetchmail-model.lua12
2 files changed, 3 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 18ed7cb..644a40c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
APP_NAME=fetchmail
PACKAGE=acf-$(APP_NAME)
-VERSION=0.4.0
+VERSION=0.4.1
APP_DIST=\
fetchmail* \
diff --git a/fetchmail-model.lua b/fetchmail-model.lua
index d7a93e2..0a6cc68 100644
--- a/fetchmail-model.lua
+++ b/fetchmail-model.lua
@@ -390,28 +390,20 @@ end
function startstop_service(action)
local result = modelfunctions.startstop_service(processname, action)
- --[[
- -- Removed support for Run and Test because needs to run as fetchmail user due to init.d change
- -- trying to run as user fetchmail caused problems where could not save session (no longer root?)
- -- also, questioned reason for these functions because they will appear broken when working
- -- because fetchmail takes so long to return
table.insert(result.value.actions.value, "Run")
table.insert(result.value.actions.value, "Test")
if action and (action:lower() == "run" or action:lower() == "test") then
result.value.result.errtxt = nil
local cmd
if action:lower() == "run" then
- cmd = "/usr/bin/fetchmail -d0 -v --nosyslog -f "..configfile.." 2>&1"
+ cmd = 'su -s /bin/sh -c "/usr/bin/fetchmail -d0 -v --nosyslog -f '..configfile..' 2>&1" - fetchmail'
elseif action:lower() == "test" then
- cmd = "/usr/bin/fetchmail -d0 -v -k --nosyslog -f "..configfile.." 2>&1"
+ cmd = 'su -s /bin/sh -c "/usr/bin/fetchmail -d0 -v -k --nosyslog -f '..configfile..' 2>&1" - fetchmail'
end
- --posix.setpid("u", "fetchmail")
local f = io.popen(cmd)
result.value.result.value = f:read("*a")
f:close()
- --posix.setpid("u", "root")
end
- --]]
return result
end