From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11964 invoked by alias); 1 Aug 2008 10:15:04 -0000 Received: (qmail 11952 invoked by alias); 1 Aug 2008 10:15:03 -0000 X-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: master - cman: exit if configuration check fails. To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: e5885fd588a0608ddf00ad03ee3289a1b0c9f656 X-Git-Newrev: eabafb0bb7676fbe9275afaf1c66db1ca65411e0 From: Christine Caulfield Message-Id: <20080801101419.E6FAAA8256@lists.fedorahosted.org> Date: Fri, 01 Aug 2008 10:56:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00202.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=eabafb0bb7676fbe9275afaf1c66db1ca65411e0 Commit: eabafb0bb7676fbe9275afaf1c66db1ca65411e0 Parent: e5885fd588a0608ddf00ad03ee3289a1b0c9f656 Author: Christine Caulfield AuthorDate: Fri Aug 1 11:13:03 2008 +0100 Committer: Christine Caulfield CommitterDate: Fri Aug 1 11:13:03 2008 +0100 cman: exit if configuration check fails. The error return from read_cman_config wasn't being checked, so configuration errors could cause segfaults later on in startup. Signed-off-by: Christine Caulfield --- cman/daemon/ais.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/cman/daemon/ais.c b/cman/daemon/ais.c index d38b1eb..c73e507 100644 --- a/cman/daemon/ais.c +++ b/cman/daemon/ais.c @@ -167,7 +167,10 @@ static int cman_exec_init_fn(struct objdb_iface_ver0 *objdb) P_DAEMON(CMAN_NAME " starting"); /* Open local sockets and initialise I/O queues */ - read_cman_config(objdb, &config_version); + if (read_cman_config(objdb, &config_version)) { + /* An error message will have been written to cman_pipe */ + exit(9); + } cman_init(); /* Let cman_tool know we are running and our PID */