[Pkg-nagios-changes] [SCM] Debian packaging for nagios nrpe branch, master, updated. debian/2.13-3-2-g70155c4

[Bernd Zeimetz]

The following commit has been merged in the master branch:
commit dcffec6ed63f23b06fcb32fe42810a3fce08064a
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Mon Jul 15 16:04:42 2013 +0200

    Do not remove the PID file after a connection error.
    
    Original patch from Hiren Patel.
    Closes: #716949

diff --git a/debian/patches/00list b/debian/patches/00list
index 35cd403..47ca4c7 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -5,4 +5,5 @@
 05_pid_privileges.dpatch
 06_pid_directory.dpatch
 07_warn_ssloption.dpatch
-08_CVE-2013-1362.dpatch 
+08_CVE-2013-1362.dpatch
+09_noremove_pid.dpatch
diff --git a/debian/patches/09_noremove_pid.dpatch b/debian/patches/09_noremove_pid.dpatch
new file mode 100755
index 0000000..7d4ea4a
--- /dev/null
+++ b/debian/patches/09_noremove_pid.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_noremove_pid.dpatch by  <simon.deziel at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not remove the PID file after a connection error (original patch 
+## DP: from Hiren Patel)
+
+# Author: Hiren Patel
+# From: http://comments.gmane.org/gmane.network.nagios.devel/6774
+# Bug-Debian: #716949
+# Bug-Ubuntu: https://launchpad.net/bugs/1126890
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nrpe~/src/nrpe.c pkg-nrpe/src/nrpe.c
+--- pkg-nrpe~/src/nrpe.c	2013-07-15 17:40:37.141216355 +0200
++++ pkg-nrpe/src/nrpe.c	2013-07-15 17:41:46.521365286 +0200
+@@ -843,7 +843,7 @@
+ 					/* close socket prioer to exiting */
+ 					close(sock);
+ 			
+-					return;
++					exit(STATE_CRITICAL);;
+ 				        }
+ 
+ 				/* handle signals */
+@@ -866,7 +866,7 @@
+ 				        /* close socket prior to exiting */
+ 					close(new_sd);
+ 
+-					return;
++					exit(STATE_CRITICAL);
+ 		                        }
+ 

-- 
Debian packaging for nagios nrpe