From owner-freebsd-net@FreeBSD.ORG  Tue Dec 15 20:50:03 2009
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
Delivered-To: freebsd-net@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D13291065676
	for <freebsd-net@hub.freebsd.org>; Tue, 15 Dec 2009 20:50:03 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id C21AE8FC18
	for <freebsd-net@hub.freebsd.org>; Tue, 15 Dec 2009 20:50:03 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nBFKo3MC065318
	for <freebsd-net@freefall.freebsd.org>; Tue, 15 Dec 2009 20:50:03 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nBFKo3xt065317;
	Tue, 15 Dec 2009 20:50:03 GMT (envelope-from gnats)
Date: Tue, 15 Dec 2009 20:50:03 GMT
Message-Id: <200912152050.nBFKo3xt065317@freefall.freebsd.org>
To: freebsd-net@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: bin/140571: commit references a PR
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Dec 2009 20:50:03 -0000

The following reply was made to PR bin/140571; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/140571: commit references a PR
Date: Tue, 15 Dec 2009 20:44:26 +0000 (UTC)

 Author: gavin
 Date: Tue Dec 15 20:44:12 2009
 New Revision: 200587
 URL: http://svn.freebsd.org/changeset/base/200587
 
 Log:
   ifconfig(8) is documented to take a ISO 3166-1 country code to set the
   regulatory domain with the "country" parameter, but will also take a full
   country name.  The man page warns that only the ISO code is unambiguous.
   In reality, however, the first match on either would be accepted, leading
   to "DE" being interpreted as the "DEBUG" country rather than Germany, and
   "MO" selecting Morocco rather than the correct country, Macau.
   
   Fix this by always checking for an ISO CC match first, and only search on
   the full country name if that fails.
   
   PR:		bin/140571
   Tested by:	Dirk Meyer dirk.meyer dinoex.sub.org
   Reviewed by:	sam
   Approved by:	ed (mentor)
   MFC after:	1 month
 
 Modified:
   head/sbin/ifconfig/regdomain.c
 
 Modified: head/sbin/ifconfig/regdomain.c
 ==============================================================================
 --- head/sbin/ifconfig/regdomain.c	Tue Dec 15 20:20:05 2009	(r200586)
 +++ head/sbin/ifconfig/regdomain.c	Tue Dec 15 20:44:12 2009	(r200587)
 @@ -694,8 +694,11 @@ lib80211_country_findbyname(const struct
  
  	len = strlen(name);
  	LIST_FOREACH(cp, &rdp->countries, next) {
 -		if (strcasecmp(cp->isoname, name) == 0 ||
 -		    strncasecmp(cp->name, name, len) == 0)
 +		if (strcasecmp(cp->isoname, name) == 0)
 +			return cp;
 +	}
 +	LIST_FOREACH(cp, &rdp->countries, next) {
 +		if (strncasecmp(cp->name, name, len) == 0)
  			return cp;
  	}
  	return NULL;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"