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

2013-10-28 Sergio Martin <sergio.martin@artica.es> 

* lib/PandoraFMS/DataServer.pm: Add check to update
	adopted unlinked data modules



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8971 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-10-28 15:03:00 +00:00
parent 3bfcf5b78c
commit 3aa5403921
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2013-10-28 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DataServer.pm: Add check to update
adopted unlinked data modules
2013-10-28 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Tools.pm: Added exeptions in safe_input

12
pandora_server/lib/PandoraFMS/DataServer.pm
View File

@ -632,9 +632,17 @@ sub process_module_data ($$$$$$$$$) {
$module_conf->{'extended_info'} = $module->{'extended_info'} unless defined ($module_conf->{'extended_info'});
$module_conf->{'module_interval'} = $module->{'module_interval'} unless defined ($module_conf->{'module_interval'});
}
# Check if the module is policy linked to update it or not
my $policy_linked = 0;
if ($module->{'id_policy_module'} != 0) {
if ($module->{'policy_adopted'} == 0 || ($module->{'policy_adopted'} == 1 && $module->{'policy_linked'} == 1)) {
$policy_linked = 1;
}
}
# Update module configuration if in learning mode and not a policy module
if ($agent->{'modo'} eq '1' && $module->{'id_policy_module'} == 0) {
if ($agent->{'modo'} eq '1' && $policy_linked == 0) {
update_module_configuration ($pa_config, $dbh, $module, $module_conf);
}