Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@
This commit is contained in:
dholland 2013-06-08 20:43:35 +00:00
parent 92cba3584f
commit d347d0af43
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/ufs/lfs/ulfs_vnops.c
View File

@ -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;
}