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;
}
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;
}
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;
}
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;
}
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;
}
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;
}
/* 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;
}
/* 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;
}