Merge branch 'ent-5620-nuevo-compilador-para-backend' into master-alt

pandora_agents/unix/pandora_agent

@@ -39,7 +39,7 @@ BEGIN {
 
 	use File::Copy;
 	use Scalar::Util qw(looks_like_number);
-	use lib '/usr/lib/perl5';
+	BEGIN { push @INC, '/usr/lib/perl5'; }
 
 	################################################################################
 	# Erase blank spaces before and after the string
@@ -312,7 +312,7 @@ BEGIN {
 		$YAML = 1;
 	}
 
-	use lib '/usr/lib/perl5';
+	BEGIN { push @INC, '/usr/lib/perl5'; }
 
 	our @ISA = ("Exporter");
 	our %EXPORT_TAGS = ( 'all' => [ qw( ) ] );
@@ -1003,7 +1003,7 @@ use IO::Socket;
 use Sys::Syslog;
 use Time::Local;
 
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 # Agent XML data
 my $Xml;

pandora_agents/unix/pandora_agent_daemon

@@ -42,6 +42,8 @@ pidof_pandora () {
 	elif [ "$OS_NAME" = "SunOS" ]
 	then
 		ZONENAME_CMD="/bin/zonename"
+		# Has to be run from sources. The binary version inserts blanks between
+		# $DAEMON  and $PANDORA_PATH.
 		TRUNCATED_DAEMON=`echo "$DAEMON $PANDORA_PATH" | cut -c1-20`
 		if [ -x $ZONENAME_CMD ]
 		then
@@ -59,7 +61,7 @@ pidof_pandora () {
 	then
 		# Virtuozzo/OpenVZ
 		local _pid _ctid _pids
-		_pids=`ps -Af | grep "$DAEMON $PANDORA_PATH" | grep -v grep | awk '{ print $2 }'`
+		_pids=`ps -Af | grep "$DAEMON" | grep "$PANDORA_PATH" | grep -v grep | awk '{ print $2 }'`
 		[ "$_pids" ] && for _pid in $_pids
 		do
 			_ctid=`/usr/sbin/vzpid $_pid | awk '$1 == '$_pid' { print $2 }'`
@@ -71,9 +73,9 @@ pidof_pandora () {
 		done
 	elif [ "$OS_NAME" = "AIX" ]; then
 		# AIX
-		PANDORA_PID=`ps -ef | grep "$DAEMON $PANDORA_PATH" | grep -v grep | awk '{ print $2 }'`
+		PANDORA_PID=`ps -ef | grep "$DAEMON" | grep "$PANDORA_PATH" | grep -v grep | awk '{ print $2 }'`
 	else
-		PANDORA_PID=`ps -Afw | grep "$DAEMON $PANDORA_PATH" | grep -v grep | awk '{ print $2 }'`
+		PANDORA_PID=`ps -Afw | grep "$DAEMON" | grep "$PANDORA_PATH" | grep -v grep | awk '{ print $2 }'`
 	fi
 	
 	echo $PANDORA_PID

pandora_agents/unix/pandora_revent

@@ -14,7 +14,7 @@ use strict;
 use LWP::Simple;
 use LWP::UserAgent;
 use MIME::Base64;
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 use PandoraFMS::Tools;
 
 # Init

pandora_agents/win32/omnishell/omnishell_client.pl

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 
 use File::Basename;
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 use PandoraFMS::PluginTools;
 use PandoraFMS::Omnishell;
 

pandora_plugins/MySQL/pandora_mysql.pl

@@ -5,7 +5,7 @@
 # ----------------------------------------------------------------------
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use strict;
 use Data::Dumper;

pandora_plugins/intel_dcm/intel_dcm_discovery.pl

@@ -12,7 +12,7 @@ use NetAddr::IP;
 
 # Default lib dir for RPM and DEB packages
 
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/bin/pandora_server

@@ -24,7 +24,7 @@ use threads;
 use Digest::MD5 qw(md5_hex);
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 # Pandora Modules
 use PandoraFMS::DB;

pandora_server/lib/PandoraFMS/Config.pm

@@ -22,7 +22,7 @@ use POSIX qw(strftime);
 use Time::Local;
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/lib/PandoraFMS/Core.pm

@@ -145,7 +145,7 @@ if (!$@) {
 }
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::DB;
 use PandoraFMS::Config;

pandora_server/lib/PandoraFMS/DB.pm

@@ -22,7 +22,7 @@ use warnings;
 use DBI;
 use Carp qw/croak/;
 
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 use PandoraFMS::Tools;
 
 #use Data::Dumper;

pandora_server/lib/PandoraFMS/DataServer.pm

@@ -41,7 +41,7 @@ use Encode::Locale ();
 use LWP::Simple;
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/lib/PandoraFMS/DiscoveryServer.pm

@@ -31,7 +31,7 @@ use Encode qw(encode_utf8);
 use MIME::Base64;
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/lib/PandoraFMS/GIS.pm

@@ -53,7 +53,7 @@ use warnings;
 use Geo::IP;
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::DB;
 use PandoraFMS::Tools;

pandora_server/lib/PandoraFMS/NetworkServer.pm

@@ -30,7 +30,7 @@ use HTML::Entities;
 use POSIX qw(strftime);
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/lib/PandoraFMS/Omnishell.pm

@@ -10,7 +10,7 @@ use warnings;
 
 use File::Copy;
 use Scalar::Util qw(looks_like_number);
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 use PandoraFMS::PluginTools qw/init read_configuration read_file empty trim/;
 
 my $YAML = 0;
@@ -24,7 +24,7 @@ if ($@) {
   $YAML = 1;
 }
 
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 our @ISA = ("Exporter");
 our %EXPORT_TAGS = ( 'all' => [ qw( ) ] );

pandora_server/lib/PandoraFMS/PluginServer.pm

@@ -30,7 +30,7 @@ use JSON qw(decode_json);
 use Encode qw(encode_utf8 decode_utf8);
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/lib/PandoraFMS/PredictionServer.pm

@@ -29,7 +29,7 @@ use Net::Ping;
 use POSIX qw(strftime);
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm

@@ -25,7 +25,7 @@ use threads::shared;
 use Thread::Semaphore;
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::DB;
 use PandoraFMS::Core;

pandora_server/lib/PandoraFMS/Recon/Base.pm

@@ -12,7 +12,7 @@ use IO::Socket::INET;
 use POSIX qw/ceil/;
 use Socket qw/inet_aton/;
 
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 use PandoraFMS::Tools;
 use PandoraFMS::Recon::NmapParser;
 use PandoraFMS::Recon::Util;

pandora_server/lib/PandoraFMS/Recon/Util.pm

@@ -7,7 +7,7 @@ use strict;
 use warnings;
 
 # Default lib dir for RPM and DEB packages.
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use Socket qw/inet_aton/;
 

pandora_server/lib/PandoraFMS/SNMPServer.pm

@@ -31,7 +31,7 @@ use XML::Simple;
 use Scalar::Util qw(looks_like_number);
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/lib/PandoraFMS/Server.pm

@@ -25,7 +25,7 @@ use threads;
 use threads::shared;
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::DB;
 use PandoraFMS::Core;

pandora_server/lib/PandoraFMS/Tools.pm

@@ -34,7 +34,7 @@ use threads::shared;
 use JSON;
 use Encode qw/decode_utf8 encode_utf8/;
 
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 use PandoraFMS::Sendmail;
 
 # New in 3.2. Used to sendmail internally, without external scripts

pandora_server/lib/PandoraFMS/WMIServer.pm

@@ -28,7 +28,7 @@ use POSIX qw(strftime);
 use HTML::Entities;
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/util/agent_gis_update.pl

@@ -26,7 +26,7 @@ use POSIX qw(strftime);
 use Time::HiRes qw(usleep);
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Core;
 use PandoraFMS::Config;

pandora_server/util/gpx2pandora_agent_data.pl

@@ -13,7 +13,7 @@ use Sys::Hostname;
 use POSIX qw(strftime);
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 

pandora_server/util/pandora_database_check.pl

@@ -31,7 +31,7 @@ use POSIX qw(strftime);
 use Time::HiRes qw( clock_gettime clock ) ;
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/util/pandora_db.pl

@@ -27,7 +27,7 @@ use File::Path qw(rmtree);
 use Time::HiRes qw(usleep);
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Core;
 use PandoraFMS::Tools;

pandora_server/util/pandora_dbstress.pl

@@ -35,7 +35,7 @@ use Math::Trig;			# Math functions
 use Time::HiRes qw ( clock_gettime CLOCK_REALTIME);
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 # Pandora Modules
 use PandoraFMS::Config;

pandora_server/util/pandora_manage.pl

@@ -24,7 +24,7 @@ use LWP::Simple;
 use Data::Dumper;
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/util/pandora_migrate_logs.pl

@@ -13,7 +13,7 @@ use JSON;
 use IO::Socket::INET;
 use File::Copy;
 
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Config;
 use PandoraFMS::Tools;

pandora_server/util/pandora_migrate_plugins.pl

@@ -18,7 +18,7 @@ use Data::Dumper;
 use JSON qw(encode_json);
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/util/pandora_migrate_recon_scripts.pl

@@ -18,7 +18,7 @@ use Data::Dumper;
 use JSON qw(encode_json);
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/util/pandora_perf_report.pl

@@ -10,7 +10,7 @@ use POSIX qw (strftime floor);
 use Sys::Hostname;
 use Time::HiRes  qw(gettimeofday tv_interval);
 
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 # Pandora Modules.
 use PandoraFMS::Config;

pandora_server/util/pandora_recode_db.pl

@@ -16,7 +16,7 @@ use POSIX;
 use HTML::Entities;		# Encode or decode strings with HTML entities
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/util/pandora_revent.pl

@@ -14,7 +14,7 @@ use strict;
 use LWP::Simple;
 use LWP::UserAgent;
 use MIME::Base64;
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 use PandoraFMS::Tools;
 
 # Init

pandora_server/util/pandora_server

@@ -81,7 +81,7 @@ function pidof_pandora () {
 	# in a "strech" term, ps aux don't report more than COLUMNS
 	# characters and this will not work. 
 	COLUMNS=300
-	PANDORA_PID=`ps aux | grep "$PANDORA_DAEMON $PANDORA_HOME" | grep -v grep | tail -1 | awk '{ print $2 }'`
+	PANDORA_PID=`ps aux | grep "$PANDORA_DAEMON" | grep "$PANDORA_HOME" | grep -v grep | tail -1 | awk '{ print $2 }'`
 	echo $PANDORA_PID
 }
 

pandora_server/util/pandora_smpp.pl

@@ -5,7 +5,7 @@ use warnings;
 
 use Net::SMPP;
 
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 use PandoraFMS::PluginTools qw(read_configuration);
 
 my $HELP =<<EO_H;

pandora_server/util/pandora_sync_db.pl

@@ -16,7 +16,7 @@ use POSIX;
 use HTML::Entities;		# Encode or decode strings with HTML entities
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/util/plugin/pandora_snmp_bandwidth.pl

@@ -21,7 +21,7 @@ use warnings;
 
 use POSIX qw(strftime);
 
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 use PandoraFMS::PluginTools;
 
 use Data::Dumper;

pandora_server/util/recon_scripts/ipmi-recon.pl

@@ -12,7 +12,7 @@ use NetAddr::IP;
 
 # Default lib dir for RPM and DEB packages
 
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;

pandora_server/util/recon_scripts/snmp-recon.pl

@@ -6,7 +6,7 @@ use strict;
 use warnings;
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use POSIX qw/strftime/;
 use Socket qw/inet_aton/;

pandora_server/util/recon_scripts/wmi-recon.pl

@@ -9,7 +9,7 @@ use strict;
 use warnings;
 
 # Default lib dir for RPM and DEB packages
-use lib '/usr/lib/perl5';
+BEGIN { push @INC, '/usr/lib/perl5'; }
 
 use PandoraFMS::Tools;
 use PandoraFMS::DB;