From owner-svn-src-head@FreeBSD.ORG  Sun Dec 16 14:14:19 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 360C373D;
 Sun, 16 Dec 2012 14:14:19 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1BAE48FC14;
 Sun, 16 Dec 2012 14:14:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGEEI0a090453;
 Sun, 16 Dec 2012 14:14:18 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGEEItq090452;
 Sun, 16 Dec 2012 14:14:18 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201212161414.qBGEEItq090452@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 16 Dec 2012 14:14:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244293 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 14:14:19 -0000

Author: pjd
Date: Sun Dec 16 14:14:18 2012
New Revision: 244293
URL: http://svnweb.freebsd.org/changeset/base/244293

Log:
  Make the check easier to read.
  
  Obtained from:	WHEEL Systems

Modified:
  head/sys/kern/kern_sig.c

Modified: head/sys/kern/kern_sig.c
==============================================================================
--- head/sys/kern/kern_sig.c	Sun Dec 16 14:13:10 2012	(r244292)
+++ head/sys/kern/kern_sig.c	Sun Dec 16 14:14:18 2012	(r244293)
@@ -3218,8 +3218,7 @@ coredump(struct thread *td)
 #endif
 		return (EINVAL);
 	}
-	if (((sugid_coredump == 0) && p->p_flag & P_SUGID) ||
-	    do_coredump == 0) {
+	if (!do_coredump || (!sugid_coredump && (p->p_flag & P_SUGID) != 0)) {
 		PROC_UNLOCK(p);
 #ifdef AUDIT
 		audit_proc_coredump(td, name, EFAULT);