From 53cf86faf7ecd8bc7521a32ada1de471f8399d5c Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 20 Mar 2014 16:04:00 +0000 Subject: [PATCH] 2014-03-20 Sergio Martin * lib/PandoraFMS/WMIServer.pm: Move WMI query safe_output function to before the quotes ssubstitution to fix any WMI component with double quotes and WMI Wizard git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9620 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 6 ++++++ pandora_server/lib/PandoraFMS/WMIServer.pm | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index ed7fc673c2..bdfe9b7aba 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2014-03-20 Sergio Martin + + * lib/PandoraFMS/WMIServer.pm: Move WMI query safe_output + function to before the quotes ssubstitution to fix + any WMI component with double quotes and WMI Wizard + 2014-03-18 Miguel de Dios * util/pandora_db.pl: fixed the notinit_count in the agents after diff --git a/pandora_server/lib/PandoraFMS/WMIServer.pm b/pandora_server/lib/PandoraFMS/WMIServer.pm index d9aee78247..9a3210e28c 100644 --- a/pandora_server/lib/PandoraFMS/WMIServer.pm +++ b/pandora_server/lib/PandoraFMS/WMIServer.pm @@ -159,11 +159,10 @@ sub data_consumer ($$) { } # WMI query - my $wmi_query = $module->{'snmp_oid'}; + my $wmi_query = safe_output ($module->{'snmp_oid'}); $wmi_query =~ s/\"/\'/g; $wmi_command .= ' //' . $module->{'ip_target'} . ' "' . $wmi_query . '"'; - $wmi_command = safe_output ($wmi_command); logger ($pa_config, "Executing AM # $module_id WMI command '$wmi_command'", 9); # Execute command