[Pkg-nagios-changes] [pkg-nrpe] 12/15: Refresh patches

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch master
in repository pkg-nrpe.

commit 74e3b0795eb48f8cb72f4334a26826bbd7e8843f
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Jul 15 14:25:03 2014 +0200

    Refresh patches
---
 debian/patches/05_pid_privileges.dpatch | 38 ++++++++++++++++----------------
 debian/patches/09_noremove_pid.dpatch   | 39 +++++++++++++++++----------------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/debian/patches/05_pid_privileges.dpatch b/debian/patches/05_pid_privileges.dpatch
index 45214a8..cfec725 100755
--- a/debian/patches/05_pid_privileges.dpatch
+++ b/debian/patches/05_pid_privileges.dpatch
@@ -6,22 +6,22 @@
 
 @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	2012-06-30 11:03:29.000000000 +0200
-+++ pkg-nrpe/src/nrpe.c	2012-06-30 11:03:46.791280548 +0200
-@@ -301,13 +301,13 @@
- 		/* log info to syslog facility */
- 		syslog(LOG_NOTICE,"Starting up daemon");
- 
-+		/* drop privileges */
-+		drop_privileges(nrpe_user,nrpe_group);
-+
- 		/* write pid file */
- 		if(write_pid_file()==ERROR)
- 			return STATE_CRITICAL;
- 		
--		/* drop privileges */
--		drop_privileges(nrpe_user,nrpe_group);
--
- 		/* make sure we're not root */
- 		check_privileges();
- 
+--- pkg-nrpe~/src/nrpe.c	2014-05-23 20:42:27.000000000 +0200
++++ pkg-nrpe/src/nrpe.c	2014-07-15 14:09:45.027422047 +0200
+@@ -317,13 +317,13 @@
+ 		/* log info to syslog facility */
+ 		syslog(LOG_NOTICE,"Starting up daemon");
+ 
++		/* drop privileges */
++		drop_privileges(nrpe_user,nrpe_group);
++
+ 		/* write pid file */
+ 		if(write_pid_file()==ERROR)
+ 			return STATE_CRITICAL;
+ 
+-		/* drop privileges */
+-		drop_privileges(nrpe_user,nrpe_group);
+-
+ 		/* make sure we're not root */
+ 		check_privileges();
+ 
diff --git a/debian/patches/09_noremove_pid.dpatch b/debian/patches/09_noremove_pid.dpatch
index 7d4ea4a..ce57531 100755
--- a/debian/patches/09_noremove_pid.dpatch
+++ b/debian/patches/09_noremove_pid.dpatch
@@ -12,22 +12,23 @@
 
 @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);
- 		                        }
- 
+--- pkg-nrpe~/src/nrpe.c	2014-07-15 14:20:02.000000000 +0200
++++ pkg-nrpe/src/nrpe.c	2014-07-15 14:20:55.775429979 +0200
+@@ -998,7 +998,7 @@
+ 						/* close socket prioer to exiting */
+ 						close(sock);
+ 			
+-						return;
++                        exit(STATE_CRITICAL);
+ 						}
+ 
+ 					/* handle signals */
+@@ -1022,7 +1022,7 @@
+ 				        /* close socket prior to exiting */
+ 						close(new_sd);
+ 
+-						return;
++                        exit(STATE_CRITICAL);
+ 						}
+ 
+ 					/* is this is a blessed machine? */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nrpe.git