PERFORCE change 147221 for review

[Edward Tomasz Napierala]

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

Change 147221 by trasz at trasz_traszkan on 2008/08/12 10:03:34

	Verify ACLs loaded from disk.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#10 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#10 (text+ko) ====

@@ -195,10 +195,11 @@
 		return (EPERM);
 	}
 
-	if (ap->a_aclp->acl_cnt > ap->a_aclp->acl_length) {
+
+	error = acl_nfs4_check(ap->a_aclp, ap->a_vp->v_type == VDIR);
+	if (error) {
 		printf("ufs_getacl_nfs4(): Loaded invalid ACL "
-		    "(wrong acl_cnt: %c), inumber %d on %s\n",
-		    ap->a_aclp->acl_cnt,
+		    "(failed acl_nfs4_check), inumber %d on %s\n",
 		    ip->i_number, ip->i_fs->fs_fsmnt);
 
 		return (EPERM);