access() is supposed to return 0 if all of the desired access modes

would be granted.

SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.110
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.110

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index a1818b5..b0e2db5 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.109 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.110 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -216,9 +216,7 @@ ufs_access(ap)
 found:
                ;
        }
 found:
                ;
        }

-       if ((ip->i_mode & mode) != 0)
-               return (0);
-       return (EACCES);
+       return ((ip->i_mode & mode) == mode ? 0 : EACCES);

 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index a1818b5..b0e2db5 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.109 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.110 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -216,9 +216,7 @@ ufs_access(ap)
 found:
                ;
        }
 found:
                ;
        }

-       if ((ip->i_mode & mode) != 0)
-               return (0);
-       return (EACCES);
+       return ((ip->i_mode & mode) == mode ? 0 : EACCES);

 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */