tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add util to the PATH before launching the proxy. Fixes ticket #1175. 

(cherry picked from commit 787b76bb49)
This commit is contained in:
Ramon Novoa 2015-02-04 15:59:39 +01:00
parent a3783f70e1
commit 341928b8dd
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pandora_agents/win32/pandora_windows_service.cc
View File

@ -265,22 +265,6 @@ Pandora_Windows_Service::pandora_init () {
debug = conf->getValue ("debug");
setPandoraDebug (is_enabled (debug));
/*Check if proxy mode is set*/
proxy_mode = conf->getValue ("proxy_mode");
if (proxy_mode != "" && this->tentacle_proxy == false) {
launchTentacleProxy();
}
/* Launch UDP Server */
udp_server_enabled = conf->getValue ("udp_server");
if (udp_server_enabled.compare ("1") == 0 && this->udp_server == NULL) {
udp_server_port = conf->getValue ("udp_server_port");
udp_server_addr = conf->getValue ("udp_server_address");
udp_server_auth_addr = conf->getValue ("udp_server_auth_address");
this->udp_server = new UDP_Server (this, udp_server_addr, udp_server_auth_addr, atoi (udp_server_port.c_str ()));
((UDP_Server *)this->udp_server)->start ();
}
if (first_run == 1) {
first_run = 0;
@ -296,6 +280,22 @@ Pandora_Windows_Service::pandora_init () {
pandoraLog ("Pandora agent started");
}
/*Check if proxy mode is set*/
proxy_mode = conf->getValue ("proxy_mode");
if (proxy_mode != "" && this->tentacle_proxy == false) {
launchTentacleProxy();
}
/* Launch UDP Server */
udp_server_enabled = conf->getValue ("udp_server");
if (udp_server_enabled.compare ("1") == 0 && this->udp_server == NULL) {
udp_server_port = conf->getValue ("udp_server_port");
udp_server_addr = conf->getValue ("udp_server_address");
udp_server_auth_addr = conf->getValue ("udp_server_auth_address");
this->udp_server = new UDP_Server (this, udp_server_addr, udp_server_auth_addr, atoi (udp_server_port.c_str ()));
((UDP_Server *)this->udp_server)->start ();
}
}
int