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

[Sean Finney]

Author: seanius
Date: 2006-04-08 13:06:54 +0000 (Sat, 08 Apr 2006)
New Revision: 880

Added:
   nagios-nrpe/trunk/debian/patches/03_nrpe.c_invalid_free.dpatch
Modified:
   nagios-nrpe/trunk/debian/changelog
   nagios-nrpe/trunk/debian/patches/00list
Log:
patch from weasel about free().


Modified: nagios-nrpe/trunk/debian/changelog
===================================================================
--- nagios-nrpe/trunk/debian/changelog	2006-03-31 20:36:45 UTC (rev 879)
+++ nagios-nrpe/trunk/debian/changelog	2006-04-08 13:06:54 UTC (rev 880)
@@ -1,9 +1,13 @@
-nagios-nrpe (2.4-3) UNRELEASED; urgency=low
+nagios-nrpe (2.5-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * new upstream release.
 
- -- sean finney <seanius at debian.org>  Fri, 31 Mar 2006 07:25:40 +0200
+  [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>  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-03-31 20:36:45 UTC (rev 879)
+++ nagios-nrpe/trunk/debian/patches/00list	2006-04-08 13:06:54 UTC (rev 880)
@@ -1,2 +1,3 @@
 01_nodevrandom-and-docoptions.dpatch
 02_nrpe.cfg_local-include.dpatch
+03_nrpe.c_invalid_free.dpatch

Added: nagios-nrpe/trunk/debian/patches/03_nrpe.c_invalid_free.dpatch
===================================================================
--- nagios-nrpe/trunk/debian/patches/03_nrpe.c_invalid_free.dpatch	2006-03-31 20:36:45 UTC (rev 879)
+++ nagios-nrpe/trunk/debian/patches/03_nrpe.c_invalid_free.dpatch	2006-04-08 13:06:54 UTC (rev 880)
@@ -0,0 +1,64 @@
+#! /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 */


Property changes on: nagios-nrpe/trunk/debian/patches/03_nrpe.c_invalid_free.dpatch
___________________________________________________________________
Name: svn:executable
   + *