PERFORCE change 167315 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Fri Aug 14 10:53:13 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=167315
Change 167315 by trasz at trasz_anger on 2009/08/14 10:52:34
IFC.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/UPDATING#12 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bzip2/FREEBSD-vendor#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/file/magic2mime#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/netcat/FREEBSD-vendor#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/openpam/FREEBSD-vendor#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssh/FREEBSD-vendor#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/apps/md4.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/bftest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/bntest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/casttest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/destest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/dhtest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/dsatest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/ecdhtest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/ecdsatest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/ectest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/enginetest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/evp_test.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/exptest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/fips_aesavs.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/fips_desmovs.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/fips_dsatest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/fips_dssvs.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/fips_hmactest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/fips_randtest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/fips_rngvs.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/fips_rsagtest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/fips_rsastest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/fips_rsavtest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/fips_shatest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/fips_test_suite.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/hmactest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/ideatest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/jpaketest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/md2test.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/md4test.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/md5test.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/mdc2test.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/randtest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/rc2test.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/rc4test.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/rc5test.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/rmdtest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/rsa_test.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/sha1test.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/sha256t.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/sha512t.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/shatest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/test/ssltest.c#2 delete
.. //depot/projects/soc2009/trasz_limits/etc/mtree/BSD.include.dist#5 integrate
.. //depot/projects/soc2009/trasz_limits/include/Makefile#5 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/Makefile.inc#5 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/mac.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/mac_free.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/mac_get.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/mac_set.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/mac_text.3#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/posix1e.3#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libkvm/kvm_vnet.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/Makefile#7 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211.9#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_amrr.9#1 branch
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_beacon.9#1 branch
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_bmiss.9#1 branch
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_crypto.9#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_ddb.9#1 branch
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_input.9#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_ioctl.9#2 delete
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_node.9#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_output.9#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_proto.9#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_radiotap.9#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_regdomain.9#1 branch
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_scan.9#1 branch
.. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_vap.9#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/mp_machdep.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/NOTES#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/XENHVM#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/include/apicvar.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/include/smp.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/arm/pmap.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/compat/opensolaris/kern/opensolaris.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/options.amd64#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/options.i386#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/options.pc98#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/drm/drm_pciids.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/drm/r600_cp.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/drm/radeon_drv.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/isp/isp_freebsd.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mfi/mfi_ioctl.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mfi/mfireg.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/conf/NOTES#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/local_apic.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/mp_machdep.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/trap.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/apicvar.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/smp.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/xen/mp_machdep.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ia64/include/smp.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_shutdown.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sysctl.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_kdb.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_pcpu.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_smp.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/smp.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/bpf.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/bpf_buffer.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/bpf_zerocopy.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/bpfdesc.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/rtsock.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/vnet.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/vnet.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netatalk/at_control.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet6/in6.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/pc98/conf/NOTES#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/smp.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/mp_machdep.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/security/audit/audit.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/smp.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/smp.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/pcpu.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/smp.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/sysctl.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/xdr/xdr_mbuf.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/build/options/WITH_BIND_LIBS#3 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/priv/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/priv/main.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/priv/priv_netinet_ipsec.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/priv/priv_vfs_extattr_system.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/procstat/procstat.1#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/Makefile#6 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/jls/jls.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/README#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfi_cmd.c#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfi_config.c#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfi_drive.c#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfi_evt.c#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfi_flash.c#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfi_patrol.c#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfi_show.c#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfi_volume.c#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfiutil.1#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfiutil.c#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfiutil.h#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.sbin/ntp/scripts/mkver#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/sysinstall/install.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/sysinstall/sysinstall.8#2 integrate
Differences ...
==== //depot/projects/soc2009/trasz_limits/UPDATING#12 (text+ko) ====
@@ -22,6 +22,12 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20090813:
+ Remove the option STOP_NMI. The default action is now to use NMI
+ only for KDB via the newly introduced function stop_cpus_hard()
+ and maintain stop_cpus() to just use a normal IPI_STOP on ia32
+ and amd64.
+
20090719:
Bump the shared library version numbers for all libraries that
do not use symbol versioning as part of the 8.0-RELEASE cycle.
@@ -1665,4 +1671,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.632 2009/07/26 20:12:06 kib Exp $
+$FreeBSD: src/UPDATING,v 1.633 2009/08/13 17:09:45 attilio Exp $
==== //depot/projects/soc2009/trasz_limits/contrib/bzip2/FREEBSD-vendor#2 (text+ko) ====
@@ -1,7 +1,5 @@
-# $FreeBSD: src/contrib/bzip2/FREEBSD-vendor,v 1.1 2008/03/20 02:45:32 delphij Exp $
+# $FreeBSD: src/contrib/bzip2/FREEBSD-vendor,v 1.2 2009/08/13 06:07:38 des Exp $
Project: bzip2
ProjectURL: http://www.bzip.org/
Version: 1.0.5
-VendorTag: BZIP2
-VersionTag: v1_0_5
License: BSD
==== //depot/projects/soc2009/trasz_limits/contrib/netcat/FREEBSD-vendor#2 (text+ko) ====
@@ -1,7 +1,5 @@
-# $FreeBSD: src/contrib/netcat/FREEBSD-vendor,v 1.2 2008/12/19 23:00:23 delphij Exp $
+# $FreeBSD: src/contrib/netcat/FREEBSD-vendor,v 1.3 2009/08/13 06:07:38 des Exp $
Project: netcat (aka src/usr.bin/nc in OpenBSD)
ProjectURL: http://www.openbsd.org/
Version: 4.4
-VendorTag: OPENBSD
-VersionTag: OPENBSD_4_4
License: BSD
==== //depot/projects/soc2009/trasz_limits/contrib/openpam/FREEBSD-vendor#2 (text) ====
@@ -1,8 +1,6 @@
-# $FreeBSD: src/contrib/openpam/FREEBSD-vendor,v 1.1 2008/02/06 23:06:23 des Exp $
+# $FreeBSD: src/contrib/openpam/FREEBSD-vendor,v 1.2 2009/08/13 06:07:38 des Exp $
Project: OpenPAM
ProjectURL: http://www.openpam.org/
Version: Hydrangea (20071221)
-VendorTag: OPENPAM
-VersionTag: OPENPAM_HYDRANGEA
License: BSD
Maintainer: des
==== //depot/projects/soc2009/trasz_limits/crypto/openssh/FREEBSD-vendor#2 (text+ko) ====
@@ -1,8 +1,6 @@
-# $FreeBSD: src/crypto/openssh/FREEBSD-vendor,v 1.2 2008/08/01 02:48:36 des Exp $
+# $FreeBSD: src/crypto/openssh/FREEBSD-vendor,v 1.3 2009/08/13 06:07:38 des Exp $
Project: Portable OpenSSH
ProjectURL: http://www.openssh.com/portable.html
-Version: 5.1p1
-VendorTag: OPENSSH
-VersionTag: OpenSSH_5_1p1
+Version: 5.2p1
License: BSD
Maintainer: des
==== //depot/projects/soc2009/trasz_limits/etc/mtree/BSD.include.dist#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.131 2009/07/10 08:18:08 scottl Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.132 2009/08/13 23:18:45 scottl Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -104,6 +104,8 @@
..
lmc
..
+ mfi
+ ..
mpt
mpilib
..
==== //depot/projects/soc2009/trasz_limits/include/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.290 2009/07/10 08:18:08 scottl Exp $
+# $FreeBSD: src/include/Makefile,v 1.291 2009/08/13 23:18:45 scottl Exp $
#
# Doing a "make install" builds /usr/include.
@@ -40,7 +40,7 @@
LSUBDIRS= cam/ata cam/scsi \
dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
- dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \
+ dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/mfi dev/ofw \
dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/nfs fs/ntfs fs/nullfs \
==== //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/Makefile.inc#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.22 2009/07/14 19:37:53 trasz Exp $
+# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.23 2009/08/12 10:46:48 rwatson Exp $
.PATH: ${.CURDIR}/posix1e
@@ -106,14 +106,16 @@
mac_get.3 mac_get_fd.3 \
mac_get.3 mac_get_file.3 \
mac_get.3 mac_get_link.3 \
+ mac_get.3 mac_get_peer.3 \
mac_get.3 mac_get_pid.3 \
mac_get.3 mac_get_proc.3 \
mac_prepare.3 mac_prepare_file_label.3 \
mac_prepare.3 mac_prepare_ifnet_label.3 \
mac_prepare.3 mac_prepare_process_label.3 \
- mac_set.3 mac_set_link.3 \
+ mac_prepare.3 mac_prepare_type.3 \
mac_set.3 mac_set_fd.3 \
mac_set.3 mac_set_file.3 \
+ mac_set.3 mac_set_link.3 \
mac_set.3 mac_set_proc.3 \
mac_text.3 mac_from_text.3 \
mac_text.3 mac_to_text.3
==== //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/mac.3#2 (text+ko) ====
@@ -1,4 +1,5 @@
.\" Copyright (c) 2001, 2003 Networks Associates Technology, Inc.
+.\" Copyright (c) 2009 Robert N. M. Watson
.\" All rights reserved.
.\"
.\" This software was developed for the FreeBSD Project by Chris
@@ -28,9 +29,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac.3,v 1.15 2005/07/31 03:30:44 keramida Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac.3,v 1.16 2009/08/12 10:46:48 rwatson Exp $
.\"
-.Dd April 19, 2003
+.Dd August 7, 2009
.Dt MAC 3
.Os
.Sh NAME
@@ -44,81 +45,82 @@
In the kernel configuration file:
.Cd "options MAC"
.Sh DESCRIPTION
-.Fx
-permits administrators to define Mandatory Access Control labels
-defining levels for the privacy and integrity of data,
-overriding discretionary policies
-for those objects.
-Not all objects currently provide support for MAC labels,
-and MAC support must be explicitly enabled by the administrator.
-The library calls include routines to retrieve, duplicate,
-and set MAC labels associated with files and processes.
+Mandatory Access Control labels describe confidentiality, integrity, and
+other security attributes of operating system objects, overriding
+discretionary access control.
+Not all system objects support MAC labeling, and MAC policies must be
+explicitly enabled by the administrator.
+This API, based on POSIX.1e, includes routines to retrieve, manipulate, set,
+and convert to and from text the MAC labels on files and processes.
+.Pp
+MAC labels consist of a set of (name, value) tuples, representing security
+attributes from MAC policies.
+For example, this label contains security labels defined by two policies,
+.Xr mac_biba 4
+and
+.Xr mac_mls 4 :
+.Bd -literal -offset indent
+biba/low,mls/low
+.Ed
+.Pp
+Further syntax and semantics of MAC labels may be found in
+.Xr maclabel 7 .
+.Pp
+Applications operate on labels stored in
+.Vt mac_t ,
+but can convert between this internal format and a text format for the
+purposes of presentation to uses or external storage.
+When querying a label on an object, a
+.Vt mac_t
+must first be prepared using the interfaces described in
+.Xr mac_prepare 3 ,
+allowing the application to declare which policies it wishes to interogate.
+The application writer can also rely on default label names declared in
+.Xr mac.conf 5 .
.Pp
-POSIX.1e describes a set of MAC manipulation routines
-to manage the contents of MAC labels,
-as well as their relationships with
-files and processes;
-almost all of these support routines
-are implemented in
-.Fx .
+When finished with a
+.Vt mac_t ,
+the application must call
+.Xr mac_free 3
+to release its storage.
.Pp
-Available functions, sorted by behavior, include:
+The following functions are defined:
.Bl -tag -width indent
-.It Fn mac_get_fd
-This function is described in
+.It Fn mac_is_present
+This function, described in
+.Xr mac_is_present 3 ,
+allows applications to test whether MAC is configured, as well as whether
+specific policies are configured.
+.It Fn mac_get_fd , Fn mac_get_file , Fn mac_get_link , Fn mac_get_peer
+These functions, described in
.Xr mac_get 3 ,
-and may be used to retrieve the
-MAC label associated with
-a specific file descriptor.
-.It Fn mac_get_file
-This function is described in
+retrieve the MAC labels associated with file descriptors, files, and socket
+peers.
+.It Fn mac_get_pid , Fn mac_get_proc
+These functions, described in
.Xr mac_get 3 ,
-and may be used to retrieve the
-MAC label associated with
-a named file.
-.It Fn mac_get_proc
-This function is described in
-.Xr mac_get 3 ,
-and may be used to retrieve the
-MAC label associated with
-the calling process.
-.It Fn mac_set_fd
-This function is described in
+retrieve the MAC labels associated with processes.
+.It Fn mac_set_fd , Fn mac_set_file , Fn mac_set_link
+These functions, described in
.Xr mac_set 3 ,
-and may be used to set the
-MAC label associated with
-a specific file descriptor.
-.It Fn mac_set_file
-This function is described in
-.Xr mac_set 3 ,
-and may be used to set the
-MAC label associated with
-a named file.
+set the MAC labels associated with file descriptors and files.
.It Fn mac_set_proc
-This function is described in
+This function, described in
.Xr mac_set 3 ,
-and may be used to set the
-MAC label associated with
-the calling process.
+sets the MAC label associated with the current process.
.It Fn mac_free
-This function is described in
+This function, desribed in
.Xr mac_free 3 ,
-and may be used to free
-userland working MAC label storage.
+frees working MAC label storage.
.It Fn mac_from_text
-This function is described in
+This function, described in
.Xr mac_text 3 ,
-and may be used to convert
-a text-form MAC label
-into a working
+converts a text-form MAC label into working MAC label storage,
.Vt mac_t .
-.It Fn mac_prepare
-.It Fn mac_prepare_file_label
-.It Fn mac_prepare_ifnet_label
-.It Fn mac_prepare_process_label
-These functions are described in
+.It Fn mac_prepare , Fn mac_prepare_file_label , Fn mac_prepare_ifnet_label , Fn mac_prepare_process_label , Fn mac_prepare_type
+These functions, described in
.Xr mac_prepare 3 ,
-and may be used to preallocate storage for MAC label retrieval.
+allocate working storage for MAC label operations.
.Xr mac_prepare 3
prepares a label based on caller-specified label names; the other calls
rely on the default configuration specified in
@@ -130,15 +132,6 @@
.Vt mac_t
into a text-form MAC label.
.El
-The behavior of some of these calls is influenced by the configuration
-settings found in
-.Xr mac.conf 5 ,
-the MAC library run-time configuration file.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features
-is
-.Ud .
.Sh FILES
.Bl -tag -width ".Pa /etc/mac.conf" -compact
.It Pa /etc/mac.conf
@@ -150,24 +143,20 @@
.Sh SEE ALSO
.Xr mac_free 3 ,
.Xr mac_get 3 ,
+.Xr mac_is_present 3 ,
.Xr mac_prepare 3 ,
.Xr mac_set 3 ,
.Xr mac_text 3 ,
+.Xr posix1e 3 ,
.Xr mac 4 ,
.Xr mac.conf 5 ,
.Xr mac 9
.Sh STANDARDS
-These APIs are loosely based on the APIs described in POSIX.1e.
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft
-continues on the cross-platform POSIX.1e implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page
-for more information.
-However, the resemblance of these APIs to the POSIX APIs is only loose,
-as the POSIX APIs were unable to express many notions required for
-flexible and extensible access control.
+These APIs are loosely based on the APIs described in POSIX.1e, as described
+in IEEE POSIX.1e draft 17.
+However, the resemblence of these APIS to the POSIX APIs is loose, as the
+PSOXI APIS were unable to express some notinos required for flexible and
+extensible access control.
.Sh HISTORY
Support for Mandatory Access Control was introduced in
.Fx 5.0
==== //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/mac_free.3#2 (text+ko) ====
@@ -31,7 +31,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac_free.3,v 1.6 2003/08/22 18:01:03 rwatson Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac_free.3,v 1.7 2009/08/12 10:46:48 rwatson Exp $
.\"
.Dd December 21, 2001
.Dt MAC_FREE 3
@@ -64,6 +64,7 @@
.Xr mac_prepare 3 ,
.Xr mac_set 3 ,
.Xr mac_text 3 ,
+.Xr posix1e 3 ,
.Xr mac 4 ,
.Xr mac 9
.Sh STANDARDS
@@ -91,8 +92,8 @@
.Tn TrustedBSD
implementation,
.Fn mac_free
-is specific to that type, and must not be used to free the character
-strings returned from
+is specific to
+.Vt mac_3 ,
+and must not be used to free the character strings returned from
.Fn mac_to_text .
-Doing so may result in undefined behavior,
-including application failure.
+Doing so may result in undefined behavior.
==== //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/mac_get.3#2 (text+ko) ====
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.10 2004/06/30 20:09:09 ru Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.11 2009/08/12 10:46:48 rwatson Exp $
.\"
.Dd December 21, 2001
.Dt MAC_GET 3
@@ -133,6 +133,7 @@
.Xr mac_prepare 3 ,
.Xr mac_set 3 ,
.Xr mac_text 3 ,
+.Xr posix1e 3 ,
.Xr mac 4 ,
.Xr mac 9
.Sh STANDARDS
==== //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/mac_set.3#2 (text+ko) ====
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac_set.3,v 1.11 2006/07/07 14:02:17 rwatson Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac_set.3,v 1.12 2009/08/12 10:46:48 rwatson Exp $
.\"
.Dd January 14, 2003
.Dt MAC_SET 3
@@ -138,6 +138,7 @@
.Xr mac_is_present 3 ,
.Xr mac_prepare 3 ,
.Xr mac_text 3 ,
+.Xr posix1e 3 ,
.Xr mac 4 ,
.Xr mac 9
.Sh HISTORY
==== //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/mac_text.3#2 (text+ko) ====
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac_text.3,v 1.12 2006/07/07 14:02:17 rwatson Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac_text.3,v 1.13 2009/08/12 10:46:48 rwatson Exp $
.\"
.Dd December 21, 2001
.Dt MAC_TEXT 3
@@ -98,6 +98,7 @@
.Xr mac_is_present 3 ,
.Xr mac_prepare 3 ,
.Xr mac_set 3 ,
+.Xr posix1e 3 ,
.Xr mac 4 ,
.Xr maclabel 7
.Sh STANDARDS
==== //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/posix1e.3#3 (text+ko) ====
@@ -1,5 +1,5 @@
.\"-
-.\" Copyright (c) 2000 Robert N. M. Watson
+.\" Copyright (c) 2000, 2009 Robert N. M. Watson
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/posix1e.3,v 1.28 2009/05/19 22:28:33 brueffer Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/posix1e.3,v 1.29 2009/08/12 10:46:48 rwatson Exp $
.\"
-.Dd May 20, 2009
+.Dd August 7, 2009
.Dt POSIX1E 3
.Os
.Sh NAME
@@ -36,99 +36,77 @@
.Sh SYNOPSIS
.In sys/types.h
.In sys/acl.h
-.\" .In sys/capability.h
.In sys/mac.h
.Sh DESCRIPTION
-The IEEE POSIX.1e specification never left draft form, but the interfaces
-it describes are now widely used despite inherent limitations.
-Currently, only a few of the interfaces and features are implemented in
-.Fx ,
-although efforts are underway to complete the integration at this time.
+POSIX.1e describes five security extensions to the POSIX.1 API: Access
+Control Lists (ACLs), Auditing, Capabilities, Mandatory Access Control, and
+Information Flow Labels.
+While IEEE POSIX.1e D17 specification has not been standardized, several of
+its interfaces are widely used.
.Pp
-POSIX.1e describes five security extensions to the base POSIX.1 API:
-Access Control Lists (ACLs), Auditing, Capabilities, Mandatory Access
-Control, and Information Flow Labels.
.Fx
-supports POSIX.1e ACL interfaces, as well as POSIX.1e-like MAC
-interfaces.
-The TrustedBSD Project has produced but not integrated an implementation
-of POSIX.1e Capabilities.
+implements POSIX.1e interface for access control lists, described in
+.Xr acl 3 ,
+and supports ACLs on the
+.Xr ffs 7
+file system; ACLs must be administratively enabled using
+.Xr tunefs 8 .
.Pp
-POSIX.1e defines both syntax and semantics for these features, but fairly
-substantial changes are required to implement these features in the
-operating system.
+.Fx
+implements a POSIX.1e-like mandatory access control interface, described in
+.Xr mac 3 ,
+although with a number of extensions and important semantic differences.
.Pp
-As shipped,
-.Fx 4.0
-provides API and VFS support for ACLs, but not an implementation on any
-native file system.
-.Fx 5.0
-includes support for ACLs as part of UFS1 and UFS2, as well as necessary
-VFS support for additional file systems to export ACLs as appropriate.
-Available API calls relating to ACLs are described in detail in
-.Xr acl 3 .
-.Pp
-As shipped,
-.Fx 5.0
-includes support for Mandatory Access Control as well as POSIX.1e-like
-APIs for label management.
-More information on API calls relating to MAC is available in
-.Xr mac 3 .
-.Pp
-Additional patches supporting POSIX.1e features are provided by the
-TrustedBSD project:
-.Pp
-http://www.TrustedBSD.org/
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time, and many of these features are considered new
-or experimental.
+.Fx
+does not implement the POSIX.1e audit, privilege (capability), or information
+flow label APIs.
+However,
+.Fx
+does implement the
+.Xr libbsm
+audit API.
.Sh ENVIRONMENT
-POSIX.1e assigns security labels to all objects, extending the security
+POSIX.1e assigns security attributes to all objects, extending the security
functionality described in POSIX.1.
-These additional labels provide
-fine-grained discretionary access control, fine-grained capabilities,
-and labels necessary for mandatory access control.
+These additional attributes store fine-grained discretionary access control
+information and mandatory access control labels; for files, they are stored
+in extended attributes, described in
+.Xr extattr 3 .
+.Pp
POSIX.2c describes
-a set of userland utilities for manipulating these labels.
-.Pp
-Many of these services are supported by extended attributes, documented
-in
-.Xr extattr 2
+a set of userland utilities for manipulating these attributes, including
+.Xr getfacl 1
+and
+.Xr setfacl 1
+for access control lists, and
+.Xr getfmac 8
and
-.Xr extattr 9 .
-While these APIs are not documented in POSIX.1e, they are similar in
-structure.
+.Xr setfmac 8
+for mandatory access control labels.
.Sh SEE ALSO
+.Xr getfacl 1 ,
+.Xr setfacl 1 ,
.Xr extattr 2 ,
.Xr acl 3 ,
+.Xr extattr 3 ,
.Xr libbsm 3 ,
.Xr mac 3 ,
+.Xr ffs 7 ,
+.Xr getfmac 8 ,
+.Xr setfmac 8 ,
+.Xr tunefs 8 ,
.Xr acl 9 ,
.Xr extattr 9 ,
.Xr mac 9
.Sh STANDARDS
POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft continues
-on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
.Sh HISTORY
POSIX.1e support was introduced in
.Fx 4.0 ;
-most of the features are available as of
+most features were available as of
.Fx 5.0 .
-Development continues.
.Sh AUTHORS
.An Robert N M Watson
.An Chris D. Faulhaber
.An Thomas Moestl
.An Ilmar S Habibulin
-.Sh BUGS
-Many of these features are considered new or experimental in
-.Fx 5.0
-and should be deployed with appropriate caution.
==== //depot/projects/soc2009/trasz_limits/lib/libkvm/kvm_vnet.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_vnet.c,v 1.2 2009/08/01 19:26:27 rwatson Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_vnet.c,v 1.3 2009/08/13 14:59:04 bz Exp $");
#include <sys/param.h>
@@ -195,7 +195,7 @@
kd->vnet_start = nl[NLIST_START_VNET].n_value;
kd->vnet_stop = nl[NLIST_STOP_VNET].n_value;
kd->vnet_current = (uintptr_t)prison.pr_vnet;
- kd->vnet_base = (uintptr_t)vnet.vnet_data_mem - kd->vnet_start;
+ kd->vnet_base = vnet.vnet_data_base;
return (0);
}
==== //depot/projects/soc2009/trasz_limits/share/man/man9/Makefile#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.357 2009/07/11 17:36:59 cperciva Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.358 2009/08/12 21:03:16 sam Exp $
MAN= accept_filter.9 \
accf_data.9 \
@@ -121,13 +121,19 @@
hashinit.9 \
hexdump.9 \
ieee80211.9 \
+ ieee80211_amrr.9 \
+ ieee80211_beacon.9 \
+ ieee80211_bmiss.9 \
ieee80211_crypto.9 \
+ ieee80211_ddb.9 \
ieee80211_input.9 \
- ieee80211_ioctl.9 \
ieee80211_node.9 \
ieee80211_output.9 \
ieee80211_proto.9 \
ieee80211_radiotap.9 \
+ ieee80211_regdomain.9 \
+ ieee80211_scan.9 \
+ ieee80211_vap.9 \
ifnet.9 \
inittodr.9 \
insmntque.9 \
@@ -627,52 +633,62 @@
MLINKS+=hashinit.9 hashdestroy.9 \
hashinit.9 hashinit_flags.9 \
hashinit.9 phashinit.9
-MLINKS+=ieee80211.9 ieee80211_attach.9 \
- ieee80211.9 ieee80211_chan2ieee.9 \
- ieee80211.9 ieee80211_chan2mode.9 \
- ieee80211.9 ieee80211_ieee2mhz.9 \
- ieee80211.9 ieee80211_ifattach.9 \
- ieee80211.9 ieee80211_ifdetach.9 \
- ieee80211.9 ieee80211_media2rate.9 \
- ieee80211.9 ieee80211_media_change.9 \
- ieee80211.9 ieee80211_media_init.9 \
- ieee80211.9 ieee80211_media_status.9 \
- ieee80211.9 ieee80211_mhz2ieee.9 \
- ieee80211.9 ieee80211_rate2media.9 \
- ieee80211.9 ieee80211_setmode.9 \
- ieee80211.9 ieee80211_watchdog.9
-MLINKS+=ieee80211_crypto.9 ieee80211_crypto_attach.9 \
- ieee80211_crypto.9 ieee80211_crypto_detach.9 \
- ieee80211_crypto.9 ieee80211_wep_crypt.9
-MLINKS+=ieee80211_input.9 ieee80211_decap.9 \
- ieee80211_input.9 ieee80211_recv_mgmt.9
-MLINKS+=ieee80211_ioctl.9 ieee80211_cfgget.9 \
- ieee80211_ioctl.9 ieee80211_cfgset.9
-MLINKS+=ieee80211_node.9 ieee80211_alloc_node.9 \
- ieee80211_node.9 ieee80211_begin_scan.9 \
- ieee80211_node.9 ieee80211_create_ibss.9 \
- ieee80211_node.9 ieee80211_dup_bss.9 \
- ieee80211_node.9 ieee80211_end_scan.9 \
- ieee80211_node.9 ieee80211_find_node.9 \
- ieee80211_node.9 ieee80211_free_allnodes.9 \
+MLINKS+=ieee80211.9 ieee80211_ifattach.9 \
+ ieee80211.9 ieee80211_ifdetach.9
+MLINKS+=ieee80211_amrr.9 ieee80211_amrr_init.9 \
+ ieee80211_amrr.9 ieee80211_amrr_cleanup.9 \
+ ieee80211_amrr.9 ieee80211_amrr_setinterval.9 \
+ ieee80211_amrr.9 ieee80211_amrr_node_init.9 \
+ ieee80211_amrr.9 ieee80211_amrr_tx_complete.9 \
+ ieee80211_amrr.9 ieee80211_amrr_tx_update.9
+MLINKS+=ieee80211_beacon.9 ieee80211_beacon_alloc.9 \
+ ieee80211_beacon.9 ieee80211_beacon_update.9 \
+ ieee80211_beacon.9 ieee80211_beacon_notify.9
+MLINKS+=ieee80211_bmiss.9 ieee80211_beacon_miss.9
+MLINKS+=ieee80211_crypto.9 ieee80211_key_update_begin.9 \
+ ieee80211_crypto.9 ieee80211_key_update_end.9 \
+ ieee80211_crypto.9 ieee80211_crypto_newkey.9 \
+ ieee80211_crypto.9 ieee80211_crypto_setkey.9 \
+ ieee80211_crypto.9 ieee80211_crypto_delglobalkeys.9 \
+ ieee80211_crypto.9 ieee80211_crypto_reload_keys.9 \
+ ieee80211_crypto.9 ieee80211_crypto_decap.9 \
+ ieee80211_crypto.9 ieee80211_crypto_encap.9 \
+ ieee80211_crypto.9 ieee80211_crypto_demic.9 \
+ ieee80211_crypto.9 ieee80211_crypto_enmic.9 \
+ ieee80211_crypto.9 ieee80211_notify_michael_failure.9 \
+ ieee80211_crypto.9 ieee80211_notify_replay_failure.9 \
+ ieee80211_crypto.9 ieee80211_crypto_register.9 \
+ ieee80211_crypto.9 ieee80211_crypto_unregister.9 \
+ ieee80211_crypto.9 ieee80211_crypto_available.9
+MLINKS+=ieee80211_input.9 ieee80211_input_all.9
+MLINKS+=ieee80211_node.9 ieee80211_find_rxnode.9 \
+ ieee80211_node.9 ieee80211_find_rxnode_withkey.9 \
+ ieee80211_node.9 ieee80211_ref_node.9 \
+ ieee80211_node.9 ieee80211_unref_node.9 \
ieee80211_node.9 ieee80211_free_node.9 \
ieee80211_node.9 ieee80211_iterate_nodes.9 \
- ieee80211_node.9 ieee80211_lookup_node.9 \
- ieee80211_node.9 ieee80211_next_scan.9 \
- ieee80211_node.9 ieee80211_node_attach.9 \
- ieee80211_node.9 ieee80211_node_detach.9 \
- ieee80211_node.9 ieee80211_node_lateattach.9 \
- ieee80211_node.9 ieee80211_timeout_nodes.9
-MLINKS+=ieee80211_output.9 ieee80211_add_rates.9 \
- ieee80211_output.9 ieee80211_add_xrates.9 \
- ieee80211_output.9 ieee80211_encap.9 \
- ieee80211_output.9 ieee80211_send_mgmt.9
-MLINKS+=ieee80211_proto.9 ieee80211_dump_pkt.9 \
- ieee80211_proto.9 ieee80211_fix_rate.9 \
- ieee80211_proto.9 ieee80211_print_essid.9 \
- ieee80211_proto.9 ieee80211_proto_attach.9 \
- ieee80211_proto.9 ieee80211_proto_detach.9
-MLINKS+=ieee80211_radiotap.9 radiotap.9
+ ieee80211_node.9 ieee80211_dump_node.9 \
+ ieee80211_node.9 ieee80211_dump_nodes.9
+MLINKS+=ieee80211_output.9 M_WME_GETAC.9 \
+ ieee80211_output.9 M_SEQNO_GET.9 \
+ ieee80211_output.9 ieee80211_process_callback.9
+MLINKS+=ieee80211_proto.9 ieee80211_new_state.9 \
+ ieee80211_proto.9 ieee80211_start_all.9 \
+ ieee80211_proto.9 ieee80211_stop_all.9 \
+ ieee80211_proto.9 ieee80211_suspend_all.9 \
+ ieee80211_proto.9 ieee80211_resume_all.9 \
+ ieee80211_proto.9 ieee80211_waitfor_parent.9
+MLINKS+=ieee80211_radiotap.9 radiotap.9 \
+ ieee80211_radiotap.9 ieee80211_radiotap_attach.9 \
+ ieee80211_radiotap.9 ieee80211_radiotap_active_vap.9 \
+ ieee80211_radiotap.9 ieee80211_radiotap_active.9 \
+ ieee80211_radiotap.9 ieee80211_radiotap_tx.9
+MLINKS+=ieee80211_regdomain.9 ieee80211_init_channels.9 \
+ ieee80211_regdomain.9 ieee80211_sort_channels.9 \
+ ieee80211_regdomain.9 ieee80211_alloc_countryie.9
+MLINKS+=ieee80211_vap.9 ieee80211_vap_setup.9 \
+ ieee80211_vap.9 ieee80211_vap_attach.9 \
+ ieee80211_vap.9 ieee80211_vap_detach.9
MLINKS+=ifnet.9 ifaddr.9 \
ifnet.9 if_data.9 \
ifnet.9 ifqueue.9
==== //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211.9#2 (text+ko) ====
@@ -1,6 +1,5 @@
.\"
-.\" Copyright (c) 2004 Bruce M. Simpson <bms at spc.org>
-.\" Copyright (c) 2004 Darron Broad <darron at kewl.org>
+.\" Copyright (c) 2009 Sam Leffler, Errno Consulting
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -24,237 +23,539 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/ieee80211.9,v 1.4 2005/06/28 20:15:18 hmp Exp $
-.\" $Id: ieee80211.9,v 1.5 2004/03/04 12:33:27 bruce Exp $
+.\" $FreeBSD: src/share/man/man9/ieee80211.9,v 1.5 2009/08/12 21:03:16 sam Exp $
.\"
-.Dd March 2, 2004
-.Dt IEEE80211 9
+.Dd August 4, 2009
+.Dt NET80211 9
.Os
.Sh NAME
-.Nm ieee80211_ifattach , ieee80211_ifdetach ,
-.Nm ieee80211_mhz2ieee , ieee80211_chan2ieee , ieee80211_ieee2mhz ,
-.Nm ieee80211_media_init , ieee80211_media_change , ieee80211_media_status ,
-.Nm ieee80211_watchdog ,
-.Nm ieee80211_setmode , ieee80211_chan2mode ,
-.Nm ieee80211_rate2media , ieee80211_media2rate
-.Nd core 802.11 network stack functions
+.Nm net80211
+.Nd 802.11 network layer
.Sh SYNOPSIS
.In net80211/ieee80211_var.h
-.In net80211/ieee80211_proto.h
.Ft void
-.Fn ieee80211_ifattach "struct ifnet *ifp"
+.Fn ieee80211_ifattach "struct ieee80211com *ic" "const uint8_t macaddr[IEEE80211_ADDR_LEN]"
.Ft void
-.Fn ieee80211_ifdetach "struct ifnet *ifp"
-.Ft u_int
-.Fn ieee80211_mhz2ieee "u_int freq" "u_int flags"
-.Ft u_int
-.Fn ieee80211_chan2ieee "struct ieee80211com *ic" "struct ieee80211_channel *c"
-.Ft u_int
-.Fn ieee80211_ieee2mhz "u_int chan" "u_int flags"
-.Ft void
-.Fo ieee80211_media_init
-.Fa "struct ifnet *ifp" "ifm_change_cb_t media_change"
-.Fa "ifm_stat_cb_t media_stat"
-.Fc
-.Fa int
-.Fn ieee80211_media_change "struct ifnet *ifp"
-.Fa void
-.Fn ieee80211_media_status "struct ifnet *ifp" "struct ifmediareq *imr"
-.Ft void
-.Fn ieee80211_watchdog "struct ifnet *ifp"
-.Ft int
-.Fn ieee80211_setmode "struct ieee80211com *ic" "enum ieee80211_phymode mode"
-.Ft enum ieee80211_phymode
-.Fo ieee80211_chan2mode
-.Fa "struct ieee80211com *ic" "struct ieee80211_channel *chan"
-.Fc
-.Ft int
-.Fo ieee80211_rate2media
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list