X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Flibadacl.c;h=789d12c9807ba541a51a823da58fb1d9e269fa63;hb=237493e8056c43b284755c1717d7ad25eb3da029;hp=130da4c4b505408ced5eb67132a6e4a2b4dfddf2;hpb=2537b1a95dfac45a8514b946cd9753efa05eb92a;p=apply-default-acl.git diff --git a/src/libadacl.c b/src/libadacl.c index 130da4c..789d12c 100644 --- a/src/libadacl.c +++ b/src/libadacl.c @@ -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; }