Hello community,
here is the log from the commit of package nagios
checked in at Wed Apr 9 00:28:33 CEST 2008.
--------
--- nagios/nagios.changes 2008-03-13 21:18:23.000000000 +0100
+++ nagios/nagios.changes 2008-04-03 12:42:39.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Apr 3 12:42:34 CEST 2008 - lrupp@suse.de
+
+- update to 3.0.1:
+ + Fixed bug in trends CGI with user not being authorized
+ for hosts/services
+ + Fixed bug in status CGI with page layout messing up when
+ sounds enabled
+
+-------------------------------------------------------------------
Old:
----
nagios-3.0.tar.bz2
New:
----
nagios-3.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nagios.spec ++++++
--- /var/tmp/diff_new_pack.a17031/_old 2008-04-09 00:24:41.000000000 +0200
+++ /var/tmp/diff_new_pack.a17031/_new 2008-04-09 00:24:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package nagios (Version 3.0)
+# spec file for package nagios (Version 3.0.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,7 +13,7 @@
Name: nagios
Summary: The Nagios Network Monitor
-Version: 3.0
+Version: 3.0.1
Release: 1
Url: http://www.nagios.org/
License: GPL v2 or later
@@ -72,6 +72,7 @@
Ethan Galstad
%package www
+License: GPL v2 or later
Group: System/Monitoring
Summary: Nagios Network Monitor
Requires: %name = %version gd
@@ -98,6 +99,7 @@
Ethan Galstad
%package devel
+License: GPL v2 or later
Group: Development/Libraries/C and C++
Summary: Development files for nagios
Requires: %name = %version
@@ -349,6 +351,7 @@
if [ -r /etc/aliases ]; then
if ! grep -q "^nagiosadmin:" /etc/aliases; then
echo -e "nagiosadmin:\troot" >> /etc/aliases
+ %nnmmsg "Added alias for user nagiosadmin to /etc/aliases"
if [ -x /usr/bin/newaliases ]; then
/usr/bin/newaliases &>/dev/null
else
@@ -433,6 +436,12 @@
%_includedir/%realname/*
%changelog
+* Thu Apr 03 2008 lrupp@suse.de
+- update to 3.0.1:
+ + Fixed bug in trends CGI with user not being authorized
+ for hosts/services
+ + Fixed bug in status CGI with page layout messing up when
+ sounds enabled
* Thu Mar 13 2008 lrupp@suse.de
- update to 3.0 (final):
+ Faster program startup times (especially in large installs)
@@ -522,7 +531,7 @@
* Fix for a potential cross site scripting vulnerability in the CGIs
* Program version is now displayed in CGIs
- removed obsolete FAQ patch in html/docs dir
-* Sun Sep 16 2007 cschneemann@suse.de
+* Mon Sep 17 2007 cschneemann@suse.de
- added openssl-devel to BuildRequires to support SSL in check_http
* Sun Aug 12 2007 olh@suse.de
- move p1.pl to /usr/lib/nagios/p1.pl
@@ -579,7 +588,7 @@
instead to non-existant nagios-admin%%localhost
* Wed Jan 10 2007 olh@suse.de
- fix comparison with string literal (#232415)
-* Mon Jan 08 2007 olh@suse.de
+* Tue Jan 09 2007 olh@suse.de
- move pid file to /var/run/nagios/ (#231169)
* Fri Dec 01 2006 tsieden@suse.de
- update to version 2.6
@@ -606,7 +615,7 @@
- Don't build as root.
- Don't strip binaries.
- Fix format string bug.
-* Wed May 03 2006 stark@suse.de
+* Thu May 04 2006 stark@suse.de
- fixed possible buffer overflow in CGI scripts (#140494)
(CVE-2006-2162)
* Wed Jan 25 2006 mls@suse.de
++++++ nagios-3.0.tar.bz2 -> nagios-3.0.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nagios-3.0/base/nagios.c new/nagios-3.0.1/base/nagios.c
--- old/nagios-3.0/base/nagios.c 2008-03-13 15:16:19.000000000 +0100
+++ new/nagios-3.0.1/base/nagios.c 2008-04-01 21:32:07.000000000 +0200
@@ -3,12 +3,12 @@
* NAGIOS.C - Core Program Code For Nagios
*
* Program: Nagios
- * Version: 3.0
+ * Version: 3.0.1
* License: GPL
* Copyright (c) 1999-2007 Ethan Galstad (http://www.nagios.org)
*
* First Written: 01-28-1999 (start of development)
- * Last Modified: 03-13-2008
+ * Last Modified: 04-01-2008
*
* Description:
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nagios-3.0/base/nagiostats.c new/nagios-3.0.1/base/nagiostats.c
--- old/nagios-3.0/base/nagiostats.c 2008-03-13 15:16:19.000000000 +0100
+++ new/nagios-3.0.1/base/nagiostats.c 2008-04-01 21:32:08.000000000 +0200
@@ -3,11 +3,11 @@
* NAGIOSTATS.C - Displays Nagios Statistics
*
* Program: Nagiostats
- * Version: 3.0
+ * Version: 3.0.1
* License: GPL
* Copyright (c) 2003-2008 Ethan Galstad (nagios@nagios.org)
*
- * Last Modified: 03-13-2008
+ * Last Modified: 04-01-2008
*
* License:
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nagios-3.0/cgi/cgiauth.c new/nagios-3.0.1/cgi/cgiauth.c
--- old/nagios-3.0/cgi/cgiauth.c 2007-12-09 00:57:47.000000000 +0100
+++ new/nagios-3.0.1/cgi/cgiauth.c 2008-03-31 21:09:33.000000000 +0200
@@ -2,8 +2,8 @@
*
* CGIAUTH.C - Authorization utilities for Nagios CGIs
*
- * Copyright (c) 1999-2006 Ethan Galstad (nagios@nagios.org)
- * Last Modified: 12-08-2006
+ * Copyright (c) 1999-2008 Ethan Galstad (nagios@nagios.org)
+ * Last Modified: 03-31-2008
*
* License:
*
@@ -36,14 +36,6 @@
extern int use_authentication;
-extern int hosts_have_been_read;
-extern int hostgroups_have_been_read;
-extern int contactgroups_have_been_read;
-extern int contacts_have_been_read;
-extern int services_have_been_read;
-extern int serviceescalations_have_been_read;
-extern int hostescalations_have_been_read;
-
/* get current authentication information */
@@ -56,25 +48,6 @@
if(authinfo==NULL)
return ERROR;
- /* make sure we have read in all the configuration information we need for the authentication routines... */
- needed_options=0;
- if(hosts_have_been_read==FALSE)
- needed_options|=READ_HOSTS;
- if(hostgroups_have_been_read==FALSE)
- needed_options|=READ_HOSTGROUPS;
- if(contactgroups_have_been_read==FALSE)
- needed_options|=READ_CONTACTGROUPS;
- if(contacts_have_been_read==FALSE)
- needed_options|=READ_CONTACTS;
- if(services_have_been_read==FALSE)
- needed_options|=READ_SERVICES;
- if(serviceescalations_have_been_read==FALSE)
- needed_options|=READ_SERVICEESCALATIONS;
- if(hostescalations_have_been_read==FALSE)
- needed_options|=READ_HOSTESCALATIONS;
- if(needed_options>0)
- read_all_object_configuration_data(main_config_file,needed_options);
-
/* initial values... */
authinfo->authorized_for_all_hosts=FALSE;
authinfo->authorized_for_all_host_commands=FALSE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nagios-3.0/cgi/cgiutils.c new/nagios-3.0.1/cgi/cgiutils.c
--- old/nagios-3.0/cgi/cgiutils.c 2008-02-26 16:58:32.000000000 +0100
+++ new/nagios-3.0.1/cgi/cgiutils.c 2008-03-31 21:09:34.000000000 +0200
@@ -3,7 +3,7 @@
* CGIUTILS.C - Common utilities for Nagios CGIs
*
* Copyright (c) 1999-2008 Ethan Galstad (nagios@nagios.org)
- * Last Modified: 02-26-2008
+ * Last Modified: 03-31-2008
*
* License:
*
@@ -100,19 +100,6 @@
int use_pending_states=TRUE;
-int hosts_have_been_read=FALSE;
-int hostgroups_have_been_read=FALSE;
-int servicegroups_have_been_read=FALSE;
-int contacts_have_been_read=FALSE;
-int contactgroups_have_been_read=FALSE;
-int services_have_been_read=FALSE;
-int timeperiods_have_been_read=FALSE;
-int commands_have_been_read=FALSE;
-int servicedependencies_have_been_read=FALSE;
-int serviceescalations_have_been_read=FALSE;
-int hostdependencies_have_been_read=FALSE;
-int hostescalations_have_been_read=FALSE;
-
int host_status_has_been_read=FALSE;
int service_status_has_been_read=FALSE;
int program_status_has_been_read=FALSE;
@@ -535,65 +522,9 @@
int read_all_object_configuration_data(char *config_file,int options){
int result=OK;
- /* don't duplicate things we've already read in */
- if(hosts_have_been_read==TRUE && (options & READ_HOSTS))
- options-=READ_HOSTS;
- if(hostgroups_have_been_read==TRUE && (options & READ_HOSTGROUPS))
- options-=READ_HOSTGROUPS;
- if(contacts_have_been_read==TRUE && (options & READ_CONTACTS))
- options-=READ_CONTACTS;
- if(contactgroups_have_been_read==TRUE && (options & READ_CONTACTGROUPS))
- options-=READ_CONTACTGROUPS;
- if(services_have_been_read==TRUE && (options & READ_SERVICES))
- options-=READ_SERVICES;
- if(timeperiods_have_been_read==TRUE && (options & READ_TIMEPERIODS))
- options-=READ_TIMEPERIODS;
- if(commands_have_been_read==TRUE && (options & READ_COMMANDS))
- options-=READ_COMMANDS;
- if(servicedependencies_have_been_read==TRUE && (options & READ_SERVICEDEPENDENCIES))
- options-=READ_SERVICEDEPENDENCIES;
- if(serviceescalations_have_been_read==TRUE && (options & READ_SERVICEESCALATIONS))
- options-=READ_SERVICEESCALATIONS;
- if(hostdependencies_have_been_read==TRUE && (options & READ_HOSTDEPENDENCIES))
- options-=READ_HOSTDEPENDENCIES;
- if(hostescalations_have_been_read==TRUE && (options & READ_HOSTESCALATIONS))
- options-=READ_HOSTESCALATIONS;
- if(servicegroups_have_been_read==TRUE && (options & READ_SERVICEGROUPS))
- options-=READ_SERVICEGROUPS;
-
- /* bail out if we've already read what we need */
- if(options<=0)
- return OK;
-
/* read in all external config data of the desired type(s) */
result=read_object_config_data(config_file,options,FALSE,FALSE);
- /* mark what items we've read in... */
- if(options & READ_HOSTS)
- hosts_have_been_read=TRUE;
- if(options & READ_HOSTGROUPS)
- hostgroups_have_been_read=TRUE;
- if(options & READ_CONTACTS)
- contacts_have_been_read=TRUE;
- if(options & READ_CONTACTGROUPS)
- contactgroups_have_been_read=TRUE;
- if(options & READ_SERVICES)
- services_have_been_read=TRUE;
- if(options & READ_TIMEPERIODS)
- timeperiods_have_been_read=TRUE;
- if(options & READ_COMMANDS)
- commands_have_been_read=TRUE;
- if(options & READ_SERVICEDEPENDENCIES)
- servicedependencies_have_been_read=TRUE;
- if(options & READ_SERVICEESCALATIONS)
- serviceescalations_have_been_read=TRUE;
- if(options & READ_HOSTDEPENDENCIES)
- hostdependencies_have_been_read=TRUE;
- if(options & READ_HOSTESCALATIONS)
- hostescalations_have_been_read=TRUE;
- if(options & READ_SERVICEGROUPS)
- servicegroups_have_been_read=TRUE;
-
return result;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nagios-3.0/cgi/config.c new/nagios-3.0.1/cgi/config.c
--- old/nagios-3.0/cgi/config.c 2008-01-09 18:51:23.000000000 +0100
+++ new/nagios-3.0.1/cgi/config.c 2008-03-31 21:09:34.000000000 +0200
@@ -3,7 +3,7 @@
* CONFIG.C - Nagios Configuration CGI (View Only)
*
* Copyright (c) 1999-2008 Ethan Galstad (nagios@nagios.org)
- * Last Modified: 01-08-2008
+ * Last Modified: 03-31-2008
*
* This CGI program will display various configuration information.
*
@@ -139,6 +139,8 @@
/* get authentication information */
get_authentication_information(¤t_authdata);
+ /* read all object definitions... */
+ read_all_object_configuration_data(main_config_file,READ_ALL_OBJECT_DATA);
/* begin top table */
printf("<table border=0 width=100%%>\n");
@@ -891,9 +893,6 @@
return;
}
- /* read in contact definitions... */
- read_all_object_configuration_data(main_config_file,READ_CONTACTS);
-
printf("<P><DIV ALIGN=CENTER CLASS='dataTitle'>Contacts</DIV></P>\n");
printf("<P>\n");
@@ -1146,9 +1145,6 @@
return;
}
- /* read in service definitions... */
- read_all_object_configuration_data(main_config_file,READ_SERVICES);
-
printf("<P><DIV ALIGN=CENTER CLASS='dataTitle'>Services</DIV></P>\n");
printf("<P>\n");
@@ -1470,9 +1466,6 @@
return;
}
- /* read in time period definitions... */
- read_all_object_configuration_data(main_config_file,READ_TIMEPERIODS);
-
printf("<P><DIV ALIGN=CENTER CLASS='dataTitle'>Time Periods</DIV></P>\n");
printf("<P>\n");
@@ -1657,9 +1650,6 @@
return;
}
- /* read in command definitions... */
- read_all_object_configuration_data(main_config_file,READ_COMMANDS);
-
printf("<P><DIV ALIGN=CENTER CLASS='dataTitle'>Commands</DIV></P>\n");
printf("<P><DIV ALIGN=CENTER>\n");
@@ -1706,9 +1696,6 @@
return;
}
- /* read in command definitions... */
- read_all_object_configuration_data(main_config_file,READ_SERVICEDEPENDENCIES);
-
printf("<P><DIV ALIGN=CENTER CLASS='dataTitle'>Service Dependencies</DIV></P>\n");
printf("<P>\n");
@@ -1814,9 +1801,6 @@
return;
}
- /* read in command definitions... */
- read_all_object_configuration_data(main_config_file,READ_SERVICEESCALATIONS);
-
printf("<P><DIV ALIGN=CENTER CLASS='dataTitle'>Service Escalations</DIV></P>\n");
printf("<P>\n");
@@ -1944,9 +1928,6 @@
return;
}
- /* read in command definitions... */
- read_all_object_configuration_data(main_config_file,READ_HOSTDEPENDENCIES);
-
printf("<P><DIV ALIGN=CENTER CLASS='dataTitle'>Host Dependencies</DIV></P>\n");
printf("<P>\n");
@@ -2036,9 +2017,6 @@
return;
}
- /* read in command definitions... */
- read_all_object_configuration_data(main_config_file,READ_HOSTESCALATIONS);
-
printf("<P><DIV ALIGN=CENTER CLASS='dataTitle'>Host Escalations</DIV></P>\n");
printf("<P>\n");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nagios-3.0/cgi/status.c new/nagios-3.0.1/cgi/status.c
--- old/nagios-3.0/cgi/status.c 2008-02-26 16:58:32.000000000 +0100
+++ new/nagios-3.0.1/cgi/status.c 2008-04-01 21:32:08.000000000 +0200
@@ -3,7 +3,7 @@
* STATUS.C - Nagios Status CGI
*
* Copyright (c) 1999-2008 Ethan Galstad (nagios@nagios.org)
- * Last Modified: 01-08-2008
+ * Last Modified: 04-01-2008
*
* License:
*
@@ -438,7 +438,7 @@
else if(problem_services_unknown==0 && problem_services_warning==0 && problem_services_critical==0 && problem_hosts_down==0 && problem_hosts_unreachable==0 && normal_sound!=NULL)
sound=normal_sound;
if(sound!=NULL){
- printf("