X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fapply-default-acl.c;h=022e2b87a6cc97e3816f6b84cd23d4a4910d4c8c;hb=916bcfd577de83186c26cd4e110b8f750e781054;hp=a4961957b7487fa10591f87e93ee54f41d3d2d31;hpb=f0c1a9ee7c7a6acbfc0c4270f9167022504a6a45;p=apply-default-acl.git

diff --git a/src/apply-default-acl.c b/src/apply-default-acl.c
index a496195..022e2b8 100644
--- a/src/apply-default-acl.c
+++ b/src/apply-default-acl.c
@@ -312,20 +312,20 @@ int acl_set_entry(acl_t* aclp,
  * @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) {
@@ -344,14 +344,14 @@ int acl_entry_count(acl_t* acl) {
  * 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);
 
@@ -371,29 +371,17 @@ int acl_is_minimal(acl_t* 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);
@@ -404,8 +392,7 @@ int acl_execute_masked(const char* path) {
 
     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) {
@@ -416,15 +403,13 @@ int acl_execute_masked(const char* path) {
       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) {
@@ -436,9 +421,7 @@ int acl_execute_masked(const char* path) {
     ge_result = acl_get_entry(acl, ACL_NEXT_ENTRY, &entry);
   }
 
- cleanup:
-  acl_free(acl);
-  return result;
+  return ACL_FAILURE;
 }
 
 
@@ -482,7 +465,7 @@ int any_can_execute_or_dir(const char* path) {
   /* 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;
@@ -533,7 +516,7 @@ int any_can_execute_or_dir(const char* path) {
 
     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;
       }