PERFORCE change 144615 for review

[Edward Tomasz Napierala]

http://perforce.freebsd.org/chv.cgi?CH=144615

Change 144615 by trasz at trasz_traszkan on 2008/07/04 13:23:48

	Fix previous fix.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#5 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#5 (text+ko) ====

@@ -756,6 +756,11 @@
 		    ACL_ENTRY_FILE_INHERIT) == 0) && !is_directory)
 			continue;
 
+		if ((parent_entry->ae_flags &
+		    (ACL_ENTRY_DIRECTORY_INHERIT |
+		    ACL_ENTRY_FILE_INHERIT)) == 0)
+			continue;
+
 		KASSERT(child_aclp->acl_cnt < ACL_MAX_ENTRIES,
 		    "child_aclp->acl_cnt < ACL_MAX_ENTRIES");
 		child_aclp->acl_entry[child_aclp->acl_cnt] = *parent_entry;