Allow for different errors on invalid subrights

Specifying subrights without the corresponding CAP_IOCTL/CAP_FCNTL fails, but it can fail with different error value (ENOTCAPABLE, EINVAL).
google · Nov 13, 2015 · c12451a · c12451a
1 parent 1739762
commit c12451a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/fcntl.cc b/fcntl.cc
@@ -313,7 +313,7 @@ TEST(Fcntl, PreserveSubRights) {
   EXPECT_OK(cap_rights_limit(fd, &rights));
   EXPECT_OK(cap_fcntls_get(fd, &fcntls));
   EXPECT_EQ((cap_fcntl_t)0, fcntls);
-  EXPECT_NOTCAPABLE(cap_fcntls_limit(fd, CAP_FCNTL_GETFL));
+  EXPECT_EQ(-1, cap_fcntls_limit(fd, CAP_FCNTL_GETFL));
 
   close(fd);
   unlink(TmpFile("cap_fcntl_subrightpreserve"));

diff --git a/ioctl.cc b/ioctl.cc
@@ -102,7 +102,7 @@ TEST(Ioctl, PreserveSubRights) {
   nioctls = cap_ioctls_get(fd, ioctls, 16);
   EXPECT_OK(nioctls);
   EXPECT_EQ(0, nioctls);
-  EXPECT_NOTCAPABLE(cap_ioctls_limit(fd, &ioctl_nread, 1));
+  EXPECT_EQ(-1, cap_ioctls_limit(fd, &ioctl_nread, 1));
 
   close(fd);
 }