From owner-svn-src-all@FreeBSD.ORG  Thu Dec 22 18:12:51 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D6B3C1065673;
	Thu, 22 Dec 2011 18:12:51 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C5F0A8FC14;
	Thu, 22 Dec 2011 18:12:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBMICpEl028195;
	Thu, 22 Dec 2011 18:12:51 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBMICpkr028193;
	Thu, 22 Dec 2011 18:12:51 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201112221812.pBMICpkr028193@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Thu, 22 Dec 2011 18:12:51 +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: r228810 - head/contrib/openpam/lib
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Dec 2011 18:12:51 -0000

Author: des
Date: Thu Dec 22 18:12:51 2011
New Revision: 228810
URL: http://svn.freebsd.org/changeset/base/228810

Log:
  Merge upstream r509: don't log an error in the common case (ENOENT).

Modified:
  head/contrib/openpam/lib/openpam_check_owner_perms.c
Directory Properties:
  head/contrib/openpam/   (props changed)

Modified: head/contrib/openpam/lib/openpam_check_owner_perms.c
==============================================================================
--- head/contrib/openpam/lib/openpam_check_owner_perms.c	Thu Dec 22 18:10:15 2011	(r228809)
+++ head/contrib/openpam/lib/openpam_check_owner_perms.c	Thu Dec 22 18:12:51 2011	(r228810)
@@ -104,9 +104,11 @@ openpam_check_path_owner_perms(const cha
 	len = strlen(pathbuf);
 	while (len > 0) {
 		if (stat(pathbuf, &sb) != 0) {
-			serrno = errno;
-			openpam_log(PAM_LOG_ERROR, "%s: %m", pathbuf);
-			errno = serrno;
+			if (errno != ENOENT) {
+				serrno = errno;
+				openpam_log(PAM_LOG_ERROR, "%s: %m", pathbuf);
+				errno = serrno;
+			}
 			return (-1);
 		}
 		if ((sb.st_uid != root && sb.st_uid != arbitrator) ||