Comparison

plugins/mod_posix.lua @ 8121:a33a87f13155

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 24 Apr 2017 14:19:49 +0200
parent 8015:ecb110f45c92
parent 8116:76ac8b617402
child 8168:45be94611593
comparison
equal deleted inserted replaced
8112:d8ecefcb7c97 8121:a33a87f13155
55 55
56 -- Don't even think about it! 56 -- Don't even think about it!
57 if not prosody.start_time then -- server-starting 57 if not prosody.start_time then -- server-starting
58 local suid = module:get_option("setuid"); 58 local suid = module:get_option("setuid");
59 if not suid or suid == 0 or suid == "root" then 59 if not suid or suid == 0 or suid == "root" then
60 if pposix.getuid() == 0 and not module:get_option("run_as_root") then 60 if pposix.getuid() == 0 and not module:get_option_boolean("run_as_root") then
61 module:log("error", "Danger, Will Robinson! Prosody doesn't need to be run as root, so don't do it!"); 61 module:log("error", "Danger, Will Robinson! Prosody doesn't need to be run as root, so don't do it!");
62 module:log("error", "For more information on running Prosody as root, see https://prosody.im/doc/root"); 62 module:log("error", "For more information on running Prosody as root, see https://prosody.im/doc/root");
63 prosody.shutdown("Refusing to run as root"); 63 prosody.shutdown("Refusing to run as root");
64 end 64 end
65 end 65 end