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

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

details:   https://anonhg.NetBSD.org/src/rev/4174e02b51d7
branches:  netbsd-3
changeset: 576839:4174e02b51d7
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Aug 04 18:16:13 2005 +0000

description:
Pull up revision 1.207 (requested by elad in ticket #633):
Simplify previous commit.

diffstat:

 sys/kern/kern_exec.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 7fb0112c8276 -r 4174e02b51d7 sys/kern/kern_exec.c
--- a/sys/kern/kern_exec.c      Thu Aug 04 18:14:56 2005 +0000
+++ b/sys/kern/kern_exec.c      Thu Aug 04 18:16:13 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_exec.c,v 1.194.4.5 2005/08/04 18:14:56 tron Exp $ */
+/*     $NetBSD: kern_exec.c,v 1.194.4.6 2005/08/04 18:16:13 tron Exp $ */
 
 /*-
  * Copyright (C) 1993, 1994, 1996 Christopher G. Demetriou
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.194.4.5 2005/08/04 18:14:56 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.194.4.6 2005/08/04 18:16:13 tron Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_syscall_debug.h"
@@ -267,9 +267,7 @@
 
 
 #ifdef VERIFIED_EXEC
-        if ((error = veriexec_verify(p, vp, epp->ep_vap,
-                                    (flag == VERIEXEC_INDIRECT) ?
-                                    epp->ep_ndp->ni_dirp : epp->ep_name,
+        if ((error = veriexec_verify(p, vp, epp->ep_vap, epp->ep_ndp->ni_dirp,
                                     flag, NULL)) != 0)
                 goto bad2;
 #endif