CVS commit: src/tests/lib/librumphijack
Module Name:src Committed By: pooka Date: Sat Feb 12 10:28:08 UTC 2011 Modified Files: src/tests/lib/librumphijack: h_client.c t_asyncio.sh Log Message: Add test case from PR lib/44552 by Alexander Nasonov. I also lobbed in a test for select(0, NULL, NULL, NULL, tv) in there. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/librumphijack/h_client.c \ src/tests/lib/librumphijack/t_asyncio.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/lib/librumphijack/h_client.c diff -u src/tests/lib/librumphijack/h_client.c:1.1 src/tests/lib/librumphijack/h_client.c:1.2 --- src/tests/lib/librumphijack/h_client.c:1.1 Fri Feb 11 15:38:14 2011 +++ src/tests/lib/librumphijack/h_client.c Sat Feb 12 10:28:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: h_client.c,v 1.1 2011/02/11 15:38:14 pooka Exp $ */ +/* $NetBSD: h_client.c,v 1.2 2011/02/12 10:28:08 pooka Exp $ */ /* * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -65,6 +65,29 @@ if (FD_ISSET(STDIN_FILENO, rfds)) errx(1, stdin fileno is still set); exit(0); + } else if (strcmp(argv[1], select_allunset) == 0) { + fd_set fds; + struct timeval tv; + int rv; + + tv.tv_sec = 0; + tv.tv_usec = 1; + + FD_ZERO(fds); + + rv = select(100, fds, fds, fds, tv); + if (rv == -1) + err(1, select); + if (rv != 0) + errx(1, select succesful); + + rv = select(0, NULL, NULL, NULL, tv); + if (rv == -1) + err(1, select2); + if (rv != 0) + errx(1, select2 succesful); + + exit(0); } else { return ENOTSUP; } Index: src/tests/lib/librumphijack/t_asyncio.sh diff -u src/tests/lib/librumphijack/t_asyncio.sh:1.1 src/tests/lib/librumphijack/t_asyncio.sh:1.2 --- src/tests/lib/librumphijack/t_asyncio.sh:1.1 Fri Feb 11 15:38:14 2011 +++ src/tests/lib/librumphijack/t_asyncio.sh Sat Feb 12 10:28:08 2011 @@ -1,4 +1,4 @@ -# $NetBSD: t_asyncio.sh,v 1.1 2011/02/11 15:38:14 pooka Exp $ +# $NetBSD: t_asyncio.sh,v 1.2 2011/02/12 10:28:08 pooka Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -47,7 +47,27 @@ rump.halt } +atf_test_case select_allunset cleanup +select_allunset_head() +{ +atf_set descr select() with no set fds in fd_set should not crash +} + +select_allunset_body() +{ + + atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER} + atf_check -s exit:0 env LD_PRELOAD=/usr/lib/librumphijack.so \ + $(atf_get_srcdir)/h_client select_allunset +} + +select_allunset_cleanup() +{ + rump.halt +} + atf_init_test_cases() { atf_add_test_case select_timeout + atf_add_test_case select_allunset }
CVS commit: src/crypto/external/bsd/libsaslc/dist/src
Module Name:src Committed By: christos Date: Sat Feb 12 14:24:19 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/dist/src: dict.c Log Message: remove NULL check, can't happen. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/libsaslc/dist/src/dict.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/external/bsd/libsaslc/dist/src/dict.c diff -u src/crypto/external/bsd/libsaslc/dist/src/dict.c:1.3 src/crypto/external/bsd/libsaslc/dist/src/dict.c:1.4 --- src/crypto/external/bsd/libsaslc/dist/src/dict.c:1.3 Fri Feb 11 18:44:43 2011 +++ src/crypto/external/bsd/libsaslc/dist/src/dict.c Sat Feb 12 09:24:18 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dict.c,v 1.3 2011/02/11 23:44:43 christos Exp $ */ +/* $NetBSD: dict.c,v 1.4 2011/02/12 14:24:18 christos Exp $ */ /* Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: dict.c,v 1.3 2011/02/11 23:44:43 christos Exp $); +__RCSID($NetBSD: dict.c,v 1.4 2011/02/12 14:24:18 christos Exp $); #include sys/queue.h #include ctype.h @@ -115,9 +115,6 @@ saslc__dict_valid_key(const char *key) { /* key is empty string */ -if (key == NULL) -return false; - if (!isalpha((unsigned char)*key)) return false;
CVS commit: src/sys/external/bsd/drm/dist/bsd-core
Module Name:src Committed By: jmcneill Date: Sat Feb 12 14:49:55 UTC 2011 Modified Files: src/sys/external/bsd/drm/dist/bsd-core: drm_memory.c Log Message: wsdisplay isn't module friendly so don't add genfb support to the kmod for now To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm/dist/bsd-core/drm_memory.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/external/bsd/drm/dist/bsd-core/drm_memory.c diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.8 src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.9 --- src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c:1.8 Fri Feb 11 01:13:02 2011 +++ src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c Sat Feb 12 14:49:54 2011 @@ -47,7 +47,7 @@ #include genfb.h # else # define NAGP_I810 1 -# define NGENFB 1 +# define NGENFB 0 # endif # endif # if NAGP_I810 0
CVS commit: src/sys/modules/hdafg
Module Name:src Committed By: jmcneill Date: Sat Feb 12 15:15:56 UTC 2011 Modified Files: src/sys/modules/hdafg: Makefile Log Message: build hdafg_dd.c To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/hdafg/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/hdafg/Makefile diff -u src/sys/modules/hdafg/Makefile:1.2 src/sys/modules/hdafg/Makefile:1.3 --- src/sys/modules/hdafg/Makefile:1.2 Sat Feb 12 15:01:00 2011 +++ src/sys/modules/hdafg/Makefile Sat Feb 12 15:15:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/02/12 15:01:00 jmcneill Exp $ +# $NetBSD: Makefile,v 1.3 2011/02/12 15:15:56 jmcneill Exp $ .include ../Makefile.inc @@ -6,7 +6,7 @@ KMOD= hdafg IOCONF= hdafg.ioconf -SRCS= hdafg.c +SRCS= hdafg.c hdafg_dd.c WARNS= 3
CVS commit: src/sys/arch/hp300
Module Name:src Committed By: tsutsui Date: Sat Feb 12 15:49:02 UTC 2011 Modified Files: src/sys/arch/hp300/conf: GENERIC files.hp300 Added Files: src/sys/arch/hp300/dev: dnkbd.c dnkbdmap.c dnkbdmap.h Log Message: Pull Apollo Domain keyboard and mouse support from OpenBSD. Untested (no hardware), but no bad sideeffect on 425t without Domain keyboard. This is the last portion of new hp300 kernel features submitted in PR port-hp300/3528 back in 1997, and I think finally we can close it. To generate a diff of this commit: cvs rdiff -u -r1.163 -r1.164 src/sys/arch/hp300/conf/GENERIC cvs rdiff -u -r1.81 -r1.82 src/sys/arch/hp300/conf/files.hp300 cvs rdiff -u -r0 -r1.1 src/sys/arch/hp300/dev/dnkbd.c \ src/sys/arch/hp300/dev/dnkbdmap.c src/sys/arch/hp300/dev/dnkbdmap.h 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/hp300/conf/GENERIC diff -u src/sys/arch/hp300/conf/GENERIC:1.163 src/sys/arch/hp300/conf/GENERIC:1.164 --- src/sys/arch/hp300/conf/GENERIC:1.163 Sat Feb 12 05:15:39 2011 +++ src/sys/arch/hp300/conf/GENERIC Sat Feb 12 15:49:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.163 2011/02/12 05:15:39 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.164 2011/02/12 15:49:01 tsutsui Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.163 $ +#ident GENERIC-$Revision: 1.164 $ maxusers 32 # estimated number of users @@ -210,9 +210,9 @@ nhpib* at intio? # slow internal HP-IB # 8250-like serial ports found on Frodo ASIC -#dnkbd0 at frodo? offset 0x0 # Domain keyboard flavor -#wskbd* at dnkbd? mux 1 -#wsmouse* at dnkbd? mux 0 +dnkbd0 at frodo? offset 0x0 # Domain keyboard flavor +wskbd* at dnkbd? mux 1 +wsmouse* at dnkbd? mux 0 com* at frodo? offset ? # tty flavor dvbox* at intio? # Davinci framebuffer Index: src/sys/arch/hp300/conf/files.hp300 diff -u src/sys/arch/hp300/conf/files.hp300:1.81 src/sys/arch/hp300/conf/files.hp300:1.82 --- src/sys/arch/hp300/conf/files.hp300:1.81 Sat Feb 12 05:15:39 2011 +++ src/sys/arch/hp300/conf/files.hp300 Sat Feb 12 15:49:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.hp300,v 1.81 2011/02/12 05:15:39 tsutsui Exp $ +# $NetBSD: files.hp300,v 1.82 2011/02/12 15:49:01 tsutsui Exp $ # # hp300-specific configuration info @@ -80,10 +80,10 @@ file arch/hp300/dev/com_frodo.c com_frodo needs-flag # Apollo Keyboard and mouse -#device dnkbd: wskbddev, wsmousedev -#attach dnkbd at frodo -#file arch/hp300/dev/dnkbd.c dnkbd needs-flag -#file arch/hp300/dev/dnkbdmap.c dnkbd +device dnkbd: wskbddev, wsmousedev +attach dnkbd at frodo +file arch/hp300/dev/dnkbd.c dnkbd needs-flag +file arch/hp300/dev/dnkbdmap.c dnkbd # # Frame buffer devices on Internal I/O and the DIO bus Added files: Index: src/sys/arch/hp300/dev/dnkbd.c diff -u /dev/null src/sys/arch/hp300/dev/dnkbd.c:1.1 --- /dev/null Sat Feb 12 15:49:02 2011 +++ src/sys/arch/hp300/dev/dnkbd.c Sat Feb 12 15:49:01 2011 @@ -0,0 +1,1138 @@ +/* $NetBSD: dnkbd.c,v 1.1 2011/02/12 15:49:01 tsutsui Exp $ */ +/* $OpenBSD: dnkbd.c,v 1.17 2009/07/23 21:05:56 blambert Exp $ */ + +/* + * Copyright (c) 2005, Miodrag Vallat + * Copyright (c) 1997 Michael Smith. 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 AND CONTRIBUTORS ``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. + */ + +/* + * Driver for the Apollo Domain keyboard and mouse. + */ + +#include sys/param.h +#include sys/systm.h +#include sys/device.h +#include sys/ioctl.h +#include sys/kernel.h +#include sys/callout.h +#include sys/conf.h +#include sys/bus.h +#include sys/cpu.h + +#include machine/autoconf.h + +#include
CVS commit: src/crypto/external/bsd/libsaslc/dist/man
Module Name:src Committed By: wiz Date: Sat Feb 12 15:58:03 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/dist/man: libsaslc.3 Log Message: Remove trailing whitespace and superfluous Pp before new sections. Use Nm instead of Xr'ing itself. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 diff -u src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.4 src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.5 --- src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.4 Fri Feb 11 23:44:42 2011 +++ src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 Sat Feb 12 15:58:03 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: libsaslc.3,v 1.4 2011/02/11 23:44:42 christos Exp $ +.\ $NetBSD: libsaslc.3,v 1.5 2011/02/12 15:58:03 wiz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -57,35 +57,35 @@ .Sh SYNOPSIS .In saslc.h .Ft saslc_t * -.Fn saslc_alloc void +.Fn saslc_alloc void .Ft int .Fn saslc_end saslc_t *ctx .Ft int .Fn saslc_init saslc_t *ctx const char *appname const char *cfgpath .Ft int .Fn saslc_sess_cont saslc_sess_t *sess const void *in size_t inlen \ -void* *out size_t *outlen +void* *out size_t *outlen .Ft ssize_t .Fn saslc_sess_decode saslc_sess_t *sess const void *in size_t inlen \ -void* *out size_t *outlen +void* *out size_t *outlen .Ft ssize_t .Fn saslc_sess_encode saslc_sess_t *sess const void *in size_t inlen \ -void* *out size_t *outlen +void* *out size_t *outlen .Ft void -.Fn saslc_sess_end saslc_sess_t *sess +.Fn saslc_sess_end saslc_sess_t *sess .Ft const char * .Fn saslc_sess_getmech saslc_sess_t * .Ft const char * -.Fn saslc_sess_getprop saslc_sess_t *sess const char *key +.Fn saslc_sess_getprop saslc_sess_t *sess const char *key .Ft saslc_sess_t * .Fn saslc_sess_init saslc_t *ctx const char *mechs const char *secopts .Ft int .Fn saslc_sess_setprop saslc_sess_t *sess const char *key \ const char *value .Ft const char * -.Fn saslc_sess_strerror saslc_sess_t *sess +.Fn saslc_sess_strerror saslc_sess_t *sess .Ft const char * -.Fn saslc_strerror saslc_t *ctx +.Fn saslc_strerror saslc_t *ctx .Sh DESCRIPTION The .Fn saslc_alloc @@ -174,7 +174,7 @@ function sets the property indexed by .Ar key to the value -.Ar value +.Ar value in the session .Ar sess dictionary. @@ -214,7 +214,7 @@ buffer and stores .Ar outlen bytes of output data in -.Ar out +.Ar out .Pq for the server . The user is responsible for freeing memory allocated for .Ar out . @@ -257,7 +257,7 @@ with .Ar inlen = 0. -In this case, +In this case, .Fn saslc_sess_encode returns the number of bytes that were flushed from the internal buffer. .Pp @@ -349,9 +349,8 @@ return 0; } .Ed -.Pp .Sh CONFIGURATION -.Xr libsaslc 3 +.Nm uses three types of dictionaries: context (or global), session, and mechanism, and they are searched in that order by .Fn saslc_getprop @@ -440,10 +439,9 @@ Any base supported by .Xr strtoll 3 is allowed. -.Pp .Sh PROPERTIES Most of the control of the -.Xr libsaslc 3 +.Nm behavior is done via setting various properties in the context or mechanism dictionaries via the configuration files or in the session dictionary with @@ -567,12 +565,11 @@ .Pa saslc.h should be used in code, but their values need to be used in the config files. -.Pp .Sh ENVIRONMENT The following environment variables .Pq defined in Pa saslc.h affect the behavior of -.Xr libsaslc 3 : +.Nm : .Bl -tag -width indent .It Ev SASLC_ENV_CONFIG Po Qo SASLC_CONFIG Qc Pc If the environment variable @@ -674,7 +671,7 @@ .Pa /etc/krb5.keytab . Setup the .Pa /etc/saslc.d -configuration directory +configuration directory .Pq see CONFIGURATION above . Add the line .Bd -literal -offset indent @@ -694,7 +691,7 @@ .Pa /etc/postfix/main.cf file to do this: .Bd -literal -offset indent -smtp_sasl_auth_enable = yes +smtp_sasl_auth_enable = yes smtp_sasl_type = saslc smtp_sasl_mechanism_filter = GSSAPI relayhost = [server.my.domain]:submission @@ -712,7 +709,6 @@ .Pp to obtain a ticket for the postfix user with the postfix credential and you should be good to go! -.Pp .Sh STANDARDS RFC 2195, RFC , RFC 2245, RFC 2595, RFC 2831, RFC 4422, RFC 4505, RFC 4616, RFC 4752.
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Sat Feb 12 16:30:22 UTC 2011 Modified Files: src/sys/arch/hp300/dev: dnkbd.c Log Message: Make this compile properly with options WSDISPLAY_COMPAT_RAWKBD. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hp300/dev/dnkbd.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/hp300/dev/dnkbd.c diff -u src/sys/arch/hp300/dev/dnkbd.c:1.1 src/sys/arch/hp300/dev/dnkbd.c:1.2 --- src/sys/arch/hp300/dev/dnkbd.c:1.1 Sat Feb 12 15:49:01 2011 +++ src/sys/arch/hp300/dev/dnkbd.c Sat Feb 12 16:30:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dnkbd.c,v 1.1 2011/02/12 15:49:01 tsutsui Exp $ */ +/* $NetBSD: dnkbd.c,v 1.2 2011/02/12 16:30:22 tsutsui Exp $ */ /* $OpenBSD: dnkbd.c,v 1.17 2009/07/23 21:05:56 blambert Exp $ */ /* @@ -31,6 +31,8 @@ * Driver for the Apollo Domain keyboard and mouse. */ +#include opt_wsdisplay_compat.h + #include sys/param.h #include sys/systm.h #include sys/device.h @@ -681,7 +683,7 @@ int c, j = 0; c = dnkbd_raw[key]; - if (c != RAWKEY_Null) { + if (c != 0) { /* fake extended scancode if necessary */ if (c 0x80) cbuf[j++] = 0xe0;
CVS commit: src/sys/arch/alpha
Module Name:src Committed By: matt Date: Sat Feb 12 16:30:43 UTC 2011 Modified Files: src/sys/arch/alpha/alpha: linux_sigcode.s src/sys/arch/alpha/include: asm.h Log Message: Use .pushsection/.popsection for __KERNEL_RCSID/__KERNEL_COPYRIGHT. Add an explicit .text to linux_sigcode.s To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/alpha/linux_sigcode.s cvs rdiff -u -r1.31 -r1.32 src/sys/arch/alpha/include/asm.h 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/alpha/alpha/linux_sigcode.s diff -u src/sys/arch/alpha/alpha/linux_sigcode.s:1.3 src/sys/arch/alpha/alpha/linux_sigcode.s:1.4 --- src/sys/arch/alpha/alpha/linux_sigcode.s:1.3 Mon Apr 28 20:23:10 2008 +++ src/sys/arch/alpha/alpha/linux_sigcode.s Sat Feb 12 16:30:42 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sigcode.s,v 1.3 2008/04/28 20:23:10 martin Exp $ */ +/* $NetBSD: linux_sigcode.s,v 1.4 2011/02/12 16:30:42 matt Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -63,12 +63,13 @@ #include machine/asm.h -__KERNEL_RCSID(0, $NetBSD: linux_sigcode.s,v 1.3 2008/04/28 20:23:10 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: linux_sigcode.s,v 1.4 2011/02/12 16:30:42 matt Exp $); #include assym.h .stabs __FILE__,132,0,0,kernel_text + .text /* * Linux signal trampoline code. Almost identical to the normal one. */ Index: src/sys/arch/alpha/include/asm.h diff -u src/sys/arch/alpha/include/asm.h:1.31 src/sys/arch/alpha/include/asm.h:1.32 --- src/sys/arch/alpha/include/asm.h:1.31 Mon Dec 20 21:11:24 2010 +++ src/sys/arch/alpha/include/asm.h Sat Feb 12 16:30:43 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.31 2010/12/20 21:11:24 joerg Exp $ */ +/* $NetBSD: asm.h,v 1.32 2011/02/12 16:30:43 matt Exp $ */ /* * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University @@ -646,7 +646,7 @@ #ifdef _KERNEL #define __KERNEL_SECTIONSTRING(_sec, _str)\ - .section _sec ; .asciz _str ; .text + .pushsection _sec ; .asciz _str ; .popsection #define __KERNEL_RCSID(_n, _s) __KERNEL_SECTIONSTRING(.ident, _s) #define __KERNEL_COPYRIGHT(_n, _s) __KERNEL_SECTIONSTRING(.copyright, _s)
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: matt Date: Sat Feb 12 16:31:33 UTC 2011 Modified Files: src/sys/arch/hppa/include: asm.h Log Message: Put RCSIDs in section .ident. (use .pushsection/.popsection) To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/include/asm.h 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/hppa/include/asm.h diff -u src/sys/arch/hppa/include/asm.h:1.12 src/sys/arch/hppa/include/asm.h:1.13 --- src/sys/arch/hppa/include/asm.h:1.12 Mon Dec 20 21:11:24 2010 +++ src/sys/arch/hppa/include/asm.h Sat Feb 12 16:31:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.12 2010/12/20 21:11:24 joerg Exp $ */ +/* $NetBSD: asm.h,v 1.13 2011/02/12 16:31:32 matt Exp $ */ /* $OpenBSD: asm.h,v 1.12 2001/03/29 02:15:57 mickey Exp $ */ @@ -97,9 +97,9 @@ #define ALTENTRY(x) ! .export x, entry ! .label x #define EXIT(x) ! .exit ! .procend ! .size x, .-x -#define RCSID(x) .text!\ +#define RCSID(x) .pushsection .ident !\ .asciz x !\ - .align 4 + .popsection #define WEAK_ALIAS(alias,sym)\ .weak alias ! \
CVS commit: src/sys/arch/m68k/include
Module Name:src Committed By: matt Date: Sat Feb 12 16:32:37 UTC 2011 Modified Files: src/sys/arch/m68k/include: asm.h Log Message: Put RCSIDs in section .ident. (use .pushsection/.popsection) To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/m68k/include/asm.h 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/m68k/include/asm.h diff -u src/sys/arch/m68k/include/asm.h:1.27 src/sys/arch/m68k/include/asm.h:1.28 --- src/sys/arch/m68k/include/asm.h:1.27 Mon Dec 20 21:11:25 2010 +++ src/sys/arch/m68k/include/asm.h Sat Feb 12 16:32:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.27 2010/12/20 21:11:25 joerg Exp $ */ +/* $NetBSD: asm.h,v 1.28 2011/02/12 16:32:36 matt Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -135,9 +135,9 @@ #define ALTENTRY(name, rname) _ENTRY(_C_LABEL(name)) #endif -#define RCSID(x) .text ; \ +#define RCSID(x) .pushsection .ident ; \ .asciz x ; \ - .even + .popsection /* * Global variables of whatever sort.
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Sat Feb 12 16:36:37 UTC 2011 Modified Files: src/sys/arch/hp300/dev: dnkbdmap.c Log Message: Make sure to include opt_wsdisplay_compat.h for WSDISPLAY_COMPAT_RAWKBD. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hp300/dev/dnkbdmap.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/hp300/dev/dnkbdmap.c diff -u src/sys/arch/hp300/dev/dnkbdmap.c:1.1 src/sys/arch/hp300/dev/dnkbdmap.c:1.2 --- src/sys/arch/hp300/dev/dnkbdmap.c:1.1 Sat Feb 12 15:49:01 2011 +++ src/sys/arch/hp300/dev/dnkbdmap.c Sat Feb 12 16:36:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dnkbdmap.c,v 1.1 2011/02/12 15:49:01 tsutsui Exp $ */ +/* $NetBSD: dnkbdmap.c,v 1.2 2011/02/12 16:36:37 tsutsui Exp $ */ /* $OpenBSD: dnkbdmap.c,v 1.2 2005/05/06 22:22:53 miod Exp $ */ /* * Copyright (c) 2005, Miodrag Vallat @@ -25,6 +25,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include opt_wsdisplay_compat.h + #include sys/types.h #include dev/wscons/wsksymdef.h
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Sat Feb 12 16:37:33 UTC 2011 Modified Files: src/sys/arch/hp300/dev: dnkbd.c Log Message: Fix one more porting botch inside #ifdef WSDISPLAY_COMPAT_RAWKBD. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp300/dev/dnkbd.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/hp300/dev/dnkbd.c diff -u src/sys/arch/hp300/dev/dnkbd.c:1.2 src/sys/arch/hp300/dev/dnkbd.c:1.3 --- src/sys/arch/hp300/dev/dnkbd.c:1.2 Sat Feb 12 16:30:22 2011 +++ src/sys/arch/hp300/dev/dnkbd.c Sat Feb 12 16:37:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dnkbd.c,v 1.2 2011/02/12 16:30:22 tsutsui Exp $ */ +/* $NetBSD: dnkbd.c,v 1.3 2011/02/12 16:37:32 tsutsui Exp $ */ /* $OpenBSD: dnkbd.c,v 1.17 2009/07/23 21:05:56 blambert Exp $ */ /* @@ -991,7 +991,7 @@ #ifdef WSDISPLAY_COMPAT_RAWKBD case WSKBDIO_SETMODE: sc-sc_rawkbd = *(int *)data == WSKBD_RAW; - timeout_del(sc-sc_rawrepeat_ch); + callout_stop(sc-sc_rawrepeat_ch); return (0); #endif }
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Sat Feb 12 16:40:29 UTC 2011 Modified Files: src/sys/arch/hp300/dev: diofb.c diofb_mono.c diofbreg.h diofbvar.h dvbox.c dvboxreg.h gbox.c gboxreg.h hyper.c hyperreg.h rbox.c rboxreg.h topcat.c topcatreg.h tvrx.c Log Message: - make local functions static - some KNF To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hp300/dev/diofb.c \ src/sys/arch/hp300/dev/diofb_mono.c src/sys/arch/hp300/dev/dvbox.c \ src/sys/arch/hp300/dev/dvboxreg.h src/sys/arch/hp300/dev/gbox.c \ src/sys/arch/hp300/dev/gboxreg.h src/sys/arch/hp300/dev/hyper.c \ src/sys/arch/hp300/dev/hyperreg.h src/sys/arch/hp300/dev/rbox.c \ src/sys/arch/hp300/dev/rboxreg.h src/sys/arch/hp300/dev/topcat.c \ src/sys/arch/hp300/dev/topcatreg.h src/sys/arch/hp300/dev/tvrx.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp300/dev/diofbreg.h \ src/sys/arch/hp300/dev/diofbvar.h 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/hp300/dev/diofb.c diff -u src/sys/arch/hp300/dev/diofb.c:1.1 src/sys/arch/hp300/dev/diofb.c:1.2 --- src/sys/arch/hp300/dev/diofb.c:1.1 Sun Feb 6 18:26:51 2011 +++ src/sys/arch/hp300/dev/diofb.c Sat Feb 12 16:40:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: diofb.c,v 1.1 2011/02/06 18:26:51 tsutsui Exp $ */ +/* $NetBSD: diofb.c,v 1.2 2011/02/12 16:40:29 tsutsui Exp $ */ /* $OpenBSD: diofb.c,v 1.18 2010/12/26 15:40:59 miod Exp $ */ /* @@ -80,12 +80,12 @@ #include hp300/dev/diofbreg.h #include hp300/dev/diofbvar.h -void diofb_do_cursor(struct rasops_info *); -void diofb_copycols(void *, int, int, int, int); -void diofb_erasecols(void *, int, int, int, long); -void diofb_copyrows(void *, int, int, int); -void diofb_eraserows(void *, int, int, long); -int diofb_allocattr(void *, int, int, int, long *); +static void diofb_do_cursor(struct rasops_info *); +static void diofb_copycols(void *, int, int, int, int); +static void diofb_erasecols(void *, int, int, int, long); +static void diofb_copyrows(void *, int, int, int); +static void diofb_eraserows(void *, int, int, long); +static int diofb_allocattr(void *, int, int, int, long *); struct diofb diofb_cn; @@ -130,7 +130,7 @@ */ fb-fbkva = iomap(fb-fbaddr, fb-fbsize); if (fb-fbkva == NULL) - return (ENOMEM); + return ENOMEM; } if (fb-dwidth == 0 || fb-dheight == 0) { fb-dwidth = (fbr-dwmsb 8) | fbr-dwlsb; @@ -153,7 +153,7 @@ fb-mapmode = WSDISPLAYIO_MODE_DUMBFB; - return (0); + return 0; } /* @@ -335,8 +335,9 @@ int diofb_allocattr(void *cookie, int fg, int bg, int flg, long *attr) { + if ((flg (WSATTR_BLINK | WSATTR_HILIT)) != 0) - return (EINVAL); + return EINVAL; if ((flg WSATTR_WSCOLORS) == 0) { fg = WSCOL_WHITE; @@ -460,14 +461,14 @@ struct rasops_info *ri = fb-ri; if (fb-nscreens 0) - return (ENOMEM); + return ENOMEM; *cookiep = ri; *curxp = *curyp = 0; ri-ri_ops.allocattr(ri, 0, 0, 0, attrp); fb-nscreens++; - return (0); + return 0; } void @@ -482,7 +483,8 @@ diofb_show_screen(void *v, void *cookie, int waitok, void (*cb)(void *, int, int), void *cbarg) { - return (0); + + return 0; } paddr_t @@ -491,7 +493,7 @@ struct diofb *fb = v; if ((offset PAGE_MASK) != 0) - return (-1); + return -1; switch (fb-mapmode) { case WSDISPLAYIO_MODE_MAPPED: @@ -505,7 +507,7 @@ break; } - return (-1); + return -1; } int @@ -516,14 +518,14 @@ int error; if (index = colcount || count colcount - index) - return (EINVAL); + return EINVAL; if ((error = copyout(fb-cmap.r + index, cm-red, count)) != 0) - return (error); + return error; if ((error = copyout(fb-cmap.g + index, cm-green, count)) != 0) - return (error); + return error; if ((error = copyout(fb-cmap.b + index, cm-blue, count)) != 0) - return (error); + return error; - return (0); + return 0; } Index: src/sys/arch/hp300/dev/diofb_mono.c diff -u src/sys/arch/hp300/dev/diofb_mono.c:1.1 src/sys/arch/hp300/dev/diofb_mono.c:1.2 --- src/sys/arch/hp300/dev/diofb_mono.c:1.1 Sun Feb 6 18:26:51 2011 +++ src/sys/arch/hp300/dev/diofb_mono.c Sat Feb 12 16:40:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: diofb_mono.c,v 1.1 2011/02/06 18:26:51 tsutsui Exp $ */ +/* $NetBSD: diofb_mono.c,v 1.2 2011/02/12 16:40:29 tsutsui Exp $ */ /* $OpenBSD: diofb_mono.c,v 1.3 2006/08/11 18:33:13 miod Exp $ */ /* @@ -115,8 +115,8 @@ #include hp300/dev/maskbits.h int -diofb_mono_windowmove(struct diofb *fb, u_int16_t sx, u_int16_t sy, -u_int16_t dx, u_int16_t dy, u_int16_t cx, u_int16_t cy, int16_t rop, +diofb_mono_windowmove(struct diofb *fb, uint16_t sx, uint16_t sy, +uint16_t dx, uint16_t dy, uint16_t cx, uint16_t cy, int16_t rop, int16_t planemask /* ignored */) { int width; /* add to get to same position in next line */ @@ -271,5 +271,5 @@ } } - return (0); + return 0; } Index:
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Sat Feb 12 16:41:55 UTC 2011 Modified Files: src/sys/arch/hp300/dev: dnkbd.c Log Message: - make local functions static - some KNF To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hp300/dev/dnkbd.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/hp300/dev/dnkbd.c diff -u src/sys/arch/hp300/dev/dnkbd.c:1.3 src/sys/arch/hp300/dev/dnkbd.c:1.4 --- src/sys/arch/hp300/dev/dnkbd.c:1.3 Sat Feb 12 16:37:32 2011 +++ src/sys/arch/hp300/dev/dnkbd.c Sat Feb 12 16:41:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dnkbd.c,v 1.3 2011/02/12 16:37:32 tsutsui Exp $ */ +/* $NetBSD: dnkbd.c,v 1.4 2011/02/12 16:41:54 tsutsui Exp $ */ /* $OpenBSD: dnkbd.c,v 1.17 2009/07/23 21:05:56 blambert Exp $ */ /* @@ -140,7 +140,7 @@ sc_state, sc_prevstate; u_int sc_echolen; - u_int8_t sc_mousepkt[3]; /* mouse packet being constructed */ + uint8_t sc_mousepkt[3]; /* mouse packet being constructed */ u_int sc_mousepos; /* index in above */ struct callout sc_bellstop_tmo; @@ -160,46 +160,46 @@ #endif }; -int dnkbd_match(device_t, cfdata_t, void *); -void dnkbd_attach(device_t, device_t, void *); +static int dnkbd_match(device_t, cfdata_t, void *); +static void dnkbd_attach(device_t, device_t, void *); CFATTACH_DECL_NEW(dnkbd, sizeof(struct dnkbd_softc), dnkbd_match, dnkbd_attach, NULL, NULL); -void dnkbd_init(struct dnkbd_softc *, uint16_t, uint16_t); -int dnkbd_enable(void *, int); -void dnkbd_set_leds(void *, int); -int dnkbd_ioctl(void *, u_long, void *, int, struct lwp *); +static void dnkbd_init(struct dnkbd_softc *, uint16_t, uint16_t); +static int dnkbd_enable(void *, int); +static void dnkbd_set_leds(void *, int); +static int dnkbd_ioctl(void *, u_long, void *, int, struct lwp *); -const struct wskbd_accessops dnkbd_accessops = { +static const struct wskbd_accessops dnkbd_accessops = { dnkbd_enable, dnkbd_set_leds, dnkbd_ioctl }; #if NWSMOUSE 0 -int dnmouse_enable(void *); -int dnmouse_ioctl(void *, u_long, void *, int, struct lwp *); -void dnmouse_disable(void *); +static int dnmouse_enable(void *); +static int dnmouse_ioctl(void *, u_long, void *, int, struct lwp *); +static void dnmouse_disable(void *); -const struct wsmouse_accessops dnmouse_accessops = { +static const struct wsmouse_accessops dnmouse_accessops = { dnmouse_enable, dnmouse_ioctl, dnmouse_disable }; #endif -void dnkbd_bell(void *, u_int, u_int, u_int); -void dnkbd_cngetc(void *, u_int *, int *); -void dnkbd_cnpollc(void *, int); +static void dnkbd_bell(void *, u_int, u_int, u_int); +static void dnkbd_cngetc(void *, u_int *, int *); +static void dnkbd_cnpollc(void *, int); -const struct wskbd_consops dnkbd_consops = { +static const struct wskbd_consops dnkbd_consops = { dnkbd_cngetc, dnkbd_cnpollc, dnkbd_bell }; -struct wskbd_mapdata dnkbd_keymapdata = { +static struct wskbd_mapdata dnkbd_keymapdata = { dnkbd_keydesctab, #ifdef DNKBD_LAYOUT DNKBD_LAYOUT @@ -210,21 +210,23 @@ typedef enum { EVENT_NONE, EVENT_KEYBOARD, EVENT_MOUSE } dnevent; -void dnevent_kbd(struct dnkbd_softc *, int); -void dnevent_kbd_internal(struct dnkbd_softc *, int); -void dnevent_mouse(struct dnkbd_softc *, u_int8_t *); -void dnkbd_attach_subdevices(struct dnkbd_softc *); -void dnkbd_bellstop(void *); -void dnkbd_decode(int, u_int *, int *); -dnevent dnkbd_input(struct dnkbd_softc *, int); -int dnkbd_intr(void *); -int dnkbd_pollin(struct dnkbd_softc *, u_int); -int dnkbd_pollout(struct dnkbd_softc *, int); -int dnkbd_probe(struct dnkbd_softc *); -void dnkbd_rawrepeat(void *); -int dnkbd_send(struct dnkbd_softc *, const u_int8_t *, size_t); -int dnsubmatch_kbd(device_t, cfdata_t, const int *, void *); -int dnsubmatch_mouse(device_t, cfdata_t, const int *, void *); +static void dnevent_kbd(struct dnkbd_softc *, int); +static void dnevent_kbd_internal(struct dnkbd_softc *, int); +static void dnevent_mouse(struct dnkbd_softc *, uint8_t *); +static void dnkbd_attach_subdevices(struct dnkbd_softc *); +static void dnkbd_bellstop(void *); +static void dnkbd_decode(int, u_int *, int *); +static dnevent dnkbd_input(struct dnkbd_softc *, int); +static int dnkbd_intr(void *); +static int dnkbd_pollin(struct dnkbd_softc *, u_int); +static int dnkbd_pollout(struct dnkbd_softc *, int); +static int dnkbd_probe(struct dnkbd_softc *); +#ifdef WSDISPLAY_COMPAT_RAWKBD +static void dnkbd_rawrepeat(void *); +#endif +static int dnkbd_send(struct dnkbd_softc *, const uint8_t *, size_t); +static int dnsubmatch_kbd(device_t, cfdata_t, const int *, void *); +static int dnsubmatch_mouse(device_t, cfdata_t, const int *, void *); int dnkbd_match(device_t parent, cfdata_t cf, void *aux) @@ -232,7 +234,7 @@ struct frodo_attach_args *fa = aux; if (strcmp(fa-fa_name, dnkbd_cd.cd_name) != 0) - return (0); + return 0; if (machineid == HP_382) {
CVS commit: src/sys/dev/wsfb
Module Name:src Committed By: phx Date: Sat Feb 12 17:15:27 UTC 2011 Modified Files: src/sys/dev/wsfb: genfb.c Log Message: Fixed NULL-pointer dereferencing when a mode-callback is not defined. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/dev/wsfb/genfb.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/wsfb/genfb.c diff -u src/sys/dev/wsfb/genfb.c:1.35 src/sys/dev/wsfb/genfb.c:1.36 --- src/sys/dev/wsfb/genfb.c:1.35 Wed Feb 9 13:19:19 2011 +++ src/sys/dev/wsfb/genfb.c Sat Feb 12 17:15:27 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb.c,v 1.35 2011/02/09 13:19:19 jmcneill Exp $ */ +/* $NetBSD: genfb.c,v 1.36 2011/02/12 17:15:27 phx Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.35 2011/02/09 13:19:19 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.36 2011/02/12 17:15:27 phx Exp $); #include sys/param.h #include sys/systm.h @@ -235,7 +235,7 @@ sc-sc_screenlist = (struct wsscreen_list){1, sc-sc_screens}; memcpy(sc-sc_ops, ops, sizeof(struct genfb_ops)); sc-sc_mode = WSDISPLAYIO_MODE_EMUL; - if (sc-sc_modecb-gmc_setmode) + if (sc-sc_modecb != NULL) sc-sc_modecb-gmc_setmode(sc, sc-sc_mode); #ifdef GENFB_SHADOWFB @@ -386,7 +386,7 @@ if (new_mode != sc-sc_mode) { sc-sc_mode = new_mode; -if (sc-sc_modecb-gmc_setmode) +if (sc-sc_modecb != NULL) sc-sc_modecb-gmc_setmode(sc, sc-sc_mode); if (new_mode == WSDISPLAYIO_MODE_EMUL) {
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared
Module Name:src Committed By: jmcneill Date: Sat Feb 12 17:21:38 UTC 2011 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSShared: uds_daemon.c Log Message: Fix mdnsd ERROR failed to get errsd via SCM_RIGHTS problem. mdnsd + nsswitch.conf multicast_dns works for me now on amd64. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.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/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.2 src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.3 --- src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.2 Thu Oct 1 00:22:03 2009 +++ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Sat Feb 12 17:21:38 2011 @@ -3596,12 +3596,15 @@ #if !defined(_WIN32) cmsg = CMSG_FIRSTHDR(msg); #if DEBUG_64BIT_SCM_RIGHTS - LogMsg(%3d: Expecting %d %d %d %d, req-sd, sizeof(cbuf), sizeof(cbuf), SOL_SOCKET, SCM_RIGHTS); - LogMsg(%3d: Got %d %d %d %d, req-sd, msg.msg_controllen, cmsg-cmsg_len, cmsg-cmsg_level, cmsg-cmsg_type); + LogMsg(%3d: Expecting %d %d %d %d, req-sd, sizeof(cbuf), CMSG_LEN(sizeof(dnssd_sock_t)), SOL_SOCKET, SCM_RIGHTS); + if (cmsg) + LogMsg(%3d: Got %d %d %d %d, req-sd, msg.msg_controllen, cmsg-cmsg_len, cmsg-cmsg_level, cmsg-cmsg_type); + else + LogMsg(%3d: Got %d NULL, req-sd, msg.msg_controllen); #endif // DEBUG_64BIT_SCM_RIGHTS if (msg.msg_controllen == sizeof(cbuf) - cmsg-cmsg_len == sizeof(cbuf) - cmsg-cmsg_level == SOL_SOCKET + cmsg-cmsg_len == CMSG_LEN(sizeof(dnssd_sock_t)) + cmsg-cmsg_level == SOL_SOCKET cmsg-cmsg_type== SCM_RIGHTS) { #if APPLE_OSX_mDNSResponder
CVS commit: src/tests/fs/common
Module Name:src Committed By: bouyer Date: Sat Feb 12 18:13:46 UTC 2011 Modified Files: src/tests/fs/common: snapshot.c Log Message: Test the right fd after rump_sys_open(). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/fs/common/snapshot.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/fs/common/snapshot.c diff -u src/tests/fs/common/snapshot.c:1.5 src/tests/fs/common/snapshot.c:1.6 --- src/tests/fs/common/snapshot.c:1.5 Sun Nov 7 17:51:17 2010 +++ src/tests/fs/common/snapshot.c Sat Feb 12 18:13:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: snapshot.c,v 1.5 2010/11/07 17:51:17 jmmv Exp $ */ +/* $NetBSD: snapshot.c,v 1.6 2011/02/12 18:13:46 bouyer Exp $ */ #include sys/types.h #include sys/ioctl.h @@ -65,7 +65,7 @@ atf_tc_fail_errno(write fail); fssfd = rump_sys_open(/dev/rfss0, O_RDWR); - if (fd == -1) + if (fssfd == -1) atf_tc_fail_errno(cannot open fss); makefile(BAKNAME); memset(fss, 0, sizeof(fss));
CVS commit: src/sys/dist/ipf/netinet
Module Name:src Committed By: christos Date: Sat Feb 12 18:14:21 UTC 2011 Modified Files: src/sys/dist/ipf/netinet: ip_nat.c Log Message: PR/44070: Avoid zero divide in modulo operations. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/dist/ipf/netinet/ip_nat.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/dist/ipf/netinet/ip_nat.c diff -u src/sys/dist/ipf/netinet/ip_nat.c:1.41 src/sys/dist/ipf/netinet/ip_nat.c:1.42 --- src/sys/dist/ipf/netinet/ip_nat.c:1.41 Sat Apr 17 17:00:44 2010 +++ src/sys/dist/ipf/netinet/ip_nat.c Sat Feb 12 13:14:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_nat.c,v 1.41 2010/04/17 21:00:44 darrenr Exp $ */ +/* $NetBSD: ip_nat.c,v 1.42 2011/02/12 18:14:21 christos Exp $ */ /* * Copyright (C) 1995-2003 by Darren Reed. @@ -120,7 +120,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ip_nat.c,v 1.41 2010/04/17 21:00:44 darrenr Exp $); +__KERNEL_RCSID(0, $NetBSD: ip_nat.c,v 1.42 2011/02/12 18:14:21 christos Exp $); #else static const char sccsid[] = @(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed; static const char rcsid[] = @(#)Id: ip_nat.c,v 2.195.2.130 2010/03/16 02:24:52 darrenr Exp; @@ -2037,7 +2037,7 @@ /* * ports auto (without map-block) */ - if ((l 0) (l % np-in_ppip == 0)) { + if ((l 0) np-in_ppip (l % np-in_ppip == 0)) { if (l np-in_space) { return -1; } else if ((l np-in_ppip) @@ -2063,8 +2063,12 @@ if (np-in_flags IPN_SEQUENTIAL) { port = np-in_pnext; } else { -port = ipf_random() % (ntohs(np-in_pmax) - - ntohs(np-in_pmin)); +in_port_t d = ntohs(np-in_pmax) - +ntohs(np-in_pmin); +if (d) + port = ipf_random() % d; +else + port = 0; port += ntohs(np-in_pmin); } port = htons(port);
CVS commit: src/sys/arch/powerpc
Module Name:src Committed By: matt Date: Sat Feb 12 18:23:10 UTC 2011 Modified Files: src/sys/arch/powerpc/booke: booke_stubs.c src/sys/arch/powerpc/conf: files.powerpc kern.ldscript src/sys/arch/powerpc/include: instr.h src/sys/arch/powerpc/include/oea: pmap.h src/sys/arch/powerpc/oea: pmap.c pmap_kernel.c src/sys/arch/powerpc/powerpc: fixup.c pmap_subr.c Log Message: When an OEA kernel is configured for multiple MMU types, use the new powerpc fixup mechanism to bind the kernel to a particular MMU. This avoids an indirect call for every pmap call. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/booke/booke_stubs.c cvs rdiff -u -r1.73 -r1.74 src/sys/arch/powerpc/conf/files.powerpc cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/conf/kern.ldscript cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/include/instr.h cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/include/oea/pmap.h cvs rdiff -u -r1.75 -r1.76 src/sys/arch/powerpc/oea/pmap.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/oea/pmap_kernel.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/powerpc/fixup.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/powerpc/powerpc/pmap_subr.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/powerpc/booke/booke_stubs.c diff -u src/sys/arch/powerpc/booke/booke_stubs.c:1.2 src/sys/arch/powerpc/booke/booke_stubs.c:1.3 --- src/sys/arch/powerpc/booke/booke_stubs.c:1.2 Tue Jan 18 01:02:52 2011 +++ src/sys/arch/powerpc/booke/booke_stubs.c Sat Feb 12 18:23:09 2011 @@ -38,7 +38,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: booke_stubs.c,v 1.2 2011/01/18 01:02:52 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: booke_stubs.c,v 1.3 2011/02/12 18:23:09 matt Exp $); #include sys/param.h #include sys/cpu.h @@ -270,5 +270,5 @@ extern uint32_t _ftext[]; extern uint32_t _etext[]; - powerpc_fixup_stubs(_ftext, _etext); + powerpc_fixup_stubs(_ftext, _etext, NULL, NULL); } Index: src/sys/arch/powerpc/conf/files.powerpc diff -u src/sys/arch/powerpc/conf/files.powerpc:1.73 src/sys/arch/powerpc/conf/files.powerpc:1.74 --- src/sys/arch/powerpc/conf/files.powerpc:1.73 Tue Jan 18 01:02:53 2011 +++ src/sys/arch/powerpc/conf/files.powerpc Sat Feb 12 18:23:09 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.powerpc,v 1.73 2011/01/18 01:02:53 matt Exp $ +# $NetBSD: files.powerpc,v 1.74 2011/02/12 18:23:09 matt Exp $ defflag opt_altivec.h ALTIVEC K_ALTIVEC PPC_HAVE_SPE defflag opt_openpic.h OPENPIC OPENPIC_SERIAL_MODE @@ -9,7 +9,7 @@ file arch/powerpc/powerpc/copystr.c file arch/powerpc/powerpc/core_machdep.c coredump -file arch/powerpc/powerpc/fixup.c ppc_booke +file arch/powerpc/powerpc/fixup.c ppc_booke | (ppc_oea ppc_oea64) | (ppc_oea ppc_oea64_bridge) | (ppc_oea64 ppc_oea64_bridge) file arch/powerpc/powerpc/fubyte.c file arch/powerpc/powerpc/fuswintr.c file arch/powerpc/powerpc/ipkdb_glue.c ipkdb Index: src/sys/arch/powerpc/conf/kern.ldscript diff -u src/sys/arch/powerpc/conf/kern.ldscript:1.3 src/sys/arch/powerpc/conf/kern.ldscript:1.4 --- src/sys/arch/powerpc/conf/kern.ldscript:1.3 Sun Jan 23 17:38:37 2011 +++ src/sys/arch/powerpc/conf/kern.ldscript Sat Feb 12 18:23:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: kern.ldscript,v 1.3 2011/01/23 17:38:37 matt Exp $ */ +/* $NetBSD: kern.ldscript,v 1.4 2011/02/12 18:23:09 matt Exp $ */ /* ldscript for NetBSD/powerpc kernels and LKMs */ OUTPUT_ARCH(powerpc) @@ -18,6 +18,9 @@ __stub_start = .; *(.stub) __stub_end = .; +__stub_pmap_start = .; +*(.stub.pmap) +__stub_pmap_end = .; *(.gnu.warning) } =0 _etext = .; Index: src/sys/arch/powerpc/include/instr.h diff -u src/sys/arch/powerpc/include/instr.h:1.5 src/sys/arch/powerpc/include/instr.h:1.6 --- src/sys/arch/powerpc/include/instr.h:1.5 Tue Jan 18 01:02:54 2011 +++ src/sys/arch/powerpc/include/instr.h Sat Feb 12 18:23:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: instr.h,v 1.5 2011/01/18 01:02:54 matt Exp $ */ +/* $NetBSD: instr.h,v 1.6 2011/02/12 18:23:09 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -438,7 +438,7 @@ uint32_t jfi_real; }; -void powerpc_fixup_stubs(uint32_t *, uint32_t *); +void powerpc_fixup_stubs(uint32_t *, uint32_t *, uint32_t *, uint32_t *); #endif /* !_POWERPC_INSTR_H_ */ Index: src/sys/arch/powerpc/include/oea/pmap.h diff -u src/sys/arch/powerpc/include/oea/pmap.h:1.20 src/sys/arch/powerpc/include/oea/pmap.h:1.21 --- src/sys/arch/powerpc/include/oea/pmap.h:1.20 Tue Jan 18 01:02:55 2011 +++ src/sys/arch/powerpc/include/oea/pmap.h Sat Feb 12 18:23:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.20 2011/01/18 01:02:55 matt Exp $ */ +/* $NetBSD: pmap.h,v 1.21 2011/02/12 18:23:10 matt Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -130,12 +130,9 @@ } #if (defined(PPC_OEA) + defined(PPC_OEA64) + defined(PPC_OEA64_BRIDGE)) != 1 -#define
CVS commit: src/crypto/external/bsd/libsaslc/dist/include
Module Name:src Committed By: christos Date: Sat Feb 12 19:03:39 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/dist/include: saslc.h Log Message: just include sys/types.h; don't inclue stdbool.h because postfix does not like it. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/libsaslc/dist/include/saslc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/libsaslc/dist/include/saslc.h diff -u src/crypto/external/bsd/libsaslc/dist/include/saslc.h:1.3 src/crypto/external/bsd/libsaslc/dist/include/saslc.h:1.4 --- src/crypto/external/bsd/libsaslc/dist/include/saslc.h:1.3 Fri Feb 11 18:44:42 2011 +++ src/crypto/external/bsd/libsaslc/dist/include/saslc.h Sat Feb 12 14:03:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: saslc.h,v 1.3 2011/02/11 23:44:42 christos Exp $ */ +/* $NetBSD: saslc.h,v 1.4 2011/02/12 19:03:39 christos Exp $ */ /* Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -38,8 +38,7 @@ #ifndef _SASLC_H_ #define _SASLC_H_ -#include stdbool.h -#include stdlib.h +#include sys/types.h /* properties */ #define SASLC_PROP_AUTHCID AUTHCID
CVS commit: src/external/ibm-public/postfix
Module Name:src Committed By: christos Date: Sat Feb 12 19:07:09 UTC 2011 Modified Files: src/external/ibm-public/postfix: Makefile.inc src/external/ibm-public/postfix/dist: makedefs src/external/ibm-public/postfix/dist/src/xsasl: xsasl_client.c src/external/ibm-public/postfix/lib/xsasl: Makefile Added Files: src/external/ibm-public/postfix/dist/src/xsasl: xsasl_saslc.h xsasl_saslc_client.c Log Message: Add SASL client support using the libsaslc(3) library. From Anon Ymous To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/Makefile.inc cvs rdiff -u -r1.1.1.3 -r1.2 src/external/ibm-public/postfix/dist/makedefs cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/ibm-public/postfix/dist/src/xsasl/xsasl_client.c cvs rdiff -u -r0 -r1.1 \ src/external/ibm-public/postfix/dist/src/xsasl/xsasl_saslc.h \ src/external/ibm-public/postfix/dist/src/xsasl/xsasl_saslc_client.c cvs rdiff -u -r1.1 -r1.2 src/external/ibm-public/postfix/lib/xsasl/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/ibm-public/postfix/Makefile.inc diff -u src/external/ibm-public/postfix/Makefile.inc:1.2 src/external/ibm-public/postfix/Makefile.inc:1.3 --- src/external/ibm-public/postfix/Makefile.inc:1.2 Thu Jun 25 14:21:50 2009 +++ src/external/ibm-public/postfix/Makefile.inc Sat Feb 12 14:07:08 2011 @@ -1,20 +1,33 @@ -# $NetBSD: Makefile.inc,v 1.2 2009/06/25 18:21:50 tron Exp $ +# $NetBSD: Makefile.inc,v 1.3 2011/02/12 19:07:08 christos Exp $ .include bsd.own.mk USE_FORT?= yes # network client and server +HAVE_LIB_SASLC?= yes WARNS?= 0 PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist -CPPFLAGS+= -DNETBSD4 -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\dovecot\ \ +CPPFLAGS+= -DNETBSD4 -DUSE_SASL_AUTH \ -I${DIST} \ -I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \ -I${PFIX_DISTDIR}/src/master -I${PFIX_DISTDIR}/src/util \ -I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \ -I${PFIX_DISTDIR}/src/xsasl +.if defined(HAVE_LIB_SASLC) +CPPFLAGS+= -DUSE_SASL_AUTH -DUSE_SASLC_SASL +LDADD+= -lsaslc +.elif defined(HAVE_CYRUS_SASL) +CPPFLAGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL \ + -DDEF_SERVER_SASL_TYPE=\cyrus\ \ + -I/usr/pkg/include/sasl +LDADD+= -lsasl2 -L/usr/pkg/lib -Wl,-R/usr/pkg/lib +.else +CPPFLAGS+= -DDEF_SERVER_SASL_TYPE=\dovecot\ +.endif + .if defined(HAVE_PCC) # code uses gcc-specific aggregate dynamic array CPPFLAGS+= -DCANT_USE_SEND_RECV_MSG Index: src/external/ibm-public/postfix/dist/makedefs diff -u src/external/ibm-public/postfix/dist/makedefs:1.1.1.3 src/external/ibm-public/postfix/dist/makedefs:1.2 --- src/external/ibm-public/postfix/dist/makedefs:1.1.1.3 Thu Jun 17 14:05:50 2010 +++ src/external/ibm-public/postfix/dist/makedefs Sat Feb 12 14:07:09 2011 @@ -162,6 +162,8 @@ ;; NetBSD.4*) SYSTYPE=NETBSD4 ;; + NetBSD.5*) SYSTYPE=NETBSD5 + ;; BSD/OS.2*) SYSTYPE=BSDI2 ;; BSD/OS.3*) SYSTYPE=BSDI3 Index: src/external/ibm-public/postfix/dist/src/xsasl/xsasl_client.c diff -u src/external/ibm-public/postfix/dist/src/xsasl/xsasl_client.c:1.1.1.1 src/external/ibm-public/postfix/dist/src/xsasl/xsasl_client.c:1.2 --- src/external/ibm-public/postfix/dist/src/xsasl/xsasl_client.c:1.1.1.1 Tue Jun 23 06:09:02 2009 +++ src/external/ibm-public/postfix/dist/src/xsasl/xsasl_client.c Sat Feb 12 14:07:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: xsasl_client.c,v 1.1.1.1 2009/06/23 10:09:02 tron Exp $ */ +/* $NetBSD: xsasl_client.c,v 1.2 2011/02/12 19:07:09 christos Exp $ */ /*++ /* NAME @@ -199,6 +199,7 @@ #include xsasl.h #include xsasl_cyrus.h +#include xsasl_saslc.h /* * Lookup table for available SASL client implementations. @@ -210,9 +211,12 @@ static const XSASL_CLIENT_IMPL_INFO client_impl_info[] = { #ifdef XSASL_TYPE_CYRUS -XSASL_TYPE_CYRUS, xsasl_cyrus_client_init, +{ XSASL_TYPE_CYRUS, xsasl_cyrus_client_init }, #endif -0, +#ifdef XSASL_TYPE_SASLC +{ XSASL_TYPE_SASLC, xsasl_saslc_client_init }, +#endif +{ NULL, NULL } }; /* xsasl_client_init - look up client implementation by name */ Index: src/external/ibm-public/postfix/lib/xsasl/Makefile diff -u src/external/ibm-public/postfix/lib/xsasl/Makefile:1.1 src/external/ibm-public/postfix/lib/xsasl/Makefile:1.2 --- src/external/ibm-public/postfix/lib/xsasl/Makefile:1.1 Thu Jun 25 14:21:53 2009 +++ src/external/ibm-public/postfix/lib/xsasl/Makefile Sat Feb 12 14:07:09 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/06/25 18:21:53 tron Exp $ +# $NetBSD: Makefile,v 1.2 2011/02/12 19:07:09 christos Exp $ LIBISPRIVATE= yes @@ -11,6 +11,6 @@ SRCS= xsasl_server.c xsasl_cyrus_server.c xsasl_cyrus_log.c \ xsasl_cyrus_security.c xsasl_client.c xsasl_cyrus_client.c \ - xsasl_dovecot_server.c + xsasl_dovecot_server.c xsasl_saslc_client.c .include bsd.lib.mk Added files:
CVS commit: src/crypto/external/bsd
Module Name:src Committed By: christos Date: Sat Feb 12 19:07:35 UTC 2011 Modified Files: src/crypto/external/bsd: Makefile Log Message: glue in saslc To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/Makefile diff -u src/crypto/external/bsd/Makefile:1.8 src/crypto/external/bsd/Makefile:1.9 --- src/crypto/external/bsd/Makefile:1.8 Fri Mar 19 22:07:33 2010 +++ src/crypto/external/bsd/Makefile Sat Feb 12 14:07:35 2011 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2010/03/20 02:07:33 uwe Exp $ +# $NetBSD: Makefile,v 1.9 2011/02/12 19:07:35 christos Exp $ .include bsd.own.mk .if (${MKCRYPTO} != no) -SUBDIR+= openssl .WAIT netpgp openssh +SUBDIR+= openssl .WAIT netpgp openssh libsaslc .endif .include bsd.subdir.mk
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: jmcneill Date: Sat Feb 12 19:13:30 UTC 2011 Modified Files: src/sys/arch/x86/x86: vga_post.c Log Message: Don't rely on vga_post_call being called before vga_post_set_vbe To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x86/x86/vga_post.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/x86/vga_post.c diff -u src/sys/arch/x86/x86/vga_post.c:1.17 src/sys/arch/x86/x86/vga_post.c:1.18 --- src/sys/arch/x86/x86/vga_post.c:1.17 Fri Nov 12 13:18:59 2010 +++ src/sys/arch/x86/x86/vga_post.c Sat Feb 12 19:13:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vga_post.c,v 1.17 2010/11/12 13:18:59 uebayasi Exp $ */ +/* $NetBSD: vga_post.c,v 1.18 2011/02/12 19:13:30 jmcneill Exp $ */ /*- * Copyright (c) 2007 Joerg Sonnenberger jo...@netbsd.org. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vga_post.c,v 1.17 2010/11/12 13:18:59 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: vga_post.c,v 1.18 2011/02/12 19:13:30 jmcneill Exp $); #include sys/param.h #include sys/device.h @@ -235,6 +235,19 @@ void vga_post_set_vbe(struct vga_post *sc, uint16_t vbemode) { + sc-emu.x86.R_EAX = sc-initial_eax; + sc-emu.x86.R_EDX = 0x0080; + sc-emu.x86.R_DS = 0x0040; + sc-emu.x86.register_flags = 0x3200; + + memcpy((void *)sc-sys_image, sc-bios_data, PAGE_SIZE); + + /* stack is at the end of the first 64KB */ + sc-emu.x86.R_SS = 0; + sc-emu.x86.R_ESP = 0; + + x86emu_i8254_init(sc-i8254, nanotime); + sc-emu.x86.R_EBX = vbemode | 0x4000; sc-emu.x86.R_EAX = 0x4f02; X86EMU_exec_intr(sc-emu, 0x10);
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: jmcneill Date: Sat Feb 12 19:20:44 UTC 2011 Modified Files: src/sys/arch/x86/x86: x86_autoconf.c Log Message: x86 genfb: when switching back to the console, if vga_post is present use it to reset the video mode. gives us a chance of survival if the X server crashes or the video driver fails to restore the console properly. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x86/x86/x86_autoconf.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/x86/x86_autoconf.c diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.56 src/sys/arch/x86/x86/x86_autoconf.c:1.57 --- src/sys/arch/x86/x86/x86_autoconf.c:1.56 Wed Feb 9 15:02:00 2011 +++ src/sys/arch/x86/x86/x86_autoconf.c Sat Feb 12 19:20:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: x86_autoconf.c,v 1.56 2011/02/09 15:02:00 bouyer Exp $ */ +/* $NetBSD: x86_autoconf.c,v 1.57 2011/02/12 19:20:44 jmcneill Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: x86_autoconf.c,v 1.56 2011/02/09 15:02:00 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: x86_autoconf.c,v 1.57 2011/02/12 19:20:44 jmcneill Exp $); #include sys/param.h #include sys/systm.h @@ -93,6 +93,10 @@ #ifdef VGA_POST static struct vga_post *vga_posth = NULL; #endif +#if NGENFB 0 NACPICA 0 defined(VGA_POST) +extern int acpi_md_vbios_reset; +extern int acpi_md_vesa_modenum; +#endif struct disklist *x86_alldisks; int x86_ndisks; @@ -111,9 +115,24 @@ x86_genfb_setmode(struct genfb_softc *sc, int newmode) { #if NGENFB 0 - if (newmode == WSDISPLAYIO_MODE_EMUL) + static int curmode = WSDISPLAYIO_MODE_EMUL; + + switch (newmode) { + case WSDISPLAYIO_MODE_EMUL: x86_genfb_mtrr_init(sc-sc_fboffset, sc-sc_height * sc-sc_stride); +#if NACPICA 0 defined(VGA_POST) + if (curmode != newmode) { + if (vga_posth != NULL acpi_md_vesa_modenum != 0) { +vga_post_set_vbe(vga_posth, +acpi_md_vesa_modenum); + } + } +#endif + break; + } + + curmode = newmode; #endif return true; } @@ -129,10 +148,6 @@ { #if NGENFB 0 struct pci_genfb_softc *psc = device_private(dev); -#if NACPICA 0 defined(VGA_POST) - extern int acpi_md_vbios_reset; - extern int acpi_md_vesa_modenum; -#endif #if NACPICA 0 defined(VGA_POST) if (vga_posth != NULL acpi_md_vbios_reset == 2) {
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: nakayama Date: Sat Feb 12 19:21:30 UTC 2011 Modified Files: src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/comp/ad.mips64eb \ src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/comp/md.amd64 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/comp/ad.mips64eb diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.21 src/distrib/sets/lists/comp/ad.mips64eb:1.22 --- src/distrib/sets/lists/comp/ad.mips64eb:1.21 Fri Feb 11 06:38:39 2011 +++ src/distrib/sets/lists/comp/ad.mips64eb Sat Feb 12 19:21:29 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.21 2011/02/11 06:38:39 matt Exp $ +# $NetBSD: ad.mips64eb,v 1.22 2011/02/12 19:21:29 nakayama Exp $ ./usr/bin/elf2aoutcomp-obsolete obsolete ./usr/bin/elf2ecoffcomp-sysutil-bin ./usr/include/mipscomp-c-include @@ -234,7 +234,7 @@ ./usr/lib/64/libdevmapper_pic.a comp-lvm-piclib compat,pic,lvm ./usr/lib/64/libdm.acomp-c-lib compat ./usr/lib/64/libdm_g.a-unknown- compat,debuglib -./usr/lib/64/libdm_p.acomp-c-proflb compat,profile +./usr/lib/64/libdm_p.acomp-c-proflib compat,profile ./usr/lib/64/libdm_pic.a comp-c-piclib compat,pic ./usr/lib/64/libdns.acomp-c-lib compat ./usr/lib/64/libdns.sobase-sys-shlib compat,pic @@ -759,7 +759,7 @@ ./usr/lib/o32/libdevmapper_pic.a comp-lvm-piclib compat,pic,lvm ./usr/lib/o32/libdm.acomp-c-lib compat ./usr/lib/o32/libdm_g.a-unknown- compat,debuglib -./usr/lib/o32/libdm_p.acomp-c-proflb compat,profile +./usr/lib/o32/libdm_p.acomp-c-proflib compat,profile ./usr/lib/o32/libdm_pic.a comp-c-piclib compat,pic ./usr/lib/o32/libdns.acomp-c-lib compat ./usr/lib/o32/libdns.sobase-sys-shlib compat,pic Index: src/distrib/sets/lists/comp/ad.mips64el diff -u src/distrib/sets/lists/comp/ad.mips64el:1.21 src/distrib/sets/lists/comp/ad.mips64el:1.22 --- src/distrib/sets/lists/comp/ad.mips64el:1.21 Fri Feb 11 06:38:39 2011 +++ src/distrib/sets/lists/comp/ad.mips64el Sat Feb 12 19:21:29 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.21 2011/02/11 06:38:39 matt Exp $ +# $NetBSD: ad.mips64el,v 1.22 2011/02/12 19:21:29 nakayama Exp $ ./usr/bin/elf2aoutcomp-obsolete obsolete ./usr/bin/elf2ecoffcomp-sysutil-bin ./usr/include/mipscomp-c-include @@ -234,7 +234,7 @@ ./usr/lib/64/libdevmapper_pic.a comp-lvm-piclib compat,pic,lvm ./usr/lib/64/libdm.acomp-c-lib compat ./usr/lib/64/libdm_g.a-unknown- compat,debuglib -./usr/lib/64/libdm_p.acomp-c-proflb compat,profile +./usr/lib/64/libdm_p.acomp-c-proflib compat,profile ./usr/lib/64/libdm_pic.a comp-c-piclib compat,pic ./usr/lib/64/libdns.acomp-c-lib compat ./usr/lib/64/libdns.sobase-sys-shlib compat,pic @@ -759,7 +759,7 @@ ./usr/lib/o32/libdevmapper_pic.a comp-lvm-piclib compat,pic,lvm ./usr/lib/o32/libdm.acomp-c-lib compat ./usr/lib/o32/libdm_g.a-unknown- compat,debuglib -./usr/lib/o32/libdm_p.acomp-c-proflb compat,profile +./usr/lib/o32/libdm_p.acomp-c-proflib compat,profile ./usr/lib/o32/libdm_pic.a comp-c-piclib compat,pic ./usr/lib/o32/libdns.acomp-c-lib compat ./usr/lib/o32/libdns.sobase-sys-shlib compat,pic Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.98 src/distrib/sets/lists/comp/md.amd64:1.99 --- src/distrib/sets/lists/comp/md.amd64:1.98 Fri Feb 11 06:54:18 2011 +++ src/distrib/sets/lists/comp/md.amd64 Sat Feb 12 19:21:29 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.98 2011/02/11 06:54:18 matt Exp $ +# $NetBSD: md.amd64,v 1.99 2011/02/12 19:21:29 nakayama Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -450,7 +450,7 @@ ./usr/lib/i386/libdevmapper_p.a comp-c-proflib compat,profile,lvm ./usr/lib/i386/libdm.acomp-c-lib compat ./usr/lib/i386/libdm.socomp-sys-shlib compat,pic -./usr/lib/i386/libdm_p.a comp-c-proflb compat,profile +./usr/lib/i386/libdm_p.a comp-c-proflib compat,profile ./usr/lib/i386/libdm_pic.a comp-c-piclib compat,pic ./usr/lib/i386/libdns.acomp-c-lib compat ./usr/lib/i386/libdns.so comp-sys-shlib compat,pic
CVS commit: [bouyer-quota2] src/sys/ufs
Module Name:src Committed By: bouyer Date: Sat Feb 12 19:52:40 UTC 2011 Modified Files: src/sys/ufs/ffs [bouyer-quota2]: ffs_snapshot.c src/sys/ufs/ufs [bouyer-quota2]: ufs_quota.c Log Message: Do not update disk quotas for snapshot inodes, as this may require a write to the same filesystem, which will trigger a copy on write, which will trigger another update to the same block. Set SF_SNAPSHOT just after truncating the snapshot inode, so that this inode always account for 0 blocks in quotas. To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.102.4.1 src/sys/ufs/ffs/ffs_snapshot.c cvs rdiff -u -r1.68.4.11 -r1.68.4.12 src/sys/ufs/ufs/ufs_quota.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/ffs/ffs_snapshot.c diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.102 src/sys/ufs/ffs/ffs_snapshot.c:1.102.4.1 --- src/sys/ufs/ffs/ffs_snapshot.c:1.102 Mon Dec 20 00:25:47 2010 +++ src/sys/ufs/ffs/ffs_snapshot.c Sat Feb 12 19:52:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_snapshot.c,v 1.102 2010/12/20 00:25:47 matt Exp $ */ +/* $NetBSD: ffs_snapshot.c,v 1.102.4.1 2011/02/12 19:52:39 bouyer Exp $ */ /* * Copyright 2000 Marshall Kirk McKusick. All Rights Reserved. @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ffs_snapshot.c,v 1.102 2010/12/20 00:25:47 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: ffs_snapshot.c,v 1.102.4.1 2011/02/12 19:52:39 bouyer Exp $); #if defined(_KERNEL_OPT) #include opt_ffs.h @@ -214,12 +214,6 @@ if (error) goto out; /* - * Change inode to snapshot type file. - */ - ip-i_flags |= SF_SNAPSHOT; - DIP_ASSIGN(ip, flags, ip-i_flags); - ip-i_flag |= IN_CHANGE | IN_UPDATE; - /* * Copy all the cylinder group maps. Although the * filesystem is still active, we hope that only a few * cylinder groups will change between now and when we @@ -408,6 +402,7 @@ struct buf *ibp, *nbp; struct fs *fs = VFSTOUFS(mp)-um_fs; struct lwp *l = curlwp; + struct inode *ip = VTOI(vp); /* * Check mount, exclusive reference and owner. @@ -427,6 +422,13 @@ return error; } /* + * Change inode to snapshot type file. + * Do it now so that allocations below are not recorded in quotas + */ + ip-i_flags |= SF_SNAPSHOT; + DIP_ASSIGN(ip, flags, ip-i_flags); + ip-i_flag |= IN_CHANGE | IN_UPDATE; + /* * Write an empty list of preallocated blocks to the end of * the snapshot to set size to at least that of the filesystem. */ Index: src/sys/ufs/ufs/ufs_quota.c diff -u src/sys/ufs/ufs/ufs_quota.c:1.68.4.11 src/sys/ufs/ufs/ufs_quota.c:1.68.4.12 --- src/sys/ufs/ufs/ufs_quota.c:1.68.4.11 Wed Feb 9 16:15:01 2011 +++ src/sys/ufs/ufs/ufs_quota.c Sat Feb 12 19:52:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_quota.c,v 1.68.4.11 2011/02/09 16:15:01 bouyer Exp $ */ +/* $NetBSD: ufs_quota.c,v 1.68.4.12 2011/02/12 19:52:40 bouyer Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993, 1995 @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.68.4.11 2011/02/09 16:15:01 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.68.4.12 2011/02/12 19:52:40 bouyer Exp $); #if defined(_KERNEL_OPT) #include opt_quota.h @@ -118,6 +118,10 @@ int chkdq(struct inode *ip, int64_t change, kauth_cred_t cred, int flags) { + /* do not track snapshot usage, or we will deadlock */ + if ((ip-i_flags SF_SNAPSHOT) != 0) + return 0; + #ifdef QUOTA if (ip-i_ump-um_flags UFS_QUOTA) return chkdq1(ip, change, cred, flags);
CVS commit: [bouyer-quota2] src/sbin/fsck_ffs
Module Name:src Committed By: bouyer Date: Sat Feb 12 19:53:32 UTC 2011 Modified Files: src/sbin/fsck_ffs [bouyer-quota2]: inode.c pass1.c pass4.c Log Message: Snapshot inode doesn't count for block quotas. To generate a diff of this commit: cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/sbin/fsck_ffs/inode.c cvs rdiff -u -r1.46.14.1 -r1.46.14.2 src/sbin/fsck_ffs/pass1.c cvs rdiff -u -r1.25.14.1 -r1.25.14.2 src/sbin/fsck_ffs/pass4.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsck_ffs/inode.c diff -u src/sbin/fsck_ffs/inode.c:1.63.2.1 src/sbin/fsck_ffs/inode.c:1.63.2.2 --- src/sbin/fsck_ffs/inode.c:1.63.2.1 Thu Jan 20 14:24:53 2011 +++ src/sbin/fsck_ffs/inode.c Sat Feb 12 19:53:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: inode.c,v 1.63.2.1 2011/01/20 14:24:53 bouyer Exp $ */ +/* $NetBSD: inode.c,v 1.63.2.2 2011/02/12 19:53:32 bouyer Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -34,12 +34,13 @@ #if 0 static char sccsid[] = @(#)inode.c 8.8 (Berkeley) 4/28/95; #else -__RCSID($NetBSD: inode.c,v 1.63.2.1 2011/01/20 14:24:53 bouyer Exp $); +__RCSID($NetBSD: inode.c,v 1.63.2.2 2011/02/12 19:53:32 bouyer Exp $); #endif #endif /* not lint */ #include sys/param.h #include sys/time.h +#include sys/stat.h #include ufs/ufs/dinode.h #include ufs/ufs/dir.h @@ -830,12 +831,15 @@ } memset(idesc, 0, sizeof(struct inodesc)); - idesc.id_type = ADDR; idesc.id_func = pass4check; idesc.id_number = ino; dp = ginode(ino); idesc.id_uid = iswap32(DIP(dp, uid)); idesc.id_gid = iswap32(DIP(dp, gid)); + if (iswap32(DIP(dp, flags)) SF_SNAPSHOT) + idesc.id_type = SNAP; + else + idesc.id_type = ADDR; (void)ckinode(dp, idesc); clearinode(dp); inodirty(); Index: src/sbin/fsck_ffs/pass1.c diff -u src/sbin/fsck_ffs/pass1.c:1.46.14.1 src/sbin/fsck_ffs/pass1.c:1.46.14.2 --- src/sbin/fsck_ffs/pass1.c:1.46.14.1 Thu Jan 20 14:24:53 2011 +++ src/sbin/fsck_ffs/pass1.c Sat Feb 12 19:53:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pass1.c,v 1.46.14.1 2011/01/20 14:24:53 bouyer Exp $ */ +/* $NetBSD: pass1.c,v 1.46.14.2 2011/02/12 19:53:32 bouyer Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = @(#)pass1.c 8.6 (Berkeley) 4/28/95; #else -__RCSID($NetBSD: pass1.c,v 1.46.14.1 2011/01/20 14:24:53 bouyer Exp $); +__RCSID($NetBSD: pass1.c,v 1.46.14.2 2011/02/12 19:53:32 bouyer Exp $); #endif #endif /* not lint */ @@ -467,7 +467,7 @@ inodirty(); } update_uquot(inumber, idesc-id_uid, idesc-id_gid, - idesc-id_entryno, 1); + (idesc-id_type == SNAP) ? 0 : idesc-id_entryno, 1); return; unknown: pfatal(UNKNOWN FILE TYPE I=%llu, (unsigned long long)inumber); Index: src/sbin/fsck_ffs/pass4.c diff -u src/sbin/fsck_ffs/pass4.c:1.25.14.1 src/sbin/fsck_ffs/pass4.c:1.25.14.2 --- src/sbin/fsck_ffs/pass4.c:1.25.14.1 Thu Jan 20 14:24:54 2011 +++ src/sbin/fsck_ffs/pass4.c Sat Feb 12 19:53:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pass4.c,v 1.25.14.1 2011/01/20 14:24:54 bouyer Exp $ */ +/* $NetBSD: pass4.c,v 1.25.14.2 2011/02/12 19:53:32 bouyer Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -34,12 +34,13 @@ #if 0 static char sccsid[] = @(#)pass4.c 8.4 (Berkeley) 4/28/95; #else -__RCSID($NetBSD: pass4.c,v 1.25.14.1 2011/01/20 14:24:54 bouyer Exp $); +__RCSID($NetBSD: pass4.c,v 1.25.14.2 2011/02/12 19:53:32 bouyer Exp $); #endif #endif /* not lint */ #include sys/param.h #include sys/time.h +#include sys/stat.h #include ufs/ufs/ufs_bswap.h #include ufs/ufs/dinode.h @@ -65,7 +66,6 @@ struct inostat *info; memset(idesc, 0, sizeof(struct inodesc)); - idesc.id_type = ADDR; idesc.id_func = pass4check; for (cg = 0; cg sblock-fs_ncg; cg++) { @@ -89,6 +89,10 @@ idesc.id_number = inumber; idesc.id_uid = iswap32(DIP(dp, uid)); idesc.id_gid = iswap32(DIP(dp, gid)); + if (iswap32(DIP(dp, flags)) SF_SNAPSHOT) +idesc.id_type = SNAP; + else +idesc.id_type = ADDR; switch (info-ino_state) { case FSTATE: case DFOUND: @@ -189,7 +193,8 @@ n_blks--; update_uquot(idesc-id_number, idesc-id_uid, -idesc-id_gid, -btodb(sblock-fs_fsize), 0); +idesc-id_gid, (idesc-id_type == SNAP) ? +0 : -btodb(sblock-fs_fsize), 0); if (idesc-id_numfrags != sblock-fs_frag cgp) { cgp-cg_cs.cs_nffree ++;
CVS commit: src/sys/dist/ipf/netinet
Module Name:src Committed By: christos Date: Sat Feb 12 21:23:31 UTC 2011 Modified Files: src/sys/dist/ipf/netinet: ip_nat.c Log Message: Add 1 to the port range so the range is inclusive as documented. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/dist/ipf/netinet/ip_nat.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/dist/ipf/netinet/ip_nat.c diff -u src/sys/dist/ipf/netinet/ip_nat.c:1.42 src/sys/dist/ipf/netinet/ip_nat.c:1.43 --- src/sys/dist/ipf/netinet/ip_nat.c:1.42 Sat Feb 12 13:14:21 2011 +++ src/sys/dist/ipf/netinet/ip_nat.c Sat Feb 12 16:23:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_nat.c,v 1.42 2011/02/12 18:14:21 christos Exp $ */ +/* $NetBSD: ip_nat.c,v 1.43 2011/02/12 21:23:31 christos Exp $ */ /* * Copyright (C) 1995-2003 by Darren Reed. @@ -120,7 +120,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ip_nat.c,v 1.42 2011/02/12 18:14:21 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: ip_nat.c,v 1.43 2011/02/12 21:23:31 christos Exp $); #else static const char sccsid[] = @(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed; static const char rcsid[] = @(#)Id: ip_nat.c,v 2.195.2.130 2010/03/16 02:24:52 darrenr Exp; @@ -2064,7 +2064,7 @@ port = np-in_pnext; } else { in_port_t d = ntohs(np-in_pmax) - -ntohs(np-in_pmin); +ntohs(np-in_pmin) + 1; if (d) port = ipf_random() % d; else
CVS commit: [bouyer-quota2] src/sys/ufs
Module Name:src Committed By: bouyer Date: Sat Feb 12 21:48:10 UTC 2011 Modified Files: src/sys/ufs/ffs [bouyer-quota2]: ffs_snapshot.c src/sys/ufs/ufs [bouyer-quota2]: ufs_quota.c ufs_quota2.c Log Message: Don't count snapshot files in inode quota too. At umount time, chk?q may be called after quota have been shutdown, as there is a final vflush pass after quota?_umount(); so skip quota checks if the quota vnode is not there any more. To generate a diff of this commit: cvs rdiff -u -r1.102.4.1 -r1.102.4.2 src/sys/ufs/ffs/ffs_snapshot.c cvs rdiff -u -r1.68.4.12 -r1.68.4.13 src/sys/ufs/ufs/ufs_quota.c cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/sys/ufs/ufs/ufs_quota2.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/ffs/ffs_snapshot.c diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.102.4.1 src/sys/ufs/ffs/ffs_snapshot.c:1.102.4.2 --- src/sys/ufs/ffs/ffs_snapshot.c:1.102.4.1 Sat Feb 12 19:52:39 2011 +++ src/sys/ufs/ffs/ffs_snapshot.c Sat Feb 12 21:48:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_snapshot.c,v 1.102.4.1 2011/02/12 19:52:39 bouyer Exp $ */ +/* $NetBSD: ffs_snapshot.c,v 1.102.4.2 2011/02/12 21:48:09 bouyer Exp $ */ /* * Copyright 2000 Marshall Kirk McKusick. All Rights Reserved. @@ -38,10 +38,11 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ffs_snapshot.c,v 1.102.4.1 2011/02/12 19:52:39 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: ffs_snapshot.c,v 1.102.4.2 2011/02/12 21:48:09 bouyer Exp $); #if defined(_KERNEL_OPT) #include opt_ffs.h +#include opt_quota.h #endif #include sys/param.h @@ -213,6 +214,19 @@ error = snapshot_setup(mp, vp); if (error) goto out; + /* quota inodes are not accounted in quotas */ +#if defined(QUOTA) || defined(QUOTA2) + chkdq(ip, -DIP(ip, blocks), l-l_cred, 0); + chkiq(ip, -1, l-l_cred, 0); +#endif + /* + * Change inode to snapshot type file. + */ + ip-i_flags |= SF_SNAPSHOT; + DIP_ASSIGN(ip, flags, ip-i_flags); + ip-i_flag |= IN_CHANGE | IN_UPDATE; + + /* * Copy all the cylinder group maps. Although the * filesystem is still active, we hope that only a few @@ -402,7 +416,6 @@ struct buf *ibp, *nbp; struct fs *fs = VFSTOUFS(mp)-um_fs; struct lwp *l = curlwp; - struct inode *ip = VTOI(vp); /* * Check mount, exclusive reference and owner. @@ -422,13 +435,6 @@ return error; } /* - * Change inode to snapshot type file. - * Do it now so that allocations below are not recorded in quotas - */ - ip-i_flags |= SF_SNAPSHOT; - DIP_ASSIGN(ip, flags, ip-i_flags); - ip-i_flag |= IN_CHANGE | IN_UPDATE; - /* * Write an empty list of preallocated blocks to the end of * the snapshot to set size to at least that of the filesystem. */ @@ -1029,6 +1035,11 @@ dip1-di_flags = ufs_rw32(ufs_rw32(dip1-di_flags, ns) ~SF_SNAPSHOT, ns); memset(dip1-di_db[0], 0, (NDADDR + NIADDR) * sizeof(int32_t)); + /* quota inodes are not accounted in quotas */ +#if defined(QUOTA) || defined(QUOTA2) + if (dip1-di_mode != 0) + chkiq(cancelip, 1, l-l_cred, FORCE); +#endif } else { dip2 = (struct ufs2_dinode *)bp-b_data + ino_to_fsbo(fs, cancelip-i_number); @@ -1039,6 +1050,10 @@ dip2-di_flags = ufs_rw32(ufs_rw32(dip2-di_flags, ns) ~SF_SNAPSHOT, ns); memset(dip2-di_db[0], 0, (NDADDR + NIADDR) * sizeof(int64_t)); +#if defined(QUOTA) || defined(QUOTA2) + if (dip2-di_mode != 0) + chkiq(cancelip, 1, l-l_cred, FORCE); +#endif } bdwrite(bp); /* @@ -1387,6 +1402,10 @@ ip-i_flags = ~SF_SNAPSHOT; DIP_ASSIGN(ip, flags, ip-i_flags); ip-i_flag |= IN_CHANGE | IN_UPDATE; +#if defined(QUOTA) || defined(QUOTA2) + chkdq(ip, DIP(ip, blocks), l-l_cred, FORCE); + chkiq(ip, 1, l-l_cred, FORCE); +#endif } /* Index: src/sys/ufs/ufs/ufs_quota.c diff -u src/sys/ufs/ufs/ufs_quota.c:1.68.4.12 src/sys/ufs/ufs/ufs_quota.c:1.68.4.13 --- src/sys/ufs/ufs/ufs_quota.c:1.68.4.12 Sat Feb 12 19:52:40 2011 +++ src/sys/ufs/ufs/ufs_quota.c Sat Feb 12 21:48:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_quota.c,v 1.68.4.12 2011/02/12 19:52:40 bouyer Exp $ */ +/* $NetBSD: ufs_quota.c,v 1.68.4.13 2011/02/12 21:48:09 bouyer Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993, 1995 @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.68.4.12 2011/02/12 19:52:40 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.68.4.13 2011/02/12 21:48:09 bouyer Exp $); #if defined(_KERNEL_OPT) #include opt_quota.h @@ -139,6 +139,9 @@ int chkiq(struct inode *ip, int32_t change, kauth_cred_t cred, int flags) { + /* do not track snapshot usage, or we will deadlock */ + if ((ip-i_flags SF_SNAPSHOT) != 0) + return 0; #ifdef QUOTA if (ip-i_ump-um_flags UFS_QUOTA) return chkiq1(ip, change, cred, flags); Index: src/sys/ufs/ufs/ufs_quota2.c diff -u src/sys/ufs/ufs/ufs_quota2.c:1.1.2.14 src/sys/ufs/ufs/ufs_quota2.c:1.1.2.15 --- src/sys/ufs/ufs/ufs_quota2.c:1.1.2.14 Fri
CVS commit: [bouyer-quota2] src/sbin/fsck_ffs
Module Name:src Committed By: bouyer Date: Sat Feb 12 21:48:41 UTC 2011 Modified Files: src/sbin/fsck_ffs [bouyer-quota2]: inode.c pass1.c pass4.c Log Message: Skip snapshot inodes for both block and inode quotas. To generate a diff of this commit: cvs rdiff -u -r1.63.2.2 -r1.63.2.3 src/sbin/fsck_ffs/inode.c cvs rdiff -u -r1.46.14.2 -r1.46.14.3 src/sbin/fsck_ffs/pass1.c cvs rdiff -u -r1.25.14.2 -r1.25.14.3 src/sbin/fsck_ffs/pass4.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsck_ffs/inode.c diff -u src/sbin/fsck_ffs/inode.c:1.63.2.2 src/sbin/fsck_ffs/inode.c:1.63.2.3 --- src/sbin/fsck_ffs/inode.c:1.63.2.2 Sat Feb 12 19:53:32 2011 +++ src/sbin/fsck_ffs/inode.c Sat Feb 12 21:48:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: inode.c,v 1.63.2.2 2011/02/12 19:53:32 bouyer Exp $ */ +/* $NetBSD: inode.c,v 1.63.2.3 2011/02/12 21:48:41 bouyer Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = @(#)inode.c 8.8 (Berkeley) 4/28/95; #else -__RCSID($NetBSD: inode.c,v 1.63.2.2 2011/02/12 19:53:32 bouyer Exp $); +__RCSID($NetBSD: inode.c,v 1.63.2.3 2011/02/12 21:48:41 bouyer Exp $); #endif #endif /* not lint */ @@ -580,8 +580,9 @@ * ckinode will call id_func (actually always pass4check) * which will update the block count */ - update_uquot(idesc-id_number, idesc-id_uid, idesc-id_gid, - 0, -1); + if (idesc-id_type != SNAP) + update_uquot(idesc-id_number, + idesc-id_uid, idesc-id_gid, 0, -1); (void)ckinode(dp, idesc); clearinode(dp); inoinfo(idesc-id_number)-ino_state = USTATE; @@ -844,7 +845,9 @@ clearinode(dp); inodirty(); inoinfo(ino)-ino_state = USTATE; - update_uquot(idesc.id_number, idesc.id_uid, idesc.id_gid, 0, -1); + if (idesc.id_type != SNAP) + update_uquot(idesc.id_number, + idesc.id_uid, idesc.id_gid, 0, -1); n_files--; if (cgp) { clrbit(cg_inosused(cgp, 0), ino % sblock-fs_ipg); Index: src/sbin/fsck_ffs/pass1.c diff -u src/sbin/fsck_ffs/pass1.c:1.46.14.2 src/sbin/fsck_ffs/pass1.c:1.46.14.3 --- src/sbin/fsck_ffs/pass1.c:1.46.14.2 Sat Feb 12 19:53:32 2011 +++ src/sbin/fsck_ffs/pass1.c Sat Feb 12 21:48:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pass1.c,v 1.46.14.2 2011/02/12 19:53:32 bouyer Exp $ */ +/* $NetBSD: pass1.c,v 1.46.14.3 2011/02/12 21:48:41 bouyer Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = @(#)pass1.c 8.6 (Berkeley) 4/28/95; #else -__RCSID($NetBSD: pass1.c,v 1.46.14.2 2011/02/12 19:53:32 bouyer Exp $); +__RCSID($NetBSD: pass1.c,v 1.46.14.3 2011/02/12 21:48:41 bouyer Exp $); #endif #endif /* not lint */ @@ -466,8 +466,9 @@ dp-dp1.di_blocks = iswap32((int32_t)idesc-id_entryno); inodirty(); } - update_uquot(inumber, idesc-id_uid, idesc-id_gid, - (idesc-id_type == SNAP) ? 0 : idesc-id_entryno, 1); + if (idesc-id_type != SNAP) + update_uquot(inumber, idesc-id_uid, idesc-id_gid, + idesc-id_entryno, 1); return; unknown: pfatal(UNKNOWN FILE TYPE I=%llu, (unsigned long long)inumber); Index: src/sbin/fsck_ffs/pass4.c diff -u src/sbin/fsck_ffs/pass4.c:1.25.14.2 src/sbin/fsck_ffs/pass4.c:1.25.14.3 --- src/sbin/fsck_ffs/pass4.c:1.25.14.2 Sat Feb 12 19:53:32 2011 +++ src/sbin/fsck_ffs/pass4.c Sat Feb 12 21:48:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pass4.c,v 1.25.14.2 2011/02/12 19:53:32 bouyer Exp $ */ +/* $NetBSD: pass4.c,v 1.25.14.3 2011/02/12 21:48:41 bouyer Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = @(#)pass4.c 8.4 (Berkeley) 4/28/95; #else -__RCSID($NetBSD: pass4.c,v 1.25.14.2 2011/02/12 19:53:32 bouyer Exp $); +__RCSID($NetBSD: pass4.c,v 1.25.14.3 2011/02/12 21:48:41 bouyer Exp $); #endif #endif /* not lint */ @@ -192,9 +192,11 @@ dtogd(sblock, blkno)); n_blks--; -update_uquot(idesc-id_number, idesc-id_uid, -idesc-id_gid, (idesc-id_type == SNAP) ? -0 : -btodb(sblock-fs_fsize), 0); +if (idesc-id_type != SNAP) { + update_uquot(idesc-id_number, + idesc-id_uid, idesc-id_gid, + -btodb(sblock-fs_fsize), 0); +} if (idesc-id_numfrags != sblock-fs_frag cgp) { cgp-cg_cs.cs_nffree ++;
CVS commit: [bouyer-quota2] src/tests/fs/ffs
Module Name:src Committed By: bouyer Date: Sat Feb 12 21:49:08 UTC 2011 Modified Files: src/tests/fs/ffs [bouyer-quota2]: h_quota2_tests.c t_miscquota.sh Log Message: Add some quota+snapshot tests. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/tests/fs/ffs/h_quota2_tests.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/tests/fs/ffs/t_miscquota.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/fs/ffs/h_quota2_tests.c diff -u src/tests/fs/ffs/h_quota2_tests.c:1.1.2.3 src/tests/fs/ffs/h_quota2_tests.c:1.1.2.4 --- src/tests/fs/ffs/h_quota2_tests.c:1.1.2.3 Mon Feb 7 16:22:50 2011 +++ src/tests/fs/ffs/h_quota2_tests.c Sat Feb 12 21:49:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: h_quota2_tests.c,v 1.1.2.3 2011/02/07 16:22:50 bouyer Exp $ */ +/* $NetBSD: h_quota2_tests.c,v 1.1.2.4 2011/02/12 21:49:08 bouyer Exp $ */ /* * rump server for advanced quota tests @@ -17,6 +17,7 @@ #include unistd.h #include ufs/ufs/ufsmount.h +#include dev/fssvar.h #include rump/rump.h #include rump/rump_syscalls.h @@ -28,7 +29,7 @@ #define TEST_NONROOT_ID 1 static int -quota_test0(void) +quota_test0(const char *testopts) { static char buf[512]; int fd; @@ -60,7 +61,7 @@ } static int -quota_test1(void) +quota_test1(const char *testopts) { static char buf[512]; int fd; @@ -107,7 +108,7 @@ } static int -quota_test2(void) +quota_test2(const char *testopts) { static char buf[512]; int fd; @@ -143,7 +144,7 @@ } static int -quota_test3(void) +quota_test3(const char *testopts) { static char buf[512]; int fd; @@ -189,8 +190,71 @@ return error; } +static int +quota_test4(const char *testopts) +{ + static char buf[512]; + int fd, fssfd; + struct fss_set fss; + unsigned int i; + int unl=0; + int unconf=0; + + /* + * take an internal snapshot of the filesystem, and create a new + * file with some data + */ + + for (i =0; testopts i strlen(testopts); i++) { + switch(testopts[i]) { + case 'L': + unl++; + break; + case 'C': + unconf++; + break; + default: + errx(1, test4: unknown option %c, testopts[i]); + } + } + + /* first create the snapshot */ + + fd = rump_sys_open(FSTEST_MNTNAME /le_snap, O_CREAT | O_RDWR, 0777); + if (fd == -1) + err(1, create FSTEST_MNTNAME /le_snap); + rump_sys_close(fd); + fssfd = rump_sys_open(/dev/rfss0, O_RDWR); + if (fssfd == -1) + err(1, cannot open fss); + memset(fss, 0, sizeof(fss)); + fss.fss_mount = __UNCONST(/mnt); + fss.fss_bstore = __UNCONST(FSTEST_MNTNAME /le_snap); + fss.fss_csize = 0; + if (rump_sys_ioctl(fssfd, FSSIOCSET, fss) == -1) + err(1, create snapshot); + if (unl) + rump_sys_unlink(FSTEST_MNTNAME /le_snap); + + /* now create some extra files */ + + for (i = 0; i 4; i++) { + sprintf(buf, file%d, i); + fd = rump_sys_open(buf, O_EXCL| O_CREAT | O_RDWR, 0644); + if (fd 0) + err(1, create %s, buf); + sprintf(buf, test file no %d, i); + rump_sys_write(fd, buf, strlen(buf)); + rump_sys_close(fd); + } + if (unconf) + if (rump_sys_ioctl(fssfd, FSSIOCCLR, NULL) == -1) + err(1, unconfigure snapshot); + return 0; +} + struct quota_test { - int (*func)(void); + int (*func)(const char *); const char *desc; }; @@ -199,13 +263,19 @@ { quota_test1, write beyond the soft limit after grace time}, { quota_test2, create file up to hard limit}, { quota_test3, create file beyond the soft limit after grace time}, + { quota_test4, take a snapshot and add some data}, }; static void usage(void) { + unsigned int test; fprintf(stderr, usage: %s [-b] [-l] test# diskimage bindurl\n, getprogname()); + fprintf(stderr, available tests:\n); + for (test = 0; test sizeof(quota_tests) / sizeof(quota_tests[0]); + test++) + fprintf(stderr, \t%d: %s\n, test, quota_tests[test].desc); exit(1); } @@ -236,10 +306,11 @@ struct ufs_args uargs; const char *filename; const char *serverurl; + const char *topts = NULL; int log = 0; int ch; - while ((ch = getopt(argc, argv, bl)) != -1) { + while ((ch = getopt(argc, argv, blo:)) != -1) { switch(ch) { case 'b': background = 1; @@ -247,6 +318,9 @@ case 'l': log = 1; break; + case 'o': + topts = optarg; + break; default: usage(); } @@ -265,8 +339,7 @@ usage(); } if (test sizeof(quota_tests) / sizeof(quota_tests[0])) { - fprintf(stderr, test number %lu too big\n, test); - exit(1); + usage(); } if (background) { @@ -291,7 +364,7 @@ err(1, cd %s, FSTEST_MNTNAME); rump_sys_chown(., 0, 0); rump_sys_chmod(., 0777); - error = quota_tests[test].func(); + error = quota_tests[test].func(topts); if (error) { fprintf(stderr, test %lu: %s returned %d: %s\n, test, quota_tests[test].desc, error, strerror(error)); Index: src/tests/fs/ffs/t_miscquota.sh diff -u src/tests/fs/ffs/t_miscquota.sh:1.1.2.2 src/tests/fs/ffs/t_miscquota.sh:1.1.2.3 ---
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Sat Feb 12 22:07:56 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Note about HP362/382 framebuffer and dnkbd support for hp300. To generate a diff of this commit: cvs rdiff -u -r1.1501 -r1.1502 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/CHANGES diff -u src/doc/CHANGES:1.1501 src/doc/CHANGES:1.1502 --- src/doc/CHANGES:1.1501 Sun Feb 6 18:38:01 2011 +++ src/doc/CHANGES Sat Feb 12 22:07:56 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1501 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1502 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -843,3 +843,7 @@ dhcpcd(8): Import dhcpcd-5.2.11. [roy 20110204] hp300: Switch NetBSD/hp300 to wscons with rasops. Simply ported from OpenBSD/hp300. [tsutsui 20110206] + hp300: Add support for framebuffers on HP362 and HP382. + [tsutsui 20110212] + hp300: Add support for Apollo Domain keyboard. From OpenBSD. + [tsutsui 20110212]
CVS commit: src/crypto/external/bsd/libsaslc/lib
Module Name:src Committed By: matt Date: Sat Feb 12 22:23:11 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/lib: Makefile Log Message: Don't use DPADD/LDADD for libraries. Use LIBDPLIBS instead. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/libsaslc/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/libsaslc/lib/Makefile diff -u src/crypto/external/bsd/libsaslc/lib/Makefile:1.2 src/crypto/external/bsd/libsaslc/lib/Makefile:1.3 --- src/crypto/external/bsd/libsaslc/lib/Makefile:1.2 Fri Feb 11 23:44:44 2011 +++ src/crypto/external/bsd/libsaslc/lib/Makefile Sat Feb 12 22:23:11 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/02/11 23:44:44 christos Exp $ +# $NetBSD: Makefile,v 1.3 2011/02/12 22:23:11 matt Exp $ .include bsd.own.mk @@ -16,7 +16,9 @@ SRCS+= mech_crammd5.c SRCS+= mech_digestmd5.c SRCS+= mech_external.c +.if (${MKKERBEROS} != no) SRCS+= mech_gssapi.c +.endif SRCS+= mech_login.c SRCS+= mech_plain.c SRCS+= msg.c @@ -35,7 +37,9 @@ INCS+= saslc.h INCSDIR=/usr/include -LDADD+=-lssl -lgssapi -DPADD+=${LIBSSL} +LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl +.if (${MKKERBEROS} != no) +LIBDPLIBS+= gssapi ${NETBSDSRCDIR}/lib/libgssapi +.endif .include bsd.lib.mk
CVS commit: src/sbin/disklabel
Module Name:src Committed By: dholland Date: Sat Feb 12 22:23:02 UTC 2011 Modified Files: src/sbin/disklabel: Makefile Log Message: Disable COMPAT_386BSD_MBRPART. The code is still here if anyone needs it for some reason. (But I have no idea why that would be -- if you have one of these really ancient partitions and you're about to run disklabel, you can easily run fdisk first and change the partition type to NetBSD.) As it stands, the code will munch FreeBSD installs under some circumstances, which is really not acceptable behavior. The code, along with the kernel support that's been disabled by default for several years, and some related but less dangerous code in sysinst, should prboably be removed entirely after -6 is branched. Discussed on tech-kern and tech-userlevel; closes PR 44496. This is also almost certainly the cause of PR 42521 and PR 38841. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sbin/disklabel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/disklabel/Makefile diff -u src/sbin/disklabel/Makefile:1.66 src/sbin/disklabel/Makefile:1.67 --- src/sbin/disklabel/Makefile:1.66 Sun Dec 13 05:01:32 2009 +++ src/sbin/disklabel/Makefile Sat Feb 12 22:23:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2009/12/13 05:01:32 nakayama Exp $ +# $NetBSD: Makefile,v 1.67 2011/02/12 22:23:01 dholland Exp $ # @(#)Makefile 8.2 (Berkeley) 3/17/94 PROG= disklabel @@ -40,8 +40,8 @@ ) # use MBR partition info CPPFLAGS+= -DUSE_MBR -# recognize old MBR partition ID for a while -CPPFLAGS+= -DCOMPAT_386BSD_MBRPART +# do not recognize old MBR partition ID any more +#CPPFLAGS+= -DCOMPAT_386BSD_MBRPART .endif .if (${MACHINE} == acorn32 || ${MACHINE} == acorn26)
CVS commit: src/doc
Module Name:src Committed By: dholland Date: Sat Feb 12 22:30:04 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Note COMPAT_386BSD_MBRPART (not) in disklabel. To generate a diff of this commit: cvs rdiff -u -r1.1502 -r1.1503 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/CHANGES diff -u src/doc/CHANGES:1.1502 src/doc/CHANGES:1.1503 --- src/doc/CHANGES:1.1502 Sat Feb 12 22:07:56 2011 +++ src/doc/CHANGES Sat Feb 12 22:30:04 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1502 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1503 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -847,3 +847,11 @@ [tsutsui 20110212] hp300: Add support for Apollo Domain keyboard. From OpenBSD. [tsutsui 20110212] + disklabel(8): Disable COMPAT_386BSD_MBRPART. The related kernel + compat option was disabled by default four years ago, and + NetBSD has not used partition id 0x165 for much longer. + Meanwhile the presence of this code in disklabel can + cause sysinst to clobber FreeBSD installs on the same + disk. Those with very, very old NetBSD installations may + need to use fdisk(8) to change the NetBSD partition ids + from 0x165 to 0x169. [dholland 20110212]
CVS commit: src/lib
Module Name:src Committed By: matt Date: Sat Feb 12 22:24:40 UTC 2011 Modified Files: src/lib: Makefile Log Message: Need to build libsaslc To generate a diff of this commit: cvs rdiff -u -r1.163 -r1.164 src/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/Makefile diff -u src/lib/Makefile:1.163 src/lib/Makefile:1.164 --- src/lib/Makefile:1.163 Thu Feb 10 20:57:22 2011 +++ src/lib/Makefile Sat Feb 12 22:24:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.163 2011/02/10 20:57:22 matt Exp $ +# $NetBSD: Makefile,v 1.164 2011/02/12 22:24:40 matt Exp $ # from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91 .include bsd.own.mk @@ -185,4 +185,11 @@ SUBDIR+= libpam # depends on libkafs, libkrb5, ... .endif +# 6th library dependency barrier +SUBDIR+= .WAIT + +.if (${MKCRYPTO} != no) +SUBDIR+= ../crypto/external/bsd/libsaslc # depends on gssapi +.endif + .include bsd.subdir.mk
CVS commit: src/crypto/external/bsd/libsaslc/dist/src
Module Name:src Committed By: matt Date: Sat Feb 12 22:24:01 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/dist/src: mech_digestmd5.c Log Message: Fix some LP64/IPL32 issues To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.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/external/bsd/libsaslc/dist/src/mech_digestmd5.c diff -u src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c:1.4 src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c:1.5 --- src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c:1.4 Fri Feb 11 23:44:43 2011 +++ src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c Sat Feb 12 22:24:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mech_digestmd5.c,v 1.4 2011/02/11 23:44:43 christos Exp $ */ +/* $NetBSD: mech_digestmd5.c,v 1.5 2011/02/12 22:24:01 matt Exp $ */ /* Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: mech_digestmd5.c,v 1.4 2011/02/11 23:44:43 christos Exp $); +__RCSID($NetBSD: mech_digestmd5.c,v 1.5 2011/02/12 22:24:01 matt Exp $); #include assert.h #include md5.h @@ -180,7 +180,7 @@ char *realm; cipher_t cipher; int nonce_cnt; - unsigned long maxbuf; + size_t maxbuf; } rdata_t; typedef uint8_t md5hash_t[MD5_DIGEST_LENGTH]; @@ -1240,8 +1240,8 @@ cipher error); return -1; } - assert(tmplen == len - 6); - if (tmplen != len - 6) + assert(tmplen == (ssize_t)len - 6); + if (tmplen != (ssize_t)len - 6) return -1; } @@ -2115,7 +2115,7 @@ } /*FALLTHROUGH*/ case QOP_INT: - if (asprintf(maxbuf, maxbuf=%zd,, ms-rdata.maxbuf) == -1) { + if (asprintf(maxbuf, maxbuf=%zu,, ms-rdata.maxbuf) == -1) { saslc__error_set_errno(ERR(sess), ERROR_NOMEM); goto done; }
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: matt Date: Sat Feb 12 22:26:00 UTC 2011 Modified Files: src/distrib/sets/lists/base: md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: md.amd64 md.sparc64 mi shl.mi Log Message: Add entries for libsaslc Add some missings entries for amd64 To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.107 -r1.108 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.575 -r1.576 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1586 -r1.1587 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.160 -r1.161 src/distrib/sets/lists/comp/shl.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/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.114 src/distrib/sets/lists/base/md.amd64:1.115 --- src/distrib/sets/lists/base/md.amd64:1.114 Fri Feb 11 06:50:13 2011 +++ src/distrib/sets/lists/base/md.amd64 Sat Feb 12 22:25:59 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.114 2011/02/11 06:50:13 matt Exp $ +# $NetBSD: md.amd64,v 1.115 2011/02/12 22:25:59 matt Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -217,6 +217,8 @@ ./usr/lib/i386/librumphijack.so.0.0 base-compat-shlib compat,pic ./usr/lib/i386/librumpvfs.so.0 base-compat-shlib compat,pic ./usr/lib/i386/librumpvfs.so.0.0 base-compat-shlib compat,pic +./usr/lib/i386/libsaslc.so.0 base-compat-shlib compat,pic,crypto +./usr/lib/i386/libsaslc.so.0.0 base-compat-shlib compat,pic,crypto ./usr/lib/i386/libskey.so.2 base-compat-shlib compat,pic,skey ./usr/lib/i386/libskey.so.2.0 base-compat-shlib compat,pic,skey ./usr/lib/i386/libsl.so.4 base-compat-shlib compat,pic,kerberos Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.107 src/distrib/sets/lists/base/md.sparc64:1.108 --- src/distrib/sets/lists/base/md.sparc64:1.107 Fri Feb 11 06:50:13 2011 +++ src/distrib/sets/lists/base/md.sparc64 Sat Feb 12 22:25:59 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.107 2011/02/11 06:50:13 matt Exp $ +# $NetBSD: md.sparc64,v 1.108 2011/02/12 22:25:59 matt Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root obsolete ./usr/bin/fdformatbase-util-bin @@ -214,6 +214,8 @@ ./usr/lib/sparc/librumphijack.so.0.0 base-compat-shlib compat,pic ./usr/lib/sparc/librumpvfs.so.0 base-compat-shlib compat,pic ./usr/lib/sparc/librumpvfs.so.0.0 base-compat-shlib compat,pic +./usr/lib/sparc/libsaslc.so.0 base-compat-shlib compat,pic,crypto +./usr/lib/sparc/libsaslc.so.0.0 base-compat-shlib compat,pic,crypto ./usr/lib/sparc/libskey.so.2 base-compat-shlib compat,pic,skey ./usr/lib/sparc/libskey.so.2.0 base-compat-shlib compat,pic,skey ./usr/lib/sparc/libsl.so.4 base-compat-shlib compat,pic,kerberos Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.575 src/distrib/sets/lists/base/shl.mi:1.576 --- src/distrib/sets/lists/base/shl.mi:1.575 Tue Feb 8 19:57:10 2011 +++ src/distrib/sets/lists/base/shl.mi Sat Feb 12 22:25:59 2011 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.575 2011/02/08 19:57:10 haad Exp $ +# $NetBSD: shl.mi,v 1.576 2011/02/12 22:25:59 matt Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -606,6 +606,9 @@ ./usr/lib/librumpvfs_layerfs.so base-rump-shlib ./usr/lib/librumpvfs_layerfs.so.0 base-rump-shlib ./usr/lib/librumpvfs_layerfs.so.0.0 base-rump-shlib +./usr/lib/libsaslc.sobase-sys-shlib crypto +./usr/lib/libsaslc.so.0base-sys-shlib crypto +./usr/lib/libsaslc.so.0.0 base-sys-shlib crypto ./usr/lib/libsdp.sobase-obsolete obsolete ./usr/lib/libskey.sobase-sys-shlib skey ./usr/lib/libskey.so.2base-sys-shlib skey Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.99 src/distrib/sets/lists/comp/md.amd64:1.100 --- src/distrib/sets/lists/comp/md.amd64:1.99 Sat Feb 12 19:21:29 2011 +++ src/distrib/sets/lists/comp/md.amd64 Sat Feb 12 22:25:59 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.99 2011/02/12 19:21:29 nakayama Exp $ +# $NetBSD: md.amd64,v 1.100 2011/02/12 22:25:59 matt Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -448,6 +448,7 @@ ./usr/lib/i386/libdevmapper.so comp-sys-shlib compat,pic,lvm ./usr/lib/i386/libdevmapper_g.a -unknown- compat,debuglib,lvm ./usr/lib/i386/libdevmapper_p.a comp-c-proflib compat,profile,lvm +./usr/lib/i386/libdevmapper_pic.a comp-c-piclib compat,pic,lvm ./usr/lib/i386/libdm.a
CVS commit: src/crypto/external/bsd/libsaslc/dist/src
Module Name:src Committed By: christos Date: Sat Feb 12 22:46:14 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/dist/src: crypto.c mech_digestmd5.c mech_gssapi.c xsess.c Log Message: fix size_t inconsistencies. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/libsaslc/dist/src/crypto.c \ src/crypto/external/bsd/libsaslc/dist/src/mech_gssapi.c \ src/crypto/external/bsd/libsaslc/dist/src/xsess.c cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.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/external/bsd/libsaslc/dist/src/crypto.c diff -u src/crypto/external/bsd/libsaslc/dist/src/crypto.c:1.3 src/crypto/external/bsd/libsaslc/dist/src/crypto.c:1.4 --- src/crypto/external/bsd/libsaslc/dist/src/crypto.c:1.3 Fri Feb 11 18:44:43 2011 +++ src/crypto/external/bsd/libsaslc/dist/src/crypto.c Sat Feb 12 17:46:14 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: crypto.c,v 1.3 2011/02/11 23:44:43 christos Exp $ */ +/* $NetBSD: crypto.c,v 1.4 2011/02/12 22:46:14 christos Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: crypto.c,v 1.3 2011/02/11 23:44:43 christos Exp $); +__RCSID($NetBSD: crypto.c,v 1.4 2011/02/12 22:46:14 christos Exp $); #include assert.h #include stdio.h @@ -214,7 +214,7 @@ assert(digest != NULL); if (digest != NULL) - (void)MD5((const unsigned char *)buf, (int)buflen, digest); + (void)MD5((const unsigned char *)buf, buflen, digest); } /** @@ -229,7 +229,7 @@ { unsigned char digest[MD5_DIGEST_LENGTH]; - (void)MD5((const unsigned char *)buf, (int)buflen, digest); + (void)MD5((const unsigned char *)buf, buflen, digest); return saslc__crypto_hash_to_hex(digest); } @@ -249,9 +249,8 @@ unsigned int hmac_len; assert(hmac != NULL); - if (hmac == NULL || - HMAC(EVP_md5(), key, (int)keylen, in, (int)inlen, hmac, hmac_len) - == NULL) + if (hmac == NULL || HMAC(EVP_md5(), key, (int)keylen, in, + inlen, hmac, hmac_len) == NULL) return -1; assert(hmac_len == MD5_DIGEST_LENGTH); Index: src/crypto/external/bsd/libsaslc/dist/src/mech_gssapi.c diff -u src/crypto/external/bsd/libsaslc/dist/src/mech_gssapi.c:1.3 src/crypto/external/bsd/libsaslc/dist/src/mech_gssapi.c:1.4 --- src/crypto/external/bsd/libsaslc/dist/src/mech_gssapi.c:1.3 Fri Feb 11 18:44:43 2011 +++ src/crypto/external/bsd/libsaslc/dist/src/mech_gssapi.c Sat Feb 12 17:46:14 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mech_gssapi.c,v 1.3 2011/02/11 23:44:43 christos Exp $ */ +/* $NetBSD: mech_gssapi.c,v 1.4 2011/02/12 22:46:14 christos Exp $ */ /* Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: mech_gssapi.c,v 1.3 2011/02/11 23:44:43 christos Exp $); +__RCSID($NetBSD: mech_gssapi.c,v 1.4 2011/02/12 22:46:14 christos Exp $); #include assert.h #include errno.h @@ -269,7 +269,7 @@ } buflen = outbuf-length + 4; if (buflen ms-omaxbuf) { - saslc__error_set(ERR(sess), MECH_ERROR, + saslc__error_set(ERR(sess), ERROR_MECH, output exceeds server maxbuf size); gss_release_buffer(min_s, outbuf); return -1; Index: src/crypto/external/bsd/libsaslc/dist/src/xsess.c diff -u src/crypto/external/bsd/libsaslc/dist/src/xsess.c:1.3 src/crypto/external/bsd/libsaslc/dist/src/xsess.c:1.4 --- src/crypto/external/bsd/libsaslc/dist/src/xsess.c:1.3 Fri Feb 11 18:44:43 2011 +++ src/crypto/external/bsd/libsaslc/dist/src/xsess.c Sat Feb 12 17:46:14 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: xsess.c,v 1.3 2011/02/11 23:44:43 christos Exp $ */ +/* $NetBSD: xsess.c,v 1.4 2011/02/12 22:46:14 christos Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: xsess.c,v 1.3 2011/02/11 23:44:43 christos Exp $); +__RCSID($NetBSD: xsess.c,v 1.4 2011/02/12 22:46:14 christos Exp $); #include assert.h #include saslc.h @@ -429,7 +429,7 @@ saslc_debug = saslc__parser_is_true(debug); } - saslc__msg_dbg(%s: encoded: inlen=%zd in='%s', __func__, inlen, + saslc__msg_dbg(%s: encoded: inlen=%zu in='%s', __func__, inlen, in ? (const char *)in : null); if (inlen == 0 || (sess-flags SASLC_FLAGS_BASE64_IN) == 0) dec = NULL; @@ -442,7 +442,7 @@ } in = dec; } - saslc__msg_dbg(%s: decoded: inlen=%zd in='%s', __func__, inlen, + saslc__msg_dbg(%s: decoded: inlen=%zu in='%s', __func__, inlen, in ? (const char *)in : null); rv = sess-mech-cont(sess, in, inlen, out, outlen); if (dec != NULL) Index: src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c diff -u src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c:1.5
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Sat Feb 12 22:48:05 UTC 2011 Modified Files: src/sys/arch/hp300/dev: frodo.c Log Message: Fix comment (362 doesn't have frodo). To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/hp300/dev/frodo.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/hp300/dev/frodo.c diff -u src/sys/arch/hp300/dev/frodo.c:1.29 src/sys/arch/hp300/dev/frodo.c:1.30 --- src/sys/arch/hp300/dev/frodo.c:1.29 Mon Apr 28 20:23:19 2008 +++ src/sys/arch/hp300/dev/frodo.c Sat Feb 12 22:48:04 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: frodo.c,v 1.29 2008/04/28 20:23:19 martin Exp $ */ +/* $NetBSD: frodo.c,v 1.30 2011/02/12 22:48:04 tsutsui Exp $ */ /*- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -56,12 +56,11 @@ /* * Support for the Frodo (a.k.a. Apollo Utility) chip found - * in HP Apollo 9000/4xx workstations, as well as - * HP 9000/362 and 9000/382 controllers. + * in HP Apollo 9000/4xx workstations, as well as 9000/382 controllers. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: frodo.c,v 1.29 2008/04/28 20:23:19 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: frodo.c,v 1.30 2011/02/12 22:48:04 tsutsui Exp $); #define _HP300_INTR_H_PRIVATE
CVS commit: src/sys/arch/hp300/dev
Module Name:src Committed By: tsutsui Date: Sat Feb 12 23:10:22 UTC 2011 Modified Files: src/sys/arch/hp300/dev: spc.c Log Message: Handle LED_DISK per DMA xfer. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/dev/spc.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/hp300/dev/spc.c diff -u src/sys/arch/hp300/dev/spc.c:1.7 src/sys/arch/hp300/dev/spc.c:1.8 --- src/sys/arch/hp300/dev/spc.c:1.7 Wed May 14 13:29:28 2008 +++ src/sys/arch/hp300/dev/spc.c Sat Feb 12 23:10:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: spc.c,v 1.7 2008/05/14 13:29:28 tsutsui Exp $ */ +/* $NetBSD: spc.c,v 1.8 2011/02/12 23:10:22 tsutsui Exp $ */ /*- * Copyright (c) 2003 Izumi Tsutsui. All rights reserved. @@ -25,10 +25,11 @@ */ #include opt_ddb.h +#include opt_useleds.h #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: spc.c,v 1.7 2008/05/14 13:29:28 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: spc.c,v 1.8 2011/02/12 23:10:22 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -55,6 +56,10 @@ #include hp300/dev/dmareg.h #include hp300/dev/dmavar.h +#ifdef USELEDS +#include hp300/hp300/leds.h +#endif + static int spc_dio_match(device_t, cfdata_t, void *); static void spc_dio_attach(device_t, device_t, void *); static void spc_dio_dmastart(struct spc_softc *, void *, size_t, int); @@ -227,6 +232,9 @@ bus_space_write_1(iot, iohspc, SCMD, cmd); sc-sc_flags |= SPC_DOINGDMA; +#ifdef USELEDS + ledcontrol(LED_DISK, 0, 0); +#endif } static void @@ -270,6 +278,9 @@ sc-sc_dleft -= trans; sc-sc_flags = ~SPC_DOINGDMA; +#ifdef USELEDS + ledcontrol(0, LED_DISK, 0); +#endif } static void @@ -286,4 +297,7 @@ dsc-sc_dflags = ~SCSI_HAVEDMA; sc-sc_flags = ~SPC_DOINGDMA; +#ifdef USELEDS + ledcontrol(0, LED_DISK, 0); +#endif }
CVS commit: src/crypto/external/bsd/libsaslc/dist
Module Name:src Committed By: christos Date: Sat Feb 12 23:21:33 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/dist/man: libsaslc.3 src/crypto/external/bsd/libsaslc/dist/src: buffer.c crypto.c dict.c dict.h error.c list.c mech.c mech.h mech_crammd5.c mech_digestmd5.c mech_gssapi.c mech_plain.c msg.c parser.c saslc.c saslc_private.h xsess.c src/crypto/external/bsd/libsaslc/dist/test: Atffile Makefile example_client.c t_crypto.c t_dict.c t_error.c t_parser.c t_saslc.c t_session.c Log Message: Fix botched merges of the patch that Anon Ymous sent. From Anon Ymous To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/libsaslc/dist/src/buffer.c \ src/crypto/external/bsd/libsaslc/dist/src/list.c \ src/crypto/external/bsd/libsaslc/dist/src/msg.c cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/libsaslc/dist/src/crypto.c \ src/crypto/external/bsd/libsaslc/dist/src/dict.c \ src/crypto/external/bsd/libsaslc/dist/src/mech_gssapi.c \ src/crypto/external/bsd/libsaslc/dist/src/xsess.c cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/libsaslc/dist/src/dict.h \ src/crypto/external/bsd/libsaslc/dist/src/error.c \ src/crypto/external/bsd/libsaslc/dist/src/mech.c \ src/crypto/external/bsd/libsaslc/dist/src/mech.h \ src/crypto/external/bsd/libsaslc/dist/src/mech_crammd5.c \ src/crypto/external/bsd/libsaslc/dist/src/mech_plain.c \ src/crypto/external/bsd/libsaslc/dist/src/parser.c \ src/crypto/external/bsd/libsaslc/dist/src/saslc.c \ src/crypto/external/bsd/libsaslc/dist/src/saslc_private.h cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/libsaslc/dist/test/Atffile cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/libsaslc/dist/test/Makefile \ src/crypto/external/bsd/libsaslc/dist/test/example_client.c \ src/crypto/external/bsd/libsaslc/dist/test/t_crypto.c \ src/crypto/external/bsd/libsaslc/dist/test/t_dict.c \ src/crypto/external/bsd/libsaslc/dist/test/t_error.c \ src/crypto/external/bsd/libsaslc/dist/test/t_parser.c \ src/crypto/external/bsd/libsaslc/dist/test/t_saslc.c \ src/crypto/external/bsd/libsaslc/dist/test/t_session.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/external/bsd/libsaslc/dist/man/libsaslc.3 diff -u src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.6 src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.7 --- src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.6 Sat Feb 12 11:08:18 2011 +++ src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 Sat Feb 12 18:21:32 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: libsaslc.3,v 1.6 2011/02/12 16:08:18 wiz Exp $ +.\ $NetBSD: libsaslc.3,v 1.7 2011/02/12 23:21:32 christos Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -142,6 +142,7 @@ .Sx CONFIGURATION below for the supported mechanisms. The valid security options are +.Pp .Bl -tag -width nodictionaryxxx -offset indent -compact .It Qo noanonymous Qc reject anonymous mechanisms @@ -154,6 +155,7 @@ .It Qo mutual Qc require mutual authentication mechanisms .El +.Pp Unknown security options are ignored. Returns a session handle or .Dv NULL @@ -488,7 +490,8 @@ By default all supported ciphers are used, but they may be limited by a comma delimited list of cipher names. The recognized cipher names for DIGEST-MD5 are: -.Bl -tag -offset indent +.Pp +.Bl -tag -offset indent -compact .It Li 3des Triple-DES Cipher in CBC two keys mode with 112 bit key .It Li aes @@ -539,7 +542,8 @@ By default all supported QOP values are allowed, but they may be limited by a comma delimited list of QOP values. The recognized QOP values are: -.Bl -tag -offset indent +.Pp +.Bl -tag -offset indent -compact .It Li auth authentication only .It Li auth-int Index: src/crypto/external/bsd/libsaslc/dist/src/buffer.c diff -u src/crypto/external/bsd/libsaslc/dist/src/buffer.c:1.1 src/crypto/external/bsd/libsaslc/dist/src/buffer.c:1.2 --- src/crypto/external/bsd/libsaslc/dist/src/buffer.c:1.1 Fri Feb 11 18:44:43 2011 +++ src/crypto/external/bsd/libsaslc/dist/src/buffer.c Sat Feb 12 18:21:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: buffer.c,v 1.1 2011/02/11 23:44:43 christos Exp $ */ +/* $NetBSD: buffer.c,v 1.2 2011/02/12 23:21:32 christos Exp $ */ /* Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -32,13 +32,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: buffer.c,v 1.1 2011/02/11 23:44:43 christos Exp $); +__RCSID($NetBSD: buffer.c,v 1.2 2011/02/12 23:21:32 christos Exp $); #include sys/param.h /* for MIN() */ + #include assert.h -#include
CVS commit: [bouyer-quota2] src/sys/ufs/ufs
Module Name:src Committed By: bouyer Date: Sun Feb 13 00:11:09 UTC 2011 Modified Files: src/sys/ufs/ufs [bouyer-quota2]: ufs_quota.c Log Message: Fix memory leak To generate a diff of this commit: cvs rdiff -u -r1.68.4.13 -r1.68.4.14 src/sys/ufs/ufs/ufs_quota.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/ufs/ufs_quota.c diff -u src/sys/ufs/ufs/ufs_quota.c:1.68.4.13 src/sys/ufs/ufs/ufs_quota.c:1.68.4.14 --- src/sys/ufs/ufs/ufs_quota.c:1.68.4.13 Sat Feb 12 21:48:09 2011 +++ src/sys/ufs/ufs/ufs_quota.c Sun Feb 13 00:11:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_quota.c,v 1.68.4.13 2011/02/12 21:48:09 bouyer Exp $ */ +/* $NetBSD: ufs_quota.c,v 1.68.4.14 2011/02/13 00:11:09 bouyer Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993, 1995 @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.68.4.13 2011/02/12 21:48:09 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.68.4.14 2011/02/13 00:11:09 bouyer Exp $); #if defined(_KERNEL_OPT) #include opt_quota.h @@ -301,8 +301,10 @@ if (!prop_dictionary_get_cstring_nocopy(data, id, idstr)) continue; - if (strcmp(idstr, default)) -continue; + if (strcmp(idstr, default)) { +error = EINVAL; +goto err; + } id = 0; defaultq = 1; } else { @@ -311,10 +313,8 @@ error = quota_get_auth(mp, l, id); if (error == EPERM) continue; - if (error != 0) { - prop_object_release(replies); - return error; - } + if (error != 0) + goto err; #ifdef QUOTA if (ump-um_flags UFS_QUOTA) error = quota1_handle_cmd_get(ump, type, id, defaultq, @@ -329,17 +329,22 @@ #endif panic(quota_handle_cmd_get: no support ?); - if (error error != ENOENT) { - prop_object_release(replies); - return error; - } + if (error == ENOENT) + continue; + if (error != 0) + goto err; } + prop_object_iterator_release(iter); if (!prop_dictionary_set_and_rel(cmddict, data, replies)) { error = ENOMEM; } else { error = 0; } return error; +err: + prop_object_iterator_release(iter); + prop_object_release(replies); + return error; } static int @@ -380,10 +385,8 @@ } error = kauth_authorize_system(l-l_cred, KAUTH_SYSTEM_FS_QUOTA, KAUTH_REQ_SYSTEM_FS_QUOTA_MANAGE, mp, KAUTH_ARG(id), NULL); - if (error != 0) { - prop_object_release(replies); - return error; - } + if (error != 0) + goto err; #ifdef QUOTA if (ump-um_flags UFS_QUOTA) error = quota1_handle_cmd_set(ump, type, id, defaultq, @@ -398,17 +401,20 @@ #endif panic(quota_handle_cmd_get: no support ?); - if (error error != ENOENT) { - prop_object_release(replies); - return error; - } + if (error error != ENOENT) + goto err; } + prop_object_iterator_release(iter); if (!prop_dictionary_set_and_rel(cmddict, data, replies)) { error = ENOMEM; } else { error = 0; } return error; +err: + prop_object_iterator_release(iter); + prop_object_release(replies); + return error; } static int @@ -449,10 +455,8 @@ } error = kauth_authorize_system(l-l_cred, KAUTH_SYSTEM_FS_QUOTA, KAUTH_REQ_SYSTEM_FS_QUOTA_MANAGE, mp, KAUTH_ARG(id), NULL); - if (error != 0) { - prop_object_release(replies); - return error; - } + if (error != 0) + goto err; #ifdef QUOTA2 if (ump-um_flags UFS_QUOTA2) { error = quota2_handle_cmd_clear(ump, type, id, defaultq, @@ -461,17 +465,20 @@ #endif panic(quota_handle_cmd_get: no support ?); - if (error error != ENOENT) { - prop_object_release(replies); - return error; - } + if (error error != ENOENT) + goto err; } + prop_object_iterator_release(iter); if (!prop_dictionary_set_and_rel(cmddict, data, replies)) { error = ENOMEM; } else { error = 0; } return error; +err: + prop_object_iterator_release(iter); + prop_object_release(replies); + return error; } static int
CVS commit: src/share/misc
Module Name:src Committed By: dholland Date: Sat Feb 12 19:32:42 UTC 2011 Modified Files: src/share/misc: acronyms acronyms.comp Log Message: Move GPS, OTS, and the trademark definition of TM from acronyms.comp to acronyms. (OTS is maybe debatable, but COTS is in acronyms and the two should clearly be together.) To generate a diff of this commit: cvs rdiff -u -r1.201 -r1.202 src/share/misc/acronyms cvs rdiff -u -r1.117 -r1.118 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms diff -u src/share/misc/acronyms:1.201 src/share/misc/acronyms:1.202 --- src/share/misc/acronyms:1.201 Thu Feb 10 19:25:42 2011 +++ src/share/misc/acronyms Sat Feb 12 19:32:42 2011 @@ -1,4 +1,4 @@ -$NetBSD: acronyms,v 1.201 2011/02/10 19:25:42 jruoho Exp $ +$NetBSD: acronyms,v 1.202 2011/02/12 19:32:42 dholland Exp $ 10Q thank you 10X thanks 1337 elite (leet) @@ -144,6 +144,7 @@ GL good luck GLHF good luck, have fun GMTA great minds think alike +GPS global positioning system GR8 great GTFO get the fuck out GTG got to go @@ -263,6 +264,7 @@ OT off topic OTL out to lunch OTOH on the other hand +OTS off the shelf OTT over the top OTTOMH off the top of my head OWTTE or words to that effect @@ -350,6 +352,7 @@ TLA three letter acronym TLC tender loving care TLDR too long, didn't read +TM trademark TMA too many abbreviations TMG too much government TMI too much information Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.117 src/share/misc/acronyms.comp:1.118 --- src/share/misc/acronyms.comp:1.117 Thu Feb 10 17:52:18 2011 +++ src/share/misc/acronyms.comp Sat Feb 12 19:32:42 2011 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.117 2011/02/10 17:52:18 jruoho Exp $ +$NetBSD: acronyms.comp,v 1.118 2011/02/12 19:32:42 dholland Exp $ 3WHS three-way handshake ABI application binary interface @@ -246,7 +246,6 @@ GPE general purpose event GPF general protection fault GPL GNU/general public license -GPS global positioning system GPU graphics processing unit GRE generic routing encapsulation GSI global system interrupt @@ -477,7 +476,6 @@ OSS open sound system OSVW operating system visible workarounds OTP one time password -OTS off the shelf OUI organizationally unique identifier OWL Web ontology language P2P peer to peer @@ -676,7 +674,6 @@ TLD top level domain TLS transport layer security TLS thread local storage -TM trademark TM Turing machine TMDS transition minimized differential signaling TMO timeout
CVS commit: src/external/ibm-public/postfix
Module Name:src Committed By: christos Date: Sun Feb 13 01:50:04 UTC 2011 Modified Files: src/external/ibm-public/postfix: Makefile.inc Log Message: change the saslc define to USE_ and test against no instead of just defined. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/Makefile.inc diff -u src/external/ibm-public/postfix/Makefile.inc:1.4 src/external/ibm-public/postfix/Makefile.inc:1.5 --- src/external/ibm-public/postfix/Makefile.inc:1.4 Sat Feb 12 19:41:20 2011 +++ src/external/ibm-public/postfix/Makefile.inc Sat Feb 12 20:50:03 2011 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.4 2011/02/13 00:41:20 christos Exp $ +# $NetBSD: Makefile.inc,v 1.5 2011/02/13 01:50:03 christos Exp $ .include bsd.own.mk USE_FORT?= yes # network client and server -HAVE_LIB_SASLC?= yes +USE_LIB_SASLC?= yes WARNS?= 0 @@ -16,7 +16,7 @@ -I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \ -I${PFIX_DISTDIR}/src/xsasl -.if defined(HAVE_LIB_SASLC) +.if ${USE_LIB_SASLC} != no CPPFLAGS+= -DUSE_SASL_AUTH -DUSE_SASLC_SASL .if (${MKCRYPTO} != mo) DPADD+= ${LIBSASCL} ${LIBSSL}
CVS commit: src/external/ibm-public/postfix
Module Name:src Committed By: christos Date: Sun Feb 13 01:53:50 UTC 2011 Modified Files: src/external/ibm-public/postfix: Makefile.inc Log Message: don't hard-code /usr/pkg To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/ibm-public/postfix/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/Makefile.inc diff -u src/external/ibm-public/postfix/Makefile.inc:1.5 src/external/ibm-public/postfix/Makefile.inc:1.6 --- src/external/ibm-public/postfix/Makefile.inc:1.5 Sat Feb 12 20:50:03 2011 +++ src/external/ibm-public/postfix/Makefile.inc Sat Feb 12 20:53:50 2011 @@ -1,9 +1,10 @@ -# $NetBSD: Makefile.inc,v 1.5 2011/02/13 01:50:03 christos Exp $ +# $NetBSD: Makefile.inc,v 1.6 2011/02/13 01:53:50 christos Exp $ .include bsd.own.mk USE_FORT?= yes # network client and server USE_LIB_SASLC?= yes +PKGROOT?= /usr/pkg WARNS?= 0 @@ -29,8 +30,8 @@ .elif defined(HAVE_CYRUS_SASL) CPPFLAGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL \ -DDEF_SERVER_SASL_TYPE=\cyrus\ \ - -I/usr/pkg/include/sasl -LDADD+= -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -lsasl2 + -I${PKGROOT}/include/sasl +LDADD+= -L${PKGROOT}/lib -Wl,-R${PKGROOT}/lib -lsasl2 .else CPPFLAGS+= -DDEF_SERVER_SASL_TYPE=\dovecot\ .endif
CVS commit: src/distrib
Module Name:src Committed By: jym Date: Sun Feb 13 03:58:38 UTC 2011 Modified Files: src/distrib/amd64/ramdisks/common: dot.profile src/distrib/i386/ramdisks/common: dot.profile Log Message: Sync the ramdisks dot.profile file between amd64 and i386. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/ramdisks/common/dot.profile cvs rdiff -u -r1.5 -r1.6 src/distrib/i386/ramdisks/common/dot.profile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/amd64/ramdisks/common/dot.profile diff -u src/distrib/amd64/ramdisks/common/dot.profile:1.2 src/distrib/amd64/ramdisks/common/dot.profile:1.3 --- src/distrib/amd64/ramdisks/common/dot.profile:1.2 Wed Oct 22 11:58:00 2008 +++ src/distrib/amd64/ramdisks/common/dot.profile Sun Feb 13 03:58:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: dot.profile,v 1.2 2008/10/22 11:58:00 tsutsui Exp $ +# $NetBSD: dot.profile,v 1.3 2011/02/13 03:58:38 jym Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -36,13 +36,13 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ export PATH TERM=wsvt25 +export TERM HOME=/ export HOME BLOCKSIZE=1k export BLOCKSIZE EDITOR=ed export EDITOR -export TERM umask 022 @@ -55,14 +55,15 @@ # set up some sane defaults echo 'erase ^?, werase ^W, kill ^U, intr ^C' stty newcrt werase ^W intr ^C kill ^U erase ^? - echo '' + mount -t tmpfs tmpfs /tmp + mount -t tmpfs tmpfs /var + mount -t tmpfs -o union tmpfs /etc + + mkdir -p /var/run /var/db # mount the ramdisk read write mount -u $ROOTDEV / - # pull in the functions that people will use from the shell prompt. - # . /.commonutils - # . /.instutils grep() sed -n /$1/p if [ -x /sysinst ]; then Index: src/distrib/i386/ramdisks/common/dot.profile diff -u src/distrib/i386/ramdisks/common/dot.profile:1.5 src/distrib/i386/ramdisks/common/dot.profile:1.6 --- src/distrib/i386/ramdisks/common/dot.profile:1.5 Sun Apr 4 22:56:44 2010 +++ src/distrib/i386/ramdisks/common/dot.profile Sun Feb 13 03:58:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: dot.profile,v 1.5 2010/04/04 22:56:44 martin Exp $ +# $NetBSD: dot.profile,v 1.6 2011/02/13 03:58:38 jym Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -46,22 +46,24 @@ umask 022 +ROOTDEV=/dev/md0a + if [ X${DONEPROFILE} = X ]; then DONEPROFILE=YES export DONEPROFILE - echo '' - echo 'Please wait.' - echo '' - # set up some sane defaults - stty newcrt werase ^W intr ^C kill ^U erase ^H + echo 'erase ^?, werase ^W, kill ^U, intr ^C' + stty newcrt werase ^W intr ^C kill ^U erase ^? mount -t tmpfs tmpfs /tmp mount -t tmpfs tmpfs /var mount -t tmpfs -o union tmpfs /etc mkdir -p /var/run /var/db + # mount the ramdisk read write + mount -u $ROOTDEV / + grep() sed -n /$1/p if [ -x /sysinst ]; then
CVS commit: src/distrib
Module Name:src Committed By: jym Date: Sun Feb 13 04:14:58 UTC 2011 Modified Files: src/distrib/amd64/ramdisks/common: list.ramdisk src/distrib/amd64/ramdisks/ramdisk: list src/distrib/i386/ramdisks/common: list.ramdisk src/distrib/i386/ramdisks/ramdisk-big: list Log Message: Sync ramdisks content across i386 and amd64. Biggest change is for amd64, where configuration for crunchgen(1) is moved from ramdisk/ to common/. For i386, only mbrlabel(8) and various LFS related binaries are added. Yes, LFS. It was added to amd64 ramdisk 3 years ago, I believe it's for a good reason... ? To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/distrib/amd64/ramdisks/common/list.ramdisk cvs rdiff -u -r1.12 -r1.13 src/distrib/amd64/ramdisks/ramdisk/list cvs rdiff -u -r1.17 -r1.18 src/distrib/i386/ramdisks/common/list.ramdisk cvs rdiff -u -r1.4 -r1.5 src/distrib/i386/ramdisks/ramdisk-big/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/amd64/ramdisks/common/list.ramdisk diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.12 src/distrib/amd64/ramdisks/common/list.ramdisk:1.13 --- src/distrib/amd64/ramdisks/common/list.ramdisk:1.12 Thu Feb 11 09:06:47 2010 +++ src/distrib/amd64/ramdisks/common/list.ramdisk Sun Feb 13 04:14:58 2011 @@ -1,12 +1,68 @@ -# $NetBSD: list.ramdisk,v 1.12 2010/02/11 09:06:47 roy Exp $ +# $NetBSD: list.ramdisk,v 1.13 2011/02/13 04:14:58 jym Exp $ +SRCDIRS usr.bin/less SRCDIRS bin sbin usr.bin usr.sbin libexec +# Programs for a minimal ramdisk image + +PROG bin/cat +PROG bin/chmod +PROG bin/cp +PROG bin/ln +PROG bin/ls +PROG bin/mkdir +PROG bin/mv +PROG bin/pax usr/bin/tar +PROG bin/pwd +PROG bin/rm +PROG bin/sh +PROG bin/stty + +PROG sbin/chown bin/chgrp +PROG sbin/disklabel +PROG sbin/dmesg +PROG sbin/fsck +PROG sbin/fsck_ffs +PROG sbin/ifconfig +PROG sbin/init +PROG sbin/mknod +PROG sbin/mount +PROG sbin/mount_cd9660 +PROG sbin/mount_ffs +# PROG sbin/mount_kernfs +PROG sbin/mount_msdos +PROG sbin/mount_nfs +PROG sbin/mount_tmpfs +PROG sbin/newfs sbin/mount_mfs +PROG sbin/ping +PROG sbin/reboot sbin/halt +PROG sbin/route +PROG sbin/swapctl +PROG sbin/umount + +PROG usr/bin/ftp +PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip +PROG usr/bin/sed + +# One of these is rather useful +# PROG usr/bin/less usr/bin/more +# PROG usr/bin/more usr/bin/less + +# sysinst doesn't use installboot +# PROG usr/sbin/installboot + +PROG usr/sbin/chroot + +SPECIAL ifconfig srcdir distrib/utils/x_ifconfig +SPECIAL ping srcdir distrib/utils/x_ping +SPECIAL route srcdir distrib/utils/x_route +# SPECIAL more srcdir distrib/utils/more + # init invokes the shell as -sh ARGVLN sh -sh # libhack.o is built by Makefile included Makefile.inc -LIBS libhack.o -lbz2 -lutil -ll -lm +LIBS libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group Index: src/distrib/amd64/ramdisks/ramdisk/list diff -u src/distrib/amd64/ramdisks/ramdisk/list:1.12 src/distrib/amd64/ramdisks/ramdisk/list:1.13 --- src/distrib/amd64/ramdisks/ramdisk/list:1.12 Fri Jan 14 10:26:29 2011 +++ src/distrib/amd64/ramdisks/ramdisk/list Sun Feb 13 04:14:58 2011 @@ -1,73 +1,31 @@ -# $NetBSD: list,v 1.12 2011/01/14 10:26:29 tsutsui Exp $ -# +# $NetBSD: list,v 1.13 2011/02/13 04:14:58 jym Exp $ -SRCDIRS usr.bin/less - -PROG bin/cat -PROG bin/chmod -PROG bin/cp +PROG bin/chio PROG bin/dd PROG bin/df PROG bin/ed -PROG bin/ln -PROG bin/ls -PROG bin/mkdir PROG bin/mt -PROG bin/mv -PROG bin/pax usr/bin/tar -PROG bin/pwd PROG bin/rcmd -PROG bin/rm -PROG bin/sh -PROG bin/stty PROG bin/sync PROG libexec/lfs_cleanerd -PROG sbin/chown bin/chgrp -PROG sbin/disklabel -PROG sbin/dmesg PROG sbin/fdisk -PROG sbin/fsck -PROG sbin/fsck_ffs -PROG sbin/ifconfig -PROG sbin/init PROG sbin/mbrlabel -PROG sbin/mknod -PROG sbin/mount -PROG sbin/mount_cd9660 PROG sbin/mount_ext2fs -PROG sbin/mount_ffs -PROG sbin/mount_kernfs PROG sbin/mount_lfs -PROG sbin/mount_msdos -PROG sbin/mount_nfs PROG sbin/mount_ntfs -PROG sbin/mount_tmpfs -PROG sbin/newfs sbin/mount_mfs PROG sbin/newfs_lfs -PROG sbin/ping PROG sbin/raidctl -PROG sbin/reboot sbin/halt PROG sbin/restore sbin/rrestore -PROG sbin/route +PROG sbin/scsictl PROG sbin/shutdown +PROG sbin/slattach PROG sbin/sysctl -PROG sbin/swapctl -PROG sbin/umount -PROG usr/bin/ftp -PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip PROG usr/bin/less usr/bin/more -PROG usr/bin/sed +PROG usr/bin/tip PROG usr/sbin/installboot -PROG usr/sbin/chroot PROG usr/sbin/wiconfig - -SPECIAL ifconfig srcdir distrib/utils/x_ifconfig -SPECIAL ping srcdir distrib/utils/x_ping -SPECIAL route srcdir distrib/utils/x_route - -LIBS libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop Index:
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: jym Date: Sun Feb 13 04:21:23 UTC 2011 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Missing MPLS options (commented out). To generate a diff of this commit: cvs rdiff -u -r1.302 -r1.303 src/sys/arch/amd64/conf/GENERIC 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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.302 src/sys/arch/amd64/conf/GENERIC:1.303 --- src/sys/arch/amd64/conf/GENERIC:1.302 Fri Feb 11 02:06:09 2011 +++ src/sys/arch/amd64/conf/GENERIC Sun Feb 13 04:21:23 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.302 2011/02/11 02:06:09 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.303 2011/02/13 04:21:23 jym Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.302 $ +#ident GENERIC-$Revision: 1.303 $ maxusers 64 # estimated number of users @@ -175,6 +175,7 @@ #options IPSEC_ESP # IP security (encryption part; define w/IPSEC) #options IPSEC_NAT_T # IPsec NAT traversal (NAT-T) #options IPSEC_DEBUG # debug for IP security +#options MPLS # MultiProtocol Label Switching (needs ifmpls) #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast #options ISO,TPIP # OSI
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jym Date: Sun Feb 13 04:22:41 UTC 2011 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Add missing PUFFS (commented out). To generate a diff of this commit: cvs rdiff -u -r1.1011 -r1.1012 src/sys/arch/i386/conf/GENERIC 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/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1011 src/sys/arch/i386/conf/GENERIC:1.1012 --- src/sys/arch/i386/conf/GENERIC:1.1011 Fri Feb 11 01:59:57 2011 +++ src/sys/arch/i386/conf/GENERIC Sun Feb 13 04:22:41 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1011 2011/02/11 01:59:57 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.1012 2011/02/13 04:22:41 jym Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.1011 $ +#ident GENERIC-$Revision: 1.1012 $ maxusers 64 # estimated number of users @@ -186,6 +186,7 @@ #file-system NULLFS # loopback file system #file-system OVERLAY # overlay file system #file-system PROCFS # /proc +#file-system PUFFS # Userspace file systems (e.g. ntfs-3g sshfs) #file-system UMAPFS # NULLFS + uid and gid remapping #file-system UNION # union file system #file-system CODA # Coda File System; also needs vcoda (below)
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jym Date: Sun Feb 13 04:37:21 UTC 2011 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Compile FFS and NFS statically (e.g. not modular) for GENERIC. These file-systems can be critical for mountroot; as kernel cannot have access to module(7)s without having / mounted first... yes, you see the point. See http://mail-index.netbsd.org/port-i386/2011/02/11/msg002323.html XXX Hopefully, /stand does not reside in a separate partition :o To generate a diff of this commit: cvs rdiff -u -r1.1012 -r1.1013 src/sys/arch/i386/conf/GENERIC 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/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1012 src/sys/arch/i386/conf/GENERIC:1.1013 --- src/sys/arch/i386/conf/GENERIC:1.1012 Sun Feb 13 04:22:41 2011 +++ src/sys/arch/i386/conf/GENERIC Sun Feb 13 04:37:21 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1012 2011/02/13 04:22:41 jym Exp $ +# $NetBSD: GENERIC,v 1.1013 2011/02/13 04:37:21 jym Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.1012 $ +#ident GENERIC-$Revision: 1.1013 $ maxusers 64 # estimated number of users @@ -172,12 +172,12 @@ #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges +file-system FFS # UFS +file-system NFS # Network File System client # File systems, built as module(7)s by default -#file-system FFS # UFS #file-system EXT2FS # second extended file system (linux) #file-system LFS # log-structured file system #file-system MFS # memory file system -#file-system NFS # Network File System client #file-system NTFS # Windows/NT file system (experimental) #file-system CD9660 # ISO 9660 + Rock Ridge file system #file-system MSDOSFS # MS-DOS file system
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jym Date: Sun Feb 13 04:42:54 UTC 2011 Modified Files: src/sys/arch/i386/conf: MONOLITHIC Log Message: Comment out FFS and NFS, they are part of GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/conf/MONOLITHIC 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/i386/conf/MONOLITHIC diff -u src/sys/arch/i386/conf/MONOLITHIC:1.13 src/sys/arch/i386/conf/MONOLITHIC:1.14 --- src/sys/arch/i386/conf/MONOLITHIC:1.13 Wed Dec 15 08:09:02 2010 +++ src/sys/arch/i386/conf/MONOLITHIC Sun Feb 13 04:42:54 2011 @@ -1,4 +1,4 @@ -# $NetBSD: MONOLITHIC,v 1.13 2010/12/15 08:09:02 haad Exp $ +# $NetBSD: MONOLITHIC,v 1.14 2011/02/13 04:42:54 jym Exp $ # # Non MODULAR, used mostly as a reference as to what we modularized. # @@ -21,12 +21,12 @@ options COMPAT_LINUX # binary compatibility with Linux options COMPAT_FREEBSD # binary compatibility with FreeBSD +#file-system FFS # UFS +#file-system NFS # Network File System client # File systems -file-system FFS # UFS file-system EXT2FS # second extended file system (linux) file-system LFS # log-structured file system file-system MFS # memory file system -file-system NFS # Network File System client file-system NTFS # Windows/NT file system (experimental) file-system CD9660 # ISO 9660 + Rock Ridge file system file-system MSDOSFS # MS-DOS file system
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: matt Date: Sun Feb 13 05:03:27 UTC 2011 Modified Files: src/sys/arch/evbppc/mpc85xx: machdep.c Log Message: Fix some typos. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/mpc85xx/machdep.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/evbppc/mpc85xx/machdep.c diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.3 src/sys/arch/evbppc/mpc85xx/machdep.c:1.4 --- src/sys/arch/evbppc/mpc85xx/machdep.c:1.3 Tue Feb 8 06:22:29 2011 +++ src/sys/arch/evbppc/mpc85xx/machdep.c Sun Feb 13 05:03:27 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.3 2011/02/08 06:22:29 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.4 2011/02/13 05:03:27 matt Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -250,15 +250,15 @@ { pcie, PCIE1_BASE, PCI_SIZE, 0, 1, { ISOURCE_PCIEX }, 1 + ilog2(DEVDISR_PCIE), - { SVR_MPC8538v1 16 }, }, + { SVR_MPC8548v1 16 }, }, { pci, PCIX1_MPC8548_BASE, PCI_SIZE, 1, 1, { ISOURCE_PCI1 }, 1 + ilog2(DEVDISR_PCI1), - { SVR_MPC8538v1 16 }, }, + { SVR_MPC8548v1 16 }, }, { pci, PCIX2_MPC8548_BASE, PCI_SIZE, 2, 1, { ISOURCE_PCI2 }, 1 + ilog2(DEVDISR_PCI2), - { SVR_MPC8538v1 16 }, }, + { SVR_MPC8548v1 16 }, }, #endif #if defined(MPC8572) || defined(P2020) { pcie, PCIE1_BASE, PCI_SIZE, 1,
CVS commit: src/sys/arch/zaurus
Module Name:src Committed By: nonaka Date: Sun Feb 13 05:36:34 UTC 2011 Modified Files: src/sys/arch/zaurus/conf: GENERIC src/sys/arch/zaurus/zaurus: machdep.c Log Message: support FFUARTCONSOLE. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/zaurus/conf/GENERIC cvs rdiff -u -r1.21 -r1.22 src/sys/arch/zaurus/zaurus/machdep.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/zaurus/conf/GENERIC diff -u src/sys/arch/zaurus/conf/GENERIC:1.31 src/sys/arch/zaurus/conf/GENERIC:1.32 --- src/sys/arch/zaurus/conf/GENERIC:1.31 Tue Nov 23 11:14:07 2010 +++ src/sys/arch/zaurus/conf/GENERIC Sun Feb 13 05:36:34 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.31 2010/11/23 11:14:07 hannken Exp $ +# $NetBSD: GENERIC,v 1.32 2011/02/13 05:36:34 nonaka Exp $ # # GENERIC machine description file # @@ -215,6 +215,7 @@ # integrated 16550 UARTs options COM_PXA2X0 +#options FFUARTCONSOLE com0 at pxaip? addr 0x4010 intr 22 # Full Function UART com1 at pxaip? addr 0x4020 intr 21 # Bluetooth UART com2 at pxaip? addr 0x4070 intr 20 # Standard UART (for IrDA) Index: src/sys/arch/zaurus/zaurus/machdep.c diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.21 src/sys/arch/zaurus/zaurus/machdep.c:1.22 --- src/sys/arch/zaurus/zaurus/machdep.c:1.21 Sun Nov 28 08:23:25 2010 +++ src/sys/arch/zaurus/zaurus/machdep.c Sun Feb 13 05:36:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.21 2010/11/28 08:23:25 hannken Exp $ */ +/* $NetBSD: machdep.c,v 1.22 2011/02/13 05:36:34 nonaka Exp $ */ /* $OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $ */ /* @@ -107,7 +107,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.21 2010/11/28 08:23:25 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.22 2011/02/13 05:36:34 nonaka Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -242,7 +242,12 @@ pv_addr_t kernel_pt_table[NUM_KERNEL_PTS]; -const char *console = glass; +const char *console = +#ifdef FFUARTCONSOLE + ffuart; +#else + glass; +#endif int glass_console = 0; #ifdef KLOADER
CVS commit: src/crypto/external/bsd/libsaslc/dist/src
Module Name:src Committed By: christos Date: Sun Feb 13 05:39:52 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/dist/src: mech.c Log Message: Make all mechanisms optional, so we can compile in only the ones we want. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/libsaslc/dist/src/mech.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/external/bsd/libsaslc/dist/src/mech.c diff -u src/crypto/external/bsd/libsaslc/dist/src/mech.c:1.4 src/crypto/external/bsd/libsaslc/dist/src/mech.c:1.5 --- src/crypto/external/bsd/libsaslc/dist/src/mech.c:1.4 Sat Feb 12 18:21:32 2011 +++ src/crypto/external/bsd/libsaslc/dist/src/mech.c Sun Feb 13 00:39:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mech.c,v 1.4 2011/02/12 23:21:32 christos Exp $ */ +/* $NetBSD: mech.c,v 1.5 2011/02/13 05:39:52 christos Exp $ */ /* Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: mech.c,v 1.4 2011/02/12 23:21:32 christos Exp $); +__RCSID($NetBSD: mech.c,v 1.5 2011/02/13 05:39:52 christos Exp $); #include sys/queue.h @@ -51,13 +51,20 @@ #include saslc_private.h /* mechanisms */ -extern const saslc__mech_t saslc__mech_anonymous; -extern const saslc__mech_t saslc__mech_crammd5; -extern const saslc__mech_t saslc__mech_digestmd5; -extern const saslc__mech_t saslc__mech_external; -extern const saslc__mech_t saslc__mech_gssapi; -extern const saslc__mech_t saslc__mech_login; -extern const saslc__mech_t saslc__mech_plain; +extern const saslc__mech_t saslc__mech_anonymous +__weak_reference(saslc__mech_anonymous); +extern const saslc__mech_t saslc__mech_crammd5 +__weak_reference(saslc__mech_crammd5); +extern const saslc__mech_t saslc__mech_digestmd5 +__weak_reference(saslc__mech_digestmd5); +extern const saslc__mech_t saslc__mech_external +__weak_reference(saslc__mech_external); +extern const saslc__mech_t saslc__mech_gssapi +__weak_reference(saslc__mech_gssapi); +extern const saslc__mech_t saslc__mech_login +__weak_reference(saslc__mech_login); +extern const saslc__mech_t saslc__mech_plain +__weak_reference(saslc__mech_plain); static const saslc__mech_t *saslc__mechanisms[] = { saslc__mech_anonymous, @@ -67,7 +74,6 @@ saslc__mech_gssapi, saslc__mech_login, saslc__mech_plain, - NULL }; /* @@ -100,7 +106,9 @@ saslc__error_set_errno(ERR(ctx), ERROR_NOMEM); return NULL; } - for (i = 0; saslc__mechanisms[i] != NULL; i++) { + for (i = 0; __arraycount(saslc__mechanisms); i++) { + if (saslc__mechanisms[i] == NULL) + continue; if ((node = calloc(1, sizeof(*node))) == NULL) goto error;
CVS commit: src/external/ibm-public/postfix
Module Name:src Committed By: christos Date: Sun Feb 13 05:45:47 UTC 2011 Modified Files: src/external/ibm-public/postfix: Makefile.inc Log Message: fix typos. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/ibm-public/postfix/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/ibm-public/postfix/Makefile.inc diff -u src/external/ibm-public/postfix/Makefile.inc:1.7 src/external/ibm-public/postfix/Makefile.inc:1.8 --- src/external/ibm-public/postfix/Makefile.inc:1.7 Sun Feb 13 00:12:55 2011 +++ src/external/ibm-public/postfix/Makefile.inc Sun Feb 13 00:45:47 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.7 2011/02/13 05:12:55 christos Exp $ +# $NetBSD: Makefile.inc,v 1.8 2011/02/13 05:45:47 christos Exp $ .include bsd.own.mk @@ -17,9 +17,9 @@ -I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \ -I${PFIX_DISTDIR}/src/xsasl -.if ${USE_LIB_SASL} == sasl +.if ${USE_LIB_SASL} == saslc CPPFLAGS+= -DUSE_SASL_AUTH -DUSE_SASLC_SASL -.if (${MKCRYPTO} != mo) +.if (${MKCRYPTO} != no) DPADD+= ${LIBSASCL} ${LIBSSL} LDADD+= -lsaslc -lssl .if (${MKKERBEROS} != no)
CVS commit: src/sys/dev/usb
Module Name:src Committed By: dholland Date: Sun Feb 13 05:51:25 UTC 2011 Modified Files: src/sys/dev/usb: if_rum.c Log Message: fix typo (clean up the rx list on failure setting it up, not the tx list) from openbsd -r1.75, mentioned by Alexander Nasonov in PR 42667 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/dev/usb/if_rum.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/usb/if_rum.c diff -u src/sys/dev/usb/if_rum.c:1.33 src/sys/dev/usb/if_rum.c:1.34 --- src/sys/dev/usb/if_rum.c:1.33 Wed Nov 3 22:28:31 2010 +++ src/sys/dev/usb/if_rum.c Sun Feb 13 05:51:24 2011 @@ -1,5 +1,5 @@ /* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */ -/* $NetBSD: if_rum.c,v 1.33 2010/11/03 22:28:31 dyoung Exp $ */ +/* $NetBSD: if_rum.c,v 1.34 2011/02/13 05:51:24 dholland Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini damien.bergam...@free.fr @@ -24,7 +24,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_rum.c,v 1.33 2010/11/03 22:28:31 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: if_rum.c,v 1.34 2011/02/13 05:51:24 dholland Exp $); #include sys/param.h @@ -634,7 +634,7 @@ return 0; -fail: rum_free_tx_list(sc); +fail: rum_free_rx_list(sc); return error; }
CVS commit: src/sys/dev/raidframe
Module Name:src Committed By: enami Date: Sun Feb 13 06:17:36 UTC 2011 Modified Files: src/sys/dev/raidframe: rf_disks.c Log Message: Remove one of trailing whitespace which adds unnecessary difference against netbsd-5 branch. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/dev/raidframe/rf_disks.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/raidframe/rf_disks.c diff -u src/sys/dev/raidframe/rf_disks.c:1.76 src/sys/dev/raidframe/rf_disks.c:1.77 --- src/sys/dev/raidframe/rf_disks.c:1.76 Sat Dec 4 10:01:16 2010 +++ src/sys/dev/raidframe/rf_disks.c Sun Feb 13 06:17:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_disks.c,v 1.76 2010/12/04 10:01:16 mrg Exp $ */ +/* $NetBSD: rf_disks.c,v 1.77 2011/02/13 06:17:35 enami Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -60,7 +60,7 @@ ***/ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rf_disks.c,v 1.76 2010/12/04 10:01:16 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: rf_disks.c,v 1.77 2011/02/13 06:17:35 enami Exp $); #include dev/raidframe/raidframevar.h @@ -456,7 +456,7 @@ /* Found it. Configure it.. */ diskPtr-blockSize = ac-clabel-blockSize; diskPtr-numBlocks = ac-clabel-numBlocks; - diskPtr-numBlocks |= + diskPtr-numBlocks |= (uint64_t)ac-clabel-numBlocksHi 32; /* Note: rf_protectedSectors is already factored into numBlocks here */
CVS commit: src/sys/dev
Module Name:src Committed By: nonaka Date: Sun Feb 13 06:43:52 UTC 2011 Modified Files: src/sys/dev/marvell: mvsdio.c src/sys/dev/sdmmc: sdmmc.c sdmmc_io.c sdmmc_mem.c sdmmcreg.h sdmmcvar.h Log Message: - Don't switch MMC high-speed timing, if host controller isn't supported. - Only check EXT_CSD STRUCTURE version when CSD version is 3. - initialize width at sdmmc_function_alloc(). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/marvell/mvsdio.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/sdmmc/sdmmc.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/sdmmc/sdmmc_io.c \ src/sys/dev/sdmmc/sdmmcreg.h cvs rdiff -u -r1.15 -r1.16 src/sys/dev/sdmmc/sdmmc_mem.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/sdmmc/sdmmcvar.h 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/marvell/mvsdio.c diff -u src/sys/dev/marvell/mvsdio.c:1.3 src/sys/dev/marvell/mvsdio.c:1.4 --- src/sys/dev/marvell/mvsdio.c:1.3 Sat Feb 5 15:45:21 2011 +++ src/sys/dev/marvell/mvsdio.c Sun Feb 13 06:43:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsdio.c,v 1.3 2011/02/05 15:45:21 nonaka Exp $ */ +/* $NetBSD: mvsdio.c,v 1.4 2011/02/13 06:43:51 nonaka Exp $ */ /* * Copyright (c) 2010 KIYOHARA Takashi * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mvsdio.c,v 1.3 2011/02/05 15:45:21 nonaka Exp $); +__KERNEL_RCSID(0, $NetBSD: mvsdio.c,v 1.4 2011/02/13 06:43:51 nonaka Exp $); #include opt_mvsdio.h @@ -239,7 +239,7 @@ saa.saa_clkmin = 100; /* : 100 kHz from SheevaPlug LSP */ saa.saa_clkmax = MVSDIO_MAX_CLOCK; saa.saa_caps = SMC_CAPS_AUTO_STOP | SMC_CAPS_4BIT_MODE | SMC_CAPS_DMA | - SMC_CAPS_SD_HIGHSPEED; + SMC_CAPS_SD_HIGHSPEED | SMC_CAPS_MMC_HIGHSPEED; #ifndef MVSDIO_CARD_DETECT saa.saa_caps |= SMC_CAPS_POLL_CARD_DET; #endif Index: src/sys/dev/sdmmc/sdmmc.c diff -u src/sys/dev/sdmmc/sdmmc.c:1.7 src/sys/dev/sdmmc/sdmmc.c:1.8 --- src/sys/dev/sdmmc/sdmmc.c:1.7 Sat Feb 5 15:45:21 2011 +++ src/sys/dev/sdmmc/sdmmc.c Sun Feb 13 06:43:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sdmmc.c,v 1.7 2011/02/05 15:45:21 nonaka Exp $ */ +/* $NetBSD: sdmmc.c,v 1.8 2011/02/13 06:43:51 nonaka Exp $ */ /* $OpenBSD: sdmmc.c,v 1.18 2009/01/09 10:58:38 jsg Exp $ */ /* @@ -50,7 +50,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sdmmc.c,v 1.7 2011/02/05 15:45:21 nonaka Exp $); +__KERNEL_RCSID(0, $NetBSD: sdmmc.c,v 1.8 2011/02/13 06:43:51 nonaka Exp $); #include sys/param.h #include sys/device.h @@ -576,6 +576,7 @@ sf-cis.manufacturer = SDMMC_VENDOR_INVALID; sf-cis.product = SDMMC_PRODUCT_INVALID; sf-cis.function = SDMMC_FUNCTION_INVALID; + sf-width = 1; if (ISSET(sc-sc_flags, SMF_MEM_MODE) ISSET(sc-sc_caps, SMC_CAPS_DMA) Index: src/sys/dev/sdmmc/sdmmc_io.c diff -u src/sys/dev/sdmmc/sdmmc_io.c:1.5 src/sys/dev/sdmmc/sdmmc_io.c:1.6 --- src/sys/dev/sdmmc/sdmmc_io.c:1.5 Thu Oct 7 12:40:34 2010 +++ src/sys/dev/sdmmc/sdmmc_io.c Sun Feb 13 06:43:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sdmmc_io.c,v 1.5 2010/10/07 12:40:34 kiyohara Exp $ */ +/* $NetBSD: sdmmc_io.c,v 1.6 2011/02/13 06:43:52 nonaka Exp $ */ /* $OpenBSD: sdmmc_io.c,v 1.10 2007/09/17 01:33:33 krw Exp $ */ /* @@ -20,7 +20,7 @@ /* Routines for SD I/O cards. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sdmmc_io.c,v 1.5 2010/10/07 12:40:34 kiyohara Exp $); +__KERNEL_RCSID(0, $NetBSD: sdmmc_io.c,v 1.6 2011/02/13 06:43:52 nonaka Exp $); #include sys/param.h #include sys/kernel.h @@ -194,7 +194,6 @@ SDMMC_LOCK(sc); if (sf-number == 0) { - sf-width = 1; reg = sdmmc_io_read_1(sf, SD_IO_CCCR_CAPABILITY); if (!(reg CCCR_CAPS_LSC) || (reg CCCR_CAPS_4BLS)) { sdmmc_io_write_1(sf, SD_IO_CCCR_BUS_WIDTH, Index: src/sys/dev/sdmmc/sdmmcreg.h diff -u src/sys/dev/sdmmc/sdmmcreg.h:1.5 src/sys/dev/sdmmc/sdmmcreg.h:1.6 --- src/sys/dev/sdmmc/sdmmcreg.h:1.5 Thu Oct 7 12:24:23 2010 +++ src/sys/dev/sdmmc/sdmmcreg.h Sun Feb 13 06:43:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sdmmcreg.h,v 1.5 2010/10/07 12:24:23 kiyohara Exp $ */ +/* $NetBSD: sdmmcreg.h,v 1.6 2011/02/13 06:43:52 nonaka Exp $ */ /* $OpenBSD: sdmmcreg.h,v 1.4 2009/01/09 10:55:22 jsg Exp $ */ /* @@ -162,14 +162,15 @@ /* MMC R2 response (CSD) */ #define MMC_CSD_CSDVER(resp) MMC_RSP_BITS((resp), 126, 2) -#define MMC_CSD_CSDVER_1_0 1 -#define MMC_CSD_CSDVER_2_0 2 +#define MMC_CSD_CSDVER_1_0 0 +#define MMC_CSD_CSDVER_1_1 1 +#define MMC_CSD_CSDVER_1_2 2 /* MMC 4.1 - 4.2 - 4.3 */ #define MMC_CSD_MMCVER(resp) MMC_RSP_BITS((resp), 122, 4) #define MMC_CSD_MMCVER_1_0 0 /* MMC 1.0 - 1.2 */ #define MMC_CSD_MMCVER_1_4 1 /* MMC 1.4 */ #define MMC_CSD_MMCVER_2_0 2 /* MMC 2.0 - 2.2 */ #define MMC_CSD_MMCVER_3_1 3 /* MMC 3.1 - 3.3 */ -#define MMC_CSD_MMCVER_4_0 4 /* MMC 4 */ +#define MMC_CSD_MMCVER_4_0 4 /* MMC 4.1 - 4.2 - 4.3 */ #define MMC_CSD_TAAC(resp)
CVS commit: src/sys/dev/sdmmc
Module Name:src Committed By: nonaka Date: Sun Feb 13 07:25:56 UTC 2011 Modified Files: src/sys/dev/sdmmc: sdmmc_mem.c sdmmcreg.h Log Message: use MMC_CSD_CSDVER_EXT_CSD. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/dev/sdmmc/sdmmc_mem.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/sdmmc/sdmmcreg.h 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/sdmmc/sdmmc_mem.c diff -u src/sys/dev/sdmmc/sdmmc_mem.c:1.16 src/sys/dev/sdmmc/sdmmc_mem.c:1.17 --- src/sys/dev/sdmmc/sdmmc_mem.c:1.16 Sun Feb 13 06:43:52 2011 +++ src/sys/dev/sdmmc/sdmmc_mem.c Sun Feb 13 07:25:56 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sdmmc_mem.c,v 1.16 2011/02/13 06:43:52 nonaka Exp $ */ +/* $NetBSD: sdmmc_mem.c,v 1.17 2011/02/13 07:25:56 nonaka Exp $ */ /* $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $ */ /* @@ -46,7 +46,7 @@ /* Routines for SD/MMC memory cards. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sdmmc_mem.c,v 1.16 2011/02/13 06:43:52 nonaka Exp $); +__KERNEL_RCSID(0, $NetBSD: sdmmc_mem.c,v 1.17 2011/02/13 07:25:56 nonaka Exp $); #include sys/param.h #include sys/kernel.h @@ -685,7 +685,7 @@ aprint_error_dev(sc-sc_dev, can't read EXT_CSD\n); return error; } - if ((sf-csd.csdver == 3) + if ((sf-csd.csdver == MMC_CSD_CSDVER_EXT_CSD) (ext_csd[EXT_CSD_STRUCTURE] EXT_CSD_STRUCTURE_VER_1_2)) { aprint_error_dev(sc-sc_dev, unrecognised future version (%d)\n, Index: src/sys/dev/sdmmc/sdmmcreg.h diff -u src/sys/dev/sdmmc/sdmmcreg.h:1.6 src/sys/dev/sdmmc/sdmmcreg.h:1.7 --- src/sys/dev/sdmmc/sdmmcreg.h:1.6 Sun Feb 13 06:43:52 2011 +++ src/sys/dev/sdmmc/sdmmcreg.h Sun Feb 13 07:25:56 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sdmmcreg.h,v 1.6 2011/02/13 06:43:52 nonaka Exp $ */ +/* $NetBSD: sdmmcreg.h,v 1.7 2011/02/13 07:25:56 nonaka Exp $ */ /* $OpenBSD: sdmmcreg.h,v 1.4 2009/01/09 10:55:22 jsg Exp $ */ /* @@ -165,6 +165,7 @@ #define MMC_CSD_CSDVER_1_0 0 #define MMC_CSD_CSDVER_1_1 1 #define MMC_CSD_CSDVER_1_2 2 /* MMC 4.1 - 4.2 - 4.3 */ +#define MMC_CSD_CSDVER_EXT_CSD 3 /* Version is coded in CSD_STRUCTURE in EXT_CSD */ #define MMC_CSD_MMCVER(resp) MMC_RSP_BITS((resp), 122, 4) #define MMC_CSD_MMCVER_1_0 0 /* MMC 1.0 - 1.2 */ #define MMC_CSD_MMCVER_1_4 1 /* MMC 1.4 */