CVS commit: othersrc/external/bsd/circa/circa
Module Name:othersrc
Committed By: agc
Date: Sat May 7 02:35:28 UTC 2011
Modified Files:
othersrc/external/bsd/circa/circa: Makefile
Log Message:
Fixup pre-req lib path now that this is in-tree.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/circa/circa/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/circa/circa/Makefile
diff -u othersrc/external/bsd/circa/circa/Makefile:1.1.1.1 othersrc/external/bsd/circa/circa/Makefile:1.2
--- othersrc/external/bsd/circa/circa/Makefile:1.1.1.1 Sat May 7 02:31:24 2011
+++ othersrc/external/bsd/circa/circa/Makefile Sat May 7 02:35:28 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/07 02:31:24 agc Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/07 02:35:28 agc Exp $
.include
@@ -8,7 +8,7 @@
LDADD+= -L${LIBCIRCDIR} -lcirca
DPADD+= ${LIBCIRCDIR}/libcirca.a
-LIBRSDIR!= cd /usr/othersrc/external/bsd/rs/librs && ${PRINTOBJDIR}
+LIBRSDIR!= cd ${.CURDIR}/../../rs/librs && ${PRINTOBJDIR}
LDADD+= -L${LIBRSDIR} -lrs
DPADD+= ${LIBRSDIR}/librs.a
CVS commit: othersrc/external/bsd/circa/libcirca
Module Name:othersrc
Committed By: agc
Date: Sat May 7 02:33:58 UTC 2011
Modified Files:
othersrc/external/bsd/circa/libcirca: Makefile
Log Message:
Fixup pre-req lib path now that this is in-tree.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/circa/libcirca/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/circa/libcirca/Makefile
diff -u othersrc/external/bsd/circa/libcirca/Makefile:1.1.1.1 othersrc/external/bsd/circa/libcirca/Makefile:1.2
--- othersrc/external/bsd/circa/libcirca/Makefile:1.1.1.1 Sat May 7 02:31:24 2011
+++ othersrc/external/bsd/circa/libcirca/Makefile Sat May 7 02:33:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/07 02:31:24 agc Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/07 02:33:58 agc Exp $
USE_FORT?= yes
@@ -14,6 +14,6 @@
INCS+= circa.h
INCSDIR=/usr/include
-LIBDPLIBS+= rs /usr/othersrc/external/bsd/rs/librs
+LIBDPLIBS+= rs ${.CURDIR}/../../rs/librs
.include
CVS commit: othersrc/external/bsd/circa
Module Name:othersrc Committed By: agc Date: Sat May 7 02:31:24 UTC 2011 Update of /cvsroot/othersrc/external/bsd/circa In directory ivanova.netbsd.org:/tmp/cvs-serv4077 Log Message: Initial import of libcirca(3) and circa(1) into othersrc. The circa(3) library encodes data, protecting against damage in transit or at rest. The data size expands by 4/3 to provide protection. The library is based loosely on the protection scheme used by CD-ROMs, and employs two Reed-Solomon erasure codings (one inner and one outer), and a number of dispersal, delay lines and scattering of bytes. There are numerous areas in which single bit errors can cause re-transmission of large amounts of data, or cause file system data errors - encoding with libcirca(3) can protect against this. To illustrate its use: % wc dist/circa.h 81 4252898 dist/circa.h % circa -o h2 dist/circa.h % hd h2 | grep n | wc -l 101 % sed -e 's|n|o|g' h2 > h2e % hd h2e | grep n | wc -l 0 % hd h2e | grep o | wc -l 157 % circa -d -o h3 h2e % diff dist/circa.h h3 % i.e. circa(1) can recover completely from all 101 instances of the 'n' character being transformed into 'o', in a file of 2898 characters. (hd is a shell alias for the "codecs hexdump" transformation described elsewhere). Taken from the libcirca(3) man page: DESCRIPTION The libcirca library implements a number of functions designed to protect data against errors and erasures. It uses a number of methods of doing this, and is loosely based on Cross-Interleaved Reed-Solomon Coding, as found in CDs. The libcirca draws heavily on the librs(3) library inter- nally. The aim of this library is to encode data in preparation for transmission or storage. Various erasure codes and checksums are added to the origi- nal data, in an effort to recover the original data in the face of errors in individual bits and bytes in the encoded data. This is the same idea as implemented in CD CIRC encoding. Internally, two Reed-Solomon erasure codes are employed, a 28,24 erasure code acting on the original data, and a 32,28 erasure code acting on the output from that. The net effect of these two erasure codes is that the size of the encoded data increases by (32 / 24) or (4 / 3) The circa_init() function should be called prior to using the encoding and decoding functions. circa_encode() is used to encode data so that it is protected against data corruption. It returns the number of bytes produced in the out array. To decode the original data, circa_decode() is called. When creating output files, the two functions circa_get_header() and circa_put_header() are used. INTERNALS The libcirca library performs a number of transformations, when encoding data. These transformations are modelled on the Cross Interleaved Reed-Solomon Coding as used in CDs. Delay lines can straddle sectors in CIRC encoding for CDs, whilst libcirca strictly keeps all sector data within the same sector. This has implications about integrity of data cross-sector, although other means, such as libthreshold(3) and lib(3) can be used to replicate data at a sector level, to say noth- ing of protection by other means such as RAID raid(4). A default sector is 3136 bytes in length, although this can be changed at circa_init() time with the sectorsize argument. Each 24 bytes of input data is transformed into 32 bytes of encoded data. The 24 bytes of input data is known as a C3 frame, and the 32 bytes of encoded data is known as a C1 frame. The transformations are, in encoding order: delay1Every other 4 bytes in the input stream are put into a delay slot of 1 frame. scramble Within a C3 frame, the bytes are changed to occupy different positions. This is done to mitigate the problem where a number of bytes next to each other are the subject of errors. Q-Parity A Reed Solomon 28,24 erasure code is calculated over the 24 bytes of the C3 frame. This erasure code is inserted at the half-way point of the C3 frame. This creates a C2 frame of 28 bytes. Dispersal Each bytes is striped across the sector, according to the byte offset from the start of the C2 frame. Byte b in C2 frame f will end up in frame (f + b) and byte b in the output sector. P-Parity A Reed Solomon 32,28 erasure code is calculated on the C2 frame, to create a 32-byte C1 frame. delay2Even bytes are delayed 1 frame in the output. At decoding time, the transformations to the bytes occur in the opposite order. The circa(1) utility is also pr
CVS commit: src/tests/syscall
Module Name:src
Committed By: njoly
Date: Fri May 6 22:24:41 UTC 2011
Modified Files:
src/tests/syscall: t_mprotect.c
Log Message:
Do not return for early failures; otherwise the testcase will be
reported as passed, even if not really run.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/syscall/t_mprotect.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/syscall/t_mprotect.c
diff -u src/tests/syscall/t_mprotect.c:1.5 src/tests/syscall/t_mprotect.c:1.6
--- src/tests/syscall/t_mprotect.c:1.5 Fri May 6 21:51:19 2011
+++ src/tests/syscall/t_mprotect.c Fri May 6 22:24:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mprotect.c,v 1.5 2011/05/06 21:51:19 njoly Exp $ */
+/* $NetBSD: t_mprotect.c,v 1.6 2011/05/06 22:24:41 njoly Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_mprotect.c,v 1.5 2011/05/06 21:51:19 njoly Exp $");
+__RCSID("$NetBSD: t_mprotect.c,v 1.6 2011/05/06 22:24:41 njoly Exp $");
#include
#include
@@ -116,9 +116,7 @@
int fd;
fd = open(path, O_RDONLY | O_CREAT);
-
- if (fd < 0)
- return;
+ ATF_REQUIRE(fd >= 0);
/*
* The call should fail with EACCES if we try to mark
@@ -241,9 +239,7 @@
* to the page. This should generate a SIGSEGV.
*/
map = mmap(NULL, page, PROT_WRITE|PROT_READ, MAP_ANON, -1, 0);
-
- if (map == MAP_FAILED)
- return;
+ ATF_REQUIRE(map != MAP_FAILED);
ATF_REQUIRE(strlcpy(map, "XXX", 3) == 3);
ATF_REQUIRE(mprotect(map, page, PROT_READ) == 0);
CVS commit: src/tests/syscall
Module Name:src
Committed By: njoly
Date: Fri May 6 21:51:19 UTC 2011
Modified Files:
src/tests/syscall: t_mprotect.c
Log Message:
write-only mapping is not portable, change it to read/write. Unbreaks
mprotect_write testcase on alpha.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/syscall/t_mprotect.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/syscall/t_mprotect.c
diff -u src/tests/syscall/t_mprotect.c:1.4 src/tests/syscall/t_mprotect.c:1.5
--- src/tests/syscall/t_mprotect.c:1.4 Mon Apr 25 22:29:35 2011
+++ src/tests/syscall/t_mprotect.c Fri May 6 21:51:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mprotect.c,v 1.4 2011/04/25 22:29:35 njoly Exp $ */
+/* $NetBSD: t_mprotect.c,v 1.5 2011/05/06 21:51:19 njoly Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_mprotect.c,v 1.4 2011/04/25 22:29:35 njoly Exp $");
+__RCSID("$NetBSD: t_mprotect.c,v 1.5 2011/05/06 21:51:19 njoly Exp $");
#include
#include
@@ -236,11 +236,11 @@
int sta;
/*
- * Map a page write-only, change the protection
+ * Map a page read/write, change the protection
* to read-only with mprotect(2), and try to write
* to the page. This should generate a SIGSEGV.
*/
- map = mmap(NULL, page, PROT_WRITE, MAP_ANON, -1, 0);
+ map = mmap(NULL, page, PROT_WRITE|PROT_READ, MAP_ANON, -1, 0);
if (map == MAP_FAILED)
return;
CVS commit: src/sys
Module Name:src
Committed By: drochner
Date: Fri May 6 21:48:46 UTC 2011
Modified Files:
src/sys/netipsec: xform_ah.c xform_esp.c xform_ipcomp.c
src/sys/opencrypto: crypto.c cryptodev.c
Log Message:
As a first step towards more fine-grained locking, don't require
crypto_{new.free}session() to be called with the "crypto_mtx"
spinlock held.
This doesn't change much for now because these functions acquire
the said mutex first on entry now, but at least it keeps the nasty
locks local to the opencrypto core.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/netipsec/xform_ah.c
cvs rdiff -u -r1.33 -r1.34 src/sys/netipsec/xform_esp.c
cvs rdiff -u -r1.27 -r1.28 src/sys/netipsec/xform_ipcomp.c
cvs rdiff -u -r1.38 -r1.39 src/sys/opencrypto/crypto.c
cvs rdiff -u -r1.55 -r1.56 src/sys/opencrypto/cryptodev.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/netipsec/xform_ah.c
diff -u src/sys/netipsec/xform_ah.c:1.31 src/sys/netipsec/xform_ah.c:1.32
--- src/sys/netipsec/xform_ah.c:1.31 Fri Feb 18 20:40:58 2011
+++ src/sys/netipsec/xform_ah.c Fri May 6 21:48:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ah.c,v 1.31 2011/02/18 20:40:58 drochner Exp $ */
+/* $NetBSD: xform_ah.c,v 1.32 2011/05/06 21:48:46 drochner Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.31 2011/02/18 20:40:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.32 2011/05/06 21:48:46 drochner Exp $");
#include "opt_inet.h"
#ifdef __FreeBSD__
@@ -234,12 +234,9 @@
int error;
error = ah_init0(sav, xsp, &cria);
- if (!error) {
- mutex_spin_enter(&crypto_mtx);
+ if (!error)
error = crypto_newsession(&sav->tdb_cryptoid,
&cria, crypto_support);
- mutex_spin_exit(&crypto_mtx);
- }
return error;
}
@@ -256,9 +253,7 @@
if (sav->key_auth)
memset(_KEYBUF(sav->key_auth), 0, _KEYLEN(sav->key_auth));
- mutex_spin_enter(&crypto_mtx);
err = crypto_freesession(sav->tdb_cryptoid);
- mutex_spin_exit(&crypto_mtx);
sav->tdb_cryptoid = 0;
sav->tdb_authalgxform = NULL;
sav->tdb_xform = NULL;
Index: src/sys/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.33 src/sys/netipsec/xform_esp.c:1.34
--- src/sys/netipsec/xform_esp.c:1.33 Thu May 5 20:15:14 2011
+++ src/sys/netipsec/xform_esp.c Fri May 6 21:48:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_esp.c,v 1.33 2011/05/05 20:15:14 drochner Exp $ */
+/* $NetBSD: xform_esp.c,v 1.34 2011/05/06 21:48:46 drochner Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.33 2011/05/05 20:15:14 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.34 2011/05/06 21:48:46 drochner Exp $");
#include "opt_inet.h"
#ifdef __FreeBSD__
@@ -236,7 +236,6 @@
crie.cri_key = _KEYBUF(sav->key_enc);
/* XXX Rounds ? */
- mutex_spin_enter(&crypto_mtx);
if (sav->tdb_authalgxform && sav->tdb_encalgxform) {
/* init both auth & enc */
crie.cri_next = &cria;
@@ -253,7 +252,6 @@
DPRINTF(("esp_init: no encoding OR authentication xform!\n"));
error = EINVAL;
}
- mutex_spin_exit(&crypto_mtx);
return error;
}
Index: src/sys/netipsec/xform_ipcomp.c
diff -u src/sys/netipsec/xform_ipcomp.c:1.27 src/sys/netipsec/xform_ipcomp.c:1.28
--- src/sys/netipsec/xform_ipcomp.c:1.27 Thu May 5 20:15:15 2011
+++ src/sys/netipsec/xform_ipcomp.c Fri May 6 21:48:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ipcomp.c,v 1.27 2011/05/05 20:15:15 drochner Exp $ */
+/* $NetBSD: xform_ipcomp.c,v 1.28 2011/05/06 21:48:46 drochner Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_ipcomp.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.27 2011/05/05 20:15:15 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.28 2011/05/06 21:48:46 drochner Exp $");
/* IP payload compression protocol (IPComp), see RFC 2393 */
#include "opt_inet.h"
@@ -126,9 +126,7 @@
memset(&cric, 0, sizeof (cric));
cric.cri_alg = sav->tdb_compalgxform->type;
- mutex_spin_enter(&crypto_mtx);
ses = crypto_newsession(&sav->tdb_cryptoid, &cric, crypto_support);
- mutex_spin_exit(&crypto_mtx);
return ses;
}
@@ -140,9 +138,7 @@
{
int err;
- mutex_spin_enter(&crypto_mtx);
err = crypto_freesession(sav->tdb_cryptoid);
- mutex_spin_exit(&crypto_mtx);
sav->tdb_cryptoid = 0;
return err;
}
Index: src/sys/opencrypto/crypto.c
diff -u src/sys/opencrypto/crypto.c:1.38 src/sys/opencrypto/crypto.c:1.39
--- src/sys/opencrypto/crypt
CVS commit: src/distrib/zaurus/ramdisk
Module Name:src
Committed By: tsutsui
Date: Fri May 6 18:33:59 UTC 2011
Modified Files:
src/distrib/zaurus/ramdisk: Makefile
Log Message:
Specify DGB=-Os to make libhack a bit smaller.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/zaurus/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/zaurus/ramdisk/Makefile
diff -u src/distrib/zaurus/ramdisk/Makefile:1.12 src/distrib/zaurus/ramdisk/Makefile:1.13
--- src/distrib/zaurus/ramdisk/Makefile:1.12 Thu May 5 09:07:59 2011
+++ src/distrib/zaurus/ramdisk/Makefile Fri May 6 18:33:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2011/05/05 09:07:59 nonaka Exp $
+# $NetBSD: Makefile,v 1.13 2011/05/06 18:33:59 tsutsui Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,6 +8,7 @@
MAKEFS_FLAGS= -f 14
WARNS= 1
+DBG= -Os
CRUNCHBIN= ramdiskbin
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
CVS commit: src/distrib/zaurus/ramdisk
Module Name:src Committed By: tsutsui Date: Fri May 6 18:33:00 UTC 2011 Modified Files: src/distrib/zaurus/ramdisk: dot.profile list Log Message: Use /sbin/dmesg directly rather than kernfs and /kern/msgbuf as other ports. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/zaurus/ramdisk/dot.profile cvs rdiff -u -r1.15 -r1.16 src/distrib/zaurus/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/zaurus/ramdisk/dot.profile diff -u src/distrib/zaurus/ramdisk/dot.profile:1.2 src/distrib/zaurus/ramdisk/dot.profile:1.3 --- src/distrib/zaurus/ramdisk/dot.profile:1.2 Sun Mar 14 12:36:32 2010 +++ src/distrib/zaurus/ramdisk/dot.profile Fri May 6 18:32:59 2011 @@ -1,4 +1,4 @@ -# $NetBSD: dot.profile,v 1.2 2010/03/14 12:36:32 nonaka Exp $ +# $NetBSD: dot.profile,v 1.3 2011/05/06 18:32:59 tsutsui Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -60,13 +60,9 @@ # mount the ramdisk read write mount -u $ROOTDEV / - # mount the kern_fs so that we can examine the dmesg state - mount -t kernfs /kern /kern - # pull in the functions that people will use from the shell prompt. # . /.commonutils # . /.instutils - dmesg() cat /kern/msgbuf grep() sed -n "/$1/p" # run the installation or upgrade script. Index: src/distrib/zaurus/ramdisk/list diff -u src/distrib/zaurus/ramdisk/list:1.15 src/distrib/zaurus/ramdisk/list:1.16 --- src/distrib/zaurus/ramdisk/list:1.15 Thu May 5 09:07:59 2011 +++ src/distrib/zaurus/ramdisk/list Fri May 6 18:32:59 2011 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.15 2011/05/05 09:07:59 nonaka Exp $ +# $NetBSD: list,v 1.16 2011/05/06 18:32:59 tsutsui Exp $ # usr.bin/less has to be first, otherwise the ramdisk.mk generation fails SRCDIRS usr.bin/less bin sbin usr.bin usr.sbin gnu/usr.bin @@ -24,6 +24,7 @@ PROG sbin/chown bin/chgrp PROG sbin/disklabel +PROG sbin/dmesg PROG sbin/fdisk PROG sbin/fsck PROG sbin/fsck_ffs @@ -32,7 +33,6 @@ PROG sbin/mknod PROG sbin/mount PROG sbin/mount_ffs -PROG sbin/mount_kernfs PROG sbin/mount_msdos PROG sbin/mount_nfs PROG sbin/newfs sbin/mount_mfs
CVS commit: src/lib/libpam/modules/pam_ssh
Module Name:src
Committed By: drochner
Date: Fri May 6 17:22:09 UTC 2011
Modified Files:
src/lib/libpam/modules/pam_ssh: pam_ssh.c
Log Message:
remove excess newlines in debug output
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libpam/modules/pam_ssh/pam_ssh.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/modules/pam_ssh/pam_ssh.c
diff -u src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.16 src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.17
--- src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.16 Sun Nov 21 20:41:36 2010
+++ src/lib/libpam/modules/pam_ssh/pam_ssh.c Fri May 6 17:22:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_ssh.c,v 1.16 2010/11/21 20:41:36 adam Exp $ */
+/* $NetBSD: pam_ssh.c,v 1.17 2011/05/06 17:22:09 drochner Exp $ */
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
@@ -38,7 +38,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.40 2004/02/10 10:13:21 des Exp $");
#else
-__RCSID("$NetBSD: pam_ssh.c,v 1.16 2010/11/21 20:41:36 adam Exp $");
+__RCSID("$NetBSD: pam_ssh.c,v 1.17 2011/05/06 17:22:09 drochner Exp $");
#endif
#include
@@ -107,13 +107,13 @@
comment = NULL;
key = key_load_private(fn, passphrase, &comment);
if (key == NULL) {
- openpam_log(PAM_LOG_DEBUG, "failed to load key from %s\n", fn);
+ openpam_log(PAM_LOG_DEBUG, "failed to load key from %s", fn);
if (comment != NULL)
free(comment);
return (NULL);
}
- openpam_log(PAM_LOG_DEBUG, "loaded '%s' from %s\n", comment, fn);
+ openpam_log(PAM_LOG_DEBUG, "loaded '%s' from %s", comment, fn);
if ((psk = malloc(sizeof(*psk))) == NULL) {
key_free(key);
free(comment);
CVS commit: src/doc
Module Name:src Committed By: taca Date: Fri May 6 15:29:06 UTC 2011 Modified Files: src/doc: 3RDPARTY Log Message: BIND 9.8.0-P1 has released. To generate a diff of this commit: cvs rdiff -u -r1.833 -r1.834 src/doc/3RDPARTY 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.833 src/doc/3RDPARTY:1.834 --- src/doc/3RDPARTY:1.833 Fri Apr 29 08:26:33 2011 +++ src/doc/3RDPARTY Fri May 6 15:29:06 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.833 2011/04/29 08:26:33 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.834 2011/05/06 15:29:06 taca Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -93,7 +93,7 @@ Package: bind [named and utils] Version: 9.8.0rc1 -Current Vers: 9.8.0rc1 +Current Vers: 9.8.0-P1 Maintainer: Paul Vixie Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/sw/bind/
CVS commit: src/external/bsd/bind/dist/bin/named
Module Name:src
Committed By: taca
Date: Fri May 6 15:28:20 UTC 2011
Modified Files:
src/external/bsd/bind/dist/bin/named: query.c
Log Message:
Apply fix by BIND 9.8.0-P1: https://www.isc.org/CVE-2011-1907.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/dist/bin/named/query.c
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/bind/dist/bin/named/query.c
diff -u src/external/bsd/bind/dist/bin/named/query.c:1.2 src/external/bsd/bind/dist/bin/named/query.c:1.3
--- src/external/bsd/bind/dist/bin/named/query.c:1.2 Wed Feb 16 03:46:46 2011
+++ src/external/bsd/bind/dist/bin/named/query.c Fri May 6 15:28:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.2 2011/02/16 03:46:46 christos Exp $ */
+/* $NetBSD: query.c,v 1.3 2011/05/06 15:28:19 taca Exp $ */
/*
* Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
@@ -4089,9 +4089,15 @@
if (dns_rdataset_isassociated(*rdatasetp))
dns_rdataset_disassociate(*rdatasetp);
dns_db_detachnode(*dbp, nodep);
- result = dns_db_find(*dbp, qnamef, version, qtype, 0,
- client->now, nodep, found,
- *rdatasetp, NULL);
+
+ if (qtype == dns_rdatatype_rrsig ||
+ qtype == dns_rdatatype_sig)
+result = DNS_R_NXRRSET;
+ else
+result = dns_db_find(*dbp, qnamef, version,
+ qtype, 0, client->now,
+ nodep, found, *rdatasetp,
+ NULL);
}
}
switch (result) {
CVS commit: src/usr.sbin/perfused
Module Name:src
Committed By: manu
Date: Fri May 6 13:45:35 UTC 2011
Modified Files:
src/usr.sbin/perfused: msg.c
Log Message:
Display actual error from FUSE on failures
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/perfused/msg.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.sbin/perfused/msg.c
diff -u src/usr.sbin/perfused/msg.c:1.10 src/usr.sbin/perfused/msg.c:1.11
--- src/usr.sbin/perfused/msg.c:1.10 Mon Apr 25 04:30:59 2011
+++ src/usr.sbin/perfused/msg.c Fri May 6 13:45:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.c,v 1.10 2011/04/25 04:30:59 manu Exp $ */
+/* $NetBSD: msg.c,v 1.11 2011/05/06 13:45:35 manu Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -314,7 +314,7 @@
DPRINTF("< unique = %"PRId64", nodeid = %"PRId64", "
"opcode = %s (%d), "
"error = %d\n", unique_out, nodeid,
- perfuse_opname(opcode), opcode, error);
+ perfuse_opname(opcode), opcode, foh->error);
if (perfuse_diagflags & PDF_DUMP)
perfuse_hexdump((char *)foh, foh->len);
CVS commit: src/sys/netinet
Module Name:src
Committed By: drochner
Date: Fri May 6 12:52:43 UTC 2011
Modified Files:
src/sys/netinet: tcp_vtw.c
Log Message:
remove an empty function
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/netinet/tcp_vtw.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/netinet/tcp_vtw.c
diff -u src/sys/netinet/tcp_vtw.c:1.1 src/sys/netinet/tcp_vtw.c:1.2
--- src/sys/netinet/tcp_vtw.c:1.1 Tue May 3 18:28:45 2011
+++ src/sys/netinet/tcp_vtw.c Fri May 6 12:52:43 2011
@@ -77,11 +77,10 @@
#include
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.1 2011/05/03 18:28:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.2 2011/05/06 12:52:43 drochner Exp $");
#define db_trace(__a, __b) do { } while (/*CONSTCOND*/0)
-static void k_vtw(int c, char **v);
static void vtw_debug_init(void);
fatp_ctl_t fat_tcpv4;
@@ -171,8 +170,6 @@
{
fatp_t *fp;
- k_vtw(0,0);
-
KASSERT(n <= FATP_MAX / 2);
fat->hash = kmem_alloc(2*m * sizeof (fatp_t *), KM_SLEEP);
@@ -2417,9 +2414,3 @@
return;
}
#endif /* !VTW_DEBUG */
-
-static void
-k_vtw(int c, char **v)
-{
- return;
-}
