[Pkg-nagios-changes] [pkg-nagios] r903 - in nagios-nrpe/trunk/debian: . patches

[Sean Finney]

Author: seanius
Date: 2006-05-15 03:01:09 +0000 (Mon, 15 May 2006)
New Revision: 903

Removed:
   nagios-nrpe/trunk/debian/patches/03_nrpe.c_invalid_free.dpatch
Modified:
   nagios-nrpe/trunk/debian/changelog
   nagios-nrpe/trunk/debian/patches/00list
Log:
new upstream release, includes peters patch

Modified: nagios-nrpe/trunk/debian/changelog
===================================================================
--- nagios-nrpe/trunk/debian/changelog	2006-05-13 13:01:55 UTC (rev 902)
+++ nagios-nrpe/trunk/debian/changelog	2006-05-15 03:01:09 UTC (rev 903)
@@ -1,13 +1,10 @@
-nagios-nrpe (2.5-1) UNRELEASED; urgency=low
+nagios-nrpe (2.5.1-1) unstable; urgency=low
 
-  * new upstream release.
+  * new upstream release.  includes fix from Peter Palfrader to catch
+    invalid free()'s when nrpe is called with --no-ssl (closes: #361233).
 
-  [sean finney]
-  * fix from Peter Palfrader to catch invalid free()'s when nrpe is
-    called with --no-ssl (closes: #361233).
+ -- sean finney <seanius at debian.org>  Sun, 14 May 2006 21:38:48 -0500
 
- -- sean finney <seanius at debian.org>  Sat, 08 Apr 2006 15:04:08 +0200
-
 nagios-nrpe (2.4-2) unstable; urgency=low
 
   [sean finney]

Modified: nagios-nrpe/trunk/debian/patches/00list
===================================================================
--- nagios-nrpe/trunk/debian/patches/00list	2006-05-13 13:01:55 UTC (rev 902)
+++ nagios-nrpe/trunk/debian/patches/00list	2006-05-15 03:01:09 UTC (rev 903)
@@ -1,3 +1,2 @@
 01_nodevrandom-and-docoptions.dpatch
 02_nrpe.cfg_local-include.dpatch
-03_nrpe.c_invalid_free.dpatch

Deleted: nagios-nrpe/trunk/debian/patches/03_nrpe.c_invalid_free.dpatch
===================================================================
--- nagios-nrpe/trunk/debian/patches/03_nrpe.c_invalid_free.dpatch	2006-05-13 13:01:55 UTC (rev 902)
+++ nagios-nrpe/trunk/debian/patches/03_nrpe.c_invalid_free.dpatch	2006-05-15 03:01:09 UTC (rev 903)
@@ -1,64 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_nrpe.c_invalid_free.dpatch by  <seanius at debian.org>
-##
-## DP: patch from Peter Palfrader <weasel at debian.org> to not call free()
-## DP: on unitialized pointers when --no-ssl is used.
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/nrpe.c /home/sean/tmp/dpep-work.xTqz8T/nagios-nrpe-2.5/src/nrpe.c
---- ./src/nrpe.c	2006-04-08 15:01:37.000000000 +0200
-+++ /home/sean/tmp/dpep-work.xTqz8T/nagios-nrpe-2.5/src/nrpe.c	2006-04-08 15:01:42.000000000 +0200
-@@ -1017,9 +1017,11 @@
- 		syslog(LOG_ERR,"Could not read request from client, bailing out...");
- 
- #ifdef HAVE_SSL
--		SSL_shutdown(ssl);
--		SSL_free(ssl);
--		syslog(LOG_INFO,"INFO: SSL Socket Shutdown.\n");
-+		if (ssl) {
-+			SSL_shutdown(ssl);
-+			SSL_free(ssl);
-+			syslog(LOG_INFO,"INFO: SSL Socket Shutdown.\n");
-+			}
- #endif
- 
- 		return;
-@@ -1032,8 +1034,10 @@
- 		syslog(LOG_ERR,"Data packet from client was too short, bailing out...");
- 
- #ifdef HAVE_SSL
--		SSL_shutdown(ssl);
--		SSL_free(ssl);
-+		if (ssl) {
-+			SSL_shutdown(ssl);
-+			SSL_free(ssl);
-+			}
- #endif
- 
- 		return;
-@@ -1062,8 +1066,10 @@
- 	                }
- 
- #ifdef HAVE_SSL
--		SSL_shutdown(ssl);
--		SSL_free(ssl);
-+		if (ssl) {
-+			SSL_shutdown(ssl);
-+			SSL_free(ssl);
-+			}
- #endif
- 
- 		return;
-@@ -1186,8 +1192,10 @@
- #endif
- 
- #ifdef HAVE_SSL
--	SSL_shutdown(ssl);
--	SSL_free(ssl);
-+	if (ssl) {
-+		SSL_shutdown(ssl);
-+		SSL_free(ssl);
-+		}
- #endif
- 
- 	/* log info to syslog facility */