mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-28 16:24:54 +02:00
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
|
#Launch tentacle server in proxy mode if configured
|
||||||
if ($Conf{'proxy_mode'}) {
|
if ($Conf{'proxy_mode'}) {
|
||||||
|
return 1 if (launch_tentacle_proxy() != 0);
|
||||||
#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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Add the plugins directory to the PATH
|
# Add the plugins directory to the PATH
|
||||||
|
@ -4436,14 +4436,7 @@ my $PID = $$;
|
|||||||
|
|
||||||
#Launch tentacle server in proxy mode if configured
|
#Launch tentacle server in proxy mode if configured
|
||||||
if ($Conf{'proxy_mode'}) {
|
if ($Conf{'proxy_mode'}) {
|
||||||
|
launch_tentacle_proxy();
|
||||||
#Check if user is root
|
|
||||||
if ($> != 0) {
|
|
||||||
launch_tentacle_proxy();
|
|
||||||
} else {
|
|
||||||
log_message ('error', 'Proxy mode can not be launched as root');
|
|
||||||
exit 1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Advice if YAML::Tiny is allowed in this system
|
# Advice if YAML::Tiny is allowed in this system
|
||||||
|
Loading…
x
Reference in New Issue
Block a user