CVS commit: src/etc
Module Name:src
Committed By: jnemeth
Date: Mon Jun 25 07:22:46 UTC 2012
Modified Files:
src/etc: rc.shutdown
Log Message:
PR/46601 - Jim Bernard -- add support for rc_directories
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/etc/rc.shutdown
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.shutdown
diff -u src/etc/rc.shutdown:1.8 src/etc/rc.shutdown:1.9
--- src/etc/rc.shutdown:1.8 Sun May 19 01:01:33 2002
+++ src/etc/rc.shutdown Mon Jun 25 07:22:45 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: rc.shutdown,v 1.8 2002/05/19 01:01:33 lukem Exp $
+# $NetBSD: rc.shutdown,v 1.9 2012/06/25 07:22:45 jnemeth Exp $
#
# rc.shutdown --
# Run the scripts in /etc/rc.d with reverse rcorder.
@@ -44,10 +44,12 @@ if [ -n $rcshutdown_timeout ]; then
fi
-# Determine the shutdown order of the /etc/rc.d scripts,
+# Determine the shutdown order of the rc.d scripts,
# and perform the operation
#
-files=$(rcorder -k shutdown ${rcshutdown_rcorder_flags} /etc/rc.d/*)
+scripts=$(for rcd in ${rc_directories:-/etc/rc.d}; do
+ test -d ${rcd} echo ${rcd}/*; done)
+files=$(rcorder -k shutdown ${rcshutdown_rcorder_flags} ${scripts})
for _rc_elem in $(reverse_list $files); do
run_rc_script $_rc_elem stop
CVS commit: src/sys/arch/usermode/dev
Module Name:src
Committed By: reinoud
Date: Mon Jun 25 14:43:54 UTC 2012
Modified Files:
src/sys/arch/usermode/dev: cpu.c
Log Message:
Implement dummy `cpu_mcontext_validate' to make it compile again. This
function needs to be implemented in the target secton one day for extra
security.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/usermode/dev/cpu.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/usermode/dev/cpu.c
diff -u src/sys/arch/usermode/dev/cpu.c:1.70 src/sys/arch/usermode/dev/cpu.c:1.71
--- src/sys/arch/usermode/dev/cpu.c:1.70 Sat Mar 3 21:15:15 2012
+++ src/sys/arch/usermode/dev/cpu.c Mon Jun 25 14:43:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.70 2012/03/03 21:15:15 reinoud Exp $ */
+/* $NetBSD: cpu.c,v 1.71 2012/06/25 14:43:54 reinoud Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -30,7 +30,7 @@
#include opt_hz.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.70 2012/03/03 21:15:15 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.71 2012/06/25 14:43:54 reinoud Exp $);
#include sys/param.h
#include sys/conf.h
@@ -286,6 +286,16 @@ cpu_getmcontext(struct lwp *l, mcontext_
}
int
+cpu_mcontext_validate(struct lwp *l, const mcontext_t *mcp)
+{
+ /*
+ * can we check here? or should that be done in the target
+ * specific places?
+ */
+ return 0;
+}
+
+int
cpu_setmcontext(struct lwp *l, const mcontext_t *mcp, unsigned int flags)
{
struct pcb *pcb = lwp_getpcb(l);
CVS commit: src/share/man/man4
Module Name:src Committed By: christos Date: Mon Jun 25 14:47:56 UTC 2012 Modified Files: src/share/man/man4: ip.4 ip6.4 Log Message: moved to portalgo.h To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/share/man/man4/ip.4 cvs rdiff -u -r1.29 -r1.30 src/share/man/man4/ip6.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ip.4 diff -u src/share/man/man4/ip.4:1.32 src/share/man/man4/ip.4:1.33 --- src/share/man/man4/ip.4:1.32 Fri Jun 22 10:54:34 2012 +++ src/share/man/man4/ip.4 Mon Jun 25 10:47:55 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: ip.4,v 1.32 2012/06/22 14:54:34 christos Exp $ +.\ $NetBSD: ip.4,v 1.33 2012/06/25 14:47:55 christos Exp $ .\ .\ Copyright (c) 1983, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)ip.4 8.2 (Berkeley) 11/30/93 .\ -.Dd June 20, 2012 +.Dd June 25, 2012 .Dt IP 4 .Os .Sh NAME @@ -116,10 +116,10 @@ can be used to randomize the port select Valid algorithms are described in .Xr rfc6056 7 and their respective constants are in -.In netinet/rfc6056.h . +.In netinet/portalgo.h . For example, .Bd -literal -int algo = RFC6056_ALGO_RANDOM_PICK; /* see \*[Lt]netinet/rfc6056.h\*[Gt] */ +int algo = PORTALGO_ALGO_RANDOM_PICK; /* see \*[Lt]netinet/portalgo.h\*[Gt] */ setsockopt(s, IPPROTO_IP, IP_PORTALGO, \*[Am]algo, sizeof(algo)); .Ed .Pp Index: src/share/man/man4/ip6.4 diff -u src/share/man/man4/ip6.4:1.29 src/share/man/man4/ip6.4:1.30 --- src/share/man/man4/ip6.4:1.29 Fri Jun 22 10:54:34 2012 +++ src/share/man/man4/ip6.4 Mon Jun 25 10:47:55 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: ip6.4,v 1.29 2012/06/22 14:54:34 christos Exp $ +.\ $NetBSD: ip6.4,v 1.30 2012/06/25 14:47:55 christos Exp $ .\ $KAME: ip6.4,v 1.23 2005/01/11 05:56:25 itojun Exp $ .\ $OpenBSD: ip6.4,v 1.21 2005/01/06 03:50:46 itojun Exp $ .\ @@ -28,7 +28,7 @@ .\ 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. -.Dd June 20, 2012 +.Dd June 25, 2012 .Dt IP6 4 .Os .Sh NAME @@ -238,10 +238,10 @@ can be used to randomize the port select Valid algorithms are described in .Xr rfc6056 7 and their respective constants are in -.In netinet/rfc6056.h . +.In netinet/portalgo.h . For example, .Bd -literal -int algo = RFC6056_ALGO_RANDOM_PICK; /* see \*[Lt]netinet/rfc6056.h\*[Gt] */ +int algo = PORTALGO_ALGO_RANDOM_PICK; /* see \*[Lt]netinet/portalgo.h\*[Gt] */ setsockopt(s, IPPROTO_IPV6, IPV6_PORTALGO, \*[Am]algo, sizeof(algo)); .Ed .Pp
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Mon Jun 25 15:28:40 UTC 2012
Modified Files:
src/sys/netinet: Makefile files.netinet in_pcb.c in_pcb.h in_pcb_hdr.h
ip_input.c ip_output.c
src/sys/netinet6: in6_pcb.c in6_pcb.h in6_src.c ip6_input.c
ip6_output.c
Added Files:
src/sys/netinet: portalgo.c portalgo.h
Removed Files:
src/sys/netinet: rfc6056.c rfc6056.h
Log Message:
rename rfc6056 - portalgo, requested by yamt
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/netinet/Makefile \
src/sys/netinet/files.netinet
cvs rdiff -u -r1.142 -r1.143 src/sys/netinet/in_pcb.c
cvs rdiff -u -r1.49 -r1.50 src/sys/netinet/in_pcb.h
cvs rdiff -u -r1.7 -r1.8 src/sys/netinet/in_pcb_hdr.h
cvs rdiff -u -r1.301 -r1.302 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.216 -r1.217 src/sys/netinet/ip_output.c
cvs rdiff -u -r0 -r1.1 src/sys/netinet/portalgo.c src/sys/netinet/portalgo.h
cvs rdiff -u -r1.8 -r0 src/sys/netinet/rfc6056.c
cvs rdiff -u -r1.3 -r0 src/sys/netinet/rfc6056.h
cvs rdiff -u -r1.119 -r1.120 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.36 -r1.37 src/sys/netinet6/in6_pcb.h
cvs rdiff -u -r1.52 -r1.53 src/sys/netinet6/in6_src.c
cvs rdiff -u -r1.139 -r1.140 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.148 -r1.149 src/sys/netinet6/ip6_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/Makefile
diff -u src/sys/netinet/Makefile:1.23 src/sys/netinet/Makefile:1.24
--- src/sys/netinet/Makefile:1.23 Wed Feb 15 12:55:24 2012
+++ src/sys/netinet/Makefile Mon Jun 25 11:28:38 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2012/02/15 17:55:24 riz Exp $
+# $NetBSD: Makefile,v 1.24 2012/06/25 15:28:38 christos Exp $
INCSDIR= /usr/include/netinet
@@ -6,7 +6,7 @@ INCS= icmp6.h icmp_var.h if_atm.h if_eth
igmp_var.h in.h in_gif.h in_pcb.h in_pcb_hdr.h \
in_selsrc.h in_systm.h \
in_var.h ip.h ip_carp.h ip6.h ip_ecn.h ip_encap.h \
- ip_icmp.h ip_mroute.h ip_var.h pim.h pim_var.h rfc6056.h \
+ ip_icmp.h ip_mroute.h ip_var.h pim.h pim_var.h portalgo.h \
tcp.h tcp_debug.h tcp_fsm.h tcp_seq.h tcp_timer.h tcp_var.h \
tcpip.h udp.h udp_var.h \
tcp_vtw.h
Index: src/sys/netinet/files.netinet
diff -u src/sys/netinet/files.netinet:1.23 src/sys/netinet/files.netinet:1.24
--- src/sys/netinet/files.netinet:1.23 Sat Sep 24 13:18:17 2011
+++ src/sys/netinet/files.netinet Mon Jun 25 11:28:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.netinet,v 1.23 2011/09/24 17:18:17 christos Exp $
+# $NetBSD: files.netinet,v 1.24 2012/06/25 15:28:39 christos Exp $
defflag opt_tcp_debug.h TCP_DEBUG
defparam opt_tcp_debug.h TCP_NDEBUG
@@ -43,4 +43,4 @@ file netinet/tcp_congctl.c inet | inet6
file netinet/tcp_vtw.c inet | inet6
file netinet/udp_usrreq.c inet | inet6
-file netinet/rfc6056.c inet | inet6
+file netinet/portalgo.c inet | inet6
Index: src/sys/netinet/in_pcb.c
diff -u src/sys/netinet/in_pcb.c:1.142 src/sys/netinet/in_pcb.c:1.143
--- src/sys/netinet/in_pcb.c:1.142 Thu Jun 21 06:31:45 2012
+++ src/sys/netinet/in_pcb.c Mon Jun 25 11:28:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb.c,v 1.142 2012/06/21 10:31:45 yamt Exp $ */
+/* $NetBSD: in_pcb.c,v 1.143 2012/06/25 15:28:39 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,7 +93,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: in_pcb.c,v 1.142 2012/06/21 10:31:45 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: in_pcb.c,v 1.143 2012/06/25 15:28:39 christos Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -124,7 +124,7 @@ __KERNEL_RCSID(0, $NetBSD: in_pcb.c,v 1
#include netinet/in_pcb.h
#include netinet/in_var.h
#include netinet/ip_var.h
-#include netinet/rfc6056.h
+#include netinet/portalgo.h
#ifdef INET6
#include netinet/ip6.h
@@ -205,7 +205,7 @@ in_pcballoc(struct socket *so, void *v)
inp-inp_table = table;
inp-inp_socket = so;
inp-inp_errormtu = -1;
- inp-inp_rfc6056algo = RFC6056_ALGO_DEFAULT;
+ inp-inp_portalgo = PORTALGO_DEFAULT;
inp-inp_bindportonsend = false;
#if defined(FAST_IPSEC)
error = ipsec_init_pcbpolicy(so, inp-inp_sp);
@@ -260,7 +260,7 @@ in_pcbsetport(struct sockaddr_in *sin, s
/*
* Use RFC6056 randomized port selection
*/
- error = rfc6056_randport(lport, inp-inp_head, cred);
+ error = portalgo_randport(lport, inp-inp_head, cred);
if (error)
return error;
Index: src/sys/netinet/in_pcb.h
diff -u src/sys/netinet/in_pcb.h:1.49 src/sys/netinet/in_pcb.h:1.50
--- src/sys/netinet/in_pcb.h:1.49 Sat Sep 24 13:18:17 2011
+++ src/sys/netinet/in_pcb.h Mon Jun 25 11:28:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb.h,v 1.49 2011/09/24 17:18:17 christos Exp $ */
+/* $NetBSD: in_pcb.h,v 1.50 2012/06/25 15:28:39 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -80,7 +80,7 @@ struct inpcb {
#define inp_af inp_head.inph_af
#define inp_ppcb
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Mon Jun 25 15:30:18 UTC 2012 Modified Files: src/distrib/sets/lists/comp: mi Log Message: rename rfc6056.h to portalgo.h To generate a diff of this commit: cvs rdiff -u -r1.1765 -r1.1766 src/distrib/sets/lists/comp/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1765 src/distrib/sets/lists/comp/mi:1.1766 --- src/distrib/sets/lists/comp/mi:1.1765 Fri Jun 22 14:30:22 2012 +++ src/distrib/sets/lists/comp/mi Mon Jun 25 11:30:16 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1765 2012/06/22 18:30:22 christos Exp $ +# $NetBSD: mi,v 1.1766 2012/06/25 15:30:16 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1933,7 +1933,8 @@ ./usr/include/netinet/ipl.h comp-ipf-include ipfilter ./usr/include/netinet/pim.h comp-c-include ./usr/include/netinet/pim_var.h comp-c-include -./usr/include/netinet/rfc6056.h comp-c-include +./usr/include/netinet/portalgo.h comp-c-include +./usr/include/netinet/rfc6056.h comp-obsolete obsolete ./usr/include/netinet/tcp.h comp-c-include ./usr/include/netinet/tcp_debug.h comp-c-include ./usr/include/netinet/tcp_fsm.h comp-c-include
CVS commit: src/dist/pdisk
Module Name:src
Committed By: abs
Date: Mon Jun 25 16:47:03 UTC 2012
Modified Files:
src/dist/pdisk: partition_map.c
Log Message:
Casting an uint32_t pointer to (long *) may have been acceptable
in the eighties but that time has long past. Minimally invasive
fix using a temporary long variable, so while we can still overflow
at least we're less broken.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/dist/pdisk/partition_map.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/pdisk/partition_map.c
diff -u src/dist/pdisk/partition_map.c:1.14 src/dist/pdisk/partition_map.c:1.15
--- src/dist/pdisk/partition_map.c:1.14 Fri Apr 6 22:41:47 2012
+++ src/dist/pdisk/partition_map.c Mon Jun 25 16:47:03 2012
@@ -514,12 +514,14 @@ create_partition_map(char *name, partiti
default_number = number;
flush_to_newline(0);
do {
+ long long_number = number;
if (get_number_argument(what should be the size? ,
- (long *)number, default_number) == 0) {
+ long_number, default_number) == 0) {
printf(Not a number\n);
flush_to_newline(1);
number = 0;
} else {
+ number = long_number;
multiple = get_multiplier(map-logical_block);
if (multiple == 0) {
printf(Bad multiplier\n);
CVS commit: src/share/mk
Module Name:src
Committed By: abs
Date: Mon Jun 25 16:48:55 UTC 2012
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Whatever -Wl,--fatal-warnings get-out-of-jail-free card gcc-4.5 gets,
give the same treatment to gcc-4.1.
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.215 src/share/mk/bsd.sys.mk:1.216
--- src/share/mk/bsd.sys.mk:1.215 Tue Mar 20 21:48:20 2012
+++ src/share/mk/bsd.sys.mk Mon Jun 25 16:48:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.215 2012/03/20 21:48:20 matt Exp $
+# $NetBSD: bsd.sys.mk,v 1.216 2012/06/25 16:48:55 abs Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -40,7 +40,7 @@ CFLAGS+= -Wa,--fatal-warnings
.if (!defined(MKPIC) || ${MKPIC} != no) \
(!defined(LDSTATIC) || ${LDSTATIC} != -static)
# XXX there are some strange problems not yet resolved
-. if !defined(HAVE_GCC) || ${HAVE_GCC} != 45
+. if !defined(HAVE_GCC)
LDFLAGS+= -Wl,--fatal-warnings
. endif
.endif
CVS commit: src/sys/netinet6
Module Name:src
Committed By: abs
Date: Mon Jun 25 17:25:29 UTC 2012
Modified Files:
src/sys/netinet6: nd6_rtr.c
Log Message:
Some fun in trying to work out what was broken with gcc-4.1 to
trigger the following warning when gcc-4.5 was silent:
nd6_rtr.c: In function 'nd6_ra_input':
nd6_rtr.c:788: warning: 'ext' may be used uninitialized in this function
Eventually determined that it was not unreasonable for gcc-4.1 to
bleat in this case as there is a nasty 'goto insert' which could
indeed have resulted in an uninitialised variable use. Yay gcc 4.1.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/netinet6/nd6_rtr.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/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.83 src/sys/netinet6/nd6_rtr.c:1.84
--- src/sys/netinet6/nd6_rtr.c:1.83 Sat Jun 23 03:14:04 2012
+++ src/sys/netinet6/nd6_rtr.c Mon Jun 25 17:25:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_rtr.c,v 1.83 2012/06/23 03:14:04 christos Exp $ */
+/* $NetBSD: nd6_rtr.c,v 1.84 2012/06/25 17:25:29 abs Exp $ */
/* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nd6_rtr.c,v 1.83 2012/06/23 03:14:04 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: nd6_rtr.c,v 1.84 2012/06/25 17:25:29 abs Exp $);
#include sys/param.h
#include sys/systm.h
@@ -744,6 +744,7 @@ static struct nd_defrouter *
defrtrlist_update(struct nd_defrouter *new)
{
struct nd_defrouter *dr, *n;
+ struct in6_ifextra *ext = new-ifp-if_afdata[AF_INET6];
int s = splsoftnet();
if ((dr = defrouter_lookup(new-rtaddr, new-ifp)) != NULL) {
@@ -785,7 +786,6 @@ defrtrlist_update(struct nd_defrouter *n
return (dr);
}
- struct in6_ifextra *ext = new-ifp-if_afdata[AF_INET6];
if (ip6_maxifdefrouters = 0
ext-ndefrouters = ip6_maxifdefrouters) {
splx(s);
CVS commit: src/sys/rump/net/lib/libnet
Module Name:src
Committed By: martin
Date: Mon Jun 25 19:25:07 UTC 2012
Modified Files:
src/sys/rump/net/lib/libnet: Makefile
Log Message:
Adjust to rfc6056 rename to portalgo
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/net/lib/libnet/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/rump/net/lib/libnet/Makefile
diff -u src/sys/rump/net/lib/libnet/Makefile:1.14 src/sys/rump/net/lib/libnet/Makefile:1.15
--- src/sys/rump/net/lib/libnet/Makefile:1.14 Sat Apr 14 18:26:31 2012
+++ src/sys/rump/net/lib/libnet/Makefile Mon Jun 25 19:25:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/04/14 18:26:31 rmind Exp $
+# $NetBSD: Makefile,v 1.15 2012/06/25 19:25:07 martin Exp $
#
.PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../compat/common
@@ -7,7 +7,7 @@ LIB= rumpnet_net
# iffy stuff
SRCS= if.c if_loop.c route.c rtbl.c rtsock.c rtsock_50.c raw_usrreq.c \
- raw_cb.c if_media.c link_proto.c net_stats.c if_ethersubr.c rfc6056.c
+ raw_cb.c if_media.c link_proto.c net_stats.c if_ethersubr.c portalgo.c
SRCS+= if_43.c pfil.c uipc_syscalls_50.c
SRCS+= component.c
CVS commit: src/external/bsd/ntp/dist/ntpdc
Module Name:src Committed By: jnemeth Date: Mon Jun 25 20:23:43 UTC 2012 Modified Files: src/external/bsd/ntp/dist/ntpdc: ntpdc.c Log Message: PR/46612 - Lloyd Parkes -- add a terminating newline to error messages To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/ntpdc/ntpdc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ntp/dist/ntpdc/ntpdc.c diff -u src/external/bsd/ntp/dist/ntpdc/ntpdc.c:1.5 src/external/bsd/ntp/dist/ntpdc/ntpdc.c:1.6 --- src/external/bsd/ntp/dist/ntpdc/ntpdc.c:1.5 Wed Feb 1 22:48:15 2012 +++ src/external/bsd/ntp/dist/ntpdc/ntpdc.c Mon Jun 25 20:23:43 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ntpdc.c,v 1.5 2012/02/01 22:48:15 kardel Exp $ */ +/* $NetBSD: ntpdc.c,v 1.6 2012/06/25 20:23:43 jnemeth Exp $ */ /* * ntpdc - control and monitor your ntpd daemon @@ -1932,7 +1932,7 @@ vwarning(const char *fmt, va_list ap) int serrno = errno; (void) fprintf(stderr, %s: , progname); vfprintf(stderr, fmt, ap); - (void) fprintf(stderr, : %s, strerror(serrno)); + (void) fprintf(stderr, : %s\n, strerror(serrno)); } /*
CVS commit: src/sbin/iscsictl
Module Name:src
Committed By: mlelstv
Date: Mon Jun 25 20:33:56 UTC 2012
Modified Files:
src/sbin/iscsictl: iscsic_driverif.c
Log Message:
report luns returns a 32bit list length.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sbin/iscsictl/iscsic_driverif.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/iscsictl/iscsic_driverif.c
diff -u src/sbin/iscsictl/iscsic_driverif.c:1.4 src/sbin/iscsictl/iscsic_driverif.c:1.5
--- src/sbin/iscsictl/iscsic_driverif.c:1.4 Wed Jun 20 08:19:49 2012
+++ src/sbin/iscsictl/iscsic_driverif.c Mon Jun 25 20:33:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsic_driverif.c,v 1.4 2012/06/20 08:19:49 martin Exp $ */
+/* $NetBSD: iscsic_driverif.c,v 1.5 2012/06/25 20:33:56 mlelstv Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -590,7 +590,6 @@ report_luns(int argc, char **argv)
int rc;
size_t llen;
uint32_t n;
- uint16_t n2;
uint64_t *lp;
(void) memset(io, 0x0, sizeof(io));
@@ -609,8 +608,8 @@ report_luns(int argc, char **argv)
if ((rc = do_ioctl(io, TRUE)) != 0) {
return rc;
}
- (void) memcpy(n2, buf, sizeof(n2));
- llen = ntohs(n2);
+ (void) memcpy(n, buf, sizeof(n));
+ llen = ntohs(n);
if (!llen) {
printf(No LUNs!\n);
return 1;
CVS commit: src/sys/dev/iscsi
Module Name:src
Committed By: mlelstv
Date: Mon Jun 25 20:34:26 UTC 2012
Modified Files:
src/sys/dev/iscsi: iscsi_utils.c
Log Message:
Make digests work also on big endian machines.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/iscsi/iscsi_utils.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/iscsi/iscsi_utils.c
diff -u src/sys/dev/iscsi/iscsi_utils.c:1.3 src/sys/dev/iscsi/iscsi_utils.c:1.4
--- src/sys/dev/iscsi/iscsi_utils.c:1.3 Sun Jun 24 17:01:35 2012
+++ src/sys/dev/iscsi/iscsi_utils.c Mon Jun 25 20:34:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_utils.c,v 1.3 2012/06/24 17:01:35 mlelstv Exp $ */
+/* $NetBSD: iscsi_utils.c,v 1.4 2012/06/25 20:34:26 mlelstv Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2008 The NetBSD Foundation, Inc.
@@ -33,6 +33,7 @@
#include sys/systm.h
#include sys/buf.h
#include sys/socketvar.h
+#include sys/bswap.h
#ifdef ISCSI_DEBUG
@@ -166,7 +167,7 @@ gen_digest(void *buff, int len)
while (len--) {
crc = ((crc 8) 0x00ff) ^ crc_table[(crc ^ *bp++) 0xff];
}
- return crc ^ 0x;
+ return htonl(bswap32(crc ^ 0x));
}
@@ -195,7 +196,7 @@ gen_digest_2(void *buf1, int len1, void
while (len2--) {
crc = ((crc 8) 0x00ff) ^ crc_table[(crc ^ *bp++) 0xff];
}
- return crc ^ 0x;
+ return htonl(bswap32(crc ^ 0x));
}
/*
CVS commit: src/sbin/iscsictl
Module Name:src
Committed By: mlelstv
Date: Mon Jun 25 20:39:54 UTC 2012
Modified Files:
src/sbin/iscsictl: iscsic_driverif.c
Log Message:
it's really 32bit
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sbin/iscsictl/iscsic_driverif.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/iscsictl/iscsic_driverif.c
diff -u src/sbin/iscsictl/iscsic_driverif.c:1.5 src/sbin/iscsictl/iscsic_driverif.c:1.6
--- src/sbin/iscsictl/iscsic_driverif.c:1.5 Mon Jun 25 20:33:56 2012
+++ src/sbin/iscsictl/iscsic_driverif.c Mon Jun 25 20:39:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsic_driverif.c,v 1.5 2012/06/25 20:33:56 mlelstv Exp $ */
+/* $NetBSD: iscsic_driverif.c,v 1.6 2012/06/25 20:39:54 mlelstv Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -609,7 +609,7 @@ report_luns(int argc, char **argv)
return rc;
}
(void) memcpy(n, buf, sizeof(n));
- llen = ntohs(n);
+ llen = ntohl(n);
if (!llen) {
printf(No LUNs!\n);
return 1;
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Tue Jun 26 00:07:47 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Ticket #354. To generate a diff of this commit: cvs rdiff -u -r1.1.2.139 -r1.1.2.140 src/doc/CHANGES-6.0 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-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.139 src/doc/CHANGES-6.0:1.1.2.140 --- src/doc/CHANGES-6.0:1.1.2.139 Mon Jun 25 00:43:40 2012 +++ src/doc/CHANGES-6.0 Tue Jun 26 00:07:47 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.139 2012/06/25 00:43:40 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.140 2012/06/26 00:07:47 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -5839,3 +5839,42 @@ sys/sys/ucontext.h1.15 (Build fix for ticket #369) [jdc, ticket #371] +sys/net/npf/npf.h1.16 +sys/net/npf/npf_ctl.c1.15 +sys/net/npf/npf_handler.c 1.16-1.17 +sys/net/npf/npf_impl.h1.13-1.15 +sys/net/npf/npf_mbuf.c1.7 +sys/net/npf/npf_ncode.h1.7-1.8 +sys/net/npf/npf_sendpkt.c 1.10 +sys/net/npf/npf_state.c1.7 +sys/net/npf/npf_state_tcp.c 1.4-1.6 +sys/rump/dev/lib/libnpf/Makefile 1.2-1.3 +sys/rump/net/lib/libnet/Makefile 1.14 +usr.sbin/npf/npfctl/Makefile 1.7 +usr.sbin/npf/npfctl/npf.conf.5 1.10-1.12 +usr.sbin/npf/npfctl/npf_build.c 1.6-1.9 +usr.sbin/npf/npfctl/npf_data.c 1.11-1.13 +usr.sbin/npf/npfctl/npf_disassemble.c 1.4-1.5 +usr.sbin/npf/npfctl/npf_ncgen.c 1.9-1.10 +usr.sbin/npf/npfctl/npf_parse.y 1.5-1.8 +usr.sbin/npf/npfctl/npf_scan.l 1.2-1.3 +usr.sbin/npf/npfctl/npf_var.c 1.4-1.5 +usr.sbin/npf/npfctl/npf_var.h 1.2 +usr.sbin/npf/npfctl/npfctl.c 1.11-1.12 +usr.sbin/npf/npfctl/npfctl.h 1.12,1.14-1.15 +usr.sbin/npf/npftest/Makefile 1.1-1.2 +usr.sbin/npf/npftest/libnpftest/Makefile 1.1-1.3 +usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c 1.1-1.2 +usr.sbin/npf/npftest/libnpftest/npf_nbuf_test.c 1.1 +usr.sbin/npf/npftest/libnpftest/npf_processor_test.c 1.1 +usr.sbin/npf/npftest/libnpftest/npf_state_test.c 1.1 +usr.sbin/npf/npftest/libnpftest/npf_table_test.c 1.1 +usr.sbin/npf/npftest/libnpftest/npf_test.h 1.1-1.3 +usr.sbin/npf/npftest/libnpftest/npf_test_subr.c 1.1 +usr.sbin/npf/npftest/npfstream.c 1.1 +usr.sbin/npf/npftest/npftest.c 1.1-1.3 +usr.sbin/npf/npftest/npftest.h 1.1-1.3 + + More fixes and improvements for npf(4). + [rmind, ticket #354] +
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Tue Jun 26 02:04:56 UTC 2012 Modified Files: src/sys/arch/sparc/conf: GENERIC INSTALL KRUPS MRCOFFEE TADPOLE3GX Log Message: switch to WSEMUL_VT100 to reduce differences with sparc64 and other wscons and fb console using ports WSEMUL_SUN is left in but commented out so whoever wants it back can have it with minimal effort To generate a diff of this commit: cvs rdiff -u -r1.232 -r1.233 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.81 -r1.82 src/sys/arch/sparc/conf/INSTALL cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sparc/conf/KRUPS cvs rdiff -u -r1.36 -r1.37 src/sys/arch/sparc/conf/MRCOFFEE cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sparc/conf/TADPOLE3GX 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.232 src/sys/arch/sparc/conf/GENERIC:1.233 --- src/sys/arch/sparc/conf/GENERIC:1.232 Sun Mar 11 06:18:46 2012 +++ src/sys/arch/sparc/conf/GENERIC Tue Jun 26 02:04:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.232 2012/03/11 06:18:46 nakayama Exp $ +# $NetBSD: GENERIC,v 1.233 2012/06/26 02:04:55 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/sparc/conf/std.sparc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.232 $ +#ident GENERIC-$Revision: 1.233 $ maxusers 32 @@ -51,8 +51,8 @@ options SUN4_MMU3L # sun4/400 3-level M #options RASTERCONSOLE_BGCOL=WSCOL_WHITE # wscons stuff -options WSEMUL_SUN -#options WSEMUL_VT100 +#options WSEMUL_SUN +options WSEMUL_VT100 options WSDISPLAY_COMPAT_RAWKBD options WSDISPLAY_CUSTOM_OUTPUT options WS_DEFAULT_FG=WSCOL_BLACK Index: src/sys/arch/sparc/conf/INSTALL diff -u src/sys/arch/sparc/conf/INSTALL:1.81 src/sys/arch/sparc/conf/INSTALL:1.82 --- src/sys/arch/sparc/conf/INSTALL:1.81 Sun Mar 11 06:18:46 2012 +++ src/sys/arch/sparc/conf/INSTALL Tue Jun 26 02:04:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.81 2012/03/11 06:18:46 nakayama Exp $ +# $NetBSD: INSTALL,v 1.82 2012/06/26 02:04:55 macallan Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # @@ -49,8 +49,8 @@ options FONT_BOLD8x16 # a somewhat sma #options RASTERCONSOLE_BGCOL=WSCOL_WHITE # wscons stuff -options WSEMUL_SUN -#options WSEMUL_VT100 +#options WSEMUL_SUN +options WSEMUL_VT100 options WSDISPLAY_COMPAT_RAWKBD options WSDISPLAY_CUSTOM_OUTPUT options WS_DEFAULT_FG=WSCOL_BLACK Index: src/sys/arch/sparc/conf/KRUPS diff -u src/sys/arch/sparc/conf/KRUPS:1.59 src/sys/arch/sparc/conf/KRUPS:1.60 --- src/sys/arch/sparc/conf/KRUPS:1.59 Tue Jun 5 08:44:15 2012 +++ src/sys/arch/sparc/conf/KRUPS Tue Jun 26 02:04:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: KRUPS,v 1.59 2012/06/05 08:44:15 abs Exp $ +# $NetBSD: KRUPS,v 1.60 2012/06/26 02:04:55 macallan Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Krups (JavaStation-NC) machine description file @@ -8,7 +8,7 @@ include arch/sparc/conf/std.sparc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident KRUPS-$Revision: 1.59 $ +#ident KRUPS-$Revision: 1.60 $ maxusers 32 @@ -74,7 +74,7 @@ options NFS_BOOT_DHCP wscons options # builtin terminal emulations -options WSEMUL_SUN # sun terminal emulation +#options WSEMUL_SUN # sun terminal emulation options WSEMUL_VT100 # VT100 / VT220 emulation options WSEMUL_DEFAULT=\vt100\ Index: src/sys/arch/sparc/conf/MRCOFFEE diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.36 src/sys/arch/sparc/conf/MRCOFFEE:1.37 --- src/sys/arch/sparc/conf/MRCOFFEE:1.36 Sun Mar 11 06:18:46 2012 +++ src/sys/arch/sparc/conf/MRCOFFEE Tue Jun 26 02:04:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MRCOFFEE,v 1.36 2012/03/11 06:18:46 nakayama Exp $ +# $NetBSD: MRCOFFEE,v 1.37 2012/06/26 02:04:55 macallan Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Mr.Coffee (JavaStation 1) machine description file @@ -12,7 +12,7 @@ include arch/sparc/conf/std.sparc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident MRCOFFEE-$Revision: 1.36 $ +#ident MRCOFFEE-$Revision: 1.37 $ maxusers 32 @@ -30,7 +30,7 @@ options SUN4M # sun4m - SS10, SS20, Cl #options BLINK # builtin terminal emulations -options WSEMUL_SUN # sun terminal emulation +#options WSEMUL_SUN # sun terminal emulation options WSEMUL_VT100 # VT100 / VT220 emulation options WSEMUL_DEFAULT=\vt100\ Index: src/sys/arch/sparc/conf/TADPOLE3GX diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.56 src/sys/arch/sparc/conf/TADPOLE3GX:1.57 --- src/sys/arch/sparc/conf/TADPOLE3GX:1.56 Tue Jun 5 08:44:15 2012 +++ src/sys/arch/sparc/conf/TADPOLE3GX Tue Jun 26 02:04:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: TADPOLE3GX,v 1.56 2012/06/05 08:44:15 abs Exp $ +# $NetBSD: TADPOLE3GX,v 1.57 2012/06/26 02:04:55 macallan Exp $
CVS commit: src/etc/etc.sparc
Module Name:src Committed By: macallan Date: Tue Jun 26 02:05:43 UTC 2012 Modified Files: src/etc/etc.sparc: ttys Log Message: do as sparc64 does and switch the default terminal type to wsvt25 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/etc/etc.sparc/ttys Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.sparc/ttys diff -u src/etc/etc.sparc/ttys:1.15 src/etc/etc.sparc/ttys:1.16 --- src/etc/etc.sparc/ttys:1.15 Sun Dec 14 03:37:21 2008 +++ src/etc/etc.sparc/ttys Tue Jun 26 02:05:43 2012 @@ -1,15 +1,15 @@ -# $NetBSD: ttys,v 1.15 2008/12/14 03:37:21 macallan Exp $ +# $NetBSD: ttys,v 1.16 2012/06/26 02:05:43 macallan Exp $ # # @(#)ttys 5.1 (Berkeley) 4/17/89 # # name gettytype status comments # -console /usr/libexec/getty suncons sun-ss5 on secure -constty /usr/libexec/getty suncons sun-ss5 off secure -ttyE0 /usr/libexec/getty suncons sun-ss5 off secure -ttyE1 /usr/libexec/getty suncons sun-ss5 off secure -ttyE2 /usr/libexec/getty suncons sun-ss5 off secure -ttyE3 /usr/libexec/getty suncons sun-ss5 off secure +console /usr/libexec/getty suncons wsvt25 on secure +constty /usr/libexec/getty suncons wsvt25 off secure +ttyE0 /usr/libexec/getty suncons wsvt25 off secure +ttyE1 /usr/libexec/getty suncons wsvt25 off secure +ttyE2 /usr/libexec/getty suncons wsvt25 off secure +ttyE3 /usr/libexec/getty suncons wsvt25 off secure ttya /usr/libexec/getty std.9600 unknown off secure ttyb /usr/libexec/getty std.9600 unknown off secure ttyh0 /usr/libexec/getty std.9600 unknown off secure
