Author: trasz
Date: Sat Mar 27 18:08:14 2010
New Revision: 205769
URL: http://svn.freebsd.org/changeset/base/205769

Log:
  MFC r200058:
  
  Add change that was somehow missed in r192586.  It could manifest by
  incorrectly returning EINVAL from acl_valid(3) for applications linked
  against pre-8.0 libc.

Modified:
  stable/8/sys/kern/vfs_acl.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/kern/vfs_acl.c
==============================================================================
--- stable/8/sys/kern/vfs_acl.c Sat Mar 27 18:04:33 2010        (r205768)
+++ stable/8/sys/kern/vfs_acl.c Sat Mar 27 18:08:14 2010        (r205769)
@@ -173,7 +173,7 @@ acl_copyout(struct acl *kernel_acl, void
 
 /*
  * Convert "old" type - ACL_TYPE_{ACCESS,DEFAULT}_OLD - into its "new"
- * counterpart.  It's required for old (pre-NFS4 ACLs) libc to work
+ * counterpart.  It's required for old (pre-NFSv4 ACLs) libc to work
  * with new kernel.  Fixing 'type' for old binaries with new libc
  * is being done in lib/libc/posix1e/acl_support.c:_acl_type_unold().
  */
@@ -307,7 +307,8 @@ vacl_aclcheck(struct thread *td, struct 
        error = acl_copyin(aclp, inkernelacl, type);
        if (error)
                goto out;
-       error = VOP_ACLCHECK(vp, type, inkernelacl, td->td_ucred, td);
+       error = VOP_ACLCHECK(vp, acl_type_unold(type), inkernelacl,
+           td->td_ucred, td);
 out:
        acl_free(inkernelacl);
        return (error);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to