Merge branch 'ent-11829-16031-agente-proxy-no-levanta-con-usuario-root' into 'develop'
Ent-11829-16031-agente-proxy-no-levanta-con-usuario-root See merge request artica/pandorafms!6569
This commit is contained in:
commit
9e8ba22f15
|
@ -2179,16 +2179,7 @@ sub configure ($) {
|
|||
|
||||
#Launch tentacle server in proxy mode if configured
|
||||
if ($Conf{'proxy_mode'}) {
|
||||
|
||||
#Check if user is root
|
||||
if ($> != 0) {
|
||||
if (launch_tentacle_proxy() != 0) {
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
error ('Proxy mode can not be launched as root');
|
||||
return 1;
|
||||
}
|
||||
return 1 if (launch_tentacle_proxy() != 0);
|
||||
}
|
||||
|
||||
# Add the plugins directory to the PATH
|
||||
|
|
|
@ -4436,14 +4436,7 @@ my $PID = $$;
|
|||
|
||||
#Launch tentacle server in proxy mode if configured
|
||||
if ($Conf{'proxy_mode'}) {
|
||||
|
||||
#Check if user is root
|
||||
if ($> != 0) {
|
||||
launch_tentacle_proxy();
|
||||
} else {
|
||||
log_message ('error', 'Proxy mode can not be launched as root');
|
||||
exit 1;
|
||||
}
|
||||
launch_tentacle_proxy();
|
||||
}
|
||||
|
||||
# Advice if YAML::Tiny is allowed in this system
|
||||
|
|
Loading…
Reference in New Issue