[Pkg-samba-maint] r3380 - branches/ctdb/lenny-backports/debian/patches

sathieu at alioth.debian.org sathieu at alioth.debian.org
Thu Mar 4 17:00:00 UTC 2010


Author: sathieu
Date: 2010-03-04 17:00:00 +0000 (Thu, 04 Mar 2010)
New Revision: 3380

Removed:
   branches/ctdb/lenny-backports/debian/patches/90_prevent-log-crash.diff
Log:
Remove one more file for proper merge


Deleted: branches/ctdb/lenny-backports/debian/patches/90_prevent-log-crash.diff
===================================================================
--- branches/ctdb/lenny-backports/debian/patches/90_prevent-log-crash.diff	2010-03-04 16:59:09 UTC (rev 3379)
+++ branches/ctdb/lenny-backports/debian/patches/90_prevent-log-crash.diff	2010-03-04 17:00:00 UTC (rev 3380)
@@ -1,23 +0,0 @@
-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];




More information about the Pkg-samba-maint mailing list