[src/trunk]: src/sys/kern Sync reality with comments. This makes strict level...

[elad <elad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8f3190f3fe2e
branches:  trunk
changeset: 582050:8f3190f3fe2e
user:      elad <elad%NetBSD.org@localhost>
date:      Tue Jun 14 21:55:21 2005 +0000

description:
Sync reality with comments. This makes strict level 1 work as expected.
Reported by Nino Dehne.

diffstat:

 sys/kern/kern_verifiedexec.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r 218dfc7d9eb1 -r 8f3190f3fe2e sys/kern/kern_verifiedexec.c
--- a/sys/kern/kern_verifiedexec.c      Tue Jun 14 21:20:30 2005 +0000
+++ b/sys/kern/kern_verifiedexec.c      Tue Jun 14 21:55:21 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_verifiedexec.c,v 1.24 2005/06/13 22:46:56 elad Exp $      */
+/*     $NetBSD: kern_verifiedexec.c,v 1.25 2005/06/14 21:55:21 elad Exp $      */
 
 /*-
  * Copyright 2005 Elad Efrat <elad%bsd.org.il@localhost>
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.24 2005/06/13 22:46:56 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.25 2005/06/14 21:55:21 elad Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -469,9 +469,10 @@
                 *   - File is being accessed, and we're in strict
                 *     level 2.
                 */
-               if ((veriexec_strict > 1) ||
-                   ((veriexec_strict == 1) &&
-                   ((flag == VERIEXEC_FILE) || (flag == VERIEXEC_INDIRECT))))
+               if (((veriexec_strict == 1) &&
+                   ((flag == VERIEXEC_DIRECT) ||
+                    (flag == VERIEXEC_INDIRECT))) ||
+                   (veriexec_strict > 1))
                        error = EPERM;
 
                break;