diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 195fc34f89..bdf8cd919c 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,10 @@ +2011-09-23 Sancho Lerena + + * lib/PandoraFMS/Config.pm: Updated version. + + * lib/PandoraFMS/NetworkServer.pm: Fixed problem with SNMP v2 + due incorrect call to snmpget. + 2011-09-23 Dario Rodriguez * lib/PandoraFMS/NmapParser.pm: Added an error handler to avoid diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index 2b88eec866..096b1d198e 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="4.0RC1" +pandora_version="4.0" package_cpan=0 package_pandora=1 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index cde5943d87..3ef959cf17 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -42,7 +42,7 @@ our @EXPORT = qw( # version: Defines actual version of Pandora Server for this module only my $pandora_version = "4.0"; -my $pandora_build = "110908"; +my $pandora_build = "110923"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash diff --git a/pandora_server/lib/PandoraFMS/NetworkServer.pm b/pandora_server/lib/PandoraFMS/NetworkServer.pm index 2f8a627d56..f96730b33a 100644 --- a/pandora_server/lib/PandoraFMS/NetworkServer.pm +++ b/pandora_server/lib/PandoraFMS/NetworkServer.pm @@ -265,6 +265,12 @@ sub pandora_snmp_get_command ($$$$$$$$$) { # See codes on http://perldoc.perl.org/perlport.html#PLATFORMS my $OSNAME = $^O; + + # This fixes problem in linux snmpget, because v2 must be submitted like 2c + if ($snmp_version eq "2"){ + $snmp_version = "2c"; + } + # On windows, we need the snmpget command from net-snmp, already present on win agent # the call is the same than in linux if (($OSNAME eq "MSWin32") || ($OSNAME eq "MSWin32-x64") || ($OSNAME eq "cygwin")){