Make setfacl(1) behave properly in situations like "setfacl -kd".
MFC after: 1 month
This commit is contained in:
parent
f340037ea1
commit
00b2b3a55d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=240083
@ -73,6 +73,7 @@ main(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
acl_t acl;
|
acl_t acl;
|
||||||
acl_type_t acl_type;
|
acl_type_t acl_type;
|
||||||
|
acl_entry_t unused_entry;
|
||||||
char filename[PATH_MAX];
|
char filename[PATH_MAX];
|
||||||
int local_error, carried_error, ch, i, entry_number, ret;
|
int local_error, carried_error, ch, i, entry_number, ret;
|
||||||
int h_flag;
|
int h_flag;
|
||||||
@ -296,6 +297,20 @@ main(int argc, char *argv[])
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Don't try to set an empty default ACL; it will always fail.
|
||||||
|
* Use acl_delete_def_file(3) instead.
|
||||||
|
*/
|
||||||
|
if (acl_type == ACL_TYPE_DEFAULT &&
|
||||||
|
acl_get_entry(acl, ACL_FIRST_ENTRY, &unused_entry) == 0) {
|
||||||
|
if (acl_delete_def_file(file->filename) == -1) {
|
||||||
|
warn("%s: acl_delete_def_file() failed",
|
||||||
|
file->filename);
|
||||||
|
carried_error++;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
/* don't bother setting the ACL if something is broken */
|
/* don't bother setting the ACL if something is broken */
|
||||||
if (local_error) {
|
if (local_error) {
|
||||||
carried_error++;
|
carried_error++;
|
||||||
|
Loading…
Reference in New Issue
Block a user