X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Flibadacl.c;h=789d12c9807ba541a51a823da58fb1d9e269fa63;hb=237493e8056c43b284755c1717d7ad25eb3da029;hp=246f30aef1852f1dee3f90b26c4a50cb98a501e9;hpb=f9e643a6aaf9d03fd6c36eb0ad953f2563a7c017;p=apply-default-acl.git

diff --git a/src/libadacl.c b/src/libadacl.c
index 246f30a..789d12c 100644
--- a/src/libadacl.c
+++ b/src/libadacl.c
@@ -5,7 +5,7 @@
  *
  */
 
-/* Enables get_current_dir_name() in unistd.h */
+/* Enables get_current_dir_name() in unistd.h and the O_PATH flag. */
 #define _GNU_SOURCE
 
 #include <errno.h>    /* EINVAL, ELOOP, ENOTDIR, etc. */
@@ -256,12 +256,6 @@ int acl_set_entry(acl_t* aclp, acl_entry_t entry) {
 	   been wiped. These three are guaranteed to exist, so if we
 	   match one of them, we're allowed to return ACL_SUCCESS
 	   below and bypass the rest of the function. */
-	acl_permset_t existing_permset;
-	if (acl_get_permset(existing_entry, &existing_permset) == ACL_ERROR) {
-	  perror("acl_set_entry (acl_get_permset)");
-	  return ACL_ERROR;
-	}
-
 	if (acl_set_permset(existing_entry, entry_permset) == ACL_ERROR) {
 	  perror("acl_set_entry (acl_set_permset)");
 	  return ACL_ERROR;
@@ -483,7 +477,7 @@ int any_can_execute(int fd, const struct stat* sp) {
   acl_t acl = acl_get_fd(fd);
 
   if (acl == (acl_t)NULL) {
-    perror("any_can_execute (acl_get_file)");
+    perror("any_can_execute (acl_get_fd)");
     return ACL_ERROR;
   }