diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm index c257e2de57..896b6c3f35 100755 --- a/pandora_server/lib/PandoraFMS/Tools.pm +++ b/pandora_server/lib/PandoraFMS/Tools.pm @@ -676,12 +676,6 @@ sub enterprise_load ($) { # Ops if ($@) { - # Remove the rebranding if open version - if ($^O ne 'MSWin32') { - `unset PANDORA_RB_PRODUCT_NAME`; - `unset PANDORA_RB_COPYRIGHT_NOTICE`; - } - # Enterprise.pm not found. return 0 if ($@ =~ m/PandoraFMS\/Enterprise\.pm.*\@INC/); diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 63e3694da4..d18ea02ab0 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -553,7 +553,7 @@ sub pandora_compactdb ($$) { ######################################################################## # Check command line parameters. ######################################################################## -sub pandora_init ($) { +sub pandora_init_pdb ($) { my $conf = shift; log_message ('', "\nDB Tool $version Copyright (c) 2004-2018 " . pandora_get_initial_copyright_notice() . "\n"); @@ -595,7 +595,7 @@ sub pandora_init ($) { ######################################################################## # Read external configuration file. ######################################################################## -sub pandora_load_config ($) { +sub pandora_load_config_pdb ($) { my $conf = shift; # Read conf file @@ -1025,10 +1025,10 @@ sub pandoradb_main ($$$) { } # Init -pandora_init(\%conf); +pandora_init_pdb(\%conf); # Read config file -pandora_load_config (\%conf); +pandora_load_config_pdb (\%conf); # Load enterprise module if (enterprise_load (\%conf) == 0) {