date:20111028

CVS commit: src/sys/netinet

2011-10-28 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Oct 28 22:23:54 UTC 2011

Modified Files:
src/sys/netinet: in.c

Log Message:
Remove the #if 1 / #endif around some code that appears to be
responsible deleting the 'first' AF_INET address on the interface if the
target address has family == AF_UNSPEC.


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/netinet/in.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/in.c
diff -u src/sys/netinet/in.c:1.139 src/sys/netinet/in.c:1.140
--- src/sys/netinet/in.c:1.139	Wed Oct 19 01:52:22 2011
+++ src/sys/netinet/in.c	Fri Oct 28 22:23:54 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: in.c,v 1.139 2011/10/19 01:52:22 dyoung Exp $	*/
+/*	$NetBSD: in.c,v 1.140 2011/10/28 22:23:54 dyoung Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.139 2011/10/19 01:52:22 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.140 2011/10/28 22:23:54 dyoung Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet_conf.h"
@@ -352,12 +352,10 @@ in_control(struct socket *so, u_long cmd
 		if ((cmd == SIOCDIFADDR || cmd == SIOCGIFALIAS) && ia == NULL)
 			return (EADDRNOTAVAIL);
 
-#if 1 /*def COMPAT_43*/
 		if (cmd == SIOCDIFADDR &&
 		ifra->ifra_addr.sin_family == AF_UNSPEC) {
 			ifra->ifra_addr.sin_family = AF_INET;
 		}
-#endif
 		/* FALLTHROUGH */
 	case SIOCSIFADDR:
 	case SIOCSIFDSTADDR:

CVS commit: src/sys/net

2011-10-28 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Oct 28 22:08:15 UTC 2011

Modified Files:
src/sys/net: if_ppp.c if_spppsubr.c if_srt.c if_tun.c

