From owner-cvs-src@FreeBSD.ORG  Thu Jul 21 12:25:58 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 305BA16A41F;
	Thu, 21 Jul 2005 12:25:58 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 82BF843D66;
	Thu, 21 Jul 2005 12:25:40 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6LCPewv079422;
	Thu, 21 Jul 2005 12:25:40 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6LCPe8l079421;
	Thu, 21 Jul 2005 12:25:40 GMT (envelope-from rwatson)
Message-Id: <200507211225.j6LCPe8l079421@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 21 Jul 2005 12:25:40 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sbin/ifconfig ifconfig.8 ifconfig.c ifconfig.h
 ifieee80211.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jul 2005 12:25:58 -0000

rwatson     2005-07-21 12:25:40 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sbin/ifconfig        ifconfig.8 ifconfig.c ifconfig.h 
                         ifieee80211.c 
  Log:
  Merge ifconfig.8:1.98, ifconfig.c:1.115, ifconfig.h:1.17,
  ifieee80211.c:1.19 from HEAD to RELENG_6:
  
    Add a new flag '-k' to ifconfig(8), indicating that it is alright to
    print potentially sensitive keying material to stdout.  With the new
    802.11 support, ifconfig(8) is now capable of printing 802.11 keys,
    and did by default for the root user, which is undesirable in some
    environments.  Now it will not print keying material unless requested
    (and available to the user).
  
  Approved by:    re (kensmith)
  
  Revision   Changes    Path
  1.95.2.2   +11 -0     src/sbin/ifconfig/ifconfig.8
  1.113.2.2  +5 -1      src/sbin/ifconfig/ifconfig.c
  1.16.2.1   +1 -0      src/sbin/ifconfig/ifconfig.h
  1.18.2.1   +1 -1      src/sbin/ifconfig/ifieee80211.c