Module Name: src
Committed By: dholland
Date: Sat Jun 8 20:43:35 UTC 2013
Modified Files:
src/sys/ufs/lfs: ulfs_vnops.c
Log Message:
Merge -r1.213 of ufs_vnops.c:
Committed By: kardel
Date: Sat Jun 8 05:47:02 UTC 2013
fix clearing of system-flags (schg, sappnd). clearing system flags is
possible again at securelevel < 1.
reviewed by christos@
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/ufs/lfs/ulfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/ulfs_vnops.c
diff -u src/sys/ufs/lfs/ulfs_vnops.c:1.9 src/sys/ufs/lfs/ulfs_vnops.c:1.10
--- src/sys/ufs/lfs/ulfs_vnops.c:1.9 Sat Jun 8 02:14:46 2013
+++ src/sys/ufs/lfs/ulfs_vnops.c Sat Jun 8 20:43:35 2013
@@ -1,5 +1,5 @@
-/* $NetBSD: ulfs_vnops.c,v 1.9 2013/06/08 02:14:46 dholland Exp $ */
-/* from NetBSD: ufs_vnops.c,v 1.212 2013/03/18 19:35:48 plunky Exp */
+/* $NetBSD: ulfs_vnops.c,v 1.10 2013/06/08 20:43:35 dholland Exp $ */
+/* from NetBSD: ufs_vnops.c,v 1.213 2013/06/08 05:47:02 kardel Exp */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.9 2013/06/08 02:14:46 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.10 2013/06/08 20:43:35 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -498,7 +498,7 @@ ulfs_setattr(void *v)
action |= KAUTH_VNODE_HAS_SYSFLAGS;
}
- if ((vap->va_flags & UF_SETTABLE) != vap->va_flags) {
+ if ((vap->va_flags & SF_SETTABLE) != (ip->i_flags & SF_SETTABLE)) {
action |= KAUTH_VNODE_WRITE_SYSFLAGS;
changing_sysflags = true;
}
