*
* @return true if @c path is a directory, false otherwise.
*/
-bool is_directory(const char* path) {
+bool is_path_directory(const char* path) {
if (path == NULL) {
return false;
}
ACL. */
acl_entry_t new_entry;
- /* We allocate memory here that we should release! */
+ /* The acl_create_entry() function can allocate new memory and/or
+ * change the location of the ACL structure entirely. When that
+ * happens, the value pointed to by aclp is updated, which means
+ * that a new acl_t gets "passed out" to our caller, eventually to
+ * be fed to acl_free(). In other words, we should still be freeing
+ * the right thing, even if the value pointed to by aclp changes.
+ */
int c_result = acl_create_entry(aclp, &new_entry);
if (c_result == ACL_ERROR) {
perror("acl_set_entry (acl_create_entry)");
* @brief Determine the number of entries in the given ACL.
*
* @param acl
- * A pointer to an @c acl_t structure.
+ * The ACL to inspect.
*
* @return Either the non-negative number of entries in @c acl, or
* @c ACL_ERROR on error.
*/
-int acl_entry_count(acl_t* acl) {
+int acl_entry_count(acl_t acl) {
acl_entry_t entry;
int entry_count = 0;
- int result = acl_get_entry(*acl, ACL_FIRST_ENTRY, &entry);
+ int result = acl_get_entry(acl, ACL_FIRST_ENTRY, &entry);
while (result == ACL_SUCCESS) {
entry_count++;
- result = acl_get_entry(*acl, ACL_NEXT_ENTRY, &entry);
+ result = acl_get_entry(acl, ACL_NEXT_ENTRY, &entry);
}
if (result == ACL_ERROR) {
* An ACL is minimal if it has fewer than four entries.
*
* @param acl
- * A pointer to an acl_t structure.
+ * The ACL whose minimality is in question.
*
* @return
* - @c ACL_SUCCESS - @c acl is minimal
* - @c ACL_FAILURE - @c acl is not minimal
* - @c ACL_ERROR - Unexpected library error
*/
-int acl_is_minimal(acl_t* acl) {
+int acl_is_minimal(acl_t acl) {
int ec = acl_entry_count(acl);
/**
- * @brief Determine whether the given path has an ACL whose mask
- * denies execute.
+ * @brief Determine whether the given ACL's mask denies execute.
*
- * @param path
- * The path to check.
+ * @param acl
+ * The ACL whose mask we want to check.
*
* @return
- * - @c ACL_SUCCESS - @c path has a mask which denies execute.
- * - @c ACL_FAILURE - The ACL for @c path does not deny execute,
- * or @c path has no extended ACL at all.
+ * - @c ACL_SUCCESS - The @c acl has a mask which denies execute.
+ * - @c ACL_FAILURE - The @c acl has a mask which does not deny execute.
* - @c ACL_ERROR - Unexpected library error.
*/
-int acl_execute_masked(const char* path) {
-
- acl_t acl = acl_get_file(path, ACL_TYPE_ACCESS);
-
- if (acl == (acl_t)NULL) {
- perror("acl_execute_masked (acl_get_file)");
- return ACL_ERROR;
- }
-
- /* Our return value. */
- int result = ACL_FAILURE;
+int acl_execute_masked(acl_t acl) {
acl_entry_t entry;
int ge_result = acl_get_entry(acl, ACL_FIRST_ENTRY, &entry);
if (tag_result == ACL_ERROR) {
perror("acl_execute_masked (acl_get_tag_type)");
- result = ACL_ERROR;
- goto cleanup;
+ return ACL_ERROR;
}
if (tag == ACL_MASK) {
int ps_result = acl_get_permset(entry, &permset);
if (ps_result == ACL_ERROR) {
perror("acl_execute_masked (acl_get_permset)");
- result = ACL_ERROR;
- goto cleanup;
+ return ACL_ERROR;
}
int gp_result = acl_get_perm(permset, ACL_EXECUTE);
if (gp_result == ACL_ERROR) {
perror("acl_execute_masked (acl_get_perm)");
- result = ACL_ERROR;
- goto cleanup;
+ return ACL_ERROR;
}
if (gp_result == ACL_FAILURE) {
ge_result = acl_get_entry(acl, ACL_NEXT_ENTRY, &entry);
}
- cleanup:
- acl_free(acl);
- return result;
+ return ACL_FAILURE;
}
*/
int any_can_execute_or_dir(const char* path) {
- if (is_directory(path)) {
+ if (is_path_directory(path)) {
/* That was easy... */
return ACL_SUCCESS;
}
/* Our return value. */
int result = ACL_FAILURE;
- if (acl_is_minimal(&acl)) {
+ if (acl_is_minimal(acl)) {
mode_t mode = get_mode(path);
if (mode & (S_IXUSR | S_IXOTH | S_IXGRP)) {
result = ACL_SUCCESS;
if (gp_result == ACL_SUCCESS) {
/* Only return ACL_SUCCESS if this execute bit is not masked. */
- if (acl_execute_masked(path) != ACL_SUCCESS) {
+ if (acl_execute_masked(acl) != ACL_SUCCESS) {
result = ACL_SUCCESS;
goto cleanup;
}
return ACL_ERROR;
}
- if (!is_directory(path)) {
+ if (!is_path_directory(path)) {
return ACL_FAILURE;
}
return ACL_FAILURE;
}
- if (!is_regular_file(path) && !is_directory(path)) {
+ if (!is_regular_file(path) && !is_path_directory(path)) {
return ACL_FAILURE;
}
path_copy[PATH_MAX-1] = 0;
char* parent = dirname(path_copy);
- if (!is_directory(parent)) {
+ if (!is_path_directory(parent)) {
/* Make sure dirname() did what we think it did. */
return ACL_FAILURE;
}
acl_t acl = acl_get_file(path, ACL_TYPE_ACCESS);
if (acl == (acl_t)NULL) {
perror("apply_default_acl (acl_get_file)");
- return ACL_ERROR;
+ result = ACL_ERROR;
+ goto cleanup;
}
/* If it's a directory, inherit the parent's default. */
}
}
- /* Finally, add the permset to the access ACL. */
+ /* Finally, add the permset to the access ACL. It's actually
+ * important that we pass in the address of "acl" here, and not
+ * "acl" itself. Why? The call to acl_create_entry() within
+ * acl_set_entry() can allocate new memory for the entry.
+ * Sometimes that can be done in-place, in which case everything
+ * is cool and the new memory gets released when we call
+ * acl_free(acl).
+ *
+ * But occasionally, the whole ACL structure will have to be moved
+ * in order to allocate the extra space. When that happens,
+ * acl_create_entry() modifies the pointer it was passed (in this
+ * case, &acl) to point to the new location. We want to call
+ * acl_free() on the new location, and since acl_free() gets
+ * called right here, we need acl_create_entry() to update the
+ * value of "acl". To do that, it needs the address of "acl".
+ */
int set_result = acl_set_entry(&acl, entry);
if (set_result == ACL_ERROR) {
perror("apply_default_acl (acl_set_entry)");
*/
bool apply_default_acl_recursive(const char *target, bool no_exec_mask) {
- if (!is_directory(target)) {
+ if (!is_path_directory(target)) {
return apply_default_acl(target, no_exec_mask);
}
projects / apply-default-acl.git / blobdiff