From e901d4b55a735c575a7bf2888df646344593901f Mon Sep 17 00:00:00 2001
From: guruevi <noreply@pandorafms.org>
Date: Tue, 20 Jan 2009 18:07:18 +0000
Subject: [PATCH] 2009-01-20  Evi Vanoost  <vanooste@rcbi.rochester.edu>

	* lib/PandoraFMS/Config.pm: Commented 2 lines that broke the server

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_server/ChangeLog                | 4 ++++
 pandora_server/lib/PandoraFMS/Config.pm | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index df6c1b732d..a03046db41 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-20  Evi Vanoost  <vanooste@rcbi.rochester.edu>
+
+	* lib/PandoraFMS/Config.pm: Commented 2 lines that broke the server
+
 2009-01-20  Raul Mateos <raulofpandora@gmail.com>
 	
 	* lib/PandoraFMS/Config.pm: Changed some texts again.
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 107b1480da..17c79f4b48 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -473,7 +473,7 @@ sub pandora_loadconfig {
         exit;
     }
     # Show some config options in startup
-    if (($pa_config->{"quiet"} == 0) && ($pa_config->{"verbosity"} > 4)) {
+    #if (($pa_config->{"quiet"} == 0) && ($pa_config->{"verbosity"} > 4)) { #<-- This breaks the server as you don't allow  pa_config->{"servermode"} to be set
 	    if ($opmode == 0){
 		    print " [*] You are running Pandora FMS Data Server. \n";
 		    $parametro ="Pandora FMS Data Server";
@@ -525,7 +525,7 @@ sub pandora_loadconfig {
 	    if ($pa_config->{"pandora_master"} == 1) {
 		    print " [*] This server is running in MASTER mode.\n";
 	    }
-    }
+    #}
 	logger ($pa_config, "Launching $parametro $pa_config->{'version'} $pa_config->{'build'}", 0);
 	my $config_options = "Logfile at ".$pa_config->{"logfile"}.", Basepath is ".$pa_config->{"basepath"}.", Checksum is ".$pa_config->{"pandora_check"}.", Master is ".$pa_config->{"pandora_master"}.", SNMP Console is ".$pa_config->{"snmpconsole"}.", Server Threshold at ".$pa_config->{"server_threshold"}." sec, verbosity at ".$pa_config->{"verbosity"}.", Alert Threshold at $pa_config->{'alert_threshold'}, ServerName is '".$pa_config->{'servername'}.$pa_config->{"servermode"}."'";
 	logger ($pa_config, "Config options: $config_options", 1);