From owner-svn-src-all@FreeBSD.ORG  Tue Dec 15 20:44:13 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0252C10656A4;
	Tue, 15 Dec 2009 20:44:13 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E6A4E8FC1B;
	Tue, 15 Dec 2009 20:44:12 +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 nBFKiCNs074825;
	Tue, 15 Dec 2009 20:44:12 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBFKiCUQ074823;
	Tue, 15 Dec 2009 20:44:12 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <200912152044.nBFKiCUQ074823@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Tue, 15 Dec 2009 20:44:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200587 - head/sbin/ifconfig
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Dec 2009 20:44:13 -0000

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;