aboutsummaryrefslogtreecommitdiff
path: root/sys/ufs
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1997-07-13 16:26:40 +0000
committerBruce Evans <bde@FreeBSD.org>1997-07-13 16:26:40 +0000
commited1ab0dea281d994c2e41b78b2430e3fe7b8d381 (patch)
tree06d55dc67deb3a7e52ab8f83f43650d508da56ef /sys/ufs
parent7e88aafca74505ed5c11ad8f258dcfc4de2d3a3e (diff)
Notes
Diffstat (limited to 'sys/ufs')
-rw-r--r--sys/ufs/ufs/ufs_vnops.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 8180761377bf..fc09996ae591 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
- * $Id: ufs_vnops.c,v 1.50 1997/05/17 18:32:53 phk Exp $
+ * $Id: ufs_vnops.c,v 1.51 1997/06/02 06:24:51 julian Exp $
*/
#include "opt_quota.h"
@@ -581,12 +581,9 @@ good:
if (getinoquota(ip))
panic("ufs_chown: lost quota");
#endif /* QUOTA */
- if (ouid != uid || ogid != gid)
- ip->i_flag |= IN_CHANGE;
- if (ouid != uid && cred->cr_uid != 0)
- ip->i_mode &= ~ISUID;
- if (ogid != gid && cred->cr_uid != 0)
- ip->i_mode &= ~ISGID;
+ ip->i_flag |= IN_CHANGE;
+ if (cred->cr_uid != 0 && (ouid != uid || ogid != gid))
+ ip->i_mode &= ~(ISUID | ISGID);
return (0);
}