}
/* There's a good reason why we saved the ACL above, even though
- * we're about tto read it back into memory and mess with it on the
+ * we're about to read it back into memory and mess with it on the
* next line. The acl_copy_xattr() function is already a hack to let
* us copy default ACLs without resorting to path names; we simply
* have no way to read the parent's default ACL into memory using
*/
/* Now we potentially need to mask the execute permissions in the
- ACL on fd; or maybe now. */
+ ACL on fd; or maybe not. */
if (allow_exec) {
goto cleanup;
}
cleanup:
free(dirname_path_copy);
free(basename_path_copy);
- if (new_acl != (acl_t)NULL) {
- acl_free(new_acl);
- }
- if (new_acl_unmasked != (acl_t)NULL) {
- acl_free(new_acl_unmasked);
- }
+ acl_free(new_acl);
+ acl_free(new_acl_unmasked);
+
if (fd > 0 && close(fd) == CLOSE_ERROR) {
perror("apply_default_acl_ex (close fd)");
result = ACL_ERROR;