Log Message:
For these interfaces, the implementation of SIOCSIFDSTADDR is identical
to SIOCINITIFADDR, and SIOCSIFDSTADDR callers always fall back to
SIOCINITIFADDR, so just get rid of the SIOCSIFDSTADDR case.


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/net/if_ppp.c
cvs rdiff -u -r1.122 -r1.123 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.16 -r1.17 src/sys/net/if_srt.c
cvs rdiff -u -r1.113 -r1.114 src/sys/net/if_tun.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/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.135 src/sys/net/if_ppp.c:1.136
--- src/sys/net/if_ppp.c:1.135	Fri Oct 28 20:13:32 2011
+++ src/sys/net/if_ppp.c	Fri Oct 28 22:08:14 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ppp.c,v 1.135 2011/10/28 20:13:32 dyoung Exp $	*/
+/*	$NetBSD: if_ppp.c,v 1.136 2011/10/28 22:08:14 dyoung Exp $	*/
 /*	Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp 	*/
 
 /*
@@ -102,7 +102,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.135 2011/10/28 20:13:32 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.136 2011/10/28 22:08:14 dyoung Exp $");
 
 #include "ppp.h"
 
@@ -767,22 +767,6 @@ pppsioctl(struct ifnet *ifp, u_long cmd,
 	}
 	break;
 
-case SIOCSIFDSTADDR:
-	switch (ifa->ifa_addr->sa_family) {
-#ifdef INET
-	case AF_INET:
-	break;
-#endif
-#ifdef INET6
-	case AF_INET6:
-	break;
-#endif
-	default:
-	error = EAFNOSUPPORT;
-	break;
-	}
-	break;
-
 case SIOCADDMULTI:
 case SIOCDELMULTI:
 	if (ifr == NULL) {

Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.122 src/sys/net/if_spppsubr.c:1.123
--- src/sys/net/if_spppsubr.c:1.122	Mon Sep  5 12:19:09 2011
+++ src/sys/net/if_spppsubr.c	Fri Oct 28 22:08:14 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_spppsubr.c,v 1.122 2011/09/05 12:19:09 rjs Exp $	 */
+/*	$NetBSD: if_spppsubr.c,v 1.123 2011/10/28 22:08:14 dyoung Exp $	 */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.122 2011/09/05 12:19:09 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.123 2011/10/28 22:08:14 dyoung Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -1045,7 +1045,6 @@ sppp_ioctl(struct ifnet *ifp, u_long cmd
 
 	s = splnet();
 	switch (cmd) {
-	case SIOCSIFDSTADDR:
 	case SIOCINITIFADDR:
 		break;
 

Index: src/sys/net/if_srt.c
diff -u src/sys/net/if_srt.c:1.16 src/sys/net/if_srt.c:1.17
--- src/sys/net/if_srt.c:1.16	Sun Jul 17 20:54:52 2011
+++ src/sys/net/if_srt.c	Fri Oct 28 22:08:14 2011
@@ -1,8 +1,8 @@
-/* $NetBSD: if_srt.c,v 1.16 2011/07/17 20:54:52 joerg Exp $ */
+/* $NetBSD: if_srt.c,v 1.17 2011/10/28 22:08:14 dyoung Exp $ */
 /* This file is in the public domain. */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_srt.c,v 1.16 2011/07/17 20:54:52 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_srt.c,v 1.17 2011/10/28 22:08:14 dyoung Exp $");
 
 #include "opt_inet.h"
 
@@ -150,7 +150,6 @@ srt_if_ioctl(struct ifnet *ifp, u_long c
 	s = splnet();
 	switch (cmd) {
 	case SIOCINITIFADDR:
-	case SIOCSIFDSTADDR:
 		ifa = (void *) data;
 		switch (ifa->ifa_addr->sa_family) {
 #ifdef INET
@@ -165,7 +164,6 @@ srt_if_ioctl(struct ifnet *ifp, u_long c
 			err = EAFNOSUPPORT;
 			break;
 		}
-		/* XXX do we need to do more here for either of these? */
 		break;
 	default:
 		if ((err = ifioctl_common(ifp, cmd, data)) == ENETRESET)

Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.113 src/sys/net/if_tun.c:1.114
--- src/sys/net/if_tun.c:1.113	Mon Apr  5 07:22:24 2010
+++ src/sys/net/if_tun.c	Fri Oct 28 22:08:14 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tun.c,v 1.113 2010/04/05 07:22:24 joerg Exp $	*/
+/*	$NetBSD: if_tun.c,v 1.114 2011/10/28 22:08:14 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1988, Julian Onions 
@@ -15,7 +15,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.113 2010/04/05 07:22:24 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.114 2011/10/28 22:08:14 dyoung Exp $");
 
 #include "opt_inet.h"
 
@@ -442,10 +442,6 @@ tun_ioctl(struct ifnet *ifp, u_long cmd,
 		tuninit(tp);
 		TUNDEBUG("%s: address set\n", ifp->if_xname);
 		break;
-	case SIOCSIFDSTADDR:
-		tuninit(tp);
-		TUNDEBUG("%s: destination address set\n", ifp->if_xname);
-		break;
 	case SIOCSIFBRDADDR:
 		TUNDEBUG("%s: broadcast address set\n", ifp->if_xname);
 		break;

CVS commit: src/lib/libc/time

2011-10-28 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Oct 28 21:51:06 UTC 2011

Modified Files:
src/lib/libc/time: localtime.c

Log Message:
Only advance the time if we are skipping the gap.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/lib/libc/time/localtime.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.61 src/lib/libc/time/localtime.c:1.62
--- src/lib/libc/time/localtime.c:1.61	Fri Oct 28 09:53:06 2011
+++ src/lib/libc/time/localtime.c	Fri Oct 28 17:51:06 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: localtime.c,v 1.61 2011/10/28 13:53:06 christos Exp $	*/
+/*	$NetBSD: localtime.c,v 1.62 2011/10/28 21:51:06 christos Exp $	*/
 
 /*
 ** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
 #if 0
 static char	elsieid[] = "@(#)localtime.c	8.17";
 #else
-__RCSID("$NetBSD: localtime.c,v 1.61 2011/10/28 13:53:06 christos Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.62 2011/10/28 21:51:06 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -1934,7 +1934,9 @@ time2sub(const timezone_t sp, struct tm 
 		break;
 }
 if (off) {
-	t = hi + off;
+	t = hi;
+	if (off > 0)
+		t += off;
 	break;
 }
 			}

CVS commit: src/sys/net

2011-10-28 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Oct 28 20:13:32 UTC 2011

Modified Files:
src/sys/net: if_ppp.c if_stf.c

Log Message:
Don't kauth-orize SIOCSIFMTU in pppsioctl() and stf_ioctl(), ifioctl()
has already done that for us.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/net/if_ppp.c
cvs rdiff -u -r1.76 -r1.77 src/sys/net/if_stf.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/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.134 src/sys/net/if_ppp.c:1.135
--- src/sys/net/if_ppp.c:1.134	Sun Aug  7 13:51:37 2011
+++ src/sys/net/if_ppp.c	Fri Oct 28 20:13:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ppp.c,v 1.134 2011/08/07 13:51:37 rmind Exp $	*/
+/*	$NetBSD: if_ppp.c,v 1.135 2011/10/28 20:13:32 dyoung Exp $	*/
 /*	Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp 	*/
 
 /*
@@ -102,7 +102,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.134 2011/08/07 13:51:37 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.135 2011/10/28 20:13:32 dyoung Exp $");
 
 #include "ppp.h"
 
@@ -734,7 +734,6 @@ pppioctl(struct ppp_softc *sc, u_long cm
 static int
 pppsioctl(struct ifnet *ifp, u_long cmd, void *data)
 {
-struct lwp *l = curlwp;	/* XXX */
 struct ppp_softc *sc = ifp->if_softc;
 struct ifaddr *ifa = (struct ifaddr *)data;
 struct ifreq *ifr = (struct ifreq *)data;
@@ -834,12 +833,6 @@ pppsioctl(struct ifnet *ifp, u_long cmd,
 	break;
 #endif /* PPP_COMPRESS */
 
-case SIOCSIFMTU:
-	if ((error = kauth_authorize_network(l->l_cred,
-	KAUTH_NETWORK_INTERFACE, KAUTH_REQ_NETWORK_INTERFACE_SETPRIV,
-	ifp, (void *)cmd, NULL)) != 0)
-	break;
-	/*FALLTHROUGH*/
 default:
 	if ((error = ifioctl_common(&sc->sc_if, cmd, data)) == ENETRESET)
 		error = 0;

Index: src/sys/net/if_stf.c
diff -u src/sys/net/if_stf.c:1.76 src/sys/net/if_stf.c:1.77
--- src/sys/net/if_stf.c:1.76	Sun Jul 17 20:54:52 2011
+++ src/sys/net/if_stf.c	Fri Oct 28 20:13:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_stf.c,v 1.76 2011/07/17 20:54:52 joerg Exp $	*/
+/*	$NetBSD: if_stf.c,v 1.77 2011/10/28 20:13:32 dyoung Exp $	*/
 /*	$KAME: if_stf.c,v 1.62 2001/06/07 22:32:16 itojun Exp $ */
 
 /*
@@ -75,7 +75,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.76 2011/07/17 20:54:52 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.77 2011/10/28 20:13:32 dyoung Exp $");
 
 #include "opt_inet.h"
 
@@ -90,7 +90,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1
 #include 
 #include 
 #include 
-#include 
 
 #include 
 
@@ -661,7 +660,6 @@ stf_rtrequest(int cmd, struct rtentry *r
 static int
 stf_ioctl(struct ifnet *ifp, u_long cmd, void *data)
 {
-	struct lwp		*l = curlwp;	/* XXX */
 	struct ifaddr		*ifa;
 	struct ifreq		*ifr = data;
 	struct sockaddr_in6	*sin6;
@@ -694,12 +692,6 @@ stf_ioctl(struct ifnet *ifp, u_long cmd,
 		break;
 
 	case SIOCSIFMTU:
-		error = kauth_authorize_network(l->l_cred,
-		KAUTH_NETWORK_INTERFACE,
-		KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, KAUTH_ARG(cmd),
-		NULL);
-		if (error)
-			break;
 		if (ifr->ifr_mtu < STF_MTU_MIN || ifr->ifr_mtu > STF_MTU_MAX)
 			return EINVAL;
 		else if ((error = ifioctl_common(ifp, cmd, data)) == ENETRESET)

CVS commit: src/sys/net

2011-10-28 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Oct 28 20:11:59 UTC 2011

Modified Files:
src/sys/net: if.c

Log Message:
Userland may not change the IFF_CANTCHANGE flags, however, the kernel
may, so make sure if_flags_set() takes care of them.  Fixes a regression
in ifpromisc().


To generate a diff of this commit:
cvs rdiff -u -r1.255 -r1.256 src/sys/net/if.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/net/if.c
diff -u src/sys/net/if.c:1.255 src/sys/net/if.c:1.256
--- src/sys/net/if.c:1.255	Tue Oct 25 22:26:18 2011
+++ src/sys/net/if.c	Fri Oct 28 20:11:58 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.255 2011/10/25 22:26:18 dyoung Exp $	*/
+/*	$NetBSD: if.c,v 1.256 2011/10/28 20:11:58 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.255 2011/10/25 22:26:18 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.256 2011/10/28 20:11:58 dyoung Exp $");
 
 #include "opt_inet.h"
 
@@ -2154,14 +2154,24 @@ int
 if_flags_set(ifnet_t *ifp, const short flags)
 {
 	int rc;
-	struct ifreq ifr;
 
 	if (ifp->if_setflags != NULL)
 		rc = (*ifp->if_setflags)(ifp, flags);
 	else {
+		short cantflags;
+		struct ifreq ifr;
+
 		memset(&ifr, 0, sizeof(ifr));
-		ifr.ifr_flags = flags;
+
+		cantflags = (ifp->if_flags ^ flags) & IFF_CANTCHANGE;
+		if (cantflags != 0)
+			ifp->if_flags ^= cantflags;
+
+		ifr.ifr_flags = flags & ~IFF_CANTCHANGE;
 		rc = (*ifp->if_ioctl)(ifp, SIOCSIFFLAGS, &ifr);
+
+		if (rc != 0 && cantflags != 0)
+			ifp->if_flags ^= cantflags;
 	}
 
 	return rc;

CVS commit: src/sys/net

2011-10-28 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Oct 28 16:42:52 UTC 2011

Modified Files:
src/sys/net: if_gif.c if_gre.c

Log Message:
Don't kauth-orize SIOCDIFPHYADDR, SIOCSIFFLAGS, SIOCSIFMTU, or
SIOCSLIFPHYADDR, in gif_ioctl() or in gre_ioctl(), because those
operations are ordinarily kauth-orized already in ifioctl().

Kauth-orizing SIOCSIFFLAGS in gre_ioctl() caused a panic ("panic:
bpf_detachd: ifpromisc failed: 1") when tcpdump(8) was interrupted.
Somehow bpf(4) enables promiscuous mode using different credentials than
it uses to disable promiscuous mode, hence the ifpromisc failure.  This
may have something to do with privilege-separation in tcpdump(8).  I.e.,
an LWP with SIOCSIFFLAGS privilege opens /dev/bpf, but an LWP without
SIOCSIFFLAGS privilege closes it.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/net/if_gif.c
cvs rdiff -u -r1.147 -r1.148 src/sys/net/if_gre.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/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.79 src/sys/net/if_gif.c:1.80
--- src/sys/net/if_gif.c:1.79	Thu Oct 27 20:04:57 2011
+++ src/sys/net/if_gif.c	Fri Oct 28 16:42:52 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_gif.c,v 1.79 2011/10/27 20:04:57 dyoung Exp $	*/
+/*	$NetBSD: if_gif.c,v 1.80 2011/10/28 16:42:52 dyoung Exp $	*/
 /*	$KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.79 2011/10/27 20:04:57 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.80 2011/10/28 16:42:52 dyoung Exp $");
 
 #include "opt_inet.h"
 #include "opt_iso.h"
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -470,29 +469,12 @@ gif_input(struct mbuf *m, int af, struct
 int
 gif_ioctl(struct ifnet *ifp, u_long cmd, void *data)
 {
-	struct lwp *l = curlwp;	/* XXX */
 	struct gif_softc *sc  = ifp->if_softc;
 	struct ifreq *ifr = (struct ifreq*)data;
 	int error = 0, size;
 	struct sockaddr *dst, *src;
 
 	switch (cmd) {
-	case SIOCSIFMTU:
-	case SIOCSLIFPHYADDR:
-#ifdef SIOCDIFPHYADDR
-	case SIOCDIFPHYADDR:
-#endif
-		if ((error = kauth_authorize_network(l->l_cred,
-		KAUTH_NETWORK_INTERFACE,
-		KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, (void *)cmd,
-		NULL)) != 0)
-			return (error);
-		/* FALLTHROUGH */
-	default:
-		break;
-	}
-
-	switch (cmd) {
 	case SIOCINITIFADDR:
 		ifp->if_flags |= IFF_UP;
 		break;

Index: src/sys/net/if_gre.c
diff -u src/sys/net/if_gre.c:1.147 src/sys/net/if_gre.c:1.148
--- src/sys/net/if_gre.c:1.147	Thu Oct 27 20:04:57 2011
+++ src/sys/net/if_gre.c	Fri Oct 28 16:42:52 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_gre.c,v 1.147 2011/10/27 20:04:57 dyoung Exp $ */
+/*	$NetBSD: if_gre.c,v 1.148 2011/10/28 16:42:52 dyoung Exp $ */
 
 /*
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.147 2011/10/27 20:04:57 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.148 2011/10/28 16:42:52 dyoung Exp $");
 
 #include "opt_atalk.h"
 #include "opt_gre.h"
@@ -1234,15 +1234,11 @@ gre_ioctl(struct ifnet *ifp, const u_lon
 	GRE_DPRINTF(sc, "cmd %lu\n", cmd);
 
 	switch (cmd) {
-	case SIOCSIFFLAGS:
-	case SIOCSIFMTU:
 	case GRESPROTO:
 	case GRESADDRD:
 	case GRESADDRS:
 	case GRESSOCK:
 	case GREDSOCK:
-	case SIOCSLIFPHYADDR:
-	case SIOCDIFPHYADDR:
 		if (kauth_authorize_network(curlwp->l_cred,
 		KAUTH_NETWORK_INTERFACE,
 		KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, (void *)cmd,

CVS commit: src/sys/net

2011-10-28 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Fri Oct 28 16:10:12 UTC 2011

Modified Files:
src/sys/net: if_etherip.c

Log Message:
kauth isn't used in here, so don't #include .


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/net/if_etherip.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/net/if_etherip.c
diff -u src/sys/net/if_etherip.c:1.30 src/sys/net/if_etherip.c:1.31
--- src/sys/net/if_etherip.c:1.30	Wed May 19 20:41:59 2010
+++ src/sys/net/if_etherip.c	Fri Oct 28 16:10:12 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: if_etherip.c,v 1.30 2010/05/19 20:41:59 christos Exp $*/
+/*  $NetBSD: if_etherip.c,v 1.31 2011/10/28 16:10:12 dyoung Exp $*/
 
 /*
  *  Copyright (c) 2006, Hans Rosenfeld 
@@ -86,7 +86,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_etherip.c,v 1.30 2010/05/19 20:41:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_etherip.c,v 1.31 2011/10/28 16:10:12 dyoung Exp $");
 
 #include "opt_inet.h"
 
@@ -100,7 +100,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_etherip.c
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include

CVS commit: src/external/bsd/mdocml/dist

2011-10-28 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Oct 28 14:00:20 UTC 2011

Modified Files:
src/external/bsd/mdocml/dist: tbl_data.c

Log Message:
rename data() -> parse_data() to appease the powerpc64 toolchain:
{standard input}: Assembler messages:
{standard input}:105: Error: symbol `.data' is already defined


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/mdocml/dist/tbl_data.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/mdocml/dist/tbl_data.c
diff -u src/external/bsd/mdocml/dist/tbl_data.c:1.1.1.2 src/external/bsd/mdocml/dist/tbl_data.c:1.2
--- src/external/bsd/mdocml/dist/tbl_data.c:1.1.1.2	Fri Apr 15 09:45:36 2011
+++ src/external/bsd/mdocml/dist/tbl_data.c	Fri Oct 28 10:00:20 2011
@@ -29,13 +29,13 @@
 #include "libmandoc.h"
 #include "libroff.h"
 
-static	int		 data(struct tbl_node *, struct tbl_span *, 
+static	int		 parse_data(struct tbl_node *, struct tbl_span *, 
 int, const char *, int *);
 static	struct tbl_span	*newspan(struct tbl_node *, int, 
 struct tbl_row *);
 
 static int
-data(struct tbl_node *tbl, struct tbl_span *dp, 
+parse_data(struct tbl_node *tbl, struct tbl_span *dp, 
 		int ln, const char *p, int *pos)
 {
 	struct tbl_dat	*dat;
@@ -154,7 +154,7 @@ tbl_cdata(struct tbl_node *tbl, int ln, 
 		if (p[pos] == tbl->opts.tab) {
 			tbl->part = TBL_PART_DATA;
 			pos++;
-			return(data(tbl, tbl->last_span, ln, p, &pos));
+			return(parse_data(tbl, tbl->last_span, ln, p, &pos));
 		} else if ('\0' == p[pos]) {
 			tbl->part = TBL_PART_DATA;
 			return(1);
@@ -269,7 +269,7 @@ tbl_data(struct tbl_node *tbl, int ln, c
 	/* This returns 0 when TBL_PART_CDATA is entered. */
 
 	while ('\0' != p[pos])
-		if ( ! data(tbl, dp, ln, p, &pos))
+		if ( ! parse_data(tbl, dp, ln, p, &pos))
 			return(0);
 
 	return(1);

CVS commit: src/lib/libc/time

2011-10-28 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Oct 28 13:53:06 UTC 2011

Modified Files:
src/lib/libc/time: localtime.c

Log Message:
prevent underflow from giving us a false positive test in the first iteration.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/lib/libc/time/localtime.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.60 src/lib/libc/time/localtime.c:1.61
--- src/lib/libc/time/localtime.c:1.60	Thu Oct 27 10:48:00 2011
+++ src/lib/libc/time/localtime.c	Fri Oct 28 09:53:06 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: localtime.c,v 1.60 2011/10/27 14:48:00 christos Exp $	*/
+/*	$NetBSD: localtime.c,v 1.61 2011/10/28 13:53:06 christos Exp $	*/
 
 /*
 ** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
 #if 0
 static char	elsieid[] = "@(#)localtime.c	8.17";
 #else
-__RCSID("$NetBSD: localtime.c,v 1.60 2011/10/27 14:48:00 christos Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.61 2011/10/28 13:53:06 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -1792,6 +1792,9 @@ time2sub(const timezone_t sp, struct tm 
 	long			li;
 	time_t			lo;
 	time_t			hi;
+#ifdef NO_ERROR_IN_DST_GAP
+	time_t			ilo;
+#endif
 	longy;
 	time_tnewt;
 	time_tt;
@@ -1886,6 +1889,9 @@ time2sub(const timezone_t sp, struct tm 
 			lo *= 2;
 		hi = -(lo + 1);
 	}
+#ifdef NO_ERROR_IN_DST_GAP
+	ilo = lo;
+#endif
 	for ( ; ; ) {
 		t = lo / 2 + hi / 2;
 		if (t < lo)
@@ -1913,7 +1919,7 @@ time2sub(const timezone_t sp, struct tm 
 --hi;
 			}
 #ifdef NO_ERROR_IN_DST_GAP
-			if (lo - 1 == hi && yourtm.tm_isdst < 0) {
+			if (ilo != lo && lo - 1 == hi && yourtm.tm_isdst < 0) {
 time_t off = 0;
 for (i = sp->typecnt - 1; i >= 0; --i) {
 	for (j = sp->typecnt - 1; j >= 0; --j) {

CVS commit: src/sys/arch/i386/stand/misc

2011-10-28 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Oct 28 13:18:58 UTC 2011

Modified Files:
src/sys/arch/i386/stand/misc: rawr32.exe.uue

Log Message:
Update to version 1.0.2.2


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/stand/misc/rawr32.exe.uue

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffs are larger than 1MB and have been omitted

CVS commit: src

2011-10-28 Thread Jukka Ruohonen

Module Name:src
Committed By:   jruoho
Date:   Fri Oct 28 07:23:18 UTC 2011

Modified Files:
src/distrib/sets/lists/comp: mi
src/share/man/man9/man9.x86: Makefile rdmsr.9

Log Message:
Note briefly what MSRs are. Requested by wiz@.


To generate a diff of this commit:
cvs rdiff -u -r1.1698 -r1.1699 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/man9.x86/Makefile
cvs rdiff -u -r1.2 -r1.3 src/share/man/man9/man9.x86/rdmsr.9

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.1698 src/distrib/sets/lists/comp/mi:1.1699
--- src/distrib/sets/lists/comp/mi:1.1698	Tue Oct 25 05:41:33 2011
+++ src/distrib/sets/lists/comp/mi	Fri Oct 28 07:23:16 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1698 2011/10/25 05:41:33 jruoho Exp $
+#	$NetBSD: mi,v 1.1699 2011/10/28 07:23:16 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -10854,6 +10854,7 @@
 ./usr/share/man/cat9/wsmouse.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/wsmouse_input.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/wsmousedevprint.0		comp-sys-catman		.cat
+./usr/share/man/cat9/x86/msr.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/x86/nmi.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/x86/nmi_disestablish.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/x86/nmi_establish.0	comp-sys-catman		.cat
@@ -16903,6 +16904,7 @@
 ./usr/share/man/html9/wsmouse.html		comp-sys-htmlman	html
 ./usr/share/man/html9/wsmouse_input.html	comp-sys-htmlman	html
 ./usr/share/man/html9/wsmousedevprint.html	comp-sys-htmlman	html
+./usr/share/man/html9/x86/msr.html		comp-sys-htmlman	html
 ./usr/share/man/html9/x86/nmi.html		comp-sys-htmlman	html
 ./usr/share/man/html9/x86/nmi_disestablish.html	comp-sys-htmlman	html
 ./usr/share/man/html9/x86/nmi_establish.html	comp-sys-htmlman	html
@@ -23209,6 +23211,7 @@
 ./usr/share/man/man9/wsmouse.9			comp-sys-man		.man
 ./usr/share/man/man9/wsmouse_input.9		comp-sys-man		.man
 ./usr/share/man/man9/wsmousedevprint.9		comp-sys-man		.man
+./usr/share/man/man9/x86/msr.9			comp-sys-man		.man
 ./usr/share/man/man9/x86/nmi.9			comp-sys-man		.man
 ./usr/share/man/man9/x86/nmi_disestablish.9	comp-sys-man		.man
 ./usr/share/man/man9/x86/nmi_establish.9	comp-sys-man		.man

Index: src/share/man/man9/man9.x86/Makefile
diff -u src/share/man/man9/man9.x86/Makefile:1.5 src/share/man/man9/man9.x86/Makefile:1.6
--- src/share/man/man9/man9.x86/Makefile:1.5	Tue Oct 25 05:41:35 2011
+++ src/share/man/man9/man9.x86/Makefile	Fri Oct 28 07:23:18 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2011/10/25 05:41:35 jruoho Exp $
+#	$NetBSD: Makefile,v 1.6 2011/10/28 07:23:18 jruoho Exp $
 
 MAN=	nmi.9 rdmsr.9 tsc.9 x86_msr_xcall.9
 
@@ -7,7 +7,8 @@ MANSUBDIR=/x86
 MLINKS+=nmi.9 nmi_establish.9 \
 	nmi.9 nmi_disestablish.9
 
-MLINKS+=rdmsr.9 rdmsr_safe.9 \
+MLINKS+=rdmsr.9 msr.9 \
+	rdmsr.9 rdmsr_safe.9 \
 	rdmsr.9 wrmsr.9
 
 MLINKS+=tsc.9 rdtsc.9 \

Index: src/share/man/man9/man9.x86/rdmsr.9
diff -u src/share/man/man9/man9.x86/rdmsr.9:1.2 src/share/man/man9/man9.x86/rdmsr.9:1.3
--- src/share/man/man9/man9.x86/rdmsr.9:1.2	Tue Oct 25 05:41:35 2011
+++ src/share/man/man9/man9.x86/rdmsr.9	Fri Oct 28 07:23:18 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: rdmsr.9,v 1.2 2011/10/25 05:41:35 jruoho Exp $
+.\" $NetBSD: rdmsr.9,v 1.3 2011/10/28 07:23:18 jruoho Exp $
 .\"
 .\" Copyright (c) 2011 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,14 +27,15 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd October 25, 2011
+.Dd October 28, 2011
 .Dt RDMSR 9 x86
 .Os
 .Sh NAME
+.Nm msr ,
 .Nm rdmsr ,
 .Nm rdmsr_safe ,
 .Nm wrmsr
-.Nd functions for x86 model-specific registers
+.Nd functions for x86 MSRs
 .Sh SYNOPSIS
 .In x86/cpufunc.h
 .Ft uint64_t
@@ -65,6 +66,11 @@ and
 .Fn wrmsr
 functions are used to access
 .Dv MSRs .
+The header
+.In x86/specialreg.h
+includes definitions for some of the commonly used MSRs,
+that is, control registers that are present
+in some x86 processor models but unavailable in others.
 .Sh FUNCTIONS
 .Bl -tag -width abcd
 .It Fn rdmsr "msr"

CVS commit: src/doc

2011-10-28 Thread Matthias Scheler

Module Name:src
Committed By:   tron
Date:   Fri Oct 28 07:20:03 UTC 2011

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Postfix 2.8.6 was imported.


To generate a diff of this commit:
cvs rdiff -u -r1.882 -r1.883 src/doc/3RDPARTY
cvs rdiff -u -r1.1619 -r1.1620 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.882 src/doc/3RDPARTY:1.883
--- src/doc/3RDPARTY:1.882	Thu Oct 27 12:50:06 2011
+++ src/doc/3RDPARTY	Fri Oct 28 07:20:03 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.882 2011/10/27 12:50:06 taca Exp $
+#	$NetBSD: 3RDPARTY,v 1.883 2011/10/28 07:20:03 tron Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -903,7 +903,7 @@ formatting in man pages, disallowing flo
 and more.
 
 Package:	postfix
-Version:	2.8.5
+Version:	2.8.6
 Current Vers:	2.8.6
 Maintainer:	Wietse Venema 
 Archive Site:	ftp://postfix.cloud9.net/official/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1619 src/doc/CHANGES:1.1620
--- src/doc/CHANGES:1.1619	Thu Oct 27 22:18:50 2011
+++ src/doc/CHANGES	Fri Oct 28 07:20:03 2011
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1619 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1620 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -1150,3 +1150,4 @@ Changes from NetBSD 5.0 to NetBSD 6.0:
 	arm: Switch to GDB 7.3.1.  [mrg 20111024]
 	powerpc: Switch to GDB 7.3.1.  [mrg 20111024]
 	efa(4): Add driver for ELBOX FastATA 1200. [rkujawa 20111028]
+	postfix(1): Import version 2.8.6 [tron 20111028]

CVS commit: src/external/ibm-public/postfix/dist/src/smtpd

2011-10-28 Thread Matthias Scheler

Module Name:src
Committed By:   tron
Date:   Fri Oct 28 07:12:17 UTC 2011

Modified Files:
src/external/ibm-public/postfix/dist/src/smtpd: smtpd.c

Log Message:
Resolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/dist/src/smtpd/smtpd.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/ibm-public/postfix/dist/src/smtpd/smtpd.c
diff -u src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1.6 src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1.7
--- src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1.6	Wed Mar  2 19:56:39 2011
+++ src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c	Fri Oct 28 07:12:17 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: smtpd.c,v 1.6 2011/03/02 19:56:39 tron Exp $	*/
+/*	$NetBSD: smtpd.c,v 1.7 2011/10/28 07:12:17 tron Exp $	*/
 
 /*++
 /* NAME
@@ -3042,6 +3042,7 @@ static int data_cmd(SMTPD_STATE *state, 
 	if (state->err == 0) {
 	why = vstring_alloc(10);
 	state->err = mail_stream_finish(state->dest, why);
+	printable(STR(why), ' ');
 	} else
 	mail_stream_cleanup(state->dest);
 	state->dest = 0;

CVS commit: src/sys/netinet

CVS commit: src/sys/net

CVS commit: src/lib/libc/time

CVS commit: src/sys/net

CVS commit: src/sys/net

CVS commit: src/sys/net

CVS commit: src/sys/net

CVS commit: src/external/bsd/mdocml/dist

CVS commit: src/lib/libc/time

CVS commit: src/sys/arch/i386/stand/misc

CVS commit: src

CVS commit: src/doc

CVS commit: src/external/ibm-public/postfix/dist/src/smtpd

13 matches

Site Navigation

Mail list logo

Footer information