From owner-cvs-src-old@FreeBSD.ORG  Sat Jan 16 15:00:45 2010
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 EFD76106576D
	for <cvs-src-old@freebsd.org>; Sat, 16 Jan 2010 15:00:43 +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 89AAF8FC16
	for <cvs-src-old@freebsd.org>; Sat, 16 Jan 2010 15:00:43 +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 o0GF0hmA065673
	for <cvs-src-old@freebsd.org>; Sat, 16 Jan 2010 15:00:43 GMT
	(envelope-from gavin@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0GF0h74065672
	for cvs-src-old@freebsd.org; Sat, 16 Jan 2010 15:00:43 GMT
	(envelope-from gavin@repoman.freebsd.org)
Message-Id: <201001161500.o0GF0h74065672@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: Sat, 16 Jan 2010 15:00:35 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
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: Sat, 16 Jan 2010 15:00:46 -0000

gavin       2010-01-16 15:00:35 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    sbin/ifconfig        regdomain.c 
  Log:
  SVN rev 202446 on 2010-01-16 15:00:35Z by gavin
  
  MFC r200587:
    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, implicit)
  
  Revision  Changes    Path
  1.7.2.2   +5 -2      src/sbin/ifconfig/regdomain.c