[src/netbsd-3]: src/sys/kern Pull up revision 1.21 (requested by elad in tick...

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

details:   https://anonhg.NetBSD.org/src/rev/6b14332008ba
branches:  netbsd-3
changeset: 576359:6b14332008ba
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jul 02 15:47:07 2005 +0000

description:
Pull up revision 1.21 (requested by elad in ticket #487):
Oops - forgot to remove it in previous commit. Checking the fingerprint
status is enough here.

diffstat:

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

diffs (27 lines):

diff -r bc598ce1d1bb -r 6b14332008ba sys/kern/kern_verifiedexec.c
--- a/sys/kern/kern_verifiedexec.c      Sat Jul 02 15:46:53 2005 +0000
+++ b/sys/kern/kern_verifiedexec.c      Sat Jul 02 15:47:07 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_verifiedexec.c,v 1.9.2.11 2005/07/02 15:46:46 tron Exp $  */
+/*     $NetBSD: kern_verifiedexec.c,v 1.9.2.12 2005/07/02 15:47:07 tron 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.9.2.11 2005/07/02 15:46:46 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.9.2.12 2005/07/02 15:47:07 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -357,7 +357,7 @@
         int error = 0;
 
        /* Evaluate fingerprint if needed and set the status on the vp. */
-       if ((vp->vhe == NULL) || (vp->fp_status == FINGERPRINT_NOTEVAL)) {
+       if (vp->fp_status == FINGERPRINT_NOTEVAL) {
                vp->vhe = veriexec_lookup(va->va_fsid, va->va_fileid);
                if (vp->vhe == NULL) {
                        vp->fp_status = FINGERPRINT_NOENTRY;