From owner-cvs-src-old@FreeBSD.ORG  Tue Dec 15 20:44:28 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D57151065747
	for <cvs-src-old@freebsd.org>; Tue, 15 Dec 2009 20:44:28 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C49C48FC22
	for <cvs-src-old@freebsd.org>; Tue, 15 Dec 2009 20:44:28 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBFKiSrq051172
	for <cvs-src-old@freebsd.org>; Tue, 15 Dec 2009 20:44:28 GMT
	(envelope-from gavin@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBFKiSRr051171
	for cvs-src-old@freebsd.org; Tue, 15 Dec 2009 20:44:28 GMT
	(envelope-from gavin@repoman.freebsd.org)
Message-Id: <200912152044.nBFKiSRr051171@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	gavin@repoman.freebsd.org using -f
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Tue, 15 Dec 2009 20:44:12 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sbin/ifconfig regdomain.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Dec 2009 20:44:28 -0000

gavin       2009-12-15 20:44:12 UTC

  FreeBSD src repository

  Modified files:
    sbin/ifconfig        regdomain.c 
  Log:
  SVN rev 200587 on 2009-12-15 20:44:12Z by gavin
  
  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
  
  Revision  Changes    Path
  1.8       +5 -2      src/sbin/ifconfig/regdomain.c