[Pkg-nagios-changes] [pkg-nagios] r1580 - in nagios3/trunk/debian: . patches

[Alexander Wirt]

tags 495052 pending
tags 499571 pending
thanks

Author: formorer
Date: 2008-09-23 07:24:52 +0000 (Tue, 23 Sep 2008)
New Revision: 1580

Added:
   nagios3/trunk/debian/patches/80_fix_encoding_trends.cgi.dpatch
Modified:
   nagios3/trunk/debian/changelog
   nagios3/trunk/debian/nagios3-common.nagios3.init
Log:
- Don't fail in init if nagios is running (start) or not running (stop)
- Fix '+' encoding in trends.cgi


Modified: nagios3/trunk/debian/changelog
===================================================================
--- nagios3/trunk/debian/changelog	2008-09-23 07:09:48 UTC (rev 1579)
+++ nagios3/trunk/debian/changelog	2008-09-23 07:24:52 UTC (rev 1580)
@@ -5,6 +5,8 @@
   * Refer to nagios-plugins-basic instead of nagios-plugins in commands.cfg
     (Closes: #493107) 
   * Fix helper paths in contributed eventhandlers (Closes: #493790)
+  * Fix '+' decoding in trend.cgi (Closes: #495052)
+  * Don't fail if nagios3 is already started or not running (Closes: #499571)
   [ Christian Perrier ]
   * Non-maintainer upload.
   * Fix pending l10n bugs. Debconf translations:

Modified: nagios3/trunk/debian/nagios3-common.nagios3.init
===================================================================
--- nagios3/trunk/debian/nagios3-common.nagios3.init	2008-09-23 07:09:48 UTC (rev 1579)
+++ nagios3/trunk/debian/nagios3-common.nagios3.init	2008-09-23 07:24:52 UTC (rev 1580)
@@ -136,9 +136,7 @@
       exit 1
     fi
   else
-    log_failure_msg "already running!"
-    log_end_msg 1
-    exit 1
+    log_warning_msg "already running!"
   fi
   return $ret
 }
@@ -193,9 +191,7 @@
     if check_started; then
       killproc -p $THEPIDFILE $DAEMON 1 
     else
-      log_failure_msg "Not running."
-      log_end_msg 7
-      exit 7
+      log_warning_msg "Not running."
     fi
   else
     log_failure_msg "errors in config!"

Added: nagios3/trunk/debian/patches/80_fix_encoding_trends.cgi.dpatch
===================================================================
--- nagios3/trunk/debian/patches/80_fix_encoding_trends.cgi.dpatch	                        (rev 0)
+++ nagios3/trunk/debian/patches/80_fix_encoding_trends.cgi.dpatch	2008-09-23 07:24:52 UTC (rev 1580)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_fix_encoding_trends.cgi.dpatch by Alexander Wirt <formorer at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/cgi/getcgi.c trunk/cgi/getcgi.c
+--- trunk~/cgi/getcgi.c	2006-05-15 18:59:24.000000000 +0200
++++ trunk/cgi/getcgi.c	2008-09-23 09:19:04.000000000 +0200
+@@ -96,6 +96,9 @@
+ 			break;
+ 		else if(input[x]=='%'){
+ 			input[y]=hex_to_char(&input[x+1]);
++			if (input[y]=='+'){
++				input[y]=' ';
++			}
+ 			x+=2;
+ 		        }
+ 		else


Property changes on: nagios3/trunk/debian/patches/80_fix_encoding_trends.cgi.dpatch
___________________________________________________________________
Name: svn:executable
   + *