From 5a3d09a8979cbf91512079f64935de23e0412b81 Mon Sep 17 00:00:00 2001 From: slerena Date: Mon, 8 Jun 2009 15:12:32 +0000 Subject: [PATCH] 2009-06-08 Sancho Leren * Header updates. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1732 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 4 +++ pandora_server/bin/pandora_server | 6 ++-- pandora_server/bin/tentacle_server | 29 ++++++++++--------- pandora_server/lib/PandoraFMS/Config.pm | 1 - pandora_server/lib/PandoraFMS/Core.pm | 2 +- pandora_server/lib/PandoraFMS/DB.pm | 2 -- pandora_server/lib/PandoraFMS/DataServer.pm | 2 +- .../lib/PandoraFMS/NetworkServer.pm | 2 +- pandora_server/lib/PandoraFMS/PluginServer.pm | 2 +- .../lib/PandoraFMS/PredictionServer.pm | 2 +- .../lib/PandoraFMS/ProducerConsumerServer.pm | 2 +- pandora_server/lib/PandoraFMS/ReconServer.pm | 2 +- pandora_server/lib/PandoraFMS/SNMPServer.pm | 2 +- pandora_server/lib/PandoraFMS/Server.pm | 2 +- pandora_server/lib/PandoraFMS/Tools.pm | 1 - pandora_server/lib/PandoraFMS/WMIServer.pm | 2 +- pandora_server/pandora_server_upgrade | 2 +- pandora_server/util/mcast_client.pl | 1 + pandora_server/util/n2p.pl | 1 - pandora_server/util/pandora_DBI_test.pl | 2 +- pandora_server/util/pandora_checkdep.pl | 2 ++ pandora_server/util/pandora_db.pl | 1 - pandora_server/util/pandora_dbstress.pl | 1 - pandora_server/util/tentacle_serverd | 2 +- pandora_server/util/udp_client | 1 + pandora_server/util/udp_client.pl | 2 +- 26 files changed, 40 insertions(+), 38 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 11e5437739..29aacc66ff 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,7 @@ +2009-06-08 Sancho Leren + + * Header updates. + 2009-06-05 Ramon Novoa * util/pandora_xml_stress.pl, diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server index 7be1277ebf..cccfc19ad0 100755 --- a/pandora_server/bin/pandora_server +++ b/pandora_server/bin/pandora_server @@ -1,9 +1,9 @@ #!/usr/bin/perl ########################################################################## -# Pandora Server +# Pandora FMS Server +# Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2009 Ramon Novoa, rnovoa@artica.es -# Copyright (c) 2009 Artica Soluciones Tecnologicas S.L +# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/pandora_server/bin/tentacle_server b/pandora_server/bin/tentacle_server index cea038c571..443ce218ad 100755 --- a/pandora_server/bin/tentacle_server +++ b/pandora_server/bin/tentacle_server @@ -1,22 +1,23 @@ #!/usr/bin/perl -################################################################################ +########################################################################## +# Tentacle Server +# See http://www.openideas.info/wiki for protocol description. +# Tentacle have IANA assigned port tpc/41121 as official port. +########################################################################## +# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # -# Copyright (c) 2007-2008 Ramon Novoa -# Copyright (c) 2007-2008 Artica Soluciones Tecnologicas S.L. -# -# tentacle_server.pl Tentacle Server. See http://www.openideas.info/wiki for -# protocol description. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; version 2 # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -################################################################################ +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +########################################################################## + package tentacle::server; use strict; diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 4232304227..7391ac1887 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -3,7 +3,6 @@ package PandoraFMS::Config; # Configuration Package # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2004-2009 Sancho Lerena, slerena@gmail.com # Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 8947a1d4c5..84c697eed3 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -3,7 +3,7 @@ package PandoraFMS::Core; # Core Pandora FMS functions. # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2009 Ramon Novoa, rnovoa@artica.es +# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm index d6550dc396..37ee47cbb2 100644 --- a/pandora_server/lib/PandoraFMS/DB.pm +++ b/pandora_server/lib/PandoraFMS/DB.pm @@ -3,8 +3,6 @@ package PandoraFMS::DB; # Database Package # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2009 Ramon Novoa, rnovoa@artica.es -# Copyright (c) 2004-2009 Sancho Lerena, slerena@gmail.com # Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm index 400663a83f..554db14047 100644 --- a/pandora_server/lib/PandoraFMS/DataServer.pm +++ b/pandora_server/lib/PandoraFMS/DataServer.pm @@ -3,7 +3,7 @@ package PandoraFMS::DataServer; # Pandora FMS Data Server. # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2009 Ramon Novoa, rnovoa@artica.es +# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff --git a/pandora_server/lib/PandoraFMS/NetworkServer.pm b/pandora_server/lib/PandoraFMS/NetworkServer.pm index 8a90c203de..ce2f50eb89 100644 --- a/pandora_server/lib/PandoraFMS/NetworkServer.pm +++ b/pandora_server/lib/PandoraFMS/NetworkServer.pm @@ -3,7 +3,7 @@ package PandoraFMS::NetworkServer; # Pandora FMS Network Server. # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2009 Ramon Novoa, rnovoa@artica.es +# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm index 36a7d3a12c..89d6b40c6f 100644 --- a/pandora_server/lib/PandoraFMS/PluginServer.pm +++ b/pandora_server/lib/PandoraFMS/PluginServer.pm @@ -3,7 +3,7 @@ package PandoraFMS::PluginServer; # Pandora FMS Plugin Server. # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2009 Ramon Novoa, rnovoa@artica.es +# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff --git a/pandora_server/lib/PandoraFMS/PredictionServer.pm b/pandora_server/lib/PandoraFMS/PredictionServer.pm index 4a505e32a2..a725c5a94e 100644 --- a/pandora_server/lib/PandoraFMS/PredictionServer.pm +++ b/pandora_server/lib/PandoraFMS/PredictionServer.pm @@ -3,7 +3,7 @@ package PandoraFMS::PredictionServer; # Pandora FMS Prediction Server. # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2009 Ramon Novoa, rnovoa@artica.es +# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff --git a/pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm b/pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm index fdc1516111..3aa482edf9 100644 --- a/pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm +++ b/pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm @@ -3,7 +3,7 @@ package PandoraFMS::ProducerConsumerServer; # Pandora FMS generic server. # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2009 Ramon Novoa, rnovoa@artica.es +# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff --git a/pandora_server/lib/PandoraFMS/ReconServer.pm b/pandora_server/lib/PandoraFMS/ReconServer.pm index 2f72c832aa..ef6195600b 100644 --- a/pandora_server/lib/PandoraFMS/ReconServer.pm +++ b/pandora_server/lib/PandoraFMS/ReconServer.pm @@ -3,7 +3,7 @@ package PandoraFMS::ReconServer; # Pandora FMS Recon Server. # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2009 Ramon Novoa, rnovoa@artica.es +# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff --git a/pandora_server/lib/PandoraFMS/SNMPServer.pm b/pandora_server/lib/PandoraFMS/SNMPServer.pm index b8668b50b2..e42a1b4d6d 100644 --- a/pandora_server/lib/PandoraFMS/SNMPServer.pm +++ b/pandora_server/lib/PandoraFMS/SNMPServer.pm @@ -3,7 +3,7 @@ package PandoraFMS::SNMPServer; # Pandora FMS SNMP Console. # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2009 Ramon Novoa, rnovoa@artica.es +# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff --git a/pandora_server/lib/PandoraFMS/Server.pm b/pandora_server/lib/PandoraFMS/Server.pm index a538c9a5a8..c4f74593e3 100644 --- a/pandora_server/lib/PandoraFMS/Server.pm +++ b/pandora_server/lib/PandoraFMS/Server.pm @@ -3,7 +3,7 @@ package PandoraFMS::Server; # Pandora FMS generic server. # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2009 Ramon Novoa, rnovoa@artica.es +# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm index c629dc8af6..17020b529c 100644 --- a/pandora_server/lib/PandoraFMS/Tools.pm +++ b/pandora_server/lib/PandoraFMS/Tools.pm @@ -3,7 +3,6 @@ package PandoraFMS::Tools; # Tools Package # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2004-2009 Sancho Lerena, slerena@gmail.com # Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or diff --git a/pandora_server/lib/PandoraFMS/WMIServer.pm b/pandora_server/lib/PandoraFMS/WMIServer.pm index da9888c0a4..fae9803a35 100644 --- a/pandora_server/lib/PandoraFMS/WMIServer.pm +++ b/pandora_server/lib/PandoraFMS/WMIServer.pm @@ -3,7 +3,7 @@ package PandoraFMS::WMIServer; # Pandora FMS WMI Server. # Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org ########################################################################## -# Copyright (c) 2009 Ramon Novoa, rnovoa@artica.es +# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public License diff --git a/pandora_server/pandora_server_upgrade b/pandora_server/pandora_server_upgrade index 233e5c4732..79c7500904 100644 --- a/pandora_server/pandora_server_upgrade +++ b/pandora_server/pandora_server_upgrade @@ -1,4 +1,4 @@ -# Pandora FMS 2.0 Server Installer (c) 2009 Artica ST +# Pandora FMS 3.0 Server Installer (c) 2009 Artica ST # Please see http://www.pandorafms.com # This code is licensed under GPL 2.0 license. # ********************************************************************** diff --git a/pandora_server/util/mcast_client.pl b/pandora_server/util/mcast_client.pl index 3f82e6f8d6..74beaadfc4 100755 --- a/pandora_server/util/mcast_client.pl +++ b/pandora_server/util/mcast_client.pl @@ -1,5 +1,6 @@ #!/usr/bin/perl # Multicast client +# Copyright (c) 2007 Artica Soluciones Tecnologicas S.L. use strict; use IO::Socket::Multicast; diff --git a/pandora_server/util/n2p.pl b/pandora_server/util/n2p.pl index 77ca041719..befdb1cf41 100755 --- a/pandora_server/util/n2p.pl +++ b/pandora_server/util/n2p.pl @@ -1,7 +1,6 @@ #!/usr/bin/perl -s ################################################################################ # -# Copyright (c) 2007 Ramon Novoa, rnovoa@artica.es # Copyright (c) 2007 Artica Soluciones Tecnologicas S.L. # # n2p.pl Reads Nagios 2.x configuration files and replicates the setup diff --git a/pandora_server/util/pandora_DBI_test.pl b/pandora_server/util/pandora_DBI_test.pl index a7c5ccb80d..e772d2a817 100755 --- a/pandora_server/util/pandora_DBI_test.pl +++ b/pandora_server/util/pandora_DBI_test.pl @@ -2,7 +2,7 @@ ################################################################################## # DBI Memory Leak Tester ################################################################################## -# Copyright (c) 2004-2006 Sancho Lerena, slerena@gmail.com +# Copyright (c) 2007 Artica Soluciones Tecnologicas S.L. ################################################################################## use DBI(); # DB interface with MySQL diff --git a/pandora_server/util/pandora_checkdep.pl b/pandora_server/util/pandora_checkdep.pl index 2ad9c93964..6c02585207 100755 --- a/pandora_server/util/pandora_checkdep.pl +++ b/pandora_server/util/pandora_checkdep.pl @@ -1,5 +1,7 @@ #!/usr/bin/perl +# Copyright (c) 2007 Artica Soluciones Tecnologicas S.L. + use Date::Manip; # Needed to manipulate DateTime formats of input, output and compare use Time::Local; # DateTime basic manipulation use Net::Ping; # For ICMP latency diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 2208217025..8d288a0130 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -3,7 +3,6 @@ ############################################################################### # Pandora FMS DB Management ############################################################################### -# Copyright (c) 2004-2008 Sancho Lerena, slerena@gmail.com # Copyright (c) 2005-2008 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or diff --git a/pandora_server/util/pandora_dbstress.pl b/pandora_server/util/pandora_dbstress.pl index 1939eb8c21..d224c2d902 100755 --- a/pandora_server/util/pandora_dbstress.pl +++ b/pandora_server/util/pandora_dbstress.pl @@ -2,7 +2,6 @@ ################################################################################ # Pandora DB Stress tool ################################################################################ -# Copyright (c) 2004-2008 Sancho Lerena, slerena@gmail.com # Copyright (c) 2005-2008 Artica Soluciones Tecnologicas S.L # # This program is free software; you can redistribute it and/or diff --git a/pandora_server/util/tentacle_serverd b/pandora_server/util/tentacle_serverd index 5e673ce597..6a87a09a94 100755 --- a/pandora_server/util/tentacle_serverd +++ b/pandora_server/util/tentacle_serverd @@ -1,7 +1,7 @@ #!/bin/bash # Tentacle server simple startup script (no pid file is written). -# Ramon Novoa +# Copyright (c) 2007 Artica Soluciones Tecnologicas S.L. # Linux Version (generic) # v0.1 Build 210508 diff --git a/pandora_server/util/udp_client b/pandora_server/util/udp_client index 1ea2bca03a..110c048233 100644 --- a/pandora_server/util/udp_client +++ b/pandora_server/util/udp_client @@ -1,6 +1,7 @@ #!/usr/bin/perl use strict; use IO::Socket; +# Copyright (c) 2007 Artica Soluciones Tecnologicas S.L. if ($#ARGV != 2) { print "Usage: $0 \n"; diff --git a/pandora_server/util/udp_client.pl b/pandora_server/util/udp_client.pl index 23ff6cb023..b767b1f905 100755 --- a/pandora_server/util/udp_client.pl +++ b/pandora_server/util/udp_client.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl - +# Copyright (c) 2007 Artica Soluciones Tecnologicas S.L. use strict; use IO::Socket;