From 3a4c697a608a23e11b84d897883b2870f9587dfa Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Thu, 18 Oct 2012 08:18:15 -0400 Subject: [PATCH] Fix a function name in some error messages. --- src/reapply_default_acl.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/reapply_default_acl.c b/src/reapply_default_acl.c index a2b4307..7d63899 100644 --- a/src/reapply_default_acl.c +++ b/src/reapply_default_acl.c @@ -415,7 +415,7 @@ int reapply_default_acl(const char* path) { int ace_result = any_can_execute(path); if (ace_result == -1) { - perror("reapply_default_acl_ng (any_can_execute)"); + perror("reapply_default_acl (any_can_execute)"); return -1; } @@ -424,7 +424,7 @@ int reapply_default_acl(const char* path) { acl_t defacl = acl_get_file(parent, ACL_TYPE_DEFAULT); if (defacl == (acl_t)NULL) { - perror("reapply_default_acl_ng (acl_get_file)"); + perror("reapply_default_acl (acl_get_file)"); return -1; } @@ -433,7 +433,7 @@ int reapply_default_acl(const char* path) { int wipe_result = wipe_acls(path); if (wipe_result == -1) { - perror("reapply_default_acl_ng (wipe_acls)"); + perror("reapply_default_acl (wipe_acls)"); result = -1; goto cleanup; } @@ -442,14 +442,14 @@ int reapply_default_acl(const char* path) { ACL with this one. */ acl_t acl = acl_get_file(path, ACL_TYPE_ACCESS); if (acl == (acl_t)NULL) { - perror("reapply_default_acl_ng (acl_get_file)"); + perror("reapply_default_acl (acl_get_file)"); return -1; } /* If it's a directory, inherit the parent's default. */ int inherit_result = inherit_default_acl(path, parent); if (inherit_result == -1) { - perror("reapply_default_acl_ng (inherit_acls)"); + perror("reapply_default_acl (inherit_acls)"); result = -1; goto cleanup; } @@ -472,7 +472,7 @@ int reapply_default_acl(const char* path) { acl_permset_t permset; int ps_result = acl_get_permset(entry, &permset); if (ps_result == -1) { - perror("reapply_default_acl_ng (acl_get_permset)"); + perror("reapply_default_acl (acl_get_permset)"); result = -1; goto cleanup; } @@ -488,14 +488,14 @@ int reapply_default_acl(const char* path) { masked, we have to do it manually. */ int d_result = acl_delete_perm(permset, ACL_EXECUTE); if (d_result == -1) { - perror("reapply_default_acl_ng (acl_delete_perm)"); + perror("reapply_default_acl (acl_delete_perm)"); result = -1; goto cleanup; } int sp_result = acl_set_permset(entry, permset); if (sp_result == -1) { - perror("reapply_default_acl_ng (acl_set_permset)"); + perror("reapply_default_acl (acl_set_permset)"); result = -1; goto cleanup; } @@ -505,7 +505,7 @@ int reapply_default_acl(const char* path) { /* Finally, add the permset to the access ACL. */ int set_result = acl_set_entry(&acl, entry); if (set_result == -1) { - perror("reapply_default_acl_ng (acl_set_entry)"); + perror("reapply_default_acl (acl_set_entry)"); result = -1; goto cleanup; } @@ -516,14 +516,14 @@ int reapply_default_acl(const char* path) { /* Catches the first acl_get_entry as well as the ones at the end of the loop. */ if (ge_result == -1) { - perror("reapply_default_acl_ng (acl_get_entry)"); + perror("reapply_default_acl (acl_get_entry)"); result = -1; goto cleanup; } int sf_result = acl_set_file(path, ACL_TYPE_ACCESS, acl); if (sf_result == -1) { - perror("reapply_default_acl_ng (acl_set_file)"); + perror("reapply_default_acl (acl_set_file)"); result = -1; goto cleanup; } -- 2.43.2