CVS commit: src
Module Name:src Committed By: jruoho Date: Thu Aug 5 04:58:27 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4/man4.x86: Makefile Added Files: src/share/man/man4/man4.x86: amdpcib.4 Log Message: Add amdpcib(4). Ok nj...@. To generate a diff of this commit: cvs rdiff -u -r1.1229 -r1.1230 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.x86/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.x86/amdpcib.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1229 src/distrib/sets/lists/man/mi:1.1230 --- src/distrib/sets/lists/man/mi:1.1229 Thu Jul 29 18:25:19 2010 +++ src/distrib/sets/lists/man/mi Thu Aug 5 04:58:26 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1229 2010/07/29 18:25:19 jruoho Exp $ +# $NetBSD: mi,v 1.1230 2010/08/05 04:58:26 jruoho Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1731,6 +1731,7 @@ ./usr/share/man/cat4/x68k/neptune.0 man-sys-catman .cat ./usr/share/man/cat4/x68k/pow.0 man-sys-catman .cat ./usr/share/man/cat4/x68k/vs.0 man-sys-catman .cat +./usr/share/man/cat4/x86/amdpcib.0 man-sys-catman .cat ./usr/share/man/cat4/x86/balloon.0 man-sys-catman .cat ./usr/share/man/cat4/xbox.0 man-sys-catman .cat ./usr/share/man/cat4/xge.0 man-sys-catman .cat @@ -4325,6 +4326,7 @@ ./usr/share/man/html4/x68k/neptune.html man-sys-htmlman html ./usr/share/man/html4/x68k/pow.html man-sys-htmlman html ./usr/share/man/html4/x68k/vs.html man-sys-htmlman html +./usr/share/man/html4/x86/amdpcib.html man-sys-htmlman html ./usr/share/man/html4/x86/balloon.html man-sys-htmlman html ./usr/share/man/html4/xbox.html man-sys-htmlman html ./usr/share/man/html4/xge.html man-sys-htmlman html @@ -6857,6 +6859,7 @@ ./usr/share/man/man4/x68k/neptune.4 man-sys-man .man ./usr/share/man/man4/x68k/pow.4 man-sys-man .man ./usr/share/man/man4/x68k/vs.4 man-sys-man .man +./usr/share/man/man4/x86/amdpcib.4 man-sys-man .man ./usr/share/man/man4/x86/balloon.4 man-sys-man .man ./usr/share/man/man4/xbox.4 man-sys-man .man ./usr/share/man/man4/xge.4 man-sys-man .man Index: src/share/man/man4/man4.x86/Makefile diff -u src/share/man/man4/man4.x86/Makefile:1.1 src/share/man/man4/man4.x86/Makefile:1.2 --- src/share/man/man4/man4.x86/Makefile:1.1 Thu Jul 8 20:00:24 2010 +++ src/share/man/man4/man4.x86/Makefile Thu Aug 5 04:58:27 2010 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2010/07/08 20:00:24 christos Exp $ +# $NetBSD: Makefile,v 1.2 2010/08/05 04:58:27 jruoho Exp $ + +MAN= amdpcib.4 balloon.4 -MAN= balloon.4 MANSUBDIR=/x86 .include Added files: Index: src/share/man/man4/man4.x86/amdpcib.4 diff -u /dev/null src/share/man/man4/man4.x86/amdpcib.4:1.1 --- /dev/null Thu Aug 5 04:58:27 2010 +++ src/share/man/man4/man4.x86/amdpcib.4 Thu Aug 5 04:58:27 2010 @@ -0,0 +1,42 @@ +.\" $NetBSD: amdpcib.4,v 1.1 2010/08/05 04:58:27 jruoho Exp $ +.\" +.\" $OpenBSD: amdpcib.4,v 1.4 2007/10/08 12:48:21 jmc Exp $ +.\" +.\" Marc Balmer, 2007. Public Domain. +.\" Jukka Ruohonen, 2010. Public Domain. +.\" +.Dd August 8, 2010 +.Dt AMDPCIB 4 x86 +.Os +.Sh NAME +.Nm amdpcib +.Nd AMD-8111 series LPC bridge and timecounter +.Sh SYNOPSIS +.Cd "amdpcib* at pci?" +.Cd "hpet* at amdpcib?" +.Cd "isa* at amdpcib?" +.Sh DESCRIPTION +The +.Nm +driver provides support for the AMD-8111 +.Tn LPC +bridge and implements a 32/64-bit +14.3 MHz (or variable) timecounter using the HPET timer. +.Sh SEE ALSO +.Xr isa 4 , +.Xr pci 4 +.Rs +.%A Advanced Micro Devices +.%T AMD-8111 HyperTransport I/O Hub +.%N Revision 3.03 +.%D July, 2004 +.%U http://support.amd.com/us/ChipsetMotherboard_TechDocs/24674.pdf +.Re +.Sh HISTORY +The +.Nm +driver first appeared in +.Nx 5.0 . +.Sh AUTHORS +.An Nicolas Joly +.Aq nj...@netbsd.org
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Thu Aug 5 01:48:12 UTC 2010 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Ticket 1399 To generate a diff of this commit: cvs rdiff -u -r1.1.2.74 -r1.1.2.75 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.74 src/doc/CHANGES-4.0.2:1.1.2.75 --- src/doc/CHANGES-4.0.2:1.1.2.74 Wed Aug 4 11:14:13 2010 +++ src/doc/CHANGES-4.0.2 Thu Aug 5 01:48:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.74 2010/08/04 11:14:13 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.75 2010/08/05 01:48:12 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1062,3 +1062,11 @@ Correct incomplete size checks for the coda ioctls. From Dan Rosenberg. [christos, ticket #1400] +crypto/dist/ssh/sftp-glob.c patch +crypto/dist/ssh/sftp.cpatch +lib/libc/gen/glob.31.37 via patch +lib/libc/gen/glob.c1.26 via patch + + Fix globbing in libc and sftp. + [christos, ticket #1399] +
CVS commit: [netbsd-4-0] src
Module Name:src
Committed By: riz
Date: Thu Aug 5 01:46:31 UTC 2010
Modified Files:
src/crypto/dist/ssh [netbsd-4-0]: sftp-glob.c sftp.c
src/lib/libc/gen [netbsd-4-0]: glob.3 glob.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1399):
lib/libc/gen/glob.c: patch
lib/libc/gen/glob.3: revision 1.37 via patch
crypto/dist/ssh/sftp.c: patch
crypto/dist/ssh/sftp-glob.c: patch
Add GLOB_LIMIT to the glob calls to prevent DoS attacks.
Apply more limits to GLOB_LIMIT, number of stat(2) calls from me and number
of readdir(3) calls from Maksymilian Arciemowicz. Also reduce the memory
used by matches strings from Maksymilian Arciemowicz.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.12.1 src/crypto/dist/ssh/sftp-glob.c
cvs rdiff -u -r1.21 -r1.21.6.1 src/crypto/dist/ssh/sftp.c
cvs rdiff -u -r1.30 -r1.30.12.1 src/lib/libc/gen/glob.3
cvs rdiff -u -r1.18 -r1.18.10.1 src/lib/libc/gen/glob.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ssh/sftp-glob.c
diff -u src/crypto/dist/ssh/sftp-glob.c:1.13 src/crypto/dist/ssh/sftp-glob.c:1.13.12.1
--- src/crypto/dist/ssh/sftp-glob.c:1.13 Thu Sep 28 21:22:15 2006
+++ src/crypto/dist/ssh/sftp-glob.c Thu Aug 5 01:46:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sftp-glob.c,v 1.13 2006/09/28 21:22:15 christos Exp $ */
+/* $NetBSD: sftp-glob.c,v 1.13.12.1 2010/08/05 01:46:31 riz Exp $ */
/* $OpenBSD: sftp-glob.c,v 1.22 2006/08/03 03:34:42 deraadt Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller
@@ -17,7 +17,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sftp-glob.c,v 1.13 2006/09/28 21:22:15 christos Exp $");
+__RCSID("$NetBSD: sftp-glob.c,v 1.13.12.1 2010/08/05 01:46:31 riz Exp $");
#include
#include
@@ -121,5 +121,5 @@
memset(&cur, 0, sizeof(cur));
cur.conn = conn;
- return(glob(pattern, flags | GLOB_ALTDIRFUNC, errfunc, pglob));
+ return(glob(pattern, flags|GLOB_LIMIT|GLOB_ALTDIRFUNC, errfunc, pglob));
}
Index: src/crypto/dist/ssh/sftp.c
diff -u src/crypto/dist/ssh/sftp.c:1.21 src/crypto/dist/ssh/sftp.c:1.21.6.1
--- src/crypto/dist/ssh/sftp.c:1.21 Thu Sep 28 21:22:15 2006
+++ src/crypto/dist/ssh/sftp.c Thu Aug 5 01:46:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sftp.c,v 1.21 2006/09/28 21:22:15 christos Exp $ */
+/* $NetBSD: sftp.c,v 1.21.6.1 2010/08/05 01:46:31 riz Exp $ */
/* $OpenBSD: sftp.c,v 1.91 2006/08/03 03:34:42 deraadt Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller
@@ -17,7 +17,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sftp.c,v 1.21 2006/09/28 21:22:15 christos Exp $");
+__RCSID("$NetBSD: sftp.c,v 1.21.6.1 2010/08/05 01:46:31 riz Exp $");
#include
#include
#include
@@ -594,7 +594,7 @@
memset(&g, 0, sizeof(g));
debug3("Looking up %s", src);
- if (glob(src, 0, NULL, &g)) {
+ if (glob(src, GLOB_LIMIT, NULL, &g)) {
error("File \"%s\" not found.", src);
err = -1;
goto out;
Index: src/lib/libc/gen/glob.3
diff -u src/lib/libc/gen/glob.3:1.30 src/lib/libc/gen/glob.3:1.30.12.1
--- src/lib/libc/gen/glob.3:1.30 Sun Mar 26 18:11:22 2006
+++ src/lib/libc/gen/glob.3 Thu Aug 5 01:46:31 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: glob.3,v 1.30 2006/03/26 18:11:22 christos Exp $
+.\" $NetBSD: glob.3,v 1.30.12.1 2010/08/05 01:46:31 riz Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -31,7 +31,7 @@
.\"
.\" @(#)glob.3 8.3 (Berkeley) 4/16/94
.\"
-.Dd March 22, 2006
+.Dd July 6, 2010
.Dt GLOB 3
.Os
.Sh NAME
@@ -253,8 +253,13 @@
.Ql ~
to user name home directories.
.It Dv GLOB_LIMIT
-Limit the amount of memory used by matches to
-.Li ARG_MAX .
+Limit the amount of memory used to store matched strings to
+.Li 64K ,
+the number of
+.Xr stat 2
+calls to 128, and the number of
+.Xr readdir 3
+calls to 16K.
This option should be set for programs that can be coerced to a denial of
service attack via patterns that expand to a very large number of matches,
such as a long string of
Index: src/lib/libc/gen/glob.c
diff -u src/lib/libc/gen/glob.c:1.18 src/lib/libc/gen/glob.c:1.18.10.1
--- src/lib/libc/gen/glob.c:1.18 Fri Dec 1 18:57:29 2006
+++ src/lib/libc/gen/glob.c Thu Aug 5 01:46:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: glob.c,v 1.18 2006/12/01 18:57:29 christos Exp $ */
+/* $NetBSD: glob.c,v 1.18.10.1 2010/08/05 01:46:31 riz Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
#else
-__RCSID("$NetBSD: glob.c,v 1.18 2006/12/01 18:57:29 christos Exp $");
+__RCSID("$NetBSD: glob.c,v 1.18.10.1 2010/08/05 01:46:31 riz Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -82,6 +82,14 @@
#define NO_GETPW_R
#endif
+#define GLOB_LIMIT_MALLOC 65536
+#define GLOB_LIMIT_STAT 128
+#define GLOB_LIMIT_READDIR 16384
+
+#define GLOB_INDEX_MALLOC 0
+#define GLOB_INDEX_STAT
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: riz Date: Thu Aug 5 01:44:13 UTC 2010 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Ticket 1399. To generate a diff of this commit: cvs rdiff -u -r1.1.2.205 -r1.1.2.206 src/doc/CHANGES-4.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.205 src/doc/CHANGES-4.1:1.1.2.206 --- src/doc/CHANGES-4.1:1.1.2.205 Wed Aug 4 11:14:01 2010 +++ src/doc/CHANGES-4.1 Thu Aug 5 01:44:13 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.205 2010/08/04 11:14:01 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.206 2010/08/05 01:44:13 riz Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4208,3 +4208,11 @@ separate execution logic implementations (command.c, job.c) [dholland, ticket #1401] +crypto/dist/ssh/sftp-glob.c patch +crypto/dist/ssh/sftp.cpatch +lib/libc/gen/glob.31.37 via patch +lib/libc/gen/glob.c1.26 via patch + + Fix globbing in libc and sftp. + [christos, ticket #1399] +
CVS commit: [netbsd-4] src
Module Name:src
Committed By: riz
Date: Thu Aug 5 01:43:21 UTC 2010
Modified Files:
src/crypto/dist/ssh [netbsd-4]: sftp-glob.c sftp.c
src/lib/libc/gen [netbsd-4]: glob.3 glob.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1399):
lib/libc/gen/glob.c: patch
lib/libc/gen/glob.3: revision 1.37 via patch
crypto/dist/ssh/sftp.c: patch
crypto/dist/ssh/sftp-glob.c: patch
Add GLOB_LIMIT to the glob calls to prevent DoS attacks.
Apply more limits to GLOB_LIMIT, number of stat(2) calls from me and number
of readdir(3) calls from Maksymilian Arciemowicz. Also reduce the memory
used by matches strings from Maksymilian Arciemowicz.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.2.1 src/crypto/dist/ssh/sftp-glob.c
cvs rdiff -u -r1.21 -r1.21.2.1 src/crypto/dist/ssh/sftp.c
cvs rdiff -u -r1.30 -r1.30.4.1 src/lib/libc/gen/glob.3
cvs rdiff -u -r1.18 -r1.18.2.1 src/lib/libc/gen/glob.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ssh/sftp-glob.c
diff -u src/crypto/dist/ssh/sftp-glob.c:1.13 src/crypto/dist/ssh/sftp-glob.c:1.13.2.1
--- src/crypto/dist/ssh/sftp-glob.c:1.13 Thu Sep 28 21:22:15 2006
+++ src/crypto/dist/ssh/sftp-glob.c Thu Aug 5 01:43:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sftp-glob.c,v 1.13 2006/09/28 21:22:15 christos Exp $ */
+/* $NetBSD: sftp-glob.c,v 1.13.2.1 2010/08/05 01:43:20 riz Exp $ */
/* $OpenBSD: sftp-glob.c,v 1.22 2006/08/03 03:34:42 deraadt Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller
@@ -17,7 +17,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sftp-glob.c,v 1.13 2006/09/28 21:22:15 christos Exp $");
+__RCSID("$NetBSD: sftp-glob.c,v 1.13.2.1 2010/08/05 01:43:20 riz Exp $");
#include
#include
@@ -121,5 +121,5 @@
memset(&cur, 0, sizeof(cur));
cur.conn = conn;
- return(glob(pattern, flags | GLOB_ALTDIRFUNC, errfunc, pglob));
+ return(glob(pattern, flags|GLOB_LIMIT|GLOB_ALTDIRFUNC, errfunc, pglob));
}
Index: src/crypto/dist/ssh/sftp.c
diff -u src/crypto/dist/ssh/sftp.c:1.21 src/crypto/dist/ssh/sftp.c:1.21.2.1
--- src/crypto/dist/ssh/sftp.c:1.21 Thu Sep 28 21:22:15 2006
+++ src/crypto/dist/ssh/sftp.c Thu Aug 5 01:43:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sftp.c,v 1.21 2006/09/28 21:22:15 christos Exp $ */
+/* $NetBSD: sftp.c,v 1.21.2.1 2010/08/05 01:43:20 riz Exp $ */
/* $OpenBSD: sftp.c,v 1.91 2006/08/03 03:34:42 deraadt Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller
@@ -17,7 +17,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sftp.c,v 1.21 2006/09/28 21:22:15 christos Exp $");
+__RCSID("$NetBSD: sftp.c,v 1.21.2.1 2010/08/05 01:43:20 riz Exp $");
#include
#include
#include
@@ -594,7 +594,7 @@
memset(&g, 0, sizeof(g));
debug3("Looking up %s", src);
- if (glob(src, 0, NULL, &g)) {
+ if (glob(src, GLOB_LIMIT, NULL, &g)) {
error("File \"%s\" not found.", src);
err = -1;
goto out;
Index: src/lib/libc/gen/glob.3
diff -u src/lib/libc/gen/glob.3:1.30 src/lib/libc/gen/glob.3:1.30.4.1
--- src/lib/libc/gen/glob.3:1.30 Sun Mar 26 18:11:22 2006
+++ src/lib/libc/gen/glob.3 Thu Aug 5 01:43:20 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: glob.3,v 1.30 2006/03/26 18:11:22 christos Exp $
+.\" $NetBSD: glob.3,v 1.30.4.1 2010/08/05 01:43:20 riz Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -31,7 +31,7 @@
.\"
.\" @(#)glob.3 8.3 (Berkeley) 4/16/94
.\"
-.Dd March 22, 2006
+.Dd July 6, 2010
.Dt GLOB 3
.Os
.Sh NAME
@@ -253,8 +253,13 @@
.Ql ~
to user name home directories.
.It Dv GLOB_LIMIT
-Limit the amount of memory used by matches to
-.Li ARG_MAX .
+Limit the amount of memory used to store matched strings to
+.Li 64K ,
+the number of
+.Xr stat 2
+calls to 128, and the number of
+.Xr readdir 3
+calls to 16K.
This option should be set for programs that can be coerced to a denial of
service attack via patterns that expand to a very large number of matches,
such as a long string of
Index: src/lib/libc/gen/glob.c
diff -u src/lib/libc/gen/glob.c:1.18 src/lib/libc/gen/glob.c:1.18.2.1
--- src/lib/libc/gen/glob.c:1.18 Fri Dec 1 18:57:29 2006
+++ src/lib/libc/gen/glob.c Thu Aug 5 01:43:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: glob.c,v 1.18 2006/12/01 18:57:29 christos Exp $ */
+/* $NetBSD: glob.c,v 1.18.2.1 2010/08/05 01:43:20 riz Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
#else
-__RCSID("$NetBSD: glob.c,v 1.18 2006/12/01 18:57:29 christos Exp $");
+__RCSID("$NetBSD: glob.c,v 1.18.2.1 2010/08/05 01:43:20 riz Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -82,6 +82,14 @@
#define NO_GETPW_R
#endif
+#define GLOB_LIMIT_MALLOC 65536
+#define GLOB_LIMIT_STAT 128
+#define GLOB_LIMIT_READDIR 16384
+
+#define GLOB_INDEX_MALLOC 0
+#define GLOB_INDEX_STAT 1
+#define GLOB
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: joerg Date: Wed Aug 4 20:50:30 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Mark correct entries as obsolete. To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.131 src/distrib/sets/lists/tests/mi:1.132 --- src/distrib/sets/lists/tests/mi:1.131 Wed Aug 4 14:59:39 2010 +++ src/distrib/sets/lists/tests/mi Wed Aug 4 20:50:30 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.131 2010/08/04 14:59:39 joerg Exp $ +# $NetBSD: mi,v 1.132 2010/08/04 20:50:30 joerg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1398,10 +1398,10 @@ ./usr/tests/lib/csu/h_initfini1 tests-lib-tests atf ./usr/tests/lib/csu/h_initfini2 tests-lib-tests atf ./usr/tests/lib/csu/h_initfini3 tests-lib-tests atf -./usr/tests/lib/csu/h_initfini3_dso.so tests-obsolete obsolete -./usr/tests/lib/csu/h_initfini3_dso.so.1 tests-obsolete obsolete -./usr/tests/lib/csu/libh_initfini3_dso.so tests-lib-tests atf -./usr/tests/lib/csu/libh_initfini3_dso.so.1 tests-lib-tests atf +./usr/tests/lib/csu/h_initfini3_dso.so tests-lib-tests atf +./usr/tests/lib/csu/h_initfini3_dso.so.1 tests-lib-tests atf +./usr/tests/lib/csu/libh_initfini3_dso.so tests-obsolete obsolete +./usr/tests/lib/csu/libh_initfini3_dso.so.1 tests-obsolete obsolete ./usr/tests/lib/csu/t_crt0 tests-lib-tests atf ./usr/tests/lib/libctests-lib-tests ./usr/tests/lib/libc/Atffile tests-lib-tests atf
CVS commit: src/external/bsd/wpa/bin/wpa_cli
Module Name:src
Committed By: christos
Date: Wed Aug 4 20:29:54 UTC 2010
Modified Files:
src/external/bsd/wpa/bin/wpa_cli: Makefile
Log Message:
put back libedit support.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/bin/wpa_cli/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/bin/wpa_cli/Makefile
diff -u src/external/bsd/wpa/bin/wpa_cli/Makefile:1.2 src/external/bsd/wpa/bin/wpa_cli/Makefile:1.3
--- src/external/bsd/wpa/bin/wpa_cli/Makefile:1.2 Wed Aug 4 15:23:15 2010
+++ src/external/bsd/wpa/bin/wpa_cli/Makefile Wed Aug 4 16:29:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/08/04 19:23:15 tron Exp $
+# $NetBSD: Makefile,v 1.3 2010/08/04 20:29:54 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= wpa_cli
SRCS= wpa_cli.c wpa_ctrl.c os_unix.c
-#CPPFLAGS+=-DCONFIG_READLINE
+CPPFLAGS+=-DCONFIG_READLINE
LDADD+=-ledit -lterminfo
DPADD+=${LIBEDIT} ${LIBTERMINFO}
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Wed Aug 4 20:29:18 UTC 2010
Modified Files:
src/lib/libedit: readline.c
src/lib/libedit/readline: readline.h
Log Message:
provide rl_on_newline
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/lib/libedit/readline.c
cvs rdiff -u -r1.30 -r1.31 src/lib/libedit/readline/readline.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.89 src/lib/libedit/readline.c:1.90
--- src/lib/libedit/readline.c:1.89 Wed Apr 14 20:57:33 2010
+++ src/lib/libedit/readline.c Wed Aug 4 16:29:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.c,v 1.89 2010/04/15 00:57:33 christos Exp $ */
+/* $NetBSD: readline.c,v 1.90 2010/08/04 20:29:18 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.89 2010/04/15 00:57:33 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.90 2010/08/04 20:29:18 christos Exp $");
#endif /* not lint && not SCCSID */
#include
@@ -2234,3 +2234,9 @@
rl_cleanup_after_signal(void)
{
}
+
+int
+rl_on_new_line(void)
+{
+ return 0;
+}
Index: src/lib/libedit/readline/readline.h
diff -u src/lib/libedit/readline/readline.h:1.30 src/lib/libedit/readline/readline.h:1.31
--- src/lib/libedit/readline/readline.h:1.30 Mon Sep 7 17:24:34 2009
+++ src/lib/libedit/readline/readline.h Wed Aug 4 16:29:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: readline.h,v 1.30 2009/09/07 21:24:34 christos Exp $ */
+/* $NetBSD: readline.h,v 1.31 2010/08/04 20:29:18 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -202,6 +202,7 @@
char **rl_completion_matches(const char *, rl_compentry_func_t *);
void rl_forced_update_display(void);
int rl_set_prompt(const char *);
+int rl_on_new_line(void);
/*
* The following are not implemented
CVS commit: src/external/bsd/wpa/bin/wpa_cli
Module Name:src
Committed By: tron
Date: Wed Aug 4 19:23:15 UTC 2010
Modified Files:
src/external/bsd/wpa/bin/wpa_cli: Makefile
Log Message:
Don't enable readline support for "wpa_cli" as "libedit" doesn't provide
the necessary rl_on_new_line function.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/wpa_cli/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/bin/wpa_cli/Makefile
diff -u src/external/bsd/wpa/bin/wpa_cli/Makefile:1.1 src/external/bsd/wpa/bin/wpa_cli/Makefile:1.2
--- src/external/bsd/wpa/bin/wpa_cli/Makefile:1.1 Wed Aug 4 17:12:34 2010
+++ src/external/bsd/wpa/bin/wpa_cli/Makefile Wed Aug 4 19:23:15 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/08/04 17:12:34 christos Exp $
+# $NetBSD: Makefile,v 1.2 2010/08/04 19:23:15 tron Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= wpa_cli
SRCS= wpa_cli.c wpa_ctrl.c os_unix.c
-CPPFLAGS+=-DCONFIG_READLINE
+#CPPFLAGS+=-DCONFIG_READLINE
LDADD+=-ledit -lterminfo
DPADD+=${LIBEDIT} ${LIBTERMINFO}
CVS commit: src/external/bsd/wpa/bin/wpa_supplicant
Module Name:src Committed By: wiz Date: Wed Aug 4 19:11:15 UTC 2010 Modified Files: src/external/bsd/wpa/bin/wpa_supplicant: wpa_supplicant.conf.5 Log Message: Comment out recommendation what to use with wlan(4) for ap_scan. XXX: recommend something for NetBSD! To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5 diff -u src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5:1.1 src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5:1.2 --- src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5:1.1 Wed Aug 4 17:12:34 2010 +++ src/external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5 Wed Aug 4 19:11:14 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: wpa_supplicant.conf.5,v 1.1 2010/08/04 17:12:34 christos Exp $ +.\" $NetBSD: wpa_supplicant.conf.5,v 1.2 2010/08/04 19:11:14 wiz Exp $ .\" .\" Copyright (c) 2005 Sam Leffler .\" All rights reserved. @@ -99,9 +99,10 @@ access point, this value may be set to 2. .It Va ap_scan Access point scanning and selection control; one of 0, 1 (default), or 2. -Only setting 1 should be used with the -.Xr wlan 4 -module; the other settings are for use on other operating systems. +.\" XXX: which one is good for NetBSD? +.\"Only setting 1 should be used with the +.\".Xr wlan 4 +.\"module; the other settings are for use on other operating systems. .It Va fast_reauth EAP fast re-authentication; either 1 (default) or 0. Control fast re-authentication support in EAP methods that support it.
CVS commit: src/external/bsd/wpa/bin/wpa_passphrase
Module Name:src Committed By: wiz Date: Wed Aug 4 19:10:50 UTC 2010 Modified Files: src/external/bsd/wpa/bin/wpa_passphrase: wpa_passphrase.8 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/wpa/bin/wpa_passphrase/wpa_passphrase.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/wpa/bin/wpa_passphrase/wpa_passphrase.8 diff -u src/external/bsd/wpa/bin/wpa_passphrase/wpa_passphrase.8:1.1 src/external/bsd/wpa/bin/wpa_passphrase/wpa_passphrase.8:1.2 --- src/external/bsd/wpa/bin/wpa_passphrase/wpa_passphrase.8:1.1 Wed Aug 4 17:12:34 2010 +++ src/external/bsd/wpa/bin/wpa_passphrase/wpa_passphrase.8 Wed Aug 4 19:10:50 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: wpa_passphrase.8,v 1.1 2010/08/04 17:12:34 christos Exp $ +.\" $NetBSD: wpa_passphrase.8,v 1.2 2010/08/04 19:10:50 wiz Exp $ .\" .Dd September 10, 2008 .Dt WPA_PASSPHRASE 8 @@ -24,7 +24,8 @@ .It Ar ssid The SSID whose passphrase should be derived. .It Ar passphrase -The passphrase to use. If not included on the command line, +The passphrase to use. +If not included on the command line, passphrase will be read from standard input. The passphrase must be 8 to 63 characters in length. .El
CVS commit: src/lib/libm/man
Module Name:src
Committed By: wiz
Date: Wed Aug 4 18:58:29 UTC 2010
Modified Files:
src/lib/libm/man: fenv.3
Log Message:
Remove trailing comma in enumeration, make HTML-ready.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/man/fenv.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/man/fenv.3
diff -u src/lib/libm/man/fenv.3:1.1 src/lib/libm/man/fenv.3:1.2
--- src/lib/libm/man/fenv.3:1.1 Sat Jul 31 21:47:53 2010
+++ src/lib/libm/man/fenv.3 Wed Aug 4 18:58:28 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: fenv.3,v 1.1 2010/07/31 21:47:53 joerg Exp $
+.\" $NetBSD: fenv.3,v 1.2 2010/08/04 18:58:28 wiz Exp $
.\" Copyright (c) 2004 David Schultz
.\" All rights reserved.
.\"
@@ -208,18 +208,18 @@
double x = 1.0;
fenv_t env;
- if (isnan(n) || n < 0.0) {
+ if (isnan(n) || n \*[Lt] 0.0) {
feraiseexcept(FE_INVALID);
return (NAN);
}
if (isinf(n) || n == 0.0)
return (n);
- feholdexcept(&env);
- while (fabs((x * x) - n) > DBL_EPSILON * 2 * x)
+ feholdexcept(\*[Am]env);
+ while (fabs((x * x) - n) \*[Gt] DBL_EPSILON * 2 * x)
x = (x / 2) + (n / (2 * x));
if (x * x == n)
feclearexcept(FE_INEXACT);
- feupdateenv(&env);
+ feupdateenv(\*[Am]env);
return (x);
}
.Ed
@@ -238,7 +238,7 @@
.Xr fesetexceptflag 3 ,
.Xr fesetround 3 ,
.Xr fetestexcept 3 ,
-.Xr feupdateenv 3 ,
+.Xr feupdateenv 3
.\"Xr fpgetprec 3 ,
.\"Xr fpsetprec 3
.Sh STANDARDS
CVS commit: src/lib/libm/man
Module Name:src Committed By: wiz Date: Wed Aug 4 18:58:18 UTC 2010 Modified Files: src/lib/libm/man: fegetenv.3 Log Message: Remove trailing comma in enumeration. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libm/man/fegetenv.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/man/fegetenv.3 diff -u src/lib/libm/man/fegetenv.3:1.1 src/lib/libm/man/fegetenv.3:1.2 --- src/lib/libm/man/fegetenv.3:1.1 Sat Jul 31 21:47:53 2010 +++ src/lib/libm/man/fegetenv.3 Wed Aug 4 18:58:18 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: fegetenv.3,v 1.1 2010/07/31 21:47:53 joerg Exp $ +.\" $NetBSD: fegetenv.3,v 1.2 2010/08/04 18:58:18 wiz Exp $ .\" Copyright (c) 2004 David Schultz .\" All rights reserved. .\" @@ -96,7 +96,7 @@ .Xr fetestexcept 3 , .Xr fpgetmask 3 , .\"Xr fpgetprec 3 , -.Xr fpsetmask 3 , +.Xr fpsetmask 3 .\"Xr fpsetprec 3 .Sh STANDARDS The
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Wed Aug 4 18:52:49 UTC 2010 Modified Files: src/share/man/man9: module.9 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/module.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/module.9 diff -u src/share/man/man9/module.9:1.6 src/share/man/man9/module.9:1.7 --- src/share/man/man9/module.9:1.6 Wed Aug 4 05:51:20 2010 +++ src/share/man/man9/module.9 Wed Aug 4 18:52:49 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: module.9,v 1.6 2010/08/04 05:51:20 jruoho Exp $ +.\" $NetBSD: module.9,v 1.7 2010/08/04 18:52:49 wiz Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -308,7 +308,7 @@ The core of the kernel module implementation is in .Pa sys/kern/kern_module.c and -.Pa sys/kern/kerm_module_vfs.c . +.Pa sys/kern/kern_module_vfs.c . .Pp The header file .In sys/sys/module.h
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Aug 4 17:15:24 UTC 2010 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention new wpa code. To generate a diff of this commit: cvs rdiff -u -r1.771 -r1.772 src/doc/3RDPARTY cvs rdiff -u -r1.1425 -r1.1426 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.771 src/doc/3RDPARTY:1.772 --- src/doc/3RDPARTY:1.771 Tue Jul 13 07:56:43 2010 +++ src/doc/3RDPARTY Wed Aug 4 13:15:24 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.771 2010/07/13 11:56:43 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.772 2010/08/04 17:15:24 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1063,8 +1063,8 @@ for import. Package: wpa_supplicant/hostapd -Version: 0.6.4 -Current Vers: 0.6.9 +Version: 0.7.2 +Current Vers: 0.7.2 Maintainer: Jouni Malinen Archive Site: http://hostap.epitest.fi/releases/ Home Page: http://hostap.epitest.fi/wpa_supplicant/ @@ -1072,7 +1072,7 @@ Responsible: scw, dyoung, christos License: BSD or GPLv2 Notes: -See /usr/src/dist/wpa/NetBSD-upgrade for update instructions. +See /usr/src/external/bsd/wpa/NetBSD-upgrade for update instructions. Package: XFree86 Version: 4.5.0 Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1425 src/doc/CHANGES:1.1426 --- src/doc/CHANGES:1.1425 Sun Aug 1 12:45:12 2010 +++ src/doc/CHANGES Wed Aug 4 13:15:24 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1425 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1426 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -700,3 +700,4 @@ bebox: Support xserver. It tested only s3(TRIO 64V+). [kiyohara 20100801] tests: Convert the sort tests to ATF. [jmmv 20100801] + wpa: New wpa_supplicant and hostapd 0.7.2 [christos 20100804]
CVS commit: src/usr.sbin
Module Name:src
Committed By: christos
Date: Wed Aug 4 17:13:33 UTC 2010
Modified Files:
src/usr.sbin: Makefile
Log Message:
unhook old wpa code.
To generate a diff of this commit:
cvs rdiff -u -r1.244 -r1.245 src/usr.sbin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/Makefile
diff -u src/usr.sbin/Makefile:1.244 src/usr.sbin/Makefile:1.245
--- src/usr.sbin/Makefile:1.244 Fri May 7 13:35:32 2010
+++ src/usr.sbin/Makefile Wed Aug 4 13:13:33 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.244 2010/05/07 17:35:32 christos Exp $
+# $NetBSD: Makefile,v 1.245 2010/08/04 17:13:33 christos Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include
@@ -23,7 +23,7 @@
spray srtconfig sti sunlabel sup syslogd tadpolectl tcpdchk \
tcpdmatch tcpdump tcpdrop timed tpctl traceroute trpt unlink \
usbdevs user videomode vipw veriexecgen vnconfig wake wiconfig \
- wlanctl wpa \
+ wlanctl \
wsconscfg wsfontload wsmoused wsmuxctl zdump zic
.if (${MKKERBEROS} != "no")
CVS commit: src/sys/arch/x86/acpi
Module Name:src
Committed By: jruoho
Date: Wed Aug 4 16:16:55 UTC 2010
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
Log Message:
Run a xcall(9) to ensure that all CPUs are out from the ACPI idle-loop
before detachment.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/acpi/acpi_cpu_md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.3 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.4
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.3 Fri Jul 23 13:54:21 2010
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Wed Aug 4 16:16:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.3 2010/07/23 13:54:21 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.4 2010/08/04 16:16:55 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen
@@ -27,11 +27,12 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.3 2010/07/23 13:54:21 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.4 2010/08/04 16:16:55 jruoho Exp $");
#include
#include
#include
+#include
#include
#include
@@ -143,14 +144,13 @@
x86_cpu_idle_set(acpicpu_cstate_idle, "acpi");
x86_enable_intr();
- DELAY(1);
-
return 0;
}
int
acpicpu_md_idle_stop(void)
{
+ uint64_t xc;
KASSERT(native_idle != NULL);
KASSERT(native_idle_text[0] != '\0');
@@ -159,7 +159,12 @@
x86_cpu_idle_set(native_idle, native_idle_text);
x86_enable_intr();
- DELAY(1);
+ /*
+ * Run a cross-call to ensure that all CPUs are
+ * out from the ACPI idle-loop before detachment.
+ */
+ xc = xc_broadcast(0, (xcfunc_t)nullop, NULL, NULL);
+ xc_wait(xc);
return 0;
}
CVS commit: src
Module Name:src
Committed By: joerg
Date: Wed Aug 4 14:59:39 UTC 2010
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/lib/csu: h_initfini3.cxx
Log Message:
Rename h_initfini3 dso now that it is a simple module.
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/csu/h_initfini3.cxx
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.130 src/distrib/sets/lists/tests/mi:1.131
--- src/distrib/sets/lists/tests/mi:1.130 Wed Aug 4 13:41:03 2010
+++ src/distrib/sets/lists/tests/mi Wed Aug 4 14:59:39 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.130 2010/08/04 13:41:03 pooka Exp $
+# $NetBSD: mi,v 1.131 2010/08/04 14:59:39 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -275,7 +275,8 @@
./usr/libdata/debug/usr/tests/lib/csu/h_initfini1.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/csu/h_initfini2.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/csu/h_initfini3.debug tests-lib-debug debug,atf
-./usr/libdata/debug/usr/tests/lib/csu/libh_initfini3_dso.so.1.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/csu/h_initfini3_dso.so.1.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/csu/libh_initfini3_dso.so.1.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/lib/libc tests-lib-debug
./usr/libdata/debug/usr/tests/lib/libc/hashtests-lib-debug
./usr/libdata/debug/usr/tests/lib/libc/hash/t_sha2.debug tests-lib-debug debug,atf
@@ -1397,6 +1398,8 @@
./usr/tests/lib/csu/h_initfini1 tests-lib-tests atf
./usr/tests/lib/csu/h_initfini2 tests-lib-tests atf
./usr/tests/lib/csu/h_initfini3 tests-lib-tests atf
+./usr/tests/lib/csu/h_initfini3_dso.so tests-obsolete obsolete
+./usr/tests/lib/csu/h_initfini3_dso.so.1 tests-obsolete obsolete
./usr/tests/lib/csu/libh_initfini3_dso.so tests-lib-tests atf
./usr/tests/lib/csu/libh_initfini3_dso.so.1 tests-lib-tests atf
./usr/tests/lib/csu/t_crt0 tests-lib-tests atf
Index: src/tests/lib/csu/h_initfini3.cxx
diff -u src/tests/lib/csu/h_initfini3.cxx:1.1 src/tests/lib/csu/h_initfini3.cxx:1.2
--- src/tests/lib/csu/h_initfini3.cxx:1.1 Wed Jul 28 13:51:38 2010
+++ src/tests/lib/csu/h_initfini3.cxx Wed Aug 4 14:59:39 2010
@@ -12,7 +12,7 @@
void *handle;
write(STDOUT_FILENO, msg1, sizeof(msg1) - 1);
- handle = dlopen("libh_initfini3_dso.so", RTLD_NOW | RTLD_LOCAL);
+ handle = dlopen("h_initfini3_dso.so", RTLD_NOW | RTLD_LOCAL);
if (handle == NULL)
err(1, "dlopen");
write(STDOUT_FILENO, msg2, sizeof(msg2) - 1);
CVS commit: src/tests/dev/audio
Module Name:src Committed By: pooka Date: Wed Aug 4 14:43:15 UTC 2010 Modified Files: src/tests/dev/audio: Makefile Log Message: need to update install filename too To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/dev/audio/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/dev/audio/Makefile diff -u src/tests/dev/audio/Makefile:1.1 src/tests/dev/audio/Makefile:1.2 --- src/tests/dev/audio/Makefile:1.1 Wed Aug 4 13:15:15 2010 +++ src/tests/dev/audio/Makefile Wed Aug 4 14:43:14 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2010/08/04 13:15:15 pooka Exp $ +# $NetBSD: Makefile,v 1.2 2010/08/04 14:43:14 pooka Exp $ # .include @@ -15,7 +15,7 @@ LDADD+= -lrump LDADD+= -lrumpuser -lpthread -FILES= t_pad_output.bz2 +FILES= t_pad_output.bz2.uue WARNS= 4 NOMAN=
CVS commit: src/tests/kernel
Module Name:src
Committed By: pooka
Date: Wed Aug 4 14:28:28 UTC 2010
Modified Files:
src/tests/kernel: t_filedesc.c
Log Message:
retain pr number in comment
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/kernel/t_filedesc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/t_filedesc.c
diff -u src/tests/kernel/t_filedesc.c:1.2 src/tests/kernel/t_filedesc.c:1.3
--- src/tests/kernel/t_filedesc.c:1.2 Wed Aug 4 14:26:18 2010
+++ src/tests/kernel/t_filedesc.c Wed Aug 4 14:28:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_filedesc.c,v 1.2 2010/08/04 14:26:18 pooka Exp $ */
+/* $NetBSD: t_filedesc.c,v 1.3 2010/08/04 14:28:28 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_filedesc.c,v 1.2 2010/08/04 14:26:18 pooka Exp $");
+__RCSID("$NetBSD: t_filedesc.c,v 1.3 2010/08/04 14:28:28 pooka Exp $");
#include
@@ -47,6 +47,7 @@
atf_tc_set_md_var(tc, "descr", "race between multithreaded proc. "
"fd_getfile() and fd_close()");
+ /* PR kern/43694 */
}
static int fd;
CVS commit: src/tests/kernel
Module Name:src
Committed By: pooka
Date: Wed Aug 4 14:26:18 UTC 2010
Modified Files:
src/tests/kernel: t_filedesc.c
Log Message:
fixed in kern_descrip.c:1.204
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/t_filedesc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/t_filedesc.c
diff -u src/tests/kernel/t_filedesc.c:1.1 src/tests/kernel/t_filedesc.c:1.2
--- src/tests/kernel/t_filedesc.c:1.1 Mon Aug 2 10:29:48 2010
+++ src/tests/kernel/t_filedesc.c Wed Aug 4 14:26:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_filedesc.c,v 1.1 2010/08/02 10:29:48 pooka Exp $ */
+/* $NetBSD: t_filedesc.c,v 1.2 2010/08/04 14:26:18 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_filedesc.c,v 1.1 2010/08/02 10:29:48 pooka Exp $");
+__RCSID("$NetBSD: t_filedesc.c,v 1.2 2010/08/04 14:26:18 pooka Exp $");
#include
@@ -89,7 +89,6 @@
iters = DEFAULT_ITERATIONS;
pthread_create(&pt, NULL, wrkwrk, NULL);
- atf_tc_expect_signal(-1, "PR kern/43694");
for (i = 0; i < iters; i++) {
rump_sys_close(fd_wrk);
fd_wrk = rump_sys_open("/dev/null", O_RDWR, 0);
@@ -98,9 +97,6 @@
quit = true;
pthread_join(pt, NULL);
-
- /* XXX: ridiculous */
- abort();
}
ATF_TP_ADD_TCS(tp)
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Wed Aug 4 14:25:16 UTC 2010
Modified Files:
src/sys/kern: kern_descrip.c
Log Message:
Remove overzealous KASSERT: the refcount can be non-zero if another
thread attempts to use a non-open file descriptor. from ad
fixes PR kern/43694
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/sys/kern/kern_descrip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_descrip.c
diff -u src/sys/kern/kern_descrip.c:1.203 src/sys/kern/kern_descrip.c:1.204
--- src/sys/kern/kern_descrip.c:1.203 Thu Jul 1 02:38:30 2010
+++ src/sys/kern/kern_descrip.c Wed Aug 4 14:25:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_descrip.c,v 1.203 2010/07/01 02:38:30 rmind Exp $ */
+/* $NetBSD: kern_descrip.c,v 1.204 2010/08/04 14:25:16 pooka Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.203 2010/07/01 02:38:30 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.204 2010/08/04 14:25:16 pooka Exp $");
#include
#include
@@ -853,7 +853,6 @@
KASSERT(i >= NDFDFILE);
dt->dt_ff[i] = pool_cache_get(fdfile_cache, PR_WAITOK);
}
- KASSERT(dt->dt_ff[i]->ff_refcnt == 0);
KASSERT(dt->dt_ff[i]->ff_file == NULL);
fd_used(fdp, i);
if (want <= fdp->fd_freefile) {
CVS commit: src/tests/lib/csu/dso
Module Name:src
Committed By: joerg
Date: Wed Aug 4 13:56:10 UTC 2010
Modified Files:
src/tests/lib/csu/dso: Makefile
Log Message:
Simplify.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/csu/dso/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/csu/dso/Makefile
diff -u src/tests/lib/csu/dso/Makefile:1.2 src/tests/lib/csu/dso/Makefile:1.3
--- src/tests/lib/csu/dso/Makefile:1.2 Wed Aug 4 13:52:23 2010
+++ src/tests/lib/csu/dso/Makefile Wed Aug 4 13:56:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/08/04 13:52:23 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/08/04 13:56:10 joerg Exp $
NOMAN= # defined
@@ -11,10 +11,7 @@
SHLIBDIR= ${TESTSBASE}/lib/csu
SHLIB_MAJOR= 1
-MKSTATICLIB= no
-MKPROFILE= no
-MKPICINSTALL= no
-
+LIBISMODULE= yes
LIBISCXX= yes
.include
CVS commit: src/tests/lib/csu/dso
Module Name:src
Committed By: joerg
Date: Wed Aug 4 13:52:23 UTC 2010
Modified Files:
src/tests/lib/csu/dso: Makefile
Log Message:
TESTSBASE is provided by bsd.own.mk now.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/csu/dso/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/csu/dso/Makefile
diff -u src/tests/lib/csu/dso/Makefile:1.1 src/tests/lib/csu/dso/Makefile:1.2
--- src/tests/lib/csu/dso/Makefile:1.1 Wed Jul 28 13:51:40 2010
+++ src/tests/lib/csu/dso/Makefile Wed Aug 4 13:52:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/07/28 13:51:40 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2010/08/04 13:52:23 joerg Exp $
NOMAN= # defined
@@ -7,7 +7,6 @@
LIB= h_initfini3_dso
SRCS= h_initfini3_dso.cxx
-TESTSBASE= /usr/tests
LIBDIR= ${TESTSBASE}/lib/csu
SHLIBDIR= ${TESTSBASE}/lib/csu
SHLIB_MAJOR= 1
CVS commit: src/tests/dev/audio
Module Name:src
Committed By: pooka
Date: Wed Aug 4 13:49:48 UTC 2010
Modified Files:
src/tests/dev/audio: t_pad.sh
Log Message:
Update test program to deal with uuencoded golden data.
XXX: is it not possible to use a pipeline in atf_check?
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/dev/audio/t_pad.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/dev/audio/t_pad.sh
diff -u src/tests/dev/audio/t_pad.sh:1.1 src/tests/dev/audio/t_pad.sh:1.2
--- src/tests/dev/audio/t_pad.sh:1.1 Wed Aug 4 13:15:15 2010
+++ src/tests/dev/audio/t_pad.sh Wed Aug 4 13:49:48 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_pad.sh,v 1.1 2010/08/04 13:15:15 pooka Exp $
+# $NetBSD: t_pad.sh,v 1.2 2010/08/04 13:49:48 pooka Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -36,9 +36,9 @@
pad_output_body()
{
- atf_check -s exit:0 -o save:expout \
- bunzip2 -c $(atf_get_srcdir)/t_pad_output.bz2
- atf_check -s exit:0 -o file:expout $(atf_get_srcdir)/h_pad
+ atf_check -s exit:0 uudecode $(atf_get_srcdir)/t_pad_output.bz2.uue
+ atf_check -s exit:0 bunzip2 t_pad_output.bz2
+ atf_check -s exit:0 -o file:t_pad_output $(atf_get_srcdir)/h_pad
}
atf_init_test_cases()
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pooka Date: Wed Aug 4 13:22:39 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: setlist lottery for dev/audio/pad test To generate a diff of this commit: cvs rdiff -u -r1.128 -r1.129 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.128 src/distrib/sets/lists/tests/mi:1.129 --- src/distrib/sets/lists/tests/mi:1.128 Mon Aug 2 10:29:58 2010 +++ src/distrib/sets/lists/tests/mi Wed Aug 4 13:22:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.128 2010/08/02 10:29:58 pooka Exp $ +# $NetBSD: mi,v 1.129 2010/08/04 13:22:39 pooka Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -185,6 +185,9 @@ ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_threadstest.debug tests-crypto-debug debug,crypto ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_x509v3test.debug tests-crypto-debug debug,crypto ./usr/libdata/debug/usr/tests/fs tests-fs-debug +./usr/libdata/debug/usr/tests/dev tests-fs-debug +./usr/libdata/debug/usr/tests/dev/audio tests-fs-debug +./usr/libdata/debug/usr/tests/dev/audio/h_pad.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs tests-fs-debug ./usr/libdata/debug/usr/tests/fs/ffs/t_fifos.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/ffs/t_mount.debug tests-fs-debug debug,atf @@ -925,6 +928,13 @@ ./usr/tests/crypto/libcrypto/t_hashes tests-crypto-tests crypto ./usr/tests/crypto/libcrypto/t_libcrypto tests-crypto-tests crypto ./usr/tests/crypto/libcrypto/t_pubkey tests-crypto-tests crypto +./usr/tests/dev tests-fs-tests +./usr/tests/dev/Atffile tests-fs-tests +./usr/tests/dev/audiotests-fs-tests +./usr/tests/dev/audio/Atffile tests-fs-tests atf +./usr/tests/dev/audio/h_pad tests-fs-tests atf +./usr/tests/dev/audio/t_pad tests-fs-tests atf +./usr/tests/dev/audio/t_pad_output.bz2 tests-fs-tests atf ./usr/tests/fs tests-fs-tests ./usr/tests/fs/Atffiletests-fs-tests atf ./usr/tests/fs/h_funcs.subr tests-fs-tests atf
CVS commit: src/etc/mtree
Module Name:src Committed By: pooka Date: Wed Aug 4 13:18:50 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: dev + dev/audio test dirs To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.43 src/etc/mtree/NetBSD.dist.base:1.44 --- src/etc/mtree/NetBSD.dist.base:1.43 Sun Aug 1 16:43:38 2010 +++ src/etc/mtree/NetBSD.dist.base Wed Aug 4 13:18:50 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.43 2010/08/01 16:43:38 jmmv Exp $ +# $NetBSD: NetBSD.dist.base,v 1.44 2010/08/04 13:18:50 pooka Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -200,6 +200,8 @@ ./usr/libdata/debug/usr/tests/atf/test-programs ./usr/libdata/debug/usr/tests/crypto ./usr/libdata/debug/usr/tests/crypto/libcrypto +./usr/libdata/debug/usr/tests/dev +./usr/libdata/debug/usr/tests/dev/audio ./usr/libdata/debug/usr/tests/fs ./usr/libdata/debug/usr/tests/fs/ffs ./usr/libdata/debug/usr/tests/fs/kernfs @@ -1123,6 +1125,8 @@ ./usr/tests/atf/test-programs ./usr/tests/crypto ./usr/tests/crypto/libcrypto +./usr/tests/dev +./usr/tests/dev/audio ./usr/tests/fs ./usr/tests/fs/ffs ./usr/tests/fs/kernfs
CVS commit: src/tests
Module Name:src
Committed By: pooka
Date: Wed Aug 4 13:15:15 UTC 2010
Modified Files:
src/tests: Makefile
Added Files:
src/tests/dev: Makefile
src/tests/dev/audio: Atffile Makefile h_pad.c h_pad_musa.c t_pad.sh
t_pad_output.bz2
Log Message:
Add test of pad(4): stuff some audio into /dev/audio, read it from
/dev/pad. Test that we got sensible output by comparing against
a previous audibly good result.
This exercises auconv, audio and pad.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/tests/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/dev/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/dev/audio/Atffile \
src/tests/dev/audio/Makefile src/tests/dev/audio/h_pad.c \
src/tests/dev/audio/h_pad_musa.c src/tests/dev/audio/t_pad.sh \
src/tests/dev/audio/t_pad_output.bz2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/Makefile
diff -u src/tests/Makefile:1.22 src/tests/Makefile:1.23
--- src/tests/Makefile:1.22 Sat Jul 17 19:26:27 2010
+++ src/tests/Makefile Wed Aug 4 13:15:15 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2010/07/17 19:26:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2010/08/04 13:15:15 pooka Exp $
.include
@@ -8,7 +8,7 @@
SUBDIR= crypto games ipf util
.if ${MKATF} != "no"
-SUBDIR+= fs include kernel lib libexec net rump sys syscall
+SUBDIR+= dev fs include kernel lib libexec net rump sys syscall
. if ${MACHINE} != "evbppc" && ${MKKMOD} != "no"
SUBDIR+= modules
Added files:
Index: src/tests/dev/Makefile
diff -u /dev/null src/tests/dev/Makefile:1.1
--- /dev/null Wed Aug 4 13:15:15 2010
+++ src/tests/dev/Makefile Wed Aug 4 13:15:15 2010
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2010/08/04 13:15:15 pooka Exp $
+#
+
+.include
+
+TESTSDIR= ${TESTSBASE}/dev
+
+TESTS_SUBDIRS+= audio
+
+.include
Index: src/tests/dev/audio/Atffile
diff -u /dev/null src/tests/dev/audio/Atffile:1.1
--- /dev/null Wed Aug 4 13:15:15 2010
+++ src/tests/dev/audio/Atffile Wed Aug 4 13:15:15 2010
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version="1"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/08/04 13:15:15 pooka Exp $"
+
+prop: test-suite = "NetBSD"
+
+tp-glob: t_*
Index: src/tests/dev/audio/Makefile
diff -u /dev/null src/tests/dev/audio/Makefile:1.1
--- /dev/null Wed Aug 4 13:15:15 2010
+++ src/tests/dev/audio/Makefile Wed Aug 4 13:15:15 2010
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1 2010/08/04 13:15:15 pooka Exp $
+#
+
+.include
+
+TESTSDIR= ${TESTSBASE}/dev/audio
+FILESDIR= ${TESTSDIR}
+
+TESTS_SH= t_pad
+TESTS_C= h_pad
+
+ATFFILE= yes # for h_pad ... or rather not for it
+
+LDADD+= -lrumpdev_pad -lrumpdev_audio -lrumpdev -lrumpvfs
+LDADD+= -lrump
+LDADD+= -lrumpuser -lpthread
+
+FILES= t_pad_output.bz2
+
+WARNS= 4
+NOMAN=
+
+.include
Index: src/tests/dev/audio/h_pad.c
diff -u /dev/null src/tests/dev/audio/h_pad.c:1.1
--- /dev/null Wed Aug 4 13:15:15 2010
+++ src/tests/dev/audio/h_pad.c Wed Aug 4 13:15:15 2010
@@ -0,0 +1,76 @@
+/* $NetBSD: h_pad.c,v 1.1 2010/08/04 13:15:15 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "h_pad_musa.c"
+
+/*
+ * Stuff some audio into /dev/audio, read it from /dev/pad. Use in
+ * conjunction with t_pad, which tests that we got sensible output
+ * by comparing against a previous audibly good result.
+ */
+
+#define BUFSIZE 1024
+
+int
+main(int argc, char *argv[])
+{
+ char buf[BUFSIZE];
+ char zeros[BUFSIZE];
+ int padfd, audiofd;
+ ssize_t n;
+
+ rump_ini
CVS commit: src/sys/dev/dkwedge
Module Name:src
Committed By: bouyer
Date: Wed Aug 4 12:34:00 UTC 2010
Modified Files:
src/sys/dev/dkwedge: dk.c
Log Message:
Make sure to release sc_parent->dk_rawlock before calling
vn_close(sc->sc_parent->dk_rawvp). Avoids a lockdebug panic:
error: mutex_destroy: assertion failed: !MUTEX_OWNED(mtx->mtx_owner) &&
!MUTEX_HAS_WAITERS(mtx)
when the parent is a raidframe device.
See also:
http://mail-index.netbsd.org/tech-kern/2010/07/27/msg008612.html
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/dkwedge/dk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.56 src/sys/dev/dkwedge/dk.c:1.57
--- src/sys/dev/dkwedge/dk.c:1.56 Thu Jun 24 13:03:08 2010
+++ src/sys/dev/dkwedge/dk.c Wed Aug 4 12:34:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.56 2010/06/24 13:03:08 hannken Exp $ */
+/* $NetBSD: dk.c,v 1.57 2010/08/04 12:34:00 bouyer Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.56 2010/06/24 13:03:08 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.57 2010/08/04 12:34:00 bouyer Exp $");
#ifdef _KERNEL_OPT
#include "opt_dkwedge.h"
@@ -511,14 +511,14 @@
rc = 0;
mutex_enter(&dk->dk_openlock);
- mutex_enter(&sc->sc_parent->dk_rawlock);
if (dk->dk_openmask == 0)
; /* nothing to do */
else if ((flags & DETACH_FORCE) == 0)
rc = EBUSY;
- else
- rc = dklastclose(sc);
- mutex_exit(&sc->sc_parent->dk_rawlock);
+ else {
+ mutex_enter(&sc->sc_parent->dk_rawlock);
+ rc = dklastclose(sc); /* releases dk_rawlock */
+ }
mutex_exit(&dk->dk_openlock);
return rc;
@@ -577,17 +577,18 @@
/* Clean up the parent. */
mutex_enter(&sc->sc_dk.dk_openlock);
- mutex_enter(&sc->sc_parent->dk_rawlock);
if (sc->sc_dk.dk_openmask) {
+ mutex_enter(&sc->sc_parent->dk_rawlock);
if (sc->sc_parent->dk_rawopens-- == 1) {
KASSERT(sc->sc_parent->dk_rawvp != NULL);
+ mutex_exit(&sc->sc_parent->dk_rawlock);
(void) vn_close(sc->sc_parent->dk_rawvp, FREAD | FWRITE,
NOCRED);
sc->sc_parent->dk_rawvp = NULL;
- }
+ } else
+ mutex_exit(&sc->sc_parent->dk_rawlock);
sc->sc_dk.dk_openmask = 0;
}
- mutex_exit(&sc->sc_parent->dk_rawlock);
mutex_exit(&sc->sc_dk.dk_openlock);
/* Announce our departure. */
@@ -1050,10 +1051,12 @@
if (sc->sc_parent->dk_rawopens-- == 1) {
KASSERT(sc->sc_parent->dk_rawvp != NULL);
+ mutex_exit(&sc->sc_parent->dk_rawlock);
error = vn_close(sc->sc_parent->dk_rawvp,
FREAD | FWRITE, NOCRED);
sc->sc_parent->dk_rawvp = NULL;
- }
+ } else
+ mutex_exit(&sc->sc_parent->dk_rawlock);
return error;
}
@@ -1081,9 +1084,10 @@
sc->sc_dk.dk_copenmask | sc->sc_dk.dk_bopenmask;
if (sc->sc_dk.dk_openmask == 0)
- error = dklastclose(sc);
+ error = dklastclose(sc); /* releases dk_rawlock */
+ else
+ mutex_exit(&sc->sc_parent->dk_rawlock);
- mutex_exit(&sc->sc_parent->dk_rawlock);
mutex_exit(&sc->sc_dk.dk_openlock);
return (error);
CVS commit: src/share/man/man4/man4.x86
Module Name:src Committed By: jruoho Date: Wed Aug 4 11:39:14 UTC 2010 Modified Files: src/share/man/man4/man4.x86: balloon.4 Log Message: Rework the semantics in the reference. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.x86/balloon.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.x86/balloon.4 diff -u src/share/man/man4/man4.x86/balloon.4:1.2 src/share/man/man4/man4.x86/balloon.4:1.3 --- src/share/man/man4/man4.x86/balloon.4:1.2 Thu Jul 8 21:33:02 2010 +++ src/share/man/man4/man4.x86/balloon.4 Wed Aug 4 11:39:14 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: balloon.4,v 1.2 2010/07/08 21:33:02 wiz Exp $ +.\" $NetBSD: balloon.4,v 1.3 2010/08/04 11:39:14 jruoho Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -110,8 +110,12 @@ .Xr uvm 9 .Rs .%A Carl A. Waldspurger -.%T Memory Resource Management in VMware ESX Server -.%U http://www.usenix.org/events/osdi02/tech/waldspurger/waldspurger_html/node6.html +.%T "Memory Resource Management in VMware ESX Server" +.%I USENIX Association +.%B Proceedings of the 5th Symposium on \ +Operating Systems Design and Implementation +.%D December 9-11, 2002 +.%U http://www.usenix.org/events/osdi02/tech/full_papers/waldspurger/waldspurger.pdf .Re .\" .Sh AUTHORS
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Wed Aug 4 11:14:14 UTC 2010 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket 1400 To generate a diff of this commit: cvs rdiff -u -r1.1.2.73 -r1.1.2.74 src/doc/CHANGES-4.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.73 src/doc/CHANGES-4.0.2:1.1.2.74 --- src/doc/CHANGES-4.0.2:1.1.2.73 Thu Jul 22 20:36:12 2010 +++ src/doc/CHANGES-4.0.2 Wed Aug 4 11:14:13 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.73 2010/07/22 20:36:12 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.74 2010/08/04 11:14:13 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1055,3 +1055,10 @@ (for binary compatibility). [christos, ticket #1398] +sys/coda/coda.h 1.16 +sys/coda/coda_venus.c1.28 +sys/coda/coda_vnops.c1.76 + + Correct incomplete size checks for the coda ioctls. From Dan Rosenberg. + [christos, ticket #1400] +
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Wed Aug 4 11:14:01 UTC 2010 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Tickets 1400-1402 To generate a diff of this commit: cvs rdiff -u -r1.1.2.204 -r1.1.2.205 src/doc/CHANGES-4.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.204 src/doc/CHANGES-4.1:1.1.2.205 --- src/doc/CHANGES-4.1:1.1.2.204 Thu Jul 22 20:36:45 2010 +++ src/doc/CHANGES-4.1 Wed Aug 4 11:14:01 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.204 2010/07/22 20:36:45 riz Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.205 2010/08/04 11:14:01 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4193,3 +4193,18 @@ (for binary compatibility). [christos, ticket #1398] +sys/coda/coda.h 1.16 +sys/coda/coda_venus.c1.28 +sys/coda/coda_vnops.c1.76 + + Correct incomplete size checks for the coda ioctls. From Dan Rosenberg. + [christos, ticket #1400] + +usr.bin/make/job.c1.152 via patch + + PR/43643: David A. Holland: dash prefix broken with make -j + As the comment says in JobPrintJob set JOB_IGNERR with - commands. Fix + whitespace so that the output is consistent, although there are two + separate execution logic implementations (command.c, job.c) + [dholland, ticket #1401] +
CVS commit: [netbsd-4] src/sys/fs/msdosfs
Module Name:src Committed By: bouyer Date: Wed Aug 4 11:08:18 UTC 2010 Modified Files: src/sys/fs/msdosfs [netbsd-4]: msdosfs_lookup.c Log Message: Pull up following revision(s) (requested by mlelstv in ticket #1402): sys/fs/msdosfs/msdosfs_lookup.c: revision 1.22 Return EINVAL for rename and delete operations to the root directory instead of the erroneous EROFS. To generate a diff of this commit: cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/sys/fs/msdosfs/msdosfs_lookup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/msdosfs/msdosfs_lookup.c diff -u src/sys/fs/msdosfs/msdosfs_lookup.c:1.10.2.1 src/sys/fs/msdosfs/msdosfs_lookup.c:1.10.2.2 --- src/sys/fs/msdosfs/msdosfs_lookup.c:1.10.2.1 Sat Feb 17 23:27:44 2007 +++ src/sys/fs/msdosfs/msdosfs_lookup.c Wed Aug 4 11:08:18 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: msdosfs_lookup.c,v 1.10.2.1 2007/02/17 23:27:44 tron Exp $ */ +/* $NetBSD: msdosfs_lookup.c,v 1.10.2.2 2010/08/04 11:08:18 bouyer Exp $ */ /*- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank. @@ -48,7 +48,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.10.2.1 2007/02/17 23:27:44 tron Exp $"); +__KERNEL_RCSID(0, "$NetBSD: msdosfs_lookup.c,v 1.10.2.2 2010/08/04 11:08:18 bouyer Exp $"); #include #include @@ -462,7 +462,7 @@ * Don't allow deleting the root. */ if (blkoff == MSDOSFSROOT_OFS) - return EROFS; /* really? XXX */ + return EINVAL; /* * Write access to directory required to delete files. @@ -498,7 +498,7 @@ return (EROFS); if (blkoff == MSDOSFSROOT_OFS) - return EROFS;/* really? XXX */ + return EINVAL; error = VOP_ACCESS(vdp, VWRITE, cnp->cn_cred, cnp->cn_lwp); if (error)
CVS commit: [netbsd-4] src/usr.bin/make
Module Name:src
Committed By: bouyer
Date: Wed Aug 4 11:04:59 UTC 2010
Modified Files:
src/usr.bin/make [netbsd-4]: job.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1401):
usr.bin/make/job.c: revision 1.152 via patch
PR/43643: David A. Holland: dash prefix broken with make -j
As the comment says in JobPrintJob set JOB_IGNERR with - commands. Fix
whitespace so that the output is consistent, although there are two separate
execution logic implementations (command.c, job.c)
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.124.2.1 src/usr.bin/make/job.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.124 src/usr.bin/make/job.c:1.124.2.1
--- src/usr.bin/make/job.c:1.124 Fri Oct 27 21:00:19 2006
+++ src/usr.bin/make/job.c Wed Aug 4 11:04:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.124 2006/10/27 21:00:19 dsl Exp $ */
+/* $NetBSD: job.c,v 1.124.2.1 2010/08/04 11:04:59 bouyer Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.124 2006/10/27 21:00:19 dsl Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.124.2.1 2010/08/04 11:04:59 bouyer Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: job.c,v 1.124 2006/10/27 21:00:19 dsl Exp $");
+__RCSID("$NetBSD: job.c,v 1.124.2.1 2010/08/04 11:04:59 bouyer Exp $");
#endif
#endif /* not lint */
#endif
@@ -693,6 +693,7 @@
shutUp = TRUE;
break;
case '-':
+ job->flags |= JOB_IGNERR;
errOff = TRUE;
break;
case '+':
@@ -741,7 +742,7 @@
}
if (errOff) {
- if ( !(job->flags & JOB_IGNERR) && !noSpecials) {
+ if (!noSpecials) {
if (commandShell->hasErrCtl) {
/*
* we don't want the error-control commands showing
@@ -999,7 +1000,7 @@
(void)printf("*** [%s] Error code %d%s\n",
job->node->name,
WEXITSTATUS(status),
- (job->flags & JOB_IGNERR) ? "(ignored)" : "");
+ (job->flags & JOB_IGNERR) ? " (ignored)" : "");
if (job->flags & JOB_IGNERR)
status = 0;
} else if (DEBUG(JOB)) {
@@ -1203,11 +1204,11 @@
static const char msg[] = ": don't know how to make";
if (gn->type & OP_OPTIONAL) {
- (void)fprintf(stdout, "%s%s %s(ignored)\n", progname,
+ (void)fprintf(stdout, "%s%s %s (ignored)\n", progname,
msg, gn->name);
(void)fflush(stdout);
} else if (keepgoing) {
- (void)fprintf(stdout, "%s%s %s(continuing)\n", progname,
+ (void)fprintf(stdout, "%s%s %s (continuing)\n", progname,
msg, gn->name);
(void)fflush(stdout);
return FALSE;
CVS commit: [netbsd-4-0] src/sys/coda
Module Name:src
Committed By: bouyer
Date: Wed Aug 4 11:01:23 UTC 2010
Modified Files:
src/sys/coda [netbsd-4-0]: coda.h coda_venus.c coda_vnops.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1400):
sys/coda/coda_venus.c: revision 1.28
sys/coda/coda_vnops.c: revision 1.76
sys/coda/coda.h: revision 1.16
Correct incomplete size checks for the coda ioctls. From Dan Rosenberg.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.28.1 src/sys/coda/coda.h
cvs rdiff -u -r1.24 -r1.24.22.1 src/sys/coda/coda_venus.c
cvs rdiff -u -r1.50.8.3 -r1.50.8.3.4.1 src/sys/coda/coda_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/coda/coda.h
diff -u src/sys/coda/coda.h:1.13 src/sys/coda/coda.h:1.13.28.1
--- src/sys/coda/coda.h:1.13 Thu Mar 2 14:24:57 2006
+++ src/sys/coda/coda.h Wed Aug 4 11:01:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: coda.h,v 1.13 2006/03/02 14:24:57 gdt Exp $ */
+/* $NetBSD: coda.h,v 1.13.28.1 2010/08/04 11:01:23 bouyer Exp $ */
/*
@@ -793,8 +793,8 @@
#define PIOCPARM_MASK 0x
struct ViceIoctl {
caddr_t in, out;/* Data to be transferred in, or out */
-short in_size; /* Size of input buffer <= 2K */
-short out_size; /* Maximum size of output buffer, <= 2K */
+unsigned short in_size; /* Size of input buffer <= 2K */
+unsigned short out_size;/* Maximum size of output buffer, <= 2K */
};
struct PioctlData {
Index: src/sys/coda/coda_venus.c
diff -u src/sys/coda/coda_venus.c:1.24 src/sys/coda/coda_venus.c:1.24.22.1
--- src/sys/coda/coda_venus.c:1.24 Sun May 14 21:24:49 2006
+++ src/sys/coda/coda_venus.c Wed Aug 4 11:01:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_venus.c,v 1.24 2006/05/14 21:24:49 elad Exp $ */
+/* $NetBSD: coda_venus.c,v 1.24.22.1 2010/08/04 11:01:23 bouyer Exp $ */
/*
*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: coda_venus.c,v 1.24 2006/05/14 21:24:49 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_venus.c,v 1.24.22.1 2010/08/04 11:01:23 bouyer Exp $");
#include
#include
@@ -308,7 +308,7 @@
tmp = ((com >> 16) & IOCPARM_MASK) - sizeof (char *) - sizeof (int);
inp->cmd |= (tmp & IOCPARM_MASK) << 16;
-if (iap->vi.in_size < 0 || iap->vi.in_size > VC_MAXMSGSIZE) {
+if (iap->vi.in_size > VC_MAXMSGSIZE || iap->vi.out_size > VC_MAXMSGSIZE) {
CODA_FREE(inp, coda_ioctl_size);
return (EINVAL);
}
Index: src/sys/coda/coda_vnops.c
diff -u src/sys/coda/coda_vnops.c:1.50.8.3 src/sys/coda/coda_vnops.c:1.50.8.3.4.1
--- src/sys/coda/coda_vnops.c:1.50.8.3 Wed Jun 6 21:11:18 2007
+++ src/sys/coda/coda_vnops.c Wed Aug 4 11:01:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_vnops.c,v 1.50.8.3 2007/06/06 21:11:18 bouyer Exp $ */
+/* $NetBSD: coda_vnops.c,v 1.50.8.3.4.1 2010/08/04 11:01:23 bouyer Exp $ */
/*
*
@@ -46,7 +46,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.50.8.3 2007/06/06 21:11:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.50.8.3.4.1 2010/08/04 11:01:23 bouyer Exp $");
#include
#include
@@ -546,7 +546,7 @@
return(EINVAL);
}
-if (iap->vi.in_size > VC_MAXDATASIZE) {
+if (iap->vi.in_size > VC_MAXDATASIZE || iap->vi.out_size > VC_MAXDATASIZE) {
vrele(tvp);
return(EINVAL);
}
CVS commit: [netbsd-4] src/sys/coda
Module Name:src
Committed By: bouyer
Date: Wed Aug 4 11:00:06 UTC 2010
Modified Files:
src/sys/coda [netbsd-4]: coda.h coda_venus.c coda_vnops.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1400):
sys/coda/coda_venus.c: revision 1.28
sys/coda/coda_vnops.c: revision 1.76
sys/coda/coda.h: revision 1.16
Correct incomplete size checks for the coda ioctls. From Dan Rosenberg.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.18.1 src/sys/coda/coda.h
cvs rdiff -u -r1.24 -r1.24.12.1 src/sys/coda/coda_venus.c
cvs rdiff -u -r1.50.8.3 -r1.50.8.4 src/sys/coda/coda_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/coda/coda.h
diff -u src/sys/coda/coda.h:1.13 src/sys/coda/coda.h:1.13.18.1
--- src/sys/coda/coda.h:1.13 Thu Mar 2 14:24:57 2006
+++ src/sys/coda/coda.h Wed Aug 4 11:00:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: coda.h,v 1.13 2006/03/02 14:24:57 gdt Exp $ */
+/* $NetBSD: coda.h,v 1.13.18.1 2010/08/04 11:00:06 bouyer Exp $ */
/*
@@ -793,8 +793,8 @@
#define PIOCPARM_MASK 0x
struct ViceIoctl {
caddr_t in, out;/* Data to be transferred in, or out */
-short in_size; /* Size of input buffer <= 2K */
-short out_size; /* Maximum size of output buffer, <= 2K */
+unsigned short in_size; /* Size of input buffer <= 2K */
+unsigned short out_size;/* Maximum size of output buffer, <= 2K */
};
struct PioctlData {
Index: src/sys/coda/coda_venus.c
diff -u src/sys/coda/coda_venus.c:1.24 src/sys/coda/coda_venus.c:1.24.12.1
--- src/sys/coda/coda_venus.c:1.24 Sun May 14 21:24:49 2006
+++ src/sys/coda/coda_venus.c Wed Aug 4 11:00:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_venus.c,v 1.24 2006/05/14 21:24:49 elad Exp $ */
+/* $NetBSD: coda_venus.c,v 1.24.12.1 2010/08/04 11:00:06 bouyer Exp $ */
/*
*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: coda_venus.c,v 1.24 2006/05/14 21:24:49 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_venus.c,v 1.24.12.1 2010/08/04 11:00:06 bouyer Exp $");
#include
#include
@@ -308,7 +308,7 @@
tmp = ((com >> 16) & IOCPARM_MASK) - sizeof (char *) - sizeof (int);
inp->cmd |= (tmp & IOCPARM_MASK) << 16;
-if (iap->vi.in_size < 0 || iap->vi.in_size > VC_MAXMSGSIZE) {
+if (iap->vi.in_size > VC_MAXMSGSIZE || iap->vi.out_size > VC_MAXMSGSIZE) {
CODA_FREE(inp, coda_ioctl_size);
return (EINVAL);
}
Index: src/sys/coda/coda_vnops.c
diff -u src/sys/coda/coda_vnops.c:1.50.8.3 src/sys/coda/coda_vnops.c:1.50.8.4
--- src/sys/coda/coda_vnops.c:1.50.8.3 Wed Jun 6 21:11:18 2007
+++ src/sys/coda/coda_vnops.c Wed Aug 4 11:00:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_vnops.c,v 1.50.8.3 2007/06/06 21:11:18 bouyer Exp $ */
+/* $NetBSD: coda_vnops.c,v 1.50.8.4 2010/08/04 11:00:06 bouyer Exp $ */
/*
*
@@ -46,7 +46,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.50.8.3 2007/06/06 21:11:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.50.8.4 2010/08/04 11:00:06 bouyer Exp $");
#include
#include
@@ -546,7 +546,7 @@
return(EINVAL);
}
-if (iap->vi.in_size > VC_MAXDATASIZE) {
+if (iap->vi.in_size > VC_MAXDATASIZE || iap->vi.out_size > VC_MAXDATASIZE) {
vrele(tvp);
return(EINVAL);
}
CVS commit: src/sys/ufs/lfs
Module Name:src Committed By: hannken Date: Wed Aug 4 10:43:53 UTC 2010 Modified Files: src/sys/ufs/lfs: lfs_vnops.c Log Message: Free the on disk inodes in the reclaim routine. To generate a diff of this commit: cvs rdiff -u -r1.230 -r1.231 src/sys/ufs/lfs/lfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/ufs/lfs/lfs_vnops.c diff -u src/sys/ufs/lfs/lfs_vnops.c:1.230 src/sys/ufs/lfs/lfs_vnops.c:1.231 --- src/sys/ufs/lfs/lfs_vnops.c:1.230 Thu Jul 29 10:54:51 2010 +++ src/sys/ufs/lfs/lfs_vnops.c Wed Aug 4 10:43:53 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: lfs_vnops.c,v 1.230 2010/07/29 10:54:51 hannken Exp $ */ +/* $NetBSD: lfs_vnops.c,v 1.231 2010/08/04 10:43:53 hannken Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.230 2010/07/29 10:54:51 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.231 2010/08/04 10:43:53 hannken Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -277,6 +277,10 @@ if (fs->lfs_ronly) return 0; + /* If a removed vnode is being cleaned, no need to sync here. */ + if ((ap->a_flags & FSYNC_RECLAIM) != 0 && ip->i_mode == 0) + return 0; + /* * Trickle sync simply adds this vnode to the pager list, as if * the pagedaemon had requested a pageout. @@ -1075,6 +1079,14 @@ struct lfs *fs = ip->i_lfs; int error; + /* + * The inode must be freed and updated before being removed + * from its hash chain. Other threads trying to gain a hold + * on the inode will be stalled because it is locked (VI_XLOCK). + */ + if (ip->i_nlink <= 0 && (vp->v_mount->mnt_flag & MNT_RDONLY) == 0) + lfs_vfree(vp, ip->i_number, ip->i_omode); + mutex_enter(&lfs_lock); LFS_CLR_UINO(ip, IN_ALLMOD); mutex_exit(&lfs_lock);
CVS commit: src/external/bsd/wpa/dist
Module Name:src Committed By: christos Date: Wed Aug 4 10:24:46 UTC 2010 Update of /cvsroot/src/external/bsd/wpa/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9405 Log Message: Import wpa_supplicant and hostapd Status: Vendor Tag: MALINEN Release Tags: v0_7_2 N src/external/bsd/wpa/dist/COPYING N src/external/bsd/wpa/dist/README N src/external/bsd/wpa/dist/patches/openssl-0.9.9-session-ticket.patch N src/external/bsd/wpa/dist/patches/openssl-0.9.8g-tls-extensions.patch N src/external/bsd/wpa/dist/patches/openssl-0.9.8-tls-extensions.patch N src/external/bsd/wpa/dist/patches/openssl-0.9.8h-tls-extensions.patch N src/external/bsd/wpa/dist/patches/openssl-0.9.8i-tls-extensions.patch N src/external/bsd/wpa/dist/patches/openssl-0.9.8e-tls-extensions.patch N src/external/bsd/wpa/dist/patches/openssl-0.9.8d-tls-extensions.patch N src/external/bsd/wpa/dist/src/Makefile N src/external/bsd/wpa/dist/src/lib.rules N src/external/bsd/wpa/dist/src/ap/drv_callbacks.c N src/external/bsd/wpa/dist/src/ap/wpa_auth.c N src/external/bsd/wpa/dist/src/ap/hostapd.c N src/external/bsd/wpa/dist/src/ap/ieee802_1x.h N src/external/bsd/wpa/dist/src/ap/ieee802_11_auth.h N src/external/bsd/wpa/dist/src/ap/sta_info.c N src/external/bsd/wpa/dist/src/ap/Makefile N src/external/bsd/wpa/dist/src/ap/tkip_countermeasures.c N src/external/bsd/wpa/dist/src/ap/ieee802_11_auth.c N src/external/bsd/wpa/dist/src/ap/hw_features.c N src/external/bsd/wpa/dist/src/ap/wpa_auth_ie.c N src/external/bsd/wpa/dist/src/ap/preauth_auth.c N src/external/bsd/wpa/dist/src/ap/wpa_auth_ie.h N src/external/bsd/wpa/dist/src/ap/vlan_init.c N src/external/bsd/wpa/dist/src/ap/ap_config.c N src/external/bsd/wpa/dist/src/ap/hw_features.h N src/external/bsd/wpa/dist/src/ap/ieee802_1x.c N src/external/bsd/wpa/dist/src/ap/tkip_countermeasures.h N src/external/bsd/wpa/dist/src/ap/ap_config.h N src/external/bsd/wpa/dist/src/ap/sta_info.h N src/external/bsd/wpa/dist/src/ap/pmksa_cache_auth.h N src/external/bsd/wpa/dist/src/ap/ieee802_11_ht.c N src/external/bsd/wpa/dist/src/ap/wpa_auth_i.h N src/external/bsd/wpa/dist/src/ap/iapp.c N src/external/bsd/wpa/dist/src/ap/ieee802_11.c N src/external/bsd/wpa/dist/src/ap/beacon.c N src/external/bsd/wpa/dist/src/ap/wmm.c N src/external/bsd/wpa/dist/src/ap/wpa_auth_ft.c N src/external/bsd/wpa/dist/src/ap/wpa_auth_glue.c N src/external/bsd/wpa/dist/src/ap/ap_drv_ops.h N src/external/bsd/wpa/dist/src/ap/accounting.h N src/external/bsd/wpa/dist/src/ap/wpa_auth.h N src/external/bsd/wpa/dist/src/ap/wmm.h N src/external/bsd/wpa/dist/src/ap/ap_mlme.h N src/external/bsd/wpa/dist/src/ap/ap_mlme.c N src/external/bsd/wpa/dist/src/ap/utils.c N src/external/bsd/wpa/dist/src/ap/ctrl_iface_ap.h N src/external/bsd/wpa/dist/src/ap/ap_list.h N src/external/bsd/wpa/dist/src/ap/accounting.c N src/external/bsd/wpa/dist/src/ap/peerkey_auth.c N src/external/bsd/wpa/dist/src/ap/authsrv.h N src/external/bsd/wpa/dist/src/ap/wps_hostapd.h N src/external/bsd/wpa/dist/src/ap/iapp.h N src/external/bsd/wpa/dist/src/ap/vlan_init.h N src/external/bsd/wpa/dist/src/ap/ap_drv_ops.c N src/external/bsd/wpa/dist/src/ap/pmksa_cache_auth.c N src/external/bsd/wpa/dist/src/ap/wpa_auth_glue.h N src/external/bsd/wpa/dist/src/ap/ctrl_iface_ap.c N src/external/bsd/wpa/dist/src/ap/beacon.h N src/external/bsd/wpa/dist/src/ap/wps_hostapd.c N src/external/bsd/wpa/dist/src/ap/ap_list.c N src/external/bsd/wpa/dist/src/ap/ieee802_11.h N src/external/bsd/wpa/dist/src/ap/preauth_auth.h N src/external/bsd/wpa/dist/src/ap/authsrv.c N src/external/bsd/wpa/dist/src/ap/hostapd.h N src/external/bsd/wpa/dist/src/common/eapol_common.h N src/external/bsd/wpa/dist/src/common/wpa_common.h N src/external/bsd/wpa/dist/src/common/wpa_ctrl.c N src/external/bsd/wpa/dist/src/common/Makefile N src/external/bsd/wpa/dist/src/common/ieee802_11_common.c N src/external/bsd/wpa/dist/src/common/wpa_common.c N src/external/bsd/wpa/dist/src/common/ieee802_11_common.h N src/external/bsd/wpa/dist/src/common/wpa_ctrl.h N src/external/bsd/wpa/dist/src/common/privsep_commands.h N src/external/bsd/wpa/dist/src/common/version.h N src/external/bsd/wpa/dist/src/common/defs.h N src/external/bsd/wpa/dist/src/common/ieee802_11_defs.h N src/external/bsd/wpa/dist/src/eapol_auth/eapol_auth_sm.c N src/external/bsd/wpa/dist/src/eapol_auth/Makefile N src/external/bsd/wpa/dist/src/eapol_auth/eapol_auth_dump.c N src/external/bsd/wpa/dist/src/eapol_auth/eapol_auth_sm_i.h N src/external/bsd/wpa/dist/src/eapol_auth/eapol_auth_sm.h N src/external/bsd/wpa/dist/src/utils/radiotap_iter.h N src/external/bsd/wpa/dist/src/utils/ip_addr.c N src/external/bsd/wpa/dist/src/utils/wpabuf.c N src/external/bsd/wpa/dist/src/utils/Makefile N src/external/bsd/wpa/dist/src/utils/eloop.c N src/external/bsd/wpa/dist/src/utils/os_none.c N src/external/bsd/wpa/dist/src/utils/common.c N src/external/bsd/wpa/dist/src/utils/os_win32.c N src/external/bsd/wpa/dist/src/utils/list.h N src/external/bsd/wpa/dist/src/utils/eloop_
CVS commit: src/sys
Module Name:src
Committed By: jruoho
Date: Wed Aug 4 10:02:12 UTC 2010
Modified Files:
src/sys/arch/x86/include: cpu.h cpuvar.h
src/sys/arch/x86/x86: cpu.c mpacpi.c mpbios.c
src/sys/dev/acpi: acpi_cpu.c acpi_cpu_cstate.c
Log Message:
Store the MADT-derived CPU ID to . This is required to properly
match the ACPI processor object ID with the ID available in the APIC table.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x86/include/cpu.h
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/x86/include/cpuvar.h
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/x86/x86/mpacpi.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/x86/x86/mpbios.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/acpi/acpi_cpu.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/acpi_cpu_cstate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/cpu.h
diff -u src/sys/arch/x86/include/cpu.h:1.23 src/sys/arch/x86/include/cpu.h:1.24
--- src/sys/arch/x86/include/cpu.h:1.23 Sat Jul 24 00:45:56 2010
+++ src/sys/arch/x86/include/cpu.h Wed Aug 4 10:02:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.23 2010/07/24 00:45:56 jym Exp $ */
+/* $NetBSD: cpu.h,v 1.24 2010/08/04 10:02:11 jruoho Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -95,6 +95,7 @@
int ci_fpused; /* XEN: FPU was used by curlwp */
cpuid_t ci_cpuid; /* our CPU ID */
int ci_cpumask; /* (1 << CPU ID) */
+ uint32_t ci_acpiid; /* our ACPI/MADT ID */
uint32_t ci_initapicid; /* our intitial APIC ID */
struct cpu_data ci_data; /* MI per-cpu data */
Index: src/sys/arch/x86/include/cpuvar.h
diff -u src/sys/arch/x86/include/cpuvar.h:1.33 src/sys/arch/x86/include/cpuvar.h:1.34
--- src/sys/arch/x86/include/cpuvar.h:1.33 Tue Jul 6 20:50:35 2010
+++ src/sys/arch/x86/include/cpuvar.h Wed Aug 4 10:02:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuvar.h,v 1.33 2010/07/06 20:50:35 cegger Exp $ */
+/* $NetBSD: cpuvar.h,v 1.34 2010/08/04 10:02:11 jruoho Exp $ */
/*-
* Copyright (c) 2000, 2007 The NetBSD Foundation, Inc.
@@ -79,6 +79,7 @@
#define CPU_ROLE_AP 2
struct cpu_attach_args {
+ int cpu_id;
int cpu_number;
int cpu_role;
const struct cpu_functions *cpu_func;
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.73 src/sys/arch/x86/x86/cpu.c:1.74
--- src/sys/arch/x86/x86/cpu.c:1.73 Sat Jul 24 00:45:56 2010
+++ src/sys/arch/x86/x86/cpu.c Wed Aug 4 10:02:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.73 2010/07/24 00:45:56 jym Exp $ */
+/* $NetBSD: cpu.c,v 1.74 2010/08/04 10:02:12 jruoho Exp $ */
/*-
* Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.73 2010/07/24 00:45:56 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.74 2010/08/04 10:02:12 jruoho Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -330,6 +330,7 @@
ci->ci_self = ci;
sc->sc_info = ci;
ci->ci_dev = self;
+ ci->ci_acpiid = caa->cpu_id;
ci->ci_cpuid = caa->cpu_number;
ci->ci_func = caa->cpu_func;
Index: src/sys/arch/x86/x86/mpacpi.c
diff -u src/sys/arch/x86/x86/mpacpi.c:1.87 src/sys/arch/x86/x86/mpacpi.c:1.88
--- src/sys/arch/x86/x86/mpacpi.c:1.87 Tue Apr 27 05:34:14 2010
+++ src/sys/arch/x86/x86/mpacpi.c Wed Aug 4 10:02:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mpacpi.c,v 1.87 2010/04/27 05:34:14 jruoho Exp $ */
+/* $NetBSD: mpacpi.c,v 1.88 2010/08/04 10:02:12 jruoho Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.87 2010/04/27 05:34:14 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.88 2010/08/04 10:02:12 jruoho Exp $");
#include "acpica.h"
#include "opt_acpi.h"
@@ -383,6 +383,7 @@
caa.cpu_role = CPU_ROLE_AP;
else
caa.cpu_role = CPU_ROLE_BP;
+ caa.cpu_id = lapic->ProcessorId;
caa.cpu_number = lapic->Id;
caa.cpu_func = &mp_cpu_funcs;
locs[CPUBUSCF_APID] = caa.cpu_number;
@@ -409,6 +410,7 @@
caa.cpu_role = CPU_ROLE_AP;
else
caa.cpu_role = CPU_ROLE_BP;
+ caa.cpu_id = x2apic->Uid;
caa.cpu_number = x2apic->LocalApicId;
caa.cpu_func = &mp_cpu_funcs;
locs[CPUBUSCF_APID] = caa.cpu_number;
Index: src/sys/arch/x86/x86/mpbios.c
diff -u src/sys/arch/x86/x86/mpbios.c:1.57 src/sys/arch/x86/x86/mpbios.c:1.58
--- src/sys/arch/x86/x86/mpbios.c:1.57 Sun Apr 18 23:47:51 2010
+++ src/sys/arch/x86/x86/mpbios.c Wed Aug 4 10:02:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mpbios.c,v 1.57 2010/04/18 23:47:51 jym Exp $ */
+/* $NetBSD: mpbios.c,v 1.58 2010/08/04 10:02:12 jruoho Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.57 2010/04/18 23:47:51 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1
CVS commit: [ipsec-tools-0_7-branch] src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: vanhu
Date: Wed Aug 4 09:23:53 UTC 2010
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon [ipsec-tools-0_7-branch]:
isakmp_cfg.c
Log Message:
fixed answer for IP4_SUBNET request
To generate a diff of this commit:
cvs rdiff -u -r1.12.6.4 -r1.12.6.5 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.12.6.4 src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.12.6.5
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.12.6.4 Thu Nov 27 15:25:20 2008
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c Wed Aug 4 09:23:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_cfg.c,v 1.12.6.4 2008/11/27 15:25:20 vanhu Exp $ */
+/* $NetBSD: isakmp_cfg.c,v 1.12.6.5 2010/08/04 09:23:53 vanhu Exp $ */
/* Id: isakmp_cfg.c,v 1.55 2006/08/22 18:17:17 manubsd Exp */
@@ -114,6 +114,8 @@
#endif
static vchar_t *isakmp_cfg_addr4(struct ph1handle *,
struct isakmp_data *, in_addr_t *);
+static vchar_t *isakmp_cfg_addrnet4(struct ph1handle *,
+ struct isakmp_data *, in_addr_t *, in_addr_t *);
static void isakmp_cfg_getaddr4(struct isakmp_data *, struct in_addr *);
static vchar_t *isakmp_cfg_addr4_list(struct ph1handle *,
struct isakmp_data *, in_addr_t *, int);
@@ -901,8 +903,15 @@
break;
case INTERNAL_IP4_SUBNET:
- return isakmp_cfg_addr4(iph1,
- attr, &isakmp_cfg_config.network4);
+ if(isakmp_cfg_config.splitnet_count > 0){
+ return isakmp_cfg_addrnet4(iph1, attr,
+ &isakmp_cfg_config.splitnet_list->network.addr4.s_addr,
+ &isakmp_cfg_config.splitnet_list->network.mask4.s_addr);
+ }else{
+ plog(LLV_INFO, LOCATION, NULL,
+ "%s requested but no splitnet in configuration\n",
+ s_isakmp_cfg_type(type));
+ }
break;
default:
@@ -1042,6 +1051,36 @@
}
static vchar_t *
+isakmp_cfg_addrnet4(iph1, attr, addr, mask)
+ struct ph1handle *iph1;
+ struct isakmp_data *attr;
+ in_addr_t *addr;
+ in_addr_t *mask;
+{
+ vchar_t *buffer;
+ struct isakmp_data *new;
+ size_t len;
+ in_addr_t netbuff[2];
+
+ len = sizeof(netbuff);
+ if ((buffer = vmalloc(sizeof(*attr) + len)) == NULL) {
+ plog(LLV_ERROR, LOCATION, NULL, "Cannot allocate memory\n");
+ return NULL;
+ }
+
+ new = (struct isakmp_data *)buffer->v;
+
+ new->type = attr->type;
+ new->lorv = htons(len);
+ netbuff[0]=*addr;
+ netbuff[1]=*mask;
+ memcpy(new + 1, netbuff, len);
+
+ return buffer;
+}
+
+
+static vchar_t *
isakmp_cfg_addr4_list(iph1, attr, addr, nbr)
struct ph1handle *iph1;
struct isakmp_data *attr;
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: vanhu
Date: Wed Aug 4 09:16:58 UTC 2010
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: isakmp_cfg.c
Log Message:
fixed answer for IP4_SUBNET request
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.22 src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.23
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.22 Fri Jul 3 06:41:46 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c Wed Aug 4 09:16:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_cfg.c,v 1.22 2009/07/03 06:41:46 tteras Exp $ */
+/* $NetBSD: isakmp_cfg.c,v 1.23 2010/08/04 09:16:58 vanhu Exp $ */
/* Id: isakmp_cfg.c,v 1.55 2006/08/22 18:17:17 manubsd Exp */
@@ -114,6 +114,8 @@
#endif
static vchar_t *isakmp_cfg_addr4(struct ph1handle *,
struct isakmp_data *, in_addr_t *);
+static vchar_t *isakmp_cfg_addrnet4(struct ph1handle *,
+ struct isakmp_data *, in_addr_t *, in_addr_t *);
static void isakmp_cfg_getaddr4(struct isakmp_data *, struct in_addr *);
static vchar_t *isakmp_cfg_addr4_list(struct ph1handle *,
struct isakmp_data *, in_addr_t *, int);
@@ -901,8 +903,15 @@
break;
case INTERNAL_IP4_SUBNET:
- return isakmp_cfg_addr4(iph1,
- attr, &isakmp_cfg_config.network4);
+ if(isakmp_cfg_config.splitnet_count > 0){
+ return isakmp_cfg_addrnet4(iph1, attr,
+ &isakmp_cfg_config.splitnet_list->network.addr4.s_addr,
+ &isakmp_cfg_config.splitnet_list->network.mask4.s_addr);
+ }else{
+ plog(LLV_INFO, LOCATION, NULL,
+ "%s requested but no splitnet in configuration\n",
+ s_isakmp_cfg_type(type));
+ }
break;
default:
@@ -1042,6 +1051,36 @@
}
static vchar_t *
+isakmp_cfg_addrnet4(iph1, attr, addr, mask)
+ struct ph1handle *iph1;
+ struct isakmp_data *attr;
+ in_addr_t *addr;
+ in_addr_t *mask;
+{
+ vchar_t *buffer;
+ struct isakmp_data *new;
+ size_t len;
+ in_addr_t netbuff[2];
+
+ len = sizeof(netbuff);
+ if ((buffer = vmalloc(sizeof(*attr) + len)) == NULL) {
+ plog(LLV_ERROR, LOCATION, NULL, "Cannot allocate memory\n");
+ return NULL;
+ }
+
+ new = (struct isakmp_data *)buffer->v;
+
+ new->type = attr->type;
+ new->lorv = htons(len);
+ netbuff[0]=*addr;
+ netbuff[1]=*mask;
+ memcpy(new + 1, netbuff, len);
+
+ return buffer;
+}
+
+
+static vchar_t *
isakmp_cfg_addr4_list(iph1, attr, addr, nbr)
struct ph1handle *iph1;
struct isakmp_data *attr;
