* @param path
* The path whose ACL we would like to reset to its default.
*
- * @param sp
- * A pointer to a stat structure for @c path, or @c NULL if you don't
- * have one handy.
- *
* @param no_exec_mask
* The value (either true or false) of the --no-exec-mask flag.
*
* - @c ACL_FAILURE - If symlinks or hard links are encountered.
* - @c ACL_ERROR - Unexpected library error.
*/
-int apply_default_acl_ex(const char* path,
- const struct stat* sp,
- bool no_exec_mask) {
+int apply_default_acl(const char* path, bool no_exec_mask) {
if (path == NULL) {
errno = EINVAL;
- perror("apply_default_acl_ex (args)");
+ perror("apply_default_acl (args)");
return ACL_ERROR;
}
/* The file descriptor for the directory containing "path" */
int parent_fd = 0;
+ /* dirname() and basename() mangle their arguments, so we need
+ to make copies of "path" before using them. */
+ char* dirname_path_copy = NULL;
+ char* basename_path_copy = NULL;
+
/* Get the parent directory of "path" with dirname(), which happens
* to murder its argument and necessitates a path_copy. */
- char* path_copy = strdup(path);
- if (path_copy == NULL) {
- perror("apply_default_acl_ex (strdup)");
+ dirname_path_copy = strdup(path);
+ if (dirname_path_copy == NULL) {
+ perror("apply_default_acl (strdup)");
return ACL_ERROR;
}
- char* parent = dirname(path_copy);
+ char* parent = dirname(dirname_path_copy);
parent_fd = safe_open(parent, O_DIRECTORY | O_NOFOLLOW);
if (parent_fd == OPEN_ERROR) {
if (errno == ELOOP || errno == ENOTDIR) {
goto cleanup;
}
else {
- perror("apply_default_acl_ex (open parent fd)");
+ perror("apply_default_acl (open parent fd)");
result = ACL_ERROR;
goto cleanup;
}
goto cleanup;
}
- fd = safe_open(path, O_NOFOLLOW);
+ /* We already obtained the parent fd safely, so if we use the
+ basename of path here instead of the full thing, then we can get
+ away with using openat() and spare ourselves the slowness of
+ another safe_open(). */
+ basename_path_copy = strdup(path);
+ if (basename_path_copy == NULL) {
+ perror("apply_default_acl (strdup)");
+ return ACL_ERROR;
+ }
+ fd = openat(parent_fd, basename(basename_path_copy), O_NOFOLLOW);
if (fd == OPEN_ERROR) {
if (errno == ELOOP || errno == ENOTDIR) {
/* We hit a symlink, either in the last path component (ELOOP)
goto cleanup;
}
else {
- perror("apply_default_acl_ex (open fd)");
+ perror("apply_default_acl (open fd)");
result = ACL_ERROR;
goto cleanup;
}
* race condition here, but the window is as small as possible
* between when we open the file descriptor (look above) and when we
* fstat it.
- *
- * Note: we only need to call fstat ourselves if we weren't passed a
- * valid pointer to a stat structure (nftw does that).
*/
- if (sp == NULL) {
- struct stat s;
- if (fstat(fd, &s) == STAT_ERROR) {
- perror("apply_default_acl_ex (fstat)");
- goto cleanup;
- }
-
- sp = &s;
+ struct stat s;
+ if (fstat(fd, &s) == STAT_ERROR) {
+ perror("apply_default_acl (fstat)");
+ goto cleanup;
}
- if (!S_ISDIR(sp->st_mode)) {
+ if (!S_ISDIR(s.st_mode)) {
/* If it's not a directory, make sure it's a regular,
non-hard-linked file. */
- if (!S_ISREG(sp->st_mode) || sp->st_nlink != 1) {
+ if (!S_ISREG(s.st_mode) || s.st_nlink != 1) {
result = ACL_FAILURE;
goto cleanup;
}
if (!no_exec_mask) {
/* Never mask the execute bit on directories. */
- int ace_result = any_can_execute(fd,sp) || S_ISDIR(sp->st_mode);
+ int ace_result = any_can_execute(fd,&s) || S_ISDIR(s.st_mode);
if (ace_result == ACL_ERROR) {
- perror("apply_default_acl_ex (any_can_execute)");
+ perror("apply_default_acl (any_can_execute)");
result = ACL_ERROR;
goto cleanup;
}
}
/* If it's a directory, inherit the parent's default. */
- if (S_ISDIR(sp->st_mode)) {
+ if (S_ISDIR(s.st_mode)) {
if (acl_copy_xattr(parent_fd,
ACL_TYPE_DEFAULT,
fd,
ACL_TYPE_DEFAULT) == ACL_ERROR) {
- perror("apply_default_acl_ex (acl_copy_xattr default)");
+ perror("apply_default_acl (acl_copy_xattr default)");
result = ACL_ERROR;
goto cleanup;
}
ACL_TYPE_DEFAULT,
fd,
ACL_TYPE_ACCESS) == ACL_ERROR) {
- perror("apply_default_acl_ex (acl_copy_xattr access)");
+ perror("apply_default_acl (acl_copy_xattr access)");
result = ACL_ERROR;
goto cleanup;
}
/* 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;
}
current ACL... */
new_acl = acl_get_fd(fd);
if (new_acl == (acl_t)NULL) {
- perror("apply_default_acl_ex (acl_get_fd)");
+ perror("apply_default_acl (acl_get_fd)");
result = ACL_ERROR;
goto cleanup;
}
looping over it no worky). */
new_acl_unmasked = acl_dup(new_acl);
if (new_acl_unmasked == (acl_t)NULL) {
- perror("apply_default_acl_ex (acl_dup)");
+ perror("apply_default_acl (acl_dup)");
result = ACL_ERROR;
goto cleanup;
}
acl_tag_t tag = ACL_UNDEFINED_TAG;
if (acl_get_tag_type(entry, &tag) == ACL_ERROR) {
- perror("apply_default_acl_ex (acl_get_tag_type)");
+ perror("apply_default_acl (acl_get_tag_type)");
result = ACL_ERROR;
goto cleanup;
}
/* We've got an entry/tag from the default ACL. Get its permset. */
acl_permset_t permset;
if (acl_get_permset(entry, &permset) == ACL_ERROR) {
- perror("apply_default_acl_ex (acl_get_permset)");
+ perror("apply_default_acl (acl_get_permset)");
result = ACL_ERROR;
goto cleanup;
}
minimal ACLs) or acl_other entries, so if execute should be
masked, we have to do it manually. */
if (acl_delete_perm(permset, ACL_EXECUTE) == ACL_ERROR) {
- perror("apply_default_acl_ex (acl_delete_perm)");
+ perror("apply_default_acl (acl_delete_perm)");
result = ACL_ERROR;
goto cleanup;
}
if (acl_set_permset(entry, permset) == ACL_ERROR) {
- perror("apply_default_acl_ex (acl_set_permset)");
+ perror("apply_default_acl (acl_set_permset)");
result = ACL_ERROR;
goto cleanup;
}
}
if (acl_update_entry(new_acl, entry) == ACL_ERROR) {
- perror("apply_default_acl_ex (acl_update_entry)");
+ perror("apply_default_acl (acl_update_entry)");
result = ACL_ERROR;
goto cleanup;
}
/* Catches the first acl_get_entry as well as the ones at the end of
the loop. */
if (ge_result == ACL_ERROR) {
- perror("apply_default_acl_ex (acl_get_entry)");
+ perror("apply_default_acl (acl_get_entry)");
result = ACL_ERROR;
goto cleanup;
}
if (acl_set_fd(fd, new_acl) == ACL_ERROR) {
- perror("apply_default_acl_ex (acl_set_fd)");
+ perror("apply_default_acl (acl_set_fd)");
result = ACL_ERROR;
goto cleanup;
}
cleanup:
- free(path_copy);
- if (new_acl != (acl_t)NULL) {
- acl_free(new_acl);
- }
- if (new_acl_unmasked != (acl_t)NULL) {
- acl_free(new_acl_unmasked);
- }
+ free(dirname_path_copy);
+ free(basename_path_copy);
+ acl_free(new_acl);
+ acl_free(new_acl_unmasked);
+
if (fd > 0 && close(fd) == CLOSE_ERROR) {
- perror("apply_default_acl_ex (close fd)");
+ perror("apply_default_acl (close fd)");
result = ACL_ERROR;
}
if (parent_fd > 0 && close(parent_fd) == CLOSE_ERROR) {
- perror("apply_default_acl_ex (close parent_fd)");
+ perror("apply_default_acl (close parent_fd)");
result = ACL_ERROR;
}
return result;
}
-
-
-
-/**
- * @brief The friendly interface to @c apply_default_acl_ex.
- *
- * The @c apply_default_acl_ex function holds the real implementation
- * of this function, but it takes a weird second argument that most
- * people won't care about (a stat structure). But, we use that
- * argument for the recursive mode of the CLI, so it's there.
- *
- * If you don't have a stat structure for your @c path, use this instead.
- *
- * @param path
- * The path whose ACL we would like to reset to its default.
- *
- * @param no_exec_mask
- * The value (either true or false) of the --no-exec-mask flag.
- *
- * @return
- * - @c ACL_SUCCESS - The parent default ACL was inherited successfully.
- * - @c ACL_FAILURE - If symlinks or hard links are encountered.
- * or the parent of @c path is not a directory.
- * - @c ACL_ERROR - Unexpected library error.
- */
-int apply_default_acl(const char* path, bool no_exec_mask) {
- return apply_default_acl_ex(path, NULL, no_exec_mask);
-}
projects / apply-default-acl.git / blobdiff