From owner-svn-src-stable-6@FreeBSD.ORG Tue Sep 28 19:17:40 2010 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 37E09106566C; Tue, 28 Sep 2010 19:17:40 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 266FF8FC18; Tue, 28 Sep 2010 19:17:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8SJHeoc083136; Tue, 28 Sep 2010 19:17:40 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8SJHebT083134; Tue, 28 Sep 2010 19:17:40 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201009281917.o8SJHebT083134@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Tue, 28 Sep 2010 19:17:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213249 - stable/6/sys/netinet X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Sep 2010 19:17:40 -0000 Author: bz Date: Tue Sep 28 19:17:39 2010 New Revision: 213249 URL: http://svn.freebsd.org/changeset/base/213249 Log: r201663 introduced a bug in stable/6 that prison_ip() might change the passed address argument, while we are only interested in whether it is a valid address of the jail. This can modify an address in the live interface address list with an address of the jail. Make a copy of the address for the call to prison_ip() to avoid this. Reported by: Andreas Longwitz (longwitz incore.de) Tested by: Andreas Longwitz (longwitz incore.de) PR: kern/114325 Modified: stable/6/sys/netinet/in.c Modified: stable/6/sys/netinet/in.c ============================================================================== --- stable/6/sys/netinet/in.c Tue Sep 28 15:33:30 2010 (r213248) +++ stable/6/sys/netinet/in.c Tue Sep 28 19:17:39 2010 (r213249) @@ -252,12 +252,15 @@ in_control(so, cmd, data, ifp, td) * the first one on the interface, if possible. */ if (ifp) { + struct in_addr tmp; + dst = ((struct sockaddr_in *)&ifr->ifr_addr)->sin_addr; LIST_FOREACH(iap, INADDR_HASH(dst.s_addr), ia_hash) if (iap->ia_ifp == ifp && iap->ia_addr.sin_addr.s_addr == dst.s_addr) { + tmp.s_addr = dst.s_addr; if (td == NULL || !prison_ip( - td->td_ucred, 0, &dst.s_addr)) + td->td_ucred, 0, &tmp.s_addr)) ia = iap; break; } @@ -265,9 +268,11 @@ in_control(so, cmd, data, ifp, td) TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { iap = ifatoia(ifa); if (iap->ia_addr.sin_family == AF_INET) { + tmp.s_addr = + iap->ia_addr.sin_addr.s_addr; if (td != NULL && prison_ip(td->td_ucred, 0, - &iap->ia_addr.sin_addr.s_addr)) + &tmp.s_addr)) continue; ia = iap; break; From owner-svn-src-stable-6@FreeBSD.ORG Thu Sep 30 22:03:39 2010 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0041B1065674; Thu, 30 Sep 2010 22:03:38 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C90578FC18; Thu, 30 Sep 2010 22:03:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8UM3ciw082607; Thu, 30 Sep 2010 22:03:38 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8UM3cHR082604; Thu, 30 Sep 2010 22:03:38 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201009302203.o8UM3cHR082604@svn.freebsd.org> From: Edwin Groothuis Date: Thu, 30 Sep 2010 22:03:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213314 - stable/6/share/zoneinfo X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Sep 2010 22:03:39 -0000 Author: edwin Date: Thu Sep 30 22:03:38 2010 New Revision: 213314 URL: http://svn.freebsd.org/changeset/base/213314 Log: MFC of 213312, tzdata2010m - Fix historical data for Hongkong - Fix location description for Antarctica/Vostok Modified: stable/6/share/zoneinfo/asia stable/6/share/zoneinfo/zone.tab Directory Properties: stable/6/share/zoneinfo/ (props changed) Modified: stable/6/share/zoneinfo/asia ============================================================================== --- stable/6/share/zoneinfo/asia Thu Sep 30 22:03:33 2010 (r213313) +++ stable/6/share/zoneinfo/asia Thu Sep 30 22:03:38 2010 (r213314) @@ -1,4 +1,4 @@ -# @(#)asia 8.61 +# @(#)asia 8.62 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -547,8 +547,8 @@ Rule HK 1953 only - Nov 1 3:30 0 - Rule HK 1954 1964 - Mar Sun>=18 3:30 1:00 S Rule HK 1954 only - Oct 31 3:30 0 - Rule HK 1955 1964 - Nov Sun>=1 3:30 0 - -Rule HK 1965 1977 - Apr Sun>=16 3:30 1:00 S -Rule HK 1965 1977 - Oct Sun>=16 3:30 0 - +Rule HK 1965 1976 - Apr Sun>=16 3:30 1:00 S +Rule HK 1965 1976 - Oct Sun>=16 3:30 0 - Rule HK 1973 only - Dec 30 3:30 1:00 S Rule HK 1979 only - May Sun>=8 3:30 1:00 S Rule HK 1979 only - Oct Sun>=16 3:30 0 - Modified: stable/6/share/zoneinfo/zone.tab ============================================================================== --- stable/6/share/zoneinfo/zone.tab Thu Sep 30 22:03:33 2010 (r213313) +++ stable/6/share/zoneinfo/zone.tab Thu Sep 30 22:03:38 2010 (r213314) @@ -1,5 +1,5 @@ # 
-# @(#)zone.tab	8.37
+# @(#)zone.tab	8.38
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
@@ -41,7 +41,7 @@ AQ	-6448-06406	Antarctica/Palmer	Palmer 
 AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
 AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
 AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, S Magnetic Pole
+AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
 AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Terre Adelie
 AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
 AQ	-5430+15857	Antarctica/Macquarie	Macquarie Island Station, Macquarie Island

From owner-svn-src-stable-6@FreeBSD.ORG  Fri Oct  1 17:20:49 2010
Return-Path: 
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5218510656A5;
	Fri,  1 Oct 2010 17:20:49 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 413DF8FC19;
	Fri,  1 Oct 2010 17:20:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o91HKn2v012905;
	Fri, 1 Oct 2010 17:20:49 GMT (envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o91HKnPh012903;
	Fri, 1 Oct 2010 17:20:49 GMT (envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201010011720.o91HKnPh012903@svn.freebsd.org>
From: Bernhard Schmidt 
Date: Fri, 1 Oct 2010 17:20:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213332 - stable/6/etc/mtree
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 01 Oct 2010 17:20:49 -0000

Author: bschmidt
Date: Fri Oct  1 17:20:48 2010
New Revision: 213332
URL: http://svn.freebsd.org/changeset/base/213332

Log:
  Create the var/run/wpa_supplicant directory where the wpa_supplicant
  RC script wants to save a pidfile for each interface.

Modified:
  stable/6/etc/mtree/BSD.var.dist
Directory Properties:
  stable/6/etc/   (props changed)

Modified: stable/6/etc/mtree/BSD.var.dist
==============================================================================
--- stable/6/etc/mtree/BSD.var.dist	Fri Oct  1 17:20:30 2010	(r213331)
+++ stable/6/etc/mtree/BSD.var.dist	Fri Oct  1 17:20:48 2010	(r213332)
@@ -64,6 +64,8 @@
         ..
         ppp             gname=network mode=0770
         ..
+        wpa_supplicant
+        ..
     ..
     rwho            gname=daemon mode=0775
     ..