[Pkg-nagios-devel] nagios changelog,1.34,1.35 nagios-common.nagios.init,1.4,1.5

seanius@haydn.debian.org seanius@haydn.debian.org


Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv6258

Modified Files:
	changelog nagios-common.nagios.init 
Log Message:
another bug fix.  after i double check the build and install, i'll go
ahead and upload it if there aren't any complaints.


	sean


Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- changelog	18 Jan 2005 07:17:08 -0000	1.34
+++ changelog	9 Feb 2005 04:37:51 -0000	1.35
@@ -1,3 +1,17 @@
+nagios (2:1.3-cvs.20050116-2) unstable; urgency=low
+
+  * Sean Finney:
+    - use dpkg-statoverride to keep permissions set appropriately
+      for cgi files (closes: #293242, #291351).  thanks to
+      Tristan Seligmann <mithrandi@mithrandi.za.net> and to
+      Steve Greenland <steveg@lsli.com> for reporting this.
+    - added a -e 15 to the call of check_nagios in the init script,
+      after many reports of check_nagios failing without it
+      (closes: #294178, #289830).  thanks to Heno Ivanov <heno@siil.net>
+      and jan gregor <pamela@rak.bb.euroweb.sk> for pointing this out.
+
+ -- Sean Finney <seanius@debian.org>  Tue, 08 Feb 2005 23:32:31 -0500
+
 nagios (2:1.3-cvs.20050116-1) unstable; urgency=low
 
   * Sean Finney:

Index: nagios-common.nagios.init
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.nagios.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nagios-common.nagios.init	6 Feb 2005 00:12:58 -0000	1.4
+++ nagios-common.nagios.init	9 Feb 2005 04:37:51 -0000	1.5
@@ -37,7 +37,7 @@
  	    return 1    # Isn't started
  	fi
     elif [ -f /usr/lib/nagios/plugins/check_nagios ]; then
-	if /usr/lib/nagios/plugins/check_nagios -F /var/log/nagios/status.log -C 'nagios' > /dev/null; then
+	if /usr/lib/nagios/plugins/check_nagios -e 15 -F /var/log/nagios/status.log -C 'nagios' > /dev/null; then
 	    return 0    # Is started
 	else
 	    return 1    # Isn't started