svn commit: r228810 - head/contrib/openpam/lib

[Dag-Erling Smorgrav]

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) ||