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

recvTentacleDataFile should throw an exception when it fails, otherwise 

remote configuration doesn't work!
This commit is contained in:
Ramon Novoa 2015-09-08 15:41:14 +02:00
parent 7f802868b4
commit 80fea40223
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_agents/win32/pandora_windows_service.cc
View File

@ -1028,7 +1028,7 @@ Pandora_Windows_Service::recvTentacleDataFile (string host,
ZeroMemory (&pi, sizeof (pi)); ZeroMemory (&pi, sizeof (pi));
if (CreateProcess (NULL , (CHAR *)tentacle_cmd.c_str (), NULL, NULL, FALSE, if (CreateProcess (NULL , (CHAR *)tentacle_cmd.c_str (), NULL, NULL, FALSE,
CREATE_NO_WINDOW, NULL, NULL, &si, &pi) == 0) { CREATE_NO_WINDOW, NULL, NULL, &si, &pi) == 0) {
return; throw Pandora_Exception ();
} }
/* close thread handle, because it won't be used */ /* close thread handle, because it won't be used */
@ -1045,7 +1045,7 @@ Pandora_Windows_Service::recvTentacleDataFile (string host,
TerminateProcess(pi.hProcess, STILL_ACTIVE); TerminateProcess(pi.hProcess, STILL_ACTIVE);
CloseHandle (pi.hProcess); CloseHandle (pi.hProcess);
pandoraLog ("Unable to receive file %s (tentacle timeout)", filename.c_str ()); pandoraLog ("Unable to receive file %s (tentacle timeout)", filename.c_str ());
return; throw Pandora_Exception ();
} }
/* Get the return code of the tentacle client*/ /* Get the return code of the tentacle client*/
@ -1053,7 +1053,7 @@ Pandora_Windows_Service::recvTentacleDataFile (string host,
if (rc != 0) { if (rc != 0) {
CloseHandle (pi.hProcess); CloseHandle (pi.hProcess);
pandoraLog ("Unable to receive file %s", filename.c_str ()); pandoraLog ("Unable to receive file %s", filename.c_str ());
return; throw Pandora_Exception ();
} }
CloseHandle (pi.hProcess); CloseHandle (pi.hProcess);