diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index 696851c7c4..98b8ae87f1 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,9 @@ +2012-11-19 Sergio Martin + + * modules/pandora_module.h + modules/pandora_module.cc: Fixed type conflicts in the + last changes + 2012-11-19 Sergio Martin * modules/pandora_module.h diff --git a/pandora_agents/win32/modules/pandora_module.cc b/pandora_agents/win32/modules/pandora_module.cc index f2fda80d0f..43f15a1f4f 100644 --- a/pandora_agents/win32/modules/pandora_module.cc +++ b/pandora_agents/win32/modules/pandora_module.cc @@ -66,7 +66,7 @@ Pandora_Module::Pandora_Module (string name) { this->timestamp = 0; this->intensive_match = 0; this->unit = ""; - this->module_group = 0; + this->module_group = ""; this->custom_id = ""; this->str_warning = ""; this->str_critical = ""; @@ -74,10 +74,10 @@ Pandora_Module::Pandora_Module (string name) { this->warning_instructions = ""; this->unknown_instructions = ""; this->tags = ""; - this->critical_inverse = 0; - this->warning_inverse = 0; - this->quiet = 0; - this->module_ff_interval = 0; + this->critical_inverse = ""; + this->warning_inverse = ""; + this->quiet = ""; + this->module_ff_interval = ""; } /** @@ -601,7 +601,7 @@ Pandora_Module::getXml () { } /* Module group */ - if (this->module_group != 0) { + if (this->module_group != "") { module_xml += "\t"; module_xml += this->module_group; module_xml += "\n"; @@ -657,28 +657,28 @@ Pandora_Module::getXml () { } /* Critical inverse */ - if (this->critical_inverse != 0) { + if (this->critical_inverse != "") { module_xml += "\t"; module_xml += this->critical_inverse; module_xml += "\n"; } /* Warning inverse */ - if (this->warning_inverse != 0) { + if (this->warning_inverse != "") { module_xml += "\t"; module_xml += this->warning_inverse; module_xml += "\n"; } /* Quiet */ - if (this->quiet != 0) { + if (this->quiet != "") { module_xml += "\t"; module_xml += this->quiet; module_xml += "\n"; } /* Module FF interval */ - if (this->module_ff_interval != 0) { + if (this->module_ff_interval != "") { module_xml += "\t"; module_xml += this->module_ff_interval; module_xml += "\n"; diff --git a/pandora_agents/win32/modules/pandora_module.h b/pandora_agents/win32/modules/pandora_module.h index c6da1115be..673ddf0764 100644 --- a/pandora_agents/win32/modules/pandora_module.h +++ b/pandora_agents/win32/modules/pandora_module.h @@ -177,7 +177,7 @@ namespace Pandora_Modules { unsigned char intensive_match; int intensive_interval; string unit, custom_id, str_warning, str_critical; - int module_group, warning_inverse, critical_inverse, quiet, module_ff_interval; + string module_group, warning_inverse, critical_inverse, quiet, module_ff_interval; string critical_instructions, warning_instructions, unknown_instructions, tags; protected: