Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Jan 2019 04:10:45 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r343248 - stable/12/usr.bin/cmp
Message-ID:  <201901210410.x0L4Aji2058548@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Mon Jan 21 04:10:45 2019
New Revision: 343248
URL: https://svnweb.freebsd.org/changeset/base/343248

Log:
  Properly commit the revert of r343205.
  
  MFCing the head revert isn't the same as reverting the MFC.
  
  This is a direct commit to stable/12.

Modified:
  stable/12/usr.bin/cmp/cmp.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.bin/cmp/cmp.c
==============================================================================
--- stable/12/usr.bin/cmp/cmp.c	Mon Jan 21 03:57:49 2019	(r343247)
+++ stable/12/usr.bin/cmp/cmp.c	Mon Jan 21 04:10:45 2019	(r343248)
@@ -177,7 +177,8 @@ main(int argc, char *argv[])
 
 	if (!special) {
 		cap_rights_init(&rights);
-		if (caph_rights_limit(STDIN_FILENO, &rights) < 0) {
+		if (cap_rights_limit(STDIN_FILENO, &rights) < 0 &&
+		    errno != ENOSYS) {
 			err(ERR_EXIT, "unable to limit stdio");
 		}
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901210410.x0L4Aji2058548>