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

2012-05-21 Koichiro Kikuchi <koichiro@rworks.jp> 

* util/pandora_db.pl: Merged from 4.0.2: Set default DB port
	 number when it's not specified in the configuration file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6324 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
koichirok 2012-05-21 06:37:12 +00:00
parent e511723053
commit 3dd055b206
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2012-05-21 Koichiro Kikuchi <koichiro@rworks.jp>
* util/pandora_db.pl: Merged from 4.0.2: Set default DB port
number when it's not specified in the configuration file.
2012-05-17 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Added --create_network_module_from_component

1
pandora_server/util/pandora_db.pl
View File

@ -378,6 +378,7 @@ sub pandora_load_config ($) {
foreach my $param ('dbuser', 'dbpass', 'dbname', 'dbhost', 'log_file') {
die ("[ERROR] Bad config values. Make sure " . $conf->{'_pandora_path'} . " is a valid config file.\n\n") unless defined ($conf->{$param});
}
$conf->{'dbport'} = '3306' unless defined ($conf->{'dbport'});
# Read additional tokens from the DB
my $dbh = db_connect ('mysql', $conf->{'dbname'}, $conf->{'dbhost'}, $conf->{'dbport'}, $conf->{'dbuser'}, $conf->{'dbpass'});