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

Merge branch '2031-syslogserver-perdida-de-historico-en-cambio-de-alias-re' into 'develop' 

Fixed duplicate definition $rs

See merge request artica/pandorafms!1360
This commit is contained in:
vgilc 2018-03-12 13:55:49 +01:00
parent a66a7fde49 4566aee4e1
commit 3e90c3421a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,10 +267,10 @@ sub get_agent {
my $rs = get_agent_from_alias($dbh, $field);
return $rs if defined($rs) && (ref($rs)); # defined and not a scalar
my $rs = get_agent_from_addr($dbh, $field);
$rs = get_agent_from_addr($dbh, $field);
return $rs if defined($rs) && (ref($rs)); # defined and not a scalar
my $rs = get_agent_from_name($dbh, $field);
$rs = get_agent_from_name($dbh, $field);
return $rs if defined($rs) && (ref($rs)); # defined and not a scalar
return undef;