[Pkg-samba-maint] r3356 - in branches/ctdb/lenny-backports/debian: . patches

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2010-03-02 08:09:24 +0000 (Tue, 02 Mar 2010)
New Revision: 3356

Added:
   branches/ctdb/lenny-backports/debian/patches/90_prevent-log-crash.diff
Modified:
   branches/ctdb/lenny-backports/debian/changelog
   branches/ctdb/lenny-backports/debian/patches/series
Log:
Release 1.0.111.really.1.0.108-2~bpo50+1



Modified: branches/ctdb/lenny-backports/debian/changelog
===================================================================
--- branches/ctdb/lenny-backports/debian/changelog	2010-03-02 08:05:20 UTC (rev 3355)
+++ branches/ctdb/lenny-backports/debian/changelog	2010-03-02 08:09:24 UTC (rev 3356)
@@ -1,9 +1,15 @@
-ctdb (1.0.111.really.1.0.108-1~bpo50+1) lenny-backports; urgency=low
+ctdb (1.0.111.really.1.0.108-2~bpo50+1) lenny-backports; urgency=low
 
   * Rebuild for lenny-backports.
 
- -- Mathieu Parent <sathieu at debian.org>  Wed, 10 Feb 2010 19:51:44 +0100
+ -- Mathieu Parent <sathieu at debian.org>  Tue, 02 Mar 2010 09:08:31 +0100
 
+ctdb (1.0.111.really.1.0.108-2) unstable; urgency=low
+
+  * 90_prevent-log-crash.diff: Cherry-pick one patch to prevent crashes
+
+ -- Mathieu Parent <sathieu at debian.org>  Tue, 02 Mar 2010 09:04:45 +0100
+
 ctdb (1.0.111.really.1.0.108-1) unstable; urgency=low
 
   * Back to 1.0.108 which works better with samba 3.4.x and 3.5.0

Copied: branches/ctdb/lenny-backports/debian/patches/90_prevent-log-crash.diff (from rev 3355, branches/ctdb/squeeze/debian/patches/90_prevent-log-crash.diff)
===================================================================
--- branches/ctdb/lenny-backports/debian/patches/90_prevent-log-crash.diff	                        (rev 0)
+++ branches/ctdb/lenny-backports/debian/patches/90_prevent-log-crash.diff	2010-03-02 08:09:24 UTC (rev 3356)
@@ -0,0 +1,23 @@
+From: Ronnie Sahlberg <ronniesahlberg at gmail.com>
+Date: Mon, 14 Dec 2009 23:45:18 +0000 (+1100)
+Subject: When setting up the logging, set the event to trigger a read of a log message from ...
+X-Git-Tag: ctdb-1.0.113~9
+X-Git-Url: http://git.samba.org/?p=sahlberg%2Fctdb.git;a=commitdiff_plain;h=ea9e39369379939abf6a4076fa2014c10c1a9ad0
+
+When setting up the logging, set the event to trigger a read of a log message from a child process as a child of the "log" structure and not the ctdb structure,
+or else we can crash if we receive log messages from a child but the log structure has been freed()
+---
+
+diff --git a/server/ctdb_logging.c b/server/ctdb_logging.c
+index 9aba7f8..770deb6 100644
+--- a/server/ctdb_logging.c
++++ b/server/ctdb_logging.c
+@@ -509,7 +509,7 @@ int ctdb_set_child_logging(struct ctdb_context *ctdb)
+ 		return -1;
+ 	}
+ 
+-	event_add_fd(ctdb->ev, ctdb, p[0], EVENT_FD_READ, 
++	event_add_fd(ctdb->ev, ctdb->log, p[0], EVENT_FD_READ, 
+ 		     ctdb_log_handler, ctdb->log);
+ 	set_close_on_exec(p[0]);
+ 	ctdb->log->pfd = p[0];

Modified: branches/ctdb/lenny-backports/debian/patches/series
===================================================================
--- branches/ctdb/lenny-backports/debian/patches/series	2010-03-02 08:05:20 UTC (rev 3355)
+++ branches/ctdb/lenny-backports/debian/patches/series	2010-03-02 08:09:24 UTC (rev 3356)
@@ -2,3 +2,4 @@
 05-hurd.diff
 10_no-lib64.diff
 60-spelling-errors.diff
+90_prevent-log-crash.diff