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

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

details:   https://anonhg.NetBSD.org/src/rev/7fb0112c8276
branches:  netbsd-3
changeset: 576838:7fb0112c8276
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Aug 04 18:14:56 2005 +0000

description:
Pull up revision 1.206 (requested by elad in ticket #633):
Use real executed program in logs instead of the script that was executed.
For example, this used to give false logs of matching fingerprint for
foo.sh while foo.sh don't have an entry, and the program executed (and
matching the fingerprint) is the interpreter - /bin/sh.

diffstat:

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

diffs (30 lines):

diff -r a4af85269aea -r 7fb0112c8276 sys/kern/kern_exec.c
--- a/sys/kern/kern_exec.c      Thu Aug 04 17:48:10 2005 +0000
+++ b/sys/kern/kern_exec.c      Thu Aug 04 18:14:56 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_exec.c,v 1.194.4.4 2005/07/02 18:50:06 tron Exp $ */
+/*     $NetBSD: kern_exec.c,v 1.194.4.5 2005/08/04 18:14:56 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.4 2005/07/02 18:50:06 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.194.4.5 2005/08/04 18:14:56 tron Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_syscall_debug.h"
@@ -267,8 +267,9 @@
 
 
 #ifdef VERIFIED_EXEC
-        /* Evaluate signature for file... */
-        if ((error = veriexec_verify(p, vp, epp->ep_vap, epp->ep_name,
+        if ((error = veriexec_verify(p, vp, epp->ep_vap,
+                                    (flag == VERIEXEC_INDIRECT) ?
+                                    epp->ep_ndp->ni_dirp : epp->ep_name,
                                     flag, NULL)) != 0)
                 goto bad2;
 #endif