[SCM] CTDB repository - branch master updated - b1f1e80d3ad50280a300f2ed021513cf0a6f3a76

[Ronnie Sahlberg]

The branch, master has been updated
       via  b1f1e80d3ad50280a300f2ed021513cf0a6f3a76 (commit)
      from  b4b2408ba1bdce22abb3fb19d398b72e96da6505 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b1f1e80d3ad50280a300f2ed021513cf0a6f3a76
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Jul 8 16:31:23 2008 +1000

    set sigchild to SIG_IGN instead of SIG_DFL

-----------------------------------------------------------------------

Summary of changes:
 server/ctdb_daemon.c   |    6 +++---
 server/ctdb_recoverd.c |    3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_daemon.c b/server/ctdb_daemon.c
index a7f9086..83fcc0a 100644
--- a/server/ctdb_daemon.c
+++ b/server/ctdb_daemon.c
@@ -662,9 +662,6 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork)
 		}
 	}
 	block_signal(SIGPIPE);
-	
-	/* we dont want any SIGCHLD */
-	signal(SIGCHLD, SIG_DFL);
 
 	if (ctdb->do_setsched) {
 		/* try to set us up as realtime */
@@ -734,6 +731,9 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork)
 	/* start the transport going */
 	ctdb_start_transport(ctdb);
 
+	/* we dont want any SIGCHLD */
+	signal(SIGCHLD, SIG_IGN);
+
 	/* go into a wait loop to allow other nodes to complete */
 	event_loop_wait(ctdb->ev);
 
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 837c0b1..9059b1c 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -3011,6 +3011,9 @@ int ctdb_start_recoverd(struct ctdb_context *ctdb)
 		exit(1);
 	}
 
+	/* we dont want any SIGCHLD */
+	signal(SIGCHLD, SIG_IGN);
+
 	monitor_cluster(ctdb);
 
 	DEBUG(DEBUG_ALERT,("ERROR: ctdb_recoverd finished!?\n"));


-- 
CTDB repository