[Midnightbsd-cvs] src [8149] trunk/bin/setfacl/setfacl.c: more fixes

[laffer1 at midnightbsd.org]

Revision: 8149
          http://svnweb.midnightbsd.org/src/?rev=8149
Author:   laffer1
Date:     2016-09-16 18:17:48 -0400 (Fri, 16 Sep 2016)
Log Message:
-----------
more fixes

Modified Paths:
--------------
    trunk/bin/setfacl/setfacl.c

Modified: trunk/bin/setfacl/setfacl.c
===================================================================
--- trunk/bin/setfacl/setfacl.c	2016-09-16 22:17:27 UTC (rev 8148)
+++ trunk/bin/setfacl/setfacl.c	2016-09-16 22:17:48 UTC (rev 8149)
@@ -265,6 +265,17 @@
 				need_mask = 1;
 				break;
 			case OP_REMOVE_EXT:
+				/*
+				 * Don't try to call remove_ext() for empty
+				 * default ACL.
+				 */
+				if (acl_type == ACL_TYPE_DEFAULT &&
+				    acl_get_entry(acl, ACL_FIRST_ENTRY,
+				    &unused_entry) == 0) {
+					local_error += remove_default(&acl,
+					    file->filename);
+					break;
+				}
 				remove_ext(&acl, file->filename);
 				need_mask = 0;
 				break;