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

Merge branch 'weird-names-whe-apply-policies-7.0' into 'develop' 

Calculate md5 checksums byte by byte, not char by char!

See merge request !464
This commit is contained in:
vgilc 2017-05-12 09:42:02 +02:00
parent 3d0c77709e 6a83598c64
commit 03158ccc16
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -2681,7 +2681,7 @@ sub pandora_delete_module ($$;$) {
my $agent_name = get_agent_name($dbh, $module->{'id_agente'}); my $agent_name = get_agent_name($dbh, $module->{'id_agente'});
if ((defined($conf)) && (-e $conf->{incomingdir}.'/conf/'.md5($agent_name).'.conf')) { if ((defined($conf)) && (-e $conf->{incomingdir}.'/conf/'.md5(encode_utf8(safe_output($agent_name))).'.conf')) {
enterprise_hook('pandora_delete_module_from_conf', [$conf,$agent_name,$module->{'nombre'}]); enterprise_hook('pandora_delete_module_from_conf', [$conf,$agent_name,$module->{'nombre'}]);
} }
@ -2979,12 +2979,11 @@ sub pandora_delete_agent ($$;$) {
if (defined $conf) { if (defined $conf) {
# Delete the conf files # Delete the conf files
if (-e $conf->{incomingdir}.'/conf/'.md5($agent_name).'.conf') { my $conf_fname = $conf->{incomingdir}.'/conf/'.md5(encode_utf8(safe_output($agent_name))).'.conf';
unlink($conf->{incomingdir}.'/conf/'.md5($agent_name).'.conf'); unlink($conf_fname) if (-f $conf_fname);
}
if (-e $conf->{incomingdir}.'/md5/'.md5($agent_name).'.md5') { my $md5_fname = $conf->{incomingdir}.'/md5/'.md5(encode_utf8(safe_output($agent_name))).'.md5';
unlink($conf->{incomingdir}.'/md5/'.md5($agent_name).'.md5'); unlink($md5_fname) if (-f $md5_fname);
}
} }
foreach my $module (@modules) { foreach my $module (@modules) {