Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-3]: src Backout ticket 685. It causes build failures.
details: https://anonhg.NetBSD.org/src/rev/33a9da24a0a7
branches: netbsd-3
changeset: 577026:33a9da24a0a7
user: tron <tron%NetBSD.org@localhost>
date: Tue Aug 23 14:45:20 2005 +0000
description:
Backout ticket 685. It causes build failures.
diffstat:
doc/CHANGES-3.0 | 15 +--------------
sys/conf/files | 10 +---------
sys/kern/exec_script.c | 8 +++-----
sys/kern/init_main.c | 5 ++---
sys/kern/init_sysctl.c | 5 ++---
sys/kern/kern_exec.c | 12 +++++++-----
sys/kern/kern_verifiedexec.c | 6 ++----
sys/kern/vfs_syscalls.c | 5 ++---
sys/kern/vfs_vnops.c | 6 ++----
9 files changed, 22 insertions(+), 50 deletions(-)
diffs (241 lines):
diff -r ec1bc8d62918 -r 33a9da24a0a7 doc/CHANGES-3.0
--- a/doc/CHANGES-3.0 Tue Aug 23 13:50:31 2005 +0000
+++ b/doc/CHANGES-3.0 Tue Aug 23 14:45:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-3.0,v 1.1.2.210 2005/08/23 13:50:31 tron Exp $
+# $NetBSD: CHANGES-3.0,v 1.1.2.211 2005/08/23 14:45:20 tron Exp $
A complete list of changes from the initial NetBSD 3.0 branch on 16 March 2005
until the 3.0 release:
@@ -11790,16 +11790,3 @@
- Fix spl/splx mismatch.
[yamt, ticket #683]
-sys/conf/files 1.725
-sys/kern/exec_script.c 1.42
-sys/kern/init_main.c 1.250 via patch
-sys/kern/init_sysctl.c 1.47
-sys/kern/kern_exec.c 1.205
-sys/kern/exec_script.c 1.43
-sys/kern/kern_verifiedexec.c 1.32
-sys/kern/vfs_syscalls.c 1.226
-sys/kern/vfs_vnops.c 1.93
-
- Defopt verified_exec and VERIFIED_EXEC*
- [elad, ticket #685]
-
diff -r ec1bc8d62918 -r 33a9da24a0a7 sys/conf/files
--- a/sys/conf/files Tue Aug 23 13:50:31 2005 +0000
+++ b/sys/conf/files Tue Aug 23 14:45:20 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.712.2.3 2005/08/23 13:45:30 tron Exp $
+# $NetBSD: files,v 1.712.2.4 2005/08/23 14:45:20 tron Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -69,14 +69,6 @@
DKWEDGE_METHOD_GPT
DKWEDGE_METHOD_MBR
-defflag opt_verified_exec.h VERIFIED_EXEC
- VERIFIED_EXEC_FP_SHA1
- VERIFIED_EXEC_FP_SHA256
- VERIFIED_EXEC_FP_SHA384
- VERIFIED_EXEC_FP_SHA512
- VERIFIED_EXEC_FP_MD5
- VERIFIED_EXEC_FP_RMD160
-
# compatibility options
#
defflag COMPAT_OSSAUDIO
diff -r ec1bc8d62918 -r 33a9da24a0a7 sys/kern/exec_script.c
--- a/sys/kern/exec_script.c Tue Aug 23 13:50:31 2005 +0000
+++ b/sys/kern/exec_script.c Tue Aug 23 14:45:20 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_script.c,v 1.38.10.5 2005/08/23 13:47:41 tron Exp $ */
+/* $NetBSD: exec_script.c,v 1.38.10.6 2005/08/23 14:45:20 tron Exp $ */
/*
* Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,14 +31,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_script.c,v 1.38.10.5 2005/08/23 13:47:41 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_script.c,v 1.38.10.6 2005/08/23 14:45:20 tron Exp $");
#if defined(SETUIDSCRIPTS) && !defined(FDSCRIPTS)
#define FDSCRIPTS /* Need this for safe set-id scripts. */
#endif
-#include "opt_verified_exec.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
@@ -255,7 +253,7 @@
#ifdef VERIFIED_EXEC
if ((error = check_exec(p, epp, VERIEXEC_INDIRECT)) == 0) {
#else
- if ((error = check_exec(p, epp, 0)) == 0) {
+ if ((error = check_exec(p, epp)) == 0) {
#endif
/* note that we've clobbered the header */
epp->ep_flags |= EXEC_DESTR|EXEC_HASES;
diff -r ec1bc8d62918 -r 33a9da24a0a7 sys/kern/init_main.c
--- a/sys/kern/init_main.c Tue Aug 23 13:50:31 2005 +0000
+++ b/sys/kern/init_main.c Tue Aug 23 14:45:20 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.244.6.2 2005/08/23 13:43:53 tron Exp $ */
+/* $NetBSD: init_main.c,v 1.244.6.3 2005/08/23 14:45:20 tron Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1992, 1993
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.244.6.2 2005/08/23 13:43:53 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.244.6.3 2005/08/23 14:45:20 tron Exp $");
#include "fs_nfs.h"
#include "opt_nfsserver.h"
@@ -84,7 +84,6 @@
#include "opt_systrace.h"
#include "opt_posix.h"
#include "opt_kcont.h"
-#include "opt_verified_exec.h"
#include "opencrypto.h"
#include "rnd.h"
diff -r ec1bc8d62918 -r 33a9da24a0a7 sys/kern/init_sysctl.c
--- a/sys/kern/init_sysctl.c Tue Aug 23 13:50:31 2005 +0000
+++ b/sys/kern/init_sysctl.c Tue Aug 23 14:45:20 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl.c,v 1.36.2.4 2005/08/23 13:43:39 tron Exp $ */
+/* $NetBSD: init_sysctl.c,v 1.36.2.5 2005/08/23 14:45:20 tron Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -37,12 +37,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.36.2.4 2005/08/23 13:43:39 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.36.2.5 2005/08/23 14:45:20 tron Exp $");
#include "opt_sysv.h"
#include "opt_multiprocessor.h"
#include "opt_posix.h"
-#include "opt_verified_exec.h"
#include "pty.h"
#include "rnd.h"
diff -r ec1bc8d62918 -r 33a9da24a0a7 sys/kern/kern_exec.c
--- a/sys/kern/kern_exec.c Tue Aug 23 13:50:31 2005 +0000
+++ b/sys/kern/kern_exec.c Tue Aug 23 14:45:20 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.194.4.7 2005/08/23 13:43:48 tron Exp $ */
+/* $NetBSD: kern_exec.c,v 1.194.4.8 2005/08/23 14:45:20 tron Exp $ */
/*-
* Copyright (C) 1993, 1994, 1996 Christopher G. Demetriou
@@ -33,12 +33,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.194.4.7 2005/08/23 13:43:48 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.194.4.8 2005/08/23 14:45:20 tron Exp $");
#include "opt_ktrace.h"
#include "opt_syscall_debug.h"
#include "opt_compat_netbsd.h"
-#include "opt_verified_exec.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -220,8 +219,11 @@
* exec header unmodified.
*/
int
-/*ARGSUSED*/
+#ifdef VERIFIED_EXEC
check_exec(struct proc *p, struct exec_package *epp, int flag)
+#else
+check_exec(struct proc *p, struct exec_package *epp)
+#endif
{
int error, i;
struct vnode *vp;
@@ -435,7 +437,7 @@
#ifdef VERIFIED_EXEC
if ((error = check_exec(p, &pack, VERIEXEC_DIRECT)) != 0)
#else
- if ((error = check_exec(p, &pack, 0)) != 0)
+ if ((error = check_exec(p, &pack)) != 0)
#endif
goto freehdr;
diff -r ec1bc8d62918 -r 33a9da24a0a7 sys/kern/kern_verifiedexec.c
--- a/sys/kern/kern_verifiedexec.c Tue Aug 23 13:50:31 2005 +0000
+++ b/sys/kern/kern_verifiedexec.c Tue Aug 23 14:45:20 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_verifiedexec.c,v 1.9.2.24 2005/08/23 13:43:57 tron Exp $ */
+/* $NetBSD: kern_verifiedexec.c,v 1.9.2.25 2005/08/23 14:45:21 tron Exp $ */
/*-
* Copyright 2005 Elad Efrat <elad%bsd.org.il@localhost>
@@ -30,9 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.9.2.24 2005/08/23 13:43:57 tron Exp $");
-
-#include "opt_verified_exec.h"
+__KERNEL_RCSID(0, "$NetBSD: kern_verifiedexec.c,v 1.9.2.25 2005/08/23 14:45:21 tron Exp $");
#include <sys/param.h>
#include <sys/mount.h>
diff -r ec1bc8d62918 -r 33a9da24a0a7 sys/kern/vfs_syscalls.c
--- a/sys/kern/vfs_syscalls.c Tue Aug 23 13:50:31 2005 +0000
+++ b/sys/kern/vfs_syscalls.c Tue Aug 23 14:45:20 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.217.2.4 2005/08/23 13:44:01 tron Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.217.2.5 2005/08/23 14:45:21 tron Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,12 +37,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.217.2.4 2005/08/23 13:44:01 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.217.2.5 2005/08/23 14:45:21 tron Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_43.h"
#include "opt_ktrace.h"
-#include "opt_verified_exec.h"
#include "fss.h"
#include <sys/param.h>
diff -r ec1bc8d62918 -r 33a9da24a0a7 sys/kern/vfs_vnops.c
--- a/sys/kern/vfs_vnops.c Tue Aug 23 13:50:31 2005 +0000
+++ b/sys/kern/vfs_vnops.c Tue Aug 23 14:45:20 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnops.c,v 1.86.2.6 2005/08/23 13:43:43 tron Exp $ */
+/* $NetBSD: vfs_vnops.c,v 1.86.2.7 2005/08/23 14:45:21 tron Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,9 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.86.2.6 2005/08/23 13:43:43 tron Exp $");
-
-#include "opt_verified_exec.h"
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.86.2.7 2005/08/23 14:45:21 tron Exp $");
#include "fs_union.h"
Home |
Main Index |
Thread Index |
Old Index