keep me happy about precedence

SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 7.49
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.49
SCCS-vsn: sys/ufs/lfs/lfs_vnops.c 7.49
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.49

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

- *     @(#)ffs_vnops.c 7.48 (Berkeley) %G%
+ *     @(#)ffs_vnops.c 7.49 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -462,9 +462,9 @@ chmod1(vp, mode, cred)
            (error = suser(cred, &u.u_acflag)))
                return (error);
        if (cred->cr_uid) {
            (error = suser(cred, &u.u_acflag)))
                return (error);
        if (cred->cr_uid) {

-               if (vp->v_type != VDIR && mode & ISVTX)
+               if (vp->v_type != VDIR && (mode & ISVTX))

                        return (EFTYPE);
                        return (EFTYPE);

-               if (!groupmember(ip->i_gid, cred) && mode & ISGID)
+               if (!groupmember(ip->i_gid, cred) && (mode & ISGID))

                        return (EPERM);
        }
        ip->i_mode &= ~07777;
                        return (EPERM);
        }
        ip->i_mode &= ~07777;

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index 8599648..6569cf1 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.48 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.49 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -462,9 +462,9 @@ chmod1(vp, mode, cred)
            (error = suser(cred, &u.u_acflag)))
                return (error);
        if (cred->cr_uid) {
            (error = suser(cred, &u.u_acflag)))
                return (error);
        if (cred->cr_uid) {

-               if (vp->v_type != VDIR && mode & ISVTX)
+               if (vp->v_type != VDIR && (mode & ISVTX))

                        return (EFTYPE);
                        return (EFTYPE);

-               if (!groupmember(ip->i_gid, cred) && mode & ISGID)
+               if (!groupmember(ip->i_gid, cred) && (mode & ISGID))

                        return (EPERM);
        }
        ip->i_mode &= ~07777;
                        return (EPERM);
        }
        ip->i_mode &= ~07777;

diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c
index d3c1d25..147291c 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vnops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_vnops.c 7.48 (Berkeley) %G%
+ *     @(#)lfs_vnops.c 7.49 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -462,9 +462,9 @@ chmod1(vp, mode, cred)
            (error = suser(cred, &u.u_acflag)))
                return (error);
        if (cred->cr_uid) {
            (error = suser(cred, &u.u_acflag)))
                return (error);
        if (cred->cr_uid) {

-               if (vp->v_type != VDIR && mode & ISVTX)
+               if (vp->v_type != VDIR && (mode & ISVTX))

                        return (EFTYPE);
                        return (EFTYPE);

-               if (!groupmember(ip->i_gid, cred) && mode & ISGID)
+               if (!groupmember(ip->i_gid, cred) && (mode & ISGID))

                        return (EPERM);
        }
        ip->i_mode &= ~07777;
                        return (EPERM);
        }
        ip->i_mode &= ~07777;

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index 8599648..6569cf1 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.48 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.49 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -462,9 +462,9 @@ chmod1(vp, mode, cred)
            (error = suser(cred, &u.u_acflag)))
                return (error);
        if (cred->cr_uid) {
            (error = suser(cred, &u.u_acflag)))
                return (error);
        if (cred->cr_uid) {

-               if (vp->v_type != VDIR && mode & ISVTX)
+               if (vp->v_type != VDIR && (mode & ISVTX))

                        return (EFTYPE);
                        return (EFTYPE);

-               if (!groupmember(ip->i_gid, cred) && mode & ISGID)
+               if (!groupmember(ip->i_gid, cred) && (mode & ISGID))

                        return (EPERM);
        }
        ip->i_mode &= ~07777;
                        return (EPERM);
        }
        ip->i_mode &= ~07777;