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

Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

This commit is contained in:
m-lopez-f 2015-04-20 15:30:32 +02:00
parent a454a16c57 878e65fa30
commit f7d9831dd2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pandora_agents/win32/modules/pandora_module_logevent.cc
View File

@ -392,16 +392,16 @@ Pandora_Module_Logevent::getLogEvents (list<string> &event_list, unsigned char d
event << "]";
}
// Remove carriage returns and new lines in between the description.
output = "";
for (size_t i = 0; i < description.size(); i++) {
if (description[i] != '\n' && description[i] != '\r') {
output += description[i];
}
}
output += '\n';
// Remove carriage returns and new lines in between the description.
output = "";
for (size_t i = 0; i < description.size(); i++) {
if (description[i] != '\n' && description[i] != '\r') {
output += description[i];
}
}
output += '\n';
// Print the event description
event << " ";
event << output;
@ -508,7 +508,7 @@ Pandora_Module_Logevent::getEventDescription (PEVENTLOGRECORD pevlr, char *messa
exe_file_path_end = ((char *) exe_file_path) + _MAX_PATH * sizeof (TCHAR);
while (1) {
// Load the DLL
// Load the DLL
module = LoadLibraryEx (dll_start, 0, flags);
if(module == NULL) {
pandoraDebug("LoadLibraryEx error %d. Exe file path %s.", GetLastError(), exe_file_path);
@ -572,7 +572,7 @@ Pandora_Module_Logevent::getEventDescriptionXPATH (PEVENTLOGRECORD pevlr) {
}
// Build the XPATH query
query = "Event/System[EventID=" + inttostr(pevlr->EventID & EVENT_ID_MASK) + "]";
query = "Event/System[EventRecordID=" + inttostr(pevlr->RecordNumber) + "]";
pwsQuery = strAnsiToUnicode (query.c_str());
pwsPath = strAnsiToUnicode (this->source.c_str());