From owner-svn-src-head@FreeBSD.ORG Wed Apr 28 22:26:30 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C437D1065688; Wed, 28 Apr 2010 22:26:30 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B3B1B8FC1B; Wed, 28 Apr 2010 22:26:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3SMQUIo076748; Wed, 28 Apr 2010 22:26:30 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3SMQUUZ076746; Wed, 28 Apr 2010 22:26:30 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201004282226.o3SMQUUZ076746@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Wed, 28 Apr 2010 22:26:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207345 - head/sbin/hastd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Apr 2010 22:26:30 -0000 Author: pjd Date: Wed Apr 28 22:26:30 2010 New Revision: 207345 URL: http://svn.freebsd.org/changeset/base/207345 Log: Use WEXITSTATUS() to obtain real exit code. MFC after: 3 days Modified: head/sbin/hastd/hastd.c Modified: head/sbin/hastd/hastd.c ============================================================================== --- head/sbin/hastd/hastd.c Wed Apr 28 22:25:27 2010 (r207344) +++ head/sbin/hastd/hastd.c Wed Apr 28 22:26:30 2010 (r207345) @@ -294,9 +294,10 @@ listen_accept(void) "Waiting for worker process (pid=%u) failed", (unsigned int)res->hr_workerpid); /* See above. */ - } else if (status != 0) { + } else if (WEXITSTATUS(status) != 0) { pjdlog_error("Worker process (pid=%u) exited ungracefully: status=%d.", - (unsigned int)res->hr_workerpid, status); + (unsigned int)res->hr_workerpid, + WEXITSTATUS(status)); /* See above. */ } else { pjdlog_debug(1,