From 2322b07c771b89b5805da7effa34a401b848d460 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Tue, 12 May 2015 16:30:05 +0200
Subject: [PATCH] Read dbengine from pandora_server.conf before connecting to
the DB.
---
pandora_server/util/pandora_manage.pl | 2 +-
pandora_server/util/recon_scripts/ipmi-recon.pl | 2 +-
pandora_server/util/recon_scripts/snmp-recon.pl | 2 +-
pandora_server/util/recon_scripts/wmi-recon.pl | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7b880c6ac1..3bf7119f5d 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -67,7 +67,7 @@ if (enterprise_load (\%conf) == 0) {
}
# Connect to the DB
-my $dbh = db_connect ('mysql', $conf{'dbname'}, $conf{'dbhost'}, $conf{'dbport'}, $conf{'dbuser'}, $conf{'dbpass'});
+my $dbh = db_connect ($conf{'dbengine'}, $conf{'dbname'}, $conf{'dbhost'}, $conf{'dbport'}, $conf{'dbuser'}, $conf{'dbpass'});
my $history_dbh = ($conf{'_history_db_enabled'} eq '1') ? db_connect ('mysql', $conf{'_history_db_name'},
$conf{'_history_db_host'}, '3306', $conf{'_history_db_user'}, $conf{'_history_db_pass'}) : undef;
diff --git a/pandora_server/util/recon_scripts/ipmi-recon.pl b/pandora_server/util/recon_scripts/ipmi-recon.pl
index 7cfea2d0c4..ce9c2f6ae1 100644
--- a/pandora_server/util/recon_scripts/ipmi-recon.pl
+++ b/pandora_server/util/recon_scripts/ipmi-recon.pl
@@ -169,7 +169,7 @@ $conf{'pandora_path'} = $pandora_conf;
pandora_load_config (\%conf);
# Connect to the DB
-my $dbh = db_connect ('mysql', $conf{'dbname'}, $conf{'dbhost'}, '3306', $conf{'dbuser'}, $conf{'dbpass'});
+my $dbh = db_connect ($conf{'dbengine'}, $conf{'dbname'}, $conf{'dbhost'}, '3306', $conf{'dbuser'}, $conf{'dbpass'});
# Start the network sweep
diff --git a/pandora_server/util/recon_scripts/snmp-recon.pl b/pandora_server/util/recon_scripts/snmp-recon.pl
index c38fc19454..71d0ad0d2b 100755
--- a/pandora_server/util/recon_scripts/snmp-recon.pl
+++ b/pandora_server/util/recon_scripts/snmp-recon.pl
@@ -959,7 +959,7 @@ pandora_load_config(\%CONF);
pandora_start_log(\%CONF);
# Connect to the DB
-$DBH = db_connect ('mysql', $CONF{'dbname'}, $CONF{'dbhost'}, $CONF{'dbport'}, $CONF{'dbuser'}, $CONF{'dbpass'});
+$DBH = db_connect ($CONF{'dbengine'}, $CONF{'dbname'}, $CONF{'dbhost'}, $CONF{'dbport'}, $CONF{'dbuser'}, $CONF{'dbpass'});
# 0%
update_recon_task($DBH, $TASK_ID, 1);
diff --git a/pandora_server/util/recon_scripts/wmi-recon.pl b/pandora_server/util/recon_scripts/wmi-recon.pl
index 092ead1d51..5b036e0200 100755
--- a/pandora_server/util/recon_scripts/wmi-recon.pl
+++ b/pandora_server/util/recon_scripts/wmi-recon.pl
@@ -360,7 +360,7 @@ pandora_load_config(\%CONF);
pandora_start_log(\%CONF);
# Connect to the DB.
-$DBH = db_connect ('mysql', $CONF{'dbname'}, $CONF{'dbhost'}, $CONF{'dbport'}, $CONF{'dbuser'}, $CONF{'dbpass'});
+$DBH = db_connect ($CONF{'dbengine'}, $CONF{'dbname'}, $CONF{'dbhost'}, $CONF{'dbport'}, $CONF{'dbuser'}, $CONF{'dbpass'});
# Get the recon task from the database.
my $task = get_db_single_row ($DBH, 'SELECT * FROM trecon_task WHERE id_rt = ?', $TASK_ID);