From owner-p4-projects@FreeBSD.ORG Sun Jan 29 00:44:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6869D16A423; Sun, 29 Jan 2006 00:44:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 24A5C16A420 for ; Sun, 29 Jan 2006 00:44:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFB4643D45 for ; Sun, 29 Jan 2006 00:44:12 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0T0iCSX000248 for ; Sun, 29 Jan 2006 00:44:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0T0iCSU000245 for perforce@freebsd.org; Sun, 29 Jan 2006 00:44:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 00:44:12 GMT Message-Id: <200601290044.k0T0iCSU000245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90583 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 00:44:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=90583 Change 90583 by rwatson@rwatson_peppercorn on 2006/01/29 00:43:58 Add $P4$ to headers of all revision controlled files, except for VERSION. Slight license formatting changes to some files. Affected files ... .. //depot/projects/trustedbsd/openbsm/CHANGELOG#4 edit .. //depot/projects/trustedbsd/openbsm/LICENSE#4 edit .. //depot/projects/trustedbsd/openbsm/Makefile#2 edit .. //depot/projects/trustedbsd/openbsm/README#10 edit .. //depot/projects/trustedbsd/openbsm/TODO#3 edit .. //depot/projects/trustedbsd/openbsm/bin/Makefile#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#9 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.h#2 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#4 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#4 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#5 edit .. //depot/projects/trustedbsd/openbsm/bsm/Makefile#7 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#13 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#7 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#28 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#13 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#3 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#12 edit .. //depot/projects/trustedbsd/openbsm/compat/endian.h#4 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_class#3 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_control#2 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#9 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_user#2 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_warn#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile#11 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_class.3#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#2 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_free_token.3#2 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#2 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#2 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#17 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#9 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#11 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#8 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#12 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#28 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#10 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#7 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#33 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#12 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#13 edit .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#3 edit .. //depot/projects/trustedbsd/openbsm/man/Makefile#4 edit .. //depot/projects/trustedbsd/openbsm/man/audit.2#5 edit .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#6 edit .. //depot/projects/trustedbsd/openbsm/man/audit_class.5#3 edit .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#3 edit .. //depot/projects/trustedbsd/openbsm/man/audit_event.5#3 edit .. //depot/projects/trustedbsd/openbsm/man/audit_user.5#3 edit .. //depot/projects/trustedbsd/openbsm/man/audit_warn.5#3 edit .. //depot/projects/trustedbsd/openbsm/man/auditctl.2#3 edit .. //depot/projects/trustedbsd/openbsm/man/auditon.2#5 edit .. //depot/projects/trustedbsd/openbsm/man/event_code.5#2 edit .. //depot/projects/trustedbsd/openbsm/man/getaudit.2#3 edit .. //depot/projects/trustedbsd/openbsm/man/getauid.2#3 edit .. //depot/projects/trustedbsd/openbsm/man/setaudit.2#3 edit .. //depot/projects/trustedbsd/openbsm/man/setauid.2#3 edit .. //depot/projects/trustedbsd/openbsm/tools/Makefile#3 edit .. //depot/projects/trustedbsd/openbsm/tools/audump.c#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/CHANGELOG#4 (text+ko) ==== @@ -61,4 +61,6 @@ or static memory is returned for non-_r() versions of API calls. _free() calls dropped as a result, and source code compatibility with OpenSolaris improved significantly. +- Annotate BSM events with origin OS and compatibility information. +$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#4 $ ==== //depot/projects/trustedbsd/openbsm/LICENSE#4 (text+ko) ==== @@ -30,3 +30,4 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. +$P4: //depot/projects/trustedbsd/openbsm/LICENSE#4 $ ==== //depot/projects/trustedbsd/openbsm/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# +# $P4: //depot/projects/trustedbsd/openbsm/Makefile#2 $ # SUBDIR= bsm \ ==== //depot/projects/trustedbsd/openbsm/README#10 (text+ko) ==== @@ -77,3 +77,4 @@ Information on OpenBSM may be found on the OpenBSM home page: +$P4: //depot/projects/trustedbsd/openbsm/README#10 $ ==== //depot/projects/trustedbsd/openbsm/TODO#3 (text+ko) ==== @@ -6,3 +6,5 @@ test that things work properly with respect to endianness of the local platform. - Document contents of libbsm "public" data structures in libbsm man pages. + +$P4: //depot/projects/trustedbsd/openbsm/TODO#3 $ ==== //depot/projects/trustedbsd/openbsm/bin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile#2 $ # SUBDIR= auditreduce \ ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#4 $ # CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#3 (text+ko) ==== @@ -24,6 +24,8 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#3 $ +.\" .Dd Jan 24, 2004 .Dt AUDITREDUCE 1 .Os ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#9 (text+ko) ==== @@ -24,6 +24,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#9 $ */ /* ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.h#2 (text+ko) ==== @@ -24,6 +24,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.h#2 $ */ #ifndef _AUDITREDUCE_H_ ==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#4 $ # CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#4 (text+ko) ==== @@ -24,6 +24,8 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#4 $ +.\" .Dd Jan 24, 2004 .Dt PRAUDIT 1 .Os ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#5 (text+ko) ==== @@ -24,6 +24,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#5 $ */ /* ==== //depot/projects/trustedbsd/openbsm/bsm/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# +# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile#7 $ # INCS= audit.h \ ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#13 (text+ko) ==== @@ -29,6 +29,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * @APPLE_BSD_LICENSE_HEADER_END@ + * + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#13 $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#7 (text+ko) ==== @@ -33,6 +33,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * @APPLE_BSD_LICENSE_HEADER_END@ + * + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#7 $ */ #ifndef _LIBBSM_INTERNAL_H ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#28 (text+ko) ==== @@ -29,6 +29,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * @APPLE_BSD_LICENSE_HEADER_END@ + * + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#28 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#13 (text+ko) ==== @@ -29,6 +29,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * @APPLE_BSD_LICENSE_HEADER_END@ + * + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#13 $ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#3 (text+ko) ==== @@ -24,6 +24,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#3 $ */ #ifndef _BSM_AUDIT_UEVENTS_H_ ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#12 (text+ko) ==== @@ -24,6 +24,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#12 $ */ #ifndef _LIBBSM_H_ ==== //depot/projects/trustedbsd/openbsm/compat/endian.h#4 (text+ko) ==== @@ -25,6 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/sys/endian.h,v 1.6 2003/10/15 20:05:57 obrien Exp $ + * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#4 $ */ #ifndef _COMPAT_ENDIAN_H_ ==== //depot/projects/trustedbsd/openbsm/etc/audit_class#3 (text+ko) ==== @@ -1,4 +1,6 @@ # +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_class#3 $ +# # This file must match audit.h # 0x00000000:no:invalid class ==== //depot/projects/trustedbsd/openbsm/etc/audit_control#2 (text+ko) ==== @@ -1,3 +1,6 @@ +# +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#2 $ +# dir:/var/audit flags:lo,ad,-all,^-fa,^-fc,^-cl minfree:20 ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#9 (text+ko) ==== @@ -1,3 +1,6 @@ +# +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#9 $ +# 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc 2:AUE_FORK:fork(2):pc ==== //depot/projects/trustedbsd/openbsm/etc/audit_user#2 (text+ko) ==== @@ -1,2 +1,5 @@ +# +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_user#2 $ +# root:lo:no audit:fc:no ==== //depot/projects/trustedbsd/openbsm/etc/audit_warn#3 (text+ko) ==== @@ -1,2 +1,5 @@ #!/bin/sh +# +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_warn#3 $ +# logger -p security.warning "audit warning: $@" ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile#11 (text+ko) ==== @@ -1,7 +1,7 @@ # # OpenBSM libbsm # -# $FreeBSD$ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile#11 $ # LIB= bsm ==== //depot/projects/trustedbsd/openbsm/libbsm/au_class.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_class.3#3 $ .\" .Dd April 19, 2005 .Dt AU_CLASS 3 ==== //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#2 $ .\" .Dd April 19, 2005 .Dt AU_CONTROL 3 ==== //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#3 $ .\" .Dd April 19, 2005 .Dt AU_EVENT 3 ==== //depot/projects/trustedbsd/openbsm/libbsm/au_free_token.3#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_free_token.3#2 $ .\" .Dd April 19, 2005 .Dt AU_FREE_TOKEN 3 ==== //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#2 $ .\" .Dd April 19, 2005 .Dt AU_IO 3 ==== //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#2 $ .\" .Dd April 19, 2005 .Dt AU_MASK 3 ==== //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#4 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 ==== //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#3 $ .\" .Dd April 19, 2005 .Dt AU_USER 3 ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#17 (text+ko) ==== @@ -29,6 +29,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#17 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#9 (text+ko) ==== @@ -26,6 +26,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#9 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#11 (text+ko) ==== @@ -25,6 +25,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#11 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#8 (text+ko) ==== @@ -26,6 +26,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#8 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#12 (text+ko) ==== @@ -26,6 +26,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#12 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#28 (text+ko) ==== @@ -30,6 +30,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#28 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#10 (text+ko) ==== @@ -26,6 +26,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#10 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#7 (text+ko) ==== @@ -1,5 +1,6 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004, Apple Computer, Inc. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -24,6 +25,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#7 $ */ #ifdef __APPLE__ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#33 (text+ko) ==== @@ -29,6 +29,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#33 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#12 (text+ko) ==== @@ -26,6 +26,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#12 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#13 (text+ko) ==== @@ -1,5 +1,6 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004, Apple Computer, Inc. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -24,6 +25,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#13 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#3 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 ==== //depot/projects/trustedbsd/openbsm/man/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile#4 $ # MAN= audit.2 \ ==== //depot/projects/trustedbsd/openbsm/man/audit.2#5 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.2#5 $ .\" .Dd April 19, 2005 .Dt AUDIT 2 ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#6 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#6 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 ==== //depot/projects/trustedbsd/openbsm/man/audit_class.5#3 (text+ko) ==== @@ -1,4 +1,5 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. All rights reserved. +.\" Copyright (c) 2004, Apple Computer, Inc. +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -24,6 +25,8 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#3 $ +.\" .Dd Jan 24, 2004 .Dt AUDIT_CLASS 5 .Os "Mac OS X" ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#3 (text+ko) ==== @@ -1,4 +1,5 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. All rights reserved. +.\" Copyright (c) 2004, Apple Computer, Inc. +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -24,6 +25,8 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#3 $ +.\" .Dd Jan 24, 2004 .Dt AUDIT_CONTROL 5 .Os "Mac OS X" ==== //depot/projects/trustedbsd/openbsm/man/audit_event.5#3 (text+ko) ==== @@ -1,4 +1,5 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. All rights reserved. +.\" Copyright (c) 2004, Apple Computer, Inc. +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -24,6 +25,8 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#3 $ +.\" .Dd Jan 24, 2004 .Dt AUDIT_EVENT 5 .Os "Mac OS X" ==== //depot/projects/trustedbsd/openbsm/man/audit_user.5#3 (text+ko) ==== @@ -1,4 +1,5 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. All rights reserved. +.\" Copyright (c) 2004, Apple Computer, Inc. +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -24,6 +25,8 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#3 $ +.\" .Dd Jan 24, 2004 .Dt AUDIT_USER 5 .Os "Mac OS X" ==== //depot/projects/trustedbsd/openbsm/man/audit_warn.5#3 (text+ko) ==== @@ -1,4 +1,5 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. All rights reserved. +.\" Copyright (c) 2004, Apple Computer, Inc. +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -24,6 +25,8 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_warn.5#3 $ +.\" .Dd Mar 17, 2004 .Dt AUDIT_WARN 5 .Os "Mac OS X" ==== //depot/projects/trustedbsd/openbsm/man/auditctl.2#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditctl.2#3 $ .\" .Dd April 19, 2005 .Dt AUDITCTL 2 ==== //depot/projects/trustedbsd/openbsm/man/auditon.2#5 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#5 $ .\" .Dd April 19, 2005 .Dt AUDITON 2 ==== //depot/projects/trustedbsd/openbsm/man/event_code.5#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/event_code.5#2 $ .\" .Dd May 1, 2005 .Dt EVENT_CODE 5 ==== //depot/projects/trustedbsd/openbsm/man/getaudit.2#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#3 $ .\" .Dd April 19, 2005 .Dt GETAUDIT 2 ==== //depot/projects/trustedbsd/openbsm/man/getauid.2#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/getauid.2#3 $ .\" .Dd April 19, 2005 .Dt GETAUID 2 ==== //depot/projects/trustedbsd/openbsm/man/setaudit.2#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#3 $ .\" .Dd April 19, 2005 .Dt SETAUDIT 2 ==== //depot/projects/trustedbsd/openbsm/man/setauid.2#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/setauid.2#3 $ .\" .Dd April 19, 2005 .Dt SETAUID 2 ==== //depot/projects/trustedbsd/openbsm/tools/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile#3 $ # CFLAGS+= -I- -I .. -I ../libbsm -L ../libbsm -I. ==== //depot/projects/trustedbsd/openbsm/tools/audump.c#4 (text+ko) ==== @@ -22,6 +22,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/openbsm/tools/audump.c#4 $ */ #include From owner-p4-projects@FreeBSD.ORG Sun Jan 29 00:56:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6F5F16A423; Sun, 29 Jan 2006 00:56:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C0ED16A420 for ; Sun, 29 Jan 2006 00:56:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F312743D46 for ; Sun, 29 Jan 2006 00:56:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0T0uRo3008611 for ; Sun, 29 Jan 2006 00:56:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0T0uRTB008608 for perforce@freebsd.org; Sun, 29 Jan 2006 00:56:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 00:56:27 GMT Message-Id: <200601290056.k0T0uRTB008608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 00:56:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=90584 Change 90584 by rwatson@rwatson_peppercorn on 2006/01/29 00:56:07 Pick a more CVS-friendly version string, and add a '1' because this is the first alpha, and likely not the last. Affected files ... .. //depot/projects/trustedbsd/openbsm/VERSION#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/VERSION#4 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM-1.0-ALPHA +OPENBSM_1_0_ALPHA_1 From owner-p4-projects@FreeBSD.ORG Sun Jan 29 00:57:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4609016A423; Sun, 29 Jan 2006 00:57:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E621816A420 for ; Sun, 29 Jan 2006 00:57:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B170543D45 for ; Sun, 29 Jan 2006 00:57:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0T0vTtC008648 for ; Sun, 29 Jan 2006 00:57:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0T0vT1a008645 for perforce@freebsd.org; Sun, 29 Jan 2006 00:57:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 00:57:29 GMT Message-Id: <200601290057.k0T0vT1a008645@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 00:57:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=90585 Change 90585 by rwatson@rwatson_peppercorn on 2006/01/29 00:57:24 Avoid '$FreeBSD$' in a file that will be vendor-imported into FreeBSD CVS. Affected files ... .. //depot/projects/trustedbsd/openbsm/compat/endian.h#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/compat/endian.h#5 (text+ko) ==== @@ -24,8 +24,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/endian.h,v 1.6 2003/10/15 20:05:57 obrien Exp $ - * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#4 $ + * Derived from FreeBSD src/sys/sys/endian.h:1.6. + * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#5 $ */ #ifndef _COMPAT_ENDIAN_H_ From owner-p4-projects@FreeBSD.ORG Sun Jan 29 00:59:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5113716A423; Sun, 29 Jan 2006 00:59:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1505716A420 for ; Sun, 29 Jan 2006 00:59:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C30F943D46 for ; Sun, 29 Jan 2006 00:59:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0T0xWuu008777 for ; Sun, 29 Jan 2006 00:59:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0T0xWF5008774 for perforce@freebsd.org; Sun, 29 Jan 2006 00:59:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 00:59:32 GMT Message-Id: <200601290059.k0T0xWF5008774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 00:59:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=90586 Change 90586 by rwatson@rwatson_peppercorn on 2006/01/29 00:59:29 Canonicalize copyright/rights statements. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#10 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.h#3 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#5 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#6 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#4 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#4 (text+ko) ==== @@ -1,4 +1,5 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. All rights reserved. +.\" Copyright (c) 2004, Apple Computer, Inc. +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -24,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#4 $ .\" .Dd Jan 24, 2004 .Dt AUDITREDUCE 1 ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#10 (text+ko) ==== @@ -1,5 +1,6 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004, Apple Computer, Inc. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#10 $ */ /* ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.h#3 (text+ko) ==== @@ -1,5 +1,6 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004, Apple Computer, Inc. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.h#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.h#3 $ */ #ifndef _AUDITREDUCE_H_ ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#5 (text+ko) ==== @@ -1,4 +1,5 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. All rights reserved. +.\" Copyright (c) 2004, Apple Computer, Inc. +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -24,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#5 $ .\" .Dd Jan 24, 2004 .Dt PRAUDIT 1 ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#6 (text+ko) ==== @@ -1,5 +1,6 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004, Apple Computer, Inc. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#6 $ */ /* ==== //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#4 (text+ko) ==== @@ -1,5 +1,6 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004, Apple Computer, Inc. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#4 $ */ #ifndef _BSM_AUDIT_UEVENTS_H_ ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#13 (text+ko) ==== @@ -1,5 +1,6 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004, Apple Computer, Inc. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -25,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#13 $ */ #ifndef _LIBBSM_H_ From owner-p4-projects@FreeBSD.ORG Sun Jan 29 01:03:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD7BE16A423; Sun, 29 Jan 2006 01:03:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 95E8416A420 for ; Sun, 29 Jan 2006 01:03:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 384AC43D45 for ; Sun, 29 Jan 2006 01:03:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0T13cEC009003 for ; Sun, 29 Jan 2006 01:03:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0T13b2a009000 for perforce@freebsd.org; Sun, 29 Jan 2006 01:03:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 01:03:37 GMT Message-Id: <200601290103.k0T13b2a009000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90587 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 01:03:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=90587 Change 90587 by rwatson@rwatson_peppercorn on 2006/01/29 01:03:28 Further canonlicalize copyrights -- no ',' after the year. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#5 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#11 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.h#4 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#6 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#7 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#5 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#14 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#18 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#10 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#12 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#9 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#13 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#29 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#11 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#8 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#34 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#13 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#14 edit .. //depot/projects/trustedbsd/openbsm/man/audit_class.5#4 edit .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#4 edit .. //depot/projects/trustedbsd/openbsm/man/audit_event.5#4 edit .. //depot/projects/trustedbsd/openbsm/man/audit_user.5#4 edit .. //depot/projects/trustedbsd/openbsm/man/audit_warn.5#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#5 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. +.\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#5 $ .\" .Dd Jan 24, 2004 .Dt AUDITREDUCE 1 ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#11 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#11 $ */ /* ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.h#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.h#4 $ */ #ifndef _AUDITREDUCE_H_ ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#6 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. +.\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#6 $ .\" .Dd Jan 24, 2004 .Dt PRAUDIT 1 ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#6 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#7 $ */ /* ==== //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#5 $ */ #ifndef _BSM_AUDIT_UEVENTS_H_ ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#14 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#14 $ */ #ifndef _LIBBSM_H_ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#18 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. * @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#18 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. * @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#10 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#12 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. * @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#9 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. * @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#13 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#29 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * Copyright (c) 2005 SPARTA, Inc. * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#28 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#29 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#11 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * Copyright (c) 2005 Robert N. M. Watson * All rights reserved. * @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#11 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#8 $ */ #ifdef __APPLE__ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#34 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. * @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#33 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#34 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. * @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#13 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#14 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#14 $ */ #include ==== //depot/projects/trustedbsd/openbsm/man/audit_class.5#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. +.\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#4 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_CLASS 5 ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. +.\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#4 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_CONTROL 5 ==== //depot/projects/trustedbsd/openbsm/man/audit_event.5#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. +.\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#4 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_EVENT 5 ==== //depot/projects/trustedbsd/openbsm/man/audit_user.5#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. +.\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#4 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_USER 5 ==== //depot/projects/trustedbsd/openbsm/man/audit_warn.5#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. +.\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_warn.5#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_warn.5#4 $ .\" .Dd Mar 17, 2004 .Dt AUDIT_WARN 5 From owner-p4-projects@FreeBSD.ORG Sun Jan 29 05:48:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8029916A423; Sun, 29 Jan 2006 05:48:29 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5719616A420 for ; Sun, 29 Jan 2006 05:48:29 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28F5543D45 for ; Sun, 29 Jan 2006 05:48:29 +0000 (GMT) (envelope-from alc@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 k0T5mSSV028257 for ; Sun, 29 Jan 2006 05:48:29 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0T5mSrI028254 for perforce@freebsd.org; Sun, 29 Jan 2006 05:48:28 GMT (envelope-from alc@freebsd.org) Date: Sun, 29 Jan 2006 05:48:28 GMT Message-Id: <200601290548.k0T5mSrI028254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 05:48:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=90602 Change 90602 by alc@alc_home on 2006/01/29 05:47:50 Prepare for recognizing cache pages using PG_CACHE. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_pageq.c#12 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_pageq.c#12 (text+ko) ==== @@ -164,7 +164,7 @@ int queue = VM_PAGE_GETQUEUE(m); struct vpgqueues *pq; - if ((queue - m->buddyq) == PQ_BUDDY) { + if ((m->flags & PG_CACHE) != 0) { buddy_unfree(m); KASSERT(m->queue == PQ_NONE, ("xxx")); vm_page_flag_clear(m, PG_CACHE); @@ -191,7 +191,7 @@ int queue = VM_PAGE_GETQUEUE(m); struct vpgqueues *pq; - if ((queue - m->buddyq) == PQ_BUDDY) { + if ((m->flags & PG_CACHE) != 0) { buddy_unfree(m); KASSERT(m->queue == PQ_NONE, ("xxx")); vm_page_flag_clear(m, PG_CACHE); From owner-p4-projects@FreeBSD.ORG Sun Jan 29 06:19:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BB3F16A423; Sun, 29 Jan 2006 06:19:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C4E516A420 for ; Sun, 29 Jan 2006 06:19:10 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6286F43D60 for ; Sun, 29 Jan 2006 06:19:06 +0000 (GMT) (envelope-from alc@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 k0T6J6ca029307 for ; Sun, 29 Jan 2006 06:19:06 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0T6J6K2029304 for perforce@freebsd.org; Sun, 29 Jan 2006 06:19:06 GMT (envelope-from alc@freebsd.org) Date: Sun, 29 Jan 2006 06:19:06 GMT Message-Id: <200601290619.k0T6J6K2029304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90603 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 06:19:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=90603 Change 90603 by alc@alc_home on 2006/01/29 06:18:23 Revise buddy_unfree(). Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_buddy.c#5 edit .. //depot/projects/superpages/src/sys/vm/vm_buddy.h#5 edit .. //depot/projects/superpages/src/sys/vm/vm_pageq.c#13 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_buddy.c#5 (text+ko) ==== @@ -255,26 +255,22 @@ /* * Extract the give page from the buddy queues. */ -boolean_t +void buddy_unfree(vm_page_t m) { vm_paddr_t half; vm_page_t buddy, other; int q; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); KASSERT(m->flags & PG_CACHE, ("xxx")); buddy = m; - mtx_lock_spin(&vm_page_queue_free_mtx); - for (q = 0; (buddy->queue - buddy->buddyq) != PQ_BUDDY && + for (q = 0; !VM_PAGE_INQUEUE1(buddy, PQ_CACHE) && q < BUDDY_QUEUES; q++) { buddy = PHYS_TO_VM_PAGE(m->phys_addr & (~(vm_paddr_t)0 << (PAGE_SHIFT + q))); } - if (q == BUDDY_QUEUES || buddy->buddyq < q) { - mtx_unlock_spin(&vm_page_queue_free_mtx); - return (FALSE); - } - q = buddy->buddyq; + KASSERT(q == buddy->buddyq, ("xxx")); /* * m is in the free list as part of a chunk of size 1<phys_addr ^ (1 << (PAGE_SHIFT + q)); if (m->phys_addr < half) - other = PHYS_TO_VM_PAGE(half); + other = phys_to_vm_page(half); else { other = buddy; - buddy = PHYS_TO_VM_PAGE(half); + buddy = phys_to_vm_page(half); } buddy_insert(q, other); } - cnt.v_free_count--; - mtx_unlock_spin(&vm_page_queue_free_mtx); + cnt.v_cache_count--; KASSERT(buddy == m, ("yyy")); - return (TRUE); + KASSERT(m->queue == PQ_NONE, ("xxx")); } /* ==== //depot/projects/superpages/src/sys/vm/vm_buddy.h#5 (text+ko) ==== @@ -6,4 +6,4 @@ vm_page_t buddy_alloc_locked(int magn, boolean_t prefer_zero); void buddy_free(vm_page_t m, int magn); void buddy_free_locked(vm_page_t m, int magn); -boolean_t buddy_unfree(vm_page_t m); +void buddy_unfree(vm_page_t m); ==== //depot/projects/superpages/src/sys/vm/vm_pageq.c#13 (text+ko) ==== @@ -166,7 +166,6 @@ if ((m->flags & PG_CACHE) != 0) { buddy_unfree(m); - KASSERT(m->queue == PQ_NONE, ("xxx")); vm_page_flag_clear(m, PG_CACHE); } else if (queue != PQ_NONE) { pq = &vm_page_queues[queue]; @@ -193,7 +192,6 @@ if ((m->flags & PG_CACHE) != 0) { buddy_unfree(m); - KASSERT(m->queue == PQ_NONE, ("xxx")); vm_page_flag_clear(m, PG_CACHE); if (vm_paging_needed()) pagedaemon_wakeup(); From owner-p4-projects@FreeBSD.ORG Sun Jan 29 06:52:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6585316A4AC; Sun, 29 Jan 2006 06:52:48 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28A1816A435 for ; Sun, 29 Jan 2006 06:52:48 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9C6143D45 for ; Sun, 29 Jan 2006 06:52:47 +0000 (GMT) (envelope-from alc@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 k0T6qloA030541 for ; Sun, 29 Jan 2006 06:52:47 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0T6qll7030538 for perforce@freebsd.org; Sun, 29 Jan 2006 06:52:47 GMT (envelope-from alc@freebsd.org) Date: Sun, 29 Jan 2006 06:52:47 GMT Message-Id: <200601290652.k0T6qll7030538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 06:52:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=90605 Change 90605 by alc@alc_home on 2006/01/29 06:52:39 Parameterize the base queue used by buddy_insert(). Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_buddy.c#6 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_buddy.c#6 (text+ko) ==== @@ -106,15 +106,15 @@ * */ static __inline void -buddy_insert(int q, vm_page_t m) +buddy_insert(int baseq, int q, vm_page_t m) { KASSERT(m->queue == PQ_NONE, ("vm_page_buddy_insert: page %p has unexpected queue %d", m, m->queue)); m->buddyq = q; - m->queue = PQ_BUDDY + q; - if (m->flags & PG_ZERO) + m->queue = baseq + q; + if (baseq == PQ_CACHE || (m->flags & PG_ZERO) != 0) TAILQ_INSERT_TAIL(&vm_page_queues[m->queue].pl, m, pageq); else TAILQ_INSERT_HEAD(&vm_page_queues[m->queue].pl, m, pageq); @@ -148,7 +148,7 @@ (1 << (PAGE_SHIFT + q)), ("vm_page_buddy_split: page %p is not page %p's %d buddy", m_buddy, m, q)); - buddy_insert(q, m_buddy); + buddy_insert(PQ_BUDDY, q, m_buddy); } } @@ -249,7 +249,7 @@ pa &= ~((1 << (PAGE_SHIFT + q)) - 1); m = PHYS_TO_VM_PAGE(pa); } - buddy_insert(q, m); + buddy_insert(PQ_BUDDY, q, m); } /* @@ -288,7 +288,7 @@ other = buddy; buddy = phys_to_vm_page(half); } - buddy_insert(q, other); + buddy_insert(PQ_CACHE, q, other); } cnt.v_cache_count--; KASSERT(buddy == m, ("yyy")); From owner-p4-projects@FreeBSD.ORG Sun Jan 29 07:10:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E384416A423; Sun, 29 Jan 2006 07:10:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A74E16A420 for ; Sun, 29 Jan 2006 07:10:13 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 215C643D45 for ; Sun, 29 Jan 2006 07:10:13 +0000 (GMT) (envelope-from marcel@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 k0T7ACLw031212 for ; Sun, 29 Jan 2006 07:10:13 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0T7AAfq031200 for perforce@freebsd.org; Sun, 29 Jan 2006 07:10:10 GMT (envelope-from marcel@freebsd.org) Date: Sun, 29 Jan 2006 07:10:10 GMT Message-Id: <200601290710.k0T7AAfq031200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 90606 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 07:10:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=90606 Change 90606 by marcel@marcel_nfs on 2006/01/29 07:09:36 IFC @90604 Affected files ... .. //depot/projects/uart/Makefile#4 integrate .. //depot/projects/uart/alpha/alpha/clock.c#7 integrate .. //depot/projects/uart/alpha/alpha/cpuconf.c#4 integrate .. //depot/projects/uart/alpha/alpha/elf_machdep.c#5 integrate .. //depot/projects/uart/alpha/alpha/interrupt.c#8 integrate .. //depot/projects/uart/alpha/conf/GENERIC#12 integrate .. //depot/projects/uart/alpha/include/_types.h#4 integrate .. //depot/projects/uart/alpha/include/cpu.h#5 integrate .. //depot/projects/uart/alpha/include/cpuconf.h#4 integrate .. //depot/projects/uart/alpha/include/param.h#7 integrate .. //depot/projects/uart/alpha/linux/linux_sysvec.c#8 integrate .. //depot/projects/uart/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/uart/amd64/amd64/busdma_machdep.c#13 integrate .. //depot/projects/uart/amd64/amd64/db_trace.c#9 integrate .. //depot/projects/uart/amd64/amd64/elf_machdep.c#7 integrate .. //depot/projects/uart/amd64/amd64/identcpu.c#7 integrate .. //depot/projects/uart/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/uart/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/uart/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/uart/amd64/amd64/trap.c#9 integrate .. //depot/projects/uart/amd64/conf/GENERIC#13 integrate .. //depot/projects/uart/amd64/include/_types.h#5 integrate .. //depot/projects/uart/amd64/include/apicvar.h#7 integrate .. //depot/projects/uart/amd64/include/clock.h#6 integrate .. //depot/projects/uart/amd64/include/cpu.h#5 integrate .. //depot/projects/uart/amd64/include/frame.h#5 integrate .. //depot/projects/uart/amd64/include/param.h#9 integrate .. //depot/projects/uart/amd64/include/smp.h#8 integrate .. //depot/projects/uart/amd64/isa/clock.c#10 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/uart/amd64/pci/pci_bus.c#10 integrate .. //depot/projects/uart/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/uart/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/uart/arm/arm/identcpu.c#5 integrate .. //depot/projects/uart/arm/arm/intr.c#8 integrate .. //depot/projects/uart/arm/arm/locore.S#7 integrate .. //depot/projects/uart/arm/arm/trap.c#9 integrate .. //depot/projects/uart/arm/arm/vm_machdep.c#9 integrate .. //depot/projects/uart/arm/include/_types.h#4 integrate .. //depot/projects/uart/arm/include/cpu.h#4 integrate .. //depot/projects/uart/arm/include/frame.h#3 integrate .. //depot/projects/uart/arm/include/param.h#7 integrate .. //depot/projects/uart/arm/sa11x0/sa11x0_ost.c#3 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_pci.c#5 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_timer.c#6 integrate .. //depot/projects/uart/arm/xscale/i80321/iq31244_machdep.c#11 integrate .. //depot/projects/uart/boot/common/bootstrap.h#3 integrate .. //depot/projects/uart/boot/common/load_elf.c#4 integrate .. //depot/projects/uart/boot/common/load_elf_obj.c#2 integrate .. //depot/projects/uart/boot/common/module.c#3 integrate .. //depot/projects/uart/boot/common/reloc_elf.c#2 integrate .. //depot/projects/uart/boot/i386/libi386/Makefile#5 integrate .. //depot/projects/uart/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/uart/boot/i386/libi386/biosmem.c#3 integrate .. //depot/projects/uart/boot/i386/libi386/biospnp.c#4 integrate .. //depot/projects/uart/boot/i386/libi386/biossmap.c#4 integrate .. //depot/projects/uart/boot/i386/libi386/i386_copy.c#3 integrate .. //depot/projects/uart/boot/i386/libi386/libi386.h#6 integrate .. //depot/projects/uart/boot/i386/loader/main.c#7 integrate .. //depot/projects/uart/boot/ia64/efi/start.S#2 integrate .. //depot/projects/uart/boot/pc98/libpc98/Makefile#5 integrate .. //depot/projects/uart/boot/pc98/libpc98/biosdisk.c#5 integrate .. //depot/projects/uart/boot/pc98/libpc98/biosmem.c#4 integrate .. //depot/projects/uart/boot/pc98/loader/main.c#6 integrate .. //depot/projects/uart/cam/cam_ccb.h#5 integrate .. //depot/projects/uart/cam/cam_periph.c#9 integrate .. //depot/projects/uart/cam/cam_xpt.c#10 integrate .. //depot/projects/uart/cam/scsi/scsi_da.c#15 integrate .. //depot/projects/uart/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/uart/cam/scsi/scsi_ses.h#3 integrate .. //depot/projects/uart/coda/coda_vfsops.c#10 integrate .. //depot/projects/uart/coda/coda_vnops.c#10 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#10 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/uart/compat/freebsd32/syscalls.master#10 integrate .. //depot/projects/uart/compat/ia32/ia32_sysvec.c#6 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.h#4 integrate .. //depot/projects/uart/compat/linux/linux_mib.c#4 integrate .. //depot/projects/uart/compat/linux/linux_mib.h#2 integrate .. //depot/projects/uart/compat/linux/linux_misc.c#12 integrate .. //depot/projects/uart/compat/linux/linux_socket.c#9 integrate .. //depot/projects/uart/compat/linux/linux_stats.c#7 integrate .. //depot/projects/uart/compat/ndis/subr_ndis.c#8 integrate .. //depot/projects/uart/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/uart/conf/Makefile.arm#7 integrate .. //depot/projects/uart/conf/Makefile.i386#6 integrate .. //depot/projects/uart/conf/Makefile.pc98#6 integrate .. //depot/projects/uart/conf/NOTES#28 integrate .. //depot/projects/uart/conf/files#45 integrate .. //depot/projects/uart/conf/files.amd64#15 integrate .. //depot/projects/uart/conf/kern.post.mk#11 integrate .. //depot/projects/uart/conf/kmod.mk#16 integrate .. //depot/projects/uart/conf/options#22 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/fil.c#7 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_auth.c#6 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_compat.h#6 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil.h#6 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_frag.c#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_frag.h#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_ftp_pxy.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_htable.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_ipsec_pxy.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_log.c#6 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_nat.c#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_nat.h#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_netbios_pxy.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_proxy.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_proxy.h#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_raudio_pxy.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_rcmd_pxy.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_state.c#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_state.h#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_sync.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ipl.h#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/mlfk_ipl.c#6 integrate .. //depot/projects/uart/contrib/pf/net/pf.c#9 integrate .. //depot/projects/uart/contrib/pf/net/pf_norm.c#5 integrate .. //depot/projects/uart/contrib/pf/net/pfvar.h#4 integrate .. //depot/projects/uart/dev/aac/aac.c#16 integrate .. //depot/projects/uart/dev/acpi_support/acpi_ibm.c#5 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdSchedule.c#9 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdSynch.c#7 integrate .. //depot/projects/uart/dev/acpica/acpi_pci.c#8 integrate .. //depot/projects/uart/dev/acpica/acpi_pci_link.c#10 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib_acpi.c#10 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib_pci.c#8 integrate .. //depot/projects/uart/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/uart/dev/acpica/acpi_video.c#5 integrate .. //depot/projects/uart/dev/amr/amr.c#12 integrate .. //depot/projects/uart/dev/amr/amr_linux.c#1 branch .. //depot/projects/uart/dev/amr/amrreg.h#4 integrate .. //depot/projects/uart/dev/an/if_an.c#10 integrate .. //depot/projects/uart/dev/asr/asr.c#9 integrate .. //depot/projects/uart/dev/ata/ata-all.c#15 integrate .. //depot/projects/uart/dev/ata/ata-all.h#9 integrate .. //depot/projects/uart/dev/ata/ata-card.c#11 integrate .. //depot/projects/uart/dev/ata/ata-cbus.c#6 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/uart/dev/ata/ata-disk.c#11 integrate .. //depot/projects/uart/dev/ata/ata-disk.h#5 integrate .. //depot/projects/uart/dev/ata/ata-dma.c#11 integrate .. //depot/projects/uart/dev/ata/ata-isa.c#6 integrate .. //depot/projects/uart/dev/ata/ata-lowlevel.c#19 integrate .. //depot/projects/uart/dev/ata/ata-pci.c#11 integrate .. //depot/projects/uart/dev/ata/ata-pci.h#12 integrate .. //depot/projects/uart/dev/ata/ata-queue.c#12 integrate .. //depot/projects/uart/dev/ata/ata-raid.c#9 integrate .. //depot/projects/uart/dev/ata/ata-raid.h#7 integrate .. //depot/projects/uart/dev/ata/ata_if.m#2 integrate .. //depot/projects/uart/dev/ata/atapi-cd.c#16 integrate .. //depot/projects/uart/dev/ata/atapi-cd.h#8 integrate .. //depot/projects/uart/dev/ata/atapi-fd.c#7 integrate .. //depot/projects/uart/dev/ata/atapi-fd.h#5 integrate .. //depot/projects/uart/dev/ata/atapi-tape.c#8 integrate .. //depot/projects/uart/dev/ata/atapi-tape.h#5 integrate .. //depot/projects/uart/dev/ath/if_ath.c#19 integrate .. //depot/projects/uart/dev/ath/if_athioctl.h#8 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#14 integrate .. //depot/projects/uart/dev/atkbdc/psm.c#3 integrate .. //depot/projects/uart/dev/auxio/auxio.c#5 integrate .. //depot/projects/uart/dev/bge/if_bge.c#20 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#14 integrate .. //depot/projects/uart/dev/bktr/bktr_os.c#10 integrate .. //depot/projects/uart/dev/cardbus/cardbus.c#10 integrate .. //depot/projects/uart/dev/cardbus/cardbus_cis.c#10 integrate .. //depot/projects/uart/dev/cardbus/cardbus_device.c#1 branch .. //depot/projects/uart/dev/cardbus/cardbusvar.h#6 integrate .. //depot/projects/uart/dev/ce/ceddk.c#1 branch .. //depot/projects/uart/dev/ce/ceddk.h#1 branch .. //depot/projects/uart/dev/ce/if_ce.c#1 branch .. //depot/projects/uart/dev/ce/ng_ce.h#1 branch .. //depot/projects/uart/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/uart/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/uart/dev/ciss/ciss.c#14 integrate .. //depot/projects/uart/dev/cp/cpddk.c#3 integrate .. //depot/projects/uart/dev/dc/if_dc.c#2 integrate .. //depot/projects/uart/dev/dcons/dcons_os.c#5 integrate .. //depot/projects/uart/dev/drm/drm_agpsupport.c#4 integrate .. //depot/projects/uart/dev/drm/drm_drv.c#3 integrate .. //depot/projects/uart/dev/drm/i915_drv.c#3 integrate .. //depot/projects/uart/dev/drm/mach64_drv.c#3 integrate .. //depot/projects/uart/dev/drm/mga_drv.c#7 integrate .. //depot/projects/uart/dev/drm/r128_drv.c#7 integrate .. //depot/projects/uart/dev/drm/radeon_drv.c#8 integrate .. //depot/projects/uart/dev/drm/savage_drv.c#3 integrate .. //depot/projects/uart/dev/drm/sis_drv.c#6 integrate .. //depot/projects/uart/dev/drm/tdfx_drv.c#7 integrate .. //depot/projects/uart/dev/ed/if_ed.c#12 integrate .. //depot/projects/uart/dev/ed/if_ed_3c503.c#3 integrate .. //depot/projects/uart/dev/ed/if_ed_cbus.c#10 integrate .. //depot/projects/uart/dev/ed/if_ed_hpp.c#3 integrate .. //depot/projects/uart/dev/ed/if_ed_isa.c#9 integrate .. //depot/projects/uart/dev/ed/if_ed_novell.c#4 integrate .. //depot/projects/uart/dev/ed/if_ed_sic.c#3 integrate .. //depot/projects/uart/dev/ed/if_ed_wd80x3.c#3 integrate .. //depot/projects/uart/dev/ed/if_edvar.h#9 integrate .. //depot/projects/uart/dev/em/if_em.c#17 integrate .. //depot/projects/uart/dev/em/if_em.h#15 integrate .. //depot/projects/uart/dev/firewire/sbp.c#13 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#20 integrate .. //depot/projects/uart/dev/hme/if_hme.c#12 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/uart/dev/ichsmb/ichsmb.c#7 integrate .. //depot/projects/uart/dev/ieee488/pcii.c#3 integrate .. //depot/projects/uart/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/uart/dev/iir/iir.h#7 integrate .. //depot/projects/uart/dev/ips/ips_ioctl.h#2 integrate .. //depot/projects/uart/dev/ips/ipsreg.h#2 integrate .. //depot/projects/uart/dev/isp/isp.c#9 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.h#7 integrate .. //depot/projects/uart/dev/isp/isp_inline.h#6 integrate .. //depot/projects/uart/dev/isp/isp_ioctl.h#5 integrate .. //depot/projects/uart/dev/isp/isp_pci.c#9 integrate .. //depot/projects/uart/dev/isp/isp_sbus.c#7 integrate .. //depot/projects/uart/dev/isp/isp_target.c#6 integrate .. //depot/projects/uart/dev/isp/isp_target.h#5 integrate .. //depot/projects/uart/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/uart/dev/isp/ispmbox.h#5 integrate .. //depot/projects/uart/dev/isp/ispreg.h#3 integrate .. //depot/projects/uart/dev/isp/ispvar.h#8 integrate .. //depot/projects/uart/dev/ixgb/if_ixgb.c#7 integrate .. //depot/projects/uart/dev/md/md.c#14 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi.h#4 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_cnfg.h#4 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_fc.h#4 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_inb.h#1 branch .. //depot/projects/uart/dev/mpt/mpilib/mpi_init.h#4 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_ioc.h#4 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_lan.h#4 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_log_fc.h#1 branch .. //depot/projects/uart/dev/mpt/mpilib/mpi_log_sas.h#1 branch .. //depot/projects/uart/dev/mpt/mpilib/mpi_raid.h#4 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_sas.h#1 branch .. //depot/projects/uart/dev/mpt/mpilib/mpi_targ.h#4 integrate .. //depot/projects/uart/dev/mpt/mpilib/mpi_tool.h#1 branch .. //depot/projects/uart/dev/mpt/mpilib/mpi_type.h#6 integrate .. //depot/projects/uart/dev/mpt/mpt_debug.c#6 integrate .. //depot/projects/uart/dev/nge/if_nge.c#12 integrate .. //depot/projects/uart/dev/nmdm/nmdm.c#9 integrate .. //depot/projects/uart/dev/pccard/pccard.c#14 integrate .. //depot/projects/uart/dev/pccbb/pccbb.c#13 integrate .. //depot/projects/uart/dev/pccbb/pccbbreg.h#6 integrate .. //depot/projects/uart/dev/pci/hostb_pci.c#1 branch .. //depot/projects/uart/dev/pci/pci.c#21 integrate .. //depot/projects/uart/dev/pci/pci_if.m#4 integrate .. //depot/projects/uart/dev/pci/pci_pci.c#8 integrate .. //depot/projects/uart/dev/pci/pci_private.h#8 integrate .. //depot/projects/uart/dev/pci/pcib_private.h#4 integrate .. //depot/projects/uart/dev/pci/pcireg.h#10 integrate .. //depot/projects/uart/dev/pci/pcivar.h#8 integrate .. //depot/projects/uart/dev/pci/vga_pci.c#1 branch .. //depot/projects/uart/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/uart/dev/ppbus/immio.c#3 integrate .. //depot/projects/uart/dev/ppbus/lpbb.c#4 integrate .. //depot/projects/uart/dev/ppbus/lpt.c#6 integrate .. //depot/projects/uart/dev/ppbus/ppi.c#4 integrate .. //depot/projects/uart/dev/ppbus/pps.c#7 integrate .. //depot/projects/uart/dev/ppc/ppc.c#6 integrate .. //depot/projects/uart/dev/random/nehemiah.c#3 integrate .. //depot/projects/uart/dev/random/randomdev.c#6 integrate .. //depot/projects/uart/dev/random/randomdev.h#3 integrate .. //depot/projects/uart/dev/random/randomdev_soft.c#7 integrate .. //depot/projects/uart/dev/random/randomdev_soft.h#2 integrate .. //depot/projects/uart/dev/random/yarrow.c#5 integrate .. //depot/projects/uart/dev/re/if_re.c#13 integrate .. //depot/projects/uart/dev/rp/rp_pci.c#8 integrate .. //depot/projects/uart/dev/si/si.c#6 integrate .. //depot/projects/uart/dev/si/si2_z280.c#4 integrate .. //depot/projects/uart/dev/si/si3_t225.c#4 integrate .. //depot/projects/uart/dev/smbus/smb.c#4 integrate .. //depot/projects/uart/dev/smbus/smbus.c#4 integrate .. //depot/projects/uart/dev/sn/if_sn.c#7 integrate .. //depot/projects/uart/dev/sound/driver.c#5 integrate .. //depot/projects/uart/dev/sound/isa/ess.c#7 integrate .. //depot/projects/uart/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/uart/dev/sound/pci/cmi.c#9 integrate .. //depot/projects/uart/dev/sound/pci/ds1.c#9 integrate .. //depot/projects/uart/dev/sound/pci/emu10k1.c#9 integrate .. //depot/projects/uart/dev/sound/pci/es137x.c#13 integrate .. //depot/projects/uart/dev/sound/pci/fm801.c#8 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#15 integrate .. //depot/projects/uart/dev/sound/pci/maestro.c#10 integrate .. //depot/projects/uart/dev/sound/pci/solo.c#9 integrate .. //depot/projects/uart/dev/sound/pci/vibes.c#7 integrate .. //depot/projects/uart/dev/sound/pcm/ac97.c#12 integrate .. //depot/projects/uart/dev/sound/pcm/channel.c#8 integrate .. //depot/projects/uart/dev/sound/pcm/dsp.c#10 integrate .. //depot/projects/uart/dev/sound/pcm/feeder.c#7 integrate .. //depot/projects/uart/dev/sound/pcm/feeder.h#6 integrate .. //depot/projects/uart/dev/sound/pcm/feeder_fmt.c#7 integrate .. //depot/projects/uart/dev/sound/pcm/feeder_rate.c#5 integrate .. //depot/projects/uart/dev/sound/pcm/vchan.c#7 integrate .. //depot/projects/uart/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/uart/dev/syscons/syscons.c#12 integrate .. //depot/projects/uart/dev/ti/if_ti.c#2 integrate .. //depot/projects/uart/dev/ti/if_tireg.h#2 integrate .. //depot/projects/uart/dev/tx/if_tx.c#11 integrate .. //depot/projects/uart/dev/txp/if_txp.c#11 integrate .. //depot/projects/uart/dev/usb/ehci.c#13 integrate .. //depot/projects/uart/dev/usb/ehci_pci.c#11 integrate .. //depot/projects/uart/dev/usb/ehcivar.h#8 integrate .. //depot/projects/uart/dev/usb/if_cdce.c#4 integrate .. //depot/projects/uart/dev/usb/if_ural.c#4 integrate .. //depot/projects/uart/dev/usb/if_uralreg.h#3 integrate .. //depot/projects/uart/dev/usb/ohci.c#14 integrate .. //depot/projects/uart/dev/usb/ohci_pci.c#9 integrate .. //depot/projects/uart/dev/usb/ufoma.c#1 branch .. //depot/projects/uart/dev/usb/ugen.c#11 integrate .. //depot/projects/uart/dev/usb/ugraphire_rdesc.h#3 integrate .. //depot/projects/uart/dev/usb/uhci.c#14 integrate .. //depot/projects/uart/dev/usb/uhid.c#10 integrate .. //depot/projects/uart/dev/usb/umass.c#14 integrate .. //depot/projects/uart/dev/usb/ums.c#10 integrate .. //depot/projects/uart/dev/usb/usb.h#3 integrate .. //depot/projects/uart/dev/usb/usb_mem.c#8 integrate .. //depot/projects/uart/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/uart/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/uart/dev/usb/usb_subr.c#12 integrate .. //depot/projects/uart/dev/usb/usbdevs#16 integrate .. //depot/projects/uart/dev/usb/uscanner.c#11 integrate .. //depot/projects/uart/dev/usb/uxb360gp_rdesc.h#1 branch .. //depot/projects/uart/dev/vge/if_vge.c#7 integrate .. //depot/projects/uart/fs/devfs/devfs_rule.c#6 integrate .. //depot/projects/uart/fs/hpfs/hpfs_vnops.c#11 integrate .. //depot/projects/uart/fs/msdosfs/direntry.h#5 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_conv.c#8 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_denode.c#10 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_lookup.c#6 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vnops.c#12 integrate .. //depot/projects/uart/fs/ntfs/ntfs_subr.c#9 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vnops.c#11 integrate .. //depot/projects/uart/fs/nwfs/nwfs_node.c#7 integrate .. //depot/projects/uart/fs/procfs/procfs_status.c#5 integrate .. //depot/projects/uart/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/uart/fs/udf/udf_vnops.c#12 integrate .. //depot/projects/uart/geom/eli/g_eli.c#3 integrate .. //depot/projects/uart/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/uart/geom/label/g_label_ntfs.c#3 integrate .. //depot/projects/uart/geom/mirror/g_mirror.c#8 integrate .. //depot/projects/uart/geom/nop/g_nop.c#3 integrate .. //depot/projects/uart/geom/raid3/g_raid3.c#9 integrate .. //depot/projects/uart/geom/uzip/g_uzip.c#4 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_drive.c#7 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_plex.c#5 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_subr.c#4 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_var.h#5 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_volume.c#5 integrate .. //depot/projects/uart/geom/zero/g_zero.c#3 integrate .. //depot/projects/uart/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/uart/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/uart/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/uart/i386/conf/GENERIC#12 integrate .. //depot/projects/uart/i386/conf/NOTES#14 integrate .. //depot/projects/uart/i386/i386/bpf_jit_machdep.c#2 integrate .. //depot/projects/uart/i386/i386/busdma_machdep.c#16 integrate .. //depot/projects/uart/i386/i386/db_trace.c#9 integrate .. //depot/projects/uart/i386/i386/elf_machdep.c#6 integrate .. //depot/projects/uart/i386/i386/genassym.c#6 integrate .. //depot/projects/uart/i386/i386/identcpu.c#14 integrate .. //depot/projects/uart/i386/i386/local_apic.c#8 integrate .. //depot/projects/uart/i386/i386/machdep.c#18 integrate .. //depot/projects/uart/i386/i386/mem.c#3 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#17 integrate .. //depot/projects/uart/i386/i386/mptable_pci.c#3 integrate .. //depot/projects/uart/i386/i386/swtch.s#7 integrate .. //depot/projects/uart/i386/i386/sys_machdep.c#15 integrate .. //depot/projects/uart/i386/i386/trap.c#11 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_sysvec.c#6 integrate .. //depot/projects/uart/i386/include/_types.h#5 integrate .. //depot/projects/uart/i386/include/apicvar.h#7 integrate .. //depot/projects/uart/i386/include/clock.h#9 integrate .. //depot/projects/uart/i386/include/cpu.h#5 integrate .. //depot/projects/uart/i386/include/frame.h#5 integrate .. //depot/projects/uart/i386/include/param.h#5 integrate .. //depot/projects/uart/i386/include/pcb.h#5 integrate .. //depot/projects/uart/i386/include/pcpu.h#6 integrate .. //depot/projects/uart/i386/include/smp.h#7 integrate .. //depot/projects/uart/i386/isa/clock.c#12 integrate .. //depot/projects/uart/i386/isa/pcvt/pcvt_drv.c#7 integrate .. //depot/projects/uart/i386/linux/linux_sysvec.c#10 integrate .. //depot/projects/uart/i386/pci/pci_bus.c#10 integrate .. //depot/projects/uart/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/uart/ia64/conf/GENERIC#10 integrate .. //depot/projects/uart/ia64/ia64/elf_machdep.c#7 integrate .. //depot/projects/uart/ia64/ia64/genassym.c#8 integrate .. //depot/projects/uart/ia64/ia64/interrupt.c#12 integrate .. //depot/projects/uart/ia64/ia64/locore.S#4 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#23 integrate .. //depot/projects/uart/ia64/ia64/ssc.c#5 integrate .. //depot/projects/uart/ia64/include/_types.h#4 integrate .. //depot/projects/uart/ia64/include/cpu.h#10 integrate .. //depot/projects/uart/ia64/include/elf.h#3 integrate .. //depot/projects/uart/ia64/include/param.h#9 integrate .. //depot/projects/uart/isofs/cd9660/cd9660_node.c#7 integrate .. //depot/projects/uart/isofs/cd9660/cd9660_vnops.c#9 integrate .. //depot/projects/uart/kern/imgact_aout.c#8 integrate .. //depot/projects/uart/kern/imgact_elf.c#8 integrate .. //depot/projects/uart/kern/imgact_gzip.c#6 integrate .. //depot/projects/uart/kern/init_sysent.c#13 integrate .. //depot/projects/uart/kern/kern_alq.c#6 integrate .. //depot/projects/uart/kern/kern_clock.c#8 integrate .. //depot/projects/uart/kern/kern_conf.c#10 integrate .. //depot/projects/uart/kern/kern_descrip.c#19 integrate .. //depot/projects/uart/kern/kern_exit.c#9 integrate .. //depot/projects/uart/kern/kern_ktr.c#10 integrate .. //depot/projects/uart/kern/kern_ktrace.c#9 integrate .. //depot/projects/uart/kern/kern_lock.c#11 integrate .. //depot/projects/uart/kern/kern_malloc.c#11 integrate .. //depot/projects/uart/kern/kern_mbuf.c#5 integrate .. //depot/projects/uart/kern/kern_mutex.c#10 integrate .. //depot/projects/uart/kern/kern_proc.c#14 integrate .. //depot/projects/uart/kern/kern_resource.c#7 integrate .. //depot/projects/uart/kern/kern_rwlock.c#1 branch .. //depot/projects/uart/kern/kern_sig.c#20 integrate .. //depot/projects/uart/kern/kern_switch.c#10 integrate .. //depot/projects/uart/kern/kern_sx.c#6 integrate .. //depot/projects/uart/kern/kern_synch.c#11 integrate .. //depot/projects/uart/kern/kern_sysctl.c#7 integrate .. //depot/projects/uart/kern/kern_thr.c#10 integrate .. //depot/projects/uart/kern/link_elf.c#7 integrate .. //depot/projects/uart/kern/link_elf_obj.c#3 integrate .. //depot/projects/uart/kern/md5c.c#5 integrate .. //depot/projects/uart/kern/sched_ule.c#16 integrate .. //depot/projects/uart/kern/subr_bus.c#13 integrate .. //depot/projects/uart/kern/subr_disk.c#6 integrate .. //depot/projects/uart/kern/subr_firmware.c#1 branch .. //depot/projects/uart/kern/subr_kobj.c#5 integrate .. //depot/projects/uart/kern/subr_lock.c#1 branch .. //depot/projects/uart/kern/subr_prof.c#4 integrate .. //depot/projects/uart/kern/subr_sbuf.c#4 integrate .. //depot/projects/uart/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/uart/kern/subr_taskqueue.c#7 integrate .. //depot/projects/uart/kern/subr_turnstile.c#5 integrate .. //depot/projects/uart/kern/subr_witness.c#14 integrate .. //depot/projects/uart/kern/sys_generic.c#12 integrate .. //depot/projects/uart/kern/sys_pipe.c#18 integrate .. //depot/projects/uart/kern/sys_process.c#11 integrate .. //depot/projects/uart/kern/syscalls.c#13 integrate .. //depot/projects/uart/kern/syscalls.master#13 integrate .. //depot/projects/uart/kern/tty.c#11 integrate .. //depot/projects/uart/kern/tty_compat.c#4 integrate .. //depot/projects/uart/kern/tty_pts.c#1 branch .. //depot/projects/uart/kern/tty_pty.c#8 integrate .. //depot/projects/uart/kern/uipc_mqueue.c#2 integrate .. //depot/projects/uart/kern/uipc_sem.c#8 integrate .. //depot/projects/uart/kern/uipc_socket.c#14 integrate .. //depot/projects/uart/kern/uipc_usrreq.c#8 integrate .. //depot/projects/uart/kern/vfs_aio.c#11 integrate .. //depot/projects/uart/kern/vfs_bio.c#19 integrate .. //depot/projects/uart/kern/vfs_default.c#14 integrate .. //depot/projects/uart/kern/vfs_lookup.c#9 integrate .. //depot/projects/uart/kern/vfs_mount.c#16 integrate .. //depot/projects/uart/kern/vfs_subr.c#18 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#17 integrate .. //depot/projects/uart/libkern/fnmatch.c#4 integrate .. //depot/projects/uart/libkern/gets.c#2 integrate .. //depot/projects/uart/modules/Makefile#21 integrate .. //depot/projects/uart/modules/amr/Makefile#2 integrate .. //depot/projects/uart/modules/amr/amr_linux/Makefile#1 branch .. //depot/projects/uart/modules/bktr/bktr/Makefile#5 integrate .. //depot/projects/uart/modules/cardbus/Makefile#2 integrate .. //depot/projects/uart/modules/firmware/Makefile#1 branch .. //depot/projects/uart/modules/i2c/controllers/Makefile#3 integrate .. //depot/projects/uart/modules/i2c/controllers/amdsmb/Makefile#1 branch .. //depot/projects/uart/modules/i2c/controllers/nfsmb/Makefile#1 branch .. //depot/projects/uart/modules/linux/Makefile#5 integrate .. //depot/projects/uart/modules/nwfs/Makefile#4 integrate .. //depot/projects/uart/modules/smbfs/Makefile#4 integrate .. //depot/projects/uart/modules/svr4/Makefile#3 integrate .. //depot/projects/uart/modules/ufoma/Makefile#1 branch .. //depot/projects/uart/modules/xfs/Makefile#2 integrate .. //depot/projects/uart/net/bpf_filter.c#5 integrate .. //depot/projects/uart/net/bridgestp.c#4 integrate .. //depot/projects/uart/net/if.c#15 integrate .. //depot/projects/uart/net/if_arcsubr.c#6 integrate .. //depot/projects/uart/net/if_bridge.c#4 integrate .. //depot/projects/uart/net/if_bridgevar.h#4 integrate .. //depot/projects/uart/net/if_ef.c#6 integrate .. //depot/projects/uart/net/if_ethersubr.c#13 integrate .. //depot/projects/uart/net/if_fddisubr.c#7 integrate .. //depot/projects/uart/net/if_fwsubr.c#7 integrate .. //depot/projects/uart/net/if_gif.c#6 integrate .. //depot/projects/uart/net/if_gif.h#5 integrate .. //depot/projects/uart/net/if_gre.c#6 integrate .. //depot/projects/uart/net/if_iso88025subr.c#7 integrate .. //depot/projects/uart/net/if_media.c#4 integrate .. //depot/projects/uart/net/if_mib.c#6 integrate .. //depot/projects/uart/net/if_mib.h#3 integrate .. //depot/projects/uart/net/if_ppp.c#7 integrate .. //depot/projects/uart/net/if_vlan_var.h#7 integrate .. //depot/projects/uart/net80211/ieee80211.c#11 integrate .. //depot/projects/uart/net80211/ieee80211_input.c#14 integrate .. //depot/projects/uart/net80211/ieee80211_ioctl.c#14 integrate .. //depot/projects/uart/net80211/ieee80211_ioctl.h#8 integrate .. //depot/projects/uart/net80211/ieee80211_node.c#15 integrate .. //depot/projects/uart/net80211/ieee80211_output.c#14 integrate .. //depot/projects/uart/net80211/ieee80211_proto.c#10 integrate .. //depot/projects/uart/net80211/ieee80211_proto.h#9 integrate .. //depot/projects/uart/net80211/ieee80211_radiotap.h#5 integrate .. //depot/projects/uart/net80211/ieee80211_var.h#12 integrate .. //depot/projects/uart/netatm/atm_signal.c#3 integrate .. //depot/projects/uart/netatm/atm_sys.h#3 integrate .. //depot/projects/uart/netatm/ipatm/ipatm_vcm.c#7 integrate .. //depot/projects/uart/netatm/uni/unisig_encode.c#3 integrate .. //depot/projects/uart/netgraph/netflow/netflow.c#8 integrate .. //depot/projects/uart/netgraph/netflow/ng_netflow.c#6 integrate .. //depot/projects/uart/netgraph/netflow/ng_netflow.h#4 integrate .. //depot/projects/uart/netgraph/netgraph.h#9 integrate .. //depot/projects/uart/netgraph/ng_base.c#11 integrate .. //depot/projects/uart/netgraph/ng_ether.c#7 integrate .. //depot/projects/uart/netgraph/ng_frame_relay.c#4 integrate .. //depot/projects/uart/netgraph/ng_lmi.c#6 integrate .. //depot/projects/uart/netgraph/ng_message.h#6 integrate .. //depot/projects/uart/netgraph/ng_parse.c#6 integrate .. //depot/projects/uart/netgraph/ng_pppoe.c#9 integrate .. //depot/projects/uart/netgraph/ng_pppoe.h#5 integrate .. //depot/projects/uart/netgraph/ng_source.c#7 integrate .. //depot/projects/uart/netgraph/ng_source.h#6 integrate .. //depot/projects/uart/netinet/if_ether.c#10 integrate .. //depot/projects/uart/netinet/in.c#10 integrate .. //depot/projects/uart/netinet/in.h#9 integrate .. //depot/projects/uart/netinet/in_gif.c#7 integrate .. //depot/projects/uart/netinet/in_pcb.c#9 integrate .. //depot/projects/uart/netinet/in_proto.c#9 integrate .. //depot/projects/uart/netinet/in_var.h#6 integrate .. //depot/projects/uart/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/uart/netinet/ip_fw2.c#17 integrate .. //depot/projects/uart/netinet/ip_gre.c#5 integrate .. //depot/projects/uart/netinet/ip_gre.h#3 integrate .. //depot/projects/uart/netinet/ip_icmp.c#9 integrate .. //depot/projects/uart/netinet/ip_input.c#13 integrate .. //depot/projects/uart/netinet/ip_mroute.c#10 integrate .. //depot/projects/uart/netinet/ip_output.c#14 integrate .. //depot/projects/uart/netinet/tcp_input.c#14 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#12 integrate .. //depot/projects/uart/netinet/udp_usrreq.c#13 integrate .. //depot/projects/uart/netinet6/in6_cksum.c#6 integrate .. //depot/projects/uart/netinet6/in6_gif.c#6 integrate .. //depot/projects/uart/netinet6/ip6_input.c#10 integrate .. //depot/projects/uart/netinet6/ip6_mroute.c#7 integrate .. //depot/projects/uart/netinet6/ip6_output.c#11 integrate .. //depot/projects/uart/netinet6/ipcomp_input.c#4 integrate .. //depot/projects/uart/netipsec/keysock.c#7 integrate .. //depot/projects/uart/netipsec/keysock.h#3 integrate .. //depot/projects/uart/netipx/ipx_input.c#7 integrate .. //depot/projects/uart/netipx/spx_usrreq.c#9 integrate .. //depot/projects/uart/netkey/keysock.c#8 integrate .. //depot/projects/uart/netkey/keysock.h#4 integrate .. //depot/projects/uart/netncp/ncp_conn.c#5 integrate .. //depot/projects/uart/netsmb/smb_subr.c#4 integrate .. //depot/projects/uart/nfs4client/nfs4_vfsops.c#7 integrate .. //depot/projects/uart/nfsclient/nfs_lock.c#6 integrate .. //depot/projects/uart/nfsclient/nfs_node.c#10 integrate .. //depot/projects/uart/nfsclient/nfs_socket.c#9 integrate .. //depot/projects/uart/nfsclient/nfs_vfsops.c#11 integrate .. //depot/projects/uart/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/uart/nfsserver/nfs.h#6 integrate .. //depot/projects/uart/nfsserver/nfs_serv.c#8 integrate .. //depot/projects/uart/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/uart/nfsserver/nfs_syscalls.c#8 integrate .. //depot/projects/uart/pc98/cbus/clock.c#3 integrate .. //depot/projects/uart/pc98/cbus/sio.c#3 integrate .. //depot/projects/uart/pc98/conf/GENERIC#12 integrate .. //depot/projects/uart/pc98/conf/NOTES#13 integrate .. //depot/projects/uart/pc98/include/_types.h#2 integrate .. //depot/projects/uart/pc98/include/param.h#3 integrate .. //depot/projects/uart/pc98/pc98/machdep.c#4 integrate .. //depot/projects/uart/pccard/cardinfo.h#3 integrate .. //depot/projects/uart/pccard/driver.h#2 delete .. //depot/projects/uart/pccard/i82365.h#5 delete .. //depot/projects/uart/pccard/meciareg.h#2 delete .. //depot/projects/uart/pccard/pccard_nbk.h#3 delete .. //depot/projects/uart/pccard/pcic_pci.h#3 delete .. //depot/projects/uart/pccard/pcicvar.h#3 delete .. //depot/projects/uart/pccard/slot.h#4 delete .. //depot/projects/uart/pci/agp.c#4 integrate .. //depot/projects/uart/pci/agp_ali.c#6 integrate .. //depot/projects/uart/pci/agp_amd.c#5 integrate .. //depot/projects/uart/pci/agp_amd64.c#5 integrate .. //depot/projects/uart/pci/agp_ati.c#2 integrate .. //depot/projects/uart/pci/agp_i810.c#7 integrate .. //depot/projects/uart/pci/agp_intel.c#8 integrate .. //depot/projects/uart/pci/agp_nvidia.c#6 integrate .. //depot/projects/uart/pci/agp_sis.c#6 integrate .. //depot/projects/uart/pci/agp_via.c#7 integrate .. //depot/projects/uart/pci/agpreg.h#5 integrate .. //depot/projects/uart/pci/agpvar.h#2 integrate .. //depot/projects/uart/pci/amdpm.c#9 integrate .. //depot/projects/uart/pci/amdsmb.c#1 branch .. //depot/projects/uart/pci/if_de.c#8 integrate .. //depot/projects/uart/pci/if_devar.h#5 integrate .. //depot/projects/uart/pci/if_sk.c#16 integrate .. //depot/projects/uart/pci/if_skreg.h#10 integrate .. //depot/projects/uart/pci/if_xl.c#17 integrate .. //depot/projects/uart/pci/nfsmb.c#1 branch .. //depot/projects/uart/powerpc/conf/GENERIC#8 integrate .. //depot/projects/uart/powerpc/conf/Makefile#1 branch .. //depot/projects/uart/powerpc/conf/NOTES#1 branch .. //depot/projects/uart/powerpc/include/clock.h#3 integrate .. //depot/projects/uart/powerpc/include/cpu.h#6 integrate .. //depot/projects/uart/powerpc/include/frame.h#4 integrate .. //depot/projects/uart/powerpc/include/profile.h#5 integrate .. //depot/projects/uart/powerpc/ofw/ofw_pcib_pci.c#4 integrate .. //depot/projects/uart/powerpc/powerpc/clock.c#6 integrate .. //depot/projects/uart/powerpc/powerpc/db_trace.c#7 integrate .. //depot/projects/uart/powerpc/powerpc/elf_machdep.c#5 integrate .. //depot/projects/uart/powerpc/powerpc/genassym.c#4 integrate .. //depot/projects/uart/powerpc/powerpc/interrupt.c#3 integrate .. //depot/projects/uart/powerpc/powerpc/machdep.c#12 integrate .. //depot/projects/uart/powerpc/powerpc/trap_subr.S#5 integrate .. //depot/projects/uart/rpc/rpcclnt.c#5 integrate .. //depot/projects/uart/security/mac_biba/mac_biba.c#9 integrate .. //depot/projects/uart/security/mac_bsdextended/mac_bsdextended.c#7 integrate .. //depot/projects/uart/sparc64/central/central.c#6 integrate .. //depot/projects/uart/sparc64/conf/GENERIC#15 integrate .. //depot/projects/uart/sparc64/conf/NOTES#10 integrate .. //depot/projects/uart/sparc64/ebus/ebus.c#9 integrate .. //depot/projects/uart/sparc64/fhc/fhc_central.c#6 integrate .. //depot/projects/uart/sparc64/fhc/fhc_nexus.c#6 integrate .. //depot/projects/uart/sparc64/include/cpu.h#4 integrate .. //depot/projects/uart/sparc64/include/frame.h#3 integrate .. //depot/projects/uart/sparc64/include/in_cksum.h#3 integrate .. //depot/projects/uart/sparc64/include/trap.h#2 integrate .. //depot/projects/uart/sparc64/include/utrap.h#2 integrate .. //depot/projects/uart/sparc64/pci/apb.c#7 integrate .. //depot/projects/uart/sparc64/pci/ofw_pcib.c#5 integrate .. //depot/projects/uart/sparc64/pci/ofw_pcibus.c#7 integrate .. //depot/projects/uart/sparc64/pci/psycho.c#9 integrate .. //depot/projects/uart/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/uart/sparc64/sbus/sbus.c#9 integrate .. //depot/projects/uart/sparc64/sparc64/elf_machdep.c#5 integrate .. //depot/projects/uart/sparc64/sparc64/exception.S#5 integrate .. //depot/projects/uart/sparc64/sparc64/identcpu.c#5 integrate .. //depot/projects/uart/sparc64/sparc64/pmap.c#19 integrate .. //depot/projects/uart/sparc64/sparc64/tick.c#6 integrate .. //depot/projects/uart/sys/_lock.h#4 integrate .. //depot/projects/uart/sys/_rwlock.h#1 branch .. //depot/projects/uart/sys/_timeval.h#2 integrate .. //depot/projects/uart/sys/ata.h#8 integrate .. //depot/projects/uart/sys/cdefs.h#11 integrate .. //depot/projects/uart/sys/copyright.h#4 integrate .. //depot/projects/uart/sys/elf32.h#2 integrate .. //depot/projects/uart/sys/elf64.h#2 integrate .. //depot/projects/uart/sys/elf_common.h#3 integrate .. //depot/projects/uart/sys/elf_generic.h#2 integrate .. //depot/projects/uart/sys/firmware.h#1 branch .. //depot/projects/uart/sys/imgact_elf.h#3 integrate .. //depot/projects/uart/sys/ioctl.h#4 integrate .. //depot/projects/uart/sys/ioctl_compat.h#4 integrate .. //depot/projects/uart/sys/ktr.h#9 integrate .. //depot/projects/uart/sys/ktrace.h#5 integrate .. //depot/projects/uart/sys/linker.h#3 integrate .. //depot/projects/uart/sys/lock.h#7 integrate .. //depot/projects/uart/sys/malloc.h#7 integrate .. //depot/projects/uart/sys/mbuf.h#9 integrate .. //depot/projects/uart/sys/md5.h#4 integrate .. //depot/projects/uart/sys/mount.h#12 integrate .. //depot/projects/uart/sys/mutex.h#11 integrate .. //depot/projects/uart/sys/param.h#21 integrate .. //depot/projects/uart/sys/proc.h#16 integrate .. //depot/projects/uart/sys/resourcevar.h#5 integrate .. //depot/projects/uart/sys/rwlock.h#1 branch .. //depot/projects/uart/sys/select.h#3 integrate .. //depot/projects/uart/sys/socketvar.h#9 integrate .. //depot/projects/uart/sys/syscall.h#12 integrate .. //depot/projects/uart/sys/syscall.mk#12 integrate .. //depot/projects/uart/sys/sysproto.h#12 integrate .. //depot/projects/uart/sys/systm.h#14 integrate .. //depot/projects/uart/sys/taskqueue.h#5 integrate .. //depot/projects/uart/sys/tree.h#5 integrate .. //depot/projects/uart/sys/tty.h#4 integrate .. //depot/projects/uart/sys/ttychars.h#3 integrate .. //depot/projects/uart/sys/ttycom.h#3 integrate .. //depot/projects/uart/sys/ttydev.h#3 integrate .. //depot/projects/uart/sys/turnstile.h#3 integrate .. //depot/projects/uart/sys/user.h#7 integrate .. //depot/projects/uart/sys/vnode.h#14 integrate .. //depot/projects/uart/tools/fw_stub.awk#1 branch .. //depot/projects/uart/ufs/ffs/ffs_snapshot.c#10 integrate .. //depot/projects/uart/ufs/ffs/ffs_softdep.c#14 integrate .. //depot/projects/uart/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/uart/ufs/ufs/ufs_quota.c#7 integrate .. //depot/projects/uart/vm/memguard.c#3 integrate .. //depot/projects/uart/vm/memguard.h#3 integrate .. //depot/projects/uart/vm/swap_pager.c#20 integrate .. //depot/projects/uart/vm/uma_core.c#20 integrate .. //depot/projects/uart/vm/vm_contig.c#13 integrate .. //depot/projects/uart/vm/vm_extern.h#7 integrate .. //depot/projects/uart/vm/vm_fault.c#12 integrate .. //depot/projects/uart/vm/vm_glue.c#13 integrate .. //depot/projects/uart/vm/vm_map.c#18 integrate .. //depot/projects/uart/vm/vm_object.c#18 integrate .. //depot/projects/uart/vm/vm_object.h#7 integrate .. //depot/projects/uart/vm/vm_page.c#16 integrate .. //depot/projects/uart/vm/vm_page.h#8 integrate .. //depot/projects/uart/vm/vm_pageout.c#17 integrate .. //depot/projects/uart/vm/vm_pageq.c#6 integrate .. //depot/projects/uart/vm/vm_zeroidle.c#8 integrate Differences ... ==== //depot/projects/uart/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.33 2005/03/08 00:09:41 grog Exp $ +# $FreeBSD: src/sys/Makefile,v 1.34 2006/01/10 20:58:27 rees Exp $ # The boot loader .if !defined(NO_BOOT) @@ -11,7 +11,8 @@ CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \ isofs kern libkern modules net netatalk netatm netgraph \ netinet netinet6 netipx netkey netnatm netncp netsmb nfs \ - pccard pci posix4 sys ufs vm ${ARCHDIR} + nfsclient nfs4client rpc pccard pci posix4 sys ufs vm \ + ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/uart/alpha/alpha/clock.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.41 2005/12/14 21:42:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.42 2005/12/22 22:16:04 jhb Exp $"); #include "opt_clock.h" @@ -157,7 +157,7 @@ static u_int32_t max_cycles_per_tick; static u_int32_t last_time; -static void handleclock(void* arg); +static void handleclock(int usermode, uintfptr_t pc); static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, u_int32_t *timer); static void set_timer_freq(u_int freq, int intr_freq); @@ -230,8 +230,7 @@ */ /* - * Start the real-time and statistics clocks. Leave stathz 0 since there - * are no other timers available. + * Start the real-time and statistics clocks. */ void cpu_initclocks() @@ -275,7 +274,9 @@ */ if (hwrpb->rpb_type != ST_DEC_21000) { tc_init(&i8254_timecounter); - } + platform.clockintr = handleclock; + } else + platform.clockintr = hardclock; if (ncpus == 1) { alpha_timecounter.tc_frequency = freq; @@ -283,7 +284,7 @@ } stathz = hz / 8; - platform.clockintr = (void (*)(void *)) handleclock; + profhz = hz; /* * Get the clock started. @@ -424,27 +425,23 @@ } static void -handleclock(void *arg) +handleclock(int usermode, uintfptr_t pc) { - /* - * XXX: TurboLaser doesn't have an i8254 counter. - * XXX: A replacement is needed, and another method - * XXX: of determining this would be nice. - */ - if (hwrpb->rpb_type != ST_DEC_21000) { - if (timecounter->tc_get_timecount == i8254_get_timecount) { - mtx_lock_spin(&clock_lock); - if (i8254_ticked) - i8254_ticked = 0; - else { - i8254_offset += timer0_max_count; - i8254_lastcount = 0; - } - clkintr_pending = 0; - mtx_unlock_spin(&clock_lock); + + KASSERT(hwrpb->rpb_type != ST_DEC_21000, + ("custom clock handler called on TurboLaser")); + if (timecounter->tc_get_timecount == i8254_get_timecount) { + mtx_lock_spin(&clock_lock); + if (i8254_ticked) + i8254_ticked = 0; + else { + i8254_offset += timer0_max_count; + i8254_lastcount = 0; } + clkintr_pending = 0; + mtx_unlock_spin(&clock_lock); } - hardclock(arg); + hardclock(usermode, pc); } void ==== //depot/projects/uart/alpha/alpha/cpuconf.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.18 2005/01/05 20:05:48 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.19 2005/12/31 14:39:18 netchild Exp $"); #include "opt_cpu.h" @@ -171,6 +171,13 @@ }; int napi_cpuinit = (sizeof(api_cpuinit) / sizeof(api_cpuinit[0])); +void setPQL2(int *const size, int *const ways); + +void +setPQL2(int *const size, int *const ways) +{ + return; +} void platform_not_configured(int cputype) ==== //depot/projects/uart/alpha/alpha/elf_machdep.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.19 2004/08/11 02:35:04 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.21 2005/12/26 21:23:56 sobomax Exp $"); #include #include @@ -85,6 +85,7 @@ "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -99,6 +100,7 @@ "/usr/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -121,7 +123,7 @@ Elf_Addr *where; Elf_Addr addr; Elf_Addr addend; - Elf_Word rtype, symidx; + Elf_Size rtype, symidx; const Elf_Rel *rel; const Elf_Rela *rela; ==== //depot/projects/uart/alpha/alpha/interrupt.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.88 2005/10/25 19:48:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.89 2005/12/22 22:16:04 jhb Exp $"); #include #include @@ -489,23 +489,21 @@ */ if (PCPU_GET(cpuid) == 0) { #endif - (*platform.clockintr)(framep); - /* divide hz (1024) by 8 to get stathz (128) */ - if ((++schedclk2 & 0x7) == 0) { - if (profprocs != 0) - profclock((struct clockframe *)framep); - statclock((struct clockframe *)framep); - } + (*platform.clockintr)(TRAPF_USERMODE(framep), + TRAPF_PC(framep)); + + /* Bump stathz divider. */ + schedclk2++; #ifdef SMP - } else { - hardclock_process((struct clockframe *)framep); - if ((schedclk2 & 0x7) == 0) { - if (profprocs != 0) - profclock((struct clockframe *)framep); - statclock((struct clockframe *)framep); - } - } + } else + hardclock_cpu(TRAPF_USERMODE(framep)); #endif + if (profprocs != 0) + profclock(TRAPF_USERMODE(framep), TRAPF_PC(framep)); + + /* divide hz (1024) by 8 to get stathz (128) */ + if ((schedclk2 & 0x7) == 0) + statclock(TRAPF_USERMODE(framep)); critical_exit(); } } ==== //depot/projects/uart/alpha/conf/GENERIC#12 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.191 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.192 2006/01/10 09:19:07 phk Exp $ cpu EV4 cpu EV5 @@ -61,6 +61,7 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] +options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI ==== //depot/projects/uart/alpha/include/_types.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.6 2005/03/02 21:33:20 joerg Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.8 2006/01/09 06:05:55 imp Exp $ */ #ifndef _MACHINE__TYPES_H_ ==== //depot/projects/uart/alpha/include/cpu.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.42 2005/01/05 20:05:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.43 2005/12/22 22:16:04 jhb Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /*- @@ -48,21 +48,10 @@ #include -/* - * Arguments to hardclock and gatherstats encapsulate the previous - * machine state in an opaque clockframe. One the Alpha, we use - * what we push on an interrupt (a trapframe). - */ -struct clockframe { - struct trapframe cf_tf; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 29 07:15:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 957D416A423; Sun, 29 Jan 2006 07:15:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EFAE16A420 for ; Sun, 29 Jan 2006 07:15:33 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE06843D48 for ; Sun, 29 Jan 2006 07:15:32 +0000 (GMT) (envelope-from alc@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 k0T7FWBo031496 for ; Sun, 29 Jan 2006 07:15:32 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0T7FWDQ031493 for perforce@freebsd.org; Sun, 29 Jan 2006 07:15:32 GMT (envelope-from alc@freebsd.org) Date: Sun, 29 Jan 2006 07:15:32 GMT Message-Id: <200601290715.k0T7FWDQ031493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90607 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 07:15:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=90607 Change 90607 by alc@alc_home on 2006/01/29 07:14:31 Remove an unnecessary assertion. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_pageq.c#14 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_pageq.c#14 (text+ko) ==== @@ -78,7 +78,6 @@ if (queue != PQ_NONE) { vpq = &vm_page_queues[queue]; - KASSERT((m->queue - m->buddyq) != PQ_BUDDY,("vm_pageq_requeue: page is un buddy allocator")); TAILQ_REMOVE(&vpq->pl, m, pageq); TAILQ_INSERT_TAIL(&vpq->pl, m, pageq); } From owner-p4-projects@FreeBSD.ORG Sun Jan 29 07:39:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA8B916A423; Sun, 29 Jan 2006 07:39:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6EDE416A420 for ; Sun, 29 Jan 2006 07:39:16 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13F8443D45 for ; Sun, 29 Jan 2006 07:39:16 +0000 (GMT) (envelope-from marcel@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 k0T7dF2Z032584 for ; Sun, 29 Jan 2006 07:39:15 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0T7d3nN032579 for perforce@freebsd.org; Sun, 29 Jan 2006 07:39:03 GMT (envelope-from marcel@freebsd.org) Date: Sun, 29 Jan 2006 07:39:03 GMT Message-Id: <200601290739.k0T7d3nN032579@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 90608 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 07:39:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=90608 Change 90608 by marcel@marcel_nfs on 2006/01/29 07:38:04 IFC @90604 Affected files ... .. //depot/projects/tty/COPYRIGHT#4 integrate .. //depot/projects/tty/LOCKS#2 integrate .. //depot/projects/tty/MAINTAINERS#16 integrate .. //depot/projects/tty/Makefile.inc1#26 integrate .. //depot/projects/tty/ObsoleteFiles.inc#3 integrate .. //depot/projects/tty/UPDATING#26 integrate .. //depot/projects/tty/bin/setfacl/setfacl.1#6 integrate .. //depot/projects/tty/bin/sh/builtins.def#4 integrate .. //depot/projects/tty/bin/sh/eval.c#5 integrate .. //depot/projects/tty/bin/sh/eval.h#3 integrate .. //depot/projects/tty/bin/sh/jobs.c#8 integrate .. //depot/projects/tty/bin/sh/output.c#4 integrate .. //depot/projects/tty/bin/sh/sh.1#14 integrate .. //depot/projects/tty/bin/sh/trap.c#4 integrate .. //depot/projects/tty/contrib/bc/bc/main.c#4 integrate .. //depot/projects/tty/contrib/bind9/CHANGES#4 integrate .. //depot/projects/tty/contrib/bind9/FAQ#3 integrate .. //depot/projects/tty/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/tty/contrib/bind9/FREEBSD-Upgrade#5 integrate .. //depot/projects/tty/contrib/bind9/FREEBSD-Xlist#3 integrate .. //depot/projects/tty/contrib/bind9/README#3 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/control.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/tty/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/tty/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/tty/contrib/bind9/config.threads.in#1 branch .. //depot/projects/tty/contrib/bind9/configure.in#3 integrate .. //depot/projects/tty/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/tty/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/isc.color.gif#2 delete .. //depot/projects/tty/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete .. //depot/projects/tty/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete .. //depot/projects/tty/contrib/bind9/doc/arm/validate.sh.in#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/tty/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/tty/contrib/bind9/doc/rfc/rfc3757.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/rfc/rfc3901.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/rfc/rfc4025.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/rfc/rfc4033.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/rfc/rfc4034.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/rfc/rfc4035.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/rfc/rfc4074.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/rfc/rfc4159.txt#1 branch .. //depot/projects/tty/contrib/bind9/lib/bind/Makefile.in#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch .. //depot/projects/tty/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/port_after.h.in#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind9/getaddresses.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rdata.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch .. //depot/projects/tty/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/print.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/strtoul.c#1 branch .. //depot/projects/tty/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/tty/contrib/bind9/version#4 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.c#7 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII.c#8 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/config.c#5 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/main.c#9 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/snmpd.config#5 integrate .. //depot/projects/tty/contrib/cpio/doc/cpio.1#2 integrate .. //depot/projects/tty/contrib/cpio/doc/cpio.texi#2 integrate .. //depot/projects/tty/contrib/cpio/src/copyin.c#2 integrate .. //depot/projects/tty/contrib/cpio/src/copyout.c#2 integrate .. //depot/projects/tty/contrib/cpio/src/copypass.c#2 integrate .. //depot/projects/tty/contrib/cpio/src/extern.h#2 integrate .. //depot/projects/tty/contrib/cpio/src/global.c#2 integrate .. //depot/projects/tty/contrib/cpio/src/main.c#2 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-common#10 integrate .. //depot/projects/tty/contrib/groff/tmac/groff_mdoc.man#8 integrate .. //depot/projects/tty/contrib/ipfilter/BSD/Makefile#4 integrate .. //depot/projects/tty/contrib/ipfilter/BSD/Makefile.ipsend#3 integrate .. //depot/projects/tty/contrib/ipfilter/BSD/kupgrade#5 integrate .. //depot/projects/tty/contrib/ipfilter/HISTORY#5 integrate .. //depot/projects/tty/contrib/ipfilter/Makefile#6 integrate .. //depot/projects/tty/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipf.h#4 integrate .. //depot/projects/tty/contrib/ipfilter/iplang/iplang_l.l#4 integrate .. //depot/projects/tty/contrib/ipfilter/iplang/iplang_y.y#4 integrate .. //depot/projects/tty/contrib/ipfilter/ipmon.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsd/ipsd.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsd/ipsdr.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/arp.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ip.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipresend.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipsend.c#5 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipsopt.c#5 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/iptest.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/iptests.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/larp.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/lsock.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/resend.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/sbpf.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/sdlpi.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/slinux.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/snit.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/sock.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/tcpip.h#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipt.h#3 integrate .. //depot/projects/tty/contrib/ipfilter/kmem.h#3 integrate .. //depot/projects/tty/contrib/ipfilter/l4check/http.ok#3 integrate .. //depot/projects/tty/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/addipopt.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/addkeep.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/binprint.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/buildopts.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/checkrev.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/count4bits.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/count6bits.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/debug.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/extras.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/facpri.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/fill6bits.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/flags.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/genmask.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/getline.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/getnattype.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/getproto.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/hostmask.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/hostnum.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/inet_addr.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/initparse.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/ionames.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/ipft_ef.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/ipft_hx.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/ipft_pc.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/ipft_sn.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/ipft_td.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/ipoptsec.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/kmem.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/kmem.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/load_hash.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/load_hashnode.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/load_pool.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/load_poolnode.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/loglevel.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/make_range.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/nat_setgroupmap.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/natparse.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/optname.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/optprintv6.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/optvalue.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/parse.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/portname.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/portnum.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/ports.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/print_toif.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printactivenat.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printaps.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printbuf.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printfraginfo.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printhostmap.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printhostmask.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printifname.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printip.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printmask.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printnat.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printpacket.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printportcmp.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printproto.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printstate.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/lib/ratoi.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/ratoui.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/remove_hash.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/remove_hashnode.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/remove_pool.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/remove_poolnode.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/tcp_flags.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/tcpflags.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/tcpoptnames.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/to_interface.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/v6ionames.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/v6optvalue.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/verbose.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipf.5#5 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipftest.1#4 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipmon.8#6 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipnat.5#5 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipnat.8#4 integrate .. //depot/projects/tty/contrib/ipfilter/mlfk_rule.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/opts.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/perl/ipf-mrtg.pl#3 integrate .. //depot/projects/tty/contrib/ipfilter/perl/logfilter.pl#3 integrate .. //depot/projects/tty/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/radix_ipf.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.1#3 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.10#3 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.11#3 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.12#3 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.13#3 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.2#3 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.3#3 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.4#3 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.5#3 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.6#3 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.7#3 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.8#3 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.9#3 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.sr#3 integrate .. //depot/projects/tty/contrib/ipfilter/samples/ipfilter-pb.gif#3 integrate .. //depot/projects/tty/contrib/ipfilter/samples/proxy.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/samples/relay.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/snoop.h#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/Makefile#5 integrate .. //depot/projects/tty/contrib/ipfilter/test/dotest#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/bpf1#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/f13#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/f17#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/f18#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/f19#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/f7#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/f9#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i1#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i11#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i12#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i14#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i16#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/i17#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/i18#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/i19#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/i2#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i20#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/i21#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/i4#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i6#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i7#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i8#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i9#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/in1#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/in2#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/in5#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/in6#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/n1#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/n11#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/n13#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/n14#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/n2#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/n3#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/n4#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/n5#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/n6#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/n7#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/p1#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/p2#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/p3#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/f13#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/f17#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/f18#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/f19#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/f7#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/f9#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/n13#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/n14#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/ni17#1 branch .. //depot/projects/tty/contrib/ipfilter/test/itest#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/natipftest#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/bpf1#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/f13#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/f18#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/f19#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/f7#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i1#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i11#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i12#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i14#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i16#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/i17#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/i18#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/i19#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/i2#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i20#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/i21#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/i4#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i6#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i7#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i8#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i9#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/in1#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/in2#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/in5#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/in6#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/n13#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/n14#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni17.nat#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/p2.ipf#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/vfycksum.pl#3 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipf.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipf_y.y#3 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipfcomp.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipftest.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipmon.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipnat.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipsyncm.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipsyncs.c#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-bpf.c#7 integrate .. //depot/projects/tty/contrib/pf/authpf/authpf.c#4 integrate .. //depot/projects/tty/contrib/texinfo/util/texindex.c#5 integrate .. //depot/projects/tty/contrib/traceroute/traceroute.c#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/gssapi_locl.h#4 integrate .. //depot/projects/tty/crypto/openssh/sshd.c#8 integrate .. //depot/projects/tty/etc/Makefile#16 integrate .. //depot/projects/tty/etc/defaults/Makefile#5 integrate .. //depot/projects/tty/etc/defaults/periodic.conf#6 integrate .. //depot/projects/tty/etc/defaults/rc.conf#17 integrate .. //depot/projects/tty/etc/devd.conf#17 integrate .. //depot/projects/tty/etc/gettytab#4 integrate .. //depot/projects/tty/etc/gss/Makefile#1 branch .. //depot/projects/tty/etc/gss/mech#1 branch .. //depot/projects/tty/etc/gss/qop#1 branch .. //depot/projects/tty/etc/mtree/BSD.include.dist#17 integrate .. //depot/projects/tty/etc/mtree/BSD.local.dist#12 integrate .. //depot/projects/tty/etc/mtree/BSD.root.dist#11 integrate .. //depot/projects/tty/etc/mtree/BSD.x11.dist#2 integrate .. //depot/projects/tty/etc/periodic/daily/406.status-gmirror#1 branch .. //depot/projects/tty/etc/periodic/daily/Makefile#4 integrate .. //depot/projects/tty/etc/pf.conf#3 integrate .. //depot/projects/tty/etc/portsnap.conf#3 integrate .. //depot/projects/tty/etc/rc#7 integrate .. //depot/projects/tty/etc/rc.d/Makefile#13 integrate .. //depot/projects/tty/etc/rc.d/NETWORKING#7 integrate .. //depot/projects/tty/etc/rc.d/abi#5 integrate .. //depot/projects/tty/etc/rc.d/addswap#4 integrate .. //depot/projects/tty/etc/rc.d/amd#4 integrate .. //depot/projects/tty/etc/rc.d/cleanvar#9 integrate .. //depot/projects/tty/etc/rc.d/cleartmp#5 integrate .. //depot/projects/tty/etc/rc.d/devfs#7 integrate .. //depot/projects/tty/etc/rc.d/dumpon#8 integrate .. //depot/projects/tty/etc/rc.d/ftpd#1 branch .. //depot/projects/tty/etc/rc.d/initrandom#5 integrate .. //depot/projects/tty/etc/rc.d/ipsec#7 integrate .. //depot/projects/tty/etc/rc.d/ldconfig#7 integrate .. //depot/projects/tty/etc/rc.d/localpkg#5 integrate .. //depot/projects/tty/etc/rc.d/mixer#4 integrate .. //depot/projects/tty/etc/rc.d/mountcritremote#7 integrate .. //depot/projects/tty/etc/rc.d/newsyslog#4 integrate .. //depot/projects/tty/etc/rc.d/ntpd#5 integrate .. //depot/projects/tty/etc/rc.d/ntpdate#6 integrate .. //depot/projects/tty/etc/rc.d/power_profile#5 integrate .. //depot/projects/tty/etc/rc.d/rcconf.sh#4 delete .. //depot/projects/tty/etc/rc.d/resolv#4 integrate .. //depot/projects/tty/etc/rc.d/root#4 integrate .. //depot/projects/tty/etc/rc.d/syscons#5 integrate .. //depot/projects/tty/etc/rc.d/syslogd#4 integrate .. //depot/projects/tty/etc/rc.d/tmp#4 integrate .. //depot/projects/tty/etc/rc.d/usbd#4 delete .. //depot/projects/tty/etc/rc.initdiskless#5 integrate .. //depot/projects/tty/etc/rc.shutdown#5 integrate .. //depot/projects/tty/etc/rc.subr#11 integrate .. //depot/projects/tty/etc/services#8 integrate .. //depot/projects/tty/etc/snmpd.config#2 integrate .. //depot/projects/tty/etc/usbd.conf#4 delete .. //depot/projects/tty/games/fortune/datfiles/fortunes#20 integrate .. //depot/projects/tty/games/fortune/datfiles/limerick#6 integrate .. //depot/projects/tty/gnu/usr.bin/cc/cc_int/Makefile#7 integrate .. //depot/projects/tty/gnu/usr.bin/cvs/cvs/Makefile#7 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/main.c#6 integrate .. //depot/projects/tty/gnu/usr.bin/grep/grep.1#6 integrate .. //depot/projects/tty/gnu/usr.bin/groff/tmac/mdoc.local#12 integrate .. //depot/projects/tty/gnu/usr.bin/man/man/man.c#3 integrate .. //depot/projects/tty/gnu/usr.bin/man/man/man.man#5 integrate .. //depot/projects/tty/include/Makefile#21 integrate .. //depot/projects/tty/include/dlfcn.h#3 integrate .. //depot/projects/tty/include/gssapi.h#1 branch .. //depot/projects/tty/include/gssapi/Makefile#1 branch .. //depot/projects/tty/include/gssapi/gssapi.h#1 branch .. //depot/projects/tty/include/nl_types.h#3 integrate .. //depot/projects/tty/include/printf.h#1 branch .. //depot/projects/tty/include/rpcsvc/yp_prot.h#3 integrate .. //depot/projects/tty/include/stdio.h#4 integrate .. //depot/projects/tty/include/stdlib.h#7 integrate .. //depot/projects/tty/include/unistd.h#8 integrate .. //depot/projects/tty/kerberos5/lib/libgssapi/Makefile#5 integrate .. //depot/projects/tty/lib/Makefile#20 integrate .. //depot/projects/tty/lib/bind/bind/config.h#3 integrate .. //depot/projects/tty/lib/bind/bind/port_after.h#2 integrate .. //depot/projects/tty/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/tty/lib/bind/config.h#4 integrate .. //depot/projects/tty/lib/bind/isc/isc/platform.h#3 integrate .. //depot/projects/tty/lib/bind/lwres/lwres/platform.h#2 integrate .. //depot/projects/tty/lib/libarchive/Makefile#9 integrate .. //depot/projects/tty/lib/libarchive/archive.h.in#5 integrate .. //depot/projects/tty/lib/libarchive/archive_read.c#7 integrate .. //depot/projects/tty/lib/libarchive/archive_read_open_fd.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_tp.c#1 branch .. //depot/projects/tty/lib/libarchive/libarchive-formats.5#8 integrate .. //depot/projects/tty/lib/libarchive/tar.5#6 integrate .. //depot/projects/tty/lib/libc/Makefile#9 integrate .. //depot/projects/tty/lib/libc/gen/Makefile.inc#14 integrate .. //depot/projects/tty/lib/libc/gen/__xuname.c#2 integrate .. //depot/projects/tty/lib/libc/gen/dlfcn.c#5 integrate .. //depot/projects/tty/lib/libc/gen/getosreldate.3#3 integrate .. //depot/projects/tty/lib/libc/gen/getosreldate.c#3 integrate .. //depot/projects/tty/lib/libc/gen/getttyent.c#3 integrate .. //depot/projects/tty/lib/libc/gen/nlist.c#3 integrate .. //depot/projects/tty/lib/libc/gen/uname.3#3 integrate .. //depot/projects/tty/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/tty/lib/libc/gen/valloc.c#2 integrate .. //depot/projects/tty/lib/libc/gmon/gmon.c#6 integrate .. //depot/projects/tty/lib/libc/include/libc_private.h#6 integrate .. //depot/projects/tty/lib/libc/rpc/netconfig.5#2 integrate .. //depot/projects/tty/lib/libc/stdio/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libc/stdio/fread.c#2 integrate .. //depot/projects/tty/lib/libc/stdio/local.h#5 integrate .. //depot/projects/tty/lib/libc/stdio/vfprintf.c#9 integrate .. //depot/projects/tty/lib/libc/stdio/vfscanf.c#6 integrate .. //depot/projects/tty/lib/libc/stdio/xprintf.c#1 branch .. //depot/projects/tty/lib/libc/stdio/xprintf_errno.c#1 branch .. //depot/projects/tty/lib/libc/stdio/xprintf_float.c#1 branch .. //depot/projects/tty/lib/libc/stdio/xprintf_hexdump.c#1 branch .. //depot/projects/tty/lib/libc/stdio/xprintf_int.c#1 branch .. //depot/projects/tty/lib/libc/stdio/xprintf_quote.c#1 branch .. //depot/projects/tty/lib/libc/stdio/xprintf_str.c#1 branch .. //depot/projects/tty/lib/libc/stdio/xprintf_time.c#1 branch .. //depot/projects/tty/lib/libc/stdio/xprintf_vis.c#1 branch .. //depot/projects/tty/lib/libc/stdlib/Makefile.inc#6 integrate .. //depot/projects/tty/lib/libc/stdlib/a64l.3#1 branch .. //depot/projects/tty/lib/libc/stdlib/a64l.c#1 branch .. //depot/projects/tty/lib/libc/stdlib/calloc.c#2 delete .. //depot/projects/tty/lib/libc/stdlib/grantpt.c#4 integrate .. //depot/projects/tty/lib/libc/stdlib/l64a.c#1 branch .. //depot/projects/tty/lib/libc/stdlib/malloc.3#5 integrate .. //depot/projects/tty/lib/libc/stdlib/malloc.c#12 integrate .. //depot/projects/tty/lib/libc/stdlib/posix_memalign.3#1 branch .. //depot/projects/tty/lib/libc/sys/Makefile.inc#9 integrate .. //depot/projects/tty/lib/libc/sys/abort2.2#1 branch .. //depot/projects/tty/lib/libc/sys/aio_read.2#3 integrate .. //depot/projects/tty/lib/libc/sys/aio_write.2#3 integrate .. //depot/projects/tty/lib/libc/sys/lio_listio.2#3 integrate .. //depot/projects/tty/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/tty/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/tty/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/tty/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/tty/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/tty/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/tty/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/tty/lib/libc/sys/open.2#5 integrate .. //depot/projects/tty/lib/libc/sys/rename.2#3 integrate .. //depot/projects/tty/lib/libc/sys/rmdir.2#2 integrate .. //depot/projects/tty/lib/libc/sys/sigaction.2#6 integrate .. //depot/projects/tty/lib/libc/sys/sigqueue.2#3 integrate .. //depot/projects/tty/lib/libc/sys/sigreturn.2#2 integrate .. //depot/projects/tty/lib/libc/sys/sigwaitinfo.2#3 integrate .. //depot/projects/tty/lib/libc/sys/stat.2#7 integrate .. //depot/projects/tty/lib/libc/sys/statfs.2#5 integrate .. //depot/projects/tty/lib/libc/sys/timer_create.2#3 integrate .. //depot/projects/tty/lib/libc/sys/timer_settime.2#3 integrate .. //depot/projects/tty/lib/libc/sys/undelete.2#2 integrate .. //depot/projects/tty/lib/libc/sys/utimes.2#2 integrate .. //depot/projects/tty/lib/libc/sys/wait.2#6 integrate .. //depot/projects/tty/lib/libdisk/Makefile#6 integrate .. //depot/projects/tty/lib/libdisk/disk.c#8 integrate .. //depot/projects/tty/lib/libdisk/libdisk.3#8 integrate .. //depot/projects/tty/lib/libdisk/libdisk.h#7 integrate .. //depot/projects/tty/lib/libdisk/write_arm_disk.c#1 branch .. //depot/projects/tty/lib/libedit/refresh.c#3 integrate .. //depot/projects/tty/lib/libfetch/ftp.c#8 integrate .. //depot/projects/tty/lib/libgssapi/Makefile#1 branch .. //depot/projects/tty/lib/libgssapi/context.h#1 branch .. //depot/projects/tty/lib/libgssapi/cred.h#1 branch .. //depot/projects/tty/lib/libgssapi/gss_accept_sec_context.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_accept_sec_context.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_acquire_cred.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_acquire_cred.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_add_cred.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_add_cred.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_add_oid_set_member.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_add_oid_set_member.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_canonicalize_name.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_canonicalize_name.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_compare_name.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_compare_name.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_context_time.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_context_time.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_create_empty_oid_set.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_create_empty_oid_set.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_delete_sec_context.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_delete_sec_context.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_display_name.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_display_name.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_display_status.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_display_status.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_duplicate_name.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_duplicate_name.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_export_name.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_export_name.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_export_sec_context.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_export_sec_context.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_get_mic.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_get_mic.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_import_name.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_import_name.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_import_sec_context.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_import_sec_context.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_indicate_mechs.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_indicate_mechs.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_init_sec_context.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_init_sec_context.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_inquire_context.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_inquire_context.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_inquire_cred.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_inquire_cred.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_inquire_cred_by_mech.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_inquire_cred_by_mech.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_inquire_mechs_for_name.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_inquire_mechs_for_name.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_inquire_names_for_mech.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_inquire_names_for_mech.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_krb5.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_mech_switch.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_names.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_process_context_token.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_process_context_token.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_release_buffer.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_release_buffer.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_release_cred.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_release_cred.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_release_name.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_release_name.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_release_oid_set.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_release_oid_set.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_seal.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_sign.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_test_oid_set_member.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_test_oid_set_member.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_unseal.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_unwrap.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_unwrap.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_utils.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_verify.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_verify_mic.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_verify_mic.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_wrap.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_wrap.c#1 branch .. //depot/projects/tty/lib/libgssapi/gss_wrap_size_limit.3#1 branch .. //depot/projects/tty/lib/libgssapi/gss_wrap_size_limit.c#1 branch .. //depot/projects/tty/lib/libgssapi/gssapi.3#1 branch .. //depot/projects/tty/lib/libgssapi/mech.5#1 branch .. //depot/projects/tty/lib/libgssapi/mech_switch.h#1 branch .. //depot/projects/tty/lib/libgssapi/name.h#1 branch .. //depot/projects/tty/lib/libgssapi/spnego.h#1 branch .. //depot/projects/tty/lib/libgssapi/utils.h#1 branch .. //depot/projects/tty/lib/libkvm/kvm.c#6 integrate .. //depot/projects/tty/lib/libmd/md2.h#2 integrate .. //depot/projects/tty/lib/libmd/md2c.c#3 integrate .. //depot/projects/tty/lib/libmd/md4.h#2 integrate .. //depot/projects/tty/lib/libmd/md4c.c#3 integrate .. //depot/projects/tty/lib/libmd/md5c.c#3 integrate .. //depot/projects/tty/lib/libmd/mdX.3#6 integrate .. //depot/projects/tty/lib/libmd/mdXhl.c#2 integrate .. //depot/projects/tty/lib/libmd/ripemd.h#2 integrate .. //depot/projects/tty/lib/libmd/rmd160c.c#2 integrate .. //depot/projects/tty/lib/libmd/sha.h#2 integrate .. //depot/projects/tty/lib/libmd/sha0c.c#2 integrate .. //depot/projects/tty/lib/libmd/sha1c.c#2 integrate .. //depot/projects/tty/lib/libmd/sha256.h#2 integrate .. //depot/projects/tty/lib/libmd/sha256c.c#2 integrate .. //depot/projects/tty/lib/libmemstat/memstat_uma.c#2 integrate .. //depot/projects/tty/lib/libnetgraph/msg.c#6 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_fork.c#6 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_kern.c#15 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_spinlock.c#8 integrate .. //depot/projects/tty/lib/libthr/Makefile#12 integrate .. //depot/projects/tty/lib/libthr/arch/i386/i386/pthread_md.c#3 integrate .. //depot/projects/tty/lib/libthr/pthread.map#4 integrate .. //depot/projects/tty/lib/libthr/thread/Makefile.inc#6 integrate .. //depot/projects/tty/lib/libthr/thread/thr_attr.c#4 integrate .. //depot/projects/tty/lib/libthr/thread/thr_create.c#9 integrate .. //depot/projects/tty/lib/libthr/thread/thr_detach.c#6 integrate .. //depot/projects/tty/lib/libthr/thread/thr_exit.c#8 integrate .. //depot/projects/tty/lib/libthr/thread/thr_fork.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_info.c#4 integrate .. //depot/projects/tty/lib/libthr/thread/thr_init.c#9 integrate .. //depot/projects/tty/lib/libthr/thread/thr_join.c#8 integrate .. //depot/projects/tty/lib/libthr/thread/thr_list.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_mutex.c#10 integrate .. //depot/projects/tty/lib/libthr/thread/thr_once.c#3 integrate .. //depot/projects/tty/lib/libthr/thread/thr_private.h#10 integrate .. //depot/projects/tty/lib/libthr/thread/thr_resume_np.c#5 integrate .. //depot/projects/tty/lib/libthr/thread/thr_sig.c#6 integrate .. //depot/projects/tty/lib/libthr/thread/thr_spinlock.c#6 integrate .. //depot/projects/tty/lib/libthr/thread/thr_suspend_np.c#4 integrate .. //depot/projects/tty/lib/libthr/thread/thr_timer.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_umtx.h#3 integrate .. //depot/projects/tty/lib/libutil/login_class.3#4 integrate .. //depot/projects/tty/lib/libutil/login_ok.c#4 integrate .. //depot/projects/tty/lib/libutil/login_times.c#3 integrate .. //depot/projects/tty/lib/libutil/pidfile.3#4 integrate .. //depot/projects/tty/lib/libutil/pty.c#4 integrate .. //depot/projects/tty/lib/msun/src/e_asinf.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_scalbf.c#4 integrate .. //depot/projects/tty/lib/msun/src/s_cbrt.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_cbrtf.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_log1p.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_log1pf.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_logb.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_logbf.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_rint.c#4 integrate .. //depot/projects/tty/lib/msun/src/s_rintf.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_round.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_roundf.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_roundl.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_tanhf.c#2 integrate .. //depot/projects/tty/libexec/atrun/atrun.c#3 integrate .. //depot/projects/tty/libexec/bootpd/bootpd.c#6 integrate .. //depot/projects/tty/libexec/ftpd/ftpd.8#10 integrate .. //depot/projects/tty/libexec/ftpd/ftpd.c#9 integrate .. //depot/projects/tty/libexec/rtld-elf/alpha/reloc.c#5 integrate .. //depot/projects/tty/libexec/rtld-elf/amd64/reloc.c#5 integrate .. //depot/projects/tty/libexec/rtld-elf/arm/reloc.c#3 integrate .. //depot/projects/tty/libexec/rtld-elf/i386/reloc.c#8 integrate .. //depot/projects/tty/libexec/rtld-elf/ia64/reloc.c#6 integrate .. //depot/projects/tty/libexec/rtld-elf/ia64/rtld_start.S#3 integrate .. //depot/projects/tty/libexec/rtld-elf/malloc.c#5 integrate .. //depot/projects/tty/libexec/rtld-elf/map_object.c#8 integrate .. //depot/projects/tty/libexec/rtld-elf/powerpc/reloc.c#6 integrate .. //depot/projects/tty/libexec/rtld-elf/rtld.c#15 integrate .. //depot/projects/tty/libexec/rtld-elf/rtld.h#8 integrate .. //depot/projects/tty/libexec/rtld-elf/sparc64/reloc.c#6 integrate .. //depot/projects/tty/release/Makefile#22 integrate .. //depot/projects/tty/release/alpha/boot_crunch.conf#4 integrate .. //depot/projects/tty/release/amd64/boot_crunch.conf#4 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#12 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#20 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#13 integrate .. //depot/projects/tty/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#8 integrate .. //depot/projects/tty/release/doc/share/misc/dev.archlist.txt#10 integrate .. //depot/projects/tty/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#5 integrate .. //depot/projects/tty/release/i386/boot_crunch.conf#4 integrate .. //depot/projects/tty/release/ia64/boot_crunch.conf#5 integrate .. //depot/projects/tty/release/powerpc/boot_crunch.conf#3 integrate .. //depot/projects/tty/release/scripts/package-split.py#4 integrate .. //depot/projects/tty/release/sparc64/boot_crunch.conf#4 integrate .. //depot/projects/tty/rescue/rescue/Makefile#11 integrate .. //depot/projects/tty/sbin/atacontrol/atacontrol.c#12 integrate .. //depot/projects/tty/sbin/devd/devd.8#10 integrate .. //depot/projects/tty/sbin/devd/devd.cc#11 integrate .. //depot/projects/tty/sbin/devfs/rule.c#5 integrate .. //depot/projects/tty/sbin/dhclient/dhclient-script#5 integrate .. //depot/projects/tty/sbin/dhclient/dhclient.8#3 integrate .. //depot/projects/tty/sbin/dhclient/dhclient.c#4 integrate .. //depot/projects/tty/sbin/dump/dump.8#10 integrate .. //depot/projects/tty/sbin/dumpon/dumpon.8#6 integrate .. //depot/projects/tty/sbin/geom/class/concat/geom_concat.c#5 integrate .. //depot/projects/tty/sbin/geom/class/eli/geom_eli.c#3 integrate .. //depot/projects/tty/sbin/geom/class/label/geom_label.c#4 integrate .. //depot/projects/tty/sbin/geom/class/mirror/geom_mirror.c#5 integrate .. //depot/projects/tty/sbin/geom/class/nop/geom_nop.c#5 integrate .. //depot/projects/tty/sbin/geom/class/nop/gnop.8#5 integrate .. //depot/projects/tty/sbin/geom/class/raid3/geom_raid3.c#5 integrate .. //depot/projects/tty/sbin/geom/class/shsec/geom_shsec.c#3 integrate .. //depot/projects/tty/sbin/geom/class/stripe/geom_stripe.c#5 integrate .. //depot/projects/tty/sbin/geom/core/geom.8#5 integrate .. //depot/projects/tty/sbin/geom/core/geom.c#7 integrate .. //depot/projects/tty/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/tty/sbin/geom/misc/subr.h#4 integrate .. //depot/projects/tty/sbin/ifconfig/af_link.c#2 integrate .. //depot/projects/tty/sbin/ifconfig/ifbridge.c#3 integrate .. //depot/projects/tty/sbin/ifconfig/ifconfig.8#16 integrate .. //depot/projects/tty/sbin/ifconfig/ifieee80211.c#9 integrate .. //depot/projects/tty/sbin/ifconfig/ifmedia.c#6 integrate .. //depot/projects/tty/sbin/ipf/libipf/Makefile#3 integrate .. //depot/projects/tty/sbin/ipfw/ipfw.8#21 integrate .. //depot/projects/tty/sbin/ipfw/ipfw2.c#18 integrate .. //depot/projects/tty/sbin/ldconfig/ldconfig.8#6 integrate .. //depot/projects/tty/sbin/md5/md5.c#8 integrate .. //depot/projects/tty/sbin/mdconfig/mdconfig.c#12 integrate .. //depot/projects/tty/sbin/mdmfs/mdmfs.8#7 integrate .. //depot/projects/tty/sbin/mdmfs/mdmfs.c#8 integrate .. //depot/projects/tty/sbin/mount/mntopts.h#7 integrate .. //depot/projects/tty/sbin/mount/mount.8#10 integrate .. //depot/projects/tty/sbin/mount/mount.c#9 integrate .. //depot/projects/tty/sbin/mount_cd9660/mount_cd9660.c#9 integrate .. //depot/projects/tty/sbin/mount_nfs/mount_nfs.8#9 integrate .. //depot/projects/tty/sbin/mount_nullfs/mount_nullfs.8#6 integrate .. //depot/projects/tty/sbin/mount_std/Makefile#4 integrate .. //depot/projects/tty/sbin/ping/ping.c#11 integrate .. //depot/projects/tty/sbin/rcorder/Makefile#3 integrate .. //depot/projects/tty/sbin/rcorder/rcorder.c#4 integrate .. //depot/projects/tty/sbin/reboot/nextboot.sh#2 integrate .. //depot/projects/tty/sbin/routed/if.c#5 integrate .. //depot/projects/tty/sbin/setkey/setkey.8#2 integrate .. //depot/projects/tty/sbin/sysctl/sysctl.c#11 integrate .. //depot/projects/tty/secure/lib/libssh/Makefile#9 integrate .. //depot/projects/tty/secure/usr.bin/ssh/Makefile#8 integrate .. //depot/projects/tty/secure/usr.sbin/sshd/Makefile#9 integrate .. //depot/projects/tty/share/examples/cvsup/ports-supfile#8 integrate .. //depot/projects/tty/share/examples/etc/make.conf#17 integrate .. //depot/projects/tty/share/examples/kld/Makefile#2 integrate .. //depot/projects/tty/share/examples/kld/firmware/Makefile#1 branch .. //depot/projects/tty/share/examples/kld/firmware/README#1 branch .. //depot/projects/tty/share/examples/kld/firmware/fwconsumer/Makefile#1 branch .. //depot/projects/tty/share/examples/kld/firmware/fwconsumer/fw_consumer.c#1 branch .. //depot/projects/tty/share/examples/kld/firmware/fwimage/Makefile#1 branch .. //depot/projects/tty/share/examples/kld/firmware/fwimage/firmware.img#1 branch .. //depot/projects/tty/share/examples/ses/Makefile.inc#3 integrate .. //depot/projects/tty/share/examples/ses/getencstat/Makefile#2 integrate .. //depot/projects/tty/share/examples/ses/sesd/Makefile#2 integrate .. //depot/projects/tty/share/examples/ses/setencstat/Makefile#2 integrate .. //depot/projects/tty/share/examples/ses/setobjstat/Makefile#2 integrate .. //depot/projects/tty/share/man/man1/Makefile#3 integrate .. //depot/projects/tty/share/man/man1/builtin.1#6 integrate .. //depot/projects/tty/share/man/man3/Makefile#8 integrate .. //depot/projects/tty/share/man/man3/siginfo.3#1 branch .. //depot/projects/tty/share/man/man3/tree.3#4 integrate .. //depot/projects/tty/share/man/man4/Makefile#23 integrate .. //depot/projects/tty/share/man/man4/agp.4#5 integrate .. //depot/projects/tty/share/man/man4/amdsmb.4#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 29 08:44:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C164B16A423; Sun, 29 Jan 2006 08:44:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 661AF16A420 for ; Sun, 29 Jan 2006 08:44:37 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4574B43D49 for ; Sun, 29 Jan 2006 08:44:36 +0000 (GMT) (envelope-from alc@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 k0T8iaaW035137 for ; Sun, 29 Jan 2006 08:44:36 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0T8iZMp035134 for perforce@freebsd.org; Sun, 29 Jan 2006 08:44:35 GMT (envelope-from alc@freebsd.org) Date: Sun, 29 Jan 2006 08:44:35 GMT Message-Id: <200601290844.k0T8iZMp035134@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 08:44:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=90612 Change 90612 by alc@alc_home on 2006/01/29 08:43:36 Prepare for handing cache pages to the buddy allocator. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_buddy.c#7 edit .. //depot/projects/superpages/src/sys/vm/vm_buddy.h#6 edit .. //depot/projects/superpages/src/sys/vm/vm_page.c#13 edit .. //depot/projects/superpages/src/sys/vm/vm_pageq.c#15 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_buddy.c#7 (text+ko) ==== @@ -212,7 +212,7 @@ { mtx_lock_spin(&vm_page_queue_free_mtx); - buddy_free_locked(m, q); + buddy_free_locked(PQ_BUDDY, m, q); mtx_unlock_spin(&vm_page_queue_free_mtx); } @@ -220,36 +220,45 @@ * Free a contiguous, power of two-sized set of physical pages. */ void -buddy_free_locked(vm_page_t m, int q) +buddy_free_locked(int baseq, vm_page_t m, int q) { vm_paddr_t pa, pa_buddy; vm_page_t buddy; KASSERT(q < BUDDY_QUEUES, - ("vm_page_buddy_free: queue %d is out of range", q)); + ("buddy_free_locked: queue %d is out of range", q)); KASSERT(m->queue == PQ_NONE, - ("vm_page_buddy_free: page %p has unexpected queue %d", + ("buddy_free_locked: page %p has unexpected queue %d", m, m->queue)); KASSERT(m->dirty == 0, - ("vm_page_buddy_free: page %p is dirty", m)); - mtx_assert(&vm_page_queue_free_mtx, MA_OWNED); + ("buddy_free_locked: page %p is dirty", m)); + switch (baseq) { + case PQ_CACHE: + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + break; + case PQ_BUDDY: + mtx_assert(&vm_page_queue_free_mtx, MA_OWNED); + break; + default: + KASSERT(FALSE, ("buddy_free_locked: unexpected baseq %d", + baseq)); + break; + } + *vm_page_queues[baseq].cnt += 1 << q; pa = VM_PAGE_TO_PHYS(m); - cnt.v_free_count += 1 << q; while (q < BUDDY_QUEUES - 1) { pa_buddy = pa ^ (1 << (PAGE_SHIFT + q)); buddy = phys_to_vm_page(pa_buddy); if (buddy == NULL || buddy->buddyq != q || - (buddy->queue - buddy->buddyq) != PQ_BUDDY) + (buddy->queue - buddy->buddyq) != baseq) break; - KASSERT(buddy->object == NULL, - ("vm_page_buddy_free: page %p xxx", buddy)); buddy_remove(buddy); q++; pa &= ~((1 << (PAGE_SHIFT + q)) - 1); m = PHYS_TO_VM_PAGE(pa); } - buddy_insert(PQ_BUDDY, q, m); + buddy_insert(baseq, q, m); } /* @@ -388,7 +397,7 @@ KASSERT(m->queue == PQ_NONE, ("vm_page_alloc_contig: page %p has unexpected queue %d", m, m->queue)); - buddy_free_locked(m, 0); + buddy_free_locked(PQ_BUDDY, m, 0); } mtx_unlock_spin(&vm_page_queue_free_mtx); return (m_ret); ==== //depot/projects/superpages/src/sys/vm/vm_buddy.h#6 (text+ko) ==== @@ -5,5 +5,5 @@ vm_page_t buddy_alloc(int magn, boolean_t prefer_zero); vm_page_t buddy_alloc_locked(int magn, boolean_t prefer_zero); void buddy_free(vm_page_t m, int magn); -void buddy_free_locked(vm_page_t m, int magn); +void buddy_free_locked(int baseq, vm_page_t m, int magn); void buddy_unfree(vm_page_t m); ==== //depot/projects/superpages/src/sys/vm/vm_page.c#13 (text+ko) ==== @@ -1090,7 +1090,7 @@ mtx_lock_spin(&vm_page_queue_free_mtx); if (m->flags & PG_ZERO) ++vm_page_zero_count; - buddy_free_locked(m, 0); + buddy_free_locked(PQ_BUDDY, m, 0); mtx_unlock_spin(&vm_page_queue_free_mtx); vm_page_free_wakeup(); } ==== //depot/projects/superpages/src/sys/vm/vm_pageq.c#15 (text+ko) ==== @@ -91,11 +91,15 @@ { struct vpgqueues *vpq; - vpq = &vm_page_queues[queue]; - VM_PAGE_SETQUEUE2(m, queue); - TAILQ_INSERT_TAIL(&vpq->pl, m, pageq); - ++*vpq->cnt; - ++vpq->lcnt; + if ((m->flags & PG_CACHE) != 0) + buddy_free_locked(queue, m, 0); + else { + vpq = &vm_page_queues[queue]; + VM_PAGE_SETQUEUE2(m, queue); + TAILQ_INSERT_TAIL(&vpq->pl, m, pageq); + ++*vpq->cnt; + ++vpq->lcnt; + } } /* From owner-p4-projects@FreeBSD.ORG Sun Jan 29 12:50:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8B6616A423; Sun, 29 Jan 2006 12:50:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 623E716A420 for ; Sun, 29 Jan 2006 12:50:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B4B443D45 for ; Sun, 29 Jan 2006 12:50:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0TCo8gq060436 for ; Sun, 29 Jan 2006 12:50:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TCo7Jh060433 for perforce@freebsd.org; Sun, 29 Jan 2006 12:50:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 12:50:07 GMT Message-Id: <200601291250.k0TCo7Jh060433@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90618 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 12:50:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=90618 Change 90618 by rwatson@rwatson_peppercorn on 2006/01/29 12:49:12 Web site information. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#11 (text+ko) ==== @@ -77,4 +77,10 @@ Information on OpenBSM may be found on the OpenBSM home page: -$P4: //depot/projects/trustedbsd/openbsm/README#10 $ + http://www.OpenBSM.org/ + +Information on TrustedBSD may be found on the TrustedBSD home page: + + http://www.TrustedBSD.org/ + +$P4: //depot/projects/trustedbsd/openbsm/README#11 $ From owner-p4-projects@FreeBSD.ORG Sun Jan 29 16:35:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5DB316A423; Sun, 29 Jan 2006 16:35:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A51B316A420 for ; Sun, 29 Jan 2006 16:35:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0329A43D48 for ; Sun, 29 Jan 2006 16:35:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0TGZh80071904 for ; Sun, 29 Jan 2006 16:35:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TGZhqr071889 for perforce@freebsd.org; Sun, 29 Jan 2006 16:35:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 16:35:43 GMT Message-Id: <200601291635.k0TGZhqr071889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90627 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 16:35:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=90627 Change 90627 by rwatson@rwatson_peppercorn on 2006/01/29 16:35:27 Integrate TrustedBSD OpenBSM code into TrustedBSD audit3 branch: - License cleanup - $P4$ - README update - auditreduce bug fixing and cleanup - praudit cleanup - Audit events update, cleanup, preference for Solaris definitions over Darwin Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/LICENSE#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_uevents.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_user#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_warn#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_class.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_event.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_io.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_mask.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_user.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_class.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_flags.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_class.5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_event.5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_user.5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_warn.5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/event_code.5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#3 (text+ko) ==== @@ -61,4 +61,6 @@ or static memory is returned for non-_r() versions of API calls. _free() calls dropped as a result, and source code compatibility with OpenSolaris improved significantly. +- Annotate BSM events with origin OS and compatibility information. +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#3 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/LICENSE#3 (text+ko) ==== @@ -1,41 +1,14 @@ -OpenBSM is covered by a number of copyrights, with two variants of the BSD -license depending on origination. The TrustedBSD Project would appreciate -the contribution of fixes and enhancements under identical of substantially -similar licenses. +OpenBSM is covered by a number of copyrights, with licenses being either two +or three clause BSD licenses. Individual file headers should be consulted +for specific copyrights on specific components. The TrustedBSD Project would +appreciate the contribution of fixes and enhancements under identical or +substantially similar licenses: - * Copyright (c) 2004 Apple Computer, Inc. + * Copyright (c) * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRING LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - - * Copyright (c) 2005 SPARTA, Inc. - * All rights reserved. - * - * This code was developed in part by Robert N. M. Watson, Senior Principal - * Scientist, SPARTA, Inc. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -56,3 +29,5 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/LICENSE#3 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile#2 $ # SUBDIR= bsm \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#5 (text+ko) ==== @@ -77,3 +77,10 @@ Information on OpenBSM may be found on the OpenBSM home page: + http://www.OpenBSM.org/ + +Information on TrustedBSD may be found on the TrustedBSD home page: + + http://www.TrustedBSD.org/ + +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#5 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#3 (text+ko) ==== @@ -6,3 +6,5 @@ test that things work properly with respect to endianness of the local platform. - Document contents of libbsm "public" data structures in libbsm man pages. + +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#3 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.0-PRERELEASE +OPENBSM_1_0_ALPHA_1 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#2 $ # SUBDIR= auditreduce \ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile#2 $ # CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#2 (text+ko) ==== @@ -1,4 +1,5 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. All rights reserved. +.\" Copyright (c) 2004 Apple Computer, Inc. +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -24,6 +25,8 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#2 $ +.\" .Dd Jan 24, 2004 .Dt AUDITREDUCE 1 .Os ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#4 (text+ko) ==== @@ -1,5 +1,6 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004 Apple Computer, Inc. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -24,11 +25,13 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#4 $ */ /* * Tool used to merge and select audit records from audit trail files - */ + */ /* * XXX Currently we do not support merging of records from multiple @@ -50,33 +53,32 @@ #include "auditreduce.h" +extern char *optarg; +extern int optind, optopt, opterr,optreset; -extern char *optarg; -extern int optind, optopt, opterr,optreset; +static au_mask_t maskp; /* Class. */ +static time_t p_atime; /* Created after this time. */ +static time_t p_btime; /* Created before this time. */ +static uint16_t p_evtype; /* Event that we are searching for. */ +static int p_auid; /* Audit id. */ +static int p_euid; /* Effective user id. */ +static int p_egid; /* Effective group id. */ +static int p_rgid; /* Real group id. */ +static int p_ruid; /* Real user id. */ +static int p_subid; /* Subject id. */ -static au_mask_t maskp; /* Used while selecting based on class */ -static time_t p_atime;/* select records created after this time */ -static time_t p_btime;/* select records created before this time */ -static uint16_t p_evtype; /* The event that we are searching for */ -static int p_auid; /* audit id */ -static int p_euid; /* effective user id */ -static int p_egid; /* effective group id */ -static int p_rgid; /* real group id */ -static int p_ruid; /* real user id */ -static int p_subid; /* subject id */ - -/* Following are the objects (-o option) that we can select upon */ -static char *p_fileobj = NULL; -static char *p_msgqobj = NULL; -static char *p_pidobj = NULL; -static char *p_semobj = NULL; -static char *p_shmobj = NULL; -static char *p_sockobj = NULL; +/* + * Following are the objects (-o option) that we can select upon. + */ +static char *p_fileobj = NULL; +static char *p_msgqobj = NULL; +static char *p_pidobj = NULL; +static char *p_semobj = NULL; +static char *p_shmobj = NULL; +static char *p_sockobj = NULL; - static uint32_t opttochk = 0; - static void usage(const char *msg) { @@ -105,179 +107,177 @@ } /* - * Check if the given auid matches the selection criteria + * Check if the given auid matches the selection criteria. */ -static int select_auid(int au) +static int +select_auid(int au) { - /* check if we want to select on auid */ - if(ISOPTSET(opttochk, OPT_u)) { - if(au != p_auid) { - return 0; - } + + /* Check if we want to select on auid. */ + if (ISOPTSET(opttochk, OPT_u)) { + if (au != p_auid) + return (0); } - return 1; + return (1); } /* - * Check if the given euid matches the selection criteria + * Check if the given euid matches the selection criteria. */ -static int select_euid(int euser) +static int +select_euid(int euser) { - /* check if we want to select on euid */ - if(ISOPTSET(opttochk, OPT_e)) { - if(euser != p_euid) { - return 0; - } + + /* Check if we want to select on euid. */ + if (ISOPTSET(opttochk, OPT_e)) { + if (euser != p_euid) + return (0); } - return 1; + return (1); } /* - * Check if the given egid matches the selection criteria + * Check if the given egid matches the selection criteria. */ -static int select_egid(int egrp) +static int +select_egid(int egrp) { - /* check if we want to select on egid */ - if(ISOPTSET(opttochk, OPT_f)) { - if(egrp != p_egid) { - return 0; - } + + /* Check if we want to select on egid. */ + if (ISOPTSET(opttochk, OPT_f)) { + if (egrp != p_egid) + return (0); } - return 1; + return (1); } /* - * Check if the given rgid matches the selection criteria + * Check if the given rgid matches the selection criteria. */ -static int select_rgid(int grp) +static int +select_rgid(int grp) { - /* check if we want to select on rgid */ - if(ISOPTSET(opttochk, OPT_g)) { - if(grp != p_rgid) { - return 0; - } + + /* Check if we want to select on rgid. */ + if (ISOPTSET(opttochk, OPT_g)) { + if (grp != p_rgid) + return (0); } - return 1; + return (1); } /* - * Check if the given ruid matches the selection criteria + * Check if the given ruid matches the selection criteria. */ -static int select_ruid(int user) +static int +select_ruid(int user) { - /* check if we want to select on rgid */ - if(ISOPTSET(opttochk, OPT_r)) { - if(user != p_ruid) { - return 0; - } + + /* Check if we want to select on rgid. */ + if (ISOPTSET(opttochk, OPT_r)) { + if (user != p_ruid) + return (0); } - return 1; + return (1); } /* - * Check if the given subject id (pid) matches the selection criteria + * Check if the given subject id (pid) matches the selection criteria. */ -static int select_subid(int subid) +static int +select_subid(int subid) { - /* check if we want to select on subject uid */ - if(ISOPTSET(opttochk, OPT_j)) { - if(subid != p_subid) { - return 0; - } + + /* Check if we want to select on subject uid. */ + if (ISOPTSET(opttochk, OPT_j)) { + if (subid != p_subid) + return (0); } - return 1; + return (1); } /* - * Check if object's pid maches the given pid + * Check if object's pid maches the given pid. */ -static int select_pidobj(uint32_t pid) +static int +select_pidobj(uint32_t pid) { - if(ISOPTSET(opttochk, OPT_op)) { - if(pid != strtol(p_pidobj, (char **)NULL, 10)) { - return 0; - } + + if (ISOPTSET(opttochk, OPT_op)) { + if (pid != strtol(p_pidobj, (char **)NULL, 10)) + return (0); } - return 1; + return (1); } /* - * Check if the given ipc object with the given type matches the - * selection criteria + * Check if the given ipc object with the given type matches the selection + * criteria. */ -static int select_ipcobj(u_char type, uint32_t id, uint32_t *optchkd) +static int +select_ipcobj(u_char type, uint32_t id, uint32_t *optchkd) { - if(type == AT_IPC_MSG) { + + if (type == AT_IPC_MSG) { SETOPT((*optchkd), OPT_om); - if(ISOPTSET(opttochk, OPT_om)) { - if(id != strtol(p_msgqobj, (char **)NULL, 10)) { - return 0; - } + if (ISOPTSET(opttochk, OPT_om)) { + if (id != strtol(p_msgqobj, (char **)NULL, 10)) + return (0); } - return 1; - } - else if(type == AT_IPC_SEM) { + return (1); + } else if (type == AT_IPC_SEM) { SETOPT((*optchkd), OPT_ose); - if(ISOPTSET(opttochk, OPT_ose)) { - if(id != strtol(p_semobj, (char **)NULL, 10)) { - return 0; - } + if (ISOPTSET(opttochk, OPT_ose)) { + if (id != strtol(p_semobj, (char **)NULL, 10)) + return (0); } - return 1; - } - else if (type == AT_IPC_SHM) { + return (1); + } else if (type == AT_IPC_SHM) { SETOPT((*optchkd), OPT_osh); - if(ISOPTSET(opttochk, OPT_osh)) { - if(id != strtol(p_shmobj, (char **)NULL, 10)) { - return 0; - } + if (ISOPTSET(opttochk, OPT_osh)) { + if (id != strtol(p_shmobj, (char **)NULL, 10)) + return (0); } - return 1; + return (1); } - /* unknown type -- filter if *any* ipc filtering is required */ - if(ISOPTSET(opttochk, OPT_om) - || ISOPTSET(opttochk, OPT_ose) - || ISOPTSET(opttochk, OPT_osh)) { - return 0; - } + /* Unknown type -- filter if *any* ipc filtering is required. */ + if (ISOPTSET(opttochk, OPT_om) || ISOPTSET(opttochk, OPT_ose) + || ISOPTSET(opttochk, OPT_osh)) + return (0); - return 1; + return (1); } /* - * Check if the file name matches selection criteria + * Check if the file name matches selection criteria. */ -static int select_filepath(char *path, uint32_t *optchkd) +static int +select_filepath(char *path, uint32_t *optchkd) { char *loc; SETOPT((*optchkd), OPT_of); - if(ISOPTSET(opttochk, OPT_of)) { - if(p_fileobj[0] == '~') { - /* object should not be in path */ + if (ISOPTSET(opttochk, OPT_of)) { + if (p_fileobj[0] == '~') { + /* Object should not be in path. */ loc = strstr(path, p_fileobj + 1); - if((loc != NULL) && (loc == path)) { - return 0; - } - } - else { - /* object should be in path */ + if ((loc != NULL) && (loc == path)) + return (0); + } else { + /* Object should be in path. */ loc = strstr(path, p_fileobj); - if((loc == NULL) || (loc != path)) { - return 0; - } + if ((loc == NULL) || (loc != path)) + return (0); } } - return 1; + return (1); } - - /* - * Returns 1 if the following pass the selection rules: + * Returns 1 if the following pass the selection rules: * * before-time, * after time, @@ -285,44 +285,46 @@ * class, * event */ -static int select_hdr32(tokenstr_t tok, uint32_t *optchkd) +static int +select_hdr32(tokenstr_t tok, uint32_t *optchkd) { + SETOPT((*optchkd), (OPT_A | OPT_a | OPT_b | OPT_c | OPT_m)); - /* The A option overrides a,b and d */ - if(!ISOPTSET(opttochk, OPT_A)) { - if(ISOPTSET(opttochk, OPT_a)) { + /* The A option overrides a, b and d. */ + if (!ISOPTSET(opttochk, OPT_A)) { + if (ISOPTSET(opttochk, OPT_a)) { if (difftime((time_t)tok.tt.hdr32.s, p_atime) < 0) { - /* record was created before p_atime */ - return 0; + /* Record was created before p_atime. */ + return (0); } } - if(ISOPTSET(opttochk, OPT_b)) { + if (ISOPTSET(opttochk, OPT_b)) { if (difftime(p_btime, (time_t)tok.tt.hdr32.s) < 0) { - /* record was created after p_btime */ - return 0; + /* Record was created after p_btime. */ + return (0); } } } - if(ISOPTSET(opttochk, OPT_c)) { + if (ISOPTSET(opttochk, OPT_c)) { + /* + * Check if the classes represented by the event matches + * given class. + */ + if (au_preselect(tok.tt.hdr32.e_type, &maskp, AU_PRS_BOTH, + AU_PRS_USECACHE) != 1) + return (0); + } - /* check if the classes represented by the event matches given class */ - if(au_preselect(tok.tt.hdr32.e_type, &maskp, - AU_PRS_BOTH, AU_PRS_USECACHE) != 1) { - return 0; - } - } - - /* check if event matches */ - if(ISOPTSET(opttochk, OPT_m)) { - if(tok.tt.hdr32.e_type != p_evtype) { - return 0; - } + /* Check if event matches. */ + if (ISOPTSET(opttochk, OPT_m)) { + if (tok.tt.hdr32.e_type != p_evtype) + return (0); } - return 1; + return (1); } /* @@ -334,31 +336,25 @@ * ruid, * process id */ -static int select_proc32(tokenstr_t tok, uint32_t *optchkd) +static int +select_proc32(tokenstr_t tok, uint32_t *optchkd) { + SETOPT((*optchkd), (OPT_u | OPT_e | OPT_f | OPT_g | OPT_r | OPT_op)); - if( !select_auid(tok.tt.proc32.auid)) { - return 0; - } - if( !select_euid(tok.tt.proc32.euid)) { - return 0; - } - if( !select_egid(tok.tt.proc32.egid)) { - return 0; - } - if( !select_rgid(tok.tt.proc32.rgid)) { - return 0; - } - if( !select_ruid(tok.tt.proc32.ruid)) { - return 0; - } - - if( !select_pidobj(tok.tt.proc32.pid)) { - return 0; - } - - return 1; + if (!select_auid(tok.tt.proc32.auid)) + return (0); + if (!select_euid(tok.tt.proc32.euid)) + return (0); + if (!select_egid(tok.tt.proc32.egid)) + return (0); + if (!select_rgid(tok.tt.proc32.rgid)) + return (0); + if (!select_ruid(tok.tt.proc32.ruid)) + return (0); + if (!select_pidobj(tok.tt.proc32.pid)) + return (0); + return (1); } /* @@ -370,169 +366,159 @@ * ruid, * subject id */ -static int select_subj32(tokenstr_t tok, uint32_t *optchkd) +static int +select_subj32(tokenstr_t tok, uint32_t *optchkd) { + SETOPT((*optchkd), (OPT_u | OPT_e | OPT_f | OPT_g | OPT_r | OPT_j)); - if( !select_auid(tok.tt.subj32.auid)) { - return 0; - } - if( !select_euid(tok.tt.subj32.euid)) { - return 0; - } - if( !select_egid(tok.tt.subj32.egid)) { - return 0; - } - if( !select_rgid(tok.tt.subj32.rgid)) { - return 0; - } - if( !select_ruid(tok.tt.subj32.ruid)) { - return 0; - } - if( !select_subid(tok.tt.subj32.pid)) { - return 0; - } - return 1; + if (!select_auid(tok.tt.subj32.auid)) + return (0); + if (!select_euid(tok.tt.subj32.euid)) + return (0); + if (!select_egid(tok.tt.subj32.egid)) + return (0); + if (!select_rgid(tok.tt.subj32.rgid)) + return (0); + if (!select_ruid(tok.tt.subj32.ruid)) + return (0); + if (!select_subid(tok.tt.subj32.pid)) + return (0); + return (1); } /* - * Read each record from the audit trail. - * Check if it is selected after passing through each of the options + * Read each record from the audit trail. Check if it is selected after + * passing through each of the options */ -static int select_records(FILE *fp) +static int +select_records(FILE *fp) { u_char *buf; tokenstr_t tok; int reclen; - int bytesread; + int bytesread; int selected; uint32_t optchkd; int err = 0; - - while((reclen = au_read_rec(fp, &buf)) != -1) { - + while ((reclen = au_read_rec(fp, &buf)) != -1) { optchkd = 0; bytesread = 0; selected = 1; - while ((selected == 1) && (bytesread < reclen)) { - - if(-1 == au_fetch_tok(&tok, buf + bytesread, reclen - bytesread)) { - /* is this an incomplete record ? */ + if (-1 == au_fetch_tok(&tok, buf + bytesread, + reclen - bytesread)) { + /* Is this an incomplete record? */ err = 1; break; } - /* For each token type we have have different selection criteria */ + /* + * For each token type we have have different + * selection criteria. + */ switch(tok.id) { - case AU_HEADER_32_TOKEN : - selected = select_hdr32(tok, &optchkd); - break; + case AU_HEADER_32_TOKEN: + selected = select_hdr32(tok, + &optchkd); + break; - case AU_PROCESS_32_TOKEN : - selected = select_proc32(tok, &optchkd); - break; + case AU_PROCESS_32_TOKEN: + selected = select_proc32(tok, + &optchkd); + break; - case AU_SUBJECT_32_TOKEN : - selected = select_subj32(tok, &optchkd); - break; + case AU_SUBJECT_32_TOKEN: + selected = select_subj32(tok, + &optchkd); + break; - case AU_IPC_TOKEN : - selected = select_ipcobj(tok.tt.ipc.type, tok.tt.ipc.id, &optchkd); - break; + case AU_IPC_TOKEN: + selected = select_ipcobj( + tok.tt.ipc.type, tok.tt.ipc.id, + &optchkd); + break; - case AU_FILE_TOKEN : - selected = select_filepath(tok.tt.file.name, &optchkd); - break; + case AU_FILE_TOKEN: + selected = select_filepath( + tok.tt.file.name, &optchkd); + break; - case AU_PATH_TOKEN : - selected = select_filepath(tok.tt.path.path, &optchkd); - break; + case AU_PATH_TOKEN: + selected = select_filepath( + tok.tt.path.path, &optchkd); + break; - /* - * The following tokens dont have any relevant attributes - * that we can select upon - */ - case AU_TRAILER_TOKEN : - case AU_ARG32_TOKEN : - case AU_ATTR32_TOKEN : - case AU_EXIT_TOKEN : - case AU_NEWGROUPS_TOKEN : - case AU_IN_ADDR_TOKEN : - case AU_IP_TOKEN : - case AU_IPCPERM_TOKEN : - case AU_IPORT_TOKEN : - case AU_OPAQUE_TOKEN : - case AU_RETURN_32_TOKEN : - case AU_SEQ_TOKEN : - case AU_TEXT_TOKEN : - case AU_ARB_TOKEN : - case AU_SOCK_TOKEN : - default: - break; + /* + * The following tokens dont have any relevant + * attributes that we can select upon. + */ + case AU_TRAILER_TOKEN: + case AU_ARG32_TOKEN: + case AU_ATTR32_TOKEN: + case AU_EXIT_TOKEN: + case AU_NEWGROUPS_TOKEN: + case AU_IN_ADDR_TOKEN: + case AU_IP_TOKEN: + case AU_IPCPERM_TOKEN: + case AU_IPORT_TOKEN: + case AU_OPAQUE_TOKEN: + case AU_RETURN_32_TOKEN: + case AU_SEQ_TOKEN: + case AU_TEXT_TOKEN: + case AU_ARB_TOKEN: + case AU_SOCK_TOKEN: + default: + break; } - bytesread += tok.len; } - - if((selected == 1) && (!err)) { - - /* check if all the options were matched */ - if(!(opttochk & ~optchkd)) { - /* XXX write this record to the output file */ - + if ((selected == 1) && (!err)) { + /* Check if all the options were matched. */ + if (!(opttochk & ~optchkd)) { + /* XXX Write this record to the output file. */ /* default to stdout */ fwrite(buf, 1, reclen, stdout); } } - free(buf); } - - return 0; + return (0); } - /* - * The -o option has the form object_type=object_value - * Identify the object components + * The -o option has the form object_type=object_value. Identify the object + * components. */ -void parse_object_type(char *name, char *val) +void +parse_object_type(char *name, char *val) { - if(val == NULL) + if (val == NULL) return; - if(!strcmp(name, FILEOBJ)) { + if (!strcmp(name, FILEOBJ)) { p_fileobj = val; SETOPT(opttochk, OPT_of); - } - else if( !strcmp(name, MSGQIDOBJ)) { + } else if (!strcmp(name, MSGQIDOBJ)) { p_msgqobj = val; SETOPT(opttochk, OPT_om); - } - else if( !strcmp(name, PIDOBJ)) { + } else if (!strcmp(name, PIDOBJ)) { p_pidobj = val; SETOPT(opttochk, OPT_op); - } - else if( !strcmp(name, SEMIDOBJ)) { + } else if (!strcmp(name, SEMIDOBJ)) { p_semobj = val; SETOPT(opttochk, OPT_ose); - } - else if( !strcmp(name, SHMIDOBJ)) { + } else if (!strcmp(name, SHMIDOBJ)) { p_shmobj = val; SETOPT(opttochk, OPT_osh); - } - else if( !strcmp(name, SOCKOBJ)) { + } else if (!strcmp(name, SOCKOBJ)) { p_sockobj = val; SETOPT(opttochk, OPT_oso); - } - else { + } else usage("unknown value for -o"); - } } - int main(int argc, char **argv) { @@ -540,11 +526,12 @@ struct passwd *pw; struct tm tm; au_event_t *n; - FILE *fp; + FILE *fp; int i; char *objval, *converr; char ch; char timestr[128]; + char *fname; converr = NULL; @@ -553,28 +540,33 @@ case 'A': SETOPT(opttochk, OPT_A); break; + case 'a': if (ISOPTSET(opttochk, OPT_a)) { usage("d is exclusive with a and b"); } SETOPT(opttochk, OPT_a); strptime(optarg, "%Y%m%d%H%M%S", &tm); - strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", &tm); - //fprintf(stderr, "Time converted = %s\n", timestr); + strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", + &tm); + /* fprintf(stderr, "Time converted = %s\n", timestr); */ p_atime = mktime(&tm); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 29 17:40:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82E6916A424; Sun, 29 Jan 2006 17:40:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2984616A420 for ; Sun, 29 Jan 2006 17:40:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDD2C43D72 for ; Sun, 29 Jan 2006 17:40:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0THe2i8081763 for ; Sun, 29 Jan 2006 17:40:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0THe2Gr081734 for perforce@freebsd.org; Sun, 29 Jan 2006 17:40:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 17:40:02 GMT Message-Id: <200601291740.k0THe2Gr081734@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 17:40:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=90630 Change 90630 by rwatson@rwatson_peppercorn on 2006/01/29 17:39:56 Document that audit.log.5 is incomplete. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#4 (text+ko) ==== @@ -6,5 +6,7 @@ test that things work properly with respect to endianness of the local platform. - Document contents of libbsm "public" data structures in libbsm man pages. +- The audit.log.5 man page is incomplete, as it does not describe all + token types. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#3 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#4 $ From owner-p4-projects@FreeBSD.ORG Sun Jan 29 18:20:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C042816A423; Sun, 29 Jan 2006 18:20:52 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A9EC16A420 for ; Sun, 29 Jan 2006 18:20:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E0C9443D46 for ; Sun, 29 Jan 2006 18:20:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0TIKp2b084050 for ; Sun, 29 Jan 2006 18:20:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TIKpel084047 for perforce@freebsd.org; Sun, 29 Jan 2006 18:20:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 18:20:51 GMT Message-Id: <200601291820.k0TIKpel084047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90631 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 18:20:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=90631 Change 90631 by rwatson@rwatson_peppercorn on 2006/01/29 18:20:42 Man page cleanup: - Remove event_code.5, it's a good idea, but its time has not yet come. - Use .Fn when naming system calls instead of .Nm, as that's not the same thing. - Remove references to FreeBSD as being the point of appearance of some calls, as they actually first appeared in Mac OS X/Solaris. - Use .Os instead of .Os Mac OS X in man page headers, as these man pages will be used on several operating systems. - Add authors/history information to additional pages. - Document auditctl() a bit better. - Document that A_SENDTRIGGER is specific to Mac OS X and FreeBSD. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#3 edit .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.2#3 edit .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_class.5#4 edit .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#4 edit .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_event.5#4 edit .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_user.5#4 edit .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_warn.5#4 edit .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#3 edit .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#4 edit .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/event_code.5#3 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getaudit.2#3 edit .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getauid.2#3 edit .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setaudit.2#3 edit .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setauid.2#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#3 $ # MAN= audit.2 \ @@ -14,7 +14,6 @@ audit_control.5 \ audit_event.5 \ audit_user.5 \ - audit_warn.5 \ - event_code.5 + audit_warn.5 .include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.2#3 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.2#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.2#3 $ .\" .Dd April 19, 2005 .Dt AUDIT 2 @@ -37,7 +37,7 @@ .Ft int .Fn audit "const char *record" "u_int length" .Sh DESCRIPTION -.Nm +.Fn audit submits a completed BSM audit record to the system audit log. .Pp .Fa record @@ -88,11 +88,6 @@ division of McAfee Inc., under contract to Apple Computer Inc. in 2004. It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. -.Pp -The -.Fn audit -function first appeared in -.Fx .Sh BUGS The .Fx ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_class.5#4 (text+ko) ==== @@ -25,11 +25,11 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_class.5#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_class.5#4 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_CLASS 5 -.Os "Mac OS X" +.Os .Sh NAME .Nm audit_class .Nd "contains audit event class descriptions" @@ -56,3 +56,15 @@ .Bl -tag -width "/etc/security/audit_class" -compact .It Pa /etc/security/audit_class .El +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#4 (text+ko) ==== @@ -25,17 +25,17 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#4 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_CONTROL 5 -.Os "Mac OS X" +.Os .Sh NAME .Nm audit_control .Nd "contains audit system parameters" .Sh DESCRIPTION The -.Nm +.Nm file contains several audit system parameters. Each line of this file is of the form: .Dl parameter:value. @@ -107,3 +107,15 @@ .Xr auditd 8 , .Xr audit_class 5 , .Xr audit_user 5 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_event.5#4 (text+ko) ==== @@ -25,11 +25,11 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_event.5#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_event.5#4 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_EVENT 5 -.Os "Mac OS X" +.Os .Sh NAME .Nm audit_event .Nd "contains audit event descriptions" @@ -60,3 +60,15 @@ .El .Sh SEE ALSO .Xr audit_class 5 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_user.5#4 (text+ko) ==== @@ -25,11 +25,11 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_user.5#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_user.5#4 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_USER 5 -.Os "Mac OS X" +.Os .Sh NAME .Nm audit_user .Nd "specifies events to be audited for the given users" @@ -77,3 +77,15 @@ .El .Sh SEE ALSO .Xr audit_control 5 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_warn.5#4 (text+ko) ==== @@ -25,11 +25,11 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_warn.5#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_warn.5#4 $ .\" .Dd Mar 17, 2004 .Dt AUDIT_WARN 5 -.Os "Mac OS X" +.Os .Sh NAME .Nm audit_warn .Nd "alert when audit daemon issues warnings" @@ -55,3 +55,15 @@ .El .Sh SEE ALSO .Xr auditd 8 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2005 Robert N. M. Watson +.\" Copyright (c) 2005-2006 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#3 $ .\" .Dd April 19, 2005 .Dt AUDITCTL 2 @@ -34,26 +34,33 @@ .Sh SYNOPSIS .In bsm/audit.h .Ft int -.Fn auditon "int cmd" "char *path" +.Fn auditon "const char *path" .Sh DESCRIPTION - -XXXXXXXXXXXXXXXX - +The +.Fn auditctl +system call directs the kernel to open a new audit trail log file. +.Fn auditctl +requires appropriate privilege. +In the +.Fx +implementation, +.Fn auditctl +opens new files, but +.Fn auditon +is used to disable the audit log. +In the Mac OS X implementation, passing +.Va NULL +to +.Fn auditctl +will disable the audit log. .Sh RETURN VALUES .Nm returns 0 on success, or returns -1 on failure, providing additional error information via .Va errno . .Sh SEE ALSO -.Xr audit 2 , -.Xr auditon 2 , -.Xr getauid 2 , -.Xr setauid 2 , -.Xr getaudit 2 , -.Xr setaudit 2 , -.Xr getaudit_addr 2 , -.Xr setaudit_addr 2 , -.Xr libbsm 3 +.Xr libbsm 3 , +.Xr auditd 8 .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. @@ -61,9 +68,11 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. +.Pp +This manual page was written by +.An Robert Watson Aq rwatson@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 2004. It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. -.Sh BUGS ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#4 $ .\" .Dd April 19, 2005 .Dt AUDITON 2 @@ -252,6 +252,12 @@ The process does not have sufficient permission to complete the operation. .El +.Pp +The +.Dv A_SENDTRIGGER +command is specific to the +.Fx +and Mac OS X implementations, and is not present in Solaris. .Sh SEE ALSO .Xr audit 2 , .Xr auditctl 2 , @@ -280,8 +286,3 @@ division of McAfee Inc., under contract to Apple Computer Inc. in 2003. It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. -.Pp -The -.Fn auditon -function first appeared in -.Fx 6.0 . ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getaudit.2#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getaudit.2#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getaudit.2#3 $ .\" .Dd April 19, 2005 .Dt GETAUDIT 2 @@ -70,6 +70,9 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. +.Pp +This manual page was written by +.An Robert Watson Aq rwatson@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 2004. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getauid.2#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getauid.2#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getauid.2#3 $ .\" .Dd April 19, 2005 .Dt GETAUID 2 @@ -64,6 +64,9 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. +.Pp +This manual page was written by +.An Robert Watson Aq rwatson@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 2004. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setaudit.2#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setaudit.2#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setaudit.2#3 $ .\" .Dd April 19, 2005 .Dt SETAUDIT 2 @@ -71,6 +71,9 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. +.Pp +This manual page was written by +.An Robert Watson Aq rwatson@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 2004. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setauid.2#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setauid.2#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setauid.2#3 $ .\" .Dd April 19, 2005 .Dt SETAUID 2 @@ -64,6 +64,9 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. +.Pp +This manual page was written by +.An Robert Watson Aq rwatson@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 2004. From owner-p4-projects@FreeBSD.ORG Sun Jan 29 18:49:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6844016A423; Sun, 29 Jan 2006 18:49:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F36216A420 for ; Sun, 29 Jan 2006 18:49:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC77F43D45 for ; Sun, 29 Jan 2006 18:49:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0TInQXR087146 for ; Sun, 29 Jan 2006 18:49:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TInQ99087143 for perforce@freebsd.org; Sun, 29 Jan 2006 18:49:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 18:49:26 GMT Message-Id: <200601291849.k0TInQ99087143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 18:49:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=90632 Change 90632 by rwatson@rwatson_peppercorn on 2006/01/29 18:48:32 OpenBSM information added to auditreduce.1 and praudit.1 man pages. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#3 edit .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#2 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#3 $ .\" .Dd Jan 24, 2004 .Dt AUDITREDUCE 1 @@ -139,3 +139,15 @@ .Xr audit_control 5 , .Xr audit_event 5 , .Xr praudit 1 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#4 $ .\" .Dd Jan 24, 2004 .Dt PRAUDIT 1 @@ -83,3 +83,15 @@ .Sh SEE ALSO .Xr audit_class 5 , .Xr audit_event 5 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. From owner-p4-projects@FreeBSD.ORG Sun Jan 29 18:51:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32B9616A423; Sun, 29 Jan 2006 18:51:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E967C16A420 for ; Sun, 29 Jan 2006 18:51:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B207F43D48 for ; Sun, 29 Jan 2006 18:51:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0TIpTIk087334 for ; Sun, 29 Jan 2006 18:51:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TIpTDb087331 for perforce@freebsd.org; Sun, 29 Jan 2006 18:51:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 18:51:29 GMT Message-Id: <200601291851.k0TIpTDb087331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90633 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 18:51:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=90633 Change 90633 by rwatson@rwatson_peppercorn on 2006/01/29 18:50:40 Reverse integrate TODO#4 from TrustedBSD audit3 to OpenBSM branch. This change was submitted to the wrong branch. Affected files ... .. //depot/projects/trustedbsd/openbsm/TODO#4 integrate Differences ... ==== //depot/projects/trustedbsd/openbsm/TODO#4 (text+ko) ==== @@ -6,5 +6,7 @@ test that things work properly with respect to endianness of the local platform. - Document contents of libbsm "public" data structures in libbsm man pages. +- The audit.log.5 man page is incomplete, as it does not describe all + token types. -$P4: //depot/projects/trustedbsd/openbsm/TODO#3 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#4 $ From owner-p4-projects@FreeBSD.ORG Sun Jan 29 18:53:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58C4216A423; Sun, 29 Jan 2006 18:53:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A9D616A420 for ; Sun, 29 Jan 2006 18:53:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B434543D46 for ; Sun, 29 Jan 2006 18:53:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0TIrWMu087406 for ; Sun, 29 Jan 2006 18:53:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TIrWdI087403 for perforce@freebsd.org; Sun, 29 Jan 2006 18:53:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 18:53:32 GMT Message-Id: <200601291853.k0TIrWdI087403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90634 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 18:53:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=90634 Change 90634 by rwatson@rwatson_peppercorn on 2006/01/29 18:52:45 Reverse integrate @90631 and @90632 from TrustedBSD audit3 to TrustedBSD OpenBSM branch after they were submitted to the wrong branch: OpenBSM information added to auditreduce.1 and praudit.1 man pages. Man page cleanup: - Remove event_code.5, it's a good idea, but its time has not yet come. - Use .Fn when naming system calls instead of .Nm, as that's not the same thing. - Remove references to FreeBSD as being the point of appearance of some calls, as they actually first appeared in Mac OS X/Solaris. - Use .Os instead of .Os Mac OS X in man page headers, as these man pages will be used on several operating systems. - Add authors/history information to additional pages. - Document auditctl() a bit better. - Document that A_SENDTRIGGER is specific to Mac OS X and FreeBSD. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#6 integrate .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#7 integrate .. //depot/projects/trustedbsd/openbsm/man/Makefile#5 integrate .. //depot/projects/trustedbsd/openbsm/man/audit.2#6 integrate .. //depot/projects/trustedbsd/openbsm/man/audit_class.5#5 integrate .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#5 integrate .. //depot/projects/trustedbsd/openbsm/man/audit_event.5#5 integrate .. //depot/projects/trustedbsd/openbsm/man/audit_user.5#5 integrate .. //depot/projects/trustedbsd/openbsm/man/audit_warn.5#5 integrate .. //depot/projects/trustedbsd/openbsm/man/auditctl.2#4 integrate .. //depot/projects/trustedbsd/openbsm/man/auditon.2#6 integrate .. //depot/projects/trustedbsd/openbsm/man/event_code.5#3 delete .. //depot/projects/trustedbsd/openbsm/man/getaudit.2#4 integrate .. //depot/projects/trustedbsd/openbsm/man/getauid.2#4 integrate .. //depot/projects/trustedbsd/openbsm/man/setaudit.2#4 integrate .. //depot/projects/trustedbsd/openbsm/man/setauid.2#4 integrate Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#6 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#6 $ .\" .Dd Jan 24, 2004 .Dt AUDITREDUCE 1 @@ -139,3 +139,15 @@ .Xr audit_control 5 , .Xr audit_event 5 , .Xr praudit 1 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#7 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#7 $ .\" .Dd Jan 24, 2004 .Dt PRAUDIT 1 @@ -83,3 +83,15 @@ .Sh SEE ALSO .Xr audit_class 5 , .Xr audit_event 5 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/openbsm/man/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile#5 $ # MAN= audit.2 \ @@ -14,7 +14,6 @@ audit_control.5 \ audit_event.5 \ audit_user.5 \ - audit_warn.5 \ - event_code.5 + audit_warn.5 .include ==== //depot/projects/trustedbsd/openbsm/man/audit.2#6 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.2#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.2#6 $ .\" .Dd April 19, 2005 .Dt AUDIT 2 @@ -37,7 +37,7 @@ .Ft int .Fn audit "const char *record" "u_int length" .Sh DESCRIPTION -.Nm +.Fn audit submits a completed BSM audit record to the system audit log. .Pp .Fa record @@ -88,11 +88,6 @@ division of McAfee Inc., under contract to Apple Computer Inc. in 2004. It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. -.Pp -The -.Fn audit -function first appeared in -.Fx .Sh BUGS The .Fx ==== //depot/projects/trustedbsd/openbsm/man/audit_class.5#5 (text+ko) ==== @@ -25,11 +25,11 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#5 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_CLASS 5 -.Os "Mac OS X" +.Os .Sh NAME .Nm audit_class .Nd "contains audit event class descriptions" @@ -56,3 +56,15 @@ .Bl -tag -width "/etc/security/audit_class" -compact .It Pa /etc/security/audit_class .El +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#5 (text+ko) ==== @@ -25,17 +25,17 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#5 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_CONTROL 5 -.Os "Mac OS X" +.Os .Sh NAME .Nm audit_control .Nd "contains audit system parameters" .Sh DESCRIPTION The -.Nm +.Nm file contains several audit system parameters. Each line of this file is of the form: .Dl parameter:value. @@ -107,3 +107,15 @@ .Xr auditd 8 , .Xr audit_class 5 , .Xr audit_user 5 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/openbsm/man/audit_event.5#5 (text+ko) ==== @@ -25,11 +25,11 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#5 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_EVENT 5 -.Os "Mac OS X" +.Os .Sh NAME .Nm audit_event .Nd "contains audit event descriptions" @@ -60,3 +60,15 @@ .El .Sh SEE ALSO .Xr audit_class 5 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/openbsm/man/audit_user.5#5 (text+ko) ==== @@ -25,11 +25,11 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#5 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_USER 5 -.Os "Mac OS X" +.Os .Sh NAME .Nm audit_user .Nd "specifies events to be audited for the given users" @@ -77,3 +77,15 @@ .El .Sh SEE ALSO .Xr audit_control 5 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/openbsm/man/audit_warn.5#5 (text+ko) ==== @@ -25,11 +25,11 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_warn.5#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_warn.5#5 $ .\" .Dd Mar 17, 2004 .Dt AUDIT_WARN 5 -.Os "Mac OS X" +.Os .Sh NAME .Nm audit_warn .Nd "alert when audit daemon issues warnings" @@ -55,3 +55,15 @@ .El .Sh SEE ALSO .Xr auditd 8 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/openbsm/man/auditctl.2#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2005 Robert N. M. Watson +.\" Copyright (c) 2005-2006 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditctl.2#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditctl.2#4 $ .\" .Dd April 19, 2005 .Dt AUDITCTL 2 @@ -34,26 +34,33 @@ .Sh SYNOPSIS .In bsm/audit.h .Ft int -.Fn auditon "int cmd" "char *path" +.Fn auditon "const char *path" .Sh DESCRIPTION - -XXXXXXXXXXXXXXXX - +The +.Fn auditctl +system call directs the kernel to open a new audit trail log file. +.Fn auditctl +requires appropriate privilege. +In the +.Fx +implementation, +.Fn auditctl +opens new files, but +.Fn auditon +is used to disable the audit log. +In the Mac OS X implementation, passing +.Va NULL +to +.Fn auditctl +will disable the audit log. .Sh RETURN VALUES .Nm returns 0 on success, or returns -1 on failure, providing additional error information via .Va errno . .Sh SEE ALSO -.Xr audit 2 , -.Xr auditon 2 , -.Xr getauid 2 , -.Xr setauid 2 , -.Xr getaudit 2 , -.Xr setaudit 2 , -.Xr getaudit_addr 2 , -.Xr setaudit_addr 2 , -.Xr libbsm 3 +.Xr libbsm 3 , +.Xr auditd 8 .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. @@ -61,9 +68,11 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. +.Pp +This manual page was written by +.An Robert Watson Aq rwatson@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 2004. It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. -.Sh BUGS ==== //depot/projects/trustedbsd/openbsm/man/auditon.2#6 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#6 $ .\" .Dd April 19, 2005 .Dt AUDITON 2 @@ -252,6 +252,12 @@ The process does not have sufficient permission to complete the operation. .El +.Pp +The +.Dv A_SENDTRIGGER +command is specific to the +.Fx +and Mac OS X implementations, and is not present in Solaris. .Sh SEE ALSO .Xr audit 2 , .Xr auditctl 2 , @@ -280,8 +286,3 @@ division of McAfee Inc., under contract to Apple Computer Inc. in 2003. It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. -.Pp -The -.Fn auditon -function first appeared in -.Fx 6.0 . ==== //depot/projects/trustedbsd/openbsm/man/getaudit.2#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#4 $ .\" .Dd April 19, 2005 .Dt GETAUDIT 2 @@ -70,6 +70,9 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. +.Pp +This manual page was written by +.An Robert Watson Aq rwatson@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 2004. ==== //depot/projects/trustedbsd/openbsm/man/getauid.2#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/getauid.2#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/getauid.2#4 $ .\" .Dd April 19, 2005 .Dt GETAUID 2 @@ -64,6 +64,9 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. +.Pp +This manual page was written by +.An Robert Watson Aq rwatson@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 2004. ==== //depot/projects/trustedbsd/openbsm/man/setaudit.2#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#4 $ .\" .Dd April 19, 2005 .Dt SETAUDIT 2 @@ -71,6 +71,9 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. +.Pp +This manual page was written by +.An Robert Watson Aq rwatson@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 2004. ==== //depot/projects/trustedbsd/openbsm/man/setauid.2#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/setauid.2#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/setauid.2#4 $ .\" .Dd April 19, 2005 .Dt SETAUID 2 @@ -64,6 +64,9 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. +.Pp +This manual page was written by +.An Robert Watson Aq rwatson@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 2004. From owner-p4-projects@FreeBSD.ORG Sun Jan 29 19:55:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C6C616A423; Sun, 29 Jan 2006 19:55:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8F7316A420 for ; Sun, 29 Jan 2006 19:55:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88C9143D45 for ; Sun, 29 Jan 2006 19:55:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0TJtmwq089672 for ; Sun, 29 Jan 2006 19:55:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TJtmc5089669 for perforce@freebsd.org; Sun, 29 Jan 2006 19:55:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 19:55:48 GMT Message-Id: <200601291955.k0TJtmc5089669@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 19:55:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=90636 Change 90636 by rwatson@rwatson_peppercorn on 2006/01/29 19:55:45 Integrate recent OpenBSM changes to bsm/*.h and libbsm/bsm_token.c to the kernel audit source in the audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#19 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#19 (text+ko) ==== @@ -29,6 +29,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * @APPLE_BSD_LICENSE_HEADER_END@ + * + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#19 $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#5 (text+ko) ==== @@ -33,6 +33,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * @APPLE_BSD_LICENSE_HEADER_END@ + * + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#5 $ */ #ifndef _LIBBSM_INTERNAL_H ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#14 (text+ko) ==== @@ -29,22 +29,28 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * @APPLE_BSD_LICENSE_HEADER_END@ + * + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#14 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ #define _BSM_AUDIT_KEVENTS_H_ /* - * Values marked as AUE_NULL are not required to be audited as per CAPP. + * Values marked as AUE_NULL are not required to be audited as per CAPP. + * + * Some conflicts exist in the assignment of name to event number mappings + * between BSM implementations. In general, we prefer the OpenSolaris + * definition as we consider Solaris BSM to be authoritative. _DARWIN_ has + * been inserted for the Darwin variants. If necessary, other tags will be + * added in the future. */ #define AUE_NULL 0 - #define AUE_EXIT 1 #define AUE_FORK 2 #define AUE_OPEN 3 #define AUE_CREAT 4 -#define AUE_O_CREAT AUE_CREAT #define AUE_LINK 5 #define AUE_UNLINK 6 #define AUE_DELETE AUE_UNLINK @@ -54,16 +60,13 @@ #define AUE_CHMOD 10 #define AUE_CHOWN 11 #define AUE_UMOUNT 12 -#define AUE_O_UMOUNT AUE_UMOUNT #define AUE_ACCESS 14 #define AUE_CHECKUSERACCESS AUE_ACCESS #define AUE_KILL 15 #define AUE_STAT 16 -#define AUE_O_STAT AUE_STAT #define AUE_LSTAT 17 -#define AUE_O_LSTAT AUE_LSTAT #define AUE_ACCT 18 -#define AUE_SOLARIS_REBOOT 20 /* XXX: Darwin conflict. */ +#define AUE_REBOOT 20 /* XXX: Darwin conflict. */ #define AUE_SYMLINK 21 #define AUE_READLINK 22 #define AUE_EXECVE 23 @@ -72,49 +75,40 @@ #define AUE_SETGROUPS 26 #define AUE_SETPGRP 27 #define AUE_SWAPON 28 -#define AUE_SOLARIS_SETHOSTNAME 29 /* XXX: Darwin conflict. */ +#define AUE_SETHOSTNAME 29 /* XXX: Darwin conflict. */ #define AUE_FCNTL 30 -#define AUE_SOLARIS_SETPRIORITY 31 /* XXX: Darwin conflict. */ +#define AUE_SETPRIORITY 31 /* XXX: Darwin conflict. */ #define AUE_CONNECT 32 #define AUE_ACCEPT 33 -#define AUE_O_ACCEPT AUE_ACCEPT #define AUE_BIND 34 #define AUE_SETSOCKOPT 35 #define AUE_VTRACE 36 /* Solaris-specific. */ -#define AUE_SOLARIS_SETTIMEOFDAY 37 /* XXX: Darwin conflict. */ +#define AUE_SETTIMEOFDAY 37 /* XXX: Darwin conflict. */ #define AUE_FCHOWN 38 #define AUE_FCHMOD 39 -/* XXX: #define AUE_SYSINFO 39 */ #define AUE_SETREUID 40 -#define AUE_O_SETREUID AUE_SETREUID #define AUE_SETREGID 41 -#define AUE_O_SETREGID AUE_SETREGID #define AUE_RENAME 42 -#define AUE_SOLARIS_TRUNCATE 43 /* XXX: Darwin conflict. */ -#define AUE_SOLARIS_FTRUNCATE 44 /* XXX: Darwin conflict. */ -#define AUE_SOLARIS_FLOCK 45 /* XXX: Darwin conflict. */ +#define AUE_TRUNCATE 43 /* XXX: Darwin conflict. */ +#define AUE_FTRUNCATE 44 /* XXX: Darwin conflict. */ +#define AUE_FLOCK 45 /* XXX: Darwin conflict. */ #define AUE_SHUTDOWN 46 #define AUE_MKDIR 47 #define AUE_RMDIR 48 #define AUE_UTIMES 49 #define AUE_ADJTIME 50 #define AUE_SETRLIMIT 51 -#define AUE_O_SETRLIMIT AUE_SETRLIMIT #define AUE_KILLPG 52 -#define AUE_O_KILLPG AUE_KILLPG -#define AUE_SOLARIS_NFS_SVC 53 /* XXX: Darwin conflict. */ +#define AUE_NFS_SVC 53 /* XXX: Darwin conflict. */ #define AUE_STATFS 54 #define AUE_FSTATFS 55 -#define AUE_SOLARIS_UNMOUNT 56 /* XXX: Darwin conflict. */ +#define AUE_UNMOUNT 56 /* XXX: Darwin conflict. */ #define AUE_ASYNC_DAEMON 57 #define AUE_NFS_GETFH 58 /* XXX: Darwin conflict. */ -#define AUE_SOLARIS_SETDOMAINNAME 59 /* XXX: Darwin conflict. */ -#define AUE_O_SETDOMAINNAME AUE_SYSCTL -#define AUE_SOLARIS_QUOTACTL 60 /* XXX: Darwin conflict. */ +#define AUE_SETDOMAINNAME 59 +#define AUE_QUOTACTL 60 /* XXX: Darwin conflict. */ #define AUE_EXPORTFS 61 -#define AUE_O_EXPORTFS AUE_EXPORTFS #define AUE_MOUNT 62 -#define AUE_O_MOUNT AUE_MOUNT #define AUE_SEMSYS 63 #define AUE_MSGSYS 64 #define AUE_SHMSYS 65 @@ -163,7 +157,7 @@ #define AUE_SEMCTL_SETALL 108 #define AUE_SEMGET 109 #define AUE_SEMOP 110 -#define AUE_CORE 111 +#define AUE_CORE 111 /* Solaris-only, currently. */ #define AUE_CLOSE 112 #define AUE_SYSTEMBOOT 113 #define AUE_ASYNC_DAEMON_EXIT 114 /* Solaris-only. */ @@ -174,33 +168,30 @@ #define AUE_SETAUID 131 #define AUE_GETAUDIT 132 #define AUE_SETAUDIT 133 +#define AUE_GETUSERAUDIT 134 /* Solaris-only. */ +#define AUE_SETUSERAUDIT 135 /* Solaris-only. */ +#define AUE_AUDITSVC 136 /* Solaris-only. */ +#define AUE_AUDITUSER 137 /* Solaris-only. */ #define AUE_AUDITON 138 #define AUE_AUDITON_GPOLICY 141 #define AUE_AUDITON_SPOLICY 142 #define AUE_AUDITON_GQCTRL 145 #define AUE_AUDITON_SQCTRL 146 #define AUE_GETPORTAUDIT 149 -#define AUE_ENTERPROM 153 -#define AUE_EXITPROM 154 +#define AUE_ENTERPROM 153 /* Solaris-only. */ +#define AUE_EXITPROM 154 /* Solaris-only. */ #define AUE_IOCTL 158 -#define AUE_SOCKCONFIG 183 #define AUE_SOCKET 183 #define AUE_SENDTO 184 #define AUE_PIPE 185 - /* XXXRW: XXX Solaris socketpair()? */ - /* XXXRW: XXX Solaris send()? */ +#define AUE_SOCKETPAIR 186 /* XXXRW: Darwin conflict. */ +#define AUE_SEND 187 #define AUE_SENDMSG 188 -#define AUE_O_SEND AUE_SENDMSG -#define AUE_O_SENDMSG AUE_SENDMSG - /* XXXRW: XXX Solaris recv()? */ +#define AUE_RECV 189 #define AUE_RECVMSG 190 -#define AUE_O_RECV AUE_RECVMSG -#define AUE_O_RECVMSG AUE_RECVMSG #define AUE_RECVFROM 191 -#define AUE_O_RECVFROM AUE_RECVFROM #define AUE_READ 192 #define AUE_LSEEK 194 -#define AUE_O_LSEEK AUE_LSEEK #define AUE_WRITE 195 #define AUE_WRITEV 196 #define AUE_READV 198 @@ -215,7 +206,6 @@ /* XXXRW: Solaris readvl()? */ #define AUE_DUP2 209 #define AUE_MMAP 210 -#define AUE_O_MMAP AUE_MMAP #define AUE_AUDIT 211 #define AUE_PRIOCNTLSYS 212 #define AUE_MUNMAP 213 @@ -238,39 +228,48 @@ #define AUE_AUDITON_SETCOND 230 #define AUE_AUDITON_GETCLASS 231 #define AUE_AUDITON_SETCLASS 232 -#define AUE_UTSSYS 233 +#define AUE_UTSSYS 233 /* Solaris-specific. */ #define AUE_STATVFS 234 #define AUE_XSTAT 235 #define AUE_LXSTAT 236 #define AUE_LCHOWN 237 -#define AUE_MEMCNTL 238 -#define AUE_SYSINFO 239 -#define AUE_XMKNOD 240 +#define AUE_MEMCNTL 238 /* Solaris-specific. */ +#define AUE_SYSINFO 239 /* Solaris-specific. */ +#define AUE_XMKNOD 240 /* Solaris-specific. */ #define AUE_FORK1 241 /* XXXRW: Solaris modctl()? */ #define AUE_MODLOAD 243 #define AUE_MODUNLOAD 244 -#define AUE_MODCONFIG 245 -#define AUE_MODADDMAJ 246 +#define AUE_MODCONFIG 245 /* Solaris-specific. */ +#define AUE_MODADDMAJ 246 /* Solaris-specific. */ #define AUE_SOCKACCEPT 247 #define AUE_SOCKCONNECT 248 #define AUE_SOCKSEND 249 #define AUE_SOCKRECEIVE 250 #define AUE_ACLSET 251 #define AUE_FACLSET 252 -#define AUE_DOORFS_DOOR_CALL 254 -#define AUE_DOORFS_DOOR_RETURN 255 -#define AUE_DOORFS_DOOR_CREATE 256 -#define AUE_DOORFS_DOOR_REVOKE 257 -#define AUE_DOORFS_DOOR_INFO 258 -#define AUE_DOORFS_DOOR_CRED 259 -#define AUE_DOORFS_DOOR_BIND 260 -#define AUE_DOORFS_DOOR_UNBIND 261 -#define AUE_P_ONLINE 262 -#define AUE_PROCESSOR_BIND 263 -#define AUE_INST_SYNC 264 +#define AUE_DOORFS_DOOR_CALL 254 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_RETURN 255 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_CREATE 256 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_REVOKE 257 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_INFO 258 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_CRED 259 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_BIND 260 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_UNBIND 261 /* Solaris-specific. */ +#define AUE_P_ONLINE 262 /* Solaris-specific. */ +#define AUE_PROCESSOR_BIND 263 /* Solaris-specific. */ +#define AUE_INST_SYNC 264 /* Solaris-specific. */ +#define AUE_SOCK_CONFIG 265 /* Solaris-specific. */ #define AUE_SETAUDIT_ADDR 266 #define AUE_GETAUDIT_ADDR 267 +#define AUE_CLOCK_SETTIME 287 +#define AUE_NTP_ADJTIME 288 + +/* + * Events not present in OpenSolaris BSM, generally derived from Apple Darwin + * BSM or added in OpenBSM. This start a little too close to the top end of + * the OpenSolaris event list for my comfort. + */ #define AUE_GETFSSTAT 301 #define AUE_PTRACE 302 #define AUE_CHFLAGS 303 @@ -278,43 +277,38 @@ #define AUE_PROFILE 305 #define AUE_KTRACE 306 #define AUE_SETLOGIN 307 -#define AUE_REBOOT 308 /* XXX: See AUE_SOLARIS_REBOOT. */ +#define AUE_DARWIN_REBOOT 308 /* XXX: See AUE_REBOOT. */ #define AUE_REVOKE 309 #define AUE_UMASK 310 #define AUE_MPROTECT 311 -#define AUE_SETPRIORITY 312 /* XXX: See AUE_SOLARIS_SETPRIORITY. */ -#define AUE_SETTIMEOFDAY 313 /* XXX: See AUE_SOLARIS_SETTIMEOFDAY. */ -#define AUE_FLOCK 314 /* XXX: See AUE_SOLARIS_FLOCK. */ +#define AUE_DARWIN_SETPRIORITY 312 /* XXX: See AUE_SETPRIORITY. */ +#define AUE_DARWIN_SETTIMEOFDAY 313 /* XXX: See AUE_SETTIMEOFDAY. */ +#define AUE_DARWIN_FLOCK 314 /* XXX: See AUE_FLOCK. */ #define AUE_MKFIFO 315 #define AUE_POLL 316 -#define AUE_SOCKETPAIR 317 /* XXXRW: What about 186? */ +#define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ #define AUE_FUTIMES 318 #define AUE_SETSID 319 #define AUE_SETPRIVEXEC 320 -#define AUE_NFSSVC 321 /* XXX: See AUE_SOLARIS_NFS_SVC. */ -#define AUE_GETFH 322 /* XXX: See AUE_SOLARIS_NFS_GETFH. */ -#define AUE_QUOTACTL 323 /* XXX: See AUE_SOLARIS_QUOTACTL. */ -#define AUE_ADDPROFILE 324 -#define AUE_KDBUGTRACE 325 +#define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ +#define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ +#define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ +#define AUE_ADDPROFILE 324 /* Darwin */ +#define AUE_KDBUGTRACE 325 /* Darwin */ #define AUE_FSTAT 326 -#define AUE_O_FSTAT AUE_FSTAT #define AUE_FPATHCONF 327 #define AUE_GETDIRENTRIES 328 -#define AUE_O_GETDIRENTRIES AUE_GETDIRENTRIES -#define AUE_TRUNCATE 329 /* XXX: See AUE_SOLARIS_TRUNCATE. */ -#define AUE_O_TRUNCATE AUE_TRUNCATE -#define AUE_FTRUNCATE 330 /* XXX: See AUE_SOLARIS_FTRUNCATE. */ -#define AUE_O_FTRUNCATE AUE_FTRUNCATE +#define AUE_DARWIN_TRUNCATE 329 /* XXX: See AUE_TRUNCATE. */ +#define AUE_DARWIN_FTRUNCATE 330 /* XXX: See AUE_FTRUNCATE. */ #define AUE_SYSCTL 331 -#define AUE_O_SETHOSTNAME AUE_SYSCTL /* XXX: See AUE_SOLARIS_SET.. */ #define AUE_MLOCK 332 #define AUE_MUNLOCK 333 #define AUE_UNDELETE 334 -#define AUE_GETATTRLIST 335 -#define AUE_SETATTRLIST 336 -#define AUE_GETDIRENTRIESATTR 337 -#define AUE_EXCHANGEDATA 338 -#define AUE_SEARCHFS 339 +#define AUE_GETATTRLIST 335 /* Darwin */ +#define AUE_SETATTRLIST 336 /* Darwin */ +#define AUE_GETDIRENTRIESATTR 337 /* Darwin */ +#define AUE_EXCHANGEDATA 338 /* Darwin */ +#define AUE_SEARCHFS 339 /* Darwin */ #define AUE_MINHERIT 340 #define AUE_SEMCONFIG 341 #define AUE_SEMOPEN 342 @@ -322,24 +316,24 @@ #define AUE_SEMUNLINK 344 #define AUE_SHMOPEN 345 #define AUE_SHMUNLINK 346 -#define AUE_LOADSHFILE 347 -#define AUE_RESETSHFILE 348 -#define AUE_NEWSYSTEMSHREG 349 +#define AUE_LOADSHFILE 347 /* Darwin */ +#define AUE_RESETSHFILE 348 /* Darwin */ +#define AUE_NEWSYSTEMSHREG 349 /* Darwin */ #define AUE_PTHREADKILL 350 #define AUE_PTHREADSIGMASK 351 #define AUE_AUDITCTL 352 #define AUE_RFORK 353 #define AUE_LCHMOD 354 #define AUE_SWAPOFF 355 -#define AUE_INITPROCESS 356 -#define AUE_MAPFD 357 -#define AUE_TASKFORPID 358 -#define AUE_PIDFORTASK 359 +#define AUE_INITPROCESS 356 /* Darwin */ +#define AUE_MAPFD 357 /* Darwin */ +#define AUE_TASKFORPID 358 /* Darwin */ +#define AUE_PIDFORTASK 359 /* Darwin */ #define AUE_SYSCTL_NONADMIN 360 -#define AUE_COPYFILE 361 +#define AUE_COPYFILE 361 /* Darwin */ #define AUE_LUTIMES 362 #define AUE_LCHFLAGS 363 /* FreeBSD */ -#define AUE_SENDFILE 364 +#define AUE_SENDFILE 364 /* BSD/Linux */ #define AUE_USELIB 365 /* Linux */ #define AUE_GETRESUID 366 #define AUE_SETRESUID 367 @@ -358,7 +352,73 @@ #define AUE_NMOUNT 380 /* FreeBSD */ /* - * XXXRW: Values not yet assigned. + * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the + * normal Solaris BSM identifiers. _O_ refers to it being an old, or compat + * interface. In most cases, Darwin has never implemented these system calls + * but picked up the fields in their system call table from their FreeBSD + * import. Happily, these have different names than the AUE_O* definitions + * in Solaris BSM. + */ +#define AUE_O_CREAT AUE_OPEN_RWTC /* Darwin */ +#define AUE_O_EXECVE AUE_NULL /* Darwin */ +#define AUE_O_SBREAK AUE_NULL /* Darwin */ +#define AUE_O_LSEEK AUE_NULL /* Darwin */ +#define AUE_O_MOUNT AUE_NULL /* Darwin */ +#define AUE_O_UMOUNT AUE_NULL /* Darwin */ +#define AUE_O_STAT AUE_STAT /* Darwin */ +#define AUE_O_LSTAT AUE_LSTAT /* Darwin */ +#define AUE_O_FSTAT AUE_FSTAT /* Darwin */ +#define AUE_O_GETPAGESIZE AUE_NULL /* Darwin */ +#define AUE_O_VREAD AUE_NULL /* Darwin */ +#define AUE_O_VWRITE AUE_NULL /* Darwin */ +#define AUE_O_MMAP AUE_MMAP /* Darwin */ +#define AUE_O_VADVISE AUE_NULL /* Darwin */ +#define AUE_O_VHANGUP AUE_NULL /* Darwin */ +#define AUE_O_VLIMIT AUE_NULL /* Darwin */ +#define AUE_O_WAIT AUE_NULL /* Darwin */ +#define AUE_O_GETHOSTNAME AUE_NULL /* Darwin */ +#define AUE_O_SETHOSTNAME AUE_SYSCTL /* Darwin */ +#define AUE_O_GETDOPT AUE_NULL /* Darwin */ +#define AUE_O_SETDOPT AUE_NULL /* Darwin */ +#define AUE_O_ACCEPT AUE_NULL /* Darwin */ +#define AUE_O_SEND AUE_SENDMSG /* Darwin */ +#define AUE_O_RECV AUE_RECVMSG /* Darwin */ +#define AUE_O_VTIMES AUE_NULL /* Darwin */ +#define AUE_O_SIGVEC AUE_NULL /* Darwin */ +#define AUE_O_SIGBLOCK AUE_NULL /* Darwin */ +#define AUE_O_SIGSETMASK AUE_NULL /* Darwin */ +#define AUE_O_SIGSTACK AUE_NULL /* Darwin */ +#define AUE_O_RECVMSG AUE_RECVMSG /* Darwin */ +#define AUE_O_SENDMSG AUE_SENDMSG /* Darwin */ +#define AUE_O_VTRACE AUE_NULL /* Darwin */ +#define AUE_O_RESUBA AUE_NULL /* Darwin */ +#define AUE_O_RECVFROM AUE_RECVFROM /* Darwin */ +#define AUE_O_SETREUID AUE_SETREUID /* Darwin */ +#define AUE_O_SETREGID AUE_SETREGID /* Darwin */ +#define AUE_O_TRUNCATE AUE_TRUNCATE /* Darwin */ +#define AUE_O_FTRUNCATE AUE_FTRUNCATE /* Darwin */ +#define AUE_O_GETPEERNAME AUE_NULL /* Darwin */ +#define AUE_O_GETHOSTID AUE_NULL /* Darwin */ +#define AUE_O_SETHOSTID AUE_NULL /* Darwin */ +#define AUE_O_GETRLIMIT AUE_NULL /* Darwin */ +#define AUE_O_SETRLIMIT AUE_SETRLIMIT /* Darwin */ +#define AUE_O_KILLPG AUE_KILL /* Darwin */ +#define AUE_O_SETQUOTA AUE_NULL /* Darwin */ +#define AUE_O_QUOTA AUE_NULL /* Darwin */ +#define AUE_O_GETSOCKNAME AUE_NULL /* Darwin */ +#define AUE_O_GETDIREENTRIES AUE_GETDIREENTRIES /* Darwin */ +#define AUE_O_ASYNCDAEMON AUE_NULL /* Darwin */ +#define AUE_O_GETDOMAINNAME AUE_NULL /* Darwin */ +#define AUE_O_SETDOMAINNAME AUE_SYSCTL /* Darwin */ +#define AUE_O_PCFS_MOUNT AUE_NULL /* Darwin */ +#define AUE_O_EXPORTFS AUE_NULL /* Darwin */ +#define AUE_O_USTATE AUE_NULL /* Darwin */ +#define AUE_O_WAIT3 AUE_NULL /* Darwin */ +#define AUE_O_RPAUSE AUE_NULL /* Darwin */ +#define AUE_O_GETDENTS AUE_NULL /* Darwin */ + +/* + * Possible desired future values based on review of BSD/Darwin system calls. */ #define AUE_DUP AUE_NULL #define AUE_FSCTL AUE_NULL @@ -372,22 +432,19 @@ #define AUE_GETITIMER AUE_NULL #define AUE_GETLOGIN AUE_NULL #define AUE_GETPEERNAME AUE_NULL -#define AUE_O_GETPEERNAME AUE_GETPEERNAME #define AUE_GETPGID AUE_NULL #define AUE_GETPGRP AUE_NULL #define AUE_GETPID AUE_NULL #define AUE_GETPPID AUE_NULL #define AUE_GETPRIORITY AUE_NULL #define AUE_GETRLIMIT AUE_NULL -#define AUE_O_GETRLIMIT AUE_GETRLIMIT #define AUE_GETRUSAGE AUE_NULL #define AUE_GETSID AUE_NULL #define AUE_GETSOCKNAME AUE_NULL -#define AUE_O_GETSOCKNAME AUE_GETSOCKNAME #define AUE_GETTIMEOFDAY AUE_NULL #define AUE_GETUID AUE_NULL #define AUE_GETSOCKOPT AUE_NULL -#define AUE_GTSOCKOPT AUE_GETSOCKOPT +#define AUE_GTSOCKOPT AUE_GETSOCKOPT /* XXX: Typo in Darwin. */ #define AUE_ISSETUGID AUE_NULL #define AUE_LISTEN AUE_NULL #define AUE_LSTATV AUE_NULL @@ -399,36 +456,6 @@ #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL #define AUE_MUNLOCKALL AUE_NULL -#define AUE_O_ASYNCDAEMON AUE_NULL -#define AUE_O_EXECV AUE_NULL -#define AUE_O_GETDENTS AUE_NULL -#define AUE_O_GETDOMAINNAME AUE_NULL -#define AUE_O_GETDOPT AUE_NULL -#define AUE_O_GETHOSTID AUE_NULL -#define AUE_O_GETHOSTNAME AUE_NULL -#define AUE_O_GETPAGESIZE AUE_NULL -#define AUE_O_PCFS_MOUNT AUE_NULL -#define AUE_O_QUOTA AUE_NULL -#define AUE_O_RESUBA AUE_NULL -#define AUE_O_RPAUSE AUE_NULL -#define AUE_O_SBREAK AUE_NULL -#define AUE_O_SETDOPT AUE_NULL -#define AUE_O_SETHOSTID AUE_NULL -#define AUE_O_SETQUOTA AUE_NULL -#define AUE_O_SIGBLOCK AUE_NULL -#define AUE_O_SIGSETMASK AUE_NULL -#define AUE_O_SIGSTACK AUE_NULL -#define AUE_O_SIGVEC AUE_NULL -#define AUE_O_USTATE AUE_NULL -#define AUE_O_VADVISE AUE_NULL -#define AUE_O_VHANGUP AUE_NULL -#define AUE_O_VLIMIT AUE_NULL -#define AUE_O_VREAD AUE_NULL -#define AUE_O_VTIMES AUE_NULL -#define AUE_O_VTRACE AUE_NULL -#define AUE_O_VWRITE AUE_NULL -#define AUE_O_WAIT AUE_NULL -#define AUE_O_WAIT3 AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL #define AUE_SBRK AUE_NULL ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#7 (text+ko) ==== @@ -29,6 +29,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * @APPLE_BSD_LICENSE_HEADER_END@ + * + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#7 $ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2004 Apple Computer, Inc. * Copyright (c) 2005 SPARTA, Inc. * All rights reserved. * @@ -29,6 +29,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#6 $ */ #include @@ -49,6 +51,7 @@ #include #include +#include #include #include @@ -81,8 +84,8 @@ textlen = strlen(text); textlen += 1; - GET_TOKEN_AREA(t, dptr, 2 * sizeof(u_char) + 2 * sizeof(u_char) + - sizeof(u_int32_t) + sizeof(u_int16_t) + textlen); + GET_TOKEN_AREA(t, dptr, 2 * sizeof(u_char) + sizeof(u_int32_t) + + sizeof(u_int16_t) + textlen); ADD_U_CHAR(dptr, AUT_ARG32); ADD_U_CHAR(dptr, n); @@ -588,16 +591,18 @@ } token_t * -au_to_process64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, - pid_t pid, au_asid_t sid, au_tid_t *tid) +au_to_process64(__unused au_id_t auid, __unused uid_t euid, + __unused gid_t egid, __unused uid_t ruid, __unused gid_t rgid, + __unused pid_t pid, __unused au_asid_t sid, __unused au_tid_t *tid) { return (NULL); } token_t * -au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, - pid_t pid, au_asid_t sid, au_tid_t *tid) +au_to_process(__unused au_id_t auid, __unused uid_t euid, + __unused gid_t egid, __unused uid_t ruid, __unused gid_t rgid, + __unused pid_t pid, __unused au_asid_t sid, __unused au_tid_t *tid) { return (au_to_process32(auid, euid, egid, ruid, rgid, pid, sid, @@ -1130,7 +1135,8 @@ } token_t * -au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod) +au_to_header64(__unused int rec_size, __unused au_event_t e_type, + __unused au_emod_t e_mod) { return (NULL); From owner-p4-projects@FreeBSD.ORG Sun Jan 29 20:34:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AB2116A425; Sun, 29 Jan 2006 20:34:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4039F16A420 for ; Sun, 29 Jan 2006 20:34:39 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C7A043D72 for ; Sun, 29 Jan 2006 20:34:35 +0000 (GMT) (envelope-from alc@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 k0TKYZhP092386 for ; Sun, 29 Jan 2006 20:34:35 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TKYZB1092383 for perforce@freebsd.org; Sun, 29 Jan 2006 20:34:35 GMT (envelope-from alc@freebsd.org) Date: Sun, 29 Jan 2006 20:34:35 GMT Message-Id: <200601292034.k0TKYZB1092383@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 20:34:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=90637 Change 90637 by alc@alc_home on 2006/01/29 20:34:30 Convert PQ_CACHE to a collection of buddy queues. Revert PQ_BUDDY to its original name PQ_FREE. Affected files ... .. //depot/projects/superpages/src/sys/kern/vfs_bio.c#6 edit .. //depot/projects/superpages/src/sys/vm/vm_buddy.c#8 edit .. //depot/projects/superpages/src/sys/vm/vm_fault.c#6 edit .. //depot/projects/superpages/src/sys/vm/vm_map.c#5 edit .. //depot/projects/superpages/src/sys/vm/vm_object.c#7 edit .. //depot/projects/superpages/src/sys/vm/vm_page.c#14 edit .. //depot/projects/superpages/src/sys/vm/vm_page.h#8 edit .. //depot/projects/superpages/src/sys/vm/vm_pageout.c#8 edit .. //depot/projects/superpages/src/sys/vm/vm_pageq.c#16 edit .. //depot/projects/superpages/src/sys/vm/vm_zeroidle.c#5 edit Differences ... ==== //depot/projects/superpages/src/sys/kern/vfs_bio.c#6 (text+ko) ==== @@ -2864,7 +2864,7 @@ * page daemon? */ if ((curproc != pageproc) && - (VM_PAGE_INQUEUE1(m, PQ_CACHE)) && + (m->flags & PG_CACHE) != 0 && ((cnt.v_free_count + cnt.v_cache_count) < (cnt.v_free_min + cnt.v_cache_min))) { pagedaemon_wakeup(); ==== //depot/projects/superpages/src/sys/vm/vm_buddy.c#8 (text+ko) ==== @@ -67,7 +67,7 @@ for (q=0; qphys_addr + i*PAGE_SIZE); INVARIANT(!m->reserv || m->flags & PG_CACHE); @@ -94,7 +94,7 @@ for (q = BUDDY_QUEUES - 1; q >= 0; q--) sbuf_printf(&sbuf, "%5.5d: %6.6dK, %6.6d\n", q, 1 << (PAGE_SHIFT - 10 + q), - vm_page_queues[PQ_BUDDY + q].lcnt); + vm_page_queues[PQ_FREE + q].lcnt); sbuf_finish(&sbuf); error = SYSCTL_OUT(req, sbuf_data(&sbuf), sbuf_len(&sbuf)); sbuf_delete(&sbuf); @@ -114,7 +114,7 @@ m, m->queue)); m->buddyq = q; m->queue = baseq + q; - if (baseq == PQ_CACHE || (m->flags & PG_ZERO) != 0) + if (baseq != PQ_FREE || (m->flags & PG_ZERO) != 0) TAILQ_INSERT_TAIL(&vm_page_queues[m->queue].pl, m, pageq); else TAILQ_INSERT_HEAD(&vm_page_queues[m->queue].pl, m, pageq); @@ -148,7 +148,7 @@ (1 << (PAGE_SHIFT + q)), ("vm_page_buddy_split: page %p is not page %p's %d buddy", m_buddy, m, q)); - buddy_insert(PQ_BUDDY, q, m_buddy); + buddy_insert(PQ_FREE, q, m_buddy); } } @@ -178,8 +178,8 @@ mtx_assert(&vm_page_queue_free_mtx, MA_OWNED); for (q = Q; q < BUDDY_QUEUES; q++) { - m = prefer_zero ? TAILQ_LAST(&vm_page_queues[PQ_BUDDY + q].pl, - pglist) : TAILQ_FIRST(&vm_page_queues[PQ_BUDDY + q].pl); + m = prefer_zero ? TAILQ_LAST(&vm_page_queues[PQ_FREE + q].pl, + pglist) : TAILQ_FIRST(&vm_page_queues[PQ_FREE + q].pl); if (m != NULL) { buddy_remove(m); vm_page_buddy_split(m, q, Q); @@ -212,7 +212,7 @@ { mtx_lock_spin(&vm_page_queue_free_mtx); - buddy_free_locked(PQ_BUDDY, m, q); + buddy_free_locked(PQ_FREE, m, q); mtx_unlock_spin(&vm_page_queue_free_mtx); } @@ -236,7 +236,7 @@ case PQ_CACHE: mtx_assert(&vm_page_queue_mtx, MA_OWNED); break; - case PQ_BUDDY: + case PQ_FREE: mtx_assert(&vm_page_queue_free_mtx, MA_OWNED); break; default: @@ -251,7 +251,7 @@ buddy = phys_to_vm_page(pa_buddy); if (buddy == NULL || buddy->buddyq != q || - (buddy->queue - buddy->buddyq) != baseq) + !VM_PAGE_INQUEUE1(buddy, baseq)) break; buddy_remove(buddy); q++; @@ -272,14 +272,20 @@ int q; mtx_assert(&vm_page_queue_mtx, MA_OWNED); - KASSERT(m->flags & PG_CACHE, ("xxx")); + KASSERT(m->flags & PG_CACHE, ("buddy_unfree: page %p isn't cached", m)); buddy = m; - for (q = 0; !VM_PAGE_INQUEUE1(buddy, PQ_CACHE) && - q < BUDDY_QUEUES; q++) { - buddy = PHYS_TO_VM_PAGE(m->phys_addr & + for (q = 0; !VM_PAGE_INQUEUE1(buddy, PQ_CACHE) && q < BUDDY_QUEUES;) { + q++; + buddy = phys_to_vm_page(m->phys_addr & (~(vm_paddr_t)0 << (PAGE_SHIFT + q))); + KASSERT(buddy != NULL, ("buddy_unfree: buddy page is NULL")); } - KASSERT(q == buddy->buddyq, ("xxx")); + KASSERT(q < BUDDY_QUEUES, + ("buddy_unfree: queue %d is out of range", q)); + KASSERT(buddy->buddyq >= q, + ("buddy_unfree: queue %d is less than buddy page %p's queue %d", + q, buddy, buddy->buddyq)); + q = buddy->buddyq; /* * m is in the free list as part of a chunk of size 1<phys_addr ^ (1 << (PAGE_SHIFT + q)); if (m->phys_addr < half) - other = phys_to_vm_page(half); + other = PHYS_TO_VM_PAGE(half); else { other = buddy; - buddy = phys_to_vm_page(half); + buddy = PHYS_TO_VM_PAGE(half); } buddy_insert(PQ_CACHE, q, other); } cnt.v_cache_count--; - KASSERT(buddy == m, ("yyy")); - KASSERT(m->queue == PQ_NONE, ("xxx")); + KASSERT(buddy == m, ("buddy_unfree: yyy")); + KASSERT(m->queue == PQ_NONE, ("buddy_unfree: xxx")); } /* @@ -328,7 +334,7 @@ for (Q = 0; (1 << Q) < npages; Q++); mtx_lock_spin(&vm_page_queue_free_mtx); for (q = min(Q, BUDDY_QUEUES - 1); q < BUDDY_QUEUES; q++) { - TAILQ_FOREACH(m_ret, &vm_page_queues[PQ_BUDDY + q].pl, pageq) { + TAILQ_FOREACH(m_ret, &vm_page_queues[PQ_FREE + q].pl, pageq) { /* * Is the size of this allocation request larger than * the largest block size? @@ -349,7 +355,7 @@ m = phys_to_vm_page(pa); if (m == NULL || m->buddyq != BUDDY_QUEUES - 1 || - (m->queue - m->buddyq) != PQ_BUDDY) + (m->queue - m->buddyq) != PQ_FREE) break; } /* If not, continue to the next block. */ @@ -397,7 +403,7 @@ KASSERT(m->queue == PQ_NONE, ("vm_page_alloc_contig: page %p has unexpected queue %d", m, m->queue)); - buddy_free_locked(PQ_BUDDY, m, 0); + buddy_free_locked(PQ_FREE, m, 0); } mtx_unlock_spin(&vm_page_queue_free_mtx); return (m_ret); ==== //depot/projects/superpages/src/sys/vm/vm_fault.c#6 (text+ko) ==== @@ -1011,7 +1011,7 @@ (m->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { vm_page_lock_queues(); - if (VM_PAGE_INQUEUE1(m, PQ_CACHE)) + if ((m->flags & PG_CACHE) != 0) vm_page_deactivate(m); mpte = pmap_enter_quick(pmap, addr, m, entry->protection, mpte); ==== //depot/projects/superpages/src/sys/vm/vm_map.c#5 (text+ko) ==== @@ -1426,7 +1426,7 @@ are_queues_locked = TRUE; vm_page_lock_queues(); } - if (VM_PAGE_INQUEUE1(p, PQ_CACHE)) + if ((p->flags & PG_CACHE) != 0) vm_page_deactivate(p); mpte = pmap_enter_quick(map->pmap, addr + ptoa(tmpidx), p, prot, mpte); ==== //depot/projects/superpages/src/sys/vm/vm_object.c#7 (text+ko) ==== @@ -705,7 +705,7 @@ curgeneration = object->generation; p = vm_page_lookup(object, tscan); if (p == NULL || p->valid == 0 || - VM_PAGE_INQUEUE1(p, PQ_CACHE)) { + (p->flags & PG_CACHE) != 0) { if (--scanlimit == 0) break; ++tscan; @@ -794,7 +794,7 @@ if (((p->flags & PG_CLEANCHK) == 0) || (pi < tstart) || (pi >= tend) || (p->valid == 0) || - VM_PAGE_INQUEUE1(p, PQ_CACHE)) { + (p->flags & PG_CACHE) != 0) { vm_page_flag_clear(p, PG_CLEANCHK); continue; } @@ -872,7 +872,7 @@ (tp->flags & PG_CLEANCHK) == 0) || (tp->busy != 0)) break; - if (VM_PAGE_INQUEUE1(tp, PQ_CACHE)) { + if ((tp->flags & PG_CACHE) != 0) { vm_page_flag_clear(tp, PG_CLEANCHK); break; } @@ -900,7 +900,7 @@ (tp->flags & PG_CLEANCHK) == 0) || (tp->busy != 0)) break; - if (VM_PAGE_INQUEUE1(tp, PQ_CACHE)) { + if ((tp->flags & PG_CACHE) != 0) { vm_page_flag_clear(tp, PG_CLEANCHK); break; } ==== //depot/projects/superpages/src/sys/vm/vm_page.c#14 (text+ko) ==== @@ -465,9 +465,9 @@ void vm_page_dirty(vm_page_t m) { - KASSERT(VM_PAGE_GETKNOWNQUEUE1(m) != PQ_CACHE, + KASSERT((m->flags & PG_CACHE) == 0, ("vm_page_dirty: page in cache!")); - KASSERT((m->queue - m->buddyq) != PQ_BUDDY, + KASSERT(VM_PAGE_GETKNOWNQUEUE1(m) != PQ_FREE, ("vm_page_dirty: page is free!")); m->dirty = VM_PAGE_BITS_ALL; } @@ -715,7 +715,7 @@ vm_page_remove(m); vm_page_insert(m, new_object, new_pindex); - if (VM_PAGE_INQUEUE1(m, PQ_CACHE)) + if ((m->flags & PG_CACHE) != 0) vm_page_deactivate(m); vm_page_dirty(m); } @@ -967,7 +967,7 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (VM_PAGE_GETKNOWNQUEUE2(m) != PQ_ACTIVE) { - if (VM_PAGE_INQUEUE1(m, PQ_CACHE)) + if ((m->flags & PG_CACHE) != 0) cnt.v_reactivated++; vm_pageq_remove(m); if (m->wire_count == 0 && (m->flags & PG_UNMANAGED) == 0) { @@ -1035,12 +1035,12 @@ ("vm_page_free_toq: freeing mapped page %p", m)); cnt.v_tfree++; - if (m->busy || ((m->queue - m->buddyq) == PQ_BUDDY)) { + if (m->busy || VM_PAGE_INQUEUE1(m, PQ_FREE)) { printf( "vm_page_free: pindex(%lu), busy(%d), PG_BUSY(%d), hold(%d)\n", (u_long)m->pindex, m->busy, (m->flags & PG_BUSY) ? 1 : 0, m->hold_count); - if ((m->queue - m->buddyq) == PQ_BUDDY) + if (VM_PAGE_INQUEUE1(m, PQ_FREE)) panic("vm_page_free: freeing free page"); else panic("vm_page_free: freeing busy page"); @@ -1090,7 +1090,7 @@ mtx_lock_spin(&vm_page_queue_free_mtx); if (m->flags & PG_ZERO) ++vm_page_zero_count; - buddy_free_locked(PQ_BUDDY, m, 0); + buddy_free_locked(PQ_FREE, m, 0); mtx_unlock_spin(&vm_page_queue_free_mtx); vm_page_free_wakeup(); } @@ -1233,7 +1233,7 @@ if (VM_PAGE_INQUEUE2(m, PQ_INACTIVE)) return; if (m->wire_count == 0 && (m->flags & PG_UNMANAGED) == 0) { - if (VM_PAGE_INQUEUE1(m, PQ_CACHE)) + if ((m->flags & PG_CACHE) != 0) cnt.v_reactivated++; vm_page_flag_clear(m, PG_WINATCFLS); vm_pageq_remove(m); @@ -1317,7 +1317,7 @@ printf("vm_page_cache: attempting to cache busy page\n"); return; } - if (VM_PAGE_INQUEUE1(m, PQ_CACHE)) + if ((m->flags & PG_CACHE) != 0) return; /* @@ -1330,6 +1330,7 @@ (long)m->pindex); } vm_pageq_remove_nowakeup(m); + vm_page_flag_set(m, PG_CACHE); vm_pageq_enqueue(PQ_CACHE, m); vm_page_free_wakeup(); } @@ -1370,7 +1371,7 @@ */ if ((dnw & 0x01F0) == 0 || VM_PAGE_INQUEUE2(m, PQ_INACTIVE) || - VM_PAGE_INQUEUE1(m, PQ_CACHE) + (m->flags & PG_CACHE) != 0 ) { if (m->act_count >= ACT_INIT) --m->act_count; @@ -1745,13 +1746,17 @@ DB_SHOW_COMMAND(pageq, vm_page_print_pageq_info) { int i; - db_printf("PQ_BUDDY:"); + db_printf("PQ_FREE:"); for (i = 0; i < BUDDY_QUEUES; i++) { - db_printf(" %d", vm_page_queues[PQ_BUDDY + i].lcnt); + db_printf(" %d", vm_page_queues[PQ_FREE + i].lcnt); } db_printf("\n"); - db_printf("PQ_CACHE: %d\n", vm_page_queues[PQ_CACHE].lcnt); + db_printf("PQ_CACHE:"); + for (i = 0; i < BUDDY_QUEUES; i++) { + db_printf(" %d", vm_page_queues[PQ_CACHE + i].lcnt); + } + db_printf("\n"); db_printf("PQ_ACTIVE: %d, PQ_INACTIVE: %d\n", vm_page_queues[PQ_ACTIVE].lcnt, ==== //depot/projects/superpages/src/sys/vm/vm_page.h#8 (text+ko) ==== @@ -145,29 +145,29 @@ /* PQ_CACHE and PQ_FREE represents a PQ_NUMCOLORS consecutive queue. */ #define PQ_NONE 0 -#define PQ_BUDDY 1 +#define PQ_FREE 1 #define PQ_INACTIVE (1 + BUDDY_QUEUES) #define PQ_ACTIVE (2 + BUDDY_QUEUES) #define PQ_CACHE (3 + BUDDY_QUEUES) -#define PQ_HOLD (4 + BUDDY_QUEUES) -#define PQ_COUNT (5 + BUDDY_QUEUES) +#define PQ_HOLD (3 + BUDDY_QUEUES*2) +#define PQ_COUNT (4 + BUDDY_QUEUES*2) /* Returns the real queue a page is on. */ #define VM_PAGE_GETQUEUE(m) ((m)->queue) /* Returns the well known queue a page is on. */ -#define VM_PAGE_GETKNOWNQUEUE1(m) ((m)->queue) +#define VM_PAGE_GETKNOWNQUEUE1(m) ((m)->queue - (m)->buddyq) #define VM_PAGE_GETKNOWNQUEUE2(m) VM_PAGE_GETQUEUE(m) /* Given the real queue number and a page color return the well know queue. */ -#define VM_PAGE_RESOLVEQUEUE(m, q) ((q)) +#define VM_PAGE_RESOLVEQUEUE(m, q) ((q) - (m)->buddyq) /* Returns true if the page is in the named well known queue. */ #define VM_PAGE_INQUEUE1(m, q) (VM_PAGE_GETKNOWNQUEUE1(m) == (q)) #define VM_PAGE_INQUEUE2(m, q) (VM_PAGE_GETKNOWNQUEUE2(m) == (q)) /* Sets the queue a page is on. */ -#define VM_PAGE_SETQUEUE1(m, q) (VM_PAGE_GETQUEUE(m) = (q)) +#define VM_PAGE_SETQUEUE1(m, q) (VM_PAGE_GETQUEUE(m) = (q) + (m)->buddyq) #define VM_PAGE_SETQUEUE2(m, q) (VM_PAGE_GETQUEUE(m) = (q)) struct vpgqueues { ==== //depot/projects/superpages/src/sys/vm/vm_pageout.c#8 (text+ko) ==== @@ -337,7 +337,7 @@ ib = 0; break; } - if (VM_PAGE_INQUEUE1(p, PQ_CACHE) || + if ((p->flags & PG_CACHE) != 0 || (p->flags & (PG_BUSY|PG_UNMANAGED)) || p->busy) { ib = 0; break; @@ -367,7 +367,7 @@ if ((p = vm_page_lookup(object, pindex + is)) == NULL) break; - if (VM_PAGE_INQUEUE1(p, PQ_CACHE) || + if ((p->flags & PG_CACHE) != 0 || (p->flags & (PG_BUSY|PG_UNMANAGED)) || p->busy) { break; } ==== //depot/projects/superpages/src/sys/vm/vm_pageq.c#16 (text+ko) ==== @@ -58,9 +58,11 @@ int i; for (i = 0; i < BUDDY_QUEUES; i++) { - vm_page_queues[PQ_BUDDY+i].cnt = &cnt.v_free_count; + vm_page_queues[PQ_FREE+i].cnt = &cnt.v_free_count; + } + for (i = 0; i < BUDDY_QUEUES; i++) { + vm_page_queues[PQ_CACHE + i].cnt = &cnt.v_cache_count; } - vm_page_queues[PQ_CACHE].cnt = &cnt.v_cache_count; vm_page_queues[PQ_INACTIVE].cnt = &cnt.v_inactive_count; vm_page_queues[PQ_ACTIVE].cnt = &cnt.v_active_count; vm_page_queues[PQ_HOLD].cnt = &cnt.v_active_count; @@ -204,9 +206,5 @@ TAILQ_REMOVE(&pq->pl, m, pageq); (*pq->cnt)--; pq->lcnt--; - if (VM_PAGE_RESOLVEQUEUE(m, queue) == PQ_CACHE) { - if (vm_paging_needed()) - pagedaemon_wakeup(); - } } } ==== //depot/projects/superpages/src/sys/vm/vm_zeroidle.c#5 (text+ko) ==== @@ -106,14 +106,14 @@ mtx_lock_spin(&vm_page_queue_free_mtx); zero_state = 0; - m = TAILQ_FIRST(&vm_page_queues[PQ_BUDDY].pl); + m = TAILQ_FIRST(&vm_page_queues[PQ_FREE].pl); if (m != NULL && (m->flags & PG_ZERO) == 0) { vm_pageq_remove_nowakeup(m); mtx_unlock_spin(&vm_page_queue_free_mtx); pmap_zero_page_idle(m); mtx_lock_spin(&vm_page_queue_free_mtx); m->flags |= PG_ZERO; - vm_pageq_enqueue(PQ_BUDDY, m); + vm_pageq_enqueue(PQ_FREE, m); ++vm_page_zero_count; ++cnt_prezero; if (vm_page_zero_count >= ZIDLE_HI(cnt.v_free_count)) From owner-p4-projects@FreeBSD.ORG Sun Jan 29 20:39:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 480FE16A423; Sun, 29 Jan 2006 20:39:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C4F716A420 for ; Sun, 29 Jan 2006 20:39:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B685243D45 for ; Sun, 29 Jan 2006 20:39:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0TKdgQ5092632 for ; Sun, 29 Jan 2006 20:39:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TKdgqj092629 for perforce@freebsd.org; Sun, 29 Jan 2006 20:39:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 20:39:42 GMT Message-Id: <200601292039.k0TKdgqj092629@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90639 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 20:39:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=90639 Change 90639 by rwatson@rwatson_peppercorn on 2006/01/29 20:38:59 style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#14 (text+ko) ==== @@ -30,37 +30,37 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#14 $ */ #ifndef _BSM_AUDIT_H #define _BSM_AUDIT_H #define AUDIT_RECORD_MAGIC 0x828a0f1b -#define MAX_AUDIT_RECORDS 20 -#define MAX_AUDIT_RECORD_SIZE 4096 -#define MIN_AUDIT_FILE_SIZE (512 * 1024) +#define MAX_AUDIT_RECORDS 20 +#define MAX_AUDIT_RECORD_SIZE 4096 +#define MIN_AUDIT_FILE_SIZE (512 * 1024) /* * Triggers for the audit daemon */ -#define AUDIT_TRIGGER_MIN 1 -#define AUDIT_TRIGGER_LOW_SPACE 1 -#define AUDIT_TRIGGER_OPEN_NEW 2 -#define AUDIT_TRIGGER_READ_FILE 3 -#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 -#define AUDIT_TRIGGER_NO_SPACE 5 -#define AUDIT_TRIGGER_MAX 5 +#define AUDIT_TRIGGER_MIN 1 +#define AUDIT_TRIGGER_LOW_SPACE 1 +#define AUDIT_TRIGGER_OPEN_NEW 2 +#define AUDIT_TRIGGER_READ_FILE 3 +#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 +#define AUDIT_TRIGGER_NO_SPACE 5 +#define AUDIT_TRIGGER_MAX 5 /* * File that will be read for trigger events from the kernel */ -#define AUDIT_TRIGGER_FILE "/dev/audit" +#define AUDIT_TRIGGER_FILE "/dev/audit" /* * Pre-defined audit IDs */ -#define AU_DEFAUDITID -1 +#define AU_DEFAUDITID -1 /* * Define the masks for the classes of audit events. @@ -103,71 +103,74 @@ /* * IPC types */ -#define AT_IPC_MSG ((u_char)1) /* message IPC id */ -#define AT_IPC_SEM ((u_char)2) /* semaphore IPC id */ -#define AT_IPC_SHM ((u_char)3) /* shared mem IPC id */ +#define AT_IPC_MSG ((u_char)1) /* Message IPC id. */ +#define AT_IPC_SEM ((u_char)2) /* Semaphore IPC id. */ +#define AT_IPC_SHM ((u_char)3) /* Shared mem IPC id. */ /* * Audit conditions. */ -#define AUC_UNSET 0 -#define AUC_AUDITING 1 -#define AUC_NOAUDIT 2 -#define AUC_DISABLED -1 +#define AUC_UNSET 0 +#define AUC_AUDITING 1 +#define AUC_NOAUDIT 2 +#define AUC_DISABLED -1 /* * auditon(2) commands. */ -#define A_GETPOLICY 2 -#define A_SETPOLICY 3 -#define A_GETKMASK 4 -#define A_SETKMASK 5 +#define A_GETPOLICY 2 +#define A_SETPOLICY 3 +#define A_GETKMASK 4 +#define A_SETKMASK 5 #define A_GETQCTRL 6 -#define A_SETQCTRL 7 -#define A_GETCWD 8 -#define A_GETCAR 9 -#define A_GETSTAT 12 -#define A_SETSTAT 13 +#define A_SETQCTRL 7 +#define A_GETCWD 8 +#define A_GETCAR 9 +#define A_GETSTAT 12 +#define A_SETSTAT 13 #define A_SETUMASK 14 -#define A_SETSMASK 15 -#define A_GETCOND 20 -#define A_SETCOND 21 -#define A_GETCLASS 22 -#define A_SETCLASS 23 -#define A_GETPINFO 24 -#define A_SETPMASK 25 -#define A_SETFSIZE 26 -#define A_GETFSIZE 27 -#define A_GETPINFO_ADDR 28 -#define A_GETKAUDIT 29 -#define A_SETKAUDIT 30 -#define A_SENDTRIGGER 31 +#define A_SETSMASK 15 +#define A_GETCOND 20 +#define A_SETCOND 21 +#define A_GETCLASS 22 +#define A_SETCLASS 23 +#define A_GETPINFO 24 +#define A_SETPMASK 25 +#define A_SETFSIZE 26 +#define A_GETFSIZE 27 +#define A_GETPINFO_ADDR 28 +#define A_GETKAUDIT 29 +#define A_SETKAUDIT 30 +#define A_SENDTRIGGER 31 /* * Audit policy controls. */ -#define AUDIT_CNT 0x0001 -#define AUDIT_AHLT 0x0002 -#define AUDIT_ARGV 0x0004 -#define AUDIT_ARGE 0x0008 -#define AUDIT_PASSWD 0x0010 -#define AUDIT_SEQ 0x0020 -#define AUDIT_WINDATA 0x0040 -#define AUDIT_USER 0x0080 -#define AUDIT_GROUP 0x0100 -#define AUDIT_TRAIL 0x0200 -#define AUDIT_PATH 0x0400 +#define AUDIT_CNT 0x0001 +#define AUDIT_AHLT 0x0002 +#define AUDIT_ARGV 0x0004 +#define AUDIT_ARGE 0x0008 +#define AUDIT_PASSWD 0x0010 +#define AUDIT_SEQ 0x0020 +#define AUDIT_WINDATA 0x0040 +#define AUDIT_USER 0x0080 +#define AUDIT_GROUP 0x0100 +#define AUDIT_TRAIL 0x0200 +#define AUDIT_PATH 0x0400 /* * Audit queue control parameters */ -#define AQ_HIWATER 100 -#define AQ_MAXHIGH 10000 -#define AQ_LOWATER 10 -#define AQ_BUFSZ 1024 -#define AQ_MAXBUFSZ 1048576 +#define AQ_HIWATER 100 +#define AQ_MAXHIGH 10000 +#define AQ_LOWATER 10 +#define AQ_BUFSZ 1024 +#define AQ_MAXBUFSZ 1048576 -#define AU_FS_MINFREE 20 /* default min filesystem freespace, in percent */ +/* + * Default minimum percentage free space on file system. + */ +#define AU_FS_MINFREE 20 /* * Type definitions used indicating the length of variable length addresses @@ -178,83 +181,83 @@ __BEGIN_DECLS -typedef uid_t au_id_t; -typedef pid_t au_asid_t; -typedef u_int16_t au_event_t; -typedef u_int16_t au_emod_t; -typedef u_int32_t au_class_t; +typedef uid_t au_id_t; +typedef pid_t au_asid_t; +typedef u_int16_t au_event_t; +typedef u_int16_t au_emod_t; +typedef u_int32_t au_class_t; struct au_tid { - dev_t port; - u_int32_t machine; + dev_t port; + u_int32_t machine; }; -typedef struct au_tid au_tid_t; +typedef struct au_tid au_tid_t; struct au_tid_addr { - dev_t at_port; - u_int32_t at_type; - u_int32_t at_addr[4]; + dev_t at_port; + u_int32_t at_type; + u_int32_t at_addr[4]; }; -typedef struct au_tid_addr au_tid_addr_t; +typedef struct au_tid_addr au_tid_addr_t; struct au_mask { - unsigned int am_success; /* success bits */ - unsigned int am_failure; /* failure bits */ + unsigned int am_success; /* Success bits. */ + unsigned int am_failure; /* Failure bits. */ }; -typedef struct au_mask au_mask_t; +typedef struct au_mask au_mask_t; struct auditinfo { - au_id_t ai_auid; /* Audit user ID */ - au_mask_t ai_mask; /* Audit masks */ - au_tid_t ai_termid; /* Terminal ID */ - au_asid_t ai_asid; /* Audit session ID */ + au_id_t ai_auid; /* Audit user ID. */ + au_mask_t ai_mask; /* Audit masks. */ + au_tid_t ai_termid; /* Terminal ID. */ + au_asid_t ai_asid; /* Audit session ID. */ }; -typedef struct auditinfo auditinfo_t; +typedef struct auditinfo auditinfo_t; struct auditinfo_addr { - au_id_t ai_auid; /* Audit user ID */ - au_mask_t ai_mask; /* Audit masks */ - au_tid_addr_t ai_termid; /* Terminal ID */ - au_asid_t ai_asid; /* Audit session ID */ + au_id_t ai_auid; /* Audit user ID. */ + au_mask_t ai_mask; /* Audit masks. */ + au_tid_addr_t ai_termid; /* Terminal ID. */ + au_asid_t ai_asid; /* Audit session ID. */ }; -typedef struct auditinfo_addr auditinfo_addr_t; +typedef struct auditinfo_addr auditinfo_addr_t; struct auditpinfo { - pid_t ap_pid; /* ID of target process */ - au_id_t ap_auid; /* Audit user ID */ - au_mask_t ap_mask; /* Audit masks */ - au_tid_t ap_termid; /* Terminal ID */ - au_asid_t ap_asid; /* Audit session ID */ + pid_t ap_pid; /* ID of target process. */ + au_id_t ap_auid; /* Audit user ID. */ + au_mask_t ap_mask; /* Audit masks. */ + au_tid_t ap_termid; /* Terminal ID. */ + au_asid_t ap_asid; /* Audit session ID. */ }; -typedef struct auditpinfo auditpinfo_t; +typedef struct auditpinfo auditpinfo_t; struct auditpinfo_addr { - pid_t ap_pid; /* ID of target process */ - au_id_t ap_auid; /* Audit user ID */ - au_mask_t ap_mask; /* Audit masks */ - au_tid_addr_t ap_termid; /* Terminal ID */ - au_asid_t ap_asid; /* Audit session ID */ + pid_t ap_pid; /* ID of target process. */ + au_id_t ap_auid; /* Audit user ID. */ + au_mask_t ap_mask; /* Audit masks. */ + au_tid_addr_t ap_termid; /* Terminal ID. */ + au_asid_t ap_asid; /* Audit session ID. */ }; -typedef struct auditpinfo_addr auditpinfo_addr_t; +typedef struct auditpinfo_addr auditpinfo_addr_t; -/* Token and record structures */ +/* Token and record structures. */ struct au_token { - u_char *t_data; - size_t len; - TAILQ_ENTRY(au_token) tokens; + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; }; -typedef struct au_token token_t; +typedef struct au_token token_t; struct au_record { - char used; /* Is this record currently being used */ - int desc; /* The descriptor associated with this record */ - TAILQ_HEAD(, au_token) token_q; /* queue of BSM tokens */ - u_char *data; - size_t len; - LIST_ENTRY(au_record) au_rec_q; + char used; /* Record currently in use? */ + int desc; /* Descriptor for record. */ + TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ + u_char *data; + size_t len; + LIST_ENTRY(au_record) au_rec_q; }; -typedef struct au_record au_record_t; +typedef struct au_record au_record_t; /* * Kernel audit queue control parameters. @@ -264,59 +267,59 @@ size_t aq_lowater; size_t aq_bufsz; clock_t aq_delay; - int aq_minfree; /* minimum filesystem percent free space */ + int aq_minfree; /* Minimum filesystem percent free space. */ }; -typedef struct au_qctrl au_qctrl_t; +typedef struct au_qctrl au_qctrl_t; /* * Structure for the audit statistics. */ struct audit_stat { - unsigned int as_version; - unsigned int as_numevent; - int as_generated; - int as_nonattring; - int as_kernel; - int as_audit; - int as_auditctl; - int as_enqueu; - int as_written; - int as_wblocked; - int as_rblocked; - int as_dropped; - int as_totalsize; - unsigned int as_memused; + unsigned int as_version; + unsigned int as_numevent; + int as_generated; + int as_nonattring; + int as_kernel; + int as_audit; + int as_auditctl; + int as_enqueu; + int as_written; + int as_wblocked; + int as_rblocked; + int as_dropped; + int as_totalsize; + unsigned int as_memused; }; -typedef struct audit_stat au_stat_t; +typedef struct audit_stat au_stat_t; /* * Structure for the audit file statistics. */ struct audit_fstat { - u_quad_t af_filesz; - u_quad_t af_currsz; + u_quad_t af_filesz; + u_quad_t af_currsz; }; -typedef struct audit_fstat au_fstat_t; +typedef struct audit_fstat au_fstat_t; /* * Audit to event class mapping. */ struct au_evclass_map { - au_event_t ec_number; - au_class_t ec_class; + au_event_t ec_number; + au_class_t ec_class; }; -typedef struct au_evclass_map au_evclass_map_t; +typedef struct au_evclass_map au_evclass_map_t; #if !defined(_KERNEL) && !defined(KERNEL) -int audit(const void *, int); -int auditon(int, void *, int); -int auditctl(const char *); -int getauid(au_id_t *); -int setauid(const au_id_t *); -int getaudit(struct auditinfo *); -int setaudit(const struct auditinfo *); -int getaudit_addr(struct auditinfo_addr *, int); -int setaudit_addr(const struct auditinfo_addr *, int); +int audit(const void *, int); +int auditon(int, void *, int); +int auditctl(const char *); +int getauid(au_id_t *); +int setauid(const au_id_t *); +int getaudit(struct auditinfo *); +int setaudit(const struct auditinfo *); +int getaudit_addr(struct auditinfo_addr *, int); +int setaudit_addr(const struct auditinfo_addr *, int); #endif /* defined(_KERNEL) || defined(KERNEL) */ __END_DECLS From owner-p4-projects@FreeBSD.ORG Sun Jan 29 20:42:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B477B16A423; Sun, 29 Jan 2006 20:42:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 716E216A420 for ; Sun, 29 Jan 2006 20:42:10 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E04F143D46 for ; Sun, 29 Jan 2006 20:42:09 +0000 (GMT) (envelope-from sam@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 k0TKg97i092775 for ; Sun, 29 Jan 2006 20:42:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TKfRCp092748 for perforce@freebsd.org; Sun, 29 Jan 2006 20:41:27 GMT (envelope-from sam@freebsd.org) Date: Sun, 29 Jan 2006 20:41:27 GMT Message-Id: <200601292041.k0TKfRCp092748@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 90640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 20:42:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=90640 Change 90640 by sam@sam_ebb on 2006/01/29 20:40:25 IFC @ 90638 Affected files ... .. //depot/projects/wifi/COPYRIGHT#3 integrate .. //depot/projects/wifi/LOCKS#2 integrate .. //depot/projects/wifi/MAINTAINERS#11 integrate .. //depot/projects/wifi/Makefile#12 integrate .. //depot/projects/wifi/Makefile.inc1#26 integrate .. //depot/projects/wifi/ObsoleteFiles.inc#6 integrate .. //depot/projects/wifi/UPDATING#22 integrate .. //depot/projects/wifi/bin/setfacl/setfacl.1#5 integrate .. //depot/projects/wifi/bin/sh/builtins.def#3 integrate .. //depot/projects/wifi/bin/sh/eval.c#4 integrate .. //depot/projects/wifi/bin/sh/eval.h#2 integrate .. //depot/projects/wifi/bin/sh/jobs.c#4 integrate .. //depot/projects/wifi/bin/sh/output.c#2 integrate .. //depot/projects/wifi/bin/sh/sh.1#10 integrate .. //depot/projects/wifi/bin/sh/trap.c#3 integrate .. //depot/projects/wifi/contrib/bc/bc/main.c#3 integrate .. //depot/projects/wifi/contrib/bind9/CHANGES#3 integrate .. //depot/projects/wifi/contrib/bind9/FAQ#3 integrate .. //depot/projects/wifi/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/wifi/contrib/bind9/FREEBSD-Upgrade#5 integrate .. //depot/projects/wifi/contrib/bind9/FREEBSD-Xlist#3 integrate .. //depot/projects/wifi/contrib/bind9/README#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/wifi/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/wifi/contrib/bind9/config.threads.in#1 branch .. //depot/projects/wifi/contrib/bind9/configure.in#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/wifi/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/isc.color.gif#2 delete .. //depot/projects/wifi/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete .. //depot/projects/wifi/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete .. //depot/projects/wifi/contrib/bind9/doc/arm/validate.sh.in#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc3757.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc3901.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4025.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4033.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4034.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4035.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4074.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4159.txt#1 branch .. //depot/projects/wifi/contrib/bind9/lib/bind/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/port_after.h.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/getaddresses.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/print.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/strtoul.c#1 branch .. //depot/projects/wifi/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/wifi/contrib/bind9/version#3 integrate .. //depot/projects/wifi/contrib/bsnmp/gensnmptree/gensnmptree.c#5 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII.c#5 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/config.c#3 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/main.c#6 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/snmpd.config#3 integrate .. //depot/projects/wifi/contrib/cpio/doc/cpio.1#2 integrate .. //depot/projects/wifi/contrib/cpio/doc/cpio.texi#2 integrate .. //depot/projects/wifi/contrib/cpio/src/copyin.c#2 integrate .. //depot/projects/wifi/contrib/cpio/src/copyout.c#2 integrate .. //depot/projects/wifi/contrib/cpio/src/copypass.c#2 integrate .. //depot/projects/wifi/contrib/cpio/src/extern.h#2 integrate .. //depot/projects/wifi/contrib/cpio/src/global.c#2 integrate .. //depot/projects/wifi/contrib/cpio/src/main.c#2 integrate .. //depot/projects/wifi/contrib/groff/tmac/doc-common#5 integrate .. //depot/projects/wifi/contrib/groff/tmac/groff_mdoc.man#4 integrate .. //depot/projects/wifi/contrib/ipfilter/BSD/Makefile#3 integrate .. //depot/projects/wifi/contrib/ipfilter/BSD/Makefile.ipsend#3 integrate .. //depot/projects/wifi/contrib/ipfilter/BSD/kupgrade#3 integrate .. //depot/projects/wifi/contrib/ipfilter/HISTORY#3 integrate .. //depot/projects/wifi/contrib/ipfilter/Makefile#3 integrate .. //depot/projects/wifi/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/ipf.h#3 integrate .. //depot/projects/wifi/contrib/ipfilter/iplang/iplang_l.l#3 integrate .. //depot/projects/wifi/contrib/ipfilter/iplang/iplang_y.y#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipmon.h#2 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsd/ipsd.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsd/ipsdr.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/arp.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/ip.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/ipresend.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/ipsend.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/ipsopt.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/iptest.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/iptests.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/larp.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/lsock.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/resend.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/sbpf.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/sdlpi.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/slinux.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/snit.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/sock.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/tcpip.h#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipt.h#3 integrate .. //depot/projects/wifi/contrib/ipfilter/kmem.h#3 integrate .. //depot/projects/wifi/contrib/ipfilter/l4check/http.ok#3 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/addipopt.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/addkeep.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/binprint.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/buildopts.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/checkrev.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/count4bits.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/count6bits.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/debug.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/extras.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/facpri.h#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/fill6bits.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/flags.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/genmask.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/getline.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/getnattype.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/getproto.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/hostmask.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/hostnum.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/inet_addr.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/initparse.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/ionames.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/ipft_ef.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/ipft_hx.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/ipft_pc.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/ipft_sn.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/ipft_td.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/ipoptsec.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/kmem.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/kmem.h#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/load_hash.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/load_hashnode.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/load_pool.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/load_poolnode.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/loglevel.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/make_range.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/nat_setgroupmap.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/natparse.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/optname.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/optprintv6.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/optvalue.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/parse.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/portname.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/portnum.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/ports.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/print_toif.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printactivenat.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printaps.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printbuf.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printfraginfo.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printhostmap.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printhostmask.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printifname.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printip.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printmask.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printnat.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printpacket.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printportcmp.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printproto.c#1 branch .. //depot/projects/wifi/contrib/ipfilter/lib/printstate.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/ratoi.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/ratoui.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/remove_hash.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/remove_hashnode.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/remove_pool.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/remove_poolnode.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/tcp_flags.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/tcpflags.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/tcpoptnames.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/to_interface.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/v6ionames.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/v6optvalue.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/verbose.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/man/ipf.5#3 integrate .. //depot/projects/wifi/contrib/ipfilter/man/ipftest.1#3 integrate .. //depot/projects/wifi/contrib/ipfilter/man/ipmon.8#3 integrate .. //depot/projects/wifi/contrib/ipfilter/man/ipnat.5#3 integrate .. //depot/projects/wifi/contrib/ipfilter/man/ipnat.8#3 integrate .. //depot/projects/wifi/contrib/ipfilter/mlfk_rule.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/opts.h#2 integrate .. //depot/projects/wifi/contrib/ipfilter/perl/ipf-mrtg.pl#3 integrate .. //depot/projects/wifi/contrib/ipfilter/perl/logfilter.pl#3 integrate .. //depot/projects/wifi/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/radix_ipf.h#2 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.1#3 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.10#3 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.11#3 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.12#3 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.13#3 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.2#3 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.3#3 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.4#3 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.5#3 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.6#3 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.7#3 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.8#3 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.9#3 integrate .. //depot/projects/wifi/contrib/ipfilter/rules/example.sr#3 integrate .. //depot/projects/wifi/contrib/ipfilter/samples/ipfilter-pb.gif#3 integrate .. //depot/projects/wifi/contrib/ipfilter/samples/proxy.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/samples/relay.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/snoop.h#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/Makefile#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/dotest#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/bpf1#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/f13#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/f17#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/f18#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/f19#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/f7#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/f9#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i1#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i11#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i12#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i14#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i16#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/i17#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/i18#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/i19#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/i2#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i20#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/i21#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/i4#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i6#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i7#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i8#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i9#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/in1#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/in2#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/in5#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/in6#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/n1#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/n11#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/n13#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/n14#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/n2#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/n3#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/n4#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/n5#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/n6#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/n7#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/p1#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/p2#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/p3#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/input/f13#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/input/f17#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/input/f18#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/input/f19#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/input/f7#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/input/f9#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/input/n13#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/input/n14#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/input/ni17#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/itest#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/natipftest#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/bpf1#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/f13#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/f18#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/f19#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/f7#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i1#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i11#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i12#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i14#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i16#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/i17#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/i18#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/i19#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/i2#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i20#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/i21#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/i4#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i6#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i7#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i8#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i9#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/in1#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/in2#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/in5#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/in6#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/n13#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/n14#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/ni17.nat#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/p2.ipf#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/vfycksum.pl#3 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipf.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipf_y.y#3 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipfcomp.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipftest.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipmon.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipnat.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipsyncm.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipsyncs.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-bpf.c#3 integrate .. //depot/projects/wifi/contrib/pf/authpf/authpf.c#3 integrate .. //depot/projects/wifi/contrib/texinfo/util/texindex.c#3 integrate .. //depot/projects/wifi/contrib/traceroute/traceroute.c#3 integrate .. //depot/projects/wifi/crypto/heimdal/lib/gssapi/gssapi_locl.h#2 integrate .. //depot/projects/wifi/crypto/openssh/sshd.c#5 integrate .. //depot/projects/wifi/etc/Makefile#11 integrate .. //depot/projects/wifi/etc/defaults/Makefile#5 integrate .. //depot/projects/wifi/etc/defaults/periodic.conf#5 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#22 integrate .. //depot/projects/wifi/etc/devd.conf#13 integrate .. //depot/projects/wifi/etc/gettytab#2 integrate .. //depot/projects/wifi/etc/gss/Makefile#1 branch .. //depot/projects/wifi/etc/gss/mech#1 branch .. //depot/projects/wifi/etc/gss/qop#1 branch .. //depot/projects/wifi/etc/mtree/BSD.include.dist#11 integrate .. //depot/projects/wifi/etc/mtree/BSD.local.dist#6 integrate .. //depot/projects/wifi/etc/mtree/BSD.root.dist#3 integrate .. //depot/projects/wifi/etc/mtree/BSD.x11.dist#2 integrate .. //depot/projects/wifi/etc/periodic/daily/406.status-gmirror#1 branch .. //depot/projects/wifi/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/wifi/etc/pf.conf#2 integrate .. //depot/projects/wifi/etc/portsnap.conf#3 integrate .. //depot/projects/wifi/etc/rc#3 integrate .. //depot/projects/wifi/etc/rc.d/Makefile#14 integrate .. //depot/projects/wifi/etc/rc.d/NETWORKING#3 integrate .. //depot/projects/wifi/etc/rc.d/abi#2 integrate .. //depot/projects/wifi/etc/rc.d/addswap#2 integrate .. //depot/projects/wifi/etc/rc.d/amd#3 integrate .. //depot/projects/wifi/etc/rc.d/cleanvar#4 integrate .. //depot/projects/wifi/etc/rc.d/cleartmp#3 integrate .. //depot/projects/wifi/etc/rc.d/devfs#2 integrate .. //depot/projects/wifi/etc/rc.d/dumpon#5 integrate .. //depot/projects/wifi/etc/rc.d/ftpd#1 branch .. //depot/projects/wifi/etc/rc.d/initrandom#3 integrate .. //depot/projects/wifi/etc/rc.d/ipsec#3 integrate .. //depot/projects/wifi/etc/rc.d/ldconfig#4 integrate .. //depot/projects/wifi/etc/rc.d/localpkg#3 integrate .. //depot/projects/wifi/etc/rc.d/mixer#3 integrate .. //depot/projects/wifi/etc/rc.d/mountcritremote#4 integrate .. //depot/projects/wifi/etc/rc.d/newsyslog#4 integrate .. //depot/projects/wifi/etc/rc.d/ntpd#3 integrate .. //depot/projects/wifi/etc/rc.d/ntpdate#3 integrate .. //depot/projects/wifi/etc/rc.d/power_profile#5 integrate .. //depot/projects/wifi/etc/rc.d/rcconf.sh#3 delete .. //depot/projects/wifi/etc/rc.d/resolv#3 integrate .. //depot/projects/wifi/etc/rc.d/root#2 integrate .. //depot/projects/wifi/etc/rc.d/syscons#2 integrate .. //depot/projects/wifi/etc/rc.d/syslogd#2 integrate .. //depot/projects/wifi/etc/rc.d/tmp#3 integrate .. //depot/projects/wifi/etc/rc.d/usbd#2 delete .. //depot/projects/wifi/etc/rc.initdiskless#6 integrate .. //depot/projects/wifi/etc/rc.shutdown#3 integrate .. //depot/projects/wifi/etc/rc.subr#8 integrate .. //depot/projects/wifi/etc/services#2 integrate .. //depot/projects/wifi/etc/snmpd.config#2 integrate .. //depot/projects/wifi/etc/usbd.conf#4 delete .. //depot/projects/wifi/games/fortune/datfiles/fortunes#18 integrate .. //depot/projects/wifi/games/fortune/datfiles/limerick#5 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/cc_int/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/cvs/cvs/Makefile#4 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/main.c#9 integrate .. //depot/projects/wifi/gnu/usr.bin/grep/grep.1#4 integrate .. //depot/projects/wifi/gnu/usr.bin/groff/tmac/mdoc.local#7 integrate .. //depot/projects/wifi/gnu/usr.bin/man/man/man.c#2 integrate .. //depot/projects/wifi/gnu/usr.bin/man/man/man.man#4 integrate .. //depot/projects/wifi/include/Makefile#19 integrate .. //depot/projects/wifi/include/dlfcn.h#2 integrate .. //depot/projects/wifi/include/gssapi.h#1 branch .. //depot/projects/wifi/include/gssapi/Makefile#1 branch .. //depot/projects/wifi/include/gssapi/gssapi.h#1 branch .. //depot/projects/wifi/include/kenv.h#2 integrate .. //depot/projects/wifi/include/mqueue.h#1 branch .. //depot/projects/wifi/include/nl_types.h#3 integrate .. //depot/projects/wifi/include/printf.h#1 branch .. //depot/projects/wifi/include/rpcsvc/yp_prot.h#2 integrate .. //depot/projects/wifi/include/stdio.h#2 integrate .. //depot/projects/wifi/include/stdlib.h#4 integrate .. //depot/projects/wifi/include/string.h#4 integrate .. //depot/projects/wifi/include/unistd.h#6 integrate .. //depot/projects/wifi/kerberos5/lib/libgssapi/Makefile#2 integrate .. //depot/projects/wifi/lib/Makefile#11 integrate .. //depot/projects/wifi/lib/bind/bind/config.h#3 integrate .. //depot/projects/wifi/lib/bind/bind/port_after.h#2 integrate .. //depot/projects/wifi/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/wifi/lib/bind/config.h#4 integrate .. //depot/projects/wifi/lib/bind/isc/isc/platform.h#3 integrate .. //depot/projects/wifi/lib/bind/lwres/lwres/platform.h#2 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#16 integrate .. //depot/projects/wifi/lib/libarchive/archive.h.in#8 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.3#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.3#9 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_fd.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_tp.c#1 branch .. //depot/projects/wifi/lib/libarchive/archive_util.3#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write.3#6 integrate .. //depot/projects/wifi/lib/libarchive/configure.ac.in#9 integrate .. //depot/projects/wifi/lib/libarchive/libarchive-formats.5#8 integrate .. //depot/projects/wifi/lib/libarchive/tar.5#5 integrate .. //depot/projects/wifi/lib/libc/Makefile#6 integrate .. //depot/projects/wifi/lib/libc/gen/Makefile.inc#7 integrate .. //depot/projects/wifi/lib/libc/gen/__xuname.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/ftw.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getcap.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/getosreldate.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getosreldate.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/getttyent.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/nlist.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/pwcache.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/uname.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/valloc.c#2 integrate .. //depot/projects/wifi/lib/libc/gmon/gmon.c#2 integrate .. //depot/projects/wifi/lib/libc/gmon/moncontrol.3#2 integrate .. //depot/projects/wifi/lib/libc/include/libc_private.h#3 integrate .. //depot/projects/wifi/lib/libc/net/if_indextoname.3#2 integrate .. //depot/projects/wifi/lib/libc/net/inet6_opt_init.3#3 integrate .. //depot/projects/wifi/lib/libc/posix1e/posix1e.3#2 integrate .. //depot/projects/wifi/lib/libc/rpc/netconfig.5#2 integrate .. //depot/projects/wifi/lib/libc/rpc/publickey.3#2 integrate .. //depot/projects/wifi/lib/libc/rpc/rpc_clnt_create.3#3 integrate .. //depot/projects/wifi/lib/libc/rpc/rpc_svc_calls.3#3 integrate .. //depot/projects/wifi/lib/libc/stdio/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc/stdio/fread.c#2 integrate .. //depot/projects/wifi/lib/libc/stdio/getc.3#2 integrate .. //depot/projects/wifi/lib/libc/stdio/getwc.3#2 integrate .. //depot/projects/wifi/lib/libc/stdio/local.h#3 integrate .. //depot/projects/wifi/lib/libc/stdio/vfprintf.c#4 integrate .. //depot/projects/wifi/lib/libc/stdio/vfscanf.c#3 integrate .. //depot/projects/wifi/lib/libc/stdio/xprintf.c#1 branch .. //depot/projects/wifi/lib/libc/stdio/xprintf_errno.c#1 branch .. //depot/projects/wifi/lib/libc/stdio/xprintf_float.c#1 branch .. //depot/projects/wifi/lib/libc/stdio/xprintf_hexdump.c#1 branch .. //depot/projects/wifi/lib/libc/stdio/xprintf_int.c#1 branch .. //depot/projects/wifi/lib/libc/stdio/xprintf_quote.c#1 branch .. //depot/projects/wifi/lib/libc/stdio/xprintf_str.c#1 branch .. //depot/projects/wifi/lib/libc/stdio/xprintf_time.c#1 branch .. //depot/projects/wifi/lib/libc/stdio/xprintf_vis.c#1 branch .. //depot/projects/wifi/lib/libc/stdlib/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/a64l.3#1 branch .. //depot/projects/wifi/lib/libc/stdlib/a64l.c#1 branch .. //depot/projects/wifi/lib/libc/stdlib/calloc.c#2 delete .. //depot/projects/wifi/lib/libc/stdlib/grantpt.c#4 integrate .. //depot/projects/wifi/lib/libc/stdlib/l64a.c#1 branch .. //depot/projects/wifi/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/wifi/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/wifi/lib/libc/stdlib/posix_memalign.3#1 branch .. //depot/projects/wifi/lib/libc/string/memmem.3#3 integrate .. //depot/projects/wifi/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/wifi/lib/libc/sys/abort2.2#1 branch .. //depot/projects/wifi/lib/libc/sys/aio_read.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/aio_write.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/kse.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/mq.c#1 branch .. //depot/projects/wifi/lib/libc/sys/mq_close.2#1 branch .. //depot/projects/wifi/lib/libc/sys/mq_getattr.2#1 branch .. //depot/projects/wifi/lib/libc/sys/mq_notify.2#1 branch .. //depot/projects/wifi/lib/libc/sys/mq_open.2#1 branch .. //depot/projects/wifi/lib/libc/sys/mq_receive.2#1 branch .. //depot/projects/wifi/lib/libc/sys/mq_send.2#1 branch .. //depot/projects/wifi/lib/libc/sys/mq_setattr.2#1 branch .. //depot/projects/wifi/lib/libc/sys/nfssvc.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/open.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/rename.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/rmdir.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/sigaction.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/sigqueue.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/sigreturn.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/sigwaitinfo.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/stat.2#5 integrate .. //depot/projects/wifi/lib/libc/sys/statfs.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/timer_create.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/timer_delete.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/timer_settime.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/undelete.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/utimes.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/wait.2#4 integrate .. //depot/projects/wifi/lib/libc/uuid/uuid.3#3 integrate .. //depot/projects/wifi/lib/libc/xdr/xdr.3#2 integrate .. //depot/projects/wifi/lib/libdisk/Makefile#4 integrate .. //depot/projects/wifi/lib/libdisk/disk.c#5 integrate .. //depot/projects/wifi/lib/libdisk/libdisk.3#4 integrate .. //depot/projects/wifi/lib/libdisk/libdisk.h#2 integrate .. //depot/projects/wifi/lib/libdisk/write_arm_disk.c#1 branch .. //depot/projects/wifi/lib/libedit/editline.3#7 integrate .. //depot/projects/wifi/lib/libedit/refresh.c#3 integrate .. //depot/projects/wifi/lib/libfetch/fetch.3#3 integrate .. //depot/projects/wifi/lib/libfetch/ftp.c#3 integrate .. //depot/projects/wifi/lib/libgeom/libgeom.3#2 integrate .. //depot/projects/wifi/lib/libgssapi/Makefile#1 branch .. //depot/projects/wifi/lib/libgssapi/context.h#1 branch .. //depot/projects/wifi/lib/libgssapi/cred.h#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_accept_sec_context.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_accept_sec_context.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_acquire_cred.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_acquire_cred.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_add_cred.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_add_cred.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_add_oid_set_member.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_add_oid_set_member.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_canonicalize_name.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_canonicalize_name.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_compare_name.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_compare_name.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_context_time.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_context_time.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_create_empty_oid_set.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_create_empty_oid_set.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_delete_sec_context.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_delete_sec_context.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_display_name.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_display_name.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_display_status.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_display_status.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_duplicate_name.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_duplicate_name.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_export_name.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_export_name.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_export_sec_context.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_export_sec_context.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_get_mic.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_get_mic.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_import_name.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_import_name.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_import_sec_context.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_import_sec_context.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_indicate_mechs.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_indicate_mechs.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_init_sec_context.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_init_sec_context.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_inquire_context.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_inquire_context.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_inquire_cred.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_inquire_cred.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_inquire_cred_by_mech.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_inquire_cred_by_mech.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_inquire_mechs_for_name.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_inquire_mechs_for_name.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_inquire_names_for_mech.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_inquire_names_for_mech.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_krb5.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_mech_switch.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_names.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_process_context_token.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_process_context_token.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_release_buffer.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_release_buffer.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_release_cred.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_release_cred.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_release_name.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_release_name.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_release_oid_set.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_release_oid_set.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_seal.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_sign.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_test_oid_set_member.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_test_oid_set_member.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_unseal.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_unwrap.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_unwrap.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_utils.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_verify.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_verify_mic.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_verify_mic.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_wrap.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_wrap.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_wrap_size_limit.3#1 branch .. //depot/projects/wifi/lib/libgssapi/gss_wrap_size_limit.c#1 branch .. //depot/projects/wifi/lib/libgssapi/gssapi.3#1 branch .. //depot/projects/wifi/lib/libgssapi/mech.5#1 branch .. //depot/projects/wifi/lib/libgssapi/mech_switch.h#1 branch .. //depot/projects/wifi/lib/libgssapi/name.h#1 branch .. //depot/projects/wifi/lib/libgssapi/spnego.h#1 branch .. //depot/projects/wifi/lib/libgssapi/utils.h#1 branch .. //depot/projects/wifi/lib/libkvm/kvm.c#3 integrate .. //depot/projects/wifi/lib/libmd/md2.h#2 integrate .. //depot/projects/wifi/lib/libmd/md2c.c#2 integrate .. //depot/projects/wifi/lib/libmd/md4.h#2 integrate .. //depot/projects/wifi/lib/libmd/md4c.c#2 integrate .. //depot/projects/wifi/lib/libmd/md5c.c#2 integrate .. //depot/projects/wifi/lib/libmd/mdX.3#4 integrate .. //depot/projects/wifi/lib/libmd/mdXhl.c#2 integrate .. //depot/projects/wifi/lib/libmd/ripemd.h#2 integrate .. //depot/projects/wifi/lib/libmd/rmd160c.c#2 integrate .. //depot/projects/wifi/lib/libmd/sha.h#2 integrate .. //depot/projects/wifi/lib/libmd/sha0c.c#2 integrate .. //depot/projects/wifi/lib/libmd/sha1c.c#2 integrate .. //depot/projects/wifi/lib/libmd/sha256.h#2 integrate .. //depot/projects/wifi/lib/libmd/sha256c.c#2 integrate .. //depot/projects/wifi/lib/libmemstat/memstat_uma.c#6 integrate .. //depot/projects/wifi/lib/libnetgraph/msg.c#4 integrate .. //depot/projects/wifi/lib/libpmc/pmc.3#7 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_fork.c#3 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_kern.c#5 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_spinlock.c#3 integrate .. //depot/projects/wifi/lib/libstand/libstand.3#4 integrate .. //depot/projects/wifi/lib/libthr/Makefile#9 integrate .. //depot/projects/wifi/lib/libthr/arch/i386/i386/pthread_md.c#4 integrate .. //depot/projects/wifi/lib/libthr/pthread.map#6 integrate .. //depot/projects/wifi/lib/libthr/thread/Makefile.inc#5 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_attr.c#3 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_create.c#7 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_detach.c#3 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_exit.c#5 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_fork.c#2 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_info.c#3 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_init.c#7 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_join.c#5 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_list.c#3 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_once.c#3 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_private.h#8 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_resume_np.c#3 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_sig.c#3 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_spinlock.c#3 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_suspend_np.c#3 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_timer.c#2 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_umtx.h#3 integrate .. //depot/projects/wifi/lib/libusbhid/usbhid.3#3 integrate .. //depot/projects/wifi/lib/libutil/login_cap.3#3 integrate .. //depot/projects/wifi/lib/libutil/login_class.3#2 integrate .. //depot/projects/wifi/lib/libutil/login_ok.c#2 integrate .. //depot/projects/wifi/lib/libutil/login_times.c#2 integrate .. //depot/projects/wifi/lib/libutil/pidfile.3#4 integrate .. //depot/projects/wifi/lib/libutil/property.c#2 integrate .. //depot/projects/wifi/lib/libutil/pty.c#2 integrate .. //depot/projects/wifi/lib/msun/man/fma.3#3 integrate .. //depot/projects/wifi/lib/msun/man/remainder.3#4 integrate .. //depot/projects/wifi/lib/msun/man/scalbn.3#3 integrate .. //depot/projects/wifi/lib/msun/src/e_asinf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_expf.c#4 integrate .. //depot/projects/wifi/lib/msun/src/e_lgammaf_r.c#2 integrate .. //depot/projects/wifi/lib/msun/src/e_rem_pio2f.c#4 integrate .. //depot/projects/wifi/lib/msun/src/e_scalbf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/k_cosf.c#4 integrate .. //depot/projects/wifi/lib/msun/src/k_sinf.c#3 integrate .. //depot/projects/wifi/lib/msun/src/k_tanf.c#3 integrate .. //depot/projects/wifi/lib/msun/src/math_private.h#4 integrate .. //depot/projects/wifi/lib/msun/src/s_cbrt.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_cbrtf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_cosf.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_log1p.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_log1pf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_logb.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_logbf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_rint.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_rintf.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_round.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_roundf.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_roundl.c#2 integrate .. //depot/projects/wifi/lib/msun/src/s_sinf.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_tanf.c#3 integrate .. //depot/projects/wifi/lib/msun/src/s_tanhf.c#2 integrate .. //depot/projects/wifi/libexec/atrun/atrun.c#2 integrate .. //depot/projects/wifi/libexec/bootpd/bootpd.c#3 integrate .. //depot/projects/wifi/libexec/ftpd/ftpd.8#3 integrate .. //depot/projects/wifi/libexec/ftpd/ftpd.c#12 integrate .. //depot/projects/wifi/libexec/rtld-elf/alpha/reloc.c#3 integrate .. //depot/projects/wifi/libexec/rtld-elf/amd64/reloc.c#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/arm/reloc.c#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/i386/reloc.c#6 integrate .. //depot/projects/wifi/libexec/rtld-elf/ia64/reloc.c#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/ia64/rtld_start.S#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/malloc.c#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/map_object.c#3 integrate .. //depot/projects/wifi/libexec/rtld-elf/powerpc/reloc.c#3 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.c#8 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.h#3 integrate .. //depot/projects/wifi/libexec/rtld-elf/sparc64/reloc.c#3 integrate .. //depot/projects/wifi/release/Makefile#14 integrate .. //depot/projects/wifi/release/alpha/boot_crunch.conf#2 integrate .. //depot/projects/wifi/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#7 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#18 integrate .. //depot/projects/wifi/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#7 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#7 integrate .. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#17 integrate .. //depot/projects/wifi/release/doc/share/sgml/release.dsl#3 integrate .. //depot/projects/wifi/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 integrate .. //depot/projects/wifi/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/wifi/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/wifi/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/wifi/release/scripts/package-split.py#6 integrate .. //depot/projects/wifi/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#14 integrate .. //depot/projects/wifi/sbin/atacontrol/atacontrol.c#6 integrate .. //depot/projects/wifi/sbin/devd/devd.8#4 integrate .. //depot/projects/wifi/sbin/devd/devd.cc#8 integrate .. //depot/projects/wifi/sbin/devfs/rule.c#4 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient-script#9 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient.8#4 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient.c#12 integrate .. //depot/projects/wifi/sbin/dump/dump.8#5 integrate .. //depot/projects/wifi/sbin/dumpon/dumpon.8#3 integrate .. //depot/projects/wifi/sbin/geom/class/concat/geom_concat.c#5 integrate .. //depot/projects/wifi/sbin/geom/class/eli/geli.8#4 integrate .. //depot/projects/wifi/sbin/geom/class/eli/geom_eli.c#3 integrate .. //depot/projects/wifi/sbin/geom/class/label/geom_label.c#5 integrate .. //depot/projects/wifi/sbin/geom/class/mirror/geom_mirror.c#7 integrate .. //depot/projects/wifi/sbin/geom/class/nop/geom_nop.c#4 integrate .. //depot/projects/wifi/sbin/geom/class/nop/gnop.8#6 integrate .. //depot/projects/wifi/sbin/geom/class/raid3/geom_raid3.c#8 integrate .. //depot/projects/wifi/sbin/geom/class/shsec/geom_shsec.c#6 integrate .. //depot/projects/wifi/sbin/geom/class/stripe/geom_stripe.c#5 integrate .. //depot/projects/wifi/sbin/geom/core/geom.8#7 integrate .. //depot/projects/wifi/sbin/geom/core/geom.c#8 integrate .. //depot/projects/wifi/sbin/geom/misc/subr.c#3 integrate .. //depot/projects/wifi/sbin/geom/misc/subr.h#3 integrate .. //depot/projects/wifi/sbin/ifconfig/af_link.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 29 20:45:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBA5416A423; Sun, 29 Jan 2006 20:45:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AED6916A420 for ; Sun, 29 Jan 2006 20:45:14 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34B6543D46 for ; Sun, 29 Jan 2006 20:45:14 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0TKjERF092926 for ; Sun, 29 Jan 2006 20:45:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TKjEBc092923 for perforce@freebsd.org; Sun, 29 Jan 2006 20:45:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 20:45:14 GMT Message-Id: <200601292045.k0TKjEBc092923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90641 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 20:45:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=90641 Change 90641 by rwatson@rwatson_peppercorn on 2006/01/29 20:44:38 Indent less, line wrap more. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#14 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#14 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -226,108 +226,99 @@ struct vnode_au_info; #endif -int au_open(void); -int au_write(int d, token_t *m); -int au_close(int d, int keep, short event); -int au_close_buffer(int d, short event, u_char *buffer, - size_t *buflen); +int au_open(void); +int au_write(int d, token_t *m); +int au_close(int d, int keep, short event); +int au_close_buffer(int d, short event, u_char *buffer, size_t *buflen); + #if defined(KERNEL) || defined(_KERNEL) -token_t *au_to_file(char *file, struct timeval tm); +token_t *au_to_file(char *file, struct timeval tm); #else -token_t *au_to_file(char *file); +token_t *au_to_file(char *file); #endif + #if defined(KERNEL) || defined(_KERNEL) -token_t *au_to_header(int rec_size, au_event_t e_type, - au_emod_t e_mod, struct timeval tm); -token_t *au_to_header32(int rec_size, au_event_t e_type, - au_emod_t e_mod, struct timeval tm); +token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm); +token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm); #else -token_t *au_to_header(int rec_size, au_event_t e_type, - au_emod_t e_mod); -token_t *au_to_header32(int rec_size, au_event_t e_type, - au_emod_t e_mod); +token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); +token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); #endif -token_t *au_to_header64(int rec_size, au_event_t e_type, - au_emod_t e_mod); -token_t *au_to_me(void); + +token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); +token_t *au_to_me(void); +token_t *au_to_arg(char n, char *text, uint32_t v); +token_t *au_to_arg32(char n, char *text, uint32_t v); +token_t *au_to_arg64(char n, char *text, uint64_t v); -token_t *au_to_arg(char n, char *text, uint32_t v); -token_t *au_to_arg32(char n, char *text, uint32_t v); -token_t *au_to_arg64(char n, char *text, uint64_t v); #if defined(_KERNEL) || defined(KERNEL) -token_t *au_to_attr(struct vnode_au_info *vni); -token_t *au_to_attr32(struct vnode_au_info *vni); -token_t *au_to_attr64(struct vnode_au_info *vni); +token_t *au_to_attr(struct vnode_au_info *vni); +token_t *au_to_attr32(struct vnode_au_info *vni); +token_t *au_to_attr64(struct vnode_au_info *vni); #endif -token_t *au_to_data(char unit_print, char unit_type, - char unit_count, char *p); -token_t *au_to_exit(int retval, int err); -token_t *au_to_groups(int *groups); -token_t *au_to_newgroups(uint16_t n, gid_t *groups); -token_t *au_to_in_addr(struct in_addr *internet_addr); -token_t *au_to_in_addr_ex(struct in6_addr *internet_addr); -token_t *au_to_ip(struct ip *ip); -token_t *au_to_ipc(char type, int id); -token_t *au_to_ipc_perm(struct ipc_perm *perm); -token_t *au_to_iport(uint16_t iport); -token_t *au_to_opaque(char *data, uint16_t bytes); -token_t *au_to_path(char *path); -token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_process32(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_process64(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_process_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_process32_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_process64_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_return(char status, uint32_t ret); -token_t *au_to_return32(char status, uint32_t ret); -token_t *au_to_return64(char status, uint64_t ret); -token_t *au_to_seq(long audit_count); + +token_t *au_to_data(char unit_print, char unit_type, char unit_count, + char *p); +token_t *au_to_exit(int retval, int err); +token_t *au_to_groups(int *groups); +token_t *au_to_newgroups(uint16_t n, gid_t *groups); +token_t *au_to_in_addr(struct in_addr *internet_addr); +token_t *au_to_in_addr_ex(struct in6_addr *internet_addr); +token_t *au_to_ip(struct ip *ip); +token_t *au_to_ipc(char type, int id); +token_t *au_to_ipc_perm(struct ipc_perm *perm); +token_t *au_to_iport(uint16_t iport); +token_t *au_to_opaque(char *data, uint16_t bytes); +token_t *au_to_path(char *path); +token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_process32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_process64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_process_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_process32_ex(au_id_t auid, uid_t euid, gid_t egid, + uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, + au_tid_addr_t *tid); +token_t *au_to_process64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_return(char status, uint32_t ret); +token_t *au_to_return32(char status, uint32_t ret); +token_t *au_to_return64(char status, uint64_t ret); +token_t *au_to_seq(long audit_count); + #if defined(_KERNEL) || defined(KERNEL) -token_t *au_to_socket(struct socket *so); -token_t *au_to_socket_ex_32(uint16_t lp, uint16_t rp, - struct sockaddr *la, struct sockaddr *ta); -token_t *au_to_socket_ex_128(uint16_t lp, uint16_t rp, - struct sockaddr *la, struct sockaddr *ta); +token_t *au_to_socket(struct socket *so); +token_t *au_to_socket_ex_32(uint16_t lp, uint16_t rp, struct sockaddr *la, + struct sockaddr *ta); +token_t *au_to_socket_ex_128(uint16_t lp, uint16_t rp, struct sockaddr *la, + struct sockaddr *ta); #endif -token_t *au_to_sock_inet(struct sockaddr_in *so); -token_t *au_to_sock_inet32(struct sockaddr_in *so); -token_t *au_to_sock_inet128(struct sockaddr_in6 *so); -token_t *au_to_sock_unix(struct sockaddr_un *so); -token_t *au_to_subject(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_subject32(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_subject64(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_subject_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_subject32_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_subject64_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_exec_args(const char **); -token_t *au_to_exec_env(const char **); -token_t *au_to_text(char *text); -token_t *au_to_kevent(struct kevent *kev); -token_t *au_to_trailer(int rec_size); + +token_t *au_to_sock_inet(struct sockaddr_in *so); +token_t *au_to_sock_inet32(struct sockaddr_in *so); +token_t *au_to_sock_inet128(struct sockaddr_in6 *so); +token_t *au_to_sock_unix(struct sockaddr_un *so); +token_t *au_to_subject(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_subject32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_subject64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_subject_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_subject32_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_exec_args(const char **); +token_t *au_to_exec_env(const char **); +token_t *au_to_text(char *text); +token_t *au_to_kevent(struct kevent *kev); +token_t *au_to_trailer(int rec_size); __END_DECLS From owner-p4-projects@FreeBSD.ORG Sun Jan 29 20:47:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C181A16A423; Sun, 29 Jan 2006 20:47:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83DB416A420 for ; Sun, 29 Jan 2006 20:47:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43A4143D45 for ; Sun, 29 Jan 2006 20:47:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0TKlHVP000537 for ; Sun, 29 Jan 2006 20:47:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TKlGa5000534 for perforce@freebsd.org; Sun, 29 Jan 2006 20:47:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 20:47:16 GMT Message-Id: <200601292047.k0TKlGa5000534@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 20:47:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=90642 Change 90642 by rwatson@rwatson_peppercorn on 2006/01/29 20:46:15 style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#6 (text+ko) ==== @@ -6,9 +6,9 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * Notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the + * Notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived @@ -26,13 +26,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#6 $ */ #ifndef _BSM_AUDIT_UEVENTS_H_ -#define _BSM_AUDIT_UEVENTS_H_ +#define _BSM_AUDIT_UEVENTS_H_ -/* +/*- * User level audit event numbers * * Range of audit event numbers: @@ -43,60 +43,60 @@ * 36865 - 65535 Reserved for applications * */ -#define AUE_at_create 6144 -#define AUE_at_delete 6145 -#define AUE_at_perm 6146 -#define AUE_cron_invoke 6147 -#define AUE_crontab_create 6148 -#define AUE_crontab_delete 6149 -#define AUE_crontab_perm 6150 -#define AUE_inetd_connect 6151 -#define AUE_login 6152 -#define AUE_logout 6153 -#define AUE_telnet 6154 -#define AUE_rlogin 6155 -#define AUE_mountd_mount 6156 -#define AUE_mountd_umount 6157 -#define AUE_rshd 6158 -#define AUE_su 6159 -#define AUE_halt 6160 -#define AUE_reboot 6161 -#define AUE_rexecd 6162 -#define AUE_passwd 6163 -#define AUE_rexd 6164 -#define AUE_ftpd 6165 -#define AUE_init 6166 -#define AUE_uadmin 6167 -#define AUE_shutdown 6168 -#define AUE_poweroff 6169 -#define AUE_crontab_mod 6170 -#define AUE_audit_startup 6171 -#define AUE_audit_shutdown 6172 -#define AUE_allocate_succ 6200 -#define AUE_allocate_fail 6201 -#define AUE_deallocate_succ 6202 -#define AUE_deallocate_fail 6203 -#define AUE_listdevice_succ 6205 -#define AUE_listdevice_fail 6206 -#define AUE_create_user 6207 -#define AUE_modify_user 6208 -#define AUE_delete_user 6209 -#define AUE_disable_user 6210 -#define AUE_enable_user 6211 -#define AUE_sudo 6300 -#define AUE_modify_password 6501 /* not assigned by Sun */ -#define AUE_create_group 6511 /* not assigned by Sun */ -#define AUE_delete_group 6512 /* not assigned by Sun */ -#define AUE_modify_group 6513 /* not assigned by Sun */ -#define AUE_add_to_group 6514 /* not assigned by Sun */ -#define AUE_remove_from_group 6515 /* not assigned by Sun */ -#define AUE_revoke_obj 6521 /* not assigned by Sun; not curr. used */ -#define AUE_lw_login 6600 /* not assigned by Sun; tentative */ -#define AUE_lw_logout 6601 /* not assigned by Sun; tentative */ -#define AUE_auth_user 7000 /* not assigned by Sun */ -#define AUE_ssconn 7001 /* not assigned by Sun */ -#define AUE_ssauthorize 7002 /* not assigned by Sun */ -#define AUE_ssauthint 7003 /* not assigned by Sun */ -#define AUE_openssh 32800 +#define AUE_at_create 6144 +#define AUE_at_delete 6145 +#define AUE_at_perm 6146 +#define AUE_cron_invoke 6147 +#define AUE_crontab_create 6148 +#define AUE_crontab_delete 6149 +#define AUE_crontab_perm 6150 +#define AUE_inetd_connect 6151 +#define AUE_login 6152 +#define AUE_logout 6153 +#define AUE_telnet 6154 +#define AUE_rlogin 6155 +#define AUE_mountd_mount 6156 +#define AUE_mountd_umount 6157 +#define AUE_rshd 6158 +#define AUE_su 6159 +#define AUE_halt 6160 +#define AUE_reboot 6161 +#define AUE_rexecd 6162 +#define AUE_passwd 6163 +#define AUE_rexd 6164 +#define AUE_ftpd 6165 +#define AUE_init 6166 +#define AUE_uadmin 6167 +#define AUE_shutdown 6168 +#define AUE_poweroff 6169 +#define AUE_crontab_mod 6170 +#define AUE_audit_startup 6171 +#define AUE_audit_shutdown 6172 +#define AUE_allocate_succ 6200 +#define AUE_allocate_fail 6201 +#define AUE_deallocate_succ 6202 +#define AUE_deallocate_fail 6203 +#define AUE_listdevice_succ 6205 +#define AUE_listdevice_fail 6206 +#define AUE_create_user 6207 +#define AUE_modify_user 6208 +#define AUE_delete_user 6209 +#define AUE_disable_user 6210 +#define AUE_enable_user 6211 +#define AUE_sudo 6300 +#define AUE_modify_password 6501 /* Not assigned by Sun. */ +#define AUE_create_group 6511 /* Not assigned by Sun. */ +#define AUE_delete_group 6512 /* Not assigned by Sun. */ +#define AUE_modify_group 6513 /* Not assigned by Sun. */ +#define AUE_add_to_group 6514 /* Not assigned by Sun. */ +#define AUE_remove_from_group 6515 /* Not assigned by Sun. */ +#define AUE_revoke_obj 6521 /* Not assigned by Sun; not used. */ +#define AUE_lw_login 6600 /* Not assigned by Sun; tentative. */ +#define AUE_lw_logout 6601 /* Not assigned by Sun; tentative. */ +#define AUE_auth_user 7000 /* Not assigned by Sun. */ +#define AUE_ssconn 7001 /* Not assigned by Sun. */ +#define AUE_ssauthorize 7002 /* Not assigned by Sun. */ +#define AUE_ssauthint 7003 /* Not assigned by Sun. */ +#define AUE_openssh 32800 #endif /* !_BSM_AUDIT_UEVENTS_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Jan 29 20:52:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04B6E16A426; Sun, 29 Jan 2006 20:52:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9AC3C16A423 for ; Sun, 29 Jan 2006 20:52:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60D7743D70 for ; Sun, 29 Jan 2006 20:52:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0TKqYSr000853 for ; Sun, 29 Jan 2006 20:52:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TKqX4q000850 for perforce@freebsd.org; Sun, 29 Jan 2006 20:52:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 20:52:33 GMT Message-Id: <200601292052.k0TKqX4q000850@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90644 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 20:52:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=90644 Change 90644 by rwatson@rwatson_peppercorn on 2006/01/29 20:52:03 style(9). Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#7 (text+ko) ==== @@ -130,7 +130,7 @@ static void sigint(int); static void timedout(int); static void usage(void); -static void au_success(); +static void au_success(void); static void au_fail(char *, int); #define TTYGRPNAME "tty" /* group to own ttys */ @@ -376,8 +376,8 @@ pam_cleanup(); /* - * we are not exiting here, but this corresponds to - * a failed login event, so set exitstatus to 1 + * We are not exiting here, but this corresponds to a failed + * login event, so set exitstatus to 1. */ au_fail("Login incorrect", 1); @@ -403,7 +403,7 @@ endpwent(); - /* Audit successful login */ + /* Audit successful login. */ if (auditsuccess) au_success(); @@ -809,13 +809,10 @@ /* * The following tokens are included in the audit record for a successful - * login: - * header - * subject - * return + * login: header, subject, return. */ static void -au_success() +au_success(void) { token_t *tok; int aufd; @@ -826,40 +823,41 @@ pid_t pid = getpid(); long au_cond; - /* If we are not auditing, don't cut an audit record; just return */ + /* If we are not auditing, don't cut an audit record; just return. */ if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno == ENOSYS) return; - fprintf(stderr, "login: Could not determine audit condition\n"); + fprintf(stderr, + "login: Could not determine audit condition\n"); exit(1); } if (au_cond == AUC_NOAUDIT) return; - /* Compute and Set the user's preselection mask */ - if(au_user_mask(pwd->pw_name, &aumask) == -1) { + /* Compute and set the user's preselection mask. */ + if (au_user_mask(pwd->pw_name, &aumask) == -1) { fprintf(stderr, "login: Could not set audit mask\n"); exit(1); } - /* Set the audit info for the user */ + /* Set the audit info for the user. */ auinfo.ai_auid = uid; auinfo.ai_asid = pid; bcopy(&tid, &auinfo.ai_termid, sizeof(auinfo.ai_termid)); bcopy(&aumask, &auinfo.ai_mask, sizeof(auinfo.ai_mask)); - if(setaudit(&auinfo) != 0) { + if (setaudit(&auinfo) != 0) { fprintf(stderr, "login: setaudit failed: %s\n", strerror(errno)); exit(1); } - if((aufd = au_open()) == -1) { + if ((aufd = au_open()) == -1) { fprintf(stderr, "login: Audit Error: au_open() failed\n"); exit(1); } - /* The subject that is created (euid, egid of the current process) */ - if((tok = au_to_subject32(uid, geteuid(), getegid(), + /* The subject that is created (euid, egid of the current process). */ + if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, gid, pid, pid, &tid)) == NULL) { fprintf(stderr, "login: Audit Error: au_to_subject32() failed\n"); @@ -867,14 +865,14 @@ } au_write(aufd, tok); - if((tok = au_to_return32(0, 0)) == NULL) { + if ((tok = au_to_return32(0, 0)) == NULL) { fprintf(stderr, "login: Audit Error: au_to_return32() failed\n"); exit(1); } au_write(aufd, tok); - if(au_close(aufd, 1, AUE_login) == -1) { + if (au_close(aufd, 1, AUE_login) == -1) { fprintf(stderr, "login: Audit Record was not committed.\n"); exit(1); } @@ -882,11 +880,7 @@ /* * The following tokens are included in the audit record for failed - * login attempts: - * header - * subject - * text - * return + * login attempts: header, subject, text, return. */ static void au_fail(char *errmsg, int na) @@ -898,39 +892,39 @@ gid_t gid; pid_t pid = getpid(); - /* If we are not auditing, don't cut an audit record; just return */ + /* If we are not auditing, don't cut an audit record; just return. */ if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno == ENOSYS) return; - fprintf(stderr, "login: Could not determine audit condition\n"); + fprintf(stderr, + "login: Could not determine audit condition\n"); exit(1); } if (au_cond == AUC_NOAUDIT) return; - if((aufd = au_open()) == -1) { + if ((aufd = au_open()) == -1) { fprintf(stderr, "login: Audit Error: au_open() failed\n"); exit(1); } - if(na) { - /* Non attributable event */ - /* Assuming that login is not called within a user's - * session => auid,asid == -1 */ - if((tok = au_to_subject32(-1, geteuid(), getegid(), -1, -1, - pid, -1, &tid)) == NULL) { - + if (na) { + /* + * Non attributable event. Assuming that login is not called + * within a user's session => auid,asid == -1. + */ + if ((tok = au_to_subject32(-1, geteuid(), getegid(), -1, -1, + pid, -1, &tid)) == NULL) { fprintf(stderr, "login: Audit Error: au_to_subject32() failed\n"); exit(1); } - } - else { - /* we know the subject -- so use its value instead */ + } else { + /* We know the subject -- so use its value instead. */ uid = pwd->pw_uid; gid = pwd->pw_gid; - if((tok = au_to_subject32(uid, geteuid(), getegid(), - uid, gid, pid, pid, &tid)) == NULL) { + if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, + gid, pid, pid, &tid)) == NULL) { fprintf(stderr, "login: Audit Error: au_to_subject32() failed\n"); exit(1); @@ -938,21 +932,21 @@ } au_write(aufd, tok); - /* Include the error message */ - if((tok = au_to_text(errmsg)) == NULL) { + /* Include the error message. */ + if ((tok = au_to_text(errmsg)) == NULL) { fprintf(stderr, "login: Audit Error: au_to_text() failed\n"); exit(1); } au_write(aufd, tok); - if((tok = au_to_return32(1, errno)) == NULL) { + if ((tok = au_to_return32(1, errno)) == NULL) { fprintf(stderr, "login: Audit Error: au_to_return32() failed\n"); exit(1); } au_write(aufd, tok); - if(au_close(aufd, 1, AUE_login) == -1) { + if (au_close(aufd, 1, AUE_login) == -1) { fprintf(stderr, "login: Audit Error: au_close() was not committed\n"); exit(1); From owner-p4-projects@FreeBSD.ORG Sun Jan 29 20:53:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7AE016A423; Sun, 29 Jan 2006 20:53:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 898A116A420 for ; Sun, 29 Jan 2006 20:53:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EF7C43D6D for ; Sun, 29 Jan 2006 20:53:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0TKraFq000940 for ; Sun, 29 Jan 2006 20:53:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TKrZYw000937 for perforce@freebsd.org; Sun, 29 Jan 2006 20:53:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 20:53:35 GMT Message-Id: <200601292053.k0TKrZYw000937@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 20:53:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=90645 Change 90645 by rwatson@rwatson_peppercorn on 2006/01/29 20:52:46 Minor white space tweak. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#8 (text+ko) ==== @@ -948,7 +948,7 @@ if (au_close(aufd, 1, AUE_login) == -1) { fprintf(stderr, - "login: Audit Error: au_close() was not committed\n"); + "login: Audit Error: au_close() was not committed\n"); exit(1); } } From owner-p4-projects@FreeBSD.ORG Sun Jan 29 21:14:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5F7F16A423; Sun, 29 Jan 2006 21:14:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 892EA16A420 for ; Sun, 29 Jan 2006 21:14:01 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 571EE43D46 for ; Sun, 29 Jan 2006 21:14:01 +0000 (GMT) (envelope-from alc@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 k0TLE17P001758 for ; Sun, 29 Jan 2006 21:14:01 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TLE1s4001753 for perforce@freebsd.org; Sun, 29 Jan 2006 21:14:01 GMT (envelope-from alc@freebsd.org) Date: Sun, 29 Jan 2006 21:14:01 GMT Message-Id: <200601292114.k0TLE1s4001753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 21:14:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=90646 Change 90646 by alc@alc_home on 2006/01/29 21:13:50 Eliminate unused code. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_buddy.c#9 edit .. //depot/projects/superpages/src/sys/vm/vm_buddy.h#7 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_buddy.c#9 (text+ko) ==== @@ -53,30 +53,6 @@ SYSCTL_OID(_vm, OID_AUTO, buddy, CTLTYPE_STRING | CTLFLAG_RD, NULL, 0, sysctl_vm_buddy, "A", "Buddy Info"); -#ifdef PEDANTIC -/* - * not exhaustive... just the ones I've had trouble with - */ -void -buddy_invariants(char *file, int line) -{ - int q, i; - - static int n = 0; - if ((++n)%10000 == 0) printf("=%d=",n/10000); - - for (q=0; qphys_addr + i*PAGE_SIZE); - INVARIANT(!m->reserv || m->flags & PG_CACHE); - } - } - } -} -#endif - /* * */ ==== //depot/projects/superpages/src/sys/vm/vm_buddy.h#7 (text+ko) ==== @@ -1,7 +1,5 @@ /* Buddy Allocator definitions */ -void buddy_invariants(char *, int); - vm_page_t buddy_alloc(int magn, boolean_t prefer_zero); vm_page_t buddy_alloc_locked(int magn, boolean_t prefer_zero); void buddy_free(vm_page_t m, int magn); From owner-p4-projects@FreeBSD.ORG Sun Jan 29 21:52:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 735DF16A423; Sun, 29 Jan 2006 21:52:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 336E616A420 for ; Sun, 29 Jan 2006 21:52:05 +0000 (GMT) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D050F43D46 for ; Sun, 29 Jan 2006 21:52:04 +0000 (GMT) (envelope-from bz@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 k0TLq4Xf003308 for ; Sun, 29 Jan 2006 21:52:04 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TLppj4003291 for perforce@freebsd.org; Sun, 29 Jan 2006 21:51:51 GMT (envelope-from bz@freebsd.org) Date: Sun, 29 Jan 2006 21:51:51 GMT Message-Id: <200601292151.k0TLppj4003291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 90648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 21:52:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=90648 Change 90648 by bz@bz_dopt_ah on 2006/01/29 21:51:34 IFC @90643 ( Still needs dozens of hours of work to catch up with changes from major branches. So do not expect this to compile until summer ) Affected files ... .. //depot/projects/s390/COPYRIGHT#3 integrate .. //depot/projects/s390/LOCKS#2 integrate .. //depot/projects/s390/ObsoleteFiles.inc#3 integrate .. //depot/projects/s390/UPDATING#15 integrate .. //depot/projects/s390/contrib/bc/bc/main.c#4 integrate .. //depot/projects/s390/contrib/bind9/FREEBSD-Upgrade#3 integrate .. //depot/projects/s390/contrib/bsnmp/gensnmptree/gensnmptree.c#3 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII.c#3 integrate .. //depot/projects/s390/contrib/bsnmp/snmpd/config.c#3 integrate .. //depot/projects/s390/contrib/bsnmp/snmpd/main.c#3 integrate .. //depot/projects/s390/contrib/bsnmp/snmpd/snmpd.config#2 integrate .. //depot/projects/s390/contrib/cpio/doc/cpio.1#2 integrate .. //depot/projects/s390/contrib/cpio/doc/cpio.texi#2 integrate .. //depot/projects/s390/contrib/cpio/src/copyin.c#2 integrate .. //depot/projects/s390/contrib/cpio/src/copyout.c#2 integrate .. //depot/projects/s390/contrib/cpio/src/copypass.c#2 integrate .. //depot/projects/s390/contrib/cpio/src/extern.h#2 integrate .. //depot/projects/s390/contrib/cpio/src/global.c#2 integrate .. //depot/projects/s390/contrib/cpio/src/main.c#2 integrate .. //depot/projects/s390/contrib/groff/tmac/doc-common#10 integrate .. //depot/projects/s390/contrib/groff/tmac/groff_mdoc.man#9 integrate .. //depot/projects/s390/contrib/libpcap/pcap-bpf.c#4 integrate .. //depot/projects/s390/contrib/texinfo/util/texindex.c#6 integrate .. //depot/projects/s390/contrib/traceroute/traceroute.c#4 integrate .. //depot/projects/s390/etc/defaults/periodic.conf#7 integrate .. //depot/projects/s390/etc/defaults/rc.conf#14 integrate .. //depot/projects/s390/etc/gettytab#4 integrate .. //depot/projects/s390/etc/mtree/BSD.local.dist#7 integrate .. //depot/projects/s390/etc/mtree/BSD.x11.dist#2 integrate .. //depot/projects/s390/etc/periodic/daily/406.status-gmirror#1 branch .. //depot/projects/s390/etc/periodic/daily/Makefile#5 integrate .. //depot/projects/s390/etc/pf.conf#2 integrate .. //depot/projects/s390/etc/portsnap.conf#3 integrate .. //depot/projects/s390/etc/rc.d/Makefile#10 integrate .. //depot/projects/s390/etc/rc.d/abi#5 integrate .. //depot/projects/s390/etc/rc.d/addswap#4 integrate .. //depot/projects/s390/etc/rc.d/devfs#7 integrate .. //depot/projects/s390/etc/rc.d/ftpd#1 branch .. //depot/projects/s390/etc/rc.d/ipsec#7 integrate .. //depot/projects/s390/etc/rc.d/ldconfig#6 integrate .. //depot/projects/s390/etc/rc.d/root#7 integrate .. //depot/projects/s390/etc/rc.initdiskless#3 integrate .. //depot/projects/s390/etc/services#8 integrate .. //depot/projects/s390/etc/snmpd.config#2 integrate .. //depot/projects/s390/games/fortune/datfiles/fortunes#13 integrate .. //depot/projects/s390/gnu/usr.bin/cc/cc_int/Makefile#6 integrate .. //depot/projects/s390/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate .. //depot/projects/s390/include/nl_types.h#4 integrate .. //depot/projects/s390/include/printf.h#2 integrate .. //depot/projects/s390/include/stdio.h#7 integrate .. //depot/projects/s390/include/stdlib.h#9 integrate .. //depot/projects/s390/lib/Makefile#12 integrate .. //depot/projects/s390/lib/libarchive/Makefile#3 integrate .. //depot/projects/s390/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/s390/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_read_open_fd.c#3 integrate .. //depot/projects/s390/lib/libarchive/archive_read_support_format_tp.c#1 branch .. //depot/projects/s390/lib/libarchive/libarchive-formats.5#3 integrate .. //depot/projects/s390/lib/libc/gen/getttyent.c#3 integrate .. //depot/projects/s390/lib/libc/gen/valloc.3#3 integrate .. //depot/projects/s390/lib/libc/gen/valloc.c#2 integrate .. //depot/projects/s390/lib/libc/include/libc_private.h#6 integrate .. //depot/projects/s390/lib/libc/rpc/netconfig.5#3 integrate .. //depot/projects/s390/lib/libc/stdio/Makefile.inc#7 integrate .. //depot/projects/s390/lib/libc/stdio/xprintf.c#2 integrate .. //depot/projects/s390/lib/libc/stdio/xprintf_errno.c#1 branch .. //depot/projects/s390/lib/libc/stdio/xprintf_quote.c#1 branch .. //depot/projects/s390/lib/libc/stdio/xprintf_vis.c#2 integrate .. //depot/projects/s390/lib/libc/stdlib/Makefile.inc#11 integrate .. //depot/projects/s390/lib/libc/stdlib/calloc.c#3 delete .. //depot/projects/s390/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/s390/lib/libc/stdlib/malloc.3#7 integrate .. //depot/projects/s390/lib/libc/stdlib/malloc.c#9 integrate .. //depot/projects/s390/lib/libc/stdlib/posix_memalign.3#1 branch .. //depot/projects/s390/lib/libc/sys/open.2#7 integrate .. //depot/projects/s390/lib/libc/sys/rename.2#5 integrate .. //depot/projects/s390/lib/libc/sys/rmdir.2#3 integrate .. //depot/projects/s390/lib/libc/sys/stat.2#7 integrate .. //depot/projects/s390/lib/libc/sys/statfs.2#4 integrate .. //depot/projects/s390/lib/libc/sys/undelete.2#3 integrate .. //depot/projects/s390/lib/libdisk/Makefile#5 integrate .. //depot/projects/s390/lib/libdisk/disk.c#11 integrate .. //depot/projects/s390/lib/libdisk/libdisk.3#6 integrate .. //depot/projects/s390/lib/libdisk/libdisk.h#8 integrate .. //depot/projects/s390/lib/libdisk/write_arm_disk.c#1 branch .. //depot/projects/s390/lib/libfetch/ftp.c#9 integrate .. //depot/projects/s390/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/s390/lib/libgssapi/gssapi.3#2 integrate .. //depot/projects/s390/lib/libkvm/kvm.c#5 integrate .. //depot/projects/s390/lib/libmd/md2.h#2 integrate .. //depot/projects/s390/lib/libmd/md2c.c#3 integrate .. //depot/projects/s390/lib/libmd/md4.h#2 integrate .. //depot/projects/s390/lib/libmd/md4c.c#3 integrate .. //depot/projects/s390/lib/libmd/md5c.c#3 integrate .. //depot/projects/s390/lib/libmd/mdX.3#4 integrate .. //depot/projects/s390/lib/libmd/mdXhl.c#3 integrate .. //depot/projects/s390/lib/libmd/ripemd.h#2 integrate .. //depot/projects/s390/lib/libmd/rmd160c.c#2 integrate .. //depot/projects/s390/lib/libmd/sha.h#2 integrate .. //depot/projects/s390/lib/libmd/sha0c.c#2 integrate .. //depot/projects/s390/lib/libmd/sha1c.c#2 integrate .. //depot/projects/s390/lib/libmd/sha256.h#2 integrate .. //depot/projects/s390/lib/libmd/sha256c.c#2 integrate .. //depot/projects/s390/lib/libmemstat/memstat_uma.c#2 integrate .. //depot/projects/s390/lib/libnetgraph/msg.c#3 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_fork.c#5 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_spinlock.c#5 integrate .. //depot/projects/s390/lib/libthr/Makefile#6 integrate .. //depot/projects/s390/lib/libthr/thread/Makefile.inc#4 integrate .. //depot/projects/s390/lib/libthr/thread/thr_attr.c#3 integrate .. //depot/projects/s390/lib/libthr/thread/thr_create.c#5 integrate .. //depot/projects/s390/lib/libthr/thread/thr_fork.c#3 integrate .. //depot/projects/s390/lib/libthr/thread/thr_info.c#4 integrate .. //depot/projects/s390/lib/libthr/thread/thr_init.c#6 integrate .. //depot/projects/s390/lib/libthr/thread/thr_mutex.c#6 integrate .. //depot/projects/s390/lib/libthr/thread/thr_private.h#6 integrate .. //depot/projects/s390/lib/libthr/thread/thr_spinlock.c#5 integrate .. //depot/projects/s390/lib/libthr/thread/thr_suspend_np.c#4 integrate .. //depot/projects/s390/lib/libthr/thread/thr_timer.c#2 integrate .. //depot/projects/s390/lib/libutil/login_ok.c#4 integrate .. //depot/projects/s390/lib/libutil/login_times.c#3 integrate .. //depot/projects/s390/lib/libutil/pidfile.3#3 integrate .. //depot/projects/s390/lib/libutil/pty.c#4 integrate .. //depot/projects/s390/libexec/ftpd/ftpd.8#12 integrate .. //depot/projects/s390/libexec/ftpd/ftpd.c#10 integrate .. //depot/projects/s390/libexec/rtld-elf/ia64/reloc.c#10 integrate .. //depot/projects/s390/libexec/rtld-elf/ia64/rtld_start.S#3 integrate .. //depot/projects/s390/libexec/rtld-elf/malloc.c#6 integrate .. //depot/projects/s390/release/Makefile#19 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#15 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#11 integrate .. //depot/projects/s390/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 integrate .. //depot/projects/s390/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/s390/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#3 integrate .. //depot/projects/s390/sbin/atacontrol/atacontrol.c#8 integrate .. //depot/projects/s390/sbin/devd/devd.cc#8 integrate .. //depot/projects/s390/sbin/dhclient/dhclient-script#3 integrate .. //depot/projects/s390/sbin/dhclient/dhclient.8#2 integrate .. //depot/projects/s390/sbin/dhclient/dhclient.c#3 integrate .. //depot/projects/s390/sbin/dumpon/dumpon.8#5 integrate .. //depot/projects/s390/sbin/geom/core/geom.8#2 integrate .. //depot/projects/s390/sbin/ifconfig/af_link.c#2 integrate .. //depot/projects/s390/sbin/ifconfig/ifieee80211.c#6 integrate .. //depot/projects/s390/sbin/ifconfig/ifmedia.c#5 integrate .. //depot/projects/s390/sbin/ipfw/ipfw.8#13 integrate .. //depot/projects/s390/sbin/md5/md5.c#6 integrate .. //depot/projects/s390/sbin/mount/mount.8#9 integrate .. //depot/projects/s390/sbin/mount/mount.c#8 integrate .. //depot/projects/s390/sbin/mount_nullfs/mount_nullfs.8#6 integrate .. //depot/projects/s390/sbin/rcorder/Makefile#3 integrate .. //depot/projects/s390/sbin/rcorder/rcorder.c#4 integrate .. //depot/projects/s390/sbin/reboot/nextboot.sh#2 integrate .. //depot/projects/s390/sbin/setkey/setkey.8#2 integrate .. //depot/projects/s390/share/examples/cvsup/ports-supfile#7 integrate .. //depot/projects/s390/share/examples/kld/Makefile#2 integrate .. //depot/projects/s390/share/examples/kld/firmware/Makefile#1 branch .. //depot/projects/s390/share/examples/kld/firmware/README#1 branch .. //depot/projects/s390/share/examples/kld/firmware/fwconsumer/Makefile#1 branch .. //depot/projects/s390/share/examples/kld/firmware/fwconsumer/fw_consumer.c#1 branch .. //depot/projects/s390/share/examples/kld/firmware/fwimage/Makefile#1 branch .. //depot/projects/s390/share/examples/kld/firmware/fwimage/firmware.img#1 branch .. //depot/projects/s390/share/man/man3/Makefile#5 integrate .. //depot/projects/s390/share/man/man3/tree.3#4 integrate .. //depot/projects/s390/share/man/man4/Makefile#16 integrate .. //depot/projects/s390/share/man/man4/ata.4#7 integrate .. //depot/projects/s390/share/man/man4/bge.4#9 integrate .. //depot/projects/s390/share/man/man4/bktr.4#4 integrate .. //depot/projects/s390/share/man/man4/gbde.4#4 integrate .. //depot/projects/s390/share/man/man4/if_bridge.4#3 integrate .. //depot/projects/s390/share/man/man4/ipw.4#3 integrate .. //depot/projects/s390/share/man/man4/iwi.4#3 integrate .. //depot/projects/s390/share/man/man4/man4.i386/acpi_ibm.4#3 integrate .. //depot/projects/s390/share/man/man4/mpt.4#2 integrate .. //depot/projects/s390/share/man/man4/ng_pppoe.4#4 integrate .. //depot/projects/s390/share/man/man4/nge.4#5 integrate .. //depot/projects/s390/share/man/man4/pcm.4#8 integrate .. //depot/projects/s390/share/man/man4/pty.4#4 integrate .. //depot/projects/s390/share/man/man4/ral.4#3 integrate .. //depot/projects/s390/share/man/man4/re.4#5 integrate .. //depot/projects/s390/share/man/man4/snd_atiixp.4#2 integrate .. //depot/projects/s390/share/man/man4/snd_maestro3.4#3 integrate .. //depot/projects/s390/share/man/man4/splash.4#3 integrate .. //depot/projects/s390/share/man/man4/syscons.4#7 integrate .. //depot/projects/s390/share/man/man4/ufoma.4#1 branch .. //depot/projects/s390/share/man/man4/umass.4#10 integrate .. //depot/projects/s390/share/man/man4/ural.4#3 integrate .. //depot/projects/s390/share/man/man4/uscanner.4#7 integrate .. //depot/projects/s390/share/man/man5/rc.conf.5#17 integrate .. //depot/projects/s390/share/man/man7/security.7#7 integrate .. //depot/projects/s390/share/man/man9/Makefile#10 integrate .. //depot/projects/s390/share/man/man9/device_add_child.9#5 integrate .. //depot/projects/s390/share/man/man9/firmware.9#1 branch .. //depot/projects/s390/share/man/man9/make_dev.9#6 integrate .. //depot/projects/s390/share/misc/bsd-family-tree#10 integrate .. //depot/projects/s390/sys/Makefile#5 integrate .. //depot/projects/s390/sys/alpha/conf/GENERIC#13 integrate .. //depot/projects/s390/sys/alpha/include/_types.h#6 integrate .. //depot/projects/s390/sys/alpha/include/param.h#7 integrate .. //depot/projects/s390/sys/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/s390/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/s390/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/s390/sys/amd64/include/_types.h#4 integrate .. //depot/projects/s390/sys/amd64/include/param.h#5 integrate .. //depot/projects/s390/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/s390/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/s390/sys/arm/include/_types.h#5 integrate .. //depot/projects/s390/sys/arm/include/param.h#5 integrate .. //depot/projects/s390/sys/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/s390/sys/boot/common/module.c#4 integrate .. //depot/projects/s390/sys/boot/ia64/efi/start.S#2 integrate .. //depot/projects/s390/sys/cam/cam_ccb.h#5 integrate .. //depot/projects/s390/sys/cam/cam_periph.c#11 integrate .. //depot/projects/s390/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_da.c#19 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_sa.c#14 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_ses.h#3 integrate .. //depot/projects/s390/sys/coda/coda_vfsops.c#9 integrate .. //depot/projects/s390/sys/coda/coda_vnops.c#7 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/s390/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/s390/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/s390/sys/compat/linux/linux_ioctl.c#13 integrate .. //depot/projects/s390/sys/compat/linux/linux_ioctl.h#6 integrate .. //depot/projects/s390/sys/compat/linux/linux_stats.c#9 integrate .. //depot/projects/s390/sys/conf/Makefile.arm#3 integrate .. //depot/projects/s390/sys/conf/Makefile.i386#7 integrate .. //depot/projects/s390/sys/conf/Makefile.pc98#7 integrate .. //depot/projects/s390/sys/conf/NOTES#19 integrate .. //depot/projects/s390/sys/conf/files#21 integrate .. //depot/projects/s390/sys/conf/files.amd64#6 integrate .. //depot/projects/s390/sys/conf/kern.post.mk#13 integrate .. //depot/projects/s390/sys/conf/kmod.mk#13 integrate .. //depot/projects/s390/sys/conf/options#16 integrate .. //depot/projects/s390/sys/contrib/pf/net/pf_norm.c#3 integrate .. //depot/projects/s390/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/s390/sys/dev/acpica/Osd/OsdSchedule.c#7 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_pci.c#7 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/s390/sys/dev/amr/amr.c#14 integrate .. //depot/projects/s390/sys/dev/amr/amr_linux.c#1 branch .. //depot/projects/s390/sys/dev/amr/amrreg.h#6 integrate .. //depot/projects/s390/sys/dev/an/if_an.c#12 integrate .. //depot/projects/s390/sys/dev/asr/asr.c#12 integrate .. //depot/projects/s390/sys/dev/ata/ata-all.c#15 integrate .. //depot/projects/s390/sys/dev/ata/ata-all.h#12 integrate .. //depot/projects/s390/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/s390/sys/dev/ata/ata-disk.c#14 integrate .. //depot/projects/s390/sys/dev/ata/ata-lowlevel.c#6 integrate .. //depot/projects/s390/sys/dev/ata/ata-pci.c#13 integrate .. //depot/projects/s390/sys/dev/ata/ata-pci.h#10 integrate .. //depot/projects/s390/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/s390/sys/dev/ata/ata-raid.c#13 integrate .. //depot/projects/s390/sys/dev/ata/ata-raid.h#10 integrate .. //depot/projects/s390/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/s390/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/s390/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/s390/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/s390/sys/dev/bge/if_bge.c#14 integrate .. //depot/projects/s390/sys/dev/bge/if_bgereg.h#10 integrate .. //depot/projects/s390/sys/dev/bktr/bktr_os.c#9 integrate .. //depot/projects/s390/sys/dev/cardbus/cardbus.c#10 integrate .. //depot/projects/s390/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/s390/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/s390/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/s390/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/s390/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/s390/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/s390/sys/dev/ed/if_ed.c#11 integrate .. //depot/projects/s390/sys/dev/ed/if_ed_3c503.c#2 integrate .. //depot/projects/s390/sys/dev/ed/if_ed_cbus.c#8 integrate .. //depot/projects/s390/sys/dev/ed/if_ed_hpp.c#2 integrate .. //depot/projects/s390/sys/dev/ed/if_ed_isa.c#7 integrate .. //depot/projects/s390/sys/dev/ed/if_ed_novell.c#3 integrate .. //depot/projects/s390/sys/dev/ed/if_ed_sic.c#2 integrate .. //depot/projects/s390/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/s390/sys/dev/ed/if_edvar.h#4 integrate .. //depot/projects/s390/sys/dev/em/if_em.c#12 integrate .. //depot/projects/s390/sys/dev/em/if_em.h#10 integrate .. //depot/projects/s390/sys/dev/hme/if_hme.c#10 integrate .. //depot/projects/s390/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/s390/sys/dev/ieee488/pcii.c#3 integrate .. //depot/projects/s390/sys/dev/iir/iir.h#4 integrate .. //depot/projects/s390/sys/dev/isp/isp.c#10 integrate .. //depot/projects/s390/sys/dev/isp/isp_freebsd.c#8 integrate .. //depot/projects/s390/sys/dev/isp/isp_freebsd.h#6 integrate .. //depot/projects/s390/sys/dev/isp/isp_inline.h#5 integrate .. //depot/projects/s390/sys/dev/isp/isp_ioctl.h#4 integrate .. //depot/projects/s390/sys/dev/isp/isp_pci.c#10 integrate .. //depot/projects/s390/sys/dev/isp/isp_sbus.c#7 integrate .. //depot/projects/s390/sys/dev/isp/isp_target.c#8 integrate .. //depot/projects/s390/sys/dev/isp/isp_target.h#4 integrate .. //depot/projects/s390/sys/dev/isp/isp_tpublic.h#5 integrate .. //depot/projects/s390/sys/dev/isp/ispmbox.h#6 integrate .. //depot/projects/s390/sys/dev/isp/ispreg.h#3 integrate .. //depot/projects/s390/sys/dev/isp/ispvar.h#6 integrate .. //depot/projects/s390/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/s390/sys/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/s390/sys/dev/md/md.c#16 integrate .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi.h#4 integrate .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi_cnfg.h#4 integrate .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi_fc.h#3 integrate .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi_inb.h#1 branch .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi_init.h#4 integrate .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi_ioc.h#4 integrate .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi_lan.h#3 integrate .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi_log_fc.h#1 branch .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi_log_sas.h#1 branch .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi_raid.h#4 integrate .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi_sas.h#1 branch .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi_targ.h#3 integrate .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi_tool.h#1 branch .. //depot/projects/s390/sys/dev/mpt/mpilib/mpi_type.h#3 integrate .. //depot/projects/s390/sys/dev/mpt/mpt_debug.c#4 integrate .. //depot/projects/s390/sys/dev/pci/pci.c#13 integrate .. //depot/projects/s390/sys/dev/pci/pci_private.h#9 integrate .. //depot/projects/s390/sys/dev/ral/if_ral.c#3 integrate .. //depot/projects/s390/sys/dev/ral/if_ralreg.h#3 integrate .. //depot/projects/s390/sys/dev/ral/if_ralvar.h#2 integrate .. //depot/projects/s390/sys/dev/rp/rp_pci.c#6 integrate .. //depot/projects/s390/sys/dev/sn/if_sn.c#10 integrate .. //depot/projects/s390/sys/dev/sound/driver.c#4 integrate .. //depot/projects/s390/sys/dev/sound/isa/ess.c#7 integrate .. //depot/projects/s390/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/s390/sys/dev/sound/pci/cmi.c#8 integrate .. //depot/projects/s390/sys/dev/sound/pci/ds1.c#8 integrate .. //depot/projects/s390/sys/dev/sound/pci/emu10k1.c#11 integrate .. //depot/projects/s390/sys/dev/sound/pci/es137x.c#7 integrate .. //depot/projects/s390/sys/dev/sound/pci/fm801.c#7 integrate .. //depot/projects/s390/sys/dev/sound/pci/ich.c#10 integrate .. //depot/projects/s390/sys/dev/sound/pci/maestro.c#7 integrate .. //depot/projects/s390/sys/dev/sound/pci/solo.c#8 integrate .. //depot/projects/s390/sys/dev/sound/pci/vibes.c#5 integrate .. //depot/projects/s390/sys/dev/sound/pcm/channel.c#10 integrate .. //depot/projects/s390/sys/dev/sound/pcm/dsp.c#13 integrate .. //depot/projects/s390/sys/dev/sound/pcm/feeder.c#12 integrate .. //depot/projects/s390/sys/dev/sound/pcm/feeder.h#5 integrate .. //depot/projects/s390/sys/dev/sound/pcm/feeder_fmt.c#10 integrate .. //depot/projects/s390/sys/dev/sound/pcm/feeder_rate.c#10 integrate .. //depot/projects/s390/sys/dev/sound/pcm/vchan.c#10 integrate .. //depot/projects/s390/sys/dev/syscons/syscons.c#13 integrate .. //depot/projects/s390/sys/dev/tx/if_tx.c#10 integrate .. //depot/projects/s390/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/s390/sys/dev/usb/ehci_pci.c#5 integrate .. //depot/projects/s390/sys/dev/usb/ehcivar.h#4 integrate .. //depot/projects/s390/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/s390/sys/dev/usb/if_uralreg.h#3 integrate .. //depot/projects/s390/sys/dev/usb/ohci.c#8 integrate .. //depot/projects/s390/sys/dev/usb/ohci_pci.c#5 integrate .. //depot/projects/s390/sys/dev/usb/ufoma.c#1 branch .. //depot/projects/s390/sys/dev/usb/uhci.c#10 integrate .. //depot/projects/s390/sys/dev/usb/umass.c#16 integrate .. //depot/projects/s390/sys/dev/usb/usb_mem.c#3 integrate .. //depot/projects/s390/sys/dev/usb/usb_quirks.c#8 integrate .. //depot/projects/s390/sys/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/s390/sys/dev/usb/usb_subr.c#7 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/s390/sys/dev/usb/uscanner.c#9 integrate .. //depot/projects/s390/sys/fs/hpfs/hpfs_vnops.c#12 integrate .. //depot/projects/s390/sys/fs/msdosfs/direntry.h#3 integrate .. //depot/projects/s390/sys/fs/msdosfs/msdosfs_conv.c#5 integrate .. //depot/projects/s390/sys/fs/msdosfs/msdosfs_denode.c#10 integrate .. //depot/projects/s390/sys/fs/msdosfs/msdosfs_lookup.c#4 integrate .. //depot/projects/s390/sys/fs/msdosfs/msdosfs_vnops.c#10 integrate .. //depot/projects/s390/sys/fs/ntfs/ntfs_vnops.c#10 integrate .. //depot/projects/s390/sys/fs/nwfs/nwfs_node.c#8 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_node.c#10 integrate .. //depot/projects/s390/sys/fs/udf/udf_vnops.c#13 integrate .. //depot/projects/s390/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/s390/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/s390/sys/geom/label/g_label_ntfs.c#3 integrate .. //depot/projects/s390/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/s390/sys/geom/nop/g_nop.c#3 integrate .. //depot/projects/s390/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/s390/sys/geom/uzip/g_uzip.c#3 integrate .. //depot/projects/s390/sys/geom/zero/g_zero.c#3 integrate .. //depot/projects/s390/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/s390/sys/i386/conf/GENERIC#17 integrate .. //depot/projects/s390/sys/i386/i386/busdma_machdep.c#13 integrate .. //depot/projects/s390/sys/i386/i386/mem.c#12 integrate .. //depot/projects/s390/sys/i386/i386/swtch.s#8 integrate .. //depot/projects/s390/sys/i386/i386/trap.c#14 integrate .. //depot/projects/s390/sys/i386/include/_types.h#6 integrate .. //depot/projects/s390/sys/i386/include/param.h#8 integrate .. //depot/projects/s390/sys/ia64/conf/GENERIC#14 integrate .. //depot/projects/s390/sys/ia64/ia64/elf_machdep.c#10 integrate .. //depot/projects/s390/sys/ia64/ia64/genassym.c#11 integrate .. //depot/projects/s390/sys/ia64/ia64/locore.S#4 integrate .. //depot/projects/s390/sys/ia64/include/_types.h#7 integrate .. //depot/projects/s390/sys/ia64/include/elf.h#5 integrate .. //depot/projects/s390/sys/ia64/include/param.h#8 integrate .. //depot/projects/s390/sys/isofs/cd9660/cd9660_node.c#6 integrate .. //depot/projects/s390/sys/isofs/cd9660/cd9660_vnops.c#11 integrate .. //depot/projects/s390/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/s390/sys/kern/init_sysent.c#12 integrate .. //depot/projects/s390/sys/kern/kern_alq.c#7 integrate .. //depot/projects/s390/sys/kern/kern_conf.c#13 integrate .. //depot/projects/s390/sys/kern/kern_exit.c#18 integrate .. //depot/projects/s390/sys/kern/kern_ktr.c#9 integrate .. //depot/projects/s390/sys/kern/kern_ktrace.c#10 integrate .. //depot/projects/s390/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/s390/sys/kern/kern_mutex.c#12 integrate .. //depot/projects/s390/sys/kern/kern_proc.c#16 integrate .. //depot/projects/s390/sys/kern/kern_resource.c#12 integrate .. //depot/projects/s390/sys/kern/kern_rwlock.c#1 branch .. //depot/projects/s390/sys/kern/kern_sx.c#5 integrate .. //depot/projects/s390/sys/kern/kern_sysctl.c#13 integrate .. //depot/projects/s390/sys/kern/md5c.c#6 integrate .. //depot/projects/s390/sys/kern/subr_bus.c#14 integrate .. //depot/projects/s390/sys/kern/subr_disk.c#10 integrate .. //depot/projects/s390/sys/kern/subr_firmware.c#1 branch .. //depot/projects/s390/sys/kern/subr_lock.c#1 branch .. //depot/projects/s390/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/s390/sys/kern/subr_taskqueue.c#8 integrate .. //depot/projects/s390/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/s390/sys/kern/subr_witness.c#16 integrate .. //depot/projects/s390/sys/kern/syscalls.c#12 integrate .. //depot/projects/s390/sys/kern/syscalls.master#14 integrate .. //depot/projects/s390/sys/kern/tty.c#13 integrate .. //depot/projects/s390/sys/kern/tty_compat.c#5 integrate .. //depot/projects/s390/sys/kern/tty_pts.c#1 branch .. //depot/projects/s390/sys/kern/tty_pty.c#11 integrate .. //depot/projects/s390/sys/kern/uipc_sem.c#10 integrate .. //depot/projects/s390/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/s390/sys/kern/uipc_usrreq.c#14 integrate .. //depot/projects/s390/sys/kern/vfs_aio.c#14 integrate .. //depot/projects/s390/sys/kern/vfs_bio.c#18 integrate .. //depot/projects/s390/sys/kern/vfs_default.c#13 integrate .. //depot/projects/s390/sys/kern/vfs_lookup.c#9 integrate .. //depot/projects/s390/sys/kern/vfs_mount.c#15 integrate .. //depot/projects/s390/sys/kern/vfs_subr.c#17 integrate .. //depot/projects/s390/sys/kern/vfs_syscalls.c#14 integrate .. //depot/projects/s390/sys/libkern/fnmatch.c#4 integrate .. //depot/projects/s390/sys/libkern/gets.c#2 integrate .. //depot/projects/s390/sys/modules/Makefile#18 integrate .. //depot/projects/s390/sys/modules/amr/Makefile#3 integrate .. //depot/projects/s390/sys/modules/amr/amr_linux/Makefile#1 branch .. //depot/projects/s390/sys/modules/bktr/bktr/Makefile#6 integrate .. //depot/projects/s390/sys/modules/firmware/Makefile#1 branch .. //depot/projects/s390/sys/modules/linux/Makefile#6 integrate .. //depot/projects/s390/sys/modules/nwfs/Makefile#4 integrate .. //depot/projects/s390/sys/modules/smbfs/Makefile#4 integrate .. //depot/projects/s390/sys/modules/svr4/Makefile#4 integrate .. //depot/projects/s390/sys/modules/ufoma/Makefile#1 branch .. //depot/projects/s390/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/s390/sys/net/if.c#15 integrate .. //depot/projects/s390/sys/net/if_arcsubr.c#9 integrate .. //depot/projects/s390/sys/net/if_bridge.c#3 integrate .. //depot/projects/s390/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/s390/sys/net/if_ef.c#10 integrate .. //depot/projects/s390/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/s390/sys/net/if_fddisubr.c#10 integrate .. //depot/projects/s390/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/s390/sys/net/if_gre.c#9 integrate .. //depot/projects/s390/sys/net/if_iso88025subr.c#12 integrate .. //depot/projects/s390/sys/net/if_ppp.c#11 integrate .. //depot/projects/s390/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/s390/sys/net80211/ieee80211_input.c#5 integrate .. //depot/projects/s390/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/s390/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/s390/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/s390/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/s390/sys/net80211/ieee80211_radiotap.h#3 integrate .. //depot/projects/s390/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/s390/sys/netatm/atm_signal.c#5 integrate .. //depot/projects/s390/sys/netatm/ipatm/ipatm_vcm.c#6 integrate .. //depot/projects/s390/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/s390/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/s390/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/s390/sys/netgraph/netgraph.h#5 integrate .. //depot/projects/s390/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/s390/sys/netgraph/ng_ether.c#6 integrate .. //depot/projects/s390/sys/netgraph/ng_frame_relay.c#5 integrate .. //depot/projects/s390/sys/netgraph/ng_lmi.c#5 integrate .. //depot/projects/s390/sys/netgraph/ng_message.h#4 integrate .. //depot/projects/s390/sys/netgraph/ng_parse.c#4 integrate .. //depot/projects/s390/sys/netgraph/ng_pppoe.c#8 integrate .. //depot/projects/s390/sys/netgraph/ng_pppoe.h#5 integrate .. //depot/projects/s390/sys/netgraph/ng_source.c#8 integrate .. //depot/projects/s390/sys/netinet/if_ether.c#10 integrate .. //depot/projects/s390/sys/netinet/in.c#8 integrate .. //depot/projects/s390/sys/netinet/in_pcb.c#11 integrate .. //depot/projects/s390/sys/netinet/in_var.h#5 integrate .. //depot/projects/s390/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/s390/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/s390/sys/netinet/ip_gre.c#7 integrate .. //depot/projects/s390/sys/netinet/ip_gre.h#5 integrate .. //depot/projects/s390/sys/netinet/ip_icmp.c#13 integrate .. //depot/projects/s390/sys/netinet/ip_input.c#16 integrate .. //depot/projects/s390/sys/netinet/ip_mroute.c#13 integrate .. //depot/projects/s390/sys/netinet/ip_output.c#13 integrate .. //depot/projects/s390/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/s390/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/s390/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/s390/sys/netinet6/in6_cksum.c#6 integrate .. //depot/projects/s390/sys/netinet6/ip6_input.c#10 integrate .. //depot/projects/s390/sys/netinet6/ip6_mroute.c#9 integrate .. //depot/projects/s390/sys/netinet6/ip6_output.c#10 integrate .. //depot/projects/s390/sys/netinet6/ipcomp_input.c#3 integrate .. //depot/projects/s390/sys/netipsec/keysock.c#8 integrate .. //depot/projects/s390/sys/netipsec/keysock.h#3 integrate .. //depot/projects/s390/sys/netipx/ipx_input.c#8 integrate .. //depot/projects/s390/sys/netipx/spx_usrreq.c#8 integrate .. //depot/projects/s390/sys/netkey/keysock.c#10 integrate .. //depot/projects/s390/sys/netkey/keysock.h#3 integrate .. //depot/projects/s390/sys/netncp/ncp_conn.c#10 integrate .. //depot/projects/s390/sys/netsmb/smb_subr.c#12 integrate .. //depot/projects/s390/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/s390/sys/nfsclient/nfs_lock.c#11 integrate .. //depot/projects/s390/sys/nfsclient/nfs_node.c#9 integrate .. //depot/projects/s390/sys/nfsclient/nfs_socket.c#11 integrate .. //depot/projects/s390/sys/nfsclient/nfs_vfsops.c#12 integrate .. //depot/projects/s390/sys/nfsserver/nfs.h#5 integrate .. //depot/projects/s390/sys/nfsserver/nfs_serv.c#14 integrate .. //depot/projects/s390/sys/nfsserver/nfs_srvsock.c#10 integrate .. //depot/projects/s390/sys/nfsserver/nfs_syscalls.c#10 integrate .. //depot/projects/s390/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/s390/sys/pc98/include/_types.h#3 integrate .. //depot/projects/s390/sys/pc98/include/param.h#3 integrate .. //depot/projects/s390/sys/pccard/cardinfo.h#5 integrate .. //depot/projects/s390/sys/pccard/driver.h#2 delete .. //depot/projects/s390/sys/pccard/i82365.h#5 delete .. //depot/projects/s390/sys/pccard/meciareg.h#2 delete .. //depot/projects/s390/sys/pccard/pccard_nbk.h#3 delete .. //depot/projects/s390/sys/pccard/pcic_pci.h#4 delete .. //depot/projects/s390/sys/pccard/pcicvar.h#4 delete .. //depot/projects/s390/sys/pccard/slot.h#5 delete .. //depot/projects/s390/sys/pci/agp.c#14 integrate .. //depot/projects/s390/sys/pci/if_sk.c#11 integrate .. //depot/projects/s390/sys/pci/if_skreg.h#5 integrate .. //depot/projects/s390/sys/pci/if_xl.c#16 integrate .. //depot/projects/s390/sys/powerpc/conf/GENERIC#13 integrate .. //depot/projects/s390/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/s390/sys/security/mac_bsdextended/mac_bsdextended.c#9 integrate .. //depot/projects/s390/sys/sparc64/central/central.c#4 integrate .. //depot/projects/s390/sys/sparc64/conf/GENERIC#15 integrate .. //depot/projects/s390/sys/sparc64/ebus/ebus.c#9 integrate .. //depot/projects/s390/sys/sparc64/fhc/fhc_central.c#4 integrate .. //depot/projects/s390/sys/sparc64/fhc/fhc_nexus.c#4 integrate .. //depot/projects/s390/sys/sparc64/include/in_cksum.h#3 integrate .. //depot/projects/s390/sys/sparc64/include/trap.h#4 integrate .. //depot/projects/s390/sys/sparc64/include/utrap.h#4 integrate .. //depot/projects/s390/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/s390/sys/sparc64/pci/psycho.c#14 integrate .. //depot/projects/s390/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/s390/sys/sparc64/sbus/sbus.c#12 integrate .. //depot/projects/s390/sys/sparc64/sparc64/exception.S#11 integrate .. //depot/projects/s390/sys/sys/_rwlock.h#1 branch .. //depot/projects/s390/sys/sys/ata.h#9 integrate .. //depot/projects/s390/sys/sys/cdefs.h#8 integrate .. //depot/projects/s390/sys/sys/firmware.h#1 branch .. //depot/projects/s390/sys/sys/ioctl.h#3 integrate .. //depot/projects/s390/sys/sys/ioctl_compat.h#3 integrate .. //depot/projects/s390/sys/sys/ktr.h#6 integrate .. //depot/projects/s390/sys/sys/lock.h#8 integrate .. //depot/projects/s390/sys/sys/mbuf.h#14 integrate .. //depot/projects/s390/sys/sys/md5.h#3 integrate .. //depot/projects/s390/sys/sys/mount.h#12 integrate .. //depot/projects/s390/sys/sys/mutex.h#10 integrate .. //depot/projects/s390/sys/sys/param.h#18 integrate .. //depot/projects/s390/sys/sys/proc.h#19 integrate .. //depot/projects/s390/sys/sys/rwlock.h#1 branch .. //depot/projects/s390/sys/sys/socketvar.h#12 integrate .. //depot/projects/s390/sys/sys/syscall.h#12 integrate .. //depot/projects/s390/sys/sys/syscall.mk#12 integrate .. //depot/projects/s390/sys/sys/sysproto.h#13 integrate .. //depot/projects/s390/sys/sys/taskqueue.h#6 integrate .. //depot/projects/s390/sys/sys/tree.h#3 integrate .. //depot/projects/s390/sys/sys/ttychars.h#3 integrate .. //depot/projects/s390/sys/sys/ttycom.h#3 integrate .. //depot/projects/s390/sys/sys/ttydev.h#3 integrate .. //depot/projects/s390/sys/sys/turnstile.h#2 integrate .. //depot/projects/s390/sys/sys/user.h#7 integrate .. //depot/projects/s390/sys/sys/vnode.h#13 integrate .. //depot/projects/s390/sys/tools/fw_stub.awk#1 branch .. //depot/projects/s390/sys/ufs/ffs/ffs_snapshot.c#15 integrate .. //depot/projects/s390/sys/ufs/ffs/ffs_softdep.c#14 integrate .. //depot/projects/s390/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/s390/sys/ufs/ufs/ufs_quota.c#9 integrate .. //depot/projects/s390/sys/vm/swap_pager.c#13 integrate .. //depot/projects/s390/sys/vm/uma_core.c#15 integrate .. //depot/projects/s390/sys/vm/vm_contig.c#8 integrate .. //depot/projects/s390/sys/vm/vm_fault.c#13 integrate .. //depot/projects/s390/sys/vm/vm_map.c#15 integrate .. //depot/projects/s390/sys/vm/vm_object.c#16 integrate .. //depot/projects/s390/sys/vm/vm_object.h#13 integrate .. //depot/projects/s390/sys/vm/vm_page.c#14 integrate .. //depot/projects/s390/sys/vm/vm_page.h#10 integrate .. //depot/projects/s390/sys/vm/vm_pageout.c#17 integrate .. //depot/projects/s390/sys/vm/vm_pageq.c#8 integrate .. //depot/projects/s390/tools/regression/aio/kqueue/aio_kqueue.c#2 integrate .. //depot/projects/s390/tools/regression/aio/kqueue/lio/lio_kqueue.c#2 integrate .. //depot/projects/s390/tools/tools/mfc/README#1 branch .. //depot/projects/s390/tools/tools/mfc/mfc.pl#1 branch .. //depot/projects/s390/tools/tools/nanobsd/nanobsd.sh#3 integrate .. //depot/projects/s390/tools/tools/netrate/juggle/juggle.c#2 integrate .. //depot/projects/s390/usr.bin/Makefile#15 integrate .. //depot/projects/s390/usr.bin/calendar/calendars/calendar.freebsd#14 integrate .. //depot/projects/s390/usr.bin/ee/ee.c#4 integrate .. //depot/projects/s390/usr.bin/elfdump/elfdump.c#7 integrate .. //depot/projects/s390/usr.bin/fetch/fetch.c#7 integrate .. //depot/projects/s390/usr.bin/fstat/fstat.c#7 integrate .. //depot/projects/s390/usr.bin/gprof/powerpc.h#1 branch .. //depot/projects/s390/usr.bin/ktrdump/ktrdump.c#5 integrate .. //depot/projects/s390/usr.bin/mail/mail.1#5 integrate .. //depot/projects/s390/usr.bin/mktemp/mktemp.1#4 integrate .. //depot/projects/s390/usr.bin/netstat/Makefile#5 integrate .. //depot/projects/s390/usr.bin/netstat/ipsec.c#4 integrate .. //depot/projects/s390/usr.bin/netstat/main.c#9 integrate .. //depot/projects/s390/usr.bin/netstat/netstat.h#7 integrate .. //depot/projects/s390/usr.bin/netstat/pfkey.c#1 branch .. //depot/projects/s390/usr.bin/su/su.1#5 integrate .. //depot/projects/s390/usr.bin/su/su.c#9 integrate .. //depot/projects/s390/usr.bin/tar/bsdtar.1#3 integrate .. //depot/projects/s390/usr.bin/truss/alpha-fbsd.c#5 integrate .. //depot/projects/s390/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/s390/usr.bin/truss/extern.h#6 integrate .. //depot/projects/s390/usr.bin/truss/i386-fbsd.c#6 integrate .. //depot/projects/s390/usr.bin/truss/i386-linux.c#5 integrate .. //depot/projects/s390/usr.bin/truss/ia64-fbsd.c#6 integrate .. //depot/projects/s390/usr.bin/truss/main.c#7 integrate .. //depot/projects/s390/usr.bin/truss/powerpc-fbsd.c#1 branch .. //depot/projects/s390/usr.bin/truss/sparc64-fbsd.c#4 integrate .. //depot/projects/s390/usr.bin/truss/syscall.h#4 integrate .. //depot/projects/s390/usr.bin/truss/syscalls.c#8 integrate .. //depot/projects/s390/usr.bin/truss/truss.1#5 integrate .. //depot/projects/s390/usr.bin/truss/truss.h#2 integrate .. //depot/projects/s390/usr.bin/wall/ttymsg.c#3 integrate .. //depot/projects/s390/usr.bin/whois/whois.1#4 integrate .. //depot/projects/s390/usr.bin/whois/whois.c#9 integrate .. //depot/projects/s390/usr.bin/xargs/strnsubst.c#3 integrate .. //depot/projects/s390/usr.bin/xargs/xargs.1#10 integrate .. //depot/projects/s390/usr.bin/xargs/xargs.c#11 integrate .. //depot/projects/s390/usr.sbin/adduser/adduser.sh#9 integrate .. //depot/projects/s390/usr.sbin/arp/arp.8#6 integrate .. //depot/projects/s390/usr.sbin/arp/arp.c#10 integrate .. //depot/projects/s390/usr.sbin/bsnmpd/modules/Makefile#2 integrate .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def#1 branch .. //depot/projects/s390/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#1 branch .. //depot/projects/s390/usr.sbin/btxld/Makefile#4 integrate .. //depot/projects/s390/usr.sbin/btxld/btxld.c#6 integrate .. //depot/projects/s390/usr.sbin/config/config.h#5 integrate .. //depot/projects/s390/usr.sbin/config/config.y#7 integrate .. //depot/projects/s390/usr.sbin/config/main.c#6 integrate .. //depot/projects/s390/usr.sbin/config/mkmakefile.c#8 integrate .. //depot/projects/s390/usr.sbin/config/mkoptions.c#4 integrate .. //depot/projects/s390/usr.sbin/cron/crontab/crontab.c#4 integrate .. //depot/projects/s390/usr.sbin/inetd/Makefile#4 integrate .. //depot/projects/s390/usr.sbin/inetd/inetd.8#5 integrate .. //depot/projects/s390/usr.sbin/inetd/inetd.c#11 integrate .. //depot/projects/s390/usr.sbin/inetd/inetd.h#4 integrate .. //depot/projects/s390/usr.sbin/kbdcontrol/kbdcontrol.1#3 integrate .. //depot/projects/s390/usr.sbin/kbdmap/kbdmap.c#4 integrate .. //depot/projects/s390/usr.sbin/kldxref/ef_obj.c#3 integrate .. //depot/projects/s390/usr.sbin/mixer/mixer.c#7 integrate .. //depot/projects/s390/usr.sbin/mountd/exports.5#6 integrate .. //depot/projects/s390/usr.sbin/newsyslog/newsyslog.c#14 integrate .. //depot/projects/s390/usr.sbin/pkg_install/add/add.h#4 integrate .. //depot/projects/s390/usr.sbin/pkg_install/add/extract.c#5 integrate .. //depot/projects/s390/usr.sbin/pkg_install/add/main.c#5 integrate .. //depot/projects/s390/usr.sbin/pkg_install/add/perform.c#6 integrate .. //depot/projects/s390/usr.sbin/pkg_install/add/pkg_add.1#9 integrate .. //depot/projects/s390/usr.sbin/pkg_install/create/perform.c#6 integrate .. //depot/projects/s390/usr.sbin/pkg_install/create/pkg_create.1#8 integrate .. //depot/projects/s390/usr.sbin/pkg_install/create/pl.c#3 integrate .. //depot/projects/s390/usr.sbin/pkg_install/info/info.h#5 integrate .. //depot/projects/s390/usr.sbin/pkg_install/info/main.c#6 integrate .. //depot/projects/s390/usr.sbin/pkg_install/info/perform.c#5 integrate .. //depot/projects/s390/usr.sbin/pkg_install/info/pkg_info.1#7 integrate .. //depot/projects/s390/usr.sbin/pkg_install/info/show.c#8 integrate .. //depot/projects/s390/usr.sbin/pkg_install/lib/lib.h#7 integrate .. //depot/projects/s390/usr.sbin/pkg_install/lib/plist.c#6 integrate .. //depot/projects/s390/usr.sbin/pkg_install/lib/url.c#4 integrate .. //depot/projects/s390/usr.sbin/portsnap/phttpget/phttpget.c#3 integrate .. //depot/projects/s390/usr.sbin/portsnap/portsnap/portsnap.8#3 integrate .. //depot/projects/s390/usr.sbin/portsnap/portsnap/portsnap.sh#3 integrate .. //depot/projects/s390/usr.sbin/powerd/Makefile#3 integrate .. //depot/projects/s390/usr.sbin/powerd/powerd.c#3 integrate .. //depot/projects/s390/usr.sbin/sysinstall/anonFTP.c#4 integrate .. //depot/projects/s390/usr.sbin/sysinstall/disks.c#9 integrate .. //depot/projects/s390/usr.sbin/sysinstall/dispatch.c#6 integrate .. //depot/projects/s390/usr.sbin/sysinstall/install.c#11 integrate .. //depot/projects/s390/usr.sbin/sysinstall/label.c#10 integrate .. //depot/projects/s390/usr.sbin/sysinstall/media.c#4 integrate .. //depot/projects/s390/usr.sbin/sysinstall/menus.c#15 integrate .. //depot/projects/s390/usr.sbin/sysinstall/sysinstall.8#10 integrate .. //depot/projects/s390/usr.sbin/sysinstall/sysinstall.h#12 integrate .. //depot/projects/s390/usr.sbin/sysinstall/tcpip.c#6 integrate .. //depot/projects/s390/usr.sbin/traceroute6/traceroute6.8#5 integrate Differences ... ==== //depot/projects/s390/COPYRIGHT#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/COPYRIGHT,v 1.6 2005/01/01 07:29:19 sobomax Exp $ +# $FreeBSD: src/COPYRIGHT,v 1.7 2006/01/15 22:06:10 imp Exp $ # @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94 The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (C) 1992-2005 The FreeBSD Project. All rights reserved. +Copyright (C) 1992-2006 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions ==== //depot/projects/s390/LOCKS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/LOCKS,v 1.2 2005/06/02 22:57:30 peter Exp $ +$FreeBSD: src/LOCKS,v 1.3 2006/01/13 06:51:43 ru Exp $ This file documents formal review/approval requirements that have been approved by core. @@ -9,3 +9,4 @@ Special cases: src/* RELENG_4_* Requires Security Officer approval. src/* RELENG_5_* Requires Security Officer approval. +src/* RELENG_6_* Requires Security Officer approval. ==== //depot/projects/s390/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.25 2006/01/04 15:54:02 netchild Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.26 2006/01/18 18:48:42 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -2589,8 +2589,6 @@ OLD_FILES+=usr/share/games/cribbage.instr OLD_FILES+=usr/share/games/fish.instr OLD_FILES+=usr/share/games/wump.info -OLD_FILES+=usr/share/tmac/mm/locale -OLD_FILES+=usr/share/tmac/mm/se_locale OLD_FILES+=usr/games/hide/adventure OLD_FILES+=usr/games/hide/arithmetic OLD_FILES+=usr/games/hide/atc ==== //depot/projects/s390/UPDATING#15 (text+ko) ==== @@ -21,6 +21,26 @@ developers choose to disable these features on build machines to maximize performance. +20060118: + This actually occured some time ago, but installing the kernel + now also installs a bunch of symbol files for the kernel modules. + This increases the size of /boot/kernel to about 67Mbytes. You + will need twice this if you will eventually back this up to kernel.old + on your next install. + If you have a shortage of room in your root partition, you should add + -DINSTALL_NODEBUG to your make arguments or add INSTALL_NODEBUG="yes" + to your /etc/make.conf. + +20060113: + libc's malloc implementation has been replaced. This change has the + potential to uncover application bugs that previously went unnoticed. + See the malloc(3) manual page for more details. + +20060112: + The generic netgraph(4) cookie has been changed. If you upgrade + kernel passing this point, you also need to upgrade userland + and netgraph(4) utilities like ports/net/mpd or ports/net/mpd4. + 20060106: The kernel ABI was mostly destroyed due to a change in the size of struct lock_object which is nested in other structures such @@ -473,4 +493,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.432 2006/01/06 19:04:39 jhb Exp $ +$FreeBSD: src/UPDATING,v 1.436 2006/01/18 20:36:58 pav Exp $ ==== //depot/projects/s390/contrib/bc/bc/main.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ Western Washington University Bellingham, WA 98226-9062 -$FreeBSD: src/contrib/bc/bc/main.c,v 1.7 2005/09/27 18:52:17 brooks Exp $ +$FreeBSD: src/contrib/bc/bc/main.c,v 1.8 2006/01/24 06:38:35 brooks Exp $ *************************************************************************/ @@ -65,7 +65,7 @@ printf ("usage: %s [options] [file ...]\n%s%s%s%s%s%s%s", progname, " -h --help print this usage and exit\n", " -i --interactive force interactive mode\n", - " -l --mathlib use the predefine math routines\n", + " -l --mathlib use the predefined math routines\n", " -q --quiet don't print initial banner\n", " -s --standard non-standard bc constructs are errors\n", " -w --warn warn about non-standard bc constructs\n", ==== //depot/projects/s390/contrib/bind9/FREEBSD-Upgrade#3 (text+ko) ==== @@ -31,6 +31,8 @@ As of 28 December 2005, we have no local patches against BIND 9; thus there are no conflicts to merge. This may change at a later date. +5a) Remove any files that are no longer in the tarball from the vendor branch. + 6) Remove any references to the {bin,lib}/tests and docutil directories from the configure and Makefile templates: @@ -114,4 +116,4 @@ -- des@FreeBSD.org -- dougb@FreeBSD.org -$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.6 2005/12/29 04:41:09 dougb Exp $ +$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.7 2006/01/14 02:45:49 dougb Exp $ ==== //depot/projects/s390/contrib/bsnmp/gensnmptree/gensnmptree.c#3 (text+ko) ==== @@ -353,6 +353,7 @@ node = xalloc(sizeof(struct node)); node->lno = lno; + node->flags = 0; if (tok != '(') report("'(' expected at begin of node"); ==== //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII.c#3 (text+ko) ==== @@ -1030,7 +1030,7 @@ mib_fetch_rtab(int af, int info, int arg, size_t *lenp) { int name[6]; - u_char *buf; + u_char *buf, *newbuf; name[0] = CTL_NET; name[1] = PF_ROUTE; @@ -1041,6 +1041,7 @@ *lenp = 0; + /* initial estimate */ if (sysctl(name, 6, NULL, lenp, NULL, 0) == -1) { syslog(LOG_ERR, "sysctl estimate (%d,%d,%d,%d,%d,%d): %m", name[0], name[1], name[2], name[3], name[4], name[5]); @@ -1049,15 +1050,24 @@ if (*lenp == 0) return (NULL); - if ((buf = malloc(*lenp)) == NULL) { - syslog(LOG_ERR, "sysctl buffer: %m"); - return (NULL); - } + buf = NULL; + for (;;) { + if ((newbuf = realloc(buf, *lenp)) == NULL) { + syslog(LOG_ERR, "sysctl buffer: %m"); + free(buf); + return (NULL); + } + buf = newbuf; + + if (sysctl(name, 6, buf, lenp, NULL, 0) == 0) + break; - if (sysctl(name, 6, buf, lenp, NULL, 0) == -1) { - syslog(LOG_ERR, "sysctl get: %m"); - free(buf); - return (NULL); + if (errno != ENOMEM) { + syslog(LOG_ERR, "sysctl get: %m"); + free(buf); + return (NULL); + } + *lenp += *lenp / 8 + 1; } return (buf); ==== //depot/projects/s390/contrib/bsnmp/snmpd/config.c#3 (text+ko) ==== @@ -206,17 +206,18 @@ struct input *input; FILE *fp; char path[PATH_MAX + 1]; - char *col; + const char *col; const char *ptr; if (sysdir) { ptr = syspath; fp = NULL; while (*ptr != '\0') { - if ((col = strchr(ptr, ':')) == NULL) + if ((col = strchr(ptr, ':')) == NULL) { snprintf(path, sizeof(path), "%s/%s", ptr, fname); - else if (col == ptr) + col = ptr + strlen(ptr) - 1; + } else if (col == ptr) snprintf(path, sizeof(path), "./%s", fname); else snprintf(path, sizeof(path), "%.*s/%s", ==== //depot/projects/s390/contrib/bsnmp/snmpd/main.c#3 (text+ko) ==== @@ -1462,8 +1462,8 @@ /* * Get standard communities */ - (void)comm_define(1, "SNMP read", NULL, "public"); - (void)comm_define(2, "SNMP write", NULL, "public"); + (void)comm_define(1, "SNMP read", NULL, NULL); + (void)comm_define(2, "SNMP write", NULL, NULL); community = COMM_INITIALIZE; trap_reqid = reqid_allocate(512, NULL); ==== //depot/projects/s390/contrib/bsnmp/snmpd/snmpd.config#2 (text+ko) ==== @@ -42,6 +42,8 @@ trapport := 162 read := "public" +# Uncomment the line below that sets the community string +# to enable write access. write := "geheim" trap := "mytrap" @@ -52,8 +54,20 @@ begemotSnmpdDebugDumpPdus = 2 begemotSnmpdDebugSyslogPri = 7 +# +# Set the read and write communities. +# +# The default value of the community strings is NULL (note, that this is +# different from the empty string). This disables both read and write access. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 29 22:54:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA9A116A423; Sun, 29 Jan 2006 22:54:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D20016A422 for ; Sun, 29 Jan 2006 22:54:32 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2034E43D75 for ; Sun, 29 Jan 2006 22:54:22 +0000 (GMT) (envelope-from alc@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 k0TMsMbX006411 for ; Sun, 29 Jan 2006 22:54:22 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TMsM7U006408 for perforce@freebsd.org; Sun, 29 Jan 2006 22:54:22 GMT (envelope-from alc@freebsd.org) Date: Sun, 29 Jan 2006 22:54:22 GMT Message-Id: <200601292254.k0TMsM7U006408@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 22:54:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=90652 Change 90652 by alc@alc_home on 2006/01/29 22:54:09 Tidy up. There are no functional changes. Reviewed by: md5 Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_buddy.c#10 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_buddy.c#10 (text+ko) ==== @@ -53,6 +53,12 @@ SYSCTL_OID(_vm, OID_AUTO, buddy, CTLTYPE_STRING | CTLFLAG_RD, NULL, 0, sysctl_vm_buddy, "A", "Buddy Info"); +static __inline void buddyq_insert(int baseq, int q, vm_page_t m); +static __inline void buddyq_remove(vm_page_t m); +static __inline void buddyq_split(vm_page_t m, int q, int Q); + +static vm_page_t phys_to_vm_page(vm_paddr_t pa); + /* * */ @@ -82,12 +88,11 @@ * */ static __inline void -buddy_insert(int baseq, int q, vm_page_t m) +buddyq_insert(int baseq, int q, vm_page_t m) { KASSERT(m->queue == PQ_NONE, - ("vm_page_buddy_insert: page %p has unexpected queue %d", - m, m->queue)); + ("buddyq_insert: page %p has unexpected queue %d", m, m->queue)); m->buddyq = q; m->queue = baseq + q; if (baseq != PQ_FREE || (m->flags & PG_ZERO) != 0) @@ -101,7 +106,7 @@ * */ static __inline void -buddy_remove(vm_page_t m) +buddyq_remove(vm_page_t m) { TAILQ_REMOVE(&vm_page_queues[m->queue].pl, m, pageq); @@ -113,7 +118,7 @@ * */ static __inline void -vm_page_buddy_split(vm_page_t m, int q, int Q) +buddyq_split(vm_page_t m, int q, int Q) { vm_page_t m_buddy; @@ -122,9 +127,9 @@ m_buddy = &m[1 << q]; KASSERT(VM_PAGE_TO_PHYS(m_buddy) == VM_PAGE_TO_PHYS(m) + (1 << (PAGE_SHIFT + q)), - ("vm_page_buddy_split: page %p is not page %p's %d buddy", + ("buddyq_split: page %p is not page %p's %d buddy", m_buddy, m, q)); - buddy_insert(PQ_FREE, q, m_buddy); + buddyq_insert(PQ_FREE, q, m_buddy); } } @@ -157,8 +162,8 @@ m = prefer_zero ? TAILQ_LAST(&vm_page_queues[PQ_FREE + q].pl, pglist) : TAILQ_FIRST(&vm_page_queues[PQ_FREE + q].pl); if (m != NULL) { - buddy_remove(m); - vm_page_buddy_split(m, q, Q); + buddyq_remove(m); + buddyq_split(m, q, Q); cnt.v_free_count -= 1 << Q; return (m); } @@ -229,12 +234,12 @@ buddy->buddyq != q || !VM_PAGE_INQUEUE1(buddy, baseq)) break; - buddy_remove(buddy); + buddyq_remove(buddy); q++; pa &= ~((1 << (PAGE_SHIFT + q)) - 1); m = PHYS_TO_VM_PAGE(pa); } - buddy_insert(baseq, q, m); + buddyq_insert(baseq, q, m); } /* @@ -269,7 +274,7 @@ * there. For that, we remove the whole chunk, return the half * where m is not, and iterate. */ - buddy_remove(buddy); + buddyq_remove(buddy); while (q > 0) { q--; half = buddy->phys_addr ^ (1 << (PAGE_SHIFT + q)); @@ -279,7 +284,7 @@ other = buddy; buddy = PHYS_TO_VM_PAGE(half); } - buddy_insert(PQ_CACHE, q, other); + buddyq_insert(PQ_CACHE, q, other); } cnt.v_cache_count--; KASSERT(buddy == m, ("buddy_unfree: yyy")); @@ -356,8 +361,8 @@ return (NULL); done: for (m = m_ret; m < &m_ret[npages]; m = &m[1 << q]) - buddy_remove(m); - vm_page_buddy_split(m_ret, q, Q); + buddyq_remove(m); + buddyq_split(m_ret, q, Q); cnt.v_free_count -= roundup2(npages, 1 << imin(q, Q)); for (i = 0; i < npages; i++) { m = &m_ret[i]; From owner-p4-projects@FreeBSD.ORG Sun Jan 29 23:09:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C37F16A423; Sun, 29 Jan 2006 23:09:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B63316A420 for ; Sun, 29 Jan 2006 23:09:42 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E77AB43D45 for ; Sun, 29 Jan 2006 23:09:41 +0000 (GMT) (envelope-from alc@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 k0TN9fbd007229 for ; Sun, 29 Jan 2006 23:09:41 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0TN9fWG007226 for perforce@freebsd.org; Sun, 29 Jan 2006 23:09:41 GMT (envelope-from alc@freebsd.org) Date: Sun, 29 Jan 2006 23:09:41 GMT Message-Id: <200601292309.k0TN9fWG007226@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90653 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 23:09:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=90653 Change 90653 by alc@alc_home on 2006/01/29 23:09:28 Use the new page queue macros. There are no functional changes. Reviewed by: md5 Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_buddy.c#11 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_buddy.c#11 (text+ko) ==== @@ -336,7 +336,7 @@ m = phys_to_vm_page(pa); if (m == NULL || m->buddyq != BUDDY_QUEUES - 1 || - (m->queue - m->buddyq) != PQ_FREE) + !VM_PAGE_INQUEUE1(m, PQ_FREE)) break; } /* If not, continue to the next block. */ From owner-p4-projects@FreeBSD.ORG Mon Jan 30 00:02:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B036616A423; Mon, 30 Jan 2006 00:02:48 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C0CE16A420 for ; Mon, 30 Jan 2006 00:02:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 225CF43D46 for ; Mon, 30 Jan 2006 00:02:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0U02mc9009953 for ; Mon, 30 Jan 2006 00:02:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0U02lgq009950 for perforce@freebsd.org; Mon, 30 Jan 2006 00:02:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 Jan 2006 00:02:47 GMT Message-Id: <200601300002.k0U02lgq009950@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 00:02:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=90658 Change 90658 by rwatson@rwatson_peppercorn on 2006/01/30 00:02:00 Having one of those days: correct results of an errant search and replace. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#7 (text+ko) ==== @@ -6,9 +6,9 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * Notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright - * Notice, this list of conditions and the following disclaimer in the + * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#6 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#7 $ */ #ifndef _BSM_AUDIT_UEVENTS_H_ From owner-p4-projects@FreeBSD.ORG Mon Jan 30 00:14:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C98616A423; Mon, 30 Jan 2006 00:14:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0257216A420 for ; Mon, 30 Jan 2006 00:14:03 +0000 (GMT) (envelope-from soc-shteryana@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68C2443D46 for ; Mon, 30 Jan 2006 00:14:02 +0000 (GMT) (envelope-from soc-shteryana@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 k0U0E2Os010359 for ; Mon, 30 Jan 2006 00:14:02 GMT (envelope-from soc-shteryana@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0U0E2Ij010356 for perforce@freebsd.org; Mon, 30 Jan 2006 00:14:02 GMT (envelope-from soc-shteryana@freebsd.org) Date: Mon, 30 Jan 2006 00:14:02 GMT Message-Id: <200601300014.k0U0E2Ij010356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-shteryana@freebsd.org using -f From: soc-shteryana To: Perforce Change Reviews Cc: Subject: PERFORCE change 90659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 00:14:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=90659 Change 90659 by soc-shteryana@prometheus on 2006/01/30 00:13:23 IFC currently needs a dummy int debug_on = 0; to be able to compile around line 65 in contrib/bsnmp/snmpd/main.c because of extern int debug_on in libbsnmp; to be fixed shortly Affected files ... .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/FREEBSD-Xlist#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.c#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/snmpclient.c#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII.c#7 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/.gdbinit#2 delete .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/main.c#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/snmpd.config#4 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/snmpmod.h#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/trans_udp.c#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/soc2005/bsnmp/lib/libbsnmp/libbsnmp/Makefile#3 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/gensnmptree/Makefile#2 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/Makefile#6 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/Makefile.inc#3 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_atm/Makefile#2 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt#1 branch .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c#1 branch .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#1 branch .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#4 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile#2 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3#3 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c#2 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#2 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#3 integrate Differences ... ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/contrib/bsnmp/FREEBSD-Xlist,v 1.3 2005/02/28 17:29:10 harti Exp $ +#$FreeBSD: src/contrib/bsnmp/FREEBSD-Xlist,v 1.4 2005/10/04 14:53:06 harti Exp $ */Makefile.in */acinclude.m4 */aclocal.m4 @@ -10,5 +10,6 @@ */gensnmptree/Makefile.in */lib/Makefile.in */snmp_mibII/Makefile.in +*/snmp_ntp/Makefile.in */snmpd/Makefile.in */snmpd/.gdbinit ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/NEWS#2 (text+ko) ==== @@ -1,3 +1,25 @@ +1.11 Make the Mib2 routing table use red-black tree. This vastly + reduces loading and access time. Load the table only every 10 + minutes. In the meantime process message from the routing socket + to update the table. + + Lot of man-page fixes from ru@freebsd.org. + + Fixes to command line macros and macro redefinition. + + Trap variables for ntp (still need trap definition and code). + + Periodic timers from Victor Cruceru. + + Man-page fixes from Christian Brueffer. + + Lots of spelling fixes from Giorgios Keramidas. + + A number of changes to facilitate building on FreeBSD-4 from + Andrey Elsukov. + + Add repeatable timers. + 1.10 Change all the tick handling in the daemon from 32-bit to 64-bit. Bump the modules' major version number to 3. @@ -34,7 +56,7 @@ Maxim Konovalov) 1.7 - snmpd: Move event library initialisation before reading of + snmpd: Move event library initialization before reading of config file (thanks to phk). gensnmptree: can now read more than one tree and merge them. ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.10 +1.11 ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2004 +.\" Copyright (C) 2004-2005 .\" Hartmut Brandt. .\" All rights reserved. .\" @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmpdef/gensnmpdef.1,v 1.3 2005/02/25 11:55:54 brandt_h Exp $ +.\" $Begemot: bsnmp/gensnmpdef/gensnmpdef.1,v 1.5 2005/10/04 08:46:46 brandt_h Exp $ .\" -.Dd April 14, 2004 +.Dd June 14, 2005 .Dt GENSNMPDEF 1 .Os .Sh NAME @@ -43,7 +43,8 @@ The .Nm utility is used to create an initial MIB description file from -one or more MIBs. The description file must be edited to be actually useful +one or more MIBs. +The description file must be edited to be actually useful for feeding it into .Xr gensnmptree 1 . .Pp @@ -57,13 +58,13 @@ .Pp .Nm does no attempt on sorting the OID tree so in case of complex and -non-standard MIBs it is necessay to sort the tree in the resulting definition +non-standard MIBs it is necessary to sort the tree in the resulting definition file by hand. .Sh SEE ALSO .Xr snmpd 1 +.Sh AUTHORS +.An Hartmut Brandt Aq harti@freebsd.org .Sh BUGS The utility is by no means bullet-proof and may fail for complex or non-standard MIBs. Its output is expected to be edited by hand. -.Sh AUTHORS -.An Hartmut Brandt Aq harti@freebsd.org ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.1#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2001-2003 +.\" Copyright (c) 2001-2005 .\" Fraunhofer Institute for Open Communication Systems (FhG Fokus). .\" All rights reserved. .\" @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.4 2005/02/25 11:55:56 brandt_h Exp $ +.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.5 2005/06/15 11:31:25 brandt_h Exp $ .\" -.Dd October 7, 2003 +.Dd June 14, 2005 .Dt GENSNMPTREE 1 .Os .Sh NAME @@ -43,8 +43,8 @@ The .Nm utility is used to either generate C language tables and header files from -a MIB description or to numeric OIDs from MIB descriptions. The first form -is used only for maintaining the +a MIB description or to numeric OIDs from MIB descriptions. +The first form is used only for maintaining the .Xr snmpd 1 daemon or for module writers. The second form may be used by SNMP client program writers. @@ -70,7 +70,8 @@ .Nm expects MIB variable names (only the last component) on its command line. It reads a MIB specification from standard input and for each MIB variable -name emits two C preprocessor defines on its standard output. One define +name emits two C preprocessor defines on its standard output. +One define .Va OID_ Ns Ar name can be used as an array initialized to initialize a .Va struct asn_oid . @@ -85,7 +86,8 @@ .It Fl e Enter extract mode. .It Fl l -Generate local preprocessor includes. This is used for bootstrapping +Generate local preprocessor includes. +This is used for bootstrapping .Xr snmpd 1 . .It Fl t Instead of normal output print the resulting tree. ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.42 2005/04/26 16:26:19 brandt_h Exp $ + * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.43 2005/10/04 11:21:29 brandt_h Exp $ * * Generate OID table from table description. * @@ -353,6 +353,7 @@ node = xalloc(sizeof(struct node)); node->lno = lno; + node->flags = 0; if (tok != '(') report("'(' expected at begin of node"); @@ -595,7 +596,9 @@ fprintf(fp, "#include \n"); fprintf(fp, "#include \n"); +#ifdef HAVE_STDINT_H fprintf(fp, "#include \n"); +#endif if (localincs) { fprintf(fp, "#include \"asn1.h\"\n"); fprintf(fp, "#include \"snmp.h\"\n"); ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/asn1.3#2 (text+ko) ==== @@ -1,4 +1,7 @@ .\" +.\" Copyright (c) 2004-2005 +.\" Hartmut Brandt. +.\" All rights reserved. .\" Copyright (c) 2001-2003 .\" Fraunhofer Institute for Open Communication Systems (FhG Fokus). .\" All rights reserved. @@ -26,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/lib/asn1.3,v 1.6 2005/02/25 11:55:57 brandt_h Exp $ +.\" $Begemot: bsnmp/lib/asn1.3,v 1.9 2005/10/04 08:46:49 brandt_h Exp $ .\" -.Dd August 15, 2002 +.Dd October 4, 2005 .Dt ASN1 3 .Os .Sh NAME @@ -142,8 +145,8 @@ .Fn asn_oid2str "const struct asn_oid *oid" .Sh DESCRIPTION The ASN.1 library contains routines to handle ASN.1 encoding for SNMP. -It supports only the restricted form of ASN.1 as required by SNMP. There -are two basic structures used throughout the library: +It supports only the restricted form of ASN.1 as required by SNMP. +There are two basic structures used throughout the library: .Bd -literal -offset indent /* these restrictions are in the SMI */ #define ASN_MAXID 0xffffffff @@ -176,17 +179,18 @@ #define asn_ptr asn_u.ptr .Ed .Pp -This structure is used to encode and decode ASN.1. It describes the output +This structure is used to encode and decode ASN.1. +It describes the output buffer for encoding routines and the input buffer for decoding routines. For encoding .Fa asn_len -holds the number of remaining free octets in the buffer. The first free byte -is pointed to by +holds the number of remaining free octets in the buffer. +The first free byte is pointed to by .Fa asn_ptr . For decoding .Fa asn_len -holds the number of remaining bytes to decode. The next byte to decode is pointed -to by +holds the number of remaining bytes to decode. +The next byte to decode is pointed to by .Fa asn_cptr . .Pp Most of the functions return an error code @@ -216,20 +220,20 @@ .Pp The function .Fn asn_get_header -reads the next header from the input octet stream. It returns the tag -in the variable pointed to by +reads the next header from the input octet stream. +It returns the tag in the variable pointed to by .Fa type (note that only single byte tags are supported) and the decoded length field in the value pointed to by .Fa lenp -(this is restricted to a unsigned 32-bit value). All errors in this function -are fatal and stop processing. +(this is restricted to a unsigned 32-bit value). +All errors in this function are fatal and stop processing. .Pp The function .Fn asn_put_header writes an ASN.1 header. .Fa type -is the tag to write and is restricted to one byte tags (i.e. tags +is the tag to write and is restricted to one byte tags (i.e., tags lesser or equal than 0x30). .Fa len is the length of the value and is restricted to 16-bit. @@ -246,15 +250,18 @@ and space for the maximum supported length field and sets the pointer pointed to by .Fa ptr -to the begin of this length field. This pointer must then be fed into +to the begin of this length field. +This pointer must then be fed into .Fn asn_commit_header -directly after writing the value to the buffer. The function will compute the +directly after writing the value to the buffer. +The function will compute the length, insert it into the right place and shift the value if the resulting length field is shorter than the estimated one. .Pp The function .Fn asn_get_integer_raw -is used to decode a signed integer value (32-bit). It assumes, that the +is used to decode a signed integer value (32-bit). +It assumes, that the header of the integer has been decoded already. .Fa len is the length obtained from the ASN.1 header and the integer will be returned @@ -263,8 +270,8 @@ .Pp The function .Fn asn_get_integer -decodes a complete 32-bit signed integer including the header. If the -tag is wrong +decodes a complete 32-bit signed integer including the header. +If the tag is wrong .Li ASN_ERR_TAG is returned. The function @@ -273,14 +280,16 @@ .Pp The function .Fn asn_get_octetstring_raw -decodes the value field of an ASN.1 octet string. The length obtained from the -header must be fed into the +decodes the value field of an ASN.1 octet string. +The length obtained from the header must be fed into the .Fa len argument and .Fa out -must point to a buffer to receive the octet string. On entry to the function +must point to a buffer to receive the octet string. +On entry to the function .Fa outsize -must point to the size of the buffer. On exit +must point to the size of the buffer. +On exit .Fa outsize will point to the number of octets decoded (if no error occurs this will be equal to @@ -291,7 +300,8 @@ .Fa out must point to a buffer to receive the string, .Fa outsize -must point to the size of the buffer. On exit of the function +must point to the size of the buffer. +On exit of the function .Fa outsize will point to the number of octets decoded. The function @@ -316,7 +326,8 @@ .Pp The function .Fn asn_put_exception -is used to encode an SNMPv2 exception. The exception type is +is used to encode an SNMPv2 exception. +The exception type is .Fa type . .Pp The function @@ -369,8 +380,8 @@ .Fn asn_get_counter64_raw decodes an unsigned 64-bit integer value. .Fa len -must be the value length from the header. The resulting value is -stored into the variable pointed to by +must be the value length from the header. +The resulting value is stored into the variable pointed to by .Fa res . The function .Fn asn_put_counter64 @@ -392,12 +403,12 @@ .Pp The function .Fn asn_slice_oid -splits a part out from an OID. It takes all the subids from the OID -pointed to by +splits a part out from an OID. +It takes all the subids from the OID pointed to by .Fa src starting with the subid at position .Fa from -(the first subid beeing subid 0) up to, but not including, subid +(the first subid being subid 0) up to, but not including, subid .Fa to and generates a new OID in .Fa dest . @@ -413,8 +424,8 @@ .Fa from to the OID .Fa to -given that the resulting OID is not too long. If the maximum length is exceeded -the result is undefined. +given that the resulting OID is not too long. +If the maximum length is exceeded the result is undefined. .Pp The function .Fn asn_compare_oid @@ -442,7 +453,8 @@ .Fa oid . The buffer pointed to by .Fa str -must be large enough to hold the result. The constant +must be large enough to hold the result. +The constant .Li ASN_OIDSTRLEN is defined to be the length of the maximum string generated by this function (including the trailing NUL). @@ -452,7 +464,7 @@ .Fa oid into a private buffer that is overwritten by each call. .Sh DIAGNOSTICS -When an error occures in any of the function the function pointed to +When an error occurs in any of the function the function pointed to by the global pointer .Bd -literal -offset indent extern void (*asn_error)(const struct asn_buf *, const char *, ...); @@ -469,7 +481,7 @@ followed by the error message and an optional dump of the buffer. .Sh SEE ALSO .Xr gensnmptree 1 , -.Xr snmpd 1 , +.Xr bsnmpd 1 , .Xr bsnmpagent 3 , .Xr bsnmpclient 3 , .Xr bsnmplib 3 ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/asn1.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.c,v 1.28 2004/08/06 08:46:49 brandt Exp $ + * $Begemot: bsnmp/lib/asn1.c,v 1.29 2005/10/04 11:21:31 brandt_h Exp $ * * ASN.1 for SNMP. */ @@ -35,10 +35,24 @@ #include #include #include +#ifdef HAVE_STDINT_H #include +#elif defined(HAVE_INTTYPES_H) +#include +#endif #include #include "asn1.h" +#if !defined(INT32_MIN) +#define INT32_MIN (-0x7fffffff-1) +#endif +#if !defined(INT32_MAX) +#define INT32_MAX (0x7fffffff) +#endif +#if !defined(UINT32_MAX) +#define UINT32_MAX (0xffffffff) +#endif + static void asn_error_func(const struct asn_buf *, const char *, ...); void (*asn_error)(const struct asn_buf *, const char *, ...) = asn_error_func; ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/asn1.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.h,v 1.18 2004/08/06 08:46:50 brandt Exp $ + * $Begemot: bsnmp/lib/asn1.h,v 1.19 2005/10/04 11:21:31 brandt_h Exp $ * * ASN.1 for SNMP */ ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/bsnmpagent.3#2 (text+ko) ==== @@ -1,4 +1,7 @@ .\" +.\" Copyright (c) 2004-2005 +.\" Hartmut Brandt. +.\" All rights reserved. .\" Copyright (c) 2001-2003 .\" Fraunhofer Institute for Open Communication Systems (FhG Fokus). .\" All rights reserved. @@ -26,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/lib/bsnmpagent.3,v 1.7 2005/02/25 11:55:58 brandt_h Exp $ +.\" $Begemot: bsnmp/lib/bsnmpagent.3,v 1.10 2005/10/04 08:46:49 brandt_h Exp $ .\" -.Dd August 16, 2002 +.Dd October 4, 2005 .Dt BSNMPAGENT 3 .Os .Sh NAME @@ -87,14 +90,15 @@ .Fn snmp_dep_finish "struct snmp_context *ctx" .Sh DESCRIPTION The SNMP library contains routines to easily build SNMP agent applications -that use SNMP versions 1 or 2. Note, however, that it may be even easier to -build an -.Xr snmpd 1 +that use SNMP versions 1 or 2. +Note, however, that it may be even easier to build an +.Xr bsnmpd 1 loadable module, that handles the new MIB (see -.Xr snmpmod 3 ). +.Xr snmpmod 3 ) . .Pp Most of the agent routines operate on a global array that the describes the -complete MIB served by the agent. This array is held in the two variables: +complete MIB served by the agent. +This array is held in the two variables: .Bd -literal -offset indent extern struct snmp_node *tree; extern u_int tree_size; @@ -126,7 +130,8 @@ .It Va name Name of this variable. .It Va type -Type of this variable. One of: +Type of this variable. +One of: .Bd -literal -offset indent enum snmp_node_type { SNMP_NODE_LEAF = 1, @@ -136,17 +141,20 @@ .It Va syntax The SNMP syntax of this variable. .It Va op -The user supplied handler for this variable. The handler is called with -the following arguments: +The user supplied handler for this variable. +The handler is called with the following arguments: .Bl -tag -width "ctx" .It Fa ctx A pointer to the context (see below). .Li NULL . .It Fa val -The value to be set or retrieved. For GETNEXT and GETBULK operations the oid in -this value is the current OID. The function (called in this case only for +The value to be set or retrieved. +For GETNEXT and GETBULK operations the oid in +this value is the current OID. +The function (called in this case only for table rows) must find the lexically next existing OID within the same column and -set the oid and value subfields accordingly. If the table column is exhausted the +set the oid and value subfields accordingly. +If the table column is exhausted the function must return .Li SNMP_ERR_NOSUCHNAME . For all other operations the oid in @@ -169,18 +177,20 @@ .Ed .El .Pp -The user handler must return an appropiate SNMP v2 error code. If the original +The user handler must return an appropriate SNMP v2 error code. +If the original PDU was a version 1 PDU, the error code is mapped automatically. .It Va flags Currently only the flag .Li SNMP_NODE_CANSET is defined and set for nodes, that can be written or created. .It Va index -This word describes the index for table columns. Each part of the index -takes 4 bits starting at bit 4. Bits 0 to 3 hold the number of index parts. -This arrangment allows for tables with up to seven indexes. Each bit group -contains the syntax for the index part. There are a number of macros to -help in parsing this field: +This word describes the index for table columns. +Each part of the index takes 4 bits starting at bit 4. +Bits 0 to 3 hold the number of index parts. +This arrangement allows for tables with up to seven indexes. +Each bit group contains the syntax for the index part. +There are a number of macros to help in parsing this field: .Bd -literal -offset indent #define SNMP_INDEXES_MAX 7 #define SNMP_INDEX_SHIFT 4 @@ -197,8 +207,9 @@ The easiest way to construct the node table is .Xr gensnmptree 1 . Note, that one must be careful when changing the tree while executing a SET -operation. Consult the sources for -.Xr snmpd 1 . +operation. +Consult the sources for +.Xr bsnmpd 1 . .Pp The global variable .Va snmp_trace @@ -218,7 +229,8 @@ .Pp Setting a bit to true causes the library to call .Fn snmp_debug -in strategic places with a debug string. The library contains a default +in strategic places with a debug string. +The library contains a default implementation for the debug function that prints a message to standard error. .Pp Many of the functions use a so called context: @@ -234,8 +246,8 @@ struct snmp_scratch { void *ptr1; void *ptr2; - u_int32_t int1; - u_int32_t int2; + uint32_t int1; + uint32_t int2; }; .Ed .Pp @@ -243,15 +255,17 @@ .Bl -tag -width ".It Va var_index" .It Va va_index For the node operation callback this is the -index of the variable binding that should be returned if an error occures. -Set by the library. In all other functions this is undefined. +index of the variable binding that should be returned if an error occurs. +Set by the library. +In all other functions this is undefined. .It Va scratch For the node operation callback this is a pointer to a per variable binding -scratch area that can be used to implement the commit and rollback. Set -by the library. +scratch area that can be used to implement the commit and rollback. +Set by the library. .It Va dep In the dependency callback function (see below) this is a pointer to the -current dependency. Set by the library. +current dependency. +Set by the library. .It Va data This is the .Fa data @@ -267,21 +281,24 @@ .Fn snmp_getbulk executes an SNMP GETBULK operation. For all three functions the response PDU is constructed and encoded -on the fly. If everything is ok, the response PDU is returned in +on the fly. +If everything is ok, the response PDU is returned in .Fa resp and .Fa resp_b . The caller must call .Fn snmp_pdu_free -to free the response PDU in this case. One of the following values may be -returned: +to free the response PDU in this case. +One of the following values may be returned: .Bl -tag -width ".It Li SNMP_RET_ERR" .It Li SNMP_RET_OK Operation successful, response PDU may be sent. .It Li SNMP_RET_IGN -Operation failed, no response PDU constructed. Request is ignored. +Operation failed, no response PDU constructed. +Request is ignored. .It Li SNMP_RET_ERR -Error in operation. The error code and index have been set in +Error in operation. +The error code and index have been set in .Fa pdu . No response PDU has been constructed. The caller may construct an error response PDU via @@ -290,47 +307,56 @@ .Pp The function .Fn snmp_set -executes an SNMP SET operation. The arguments are the same as for the previous -three functions. The operation of this functions is, however, much more complex. +executes an SNMP SET operation. +The arguments are the same as for the previous +three functions. +The operation of this functions is, however, much more complex. .Pp -The SET operation occures in several stages: +The SET operation occurs in several stages: .Bl -enum -offset indent .It For each binding search the corresponding nodes, check that the -variable is writeable and the syntax is ok. The writeable check can be done -only for scalars. For columns it must be done in the node's operation callback -function. +variable is writeable and the syntax is ok. +The writeable check can be done only for scalars. +For columns it must be done in the node's operation callback function. .It For each binding call the node's operation callback with function SNMP_OP_SET. -The callback may create dependencies or finalizers (see below). For simple +The callback may create dependencies or finalizers (see below). +For simple scalars the scratch area may be enough to handle commit and rollback, for -interdependend table columns dependencies may be necessary. +interdependent table columns dependencies may be necessary. .It If the previous step fails at any point, the node's operation callback functions are called for all bindings for which SNMP_OP_SET was executed -with SNMP_OP_ROLLBACK, in the opposite order. This allows all variables to -undo the effect of the SET operation. After this all the dependencies -are freed -and the finalizers are executed with a fail flag of 1. Then the function +with SNMP_OP_ROLLBACK, in the opposite order. +This allows all variables to undo the effect of the SET operation. +After this all the dependencies are freed +and the finalizers are executed with a fail flag of 1. +Then the function returns to the caller with an appropriate error indication. .It If the SET step was successful for all bindings, the dependency callbacks are executed in the order in which the dependencies were created with an -operation of SNMP_DEPOP_COMMIT. If any of the dependencies fails, all the +operation of SNMP_DEPOP_COMMIT. +If any of the dependencies fails, all the committed dependencies are called again in the opposite order -with SNMP_DEPOP_ROLLBACK. Than for all bindings from the last to the first +with SNMP_DEPOP_ROLLBACK. +Than for all bindings from the last to the first the node's operation callback is called with SNMP_OP_ROLLBACK to undo -the effect of SNMP_OP_SET. At the end the dependencies are freed -and the finalizers are called with a fail flag -of 1 and the function returns to the caller with an appropriate error indication. +the effect of SNMP_OP_SET. +At the end the dependencies are freed and the finalizers are called with +a fail flag of 1 and the function returns to the caller with an appropriate +error indication. .It If the dependency commits were successful, for each binding the node's -operation callback is called with SNMP_OP_COMMIT. Any error returned from +operation callback is called with SNMP_OP_COMMIT. +Any error returned from the callbacks is ignored (an error message is generated via .Fn snmp_error ). .It Now the dependencies are freed and the finalizers are called -with a fail flag of 0. For each dependency just before freeing it +with a fail flag of 0. +For each dependency just before freeing it its callback is called with .Li SNMP_DEPOP_FINISH. Then the function returns @@ -338,20 +364,26 @@ .El .Pp There are to mechanisms to help in complex SET operations: dependencies and -finalizers. A dependency is used if several bindings depend on each other. +finalizers. +A dependency is used if several bindings depend on each other. A typical example is the creation of a conceptual row, which requires -the setting of several columns to succeed. A dependency is identified by -two OIDs. In the table case, the first oid is typically the table's base OID -and the second one the index. Both of these can easily be generated from the +the setting of several columns to succeed. +A dependency is identified by +two OIDs. +In the table case, the first oid is typically the table's base OID +and the second one the index. +Both of these can easily be generated from the variables OID with .Fn asn_slice_oid . The function .Fn snmp_dep_lookup tries to find a dependency based on these two OIDs and, if it cannot find one -creates a new one. This means for the table example, that the function +creates a new one. +This means for the table example, that the function returns the same dependency for each of the columns of the same table row. This allows during the SNMP_OP_SET processing to collect all information -about the row into the dependency. The arguments to +about the row into the dependency. +The arguments to .Fn snmp_dep_lookup are: the two OIDs to identify the dependency (they are copied into newly created dependencies), the size of the structure to allocate and @@ -369,16 +401,17 @@ .Pp The function .Fn snmp_make_errresp -makes an error response if an operation has failed. It takes the original -request PDU (it will look only on the error code and index fields), the -buffer containing the original PDU and a buffer for the error PDU. It copies -the bindings field from the original PDUs buffer directly to the response -PDU and thus does not depend on the decodability of this field. It may return -the same values as the operation functions. +makes an error response if an operation has failed. +It takes the original request PDU (it will look only on the error code and +index fields), the buffer containing the original PDU and a buffer for the +error PDU. +It copies the bindings field from the original PDUs buffer directly to +the response PDU and thus does not depend on the decodability of this field. +It may return the same values as the operation functions. .Pp The next four functions allow some parts of the SET operation to be executed. This is only used in -.Xr snmpd 1 +.Xr bsnmpd 1 to implement the configuration as a single transaction. The function .Fn snmp_init_context @@ -395,12 +428,12 @@ .Fn snmp_dep_finish executes SNMP_DEPOP_FINISH for all dependencies. .Sh DIAGNOSTICS -If an error occures in any of the function an error indication as described -above is returned. Additionally the functions may call snmp_error on unexected -errors. +If an error occurs in any of the function an error indication as described +above is returned. +Additionally the functions may call snmp_error on unexpected errors. .Sh SEE ALSO .Xr gensnmptree 1 , -.Xr snmpd 1 , +.Xr bsnmpd 1 , .Xr bsnmpclient 3 , .Xr bsnmplib 3 , .Xr snmpmod 3 ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/bsnmpclient.3#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/lib/bsnmpclient.3,v 1.9 2005/05/23 11:10:12 brandt_h Exp $ +.\" $Begemot: bsnmp/lib/bsnmpclient.3,v 1.12 2005/10/04 08:46:50 brandt_h Exp $ .\" -.Dd May 23, 2005 +.Dd October 4, 2005 .Dt BSNMPCLIENT 3 .Os .Sh NAME @@ -104,7 +104,8 @@ .Fn snmp_dialog "struct snmp_pdu *req" "struct snmp_pdu *resp" .Sh DESCRIPTION The SNMP library contains routines to easily build SNMP client applications -that use SNMP versions 1 or 2. Most of the routines use a +that use SNMP versions 1 or 2. +Most of the routines use a .Vt struct snmp_client : .Bd -literal -offset indent struct snmp_client { @@ -145,9 +146,11 @@ The fields of this structure are described below. .Bl -tag -width "timeout_start" .It Va version -This is the version of SNMP to use. See +This is the version of SNMP to use. +See .Xr bsnmplib 3 -for applicable values. The default version is +for applicable values. +The default version is .Li SNMP_V2c . .It Va trans If this is @@ -163,12 +166,14 @@ .Va chost field as the path to the server's socket for local sockets. .It Va cport -The SNMP agent's UDP port number. This may be a symbolic port number (from -.Pa /etc/services -or a numeric port number. If this field is +The SNMP agent's UDP port number. +This may be a symbolic port number (from +.Pa /etc/services ) +or a numeric port number. +If this field is .Li NULL -(the default) the standard SNMP port is used. This field should not be changed -directly but rather by calling +(the default) the standard SNMP port is used. +This field should not be changed directly but rather by calling .Fn snmp_client_set_port . .It Va chost The SNMP agent's host name, IP address or @@ -178,46 +183,52 @@ .Li NULL (the default) .Li localhost -is assumed. This field should not be changed directly but rather through -calling +is assumed. +This field should not be changed directly but rather through calling .Fn snmp_client_set_host . .It Va read_community This is the community name to be used for all requests except SET requests. The default is .Sq public . .It Va write_community -The community name to be used for SET requests. The default is +The community name to be used for SET requests. +The default is .Sq private . .It Va timeout -The maximum time to wait for responses to requests. If the time elapses, the -request is resent up to +The maximum time to wait for responses to requests. +If the time elapses, the request is resent up to .Va retries -times. The default is 3 seconds. +times. +The default is 3 seconds. .It Va retries -Number of times a request PDU is to be resent. If set to 0, the request is -sent only once. The default is 3 retransmissions. +Number of times a request PDU is to be resent. +If set to 0, the request is sent only once. +The default is 3 retransmissions. .It Va dump_pdus If set to a non-zero value all received and sent PDUs are dumped via .Xr snmp_pdu_dump 3 . The default is not to dump PDUs. .It Va txbuflen -The encoding buffer size to be allocated for transmitted PDUs. The default is -10000 octets. +The encoding buffer size to be allocated for transmitted PDUs. +The default is 10000 octets. .It Va rxbuflen -The decoding buffer size to be allocated for received PDUs. This is the size -of the maximum PDU that can be received. The default is 10000 octets. +The decoding buffer size to be allocated for received PDUs. +This is the size of the maximum PDU that can be received. +The default is 10000 octets. .It Va fd After calling .Fn snmp_open this is the file socket file descriptor used for sending and receiving PDUs. .It Va next_reqid -The request id of the next PDU to send. Used internal by the library. +The request id of the next PDU to send. +Used internal by the library. .It Va max_reqid -The maximum request id to use for outging PDUs. The default is +The maximum request id to use for outgoing PDUs. +The default is .Li INT32_MAX . .It Va min_reqid -The minimum request id to use for outgoing PDUs. Request ids are allocated -linerily starting at +The minimum request id to use for outgoing PDUs. +Request ids are allocated linearily starting at .Va min_reqid up to .Va max_reqid . @@ -225,29 +236,30 @@ If an error happens, this field is set to a printable string describing the error. .It Va timeout_start -This field must point to a function setting up a one shot timeout. After the >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 30 04:35:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC04616A423; Mon, 30 Jan 2006 04:35:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 78A5316A420 for ; Mon, 30 Jan 2006 04:35:45 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E094B43D4C for ; Mon, 30 Jan 2006 04:35:44 +0000 (GMT) (envelope-from marcel@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 k0U4Zi93030378 for ; Mon, 30 Jan 2006 04:35:44 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0U4ZPJ4030126 for perforce@freebsd.org; Mon, 30 Jan 2006 04:35:25 GMT (envelope-from marcel@freebsd.org) Date: Mon, 30 Jan 2006 04:35:25 GMT Message-Id: <200601300435.k0U4ZPJ4030126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 90663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 04:35:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=90663 Change 90663 by marcel@marcel_nfs on 2006/01/30 04:34:39 IFC @90604 Affected files ... .. //depot/projects/ia64/COPYRIGHT#4 integrate .. //depot/projects/ia64/LOCKS#2 integrate .. //depot/projects/ia64/MAINTAINERS#50 integrate .. //depot/projects/ia64/Makefile.inc1#108 integrate .. //depot/projects/ia64/ObsoleteFiles.inc#3 integrate .. //depot/projects/ia64/UPDATING#83 integrate .. //depot/projects/ia64/bin/setfacl/setfacl.1#8 integrate .. //depot/projects/ia64/bin/sh/builtins.def#8 integrate .. //depot/projects/ia64/bin/sh/eval.c#13 integrate .. //depot/projects/ia64/bin/sh/eval.h#5 integrate .. //depot/projects/ia64/bin/sh/jobs.c#23 integrate .. //depot/projects/ia64/bin/sh/output.c#8 integrate .. //depot/projects/ia64/bin/sh/sh.1#35 integrate .. //depot/projects/ia64/bin/sh/trap.c#9 integrate .. //depot/projects/ia64/contrib/bc/bc/main.c#4 integrate .. //depot/projects/ia64/contrib/bind9/CHANGES#4 integrate .. //depot/projects/ia64/contrib/bind9/FAQ#3 integrate .. //depot/projects/ia64/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/ia64/contrib/bind9/FREEBSD-Upgrade#6 integrate .. //depot/projects/ia64/contrib/bind9/FREEBSD-Xlist#3 integrate .. //depot/projects/ia64/contrib/bind9/README#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/control.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/ia64/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/ia64/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.c#4 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/ia64/contrib/bind9/config.threads.in#1 branch .. //depot/projects/ia64/contrib/bind9/configure.in#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/ia64/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/arm/isc.color.gif#2 delete .. //depot/projects/ia64/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete .. //depot/projects/ia64/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete .. //depot/projects/ia64/contrib/bind9/doc/arm/validate.sh.in#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete .. //depot/projects/ia64/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/ia64/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/ia64/contrib/bind9/doc/rfc/rfc3757.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/rfc/rfc3901.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/rfc/rfc4025.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/rfc/rfc4033.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/rfc/rfc4034.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/rfc/rfc4035.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/rfc/rfc4074.txt#1 branch .. //depot/projects/ia64/contrib/bind9/doc/rfc/rfc4159.txt#1 branch .. //depot/projects/ia64/contrib/bind9/lib/bind/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch .. //depot/projects/ia64/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/port_after.h.in#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/bind9/getaddresses.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rdata.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch .. //depot/projects/ia64/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/print.c#3 integrate .. //depot/projects/ia64/contrib/bind9/lib/lwres/strtoul.c#1 branch .. //depot/projects/ia64/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/ia64/contrib/bind9/version#4 integrate .. //depot/projects/ia64/contrib/bsnmp/gensnmptree/gensnmptree.c#8 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII.c#9 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/config.c#6 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/main.c#8 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/snmpd.config#6 integrate .. //depot/projects/ia64/contrib/cpio/doc/cpio.1#2 integrate .. //depot/projects/ia64/contrib/cpio/doc/cpio.texi#2 integrate .. //depot/projects/ia64/contrib/cpio/src/copyin.c#2 integrate .. //depot/projects/ia64/contrib/cpio/src/copyout.c#2 integrate .. //depot/projects/ia64/contrib/cpio/src/copypass.c#2 integrate .. //depot/projects/ia64/contrib/cpio/src/extern.h#2 integrate .. //depot/projects/ia64/contrib/cpio/src/global.c#2 integrate .. //depot/projects/ia64/contrib/cpio/src/main.c#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-common#17 integrate .. //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#14 integrate .. //depot/projects/ia64/contrib/ipfilter/BSD/Makefile#8 integrate .. //depot/projects/ia64/contrib/ipfilter/BSD/Makefile.ipsend#3 integrate .. //depot/projects/ia64/contrib/ipfilter/BSD/kupgrade#7 integrate .. //depot/projects/ia64/contrib/ipfilter/HISTORY#9 integrate .. //depot/projects/ia64/contrib/ipfilter/Makefile#7 integrate .. //depot/projects/ia64/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/ipf.h#5 integrate .. //depot/projects/ia64/contrib/ipfilter/iplang/iplang_l.l#4 integrate .. //depot/projects/ia64/contrib/ipfilter/iplang/iplang_y.y#5 integrate .. //depot/projects/ia64/contrib/ipfilter/ipmon.h#2 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsd/ipsd.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsd/ipsdr.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/arp.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/ip.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/ipresend.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/ipsend.c#7 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/ipsopt.c#6 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/iptest.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/iptests.c#6 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/larp.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/lsock.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/resend.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/sbpf.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/sdlpi.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/slinux.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/snit.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/sock.c#7 integrate .. //depot/projects/ia64/contrib/ipfilter/ipsend/tcpip.h#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ipt.h#3 integrate .. //depot/projects/ia64/contrib/ipfilter/kmem.h#4 integrate .. //depot/projects/ia64/contrib/ipfilter/l4check/http.ok#3 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/addipopt.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/addkeep.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/binprint.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/buildopts.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/checkrev.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/count4bits.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/count6bits.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/debug.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/extras.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/facpri.h#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/fill6bits.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/flags.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/genmask.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/getline.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/getnattype.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/getproto.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/hostmask.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/hostnum.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/inet_addr.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/initparse.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/ionames.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/ipft_ef.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/ipft_hx.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/ipft_pc.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/ipft_sn.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/ipft_td.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/ipoptsec.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/kmem.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/kmem.h#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/load_hash.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/load_hashnode.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/load_pool.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/load_poolnode.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/loglevel.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/make_range.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/nat_setgroupmap.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/natparse.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/optname.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/optprintv6.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/optvalue.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/parse.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/portname.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/portnum.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/ports.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/print_toif.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printactivenat.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printaps.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printbuf.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printfraginfo.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printhostmap.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printhostmask.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printifname.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printip.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printmask.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printnat.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printpacket.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printportcmp.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/printproto.c#1 branch .. //depot/projects/ia64/contrib/ipfilter/lib/printstate.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/ratoi.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/ratoui.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/remove_hash.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/remove_hashnode.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/remove_pool.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/remove_poolnode.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/tcp_flags.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/tcpflags.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/tcpoptnames.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/to_interface.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/v6ionames.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/v6optvalue.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/lib/verbose.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/man/ipf.5#5 integrate .. //depot/projects/ia64/contrib/ipfilter/man/ipftest.1#5 integrate .. //depot/projects/ia64/contrib/ipfilter/man/ipmon.8#9 integrate .. //depot/projects/ia64/contrib/ipfilter/man/ipnat.5#9 integrate .. //depot/projects/ia64/contrib/ipfilter/man/ipnat.8#4 integrate .. //depot/projects/ia64/contrib/ipfilter/mlfk_rule.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/opts.h#2 integrate .. //depot/projects/ia64/contrib/ipfilter/perl/ipf-mrtg.pl#3 integrate .. //depot/projects/ia64/contrib/ipfilter/perl/logfilter.pl#3 integrate .. //depot/projects/ia64/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/radix_ipf.h#2 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.1#3 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.10#3 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.11#3 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.12#3 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.13#3 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.2#3 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.3#3 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.4#3 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.5#3 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.6#3 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.7#3 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.8#3 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.9#4 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.sr#3 integrate .. //depot/projects/ia64/contrib/ipfilter/samples/ipfilter-pb.gif#3 integrate .. //depot/projects/ia64/contrib/ipfilter/samples/proxy.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/samples/relay.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/snoop.h#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/Makefile#9 integrate .. //depot/projects/ia64/contrib/ipfilter/test/dotest#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/bpf1#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/f13#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/f17#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/f18#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/f19#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/f7#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/f9#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i1#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i11#4 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i12#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i14#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i16#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/i17#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/i18#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/i19#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/i2#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i20#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/i21#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/i4#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i6#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i7#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i8#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/i9#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/in1#5 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/in2#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/in5#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/in6#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/n1#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/n11#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/n13#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/n14#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/expected/n2#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/n3#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/n4#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/n5#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/n6#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/n7#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/p1#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/p2#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/p3#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/input/f13#5 integrate .. //depot/projects/ia64/contrib/ipfilter/test/input/f17#4 integrate .. //depot/projects/ia64/contrib/ipfilter/test/input/f18#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/input/f19#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/input/f7#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/input/f9#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/input/n13#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/input/n14#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/input/ni17#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/itest#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/natipftest#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/bpf1#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/f13#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/f18#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/f19#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/f7#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i1#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i11#4 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i12#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i14#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i16#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/i17#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/i18#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/i19#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/i2#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i20#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/i21#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/i4#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i6#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i7#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i8#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/i9#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/in1#4 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/in2#3 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/in5#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/in6#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/regress/n13#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/n14#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/ni17.nat#1 branch .. //depot/projects/ia64/contrib/ipfilter/test/regress/p2.ipf#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/vfycksum.pl#3 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipf.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipfcomp.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipftest.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipnat.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipsyncm.c#2 integrate .. //depot/projects/ia64/contrib/ipfilter/tools/ipsyncs.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-bpf.c#9 integrate .. //depot/projects/ia64/contrib/pf/authpf/authpf.c#5 integrate .. //depot/projects/ia64/contrib/texinfo/util/texindex.c#7 integrate .. //depot/projects/ia64/contrib/traceroute/traceroute.c#7 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/gssapi_locl.h#5 integrate .. //depot/projects/ia64/crypto/openssh/sshd.c#16 integrate .. //depot/projects/ia64/etc/Makefile#52 integrate .. //depot/projects/ia64/etc/defaults/Makefile#7 integrate .. //depot/projects/ia64/etc/defaults/periodic.conf#17 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#66 integrate .. //depot/projects/ia64/etc/devd.conf#22 integrate .. //depot/projects/ia64/etc/gettytab#5 integrate .. //depot/projects/ia64/etc/gss/Makefile#1 branch .. //depot/projects/ia64/etc/gss/mech#1 branch .. //depot/projects/ia64/etc/gss/qop#1 branch .. //depot/projects/ia64/etc/mtree/BSD.include.dist#36 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#28 integrate .. //depot/projects/ia64/etc/mtree/BSD.root.dist#17 integrate .. //depot/projects/ia64/etc/mtree/BSD.x11.dist#3 integrate .. //depot/projects/ia64/etc/periodic/daily/406.status-gmirror#1 branch .. //depot/projects/ia64/etc/periodic/daily/Makefile#5 integrate .. //depot/projects/ia64/etc/pf.conf#3 integrate .. //depot/projects/ia64/etc/portsnap.conf#3 integrate .. //depot/projects/ia64/etc/rc#32 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#37 integrate .. //depot/projects/ia64/etc/rc.d/NETWORKING#10 integrate .. //depot/projects/ia64/etc/rc.d/abi#5 integrate .. //depot/projects/ia64/etc/rc.d/addswap#5 integrate .. //depot/projects/ia64/etc/rc.d/amd#12 integrate .. //depot/projects/ia64/etc/rc.d/cleanvar#10 integrate .. //depot/projects/ia64/etc/rc.d/cleartmp#11 integrate .. //depot/projects/ia64/etc/rc.d/devfs#9 integrate .. //depot/projects/ia64/etc/rc.d/dumpon#9 integrate .. //depot/projects/ia64/etc/rc.d/ftpd#1 branch .. //depot/projects/ia64/etc/rc.d/initrandom#6 integrate .. //depot/projects/ia64/etc/rc.d/ipsec#11 integrate .. //depot/projects/ia64/etc/rc.d/ldconfig#13 integrate .. //depot/projects/ia64/etc/rc.d/localpkg#5 integrate .. //depot/projects/ia64/etc/rc.d/mixer#5 integrate .. //depot/projects/ia64/etc/rc.d/mountcritremote#12 integrate .. //depot/projects/ia64/etc/rc.d/newsyslog#5 integrate .. //depot/projects/ia64/etc/rc.d/ntpd#11 integrate .. //depot/projects/ia64/etc/rc.d/ntpdate#12 integrate .. //depot/projects/ia64/etc/rc.d/power_profile#7 integrate .. //depot/projects/ia64/etc/rc.d/rcconf.sh#5 delete .. //depot/projects/ia64/etc/rc.d/resolv#4 integrate .. //depot/projects/ia64/etc/rc.d/root#10 integrate .. //depot/projects/ia64/etc/rc.d/syscons#9 integrate .. //depot/projects/ia64/etc/rc.d/syslogd#8 integrate .. //depot/projects/ia64/etc/rc.d/tmp#5 integrate .. //depot/projects/ia64/etc/rc.d/usbd#4 delete .. //depot/projects/ia64/etc/rc.initdiskless#5 integrate .. //depot/projects/ia64/etc/rc.shutdown#12 integrate .. //depot/projects/ia64/etc/rc.subr#26 integrate .. //depot/projects/ia64/etc/services#15 integrate .. //depot/projects/ia64/etc/snmpd.config#2 integrate .. //depot/projects/ia64/etc/usbd.conf#7 delete .. //depot/projects/ia64/games/fortune/datfiles/fortunes#53 integrate .. //depot/projects/ia64/games/fortune/datfiles/limerick#7 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_int/Makefile#14 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvs/Makefile#12 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/main.c#7 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/grep.1#11 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#29 integrate .. //depot/projects/ia64/gnu/usr.bin/man/man/man.c#11 integrate .. //depot/projects/ia64/gnu/usr.bin/man/man/man.man#7 integrate .. //depot/projects/ia64/include/Makefile#52 integrate .. //depot/projects/ia64/include/dlfcn.h#7 integrate .. //depot/projects/ia64/include/gssapi.h#1 branch .. //depot/projects/ia64/include/gssapi/Makefile#1 branch .. //depot/projects/ia64/include/gssapi/gssapi.h#1 branch .. //depot/projects/ia64/include/nl_types.h#5 integrate .. //depot/projects/ia64/include/printf.h#1 branch .. //depot/projects/ia64/include/rpcsvc/yp_prot.h#4 integrate .. //depot/projects/ia64/include/stdio.h#20 integrate .. //depot/projects/ia64/include/stdlib.h#28 integrate .. //depot/projects/ia64/include/unistd.h#29 integrate .. //depot/projects/ia64/kerberos5/lib/libgssapi/Makefile#8 integrate .. //depot/projects/ia64/lib/Makefile#56 integrate .. //depot/projects/ia64/lib/bind/bind/config.h#3 integrate .. //depot/projects/ia64/lib/bind/bind/port_after.h#2 integrate .. //depot/projects/ia64/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/ia64/lib/bind/config.h#4 integrate .. //depot/projects/ia64/lib/bind/isc/isc/platform.h#3 integrate .. //depot/projects/ia64/lib/bind/lwres/lwres/platform.h#2 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#18 integrate .. //depot/projects/ia64/lib/libarchive/archive.h.in#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.c#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_fd.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tp.c#1 branch .. //depot/projects/ia64/lib/libarchive/libarchive-formats.5#8 integrate .. //depot/projects/ia64/lib/libarchive/tar.5#9 integrate .. //depot/projects/ia64/lib/libc/Makefile#20 integrate .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#35 integrate .. //depot/projects/ia64/lib/libc/gen/__xuname.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/dlfcn.c#7 integrate .. //depot/projects/ia64/lib/libc/gen/getosreldate.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/getosreldate.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/getttyent.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/nlist.c#6 integrate .. //depot/projects/ia64/lib/libc/gen/uname.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/valloc.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/valloc.c#3 integrate .. //depot/projects/ia64/lib/libc/gmon/gmon.c#10 integrate .. //depot/projects/ia64/lib/libc/include/libc_private.h#8 integrate .. //depot/projects/ia64/lib/libc/rpc/netconfig.5#2 integrate .. //depot/projects/ia64/lib/libc/stdio/Makefile.inc#8 integrate .. //depot/projects/ia64/lib/libc/stdio/fread.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/local.h#11 integrate .. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#26 integrate .. //depot/projects/ia64/lib/libc/stdio/vfscanf.c#17 integrate .. //depot/projects/ia64/lib/libc/stdio/xprintf.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/xprintf_errno.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/xprintf_float.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/xprintf_hexdump.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/xprintf_int.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/xprintf_quote.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/xprintf_str.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/xprintf_time.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/xprintf_vis.c#1 branch .. //depot/projects/ia64/lib/libc/stdlib/Makefile.inc#16 integrate .. //depot/projects/ia64/lib/libc/stdlib/a64l.3#1 branch .. //depot/projects/ia64/lib/libc/stdlib/a64l.c#1 branch .. //depot/projects/ia64/lib/libc/stdlib/calloc.c#4 delete .. //depot/projects/ia64/lib/libc/stdlib/grantpt.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/l64a.c#1 branch .. //depot/projects/ia64/lib/libc/stdlib/malloc.3#16 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#28 integrate .. //depot/projects/ia64/lib/libc/stdlib/posix_memalign.3#1 branch .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#25 integrate .. //depot/projects/ia64/lib/libc/sys/abort2.2#1 branch .. //depot/projects/ia64/lib/libc/sys/aio_read.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/aio_write.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/lio_listio.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/open.2#9 integrate .. //depot/projects/ia64/lib/libc/sys/rename.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/rmdir.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/sigaction.2#16 integrate .. //depot/projects/ia64/lib/libc/sys/sigqueue.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sigreturn.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/sigwaitinfo.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/stat.2#13 integrate .. //depot/projects/ia64/lib/libc/sys/statfs.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/timer_create.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/timer_settime.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/undelete.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/utimes.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/wait.2#9 integrate .. //depot/projects/ia64/lib/libdisk/Makefile#14 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#27 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.3#11 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.h#19 integrate .. //depot/projects/ia64/lib/libdisk/write_arm_disk.c#1 branch .. //depot/projects/ia64/lib/libedit/refresh.c#3 integrate .. //depot/projects/ia64/lib/libfetch/ftp.c#16 integrate .. //depot/projects/ia64/lib/libgssapi/Makefile#1 branch .. //depot/projects/ia64/lib/libgssapi/context.h#1 branch .. //depot/projects/ia64/lib/libgssapi/cred.h#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_accept_sec_context.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_accept_sec_context.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_acquire_cred.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_acquire_cred.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_add_cred.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_add_cred.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_add_oid_set_member.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_add_oid_set_member.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_canonicalize_name.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_canonicalize_name.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_compare_name.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_compare_name.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_context_time.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_context_time.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_create_empty_oid_set.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_create_empty_oid_set.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_delete_sec_context.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_delete_sec_context.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_display_name.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_display_name.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_display_status.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_display_status.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_duplicate_name.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_duplicate_name.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_export_name.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_export_name.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_export_sec_context.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_export_sec_context.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_get_mic.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_get_mic.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_import_name.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_import_name.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_import_sec_context.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_import_sec_context.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_indicate_mechs.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_indicate_mechs.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_init_sec_context.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_init_sec_context.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_inquire_context.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_inquire_context.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_inquire_cred.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_inquire_cred.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_inquire_cred_by_mech.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_inquire_cred_by_mech.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_inquire_mechs_for_name.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_inquire_mechs_for_name.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_inquire_names_for_mech.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_inquire_names_for_mech.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_krb5.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_mech_switch.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_names.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_process_context_token.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_process_context_token.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_release_buffer.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_release_buffer.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_release_cred.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_release_cred.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_release_name.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_release_name.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_release_oid_set.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_release_oid_set.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_seal.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_sign.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_test_oid_set_member.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_test_oid_set_member.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_unseal.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_unwrap.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_unwrap.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_utils.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_verify.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_verify_mic.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_verify_mic.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_wrap.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_wrap.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_wrap_size_limit.3#1 branch .. //depot/projects/ia64/lib/libgssapi/gss_wrap_size_limit.c#1 branch .. //depot/projects/ia64/lib/libgssapi/gssapi.3#1 branch .. //depot/projects/ia64/lib/libgssapi/mech.5#1 branch .. //depot/projects/ia64/lib/libgssapi/mech_switch.h#1 branch .. //depot/projects/ia64/lib/libgssapi/name.h#1 branch .. //depot/projects/ia64/lib/libgssapi/spnego.h#1 branch .. //depot/projects/ia64/lib/libgssapi/utils.h#1 branch .. //depot/projects/ia64/lib/libkvm/kvm.c#10 integrate .. //depot/projects/ia64/lib/libmd/md2.h#2 integrate .. //depot/projects/ia64/lib/libmd/md2c.c#3 integrate .. //depot/projects/ia64/lib/libmd/md4.h#2 integrate .. //depot/projects/ia64/lib/libmd/md4c.c#3 integrate .. //depot/projects/ia64/lib/libmd/md5c.c#5 integrate .. //depot/projects/ia64/lib/libmd/mdX.3#7 integrate .. //depot/projects/ia64/lib/libmd/mdXhl.c#4 integrate .. //depot/projects/ia64/lib/libmd/ripemd.h#2 integrate .. //depot/projects/ia64/lib/libmd/rmd160c.c#3 integrate .. //depot/projects/ia64/lib/libmd/sha.h#2 integrate .. //depot/projects/ia64/lib/libmd/sha0c.c#3 integrate .. //depot/projects/ia64/lib/libmd/sha1c.c#3 integrate .. //depot/projects/ia64/lib/libmd/sha256.h#2 integrate .. //depot/projects/ia64/lib/libmd/sha256c.c#2 integrate .. //depot/projects/ia64/lib/libmemstat/memstat_uma.c#2 integrate .. //depot/projects/ia64/lib/libnetgraph/msg.c#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_fork.c#7 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#51 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_spinlock.c#9 integrate .. //depot/projects/ia64/lib/libthr/Makefile#12 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/i386/pthread_md.c#4 integrate .. //depot/projects/ia64/lib/libthr/pthread.map#4 integrate .. //depot/projects/ia64/lib/libthr/thread/Makefile.inc#10 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_attr.c#4 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_create.c#19 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_detach.c#9 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_exit.c#15 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_fork.c#2 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_info.c#4 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_init.c#18 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_join.c#15 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_list.c#2 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#23 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_once.c#3 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_private.h#23 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_resume_np.c#7 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_sig.c#10 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_spinlock.c#11 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_suspend_np.c#4 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_timer.c#2 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_umtx.h#3 integrate .. //depot/projects/ia64/lib/libutil/login_class.3#5 integrate .. //depot/projects/ia64/lib/libutil/login_ok.c#4 integrate .. //depot/projects/ia64/lib/libutil/login_times.c#3 integrate .. //depot/projects/ia64/lib/libutil/pidfile.3#4 integrate .. //depot/projects/ia64/lib/libutil/pty.c#5 integrate .. //depot/projects/ia64/lib/msun/src/e_asinf.c#3 integrate .. //depot/projects/ia64/lib/msun/src/e_scalbf.c#5 integrate .. //depot/projects/ia64/lib/msun/src/s_cbrt.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_cbrtf.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_log1p.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_log1pf.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_logb.c#4 integrate .. //depot/projects/ia64/lib/msun/src/s_logbf.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_rint.c#5 integrate .. //depot/projects/ia64/lib/msun/src/s_rintf.c#4 integrate .. //depot/projects/ia64/lib/msun/src/s_round.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_roundf.c#3 integrate .. //depot/projects/ia64/lib/msun/src/s_roundl.c#2 integrate .. //depot/projects/ia64/lib/msun/src/s_tanhf.c#3 integrate .. //depot/projects/ia64/libexec/atrun/atrun.c#4 integrate .. //depot/projects/ia64/libexec/bootpd/bootpd.c#8 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.8#19 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#34 integrate .. //depot/projects/ia64/libexec/rtld-elf/alpha/reloc.c#8 integrate .. //depot/projects/ia64/libexec/rtld-elf/amd64/reloc.c#5 integrate .. //depot/projects/ia64/libexec/rtld-elf/arm/reloc.c#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/i386/reloc.c#10 integrate .. //depot/projects/ia64/libexec/rtld-elf/ia64/reloc.c#14 integrate .. //depot/projects/ia64/libexec/rtld-elf/ia64/rtld_start.S#3 integrate .. //depot/projects/ia64/libexec/rtld-elf/malloc.c#7 integrate .. //depot/projects/ia64/libexec/rtld-elf/map_object.c#10 integrate .. //depot/projects/ia64/libexec/rtld-elf/powerpc/reloc.c#6 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.c#32 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.h#12 integrate .. //depot/projects/ia64/libexec/rtld-elf/sparc64/reloc.c#10 integrate .. //depot/projects/ia64/release/Makefile#94 integrate .. //depot/projects/ia64/release/alpha/boot_crunch.conf#7 integrate .. //depot/projects/ia64/release/amd64/boot_crunch.conf#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#36 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#94 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#25 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#12 integrate .. //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#15 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#5 integrate .. //depot/projects/ia64/release/i386/boot_crunch.conf#10 integrate .. //depot/projects/ia64/release/ia64/boot_crunch.conf#8 integrate .. //depot/projects/ia64/release/powerpc/boot_crunch.conf#3 integrate .. //depot/projects/ia64/release/scripts/package-split.py#5 integrate .. //depot/projects/ia64/release/sparc64/boot_crunch.conf#6 integrate .. //depot/projects/ia64/rescue/rescue/Makefile#27 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.c#21 integrate .. //depot/projects/ia64/sbin/devd/devd.8#14 integrate .. //depot/projects/ia64/sbin/devd/devd.cc#19 integrate .. //depot/projects/ia64/sbin/devfs/rule.c#6 integrate .. //depot/projects/ia64/sbin/dhclient/dhclient-script#3 integrate .. //depot/projects/ia64/sbin/dhclient/dhclient.8#2 integrate .. //depot/projects/ia64/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/ia64/sbin/dump/dump.8#25 integrate .. //depot/projects/ia64/sbin/dumpon/dumpon.8#12 integrate .. //depot/projects/ia64/sbin/geom/class/concat/geom_concat.c#5 integrate .. //depot/projects/ia64/sbin/geom/class/eli/geom_eli.c#3 integrate .. //depot/projects/ia64/sbin/geom/class/label/geom_label.c#4 integrate .. //depot/projects/ia64/sbin/geom/class/mirror/geom_mirror.c#7 integrate .. //depot/projects/ia64/sbin/geom/class/nop/geom_nop.c#5 integrate .. //depot/projects/ia64/sbin/geom/class/nop/gnop.8#6 integrate .. //depot/projects/ia64/sbin/geom/class/raid3/geom_raid3.c#8 integrate .. //depot/projects/ia64/sbin/geom/class/shsec/geom_shsec.c#3 integrate .. //depot/projects/ia64/sbin/geom/class/stripe/geom_stripe.c#7 integrate .. //depot/projects/ia64/sbin/geom/core/geom.8#7 integrate .. //depot/projects/ia64/sbin/geom/core/geom.c#10 integrate .. //depot/projects/ia64/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/ia64/sbin/geom/misc/subr.h#4 integrate .. //depot/projects/ia64/sbin/ifconfig/af_link.c#3 integrate .. //depot/projects/ia64/sbin/ifconfig/ifbridge.c#3 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#34 integrate .. //depot/projects/ia64/sbin/ifconfig/ifieee80211.c#13 integrate .. //depot/projects/ia64/sbin/ifconfig/ifmedia.c#11 integrate .. //depot/projects/ia64/sbin/ipf/libipf/Makefile#2 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#49 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#49 integrate .. //depot/projects/ia64/sbin/ldconfig/ldconfig.8#8 integrate .. //depot/projects/ia64/sbin/md5/md5.c#9 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.c#23 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.8#13 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.c#15 integrate .. //depot/projects/ia64/sbin/mount/mntopts.h#11 integrate .. //depot/projects/ia64/sbin/mount/mount.8#23 integrate .. //depot/projects/ia64/sbin/mount/mount.c#23 integrate .. //depot/projects/ia64/sbin/mount_cd9660/mount_cd9660.c#13 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.8#14 integrate .. //depot/projects/ia64/sbin/mount_nullfs/mount_nullfs.8#11 integrate .. //depot/projects/ia64/sbin/mount_std/Makefile#5 integrate .. //depot/projects/ia64/sbin/ping/ping.c#30 integrate .. //depot/projects/ia64/sbin/rcorder/Makefile#5 integrate .. //depot/projects/ia64/sbin/rcorder/rcorder.c#5 integrate .. //depot/projects/ia64/sbin/reboot/nextboot.sh#2 integrate .. //depot/projects/ia64/sbin/routed/if.c#8 integrate .. //depot/projects/ia64/sbin/setkey/setkey.8#2 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.c#23 integrate .. //depot/projects/ia64/secure/lib/libssh/Makefile#18 integrate .. //depot/projects/ia64/secure/usr.bin/ssh/Makefile#15 integrate .. //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#22 integrate .. //depot/projects/ia64/share/examples/cvsup/ports-supfile#11 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#53 integrate .. //depot/projects/ia64/share/examples/kld/Makefile#2 integrate .. //depot/projects/ia64/share/examples/kld/firmware/Makefile#1 branch .. //depot/projects/ia64/share/examples/kld/firmware/README#1 branch .. //depot/projects/ia64/share/examples/kld/firmware/fwconsumer/Makefile#1 branch .. //depot/projects/ia64/share/examples/kld/firmware/fwconsumer/fw_consumer.c#1 branch .. //depot/projects/ia64/share/examples/kld/firmware/fwimage/Makefile#1 branch .. //depot/projects/ia64/share/examples/kld/firmware/fwimage/firmware.img#1 branch .. //depot/projects/ia64/share/examples/ses/Makefile.inc#3 integrate .. //depot/projects/ia64/share/examples/ses/getencstat/Makefile#3 integrate .. //depot/projects/ia64/share/examples/ses/sesd/Makefile#3 integrate .. //depot/projects/ia64/share/examples/ses/setencstat/Makefile#3 integrate .. //depot/projects/ia64/share/examples/ses/setobjstat/Makefile#3 integrate .. //depot/projects/ia64/share/man/man1/Makefile#4 integrate .. //depot/projects/ia64/share/man/man1/builtin.1#9 integrate .. //depot/projects/ia64/share/man/man3/Makefile#14 integrate .. //depot/projects/ia64/share/man/man3/siginfo.3#1 branch .. //depot/projects/ia64/share/man/man3/tree.3#5 integrate .. //depot/projects/ia64/share/man/man4/Makefile#91 integrate .. //depot/projects/ia64/share/man/man4/agp.4#7 integrate .. //depot/projects/ia64/share/man/man4/amdsmb.4#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 30 07:48:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 473D916A423; Mon, 30 Jan 2006 07:48:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3BE116A420 for ; Mon, 30 Jan 2006 07:48:43 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEE3143D45 for ; Mon, 30 Jan 2006 07:48:43 +0000 (GMT) (envelope-from alc@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 k0U7mhfw061608 for ; Mon, 30 Jan 2006 07:48:43 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0U7mhEN061605 for perforce@freebsd.org; Mon, 30 Jan 2006 07:48:43 GMT (envelope-from alc@freebsd.org) Date: Mon, 30 Jan 2006 07:48:43 GMT Message-Id: <200601300748.k0U7mhEN061605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 07:48:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=90670 Change 90670 by alc@alc_home on 2006/01/30 07:48:35 Add a sysctl for displaying the cache queue. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_buddy.c#12 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_buddy.c#12 (text+ko) ==== @@ -53,6 +53,11 @@ SYSCTL_OID(_vm, OID_AUTO, buddy, CTLTYPE_STRING | CTLFLAG_RD, NULL, 0, sysctl_vm_buddy, "A", "Buddy Info"); +static int sysctl_vm_cacheq(SYSCTL_HANDLER_ARGS); + +SYSCTL_OID(_vm, OID_AUTO, cacheq, CTLTYPE_STRING | CTLFLAG_RD, + NULL, 0, sysctl_vm_cacheq, "A", "Cache Queue Info"); + static __inline void buddyq_insert(int baseq, int q, vm_page_t m); static __inline void buddyq_remove(vm_page_t m); static __inline void buddyq_split(vm_page_t m, int q, int Q); @@ -87,6 +92,31 @@ /* * */ +static int +sysctl_vm_cacheq(SYSCTL_HANDLER_ARGS) +{ + struct sbuf sbuf; + char *cbuf; + const int cbufsize = (BUDDY_QUEUES + 1)*81; + int error, q; + + cbuf = malloc(cbufsize, M_TEMP, M_WAITOK | M_ZERO); + sbuf_new(&sbuf, cbuf, cbufsize, SBUF_FIXEDLEN); + sbuf_printf(&sbuf, "\nORDER SIZE NUMBER\n\n"); + for (q = BUDDY_QUEUES - 1; q >= 0; q--) + sbuf_printf(&sbuf, "%5.5d: %6.6dK, %6.6d\n", q, + 1 << (PAGE_SHIFT - 10 + q), + vm_page_queues[PQ_CACHE + q].lcnt); + sbuf_finish(&sbuf); + error = SYSCTL_OUT(req, sbuf_data(&sbuf), sbuf_len(&sbuf)); + sbuf_delete(&sbuf); + free(cbuf, M_TEMP); + return (error); +} + +/* + * + */ static __inline void buddyq_insert(int baseq, int q, vm_page_t m) { From owner-p4-projects@FreeBSD.ORG Mon Jan 30 08:08:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81CB316A423; Mon, 30 Jan 2006 08:08:53 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 419C716A420 for ; Mon, 30 Jan 2006 08:08:53 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07A0B43D49 for ; Mon, 30 Jan 2006 08:08:53 +0000 (GMT) (envelope-from alc@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 k0U88q5I062655 for ; Mon, 30 Jan 2006 08:08:52 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0U88qhG062649 for perforce@freebsd.org; Mon, 30 Jan 2006 08:08:52 GMT (envelope-from alc@freebsd.org) Date: Mon, 30 Jan 2006 08:08:52 GMT Message-Id: <200601300808.k0U88qhG062649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90671 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 08:08:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=90671 Change 90671 by alc@alc_home on 2006/01/30 08:08:25 Disentangle my diagnostics from INVARIANTS. Affected files ... .. //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#7 edit Differences ... ==== //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#7 (text+ko) ==== @@ -145,6 +145,8 @@ #include #endif +#define DPRINTF(x) do { if (0) printf x; } while (0) + #ifndef PMAP_SHPGPERPROC #define PMAP_SHPGPERPROC 200 #endif @@ -1734,18 +1736,14 @@ */ if ((ptpaddr & PG_PS) != 0) { if (sva + NBPDR == va_next && eva >= va_next) { -#ifdef INVARIANTS - printf("pmap_remove: superpage at %lx to destroy.\n", - sva); -#endif + DPRINTF(("pmap_remove: superpage at %lx to destroy.\n", + sva)); pmap_remove_pde(pmap, pde, sva); anyvalid = 1; continue; } else { -#ifdef INVARIANTS - printf("pmap_remove: superpage at %lx to demote !!!\n", - sva); -#endif + DPRINTF(("pmap_remove: superpage at %lx to demote !!!\n", + sva)); if (!pmap_demote(pmap, pde, sva)) { anyvalid = 1; /* XXX */ continue; @@ -1815,7 +1813,7 @@ pmap->pm_stats.resident_count--; pde = pmap_pde(pmap, pv->pv_va); if (*pde & PG_PS) { - printf("pmap_remove_all: superpage to demote !!!\n"); + DPRINTF(("pmap_remove_all: superpage to demote !!!\n")); if (!pmap_demote(pmap, pde, pv->pv_va)) { /* * All mappings within the same 2mpage were @@ -2198,9 +2196,7 @@ m->object == kernel_object || (m->object == kmem_object && FALSE)) && m->reserv != NULL && m->reserv->refcnt == NBPDR / PAGE_SIZE) { -#ifdef INVARIANTS - printf("%s: pmap %p va %lx XXX\n", __func__, pmap, va); -#endif + DPRINTF(("%s: pmap %p va %lx XXX\n", __func__, pmap, va)); KASSERT(m->object->flags & OBJ_SUPERPAGES, ("pmap_enter: xxx")); mach_promote(pmap, pmap_pde(pmap, va), m->reserv); } @@ -2329,9 +2325,7 @@ if (m->reserv != NULL && m->reserv->refcnt == NBPDR / PAGE_SIZE && mpte->wire_count == NPTEPG) { -#ifdef INVARIANTS - printf("%s: pmap %p va %lx XXX\n", __func__, pmap, va); -#endif + DPRINTF(("%s: pmap %p va %lx XXX\n", __func__, pmap, va)); KASSERT(m->object->flags & OBJ_SUPERPAGES, ("pmap_enter_quick: xxx")); mach_promote(pmap, pmap_pde(pmap, va), m->reserv); @@ -2759,18 +2753,14 @@ } if (sva <= trunc_2mpage(pv->pv_va) && eva >= round_2mpage(pv->pv_va + 1)) { -#ifdef INVARIANTS - printf("pmap_remove_pages: superpage at %lx to destroy.\n", - trunc_2mpage(pv->pv_va)); -#endif + DPRINTF(("pmap_remove_pages: superpage at %lx to destroy.\n", + trunc_2mpage(pv->pv_va))); pmap_remove_pde(pmap, pde, trunc_2mpage(pv->pv_va)); npv = TAILQ_FIRST(&pmap->pm_pvlist); continue; } -#ifdef INVARIANTS - printf("pmap_remove_pages: superpage at %lx to demote !!!\n", - pv->pv_va); -#endif + DPRINTF(("pmap_remove_pages: superpage at %lx to demote !!!\n", + pv->pv_va)); if (!pmap_demote(pmap, pde, pv->pv_va)) { /* * All mappings within the same 2mpage were @@ -2930,7 +2920,7 @@ PMAP_LOCK(pmap); pde = pmap_pde(pmap, pv->pv_va); if (*pde & PG_PS) { - printf("pmap_clear_ptes: superpage to demote !!!\n"); + DPRINTF(("pmap_clear_ptes: superpage to demote !!!\n")); if ((*pde & bit) == 0 || !pmap_demote(pmap, pde, pv->pv_va)) { /* @@ -3294,9 +3284,7 @@ atomic_subtract_int(&cnt.v_wire_count, 1); } -#ifdef INVARIANTS - printf("Promotion successful XXX\n"); -#endif + DPRINTF(("Promotion successful XXX\n")); } static boolean_t From owner-p4-projects@FreeBSD.ORG Mon Jan 30 19:27:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CADDF16A481; Mon, 30 Jan 2006 19:27:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7469316A43A for ; Mon, 30 Jan 2006 19:27:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 260BA43D4C for ; Mon, 30 Jan 2006 19:27:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0UJRcEt019097 for ; Mon, 30 Jan 2006 19:27:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0UJRboh019094 for perforce@freebsd.org; Mon, 30 Jan 2006 19:27:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 Jan 2006 19:27:37 GMT Message-Id: <200601301927.k0UJRboh019094@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90699 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 19:27:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=90699 Change 90699 by rwatson@rwatson_zoo on 2006/01/30 19:26:42 event_code.5 man page no longer in openbsm. Affected files ... .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#14 edit Differences ... ==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#14 (text+ko) ==== @@ -55,7 +55,6 @@ audit_warn.5 \ auditctl.2 \ auditon.2 \ - event_code.5 \ getaudit.2 \ getauid.2 \ setaudit.2 \ From owner-p4-projects@FreeBSD.ORG Mon Jan 30 21:01:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6353B16A423; Mon, 30 Jan 2006 21:01:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 399C316A420 for ; Mon, 30 Jan 2006 21:01:35 +0000 (GMT) (envelope-from soc-shteryana@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0591B43D45 for ; Mon, 30 Jan 2006 21:01:35 +0000 (GMT) (envelope-from soc-shteryana@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 k0UL1Ysp050661 for ; Mon, 30 Jan 2006 21:01:34 GMT (envelope-from soc-shteryana@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0UL1YsW050658 for perforce@freebsd.org; Mon, 30 Jan 2006 21:01:34 GMT (envelope-from soc-shteryana@freebsd.org) Date: Mon, 30 Jan 2006 21:01:34 GMT Message-Id: <200601302101.k0UL1YsW050658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-shteryana@freebsd.org using -f From: soc-shteryana To: Perforce Change Reviews Cc: Subject: PERFORCE change 90707 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 21:01:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=90707 Change 90707 by soc-shteryana@prometheus on 2006/01/30 21:01:27 Make the project compile again by adding the dummy int - should be removed later Affected files ... .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/main.c#4 edit Differences ... ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/main.c#4 (text+ko) ==== @@ -64,6 +64,9 @@ #define PATH_PID "/var/run/%s.pid" #define PATH_CONFIG "/etc/%s.config" +/* dummy int so that the project may actually compile -remove that */ +int debug_on = 0; + uint64_t this_tick; /* start of processing of current packet (absolute) */ uint64_t start_tick; /* start of processing */ From owner-p4-projects@FreeBSD.ORG Mon Jan 30 21:13:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A96516A423; Mon, 30 Jan 2006 21:13:51 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E1E5B16A420 for ; Mon, 30 Jan 2006 21:13:50 +0000 (GMT) (envelope-from soc-shteryana@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 964A343D48 for ; Mon, 30 Jan 2006 21:13:50 +0000 (GMT) (envelope-from soc-shteryana@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 k0ULDoCI051606 for ; Mon, 30 Jan 2006 21:13:50 GMT (envelope-from soc-shteryana@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0ULDou5051603 for perforce@freebsd.org; Mon, 30 Jan 2006 21:13:50 GMT (envelope-from soc-shteryana@freebsd.org) Date: Mon, 30 Jan 2006 21:13:50 GMT Message-Id: <200601302113.k0ULDou5051603@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-shteryana@freebsd.org using -f From: soc-shteryana To: Perforce Change Reviews Cc: Subject: PERFORCE change 90709 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 21:13:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=90709 Change 90709 by soc-shteryana@prometheus on 2006/01/30 21:13:38 Bring in missing file from parent branch Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/Makefile.inc#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 30 21:23:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A6BF16A423; Mon, 30 Jan 2006 21:23:18 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7CBE16A420 for ; Mon, 30 Jan 2006 21:23:17 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99B4843D48 for ; Mon, 30 Jan 2006 21:23:17 +0000 (GMT) (envelope-from sam@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 k0ULNHf8052279 for ; Mon, 30 Jan 2006 21:23:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0ULNHCH052275 for perforce@freebsd.org; Mon, 30 Jan 2006 21:23:17 GMT (envelope-from sam@freebsd.org) Date: Mon, 30 Jan 2006 21:23:17 GMT Message-Id: <200601302123.k0ULNHCH052275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 90711 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 21:23:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=90711 Change 90711 by sam@sam_ebb on 2006/01/30 21:22:42 fix static turbo handling Affected files ... .. //depot/projects/wifi/sys/net80211/_ieee80211.h#11 edit Differences ... ==== //depot/projects/wifi/sys/net80211/_ieee80211.h#11 (text+ko) ==== @@ -157,7 +157,7 @@ (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_GFSK | \ IEEE80211_CHAN_CCK | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_DYN) #define IEEE80211_CHAN_ALLTURBO \ - (IEEE80211_CHAN_ALL | IEEE80211_CHAN_TURBO) + (IEEE80211_CHAN_ALL | IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO) #define IEEE80211_IS_CHAN_FHSS(_c) \ (((_c)->ic_flags & IEEE80211_CHAN_FHSS) == IEEE80211_CHAN_FHSS) From owner-p4-projects@FreeBSD.ORG Mon Jan 30 21:24:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3763716A423; Mon, 30 Jan 2006 21:24:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EEF9016A420 for ; Mon, 30 Jan 2006 21:24:19 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CB4743D46 for ; Mon, 30 Jan 2006 21:24:19 +0000 (GMT) (envelope-from sam@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 k0ULOJNZ052363 for ; Mon, 30 Jan 2006 21:24:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0ULOJZA052356 for perforce@freebsd.org; Mon, 30 Jan 2006 21:24:19 GMT (envelope-from sam@freebsd.org) Date: Mon, 30 Jan 2006 21:24:19 GMT Message-Id: <200601302124.k0ULOJZA052356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 90714 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 21:24:20 -0000 X-List-Received-Date: Mon, 30 Jan 2006 21:24:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=90714 Change 90714 by sam@sam_ebb on 2006/01/30 21:23:17 add missing burst ioctl code Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#58 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#58 (text+ko) ==== @@ -889,6 +889,9 @@ case IEEE80211_IOC_MACCMD: error = ieee80211_ioctl_getmaccmd(ic, ireq); break; + case IEEE80211_IOC_BURST: + ireq->i_val = (ic->ic_flags & IEEE80211_F_BURST) != 0; + break; default: error = EINVAL; break; @@ -1989,6 +1992,15 @@ ic->ic_fragthreshold = ireq->i_val; error = IS_UP(ic) ? ic->ic_reset(ic->ic_ifp) : 0; break; + case IEEE80211_IOC_BURST: + if (ireq->i_val) { + if ((ic->ic_caps & IEEE80211_C_BURST) == 0) + return EINVAL; + ic->ic_flags |= IEEE80211_F_BURST; + } else + ic->ic_flags &= ~IEEE80211_F_BURST; + error = ENETRESET; /* XXX maybe not for station? */ + break; default: error = EINVAL; break; From owner-p4-projects@FreeBSD.ORG Mon Jan 30 21:24:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4B7616A459; Mon, 30 Jan 2006 21:24:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A8F216A453 for ; Mon, 30 Jan 2006 21:24:20 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01EF243D46 for ; Mon, 30 Jan 2006 21:24:20 +0000 (GMT) (envelope-from sam@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 k0ULOJp8052396 for ; Mon, 30 Jan 2006 21:24:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0ULOJte052388 for perforce@freebsd.org; Mon, 30 Jan 2006 21:24:19 GMT (envelope-from sam@freebsd.org) Date: Mon, 30 Jan 2006 21:24:19 GMT Message-Id: <200601302124.k0ULOJte052388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 90716 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 21:24:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=90716 Change 90716 by sam@sam_ebb on 2006/01/30 21:23:39 fix mismerge Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#43 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#43 (text+ko) ==== @@ -1063,8 +1063,6 @@ callout_stop(&ic->ic_mgtsend); /* XXX callout_drain */ if (ostate != IEEE80211_S_SCAN) ieee80211_cancel_scan(ic); /* background scan */ - if (ic->ic_flags_ext & IEEE80211_FEXT_SWBMISS) - callout_stop(&ic->ic_swbmiss); ni = ic->ic_bss; /* NB: no reference held */ if (ic->ic_flags_ext & IEEE80211_FEXT_SWBMISS) callout_stop(&ic->ic_swbmiss); From owner-p4-projects@FreeBSD.ORG Mon Jan 30 21:24:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8061316A480; Mon, 30 Jan 2006 21:24:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 159AD16A433 for ; Mon, 30 Jan 2006 21:24:21 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5105043D4C for ; Mon, 30 Jan 2006 21:24:20 +0000 (GMT) (envelope-from sam@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 k0ULOKPo052411 for ; Mon, 30 Jan 2006 21:24:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0ULOKfw052401 for perforce@freebsd.org; Mon, 30 Jan 2006 21:24:20 GMT (envelope-from sam@freebsd.org) Date: Mon, 30 Jan 2006 21:24:20 GMT Message-Id: <200601302124.k0ULOKfw052401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 90717 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 21:24:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=90717 Change 90717 by sam@sam_ebb on 2006/01/30 21:23:51 shorten comment Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#41 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#41 (text+ko) ==== @@ -307,7 +307,7 @@ /* ic_flags_ext */ #define IEEE80211_FEXT_WDS 0x00000001 /* CONF: 4 addr allowed */ /* 0x00000006 reserved */ -#define IEEE80211_FEXT_BGSCAN 0x00000008 /* STATUS: enable full bgscan completion */ +#define IEEE80211_FEXT_BGSCAN 0x00000008 /* STATUS: complete bgscan */ #define IEEE80211_FEXT_ERPUPDATE 0x00000200 /* STATUS: update ERP element */ #define IEEE80211_FEXT_SWBMISS 0x00000400 /* CONF: do bmiss in s/w */ From owner-p4-projects@FreeBSD.ORG Mon Jan 30 21:24:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC5DB16A49C; Mon, 30 Jan 2006 21:24:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D7AE16A465 for ; Mon, 30 Jan 2006 21:24:21 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A190843D46 for ; Mon, 30 Jan 2006 21:24:20 +0000 (GMT) (envelope-from sam@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 k0ULOKoY052424 for ; Mon, 30 Jan 2006 21:24:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0ULOKZj052416 for perforce@freebsd.org; Mon, 30 Jan 2006 21:24:20 GMT (envelope-from sam@freebsd.org) Date: Mon, 30 Jan 2006 21:24:20 GMT Message-Id: <200601302124.k0ULOKZj052416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 90718 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 21:24:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=90718 Change 90718 by sam@sam_ebb on 2006/01/30 21:24:06 fix wpa/rsn ie handling Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#75 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#75 (text+ko) ==== @@ -2505,7 +2505,7 @@ * installed below after the association is assured. */ rsnparms = ni->ni_rsn; - if (wpa[0] != IEEE80211_ELEMID_RSN) + if (wpa != NULL) reason = ieee80211_parse_wpa(ic, wpa, &rsnparms, wh); else reason = ieee80211_parse_rsn(ic, wpa, &rsnparms, wh); @@ -2521,7 +2521,7 @@ IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, "[%s] %s ie: mc %u/%u uc %u/%u key %u caps 0x%x\n", ether_sprintf(wh->i_addr2), - wpa[0] != IEEE80211_ELEMID_RSN ? "WPA" : "RSN", + wpa != NULL ? "WPA" : "RSN", rsnparms.rsn_mcastcipher, rsnparms.rsn_mcastkeylen, rsnparms.rsn_ucastcipher, rsnparms.rsn_ucastkeylen, rsnparms.rsn_keymgmt, rsnparms.rsn_caps); From owner-p4-projects@FreeBSD.ORG Mon Jan 30 21:31:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E8B216A423; Mon, 30 Jan 2006 21:31:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2352B16A422 for ; Mon, 30 Jan 2006 21:31:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACAF443D4C for ; Mon, 30 Jan 2006 21:31:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0ULVTs0052978 for ; Mon, 30 Jan 2006 21:31:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0ULVTLl052975 for perforce@freebsd.org; Mon, 30 Jan 2006 21:31:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 Jan 2006 21:31:29 GMT Message-Id: <200601302131.k0ULVTLl052975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90719 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 21:31:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=90719 Change 90719 by rwatson@rwatson_zoo on 2006/01/30 21:31:13 Kernel does not desire assert.h, merged from user space. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#6 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#7 $ */ #include @@ -51,7 +51,6 @@ #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Mon Jan 30 21:36:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D676B16A424; Mon, 30 Jan 2006 21:36:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A24916A422 for ; Mon, 30 Jan 2006 21:36:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5045643D48 for ; Mon, 30 Jan 2006 21:36:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0ULaapS059827 for ; Mon, 30 Jan 2006 21:36:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0ULaaXc059824 for perforce@freebsd.org; Mon, 30 Jan 2006 21:36:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 Jan 2006 21:36:36 GMT Message-Id: <200601302136.k0ULaaXc059824@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 21:36:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=90720 Change 90720 by rwatson@rwatson_zoo on 2006/01/30 21:35:49 Use AUE_GETDIRENTRIES instead of AUE_O_GETDIRENTRIES as that's the OpenSolaris event identifier. Use AUE_SYSCTL for hostname system calls which are actually just wrappers around sysctl(), and will audit as though it is sysctl(), not as though it were the hostname calls. AUE_NFS_GETFH is the OpenSolaris name for AUE_GETFH. We may want to rename AUE_LGETFH to match this naming scheme. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#26 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#26 (text+ko) ==== @@ -304,7 +304,7 @@ 154 AUE_NULL UNIMPL nosys ; 155 is initialized by the NFS code, if present. 155 AUE_NFSSVC MNOIMPL { int nfssvc(int flag, caddr_t argp); } -156 AUE_O_GETDIRENTRIES COMPAT { int getdirentries(int fd, char *buf, \ +156 AUE_GETDIRENTRIES COMPAT { int getdirentries(int fd, char *buf, \ u_int count, long *basep); } 157 AUE_STATFS MCOMPAT4 { int statfs(char *path, \ struct ostatfs *buf); } @@ -313,11 +313,11 @@ 159 AUE_NULL UNIMPL nosys 160 AUE_LGETFH MSTD { int lgetfh(char *fname, \ struct fhandle *fhp); } -161 AUE_GETFH MSTD { int getfh(char *fname, \ +161 AUE_NFS_GETFH MSTD { int getfh(char *fname, \ struct fhandle *fhp); } -162 AUE_O_GETDOMAINNAME MSTD { int getdomainname(char *domainname, \ +162 AUE_SYSCTL MSTD { int getdomainname(char *domainname, \ int len); } -163 AUE_O_SETDOMAINNAME MSTD { int setdomainname(char *domainname, \ +163 AUE_SYSCTL MSTD { int setdomainname(char *domainname, \ int len); } 164 AUE_NULL MSTD { int uname(struct utsname *name); } 165 AUE_NULL MSTD { int sysarch(int op, char *parms); } From owner-p4-projects@FreeBSD.ORG Mon Jan 30 21:36:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CD9616A45A; Mon, 30 Jan 2006 21:36:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D26A16A43B for ; Mon, 30 Jan 2006 21:36:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB5CB43D48 for ; Mon, 30 Jan 2006 21:36:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0ULaaLl059834 for ; Mon, 30 Jan 2006 21:36:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0ULaaRL059830 for perforce@freebsd.org; Mon, 30 Jan 2006 21:36:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 Jan 2006 21:36:36 GMT Message-Id: <200601302136.k0ULaaRL059830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90721 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 21:36:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=90721 Change 90721 by rwatson@rwatson_zoo on 2006/01/30 21:36:23 Regenerate from syscalls.master updates. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#23 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#14 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#14 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#15 edit .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#18 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#23 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.205 2006/01/22 06:01:48 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.207 2006/01/22 05:59:27 davidxu Exp */ @@ -185,14 +185,14 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = asyncdaemon */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = nosys */ { SYF_MPSAFE | AS(nfssvc_args), (sy_call_t *)nosys, AUE_NULL }, /* 155 = nfssvc */ - { compat(AS(ogetdirentries_args),getdirentries), AUE_O_GETDIRENTRIES }, /* 156 = old getdirentries */ + { compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES }, /* 156 = old getdirentries */ { compat4(SYF_MPSAFE | AS(freebsd4_statfs_args),statfs), AUE_STATFS }, /* 157 = old statfs */ { compat4(SYF_MPSAFE | AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS }, /* 158 = old fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 159 = nosys */ { SYF_MPSAFE | AS(lgetfh_args), (sy_call_t *)lgetfh, AUE_LGETFH }, /* 160 = lgetfh */ - { SYF_MPSAFE | AS(getfh_args), (sy_call_t *)getfh, AUE_GETFH }, /* 161 = getfh */ - { SYF_MPSAFE | AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_O_GETDOMAINNAME }, /* 162 = getdomainname */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_O_SETDOMAINNAME }, /* 163 = setdomainname */ + { SYF_MPSAFE | AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH }, /* 161 = getfh */ + { SYF_MPSAFE | AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_SYSCTL }, /* 162 = getdomainname */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 163 = setdomainname */ { SYF_MPSAFE | AS(uname_args), (sy_call_t *)uname, AUE_NULL }, /* 164 = uname */ { SYF_MPSAFE | AS(sysarch_args), (sy_call_t *)sysarch, AUE_NULL }, /* 165 = sysarch */ { SYF_MPSAFE | AS(rtprio_args), (sy_call_t *)rtprio, AUE_NULL }, /* 166 = rtprio */ ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#14 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.189 2006/01/22 06:01:48 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.207 2006/01/22 05:59:27 davidxu Exp */ ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#14 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.186 2006/01/22 06:01:48 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.207 2006/01/22 05:59:27 davidxu Exp */ ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#15 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.141 2006/01/22 06:01:48 davidxu Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.207 2006/01/22 05:59:27 davidxu Exp MIASM = \ syscall.o \ ==== //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#18 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.186 2006/01/22 06:01:48 davidxu Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.207 2006/01/22 05:59:27 davidxu Exp */ From owner-p4-projects@FreeBSD.ORG Mon Jan 30 21:44:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C537316A424; Mon, 30 Jan 2006 21:44:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DB4216A422 for ; Mon, 30 Jan 2006 21:44:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C3A943D46 for ; Mon, 30 Jan 2006 21:44:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0ULil8M060256 for ; Mon, 30 Jan 2006 21:44:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0ULikt7060253 for perforce@freebsd.org; Mon, 30 Jan 2006 21:44:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 Jan 2006 21:44:46 GMT Message-Id: <200601302144.k0ULikt7060253@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90722 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 21:44:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=90722 Change 90722 by rwatson@rwatson_zoo on 2006/01/30 21:44:26 Use AUE_NFS_GETFH instead of AUE_GETFH. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#2 (text+ko) ==== @@ -540,7 +540,7 @@ case AUE_CHROOT: case AUE_EXECVE: case AUE_GETATTRLIST: - case AUE_GETFH: + case AUE_NFS_GETFH: case AUE_LSTAT: case AUE_MKFIFO: case AUE_PATHCONF: From owner-p4-projects@FreeBSD.ORG Mon Jan 30 22:17:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 770FB16A423; Mon, 30 Jan 2006 22:17:40 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 072D516A420 for ; Mon, 30 Jan 2006 22:17:40 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF10843D72 for ; Mon, 30 Jan 2006 22:17:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0UMHdUF061792 for ; Mon, 30 Jan 2006 22:17:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0UMHdXf061789 for perforce@freebsd.org; Mon, 30 Jan 2006 22:17:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 Jan 2006 22:17:39 GMT Message-Id: <200601302217.k0UMHdXf061789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 22:17:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=90726 Change 90726 by rwatson@rwatson_peppercorn on 2006/01/30 22:17:38 Update /etc/audit_event for recent and longer term changes to the kernel audit events list: - Add AUE_AUDITSVC, AUE_AUDITUSER from audit_kevents.h - Rename AUE_OSETUID to AUE_SETID, and AUE_OGETUID to AUE_GETUID, as these are current calls in BSD/Darwin-world. - Add AUE_CLOCK_SETTIME and AUE_NTP_ADJTIME from audit_kevents.h - Rename AUE_REBOOT:308 to AUE_DARWIN_REBOOT, likewise AUE_SETPRIORITY:312, AUE_SETTIMEOFDAY:313, AUE_FLOCK:314, AUE_SOCKETPAIR:317, AUE_NFSSVC:321, AUE_GETFH:322, AUE_QUOTACTL:323, AUE_TRUNCATE:329, AUE_FTRUNCATE:330 get _DARWIN prefixes. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#9 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#10 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -125,6 +125,8 @@ 133:AUE_SETAUDIT:setaudit(2):ad 134:AUE_GETUSERAUDIT:getuseraudit(2):ad 135:AUE_SETUSERAUDIT:setuseraudit(2):ad +136:AUE_AUDITSVC:auditsvc(2):ad +137:AUE_AUDITUSER:audituser(2):ad 138:AUE_AUDITON:auditon(2):ad 139:AUE_AUDITON_GTERMID:auditon(2) - GETTERMID command:ad 140:AUE_AUDITON_STERMID:auditon(2) - SETTERMID command:ad @@ -164,12 +166,12 @@ 197:AUE_NFS:nfs server:ad 198:AUE_READV:readv(2):no 199:AUE_OSTAT:old stat(2):fa -200:AUE_OSETUID:old setuid(2):pc +200:AUE_SETUID:setuid(2):pc 201:AUE_STIME:old stime(2):ad 202:AUE_UTIME:old utime(2):fm 203:AUE_NICE:old nice(2):pc 204:AUE_OSETPGRP:old setpgrp(2):pc -205:AUE_SETGID:old setgid(2):pc +205:AUE_SETGID:setgid(2):pc 206:AUE_READL:readl(2):no 207:AUE_READVL:readvl(2):no 209:AUE_DUP2:dup2(2):no @@ -230,6 +232,8 @@ 264:AUE_INST_SYNC:inst_sync(2):ad 266:AUE_SETAUDIT_ADDR:setaudit_addr(2):ad 267:AUE_GETAUDIT_ADDR:getaudit_addr(2):ad +268:AUE_CLOCK_SETTIME:clock_settime(2):ad +269:AUE_NTP_ADJTIME:ntp_adjtime(2):ad 301:AUE_GETFSSTAT:getfsstat(2):fa 302:AUE_PTRACE:ptrace(2):pc 303:AUE_CHFLAGS:chflags(2):fm @@ -237,29 +241,29 @@ 305:AUE_PROFILE:profil(2):pc 306:AUE_KTRACE:ktrace(2):pc 307:AUE_SETLOGIN:setlogin(2):pc -308:AUE_REBOOT:reboot(2):ad +308:AUE_DARWIN_REBOOT:reboot(2):ad 309:AUE_REVOKE:revoke(2):cl 310:AUE_UMASK:umask(2):pc 311:AUE_MPROTECT:mprotect(2):fm -312:AUE_SETPRIORITY:setpriority(2):pc,ot -313:AUE_SETTIMEOFDAY:settimeofday(2):ad -314:AUE_FLOCK:flock(2):fm +312:AUE_DARWIN_SETPRIORITY:setpriority(2):pc,ot +313:AUE_DARWIN_SETTIMEOFDAY:settimeofday(2):ad +314:AUE_DARWIN_FLOCK:flock(2):fm 315:AUE_MKFIFO:mkfifo(2):fc 316:AUE_POLL:poll(2):no -317:AUE_SOCKETPAIR:socketpair(2):nt +317:AUE_DARWIN_SOCKETPAIR:socketpair(2):nt 318:AUE_FUTIMES:futimes(2):fm 319:AUE_SETSID:setsid(2):pc 320:AUE_SETPRIVEXEC:setprivexec(2):pc -321:AUE_NFSSVC:nfssvc(2):ad -322:AUE_GETFH:getfh(2):fa -323:AUE_QUOTACTL:quotactl(2):ad +321:AUE_DARWIN_NFSSVC:nfssvc(2):ad +322:AUE_DARWIN_GETFH:getfh(2):fa +323:AUE_DARWIN_QUOTACTL:quotactl(2):ad 324:AUE_ADDPROFILE:system call:pc 325:AUE_KDEBUGTRACE:system call:pc 326:AUE_FSTAT:fstat(2):fa 327:AUE_FPATHCONF:fpathconf(2):fa 328:AUE_GETDIRENTRIES:getdirentries(2):fr -329:AUE_TRUNCATE:truncate(2):fw -330:AUE_FTRUNCATE:ftruncate(2):fw +329:AUE_DARWIN_TRUNCATE:truncate(2):fw +330:AUE_DARWIN_FTRUNCATE:ftruncate(2):fw 331:AUE_SYSCTL:sysctl(3):ad 332:AUE_MLOCK:mlock(2):pc 333:AUE_MUNLOCK:munlock(2):pc From owner-p4-projects@FreeBSD.ORG Mon Jan 30 22:19:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D90CA16A431; Mon, 30 Jan 2006 22:19:51 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E6BA16A430 for ; Mon, 30 Jan 2006 22:19:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2903443D55 for ; Mon, 30 Jan 2006 22:19:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0UMJgpQ062312 for ; Mon, 30 Jan 2006 22:19:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0UMJgwk062309 for perforce@freebsd.org; Mon, 30 Jan 2006 22:19:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 Jan 2006 22:19:42 GMT Message-Id: <200601302219.k0UMJgwk062309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90727 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 22:19:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=90727 Change 90727 by rwatson@rwatson_peppercorn on 2006/01/30 22:19:25 Add a couple more Solaris-specific event identifiers from /etc/audit_events. Add additional annotations for current events. Make annotations more consistent. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#29 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#29 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#28 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#29 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -60,12 +60,14 @@ #define AUE_CHMOD 10 #define AUE_CHOWN 11 #define AUE_UMOUNT 12 +#define AUE_JUNK 13 /* Solaris-specific. */ #define AUE_ACCESS 14 #define AUE_CHECKUSERACCESS AUE_ACCESS #define AUE_KILL 15 #define AUE_STAT 16 #define AUE_LSTAT 17 #define AUE_ACCT 18 +#define AUE_MCTL 19 /* Solaris-specific. */ #define AUE_REBOOT 20 /* XXX: Darwin conflict. */ #define AUE_SYMLINK 21 #define AUE_READLINK 22 @@ -157,34 +159,39 @@ #define AUE_SEMCTL_SETALL 108 #define AUE_SEMGET 109 #define AUE_SEMOP 110 -#define AUE_CORE 111 /* Solaris-only, currently. */ +#define AUE_CORE 111 /* Solaris-specific, currently. */ #define AUE_CLOSE 112 #define AUE_SYSTEMBOOT 113 -#define AUE_ASYNC_DAEMON_EXIT 114 /* Solaris-only. */ -#define AUE_NFSSVC_EXIT 115 /* Solaris-only. */ -#define AUE_WRITEL 128 /* Solaris-only. */ -#define AUE_WRITEVL 129 /* Solaris-only. */ +#define AUE_ASYNC_DAEMON_EXIT 114 /* Solaris-specific. */ +#define AUE_NFSSVC_EXIT 115 /* Solaris-specific. */ +#define AUE_WRITEL 128 /* Solaris-specific. */ +#define AUE_WRITEVL 129 /* Solaris-specific. */ #define AUE_GETAUID 130 #define AUE_SETAUID 131 #define AUE_GETAUDIT 132 #define AUE_SETAUDIT 133 -#define AUE_GETUSERAUDIT 134 /* Solaris-only. */ -#define AUE_SETUSERAUDIT 135 /* Solaris-only. */ -#define AUE_AUDITSVC 136 /* Solaris-only. */ -#define AUE_AUDITUSER 137 /* Solaris-only. */ +#define AUE_GETUSERAUDIT 134 /* Solaris-specific. */ +#define AUE_SETUSERAUDIT 135 /* Solaris-specific. */ +#define AUE_AUDITSVC 136 /* Solaris-specific. */ +#define AUE_AUDITUSER 137 /* Solaris-specific. */ #define AUE_AUDITON 138 +#define AUE_AUDITON_GTERMID 139 /* Solaris-specific. */ +#define AUE_AUDITON_STERMID 140 /* Solaris-specific. */ #define AUE_AUDITON_GPOLICY 141 #define AUE_AUDITON_SPOLICY 142 #define AUE_AUDITON_GQCTRL 145 #define AUE_AUDITON_SQCTRL 146 -#define AUE_GETPORTAUDIT 149 -#define AUE_ENTERPROM 153 /* Solaris-only. */ -#define AUE_EXITPROM 154 /* Solaris-only. */ +#define AUE_GETKERNSTATE 147 /* Solaris-specific. */ +#define AUE_SETKERNSTATE 148 /* Solaris-specific. */ +#define AUE_GETPORTAUDIT 149 /* Solaris-specific. */ +#define AUE_AUDISTAT 150 /* Solaris-specific. */ +#define AUE_ENTERPROM 153 /* Solaris-specific. */ +#define AUE_EXITPROM 154 /* Solaris-specific. */ #define AUE_IOCTL 158 #define AUE_SOCKET 183 #define AUE_SENDTO 184 #define AUE_PIPE 185 -#define AUE_SOCKETPAIR 186 /* XXXRW: Darwin conflict. */ +#define AUE_SOCKETPAIR 186 /* XXX: Darwin conflict. */ #define AUE_SEND 187 #define AUE_SENDMSG 188 #define AUE_RECV 189 @@ -194,6 +201,7 @@ #define AUE_LSEEK 194 #define AUE_WRITE 195 #define AUE_WRITEV 196 +#define AUE_NFS 197 /* Solaris-specific. */ #define AUE_READV 198 /* XXXRW: XXX Solaris old stat()? */ #define AUE_SETUID 200 /* XXXRW: Solaris old setuid? */ @@ -212,10 +220,10 @@ #define AUE_SETEGID 214 #define AUE_SETEUID 215 #define AUE_PUTMSG 216 -#define AUE_GETMSG 217 -#define AUE_PUTPMSG 218 -#define AUE_GETPMSG 219 - /* XXXRW: Solaris sc placeholder? */ +#define AUE_GETMSG 217 /* Solaris-specific. */ +#define AUE_PUTPMSG 218 /* Solaris-specific. */ +#define AUE_GETPMSG 219 /* Solaris-specific. */ +#define AUE_AUDITSYS 220 /* Solaris-specific. */ #define AUE_AUDITON_GETKMASK 221 #define AUE_AUDITON_SETKMASK 222 #define AUE_AUDITON_GETCWD 223 @@ -289,12 +297,13 @@ #define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ #define AUE_FUTIMES 318 #define AUE_SETSID 319 -#define AUE_SETPRIVEXEC 320 +#define AUE_SETPRIVEXEC 320 /* Darwin-specific. */ #define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ #define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ #define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ -#define AUE_ADDPROFILE 324 /* Darwin */ -#define AUE_KDBUGTRACE 325 /* Darwin */ +#define AUE_ADDPROFILE 324 /* Darwin-specific. */ +#define AUE_KDEBUGTRACE 325 /* Darwin-specific. */ +#define AUE_KDBUGTRACE AUE_KDEBUGTRACE #define AUE_FSTAT 326 #define AUE_FPATHCONF 327 #define AUE_GETDIRENTRIES 328 @@ -304,11 +313,11 @@ #define AUE_MLOCK 332 #define AUE_MUNLOCK 333 #define AUE_UNDELETE 334 -#define AUE_GETATTRLIST 335 /* Darwin */ -#define AUE_SETATTRLIST 336 /* Darwin */ -#define AUE_GETDIRENTRIESATTR 337 /* Darwin */ -#define AUE_EXCHANGEDATA 338 /* Darwin */ -#define AUE_SEARCHFS 339 /* Darwin */ +#define AUE_GETATTRLIST 335 /* Darwin-specific. */ +#define AUE_SETATTRLIST 336 /* Darwin-specific. */ +#define AUE_GETDIRENTRIESATTR 337 /* Darwin-specific. */ +#define AUE_EXCHANGEDATA 338 /* Darwin-specific. */ +#define AUE_SEARCHFS 339 /* Darwin-specific. */ #define AUE_MINHERIT 340 #define AUE_SEMCONFIG 341 #define AUE_SEMOPEN 342 @@ -316,40 +325,40 @@ #define AUE_SEMUNLINK 344 #define AUE_SHMOPEN 345 #define AUE_SHMUNLINK 346 -#define AUE_LOADSHFILE 347 /* Darwin */ -#define AUE_RESETSHFILE 348 /* Darwin */ -#define AUE_NEWSYSTEMSHREG 349 /* Darwin */ -#define AUE_PTHREADKILL 350 -#define AUE_PTHREADSIGMASK 351 +#define AUE_LOADSHFILE 347 /* Darwin-specific. */ +#define AUE_RESETSHFILE 348 /* Darwin-specific. */ +#define AUE_NEWSYSTEMSHREG 349 /* Darwin-specific. */ +#define AUE_PTHREADKILL 350 /* Darwin-specific. */ +#define AUE_PTHREADSIGMASK 351 /* Darwin-specific. */ #define AUE_AUDITCTL 352 #define AUE_RFORK 353 #define AUE_LCHMOD 354 #define AUE_SWAPOFF 355 -#define AUE_INITPROCESS 356 /* Darwin */ -#define AUE_MAPFD 357 /* Darwin */ -#define AUE_TASKFORPID 358 /* Darwin */ -#define AUE_PIDFORTASK 359 /* Darwin */ +#define AUE_INITPROCESS 356 /* Darwin-specific. */ +#define AUE_MAPFD 357 /* Darwin-specific. */ +#define AUE_TASKFORPID 358 /* Darwin-specific. */ +#define AUE_PIDFORTASK 359 /* Darwin-specific. */ #define AUE_SYSCTL_NONADMIN 360 -#define AUE_COPYFILE 361 /* Darwin */ +#define AUE_COPYFILE 361 /* Darwin-specific. */ #define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 363 /* FreeBSD */ -#define AUE_SENDFILE 364 /* BSD/Linux */ -#define AUE_USELIB 365 /* Linux */ +#define AUE_LCHFLAGS 363 /* FreeBSD-specific. */ +#define AUE_SENDFILE 364 /* BSD/Linux-specific. */ +#define AUE_USELIB 365 /* Linux-specific. */ #define AUE_GETRESUID 366 #define AUE_SETRESUID 367 #define AUE_GETRESGID 368 #define AUE_SETRESGID 369 -#define AUE_WAIT4 370 /* FreeBSD */ -#define AUE_LGETFH 371 /* FreeBSD */ -#define AUE_FHSTATFS 372 /* FreeBSD */ -#define AUE_FHOPEN 373 /* FreeBSD */ -#define AUE_FHSTAT 374 /* FreeBSD */ -#define AUE_JAIL 375 /* FreeBSD */ -#define AUE_EACCESS 376 /* FreeBSD */ -#define AUE_KQUEUE 377 /* FreeBSD */ -#define AUE_KEVENT 378 /* FreeBSD */ +#define AUE_WAIT4 370 /* FreeBSD-specific. */ +#define AUE_LGETFH 371 /* FreeBSD-specific. */ +#define AUE_FHSTATFS 372 /* FreeBSD-specific. */ +#define AUE_FHOPEN 373 /* FreeBSD-specific. */ +#define AUE_FHSTAT 374 /* FreeBSD-specific. */ +#define AUE_JAIL 375 /* FreeBSD-specific. */ +#define AUE_EACCESS 376 /* FreeBSD-specific. */ +#define AUE_KQUEUE 377 /* FreeBSD-specific. */ +#define AUE_KEVENT 378 /* FreeBSD-specific. */ #define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD */ +#define AUE_NMOUNT 380 /* FreeBSD-specific. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Mon Jan 30 22:23:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEDD316A437; Mon, 30 Jan 2006 22:23:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 498A716A423 for ; Mon, 30 Jan 2006 22:23:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0681143D9D for ; Mon, 30 Jan 2006 22:22:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0UMMl1S062525 for ; Mon, 30 Jan 2006 22:22:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0UMMk0p062522 for perforce@freebsd.org; Mon, 30 Jan 2006 22:22:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 Jan 2006 22:22:46 GMT Message-Id: <200601302222.k0UMMk0p062522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90728 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 22:23:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=90728 Change 90728 by rwatson@rwatson_peppercorn on 2006/01/30 22:22:20 Integrate recent OpenBSM changes from TrustedBSD OpenBSM branch to TrustedBSD audit3 branch: - style(9) for audit.h, audit_record.h, audit_uevents.h - Additional events in audit_kevents.h, audit_event, annotations, etc. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_uevents.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#9 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#7 (text+ko) ==== @@ -30,37 +30,37 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#7 $ */ #ifndef _BSM_AUDIT_H #define _BSM_AUDIT_H #define AUDIT_RECORD_MAGIC 0x828a0f1b -#define MAX_AUDIT_RECORDS 20 -#define MAX_AUDIT_RECORD_SIZE 4096 -#define MIN_AUDIT_FILE_SIZE (512 * 1024) +#define MAX_AUDIT_RECORDS 20 +#define MAX_AUDIT_RECORD_SIZE 4096 +#define MIN_AUDIT_FILE_SIZE (512 * 1024) /* * Triggers for the audit daemon */ -#define AUDIT_TRIGGER_MIN 1 -#define AUDIT_TRIGGER_LOW_SPACE 1 -#define AUDIT_TRIGGER_OPEN_NEW 2 -#define AUDIT_TRIGGER_READ_FILE 3 -#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 -#define AUDIT_TRIGGER_NO_SPACE 5 -#define AUDIT_TRIGGER_MAX 5 +#define AUDIT_TRIGGER_MIN 1 +#define AUDIT_TRIGGER_LOW_SPACE 1 +#define AUDIT_TRIGGER_OPEN_NEW 2 +#define AUDIT_TRIGGER_READ_FILE 3 +#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 +#define AUDIT_TRIGGER_NO_SPACE 5 +#define AUDIT_TRIGGER_MAX 5 /* * File that will be read for trigger events from the kernel */ -#define AUDIT_TRIGGER_FILE "/dev/audit" +#define AUDIT_TRIGGER_FILE "/dev/audit" /* * Pre-defined audit IDs */ -#define AU_DEFAUDITID -1 +#define AU_DEFAUDITID -1 /* * Define the masks for the classes of audit events. @@ -103,71 +103,74 @@ /* * IPC types */ -#define AT_IPC_MSG ((u_char)1) /* message IPC id */ -#define AT_IPC_SEM ((u_char)2) /* semaphore IPC id */ -#define AT_IPC_SHM ((u_char)3) /* shared mem IPC id */ +#define AT_IPC_MSG ((u_char)1) /* Message IPC id. */ +#define AT_IPC_SEM ((u_char)2) /* Semaphore IPC id. */ +#define AT_IPC_SHM ((u_char)3) /* Shared mem IPC id. */ /* * Audit conditions. */ -#define AUC_UNSET 0 -#define AUC_AUDITING 1 -#define AUC_NOAUDIT 2 -#define AUC_DISABLED -1 +#define AUC_UNSET 0 +#define AUC_AUDITING 1 +#define AUC_NOAUDIT 2 +#define AUC_DISABLED -1 /* * auditon(2) commands. */ -#define A_GETPOLICY 2 -#define A_SETPOLICY 3 -#define A_GETKMASK 4 -#define A_SETKMASK 5 +#define A_GETPOLICY 2 +#define A_SETPOLICY 3 +#define A_GETKMASK 4 +#define A_SETKMASK 5 #define A_GETQCTRL 6 -#define A_SETQCTRL 7 -#define A_GETCWD 8 -#define A_GETCAR 9 -#define A_GETSTAT 12 -#define A_SETSTAT 13 +#define A_SETQCTRL 7 +#define A_GETCWD 8 +#define A_GETCAR 9 +#define A_GETSTAT 12 +#define A_SETSTAT 13 #define A_SETUMASK 14 -#define A_SETSMASK 15 -#define A_GETCOND 20 -#define A_SETCOND 21 -#define A_GETCLASS 22 -#define A_SETCLASS 23 -#define A_GETPINFO 24 -#define A_SETPMASK 25 -#define A_SETFSIZE 26 -#define A_GETFSIZE 27 -#define A_GETPINFO_ADDR 28 -#define A_GETKAUDIT 29 -#define A_SETKAUDIT 30 -#define A_SENDTRIGGER 31 +#define A_SETSMASK 15 +#define A_GETCOND 20 +#define A_SETCOND 21 +#define A_GETCLASS 22 +#define A_SETCLASS 23 +#define A_GETPINFO 24 +#define A_SETPMASK 25 +#define A_SETFSIZE 26 +#define A_GETFSIZE 27 +#define A_GETPINFO_ADDR 28 +#define A_GETKAUDIT 29 +#define A_SETKAUDIT 30 +#define A_SENDTRIGGER 31 /* * Audit policy controls. */ -#define AUDIT_CNT 0x0001 -#define AUDIT_AHLT 0x0002 -#define AUDIT_ARGV 0x0004 -#define AUDIT_ARGE 0x0008 -#define AUDIT_PASSWD 0x0010 -#define AUDIT_SEQ 0x0020 -#define AUDIT_WINDATA 0x0040 -#define AUDIT_USER 0x0080 -#define AUDIT_GROUP 0x0100 -#define AUDIT_TRAIL 0x0200 -#define AUDIT_PATH 0x0400 +#define AUDIT_CNT 0x0001 +#define AUDIT_AHLT 0x0002 +#define AUDIT_ARGV 0x0004 +#define AUDIT_ARGE 0x0008 +#define AUDIT_PASSWD 0x0010 +#define AUDIT_SEQ 0x0020 +#define AUDIT_WINDATA 0x0040 +#define AUDIT_USER 0x0080 +#define AUDIT_GROUP 0x0100 +#define AUDIT_TRAIL 0x0200 +#define AUDIT_PATH 0x0400 /* * Audit queue control parameters */ -#define AQ_HIWATER 100 -#define AQ_MAXHIGH 10000 -#define AQ_LOWATER 10 -#define AQ_BUFSZ 1024 -#define AQ_MAXBUFSZ 1048576 +#define AQ_HIWATER 100 +#define AQ_MAXHIGH 10000 +#define AQ_LOWATER 10 +#define AQ_BUFSZ 1024 +#define AQ_MAXBUFSZ 1048576 -#define AU_FS_MINFREE 20 /* default min filesystem freespace, in percent */ +/* + * Default minimum percentage free space on file system. + */ +#define AU_FS_MINFREE 20 /* * Type definitions used indicating the length of variable length addresses @@ -178,83 +181,83 @@ __BEGIN_DECLS -typedef uid_t au_id_t; -typedef pid_t au_asid_t; -typedef u_int16_t au_event_t; -typedef u_int16_t au_emod_t; -typedef u_int32_t au_class_t; +typedef uid_t au_id_t; +typedef pid_t au_asid_t; +typedef u_int16_t au_event_t; +typedef u_int16_t au_emod_t; +typedef u_int32_t au_class_t; struct au_tid { - dev_t port; - u_int32_t machine; + dev_t port; + u_int32_t machine; }; -typedef struct au_tid au_tid_t; +typedef struct au_tid au_tid_t; struct au_tid_addr { - dev_t at_port; - u_int32_t at_type; - u_int32_t at_addr[4]; + dev_t at_port; + u_int32_t at_type; + u_int32_t at_addr[4]; }; -typedef struct au_tid_addr au_tid_addr_t; +typedef struct au_tid_addr au_tid_addr_t; struct au_mask { - unsigned int am_success; /* success bits */ - unsigned int am_failure; /* failure bits */ + unsigned int am_success; /* Success bits. */ + unsigned int am_failure; /* Failure bits. */ }; -typedef struct au_mask au_mask_t; +typedef struct au_mask au_mask_t; struct auditinfo { - au_id_t ai_auid; /* Audit user ID */ - au_mask_t ai_mask; /* Audit masks */ - au_tid_t ai_termid; /* Terminal ID */ - au_asid_t ai_asid; /* Audit session ID */ + au_id_t ai_auid; /* Audit user ID. */ + au_mask_t ai_mask; /* Audit masks. */ + au_tid_t ai_termid; /* Terminal ID. */ + au_asid_t ai_asid; /* Audit session ID. */ }; -typedef struct auditinfo auditinfo_t; +typedef struct auditinfo auditinfo_t; struct auditinfo_addr { - au_id_t ai_auid; /* Audit user ID */ - au_mask_t ai_mask; /* Audit masks */ - au_tid_addr_t ai_termid; /* Terminal ID */ - au_asid_t ai_asid; /* Audit session ID */ + au_id_t ai_auid; /* Audit user ID. */ + au_mask_t ai_mask; /* Audit masks. */ + au_tid_addr_t ai_termid; /* Terminal ID. */ + au_asid_t ai_asid; /* Audit session ID. */ }; -typedef struct auditinfo_addr auditinfo_addr_t; +typedef struct auditinfo_addr auditinfo_addr_t; struct auditpinfo { - pid_t ap_pid; /* ID of target process */ - au_id_t ap_auid; /* Audit user ID */ - au_mask_t ap_mask; /* Audit masks */ - au_tid_t ap_termid; /* Terminal ID */ - au_asid_t ap_asid; /* Audit session ID */ + pid_t ap_pid; /* ID of target process. */ + au_id_t ap_auid; /* Audit user ID. */ + au_mask_t ap_mask; /* Audit masks. */ + au_tid_t ap_termid; /* Terminal ID. */ + au_asid_t ap_asid; /* Audit session ID. */ }; -typedef struct auditpinfo auditpinfo_t; +typedef struct auditpinfo auditpinfo_t; struct auditpinfo_addr { - pid_t ap_pid; /* ID of target process */ - au_id_t ap_auid; /* Audit user ID */ - au_mask_t ap_mask; /* Audit masks */ - au_tid_addr_t ap_termid; /* Terminal ID */ - au_asid_t ap_asid; /* Audit session ID */ + pid_t ap_pid; /* ID of target process. */ + au_id_t ap_auid; /* Audit user ID. */ + au_mask_t ap_mask; /* Audit masks. */ + au_tid_addr_t ap_termid; /* Terminal ID. */ + au_asid_t ap_asid; /* Audit session ID. */ }; -typedef struct auditpinfo_addr auditpinfo_addr_t; +typedef struct auditpinfo_addr auditpinfo_addr_t; -/* Token and record structures */ +/* Token and record structures. */ struct au_token { - u_char *t_data; - size_t len; - TAILQ_ENTRY(au_token) tokens; + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; }; -typedef struct au_token token_t; +typedef struct au_token token_t; struct au_record { - char used; /* Is this record currently being used */ - int desc; /* The descriptor associated with this record */ - TAILQ_HEAD(, au_token) token_q; /* queue of BSM tokens */ - u_char *data; - size_t len; - LIST_ENTRY(au_record) au_rec_q; + char used; /* Record currently in use? */ + int desc; /* Descriptor for record. */ + TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ + u_char *data; + size_t len; + LIST_ENTRY(au_record) au_rec_q; }; -typedef struct au_record au_record_t; +typedef struct au_record au_record_t; /* * Kernel audit queue control parameters. @@ -264,59 +267,59 @@ size_t aq_lowater; size_t aq_bufsz; clock_t aq_delay; - int aq_minfree; /* minimum filesystem percent free space */ + int aq_minfree; /* Minimum filesystem percent free space. */ }; -typedef struct au_qctrl au_qctrl_t; +typedef struct au_qctrl au_qctrl_t; /* * Structure for the audit statistics. */ struct audit_stat { - unsigned int as_version; - unsigned int as_numevent; - int as_generated; - int as_nonattring; - int as_kernel; - int as_audit; - int as_auditctl; - int as_enqueu; - int as_written; - int as_wblocked; - int as_rblocked; - int as_dropped; - int as_totalsize; - unsigned int as_memused; + unsigned int as_version; + unsigned int as_numevent; + int as_generated; + int as_nonattring; + int as_kernel; + int as_audit; + int as_auditctl; + int as_enqueu; + int as_written; + int as_wblocked; + int as_rblocked; + int as_dropped; + int as_totalsize; + unsigned int as_memused; }; -typedef struct audit_stat au_stat_t; +typedef struct audit_stat au_stat_t; /* * Structure for the audit file statistics. */ struct audit_fstat { - u_quad_t af_filesz; - u_quad_t af_currsz; + u_quad_t af_filesz; + u_quad_t af_currsz; }; -typedef struct audit_fstat au_fstat_t; +typedef struct audit_fstat au_fstat_t; /* * Audit to event class mapping. */ struct au_evclass_map { - au_event_t ec_number; - au_class_t ec_class; + au_event_t ec_number; + au_class_t ec_class; }; -typedef struct au_evclass_map au_evclass_map_t; +typedef struct au_evclass_map au_evclass_map_t; #if !defined(_KERNEL) && !defined(KERNEL) -int audit(const void *, int); -int auditon(int, void *, int); -int auditctl(const char *); -int getauid(au_id_t *); -int setauid(const au_id_t *); -int getaudit(struct auditinfo *); -int setaudit(const struct auditinfo *); -int getaudit_addr(struct auditinfo_addr *, int); -int setaudit_addr(const struct auditinfo_addr *, int); +int audit(const void *, int); +int auditon(int, void *, int); +int auditctl(const char *); +int getauid(au_id_t *); +int setauid(const au_id_t *); +int getaudit(struct auditinfo *); +int setaudit(const struct auditinfo *); +int getaudit_addr(struct auditinfo_addr *, int); +int setaudit_addr(const struct auditinfo_addr *, int); #endif /* defined(_KERNEL) || defined(KERNEL) */ __END_DECLS ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#14 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#13 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#14 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -60,12 +60,14 @@ #define AUE_CHMOD 10 #define AUE_CHOWN 11 #define AUE_UMOUNT 12 +#define AUE_JUNK 13 /* Solaris-specific. */ #define AUE_ACCESS 14 #define AUE_CHECKUSERACCESS AUE_ACCESS #define AUE_KILL 15 #define AUE_STAT 16 #define AUE_LSTAT 17 #define AUE_ACCT 18 +#define AUE_MCTL 19 /* Solaris-specific. */ #define AUE_REBOOT 20 /* XXX: Darwin conflict. */ #define AUE_SYMLINK 21 #define AUE_READLINK 22 @@ -157,34 +159,39 @@ #define AUE_SEMCTL_SETALL 108 #define AUE_SEMGET 109 #define AUE_SEMOP 110 -#define AUE_CORE 111 /* Solaris-only, currently. */ +#define AUE_CORE 111 /* Solaris-specific, currently. */ #define AUE_CLOSE 112 #define AUE_SYSTEMBOOT 113 -#define AUE_ASYNC_DAEMON_EXIT 114 /* Solaris-only. */ -#define AUE_NFSSVC_EXIT 115 /* Solaris-only. */ -#define AUE_WRITEL 128 /* Solaris-only. */ -#define AUE_WRITEVL 129 /* Solaris-only. */ +#define AUE_ASYNC_DAEMON_EXIT 114 /* Solaris-specific. */ +#define AUE_NFSSVC_EXIT 115 /* Solaris-specific. */ +#define AUE_WRITEL 128 /* Solaris-specific. */ +#define AUE_WRITEVL 129 /* Solaris-specific. */ #define AUE_GETAUID 130 #define AUE_SETAUID 131 #define AUE_GETAUDIT 132 #define AUE_SETAUDIT 133 -#define AUE_GETUSERAUDIT 134 /* Solaris-only. */ -#define AUE_SETUSERAUDIT 135 /* Solaris-only. */ -#define AUE_AUDITSVC 136 /* Solaris-only. */ -#define AUE_AUDITUSER 137 /* Solaris-only. */ +#define AUE_GETUSERAUDIT 134 /* Solaris-specific. */ +#define AUE_SETUSERAUDIT 135 /* Solaris-specific. */ +#define AUE_AUDITSVC 136 /* Solaris-specific. */ +#define AUE_AUDITUSER 137 /* Solaris-specific. */ #define AUE_AUDITON 138 +#define AUE_AUDITON_GTERMID 139 /* Solaris-specific. */ +#define AUE_AUDITON_STERMID 140 /* Solaris-specific. */ #define AUE_AUDITON_GPOLICY 141 #define AUE_AUDITON_SPOLICY 142 #define AUE_AUDITON_GQCTRL 145 #define AUE_AUDITON_SQCTRL 146 -#define AUE_GETPORTAUDIT 149 -#define AUE_ENTERPROM 153 /* Solaris-only. */ -#define AUE_EXITPROM 154 /* Solaris-only. */ +#define AUE_GETKERNSTATE 147 /* Solaris-specific. */ +#define AUE_SETKERNSTATE 148 /* Solaris-specific. */ +#define AUE_GETPORTAUDIT 149 /* Solaris-specific. */ +#define AUE_AUDISTAT 150 /* Solaris-specific. */ +#define AUE_ENTERPROM 153 /* Solaris-specific. */ +#define AUE_EXITPROM 154 /* Solaris-specific. */ #define AUE_IOCTL 158 #define AUE_SOCKET 183 #define AUE_SENDTO 184 #define AUE_PIPE 185 -#define AUE_SOCKETPAIR 186 /* XXXRW: Darwin conflict. */ +#define AUE_SOCKETPAIR 186 /* XXX: Darwin conflict. */ #define AUE_SEND 187 #define AUE_SENDMSG 188 #define AUE_RECV 189 @@ -194,6 +201,7 @@ #define AUE_LSEEK 194 #define AUE_WRITE 195 #define AUE_WRITEV 196 +#define AUE_NFS 197 /* Solaris-specific. */ #define AUE_READV 198 /* XXXRW: XXX Solaris old stat()? */ #define AUE_SETUID 200 /* XXXRW: Solaris old setuid? */ @@ -212,10 +220,10 @@ #define AUE_SETEGID 214 #define AUE_SETEUID 215 #define AUE_PUTMSG 216 -#define AUE_GETMSG 217 -#define AUE_PUTPMSG 218 -#define AUE_GETPMSG 219 - /* XXXRW: Solaris sc placeholder? */ +#define AUE_GETMSG 217 /* Solaris-specific. */ +#define AUE_PUTPMSG 218 /* Solaris-specific. */ +#define AUE_GETPMSG 219 /* Solaris-specific. */ +#define AUE_AUDITSYS 220 /* Solaris-specific. */ #define AUE_AUDITON_GETKMASK 221 #define AUE_AUDITON_SETKMASK 222 #define AUE_AUDITON_GETCWD 223 @@ -289,12 +297,13 @@ #define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ #define AUE_FUTIMES 318 #define AUE_SETSID 319 -#define AUE_SETPRIVEXEC 320 +#define AUE_SETPRIVEXEC 320 /* Darwin-specific. */ #define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ #define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ #define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ -#define AUE_ADDPROFILE 324 /* Darwin */ -#define AUE_KDBUGTRACE 325 /* Darwin */ +#define AUE_ADDPROFILE 324 /* Darwin-specific. */ +#define AUE_KDEBUGTRACE 325 /* Darwin-specific. */ +#define AUE_KDBUGTRACE AUE_KDEBUGTRACE #define AUE_FSTAT 326 #define AUE_FPATHCONF 327 #define AUE_GETDIRENTRIES 328 @@ -304,11 +313,11 @@ #define AUE_MLOCK 332 #define AUE_MUNLOCK 333 #define AUE_UNDELETE 334 -#define AUE_GETATTRLIST 335 /* Darwin */ -#define AUE_SETATTRLIST 336 /* Darwin */ -#define AUE_GETDIRENTRIESATTR 337 /* Darwin */ -#define AUE_EXCHANGEDATA 338 /* Darwin */ -#define AUE_SEARCHFS 339 /* Darwin */ +#define AUE_GETATTRLIST 335 /* Darwin-specific. */ +#define AUE_SETATTRLIST 336 /* Darwin-specific. */ +#define AUE_GETDIRENTRIESATTR 337 /* Darwin-specific. */ +#define AUE_EXCHANGEDATA 338 /* Darwin-specific. */ +#define AUE_SEARCHFS 339 /* Darwin-specific. */ #define AUE_MINHERIT 340 #define AUE_SEMCONFIG 341 #define AUE_SEMOPEN 342 @@ -316,40 +325,40 @@ #define AUE_SEMUNLINK 344 #define AUE_SHMOPEN 345 #define AUE_SHMUNLINK 346 -#define AUE_LOADSHFILE 347 /* Darwin */ -#define AUE_RESETSHFILE 348 /* Darwin */ -#define AUE_NEWSYSTEMSHREG 349 /* Darwin */ -#define AUE_PTHREADKILL 350 -#define AUE_PTHREADSIGMASK 351 +#define AUE_LOADSHFILE 347 /* Darwin-specific. */ +#define AUE_RESETSHFILE 348 /* Darwin-specific. */ +#define AUE_NEWSYSTEMSHREG 349 /* Darwin-specific. */ +#define AUE_PTHREADKILL 350 /* Darwin-specific. */ +#define AUE_PTHREADSIGMASK 351 /* Darwin-specific. */ #define AUE_AUDITCTL 352 #define AUE_RFORK 353 #define AUE_LCHMOD 354 #define AUE_SWAPOFF 355 -#define AUE_INITPROCESS 356 /* Darwin */ -#define AUE_MAPFD 357 /* Darwin */ -#define AUE_TASKFORPID 358 /* Darwin */ -#define AUE_PIDFORTASK 359 /* Darwin */ +#define AUE_INITPROCESS 356 /* Darwin-specific. */ +#define AUE_MAPFD 357 /* Darwin-specific. */ +#define AUE_TASKFORPID 358 /* Darwin-specific. */ +#define AUE_PIDFORTASK 359 /* Darwin-specific. */ #define AUE_SYSCTL_NONADMIN 360 -#define AUE_COPYFILE 361 /* Darwin */ +#define AUE_COPYFILE 361 /* Darwin-specific. */ #define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 363 /* FreeBSD */ -#define AUE_SENDFILE 364 /* BSD/Linux */ -#define AUE_USELIB 365 /* Linux */ +#define AUE_LCHFLAGS 363 /* FreeBSD-specific. */ +#define AUE_SENDFILE 364 /* BSD/Linux-specific. */ +#define AUE_USELIB 365 /* Linux-specific. */ #define AUE_GETRESUID 366 #define AUE_SETRESUID 367 #define AUE_GETRESGID 368 #define AUE_SETRESGID 369 -#define AUE_WAIT4 370 /* FreeBSD */ -#define AUE_LGETFH 371 /* FreeBSD */ -#define AUE_FHSTATFS 372 /* FreeBSD */ -#define AUE_FHOPEN 373 /* FreeBSD */ -#define AUE_FHSTAT 374 /* FreeBSD */ -#define AUE_JAIL 375 /* FreeBSD */ -#define AUE_EACCESS 376 /* FreeBSD */ -#define AUE_KQUEUE 377 /* FreeBSD */ -#define AUE_KEVENT 378 /* FreeBSD */ +#define AUE_WAIT4 370 /* FreeBSD-specific. */ +#define AUE_LGETFH 371 /* FreeBSD-specific. */ +#define AUE_FHSTATFS 372 /* FreeBSD-specific. */ +#define AUE_FHOPEN 373 /* FreeBSD-specific. */ +#define AUE_FHSTAT 374 /* FreeBSD-specific. */ +#define AUE_JAIL 375 /* FreeBSD-specific. */ +#define AUE_EACCESS 376 /* FreeBSD-specific. */ +#define AUE_KQUEUE 377 /* FreeBSD-specific. */ +#define AUE_KEVENT 378 /* FreeBSD-specific. */ #define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD */ +#define AUE_NMOUNT 380 /* FreeBSD-specific. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#4 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#5 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -226,108 +226,99 @@ struct vnode_au_info; #endif -int au_open(void); -int au_write(int d, token_t *m); -int au_close(int d, int keep, short event); -int au_close_buffer(int d, short event, u_char *buffer, - size_t *buflen); +int au_open(void); +int au_write(int d, token_t *m); +int au_close(int d, int keep, short event); +int au_close_buffer(int d, short event, u_char *buffer, size_t *buflen); + #if defined(KERNEL) || defined(_KERNEL) -token_t *au_to_file(char *file, struct timeval tm); +token_t *au_to_file(char *file, struct timeval tm); #else -token_t *au_to_file(char *file); +token_t *au_to_file(char *file); #endif + #if defined(KERNEL) || defined(_KERNEL) -token_t *au_to_header(int rec_size, au_event_t e_type, - au_emod_t e_mod, struct timeval tm); -token_t *au_to_header32(int rec_size, au_event_t e_type, - au_emod_t e_mod, struct timeval tm); +token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm); +token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm); #else -token_t *au_to_header(int rec_size, au_event_t e_type, - au_emod_t e_mod); -token_t *au_to_header32(int rec_size, au_event_t e_type, - au_emod_t e_mod); +token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); +token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); #endif -token_t *au_to_header64(int rec_size, au_event_t e_type, - au_emod_t e_mod); -token_t *au_to_me(void); + +token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); +token_t *au_to_me(void); +token_t *au_to_arg(char n, char *text, uint32_t v); +token_t *au_to_arg32(char n, char *text, uint32_t v); +token_t *au_to_arg64(char n, char *text, uint64_t v); -token_t *au_to_arg(char n, char *text, uint32_t v); -token_t *au_to_arg32(char n, char *text, uint32_t v); -token_t *au_to_arg64(char n, char *text, uint64_t v); #if defined(_KERNEL) || defined(KERNEL) -token_t *au_to_attr(struct vnode_au_info *vni); -token_t *au_to_attr32(struct vnode_au_info *vni); -token_t *au_to_attr64(struct vnode_au_info *vni); +token_t *au_to_attr(struct vnode_au_info *vni); +token_t *au_to_attr32(struct vnode_au_info *vni); +token_t *au_to_attr64(struct vnode_au_info *vni); #endif -token_t *au_to_data(char unit_print, char unit_type, - char unit_count, char *p); -token_t *au_to_exit(int retval, int err); -token_t *au_to_groups(int *groups); -token_t *au_to_newgroups(uint16_t n, gid_t *groups); -token_t *au_to_in_addr(struct in_addr *internet_addr); -token_t *au_to_in_addr_ex(struct in6_addr *internet_addr); -token_t *au_to_ip(struct ip *ip); -token_t *au_to_ipc(char type, int id); -token_t *au_to_ipc_perm(struct ipc_perm *perm); -token_t *au_to_iport(uint16_t iport); -token_t *au_to_opaque(char *data, uint16_t bytes); -token_t *au_to_path(char *path); -token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_process32(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_process64(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_process_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_process32_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_process64_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_return(char status, uint32_t ret); -token_t *au_to_return32(char status, uint32_t ret); -token_t *au_to_return64(char status, uint64_t ret); -token_t *au_to_seq(long audit_count); + +token_t *au_to_data(char unit_print, char unit_type, char unit_count, + char *p); +token_t *au_to_exit(int retval, int err); +token_t *au_to_groups(int *groups); +token_t *au_to_newgroups(uint16_t n, gid_t *groups); +token_t *au_to_in_addr(struct in_addr *internet_addr); +token_t *au_to_in_addr_ex(struct in6_addr *internet_addr); +token_t *au_to_ip(struct ip *ip); +token_t *au_to_ipc(char type, int id); +token_t *au_to_ipc_perm(struct ipc_perm *perm); +token_t *au_to_iport(uint16_t iport); +token_t *au_to_opaque(char *data, uint16_t bytes); +token_t *au_to_path(char *path); +token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_process32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_process64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_process_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_process32_ex(au_id_t auid, uid_t euid, gid_t egid, + uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, + au_tid_addr_t *tid); +token_t *au_to_process64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_return(char status, uint32_t ret); +token_t *au_to_return32(char status, uint32_t ret); +token_t *au_to_return64(char status, uint64_t ret); +token_t *au_to_seq(long audit_count); + #if defined(_KERNEL) || defined(KERNEL) -token_t *au_to_socket(struct socket *so); -token_t *au_to_socket_ex_32(uint16_t lp, uint16_t rp, - struct sockaddr *la, struct sockaddr *ta); -token_t *au_to_socket_ex_128(uint16_t lp, uint16_t rp, - struct sockaddr *la, struct sockaddr *ta); +token_t *au_to_socket(struct socket *so); +token_t *au_to_socket_ex_32(uint16_t lp, uint16_t rp, struct sockaddr *la, + struct sockaddr *ta); +token_t *au_to_socket_ex_128(uint16_t lp, uint16_t rp, struct sockaddr *la, + struct sockaddr *ta); #endif -token_t *au_to_sock_inet(struct sockaddr_in *so); -token_t *au_to_sock_inet32(struct sockaddr_in *so); -token_t *au_to_sock_inet128(struct sockaddr_in6 *so); -token_t *au_to_sock_unix(struct sockaddr_un *so); -token_t *au_to_subject(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_subject32(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_subject64(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_subject_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_subject32_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_subject64_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_exec_args(const char **); -token_t *au_to_exec_env(const char **); -token_t *au_to_text(char *text); -token_t *au_to_kevent(struct kevent *kev); -token_t *au_to_trailer(int rec_size); + +token_t *au_to_sock_inet(struct sockaddr_in *so); +token_t *au_to_sock_inet32(struct sockaddr_in *so); +token_t *au_to_sock_inet128(struct sockaddr_in6 *so); +token_t *au_to_sock_unix(struct sockaddr_un *so); +token_t *au_to_subject(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_subject32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_subject64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_subject_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_subject32_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_exec_args(const char **); +token_t *au_to_exec_env(const char **); +token_t *au_to_text(char *text); +token_t *au_to_kevent(struct kevent *kev); +token_t *au_to_trailer(int rec_size); __END_DECLS ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_uevents.h#3 (text+ko) ==== @@ -26,13 +26,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_uevents.h#2 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_uevents.h#3 $ */ #ifndef _BSM_AUDIT_UEVENTS_H_ -#define _BSM_AUDIT_UEVENTS_H_ +#define _BSM_AUDIT_UEVENTS_H_ -/* +/*- * User level audit event numbers * * Range of audit event numbers: @@ -43,60 +43,60 @@ * 36865 - 65535 Reserved for applications * */ -#define AUE_at_create 6144 -#define AUE_at_delete 6145 -#define AUE_at_perm 6146 -#define AUE_cron_invoke 6147 -#define AUE_crontab_create 6148 -#define AUE_crontab_delete 6149 -#define AUE_crontab_perm 6150 -#define AUE_inetd_connect 6151 -#define AUE_login 6152 -#define AUE_logout 6153 -#define AUE_telnet 6154 -#define AUE_rlogin 6155 -#define AUE_mountd_mount 6156 -#define AUE_mountd_umount 6157 -#define AUE_rshd 6158 -#define AUE_su 6159 -#define AUE_halt 6160 -#define AUE_reboot 6161 -#define AUE_rexecd 6162 -#define AUE_passwd 6163 -#define AUE_rexd 6164 -#define AUE_ftpd 6165 -#define AUE_init 6166 -#define AUE_uadmin 6167 -#define AUE_shutdown 6168 -#define AUE_poweroff 6169 -#define AUE_crontab_mod 6170 -#define AUE_audit_startup 6171 -#define AUE_audit_shutdown 6172 -#define AUE_allocate_succ 6200 -#define AUE_allocate_fail 6201 -#define AUE_deallocate_succ 6202 -#define AUE_deallocate_fail 6203 -#define AUE_listdevice_succ 6205 -#define AUE_listdevice_fail 6206 -#define AUE_create_user 6207 -#define AUE_modify_user 6208 -#define AUE_delete_user 6209 -#define AUE_disable_user 6210 -#define AUE_enable_user 6211 -#define AUE_sudo 6300 -#define AUE_modify_password 6501 /* not assigned by Sun */ -#define AUE_create_group 6511 /* not assigned by Sun */ -#define AUE_delete_group 6512 /* not assigned by Sun */ -#define AUE_modify_group 6513 /* not assigned by Sun */ -#define AUE_add_to_group 6514 /* not assigned by Sun */ -#define AUE_remove_from_group 6515 /* not assigned by Sun */ -#define AUE_revoke_obj 6521 /* not assigned by Sun; not curr. used */ -#define AUE_lw_login 6600 /* not assigned by Sun; tentative */ -#define AUE_lw_logout 6601 /* not assigned by Sun; tentative */ -#define AUE_auth_user 7000 /* not assigned by Sun */ -#define AUE_ssconn 7001 /* not assigned by Sun */ -#define AUE_ssauthorize 7002 /* not assigned by Sun */ -#define AUE_ssauthint 7003 /* not assigned by Sun */ -#define AUE_openssh 32800 +#define AUE_at_create 6144 +#define AUE_at_delete 6145 +#define AUE_at_perm 6146 +#define AUE_cron_invoke 6147 +#define AUE_crontab_create 6148 +#define AUE_crontab_delete 6149 +#define AUE_crontab_perm 6150 +#define AUE_inetd_connect 6151 +#define AUE_login 6152 +#define AUE_logout 6153 +#define AUE_telnet 6154 +#define AUE_rlogin 6155 +#define AUE_mountd_mount 6156 +#define AUE_mountd_umount 6157 +#define AUE_rshd 6158 +#define AUE_su 6159 +#define AUE_halt 6160 +#define AUE_reboot 6161 +#define AUE_rexecd 6162 +#define AUE_passwd 6163 +#define AUE_rexd 6164 +#define AUE_ftpd 6165 +#define AUE_init 6166 +#define AUE_uadmin 6167 +#define AUE_shutdown 6168 +#define AUE_poweroff 6169 +#define AUE_crontab_mod 6170 +#define AUE_audit_startup 6171 +#define AUE_audit_shutdown 6172 +#define AUE_allocate_succ 6200 +#define AUE_allocate_fail 6201 +#define AUE_deallocate_succ 6202 +#define AUE_deallocate_fail 6203 +#define AUE_listdevice_succ 6205 +#define AUE_listdevice_fail 6206 +#define AUE_create_user 6207 +#define AUE_modify_user 6208 +#define AUE_delete_user 6209 +#define AUE_disable_user 6210 +#define AUE_enable_user 6211 +#define AUE_sudo 6300 +#define AUE_modify_password 6501 /* Not assigned by Sun. */ +#define AUE_create_group 6511 /* Not assigned by Sun. */ +#define AUE_delete_group 6512 /* Not assigned by Sun. */ +#define AUE_modify_group 6513 /* Not assigned by Sun. */ +#define AUE_add_to_group 6514 /* Not assigned by Sun. */ +#define AUE_remove_from_group 6515 /* Not assigned by Sun. */ +#define AUE_revoke_obj 6521 /* Not assigned by Sun; not used. */ +#define AUE_lw_login 6600 /* Not assigned by Sun; tentative. */ +#define AUE_lw_logout 6601 /* Not assigned by Sun; tentative. */ +#define AUE_auth_user 7000 /* Not assigned by Sun. */ +#define AUE_ssconn 7001 /* Not assigned by Sun. */ +#define AUE_ssauthorize 7002 /* Not assigned by Sun. */ +#define AUE_ssauthint 7003 /* Not assigned by Sun. */ +#define AUE_openssh 32800 #endif /* !_BSM_AUDIT_UEVENTS_H_ */ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#8 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#9 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -125,6 +125,8 @@ 133:AUE_SETAUDIT:setaudit(2):ad 134:AUE_GETUSERAUDIT:getuseraudit(2):ad 135:AUE_SETUSERAUDIT:setuseraudit(2):ad +136:AUE_AUDITSVC:auditsvc(2):ad +137:AUE_AUDITUSER:audituser(2):ad 138:AUE_AUDITON:auditon(2):ad 139:AUE_AUDITON_GTERMID:auditon(2) - GETTERMID command:ad 140:AUE_AUDITON_STERMID:auditon(2) - SETTERMID command:ad @@ -164,12 +166,12 @@ 197:AUE_NFS:nfs server:ad 198:AUE_READV:readv(2):no 199:AUE_OSTAT:old stat(2):fa -200:AUE_OSETUID:old setuid(2):pc +200:AUE_SETUID:setuid(2):pc 201:AUE_STIME:old stime(2):ad 202:AUE_UTIME:old utime(2):fm 203:AUE_NICE:old nice(2):pc 204:AUE_OSETPGRP:old setpgrp(2):pc -205:AUE_SETGID:old setgid(2):pc +205:AUE_SETGID:setgid(2):pc 206:AUE_READL:readl(2):no 207:AUE_READVL:readvl(2):no 209:AUE_DUP2:dup2(2):no @@ -230,6 +232,8 @@ 264:AUE_INST_SYNC:inst_sync(2):ad 266:AUE_SETAUDIT_ADDR:setaudit_addr(2):ad 267:AUE_GETAUDIT_ADDR:getaudit_addr(2):ad +268:AUE_CLOCK_SETTIME:clock_settime(2):ad +269:AUE_NTP_ADJTIME:ntp_adjtime(2):ad 301:AUE_GETFSSTAT:getfsstat(2):fa 302:AUE_PTRACE:ptrace(2):pc >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 30 22:23:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2639E16A423; Mon, 30 Jan 2006 22:23:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C49A216A420 for ; Mon, 30 Jan 2006 22:23:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C2F0F43D5C for ; Mon, 30 Jan 2006 22:23:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0UMNmDa062608 for ; Mon, 30 Jan 2006 22:23:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0UMNmbL062605 for perforce@freebsd.org; Mon, 30 Jan 2006 22:23:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 Jan 2006 22:23:48 GMT Message-Id: <200601302223.k0UMNmbL062605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90729 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 22:23:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=90729 Change 90729 by rwatson@rwatson_peppercorn on 2006/01/30 22:23:07 Integrate changes from contrib/openbsm to sys in audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#20 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#15 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#8 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#20 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#19 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#20 $ */ #ifndef _BSM_AUDIT_H @@ -41,9 +41,9 @@ #include #define AUDIT_RECORD_MAGIC 0x828a0f1b -#define MAX_AUDIT_RECORDS 20 -#define MAX_AUDIT_RECORD_SIZE 4096 -#define MIN_AUDIT_FILE_SIZE (512 * 1024) +#define MAX_AUDIT_RECORDS 20 +#define MAX_AUDIT_RECORD_SIZE 4096 +#define MIN_AUDIT_FILE_SIZE (512 * 1024) /* The special device filename */ #define AUDITDEV_FILENAME "audit" @@ -63,23 +63,23 @@ /* * Triggers for the audit daemon */ -#define AUDIT_TRIGGER_MIN 1 -#define AUDIT_TRIGGER_LOW_SPACE 1 -#define AUDIT_TRIGGER_OPEN_NEW 2 -#define AUDIT_TRIGGER_READ_FILE 3 -#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 -#define AUDIT_TRIGGER_NO_SPACE 5 -#define AUDIT_TRIGGER_MAX 5 +#define AUDIT_TRIGGER_MIN 1 +#define AUDIT_TRIGGER_LOW_SPACE 1 +#define AUDIT_TRIGGER_OPEN_NEW 2 +#define AUDIT_TRIGGER_READ_FILE 3 +#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 +#define AUDIT_TRIGGER_NO_SPACE 5 +#define AUDIT_TRIGGER_MAX 5 /* * File that will be read for trigger events from the kernel */ -#define AUDIT_TRIGGER_FILE "/dev/audit" +#define AUDIT_TRIGGER_FILE "/dev/audit" /* * Pre-defined audit IDs */ -#define AU_DEFAUDITID -1 +#define AU_DEFAUDITID -1 /* * Define the masks for the classes of audit events. @@ -122,71 +122,74 @@ /* * IPC types */ -#define AT_IPC_MSG ((u_char)1) /* message IPC id */ -#define AT_IPC_SEM ((u_char)2) /* semaphore IPC id */ -#define AT_IPC_SHM ((u_char)3) /* shared mem IPC id */ +#define AT_IPC_MSG ((u_char)1) /* Message IPC id. */ +#define AT_IPC_SEM ((u_char)2) /* Semaphore IPC id. */ +#define AT_IPC_SHM ((u_char)3) /* Shared mem IPC id. */ /* * Audit conditions. */ -#define AUC_UNSET 0 -#define AUC_AUDITING 1 -#define AUC_NOAUDIT 2 -#define AUC_DISABLED -1 +#define AUC_UNSET 0 +#define AUC_AUDITING 1 +#define AUC_NOAUDIT 2 +#define AUC_DISABLED -1 /* * auditon(2) commands. */ -#define A_GETPOLICY 2 -#define A_SETPOLICY 3 -#define A_GETKMASK 4 -#define A_SETKMASK 5 +#define A_GETPOLICY 2 +#define A_SETPOLICY 3 +#define A_GETKMASK 4 +#define A_SETKMASK 5 #define A_GETQCTRL 6 -#define A_SETQCTRL 7 -#define A_GETCWD 8 -#define A_GETCAR 9 -#define A_GETSTAT 12 -#define A_SETSTAT 13 +#define A_SETQCTRL 7 +#define A_GETCWD 8 +#define A_GETCAR 9 +#define A_GETSTAT 12 +#define A_SETSTAT 13 #define A_SETUMASK 14 -#define A_SETSMASK 15 -#define A_GETCOND 20 -#define A_SETCOND 21 -#define A_GETCLASS 22 -#define A_SETCLASS 23 -#define A_GETPINFO 24 -#define A_SETPMASK 25 -#define A_SETFSIZE 26 -#define A_GETFSIZE 27 -#define A_GETPINFO_ADDR 28 -#define A_GETKAUDIT 29 -#define A_SETKAUDIT 30 -#define A_SENDTRIGGER 31 +#define A_SETSMASK 15 +#define A_GETCOND 20 +#define A_SETCOND 21 +#define A_GETCLASS 22 +#define A_SETCLASS 23 +#define A_GETPINFO 24 +#define A_SETPMASK 25 +#define A_SETFSIZE 26 +#define A_GETFSIZE 27 +#define A_GETPINFO_ADDR 28 +#define A_GETKAUDIT 29 +#define A_SETKAUDIT 30 +#define A_SENDTRIGGER 31 /* * Audit policy controls. */ -#define AUDIT_CNT 0x0001 -#define AUDIT_AHLT 0x0002 -#define AUDIT_ARGV 0x0004 -#define AUDIT_ARGE 0x0008 -#define AUDIT_PASSWD 0x0010 -#define AUDIT_SEQ 0x0020 -#define AUDIT_WINDATA 0x0040 -#define AUDIT_USER 0x0080 -#define AUDIT_GROUP 0x0100 -#define AUDIT_TRAIL 0x0200 -#define AUDIT_PATH 0x0400 +#define AUDIT_CNT 0x0001 +#define AUDIT_AHLT 0x0002 +#define AUDIT_ARGV 0x0004 +#define AUDIT_ARGE 0x0008 +#define AUDIT_PASSWD 0x0010 +#define AUDIT_SEQ 0x0020 +#define AUDIT_WINDATA 0x0040 +#define AUDIT_USER 0x0080 +#define AUDIT_GROUP 0x0100 +#define AUDIT_TRAIL 0x0200 +#define AUDIT_PATH 0x0400 /* * Audit queue control parameters */ -#define AQ_HIWATER 100 -#define AQ_MAXHIGH 10000 -#define AQ_LOWATER 10 -#define AQ_BUFSZ 1024 -#define AQ_MAXBUFSZ 1048576 +#define AQ_HIWATER 100 +#define AQ_MAXHIGH 10000 +#define AQ_LOWATER 10 +#define AQ_BUFSZ 1024 +#define AQ_MAXBUFSZ 1048576 -#define AU_FS_MINFREE 20 /* default min filesystem freespace, in percent */ +/* + * Default minimum percentage free space on file system. + */ +#define AU_FS_MINFREE 20 /* * Type definitions used indicating the length of variable length addresses @@ -197,83 +200,83 @@ __BEGIN_DECLS -typedef uid_t au_id_t; -typedef pid_t au_asid_t; -typedef u_int16_t au_event_t; -typedef u_int16_t au_emod_t; -typedef u_int32_t au_class_t; +typedef uid_t au_id_t; +typedef pid_t au_asid_t; +typedef u_int16_t au_event_t; +typedef u_int16_t au_emod_t; +typedef u_int32_t au_class_t; struct au_tid { - dev_t port; - u_int32_t machine; + dev_t port; + u_int32_t machine; }; -typedef struct au_tid au_tid_t; +typedef struct au_tid au_tid_t; struct au_tid_addr { - dev_t at_port; - u_int32_t at_type; - u_int32_t at_addr[4]; + dev_t at_port; + u_int32_t at_type; + u_int32_t at_addr[4]; }; -typedef struct au_tid_addr au_tid_addr_t; +typedef struct au_tid_addr au_tid_addr_t; struct au_mask { - unsigned int am_success; /* success bits */ - unsigned int am_failure; /* failure bits */ + unsigned int am_success; /* Success bits. */ + unsigned int am_failure; /* Failure bits. */ }; -typedef struct au_mask au_mask_t; +typedef struct au_mask au_mask_t; struct auditinfo { - au_id_t ai_auid; /* Audit user ID */ - au_mask_t ai_mask; /* Audit masks */ - au_tid_t ai_termid; /* Terminal ID */ - au_asid_t ai_asid; /* Audit session ID */ + au_id_t ai_auid; /* Audit user ID. */ + au_mask_t ai_mask; /* Audit masks. */ + au_tid_t ai_termid; /* Terminal ID. */ + au_asid_t ai_asid; /* Audit session ID. */ }; -typedef struct auditinfo auditinfo_t; +typedef struct auditinfo auditinfo_t; struct auditinfo_addr { - au_id_t ai_auid; /* Audit user ID */ - au_mask_t ai_mask; /* Audit masks */ - au_tid_addr_t ai_termid; /* Terminal ID */ - au_asid_t ai_asid; /* Audit session ID */ + au_id_t ai_auid; /* Audit user ID. */ + au_mask_t ai_mask; /* Audit masks. */ + au_tid_addr_t ai_termid; /* Terminal ID. */ + au_asid_t ai_asid; /* Audit session ID. */ }; -typedef struct auditinfo_addr auditinfo_addr_t; +typedef struct auditinfo_addr auditinfo_addr_t; struct auditpinfo { - pid_t ap_pid; /* ID of target process */ - au_id_t ap_auid; /* Audit user ID */ - au_mask_t ap_mask; /* Audit masks */ - au_tid_t ap_termid; /* Terminal ID */ - au_asid_t ap_asid; /* Audit session ID */ + pid_t ap_pid; /* ID of target process. */ + au_id_t ap_auid; /* Audit user ID. */ + au_mask_t ap_mask; /* Audit masks. */ + au_tid_t ap_termid; /* Terminal ID. */ + au_asid_t ap_asid; /* Audit session ID. */ }; -typedef struct auditpinfo auditpinfo_t; +typedef struct auditpinfo auditpinfo_t; struct auditpinfo_addr { - pid_t ap_pid; /* ID of target process */ - au_id_t ap_auid; /* Audit user ID */ - au_mask_t ap_mask; /* Audit masks */ - au_tid_addr_t ap_termid; /* Terminal ID */ - au_asid_t ap_asid; /* Audit session ID */ + pid_t ap_pid; /* ID of target process. */ + au_id_t ap_auid; /* Audit user ID. */ + au_mask_t ap_mask; /* Audit masks. */ + au_tid_addr_t ap_termid; /* Terminal ID. */ + au_asid_t ap_asid; /* Audit session ID. */ }; -typedef struct auditpinfo_addr auditpinfo_addr_t; +typedef struct auditpinfo_addr auditpinfo_addr_t; -/* Token and record structures */ +/* Token and record structures. */ struct au_token { - u_char *t_data; - size_t len; - TAILQ_ENTRY(au_token) tokens; + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; }; -typedef struct au_token token_t; +typedef struct au_token token_t; struct au_record { - char used; /* Is this record currently being used */ - int desc; /* The descriptor associated with this record */ - TAILQ_HEAD(, au_token) token_q; /* queue of BSM tokens */ - u_char *data; - size_t len; - LIST_ENTRY(au_record) au_rec_q; + char used; /* Record currently in use? */ + int desc; /* Descriptor for record. */ + TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ + u_char *data; + size_t len; + LIST_ENTRY(au_record) au_rec_q; }; -typedef struct au_record au_record_t; +typedef struct au_record au_record_t; /* * Kernel audit queue control parameters. @@ -283,60 +286,60 @@ size_t aq_lowater; size_t aq_bufsz; clock_t aq_delay; - int aq_minfree; /* minimum filesystem percent free space */ + int aq_minfree; /* Minimum filesystem percent free space. */ }; -typedef struct au_qctrl au_qctrl_t; +typedef struct au_qctrl au_qctrl_t; /* * Structure for the audit statistics. */ struct audit_stat { - unsigned int as_version; - unsigned int as_numevent; - int as_generated; - int as_nonattring; - int as_kernel; - int as_audit; - int as_auditctl; - int as_enqueu; - int as_written; - int as_wblocked; - int as_rblocked; - int as_dropped; - int as_totalsize; - unsigned int as_memused; + unsigned int as_version; + unsigned int as_numevent; + int as_generated; + int as_nonattring; + int as_kernel; + int as_audit; + int as_auditctl; + int as_enqueu; + int as_written; + int as_wblocked; + int as_rblocked; + int as_dropped; + int as_totalsize; + unsigned int as_memused; }; -typedef struct audit_stat au_stat_t; +typedef struct audit_stat au_stat_t; /* * Structure for the audit file statistics. */ struct audit_fstat { - u_quad_t af_filesz; - u_quad_t af_currsz; + u_quad_t af_filesz; + u_quad_t af_currsz; }; -typedef struct audit_fstat au_fstat_t; +typedef struct audit_fstat au_fstat_t; /* * Audit to event class mapping. */ struct au_evclass_map { - au_event_t ec_number; - au_class_t ec_class; + au_event_t ec_number; + au_class_t ec_class; }; -typedef struct au_evclass_map au_evclass_map_t; +typedef struct au_evclass_map au_evclass_map_t; #ifndef _KERNEL -int audit(const void *, int); -int auditon(int, void *, int); -int auditctl(const char *); -int getauid(au_id_t *); -int setauid(const au_id_t *); -int getaudit(struct auditinfo *); -int setaudit(const struct auditinfo *); -int getaudit_addr(struct auditinfo_addr *, int); -int setaudit_addr(const struct auditinfo_addr *, int); +int audit(const void *, int); +int auditon(int, void *, int); +int auditctl(const char *); +int getauid(au_id_t *); +int setauid(const au_id_t *); +int getaudit(struct auditinfo *); +int setaudit(const struct auditinfo *); +int getaudit_addr(struct auditinfo_addr *, int); +int setaudit_addr(const struct auditinfo_addr *, int); #endif /* !_KERNEL */ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#15 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#14 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#15 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -60,12 +60,14 @@ #define AUE_CHMOD 10 #define AUE_CHOWN 11 #define AUE_UMOUNT 12 +#define AUE_JUNK 13 /* Solaris-specific. */ #define AUE_ACCESS 14 #define AUE_CHECKUSERACCESS AUE_ACCESS #define AUE_KILL 15 #define AUE_STAT 16 #define AUE_LSTAT 17 #define AUE_ACCT 18 +#define AUE_MCTL 19 /* Solaris-specific. */ #define AUE_REBOOT 20 /* XXX: Darwin conflict. */ #define AUE_SYMLINK 21 #define AUE_READLINK 22 @@ -157,34 +159,39 @@ #define AUE_SEMCTL_SETALL 108 #define AUE_SEMGET 109 #define AUE_SEMOP 110 -#define AUE_CORE 111 /* Solaris-only, currently. */ +#define AUE_CORE 111 /* Solaris-specific, currently. */ #define AUE_CLOSE 112 #define AUE_SYSTEMBOOT 113 -#define AUE_ASYNC_DAEMON_EXIT 114 /* Solaris-only. */ -#define AUE_NFSSVC_EXIT 115 /* Solaris-only. */ -#define AUE_WRITEL 128 /* Solaris-only. */ -#define AUE_WRITEVL 129 /* Solaris-only. */ +#define AUE_ASYNC_DAEMON_EXIT 114 /* Solaris-specific. */ +#define AUE_NFSSVC_EXIT 115 /* Solaris-specific. */ +#define AUE_WRITEL 128 /* Solaris-specific. */ +#define AUE_WRITEVL 129 /* Solaris-specific. */ #define AUE_GETAUID 130 #define AUE_SETAUID 131 #define AUE_GETAUDIT 132 #define AUE_SETAUDIT 133 -#define AUE_GETUSERAUDIT 134 /* Solaris-only. */ -#define AUE_SETUSERAUDIT 135 /* Solaris-only. */ -#define AUE_AUDITSVC 136 /* Solaris-only. */ -#define AUE_AUDITUSER 137 /* Solaris-only. */ +#define AUE_GETUSERAUDIT 134 /* Solaris-specific. */ +#define AUE_SETUSERAUDIT 135 /* Solaris-specific. */ +#define AUE_AUDITSVC 136 /* Solaris-specific. */ +#define AUE_AUDITUSER 137 /* Solaris-specific. */ #define AUE_AUDITON 138 +#define AUE_AUDITON_GTERMID 139 /* Solaris-specific. */ +#define AUE_AUDITON_STERMID 140 /* Solaris-specific. */ #define AUE_AUDITON_GPOLICY 141 #define AUE_AUDITON_SPOLICY 142 #define AUE_AUDITON_GQCTRL 145 #define AUE_AUDITON_SQCTRL 146 -#define AUE_GETPORTAUDIT 149 -#define AUE_ENTERPROM 153 /* Solaris-only. */ -#define AUE_EXITPROM 154 /* Solaris-only. */ +#define AUE_GETKERNSTATE 147 /* Solaris-specific. */ +#define AUE_SETKERNSTATE 148 /* Solaris-specific. */ +#define AUE_GETPORTAUDIT 149 /* Solaris-specific. */ +#define AUE_AUDISTAT 150 /* Solaris-specific. */ +#define AUE_ENTERPROM 153 /* Solaris-specific. */ +#define AUE_EXITPROM 154 /* Solaris-specific. */ #define AUE_IOCTL 158 #define AUE_SOCKET 183 #define AUE_SENDTO 184 #define AUE_PIPE 185 -#define AUE_SOCKETPAIR 186 /* XXXRW: Darwin conflict. */ +#define AUE_SOCKETPAIR 186 /* XXX: Darwin conflict. */ #define AUE_SEND 187 #define AUE_SENDMSG 188 #define AUE_RECV 189 @@ -194,6 +201,7 @@ #define AUE_LSEEK 194 #define AUE_WRITE 195 #define AUE_WRITEV 196 +#define AUE_NFS 197 /* Solaris-specific. */ #define AUE_READV 198 /* XXXRW: XXX Solaris old stat()? */ #define AUE_SETUID 200 /* XXXRW: Solaris old setuid? */ @@ -212,10 +220,10 @@ #define AUE_SETEGID 214 #define AUE_SETEUID 215 #define AUE_PUTMSG 216 -#define AUE_GETMSG 217 -#define AUE_PUTPMSG 218 -#define AUE_GETPMSG 219 - /* XXXRW: Solaris sc placeholder? */ +#define AUE_GETMSG 217 /* Solaris-specific. */ +#define AUE_PUTPMSG 218 /* Solaris-specific. */ +#define AUE_GETPMSG 219 /* Solaris-specific. */ +#define AUE_AUDITSYS 220 /* Solaris-specific. */ #define AUE_AUDITON_GETKMASK 221 #define AUE_AUDITON_SETKMASK 222 #define AUE_AUDITON_GETCWD 223 @@ -289,12 +297,13 @@ #define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ #define AUE_FUTIMES 318 #define AUE_SETSID 319 -#define AUE_SETPRIVEXEC 320 +#define AUE_SETPRIVEXEC 320 /* Darwin-specific. */ #define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ #define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ #define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ -#define AUE_ADDPROFILE 324 /* Darwin */ -#define AUE_KDBUGTRACE 325 /* Darwin */ +#define AUE_ADDPROFILE 324 /* Darwin-specific. */ +#define AUE_KDEBUGTRACE 325 /* Darwin-specific. */ +#define AUE_KDBUGTRACE AUE_KDEBUGTRACE #define AUE_FSTAT 326 #define AUE_FPATHCONF 327 #define AUE_GETDIRENTRIES 328 @@ -304,11 +313,11 @@ #define AUE_MLOCK 332 #define AUE_MUNLOCK 333 #define AUE_UNDELETE 334 -#define AUE_GETATTRLIST 335 /* Darwin */ -#define AUE_SETATTRLIST 336 /* Darwin */ -#define AUE_GETDIRENTRIESATTR 337 /* Darwin */ -#define AUE_EXCHANGEDATA 338 /* Darwin */ -#define AUE_SEARCHFS 339 /* Darwin */ +#define AUE_GETATTRLIST 335 /* Darwin-specific. */ +#define AUE_SETATTRLIST 336 /* Darwin-specific. */ +#define AUE_GETDIRENTRIESATTR 337 /* Darwin-specific. */ +#define AUE_EXCHANGEDATA 338 /* Darwin-specific. */ +#define AUE_SEARCHFS 339 /* Darwin-specific. */ #define AUE_MINHERIT 340 #define AUE_SEMCONFIG 341 #define AUE_SEMOPEN 342 @@ -316,40 +325,40 @@ #define AUE_SEMUNLINK 344 #define AUE_SHMOPEN 345 #define AUE_SHMUNLINK 346 -#define AUE_LOADSHFILE 347 /* Darwin */ -#define AUE_RESETSHFILE 348 /* Darwin */ -#define AUE_NEWSYSTEMSHREG 349 /* Darwin */ -#define AUE_PTHREADKILL 350 -#define AUE_PTHREADSIGMASK 351 +#define AUE_LOADSHFILE 347 /* Darwin-specific. */ +#define AUE_RESETSHFILE 348 /* Darwin-specific. */ +#define AUE_NEWSYSTEMSHREG 349 /* Darwin-specific. */ +#define AUE_PTHREADKILL 350 /* Darwin-specific. */ +#define AUE_PTHREADSIGMASK 351 /* Darwin-specific. */ #define AUE_AUDITCTL 352 #define AUE_RFORK 353 #define AUE_LCHMOD 354 #define AUE_SWAPOFF 355 -#define AUE_INITPROCESS 356 /* Darwin */ -#define AUE_MAPFD 357 /* Darwin */ -#define AUE_TASKFORPID 358 /* Darwin */ -#define AUE_PIDFORTASK 359 /* Darwin */ +#define AUE_INITPROCESS 356 /* Darwin-specific. */ +#define AUE_MAPFD 357 /* Darwin-specific. */ +#define AUE_TASKFORPID 358 /* Darwin-specific. */ +#define AUE_PIDFORTASK 359 /* Darwin-specific. */ #define AUE_SYSCTL_NONADMIN 360 -#define AUE_COPYFILE 361 /* Darwin */ +#define AUE_COPYFILE 361 /* Darwin-specific. */ #define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 363 /* FreeBSD */ -#define AUE_SENDFILE 364 /* BSD/Linux */ -#define AUE_USELIB 365 /* Linux */ +#define AUE_LCHFLAGS 363 /* FreeBSD-specific. */ +#define AUE_SENDFILE 364 /* BSD/Linux-specific. */ +#define AUE_USELIB 365 /* Linux-specific. */ #define AUE_GETRESUID 366 #define AUE_SETRESUID 367 #define AUE_GETRESGID 368 #define AUE_SETRESGID 369 -#define AUE_WAIT4 370 /* FreeBSD */ -#define AUE_LGETFH 371 /* FreeBSD */ -#define AUE_FHSTATFS 372 /* FreeBSD */ -#define AUE_FHOPEN 373 /* FreeBSD */ -#define AUE_FHSTAT 374 /* FreeBSD */ -#define AUE_JAIL 375 /* FreeBSD */ -#define AUE_EACCESS 376 /* FreeBSD */ -#define AUE_KQUEUE 377 /* FreeBSD */ -#define AUE_KEVENT 378 /* FreeBSD */ +#define AUE_WAIT4 370 /* FreeBSD-specific. */ +#define AUE_LGETFH 371 /* FreeBSD-specific. */ +#define AUE_FHSTATFS 372 /* FreeBSD-specific. */ +#define AUE_FHOPEN 373 /* FreeBSD-specific. */ +#define AUE_FHSTAT 374 /* FreeBSD-specific. */ +#define AUE_JAIL 375 /* FreeBSD-specific. */ +#define AUE_EACCESS 376 /* FreeBSD-specific. */ +#define AUE_KQUEUE 377 /* FreeBSD-specific. */ +#define AUE_KEVENT 378 /* FreeBSD-specific. */ #define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD */ +#define AUE_NMOUNT 380 /* FreeBSD-specific. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#8 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#7 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#8 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -226,108 +226,99 @@ struct vnode_au_info; #endif -int au_open(void); -int au_write(int d, token_t *m); -int au_close(int d, int keep, short event); -int au_close_buffer(int d, short event, u_char *buffer, - size_t *buflen); +int au_open(void); +int au_write(int d, token_t *m); +int au_close(int d, int keep, short event); +int au_close_buffer(int d, short event, u_char *buffer, size_t *buflen); + #if defined(KERNEL) || defined(_KERNEL) -token_t *au_to_file(char *file, struct timeval tm); +token_t *au_to_file(char *file, struct timeval tm); #else -token_t *au_to_file(char *file); +token_t *au_to_file(char *file); #endif + #if defined(KERNEL) || defined(_KERNEL) -token_t *au_to_header(int rec_size, au_event_t e_type, - au_emod_t e_mod, struct timeval tm); -token_t *au_to_header32(int rec_size, au_event_t e_type, - au_emod_t e_mod, struct timeval tm); +token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm); +token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod, + struct timeval tm); #else -token_t *au_to_header(int rec_size, au_event_t e_type, - au_emod_t e_mod); -token_t *au_to_header32(int rec_size, au_event_t e_type, - au_emod_t e_mod); +token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); +token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); #endif -token_t *au_to_header64(int rec_size, au_event_t e_type, - au_emod_t e_mod); -token_t *au_to_me(void); + +token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); +token_t *au_to_me(void); +token_t *au_to_arg(char n, char *text, uint32_t v); +token_t *au_to_arg32(char n, char *text, uint32_t v); +token_t *au_to_arg64(char n, char *text, uint64_t v); -token_t *au_to_arg(char n, char *text, uint32_t v); -token_t *au_to_arg32(char n, char *text, uint32_t v); -token_t *au_to_arg64(char n, char *text, uint64_t v); #if defined(_KERNEL) || defined(KERNEL) -token_t *au_to_attr(struct vnode_au_info *vni); -token_t *au_to_attr32(struct vnode_au_info *vni); -token_t *au_to_attr64(struct vnode_au_info *vni); +token_t *au_to_attr(struct vnode_au_info *vni); +token_t *au_to_attr32(struct vnode_au_info *vni); +token_t *au_to_attr64(struct vnode_au_info *vni); #endif -token_t *au_to_data(char unit_print, char unit_type, - char unit_count, char *p); -token_t *au_to_exit(int retval, int err); -token_t *au_to_groups(int *groups); -token_t *au_to_newgroups(uint16_t n, gid_t *groups); -token_t *au_to_in_addr(struct in_addr *internet_addr); -token_t *au_to_in_addr_ex(struct in6_addr *internet_addr); -token_t *au_to_ip(struct ip *ip); -token_t *au_to_ipc(char type, int id); -token_t *au_to_ipc_perm(struct ipc_perm *perm); -token_t *au_to_iport(uint16_t iport); -token_t *au_to_opaque(char *data, uint16_t bytes); -token_t *au_to_path(char *path); -token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_process32(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_process64(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_process_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_process32_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_process64_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_return(char status, uint32_t ret); -token_t *au_to_return32(char status, uint32_t ret); -token_t *au_to_return64(char status, uint64_t ret); -token_t *au_to_seq(long audit_count); + +token_t *au_to_data(char unit_print, char unit_type, char unit_count, + char *p); +token_t *au_to_exit(int retval, int err); +token_t *au_to_groups(int *groups); +token_t *au_to_newgroups(uint16_t n, gid_t *groups); +token_t *au_to_in_addr(struct in_addr *internet_addr); +token_t *au_to_in_addr_ex(struct in6_addr *internet_addr); +token_t *au_to_ip(struct ip *ip); +token_t *au_to_ipc(char type, int id); +token_t *au_to_ipc_perm(struct ipc_perm *perm); +token_t *au_to_iport(uint16_t iport); +token_t *au_to_opaque(char *data, uint16_t bytes); +token_t *au_to_path(char *path); +token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_process32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_process64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_process_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_process32_ex(au_id_t auid, uid_t euid, gid_t egid, + uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, + au_tid_addr_t *tid); +token_t *au_to_process64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_return(char status, uint32_t ret); +token_t *au_to_return32(char status, uint32_t ret); +token_t *au_to_return64(char status, uint64_t ret); +token_t *au_to_seq(long audit_count); + #if defined(_KERNEL) || defined(KERNEL) -token_t *au_to_socket(struct socket *so); -token_t *au_to_socket_ex_32(uint16_t lp, uint16_t rp, - struct sockaddr *la, struct sockaddr *ta); -token_t *au_to_socket_ex_128(uint16_t lp, uint16_t rp, - struct sockaddr *la, struct sockaddr *ta); +token_t *au_to_socket(struct socket *so); +token_t *au_to_socket_ex_32(uint16_t lp, uint16_t rp, struct sockaddr *la, + struct sockaddr *ta); +token_t *au_to_socket_ex_128(uint16_t lp, uint16_t rp, struct sockaddr *la, + struct sockaddr *ta); #endif -token_t *au_to_sock_inet(struct sockaddr_in *so); -token_t *au_to_sock_inet32(struct sockaddr_in *so); -token_t *au_to_sock_inet128(struct sockaddr_in6 *so); -token_t *au_to_sock_unix(struct sockaddr_un *so); -token_t *au_to_subject(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_subject32(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_subject64(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid); -token_t *au_to_subject_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_subject32_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_subject64_ex(au_id_t auid, uid_t euid, - gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_exec_args(const char **); -token_t *au_to_exec_env(const char **); -token_t *au_to_text(char *text); -token_t *au_to_kevent(struct kevent *kev); -token_t *au_to_trailer(int rec_size); + +token_t *au_to_sock_inet(struct sockaddr_in *so); +token_t *au_to_sock_inet32(struct sockaddr_in *so); +token_t *au_to_sock_inet128(struct sockaddr_in6 *so); +token_t *au_to_sock_unix(struct sockaddr_un *so); +token_t *au_to_subject(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_subject32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_subject64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); +token_t *au_to_subject_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_subject32_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); +token_t *au_to_exec_args(const char **); +token_t *au_to_exec_env(const char **); +token_t *au_to_text(char *text); +token_t *au_to_kevent(struct kevent *kev); +token_t *au_to_trailer(int rec_size); __END_DECLS From owner-p4-projects@FreeBSD.ORG Mon Jan 30 22:25:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33E0F16A423; Mon, 30 Jan 2006 22:25:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EACC416A420 for ; Mon, 30 Jan 2006 22:25:57 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BC9743D5D for ; Mon, 30 Jan 2006 22:25:51 +0000 (GMT) (envelope-from peter@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 k0UMPpi8062720 for ; Mon, 30 Jan 2006 22:25:51 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0UMPpTa062717 for perforce@freebsd.org; Mon, 30 Jan 2006 22:25:51 GMT (envelope-from peter@freebsd.org) Date: Mon, 30 Jan 2006 22:25:51 GMT Message-Id: <200601302225.k0UMPpTa062717@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 90730 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 22:25:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=90730 Change 90730 by peter@peter_melody on 2006/01/30 22:25:01 Move the pv entry zone out of kvm and into direct map area like most of the other zones. Convert to a regular freeable zone. Turn the vm.pmap.* tunables into real working sysctls. These now set a pmap-internal limit on pv entries, rather than the zone setting the limit. i386 uses pvzone_obj to enable preallocation of kva. We can use direct map instead. XXX perhaps remove the "high water" mark soft limit and make pv_entry_max the soft limit instead. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#131 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#131 (text+ko) ==== @@ -183,8 +183,8 @@ * Data for the pv entry allocation mechanism */ static uma_zone_t pvzone; -static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; +static int shpgperproc = PMAP_SHPGPERPROC; /* * All those kernel PT submaps that BSD is so fond of @@ -563,7 +563,6 @@ void pmap_init(void) { - int shpgperproc = PMAP_SHPGPERPROC; /* * Initialize the address space (zone) for the pv entries. Set a @@ -571,13 +570,43 @@ * numbers of pv entries. */ pvzone = uma_zcreate("PV ENTRY", sizeof(struct pv_entry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); + NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); - uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); +} + +SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters"); +static int +pmap_pventry_proc(SYSCTL_HANDLER_ARGS) +{ + int error; + + error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); + if (error == 0 && req->newptr) { + shpgperproc = (pv_entry_max - cnt.v_page_count) / maxproc; + pv_entry_high_water = 9 * (pv_entry_max / 10); + } + return (error); +} +SYSCTL_PROC(_vm_pmap, OID_AUTO, pv_entry_max, CTLTYPE_INT|CTLFLAG_RW, + &pv_entry_max, 0, pmap_pventry_proc, "IU", "Max number of PV entries"); + +static int +pmap_shpgperproc_proc(SYSCTL_HANDLER_ARGS) +{ + int error; + + error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); + if (error == 0 && req->newptr) { + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_high_water = 9 * (pv_entry_max / 10); + } + return (error); } +SYSCTL_PROC(_vm_pmap, OID_AUTO, shpgperproc, CTLTYPE_INT|CTLFLAG_RW, + &shpgperproc, 0, pmap_shpgperproc_proc, "IU", "Page share factor per proc"); /*************************************************** @@ -1452,8 +1481,9 @@ * mappings to active pages. */ if (ratecheck(&lastprint, &printinterval)) - printf("Approaching the limit on PV entries, " - "increase the vm.pmap.shpgperproc tunable.\n"); + printf("Approaching the limit on PV entries, consider " + "increasing sysctl vm.pmap.shpgperproc or " + "vm.pmap.pv_entry_max\n"); vpq = &vm_page_queues[PQ_INACTIVE]; retry: TAILQ_FOREACH(m, &vpq->pl, pageq) { From owner-p4-projects@FreeBSD.ORG Mon Jan 30 22:52:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D279D16A424; Mon, 30 Jan 2006 22:52:09 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 73D1316A422 for ; Mon, 30 Jan 2006 22:52:09 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93CA243D76 for ; Mon, 30 Jan 2006 22:51:48 +0000 (GMT) (envelope-from peter@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 k0UMpcSw064423 for ; Mon, 30 Jan 2006 22:51:38 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0UMpb55064420 for perforce@freebsd.org; Mon, 30 Jan 2006 22:51:37 GMT (envelope-from peter@freebsd.org) Date: Mon, 30 Jan 2006 22:51:37 GMT Message-Id: <200601302251.k0UMpb55064420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 90737 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 22:52:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=90737 Change 90737 by peter@peter_daintree on 2006/01/30 22:51:22 IFC @90735 Affected files ... .. //depot/projects/hammer/etc/defaults/periodic.conf#15 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#68 integrate .. //depot/projects/hammer/etc/pf.conf#3 integrate .. //depot/projects/hammer/etc/rc.d/abi#7 integrate .. //depot/projects/hammer/etc/services#12 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#58 integrate .. //depot/projects/hammer/include/nl_types.h#5 integrate .. //depot/projects/hammer/include/printf.h#2 integrate .. //depot/projects/hammer/include/stdio.h#10 integrate .. //depot/projects/hammer/lib/Makefile#54 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#31 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tp.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/getttyent.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#14 integrate .. //depot/projects/hammer/lib/libc/stdio/xprintf.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/xprintf_errno.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/xprintf_quote.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/xprintf_vis.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/grantpt.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#22 integrate .. //depot/projects/hammer/lib/libc/sys/pipe.2#4 integrate .. //depot/projects/hammer/lib/libdisk/Makefile#11 integrate .. //depot/projects/hammer/lib/libdisk/disk.c#22 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.3#11 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.h#15 integrate .. //depot/projects/hammer/lib/libdisk/write_arm_disk.c#1 branch .. //depot/projects/hammer/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/hammer/lib/libgssapi/gssapi.3#2 integrate .. //depot/projects/hammer/lib/libutil/pidfile.3#4 integrate .. //depot/projects/hammer/lib/libutil/pty.c#4 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.8#13 integrate .. //depot/projects/hammer/libexec/rtld-elf/ia64/reloc.c#10 integrate .. //depot/projects/hammer/libexec/rtld-elf/ia64/rtld_start.S#3 integrate .. //depot/projects/hammer/release/Makefile#81 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#84 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#20 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#14 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#36 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#21 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient-script#8 integrate .. //depot/projects/hammer/sbin/geom/core/geom.8#12 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#28 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#23 integrate .. //depot/projects/hammer/sbin/rcorder/Makefile#3 integrate .. //depot/projects/hammer/sbin/sconfig/sconfig.c#3 integrate .. //depot/projects/hammer/share/examples/cvsup/ports-supfile#10 integrate .. //depot/projects/hammer/share/examples/kld/Makefile#2 integrate .. //depot/projects/hammer/share/examples/kld/firmware/Makefile#1 branch .. //depot/projects/hammer/share/examples/kld/firmware/README#1 branch .. //depot/projects/hammer/share/examples/kld/firmware/fwconsumer/Makefile#1 branch .. //depot/projects/hammer/share/examples/kld/firmware/fwconsumer/fw_consumer.c#1 branch .. //depot/projects/hammer/share/examples/kld/firmware/fwimage/Makefile#1 branch .. //depot/projects/hammer/share/examples/kld/firmware/fwimage/firmware.img#1 branch .. //depot/projects/hammer/share/man/man4/ata.4#23 integrate .. //depot/projects/hammer/share/man/man4/ipw.4#7 integrate .. //depot/projects/hammer/share/man/man4/iwi.4#9 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_asus.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ce.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_pppoe.4#10 integrate .. //depot/projects/hammer/share/man/man4/pcm.4#17 integrate .. //depot/projects/hammer/share/man/man4/pty.4#5 integrate .. //depot/projects/hammer/share/man/man4/ral.4#6 integrate .. //depot/projects/hammer/share/man/man4/ural.4#7 integrate .. //depot/projects/hammer/share/man/man5/devfs.rules.5#3 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#70 integrate .. //depot/projects/hammer/share/man/man9/Makefile#60 integrate .. //depot/projects/hammer/share/man/man9/firmware.9#1 branch .. //depot/projects/hammer/sys/amd64/amd64/trap.c#86 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#20 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#32 integrate .. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#13 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#27 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#23 integrate .. //depot/projects/hammer/sys/conf/Makefile.i386#11 integrate .. //depot/projects/hammer/sys/conf/Makefile.pc98#11 integrate .. //depot/projects/hammer/sys/conf/NOTES#105 integrate .. //depot/projects/hammer/sys/conf/files#136 integrate .. //depot/projects/hammer/sys/conf/files.amd64#83 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#55 integrate .. //depot/projects/hammer/sys/conf/options#92 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_fujitsu.c#4 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#30 integrate .. //depot/projects/hammer/sys/dev/amr/amr_linux.c#1 branch .. //depot/projects/hammer/sys/dev/an/if_an.c#30 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#69 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#38 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#40 integrate .. //depot/projects/hammer/sys/dev/auxio/auxio.c#5 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#64 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#17 integrate .. //depot/projects/hammer/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/hammer/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/hammer/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/hammer/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/hammer/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/hammer/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/hammer/sys/dev/ed/if_ed.c#37 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_3c503.c#4 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_cbus.c#15 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_hpp.c#4 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_isa.c#15 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_novell.c#5 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_sic.c#5 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_wd80x3.c#5 integrate .. //depot/projects/hammer/sys/dev/ed/if_edvar.h#13 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#59 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#13 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#19 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#14 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwireg.h#7 integrate .. //depot/projects/hammer/sys/dev/md/md.c#56 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral.c#13 integrate .. //depot/projects/hammer/sys/dev/ral/if_ralreg.h#3 integrate .. //depot/projects/hammer/sys/dev/ral/if_ralvar.h#3 integrate .. //depot/projects/hammer/sys/dev/rp/rp_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/solo.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#26 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_fmt.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_rate.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#36 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#68 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#42 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#46 integrate .. //depot/projects/hammer/sys/i386/include/cserial.h#3 integrate .. //depot/projects/hammer/sys/ia64/include/elf.h#5 integrate .. //depot/projects/hammer/sys/kern/kern_alq.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_ktr.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_rwlock.c#1 branch .. //depot/projects/hammer/sys/kern/kern_sysctl.c#24 integrate .. //depot/projects/hammer/sys/kern/subr_firmware.c#1 branch .. //depot/projects/hammer/sys/kern/subr_lock.c#2 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#19 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#19 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#54 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#30 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#1 branch .. //depot/projects/hammer/sys/kern/tty_pty.c#31 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#39 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#42 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#46 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#67 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#99 integrate .. //depot/projects/hammer/sys/modules/Makefile#95 integrate .. //depot/projects/hammer/sys/modules/amr/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/amr/amr_linux/Makefile#1 branch .. //depot/projects/hammer/sys/modules/bktr/bktr/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/ce/Makefile#1 branch .. //depot/projects/hammer/sys/modules/firmware/Makefile#1 branch .. //depot/projects/hammer/sys/modules/linux/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/nwfs/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/smbfs/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/svr4/Makefile#4 integrate .. //depot/projects/hammer/sys/net/if.c#60 integrate .. //depot/projects/hammer/sys/net/if.h#22 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#22 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#55 integrate .. //depot/projects/hammer/sys/net/if_gif.c#25 integrate .. //depot/projects/hammer/sys/net/if_gif.h#9 integrate .. //depot/projects/hammer/sys/net/if_var.h#38 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#35 integrate .. //depot/projects/hammer/sys/net/if_vlan_var.h#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#21 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.h#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_sppp.c#10 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#31 integrate .. //depot/projects/hammer/sys/netinet/in_gif.c#15 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.c#11 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#25 integrate .. //depot/projects/hammer/sys/nfsserver/nfs.h#11 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#27 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#15 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_syscalls.c#17 integrate .. //depot/projects/hammer/sys/sparc64/central/central.c#9 integrate .. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#18 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc_central.c#8 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc_nexus.c#8 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#26 integrate .. //depot/projects/hammer/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#20 integrate .. //depot/projects/hammer/sys/sys/_rwlock.h#1 branch .. //depot/projects/hammer/sys/sys/cdefs.h#22 integrate .. //depot/projects/hammer/sys/sys/firmware.h#1 branch .. //depot/projects/hammer/sys/sys/ktr.h#16 integrate .. //depot/projects/hammer/sys/sys/lock.h#13 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#50 integrate .. //depot/projects/hammer/sys/sys/param.h#74 integrate .. //depot/projects/hammer/sys/sys/proc.h#94 integrate .. //depot/projects/hammer/sys/sys/rwlock.h#1 branch .. //depot/projects/hammer/sys/sys/ttycom.h#8 integrate .. //depot/projects/hammer/sys/sys/turnstile.h#7 integrate .. //depot/projects/hammer/sys/tools/fw_stub.awk#1 branch .. //depot/projects/hammer/sys/vm/swap_pager.c#43 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#47 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#28 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#36 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#53 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#60 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#37 integrate .. //depot/projects/hammer/sys/vm/vm_pageq.c#14 integrate .. //depot/projects/hammer/tools/tools/genericize/genericize.pl#4 integrate .. //depot/projects/hammer/tools/tools/mfc/mfc.pl#3 integrate .. //depot/projects/hammer/tools/tools/netrate/juggle/juggle.c#2 integrate .. //depot/projects/hammer/usr.bin/Makefile#46 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#44 integrate .. //depot/projects/hammer/usr.bin/ee/ee.c#4 integrate .. //depot/projects/hammer/usr.bin/elfdump/elfdump.c#6 integrate .. //depot/projects/hammer/usr.bin/fetch/fetch.c#17 integrate .. //depot/projects/hammer/usr.bin/fstat/fstat.c#18 integrate .. //depot/projects/hammer/usr.bin/gprof/powerpc.h#1 branch .. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.c#11 integrate .. //depot/projects/hammer/usr.bin/mail/mail.1#7 integrate .. //depot/projects/hammer/usr.bin/mktemp/mktemp.1#5 integrate .. //depot/projects/hammer/usr.bin/netstat/Makefile#10 integrate .. //depot/projects/hammer/usr.bin/netstat/ipsec.c#5 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#20 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.h#14 integrate .. //depot/projects/hammer/usr.bin/netstat/pfkey.c#1 branch .. //depot/projects/hammer/usr.bin/su/su.1#10 integrate .. //depot/projects/hammer/usr.bin/su/su.c#16 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#21 integrate .. //depot/projects/hammer/usr.bin/truss/alpha-fbsd.c#6 integrate .. //depot/projects/hammer/usr.bin/truss/amd64-fbsd.c#3 integrate .. //depot/projects/hammer/usr.bin/truss/extern.h#8 integrate .. //depot/projects/hammer/usr.bin/truss/i386-fbsd.c#8 integrate .. //depot/projects/hammer/usr.bin/truss/i386-linux.c#6 integrate .. //depot/projects/hammer/usr.bin/truss/ia64-fbsd.c#8 integrate .. //depot/projects/hammer/usr.bin/truss/main.c#10 integrate .. //depot/projects/hammer/usr.bin/truss/powerpc-fbsd.c#1 branch .. //depot/projects/hammer/usr.bin/truss/sparc64-fbsd.c#6 integrate .. //depot/projects/hammer/usr.bin/truss/syscall.h#6 integrate .. //depot/projects/hammer/usr.bin/truss/syscalls.c#20 integrate .. //depot/projects/hammer/usr.bin/truss/truss.1#5 integrate .. //depot/projects/hammer/usr.bin/truss/truss.h#2 integrate .. //depot/projects/hammer/usr.bin/wall/ttymsg.c#3 integrate .. //depot/projects/hammer/usr.bin/whois/whois.1#6 integrate .. //depot/projects/hammer/usr.bin/whois/whois.c#12 integrate .. //depot/projects/hammer/usr.bin/xargs/strnsubst.c#3 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.1#10 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.c#12 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.sh#10 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.8#6 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.c#13 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#1 branch .. //depot/projects/hammer/usr.sbin/btxld/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/btxld/btxld.c#6 integrate .. //depot/projects/hammer/usr.sbin/config/config.h#10 integrate .. //depot/projects/hammer/usr.sbin/config/config.y#12 integrate .. //depot/projects/hammer/usr.sbin/config/main.c#13 integrate .. //depot/projects/hammer/usr.sbin/config/mkmakefile.c#11 integrate .. //depot/projects/hammer/usr.sbin/config/mkoptions.c#5 integrate .. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.c#5 integrate .. //depot/projects/hammer/usr.sbin/inetd/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/inetd/inetd.8#8 integrate .. //depot/projects/hammer/usr.sbin/inetd/inetd.c#16 integrate .. //depot/projects/hammer/usr.sbin/inetd/inetd.h#3 integrate .. //depot/projects/hammer/usr.sbin/kbdcontrol/kbdcontrol.1#7 integrate .. //depot/projects/hammer/usr.sbin/kbdmap/kbdmap.c#4 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef_obj.c#4 integrate .. //depot/projects/hammer/usr.sbin/mixer/mixer.c#8 integrate .. //depot/projects/hammer/usr.sbin/mountd/exports.5#8 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#23 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/add.h#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/extract.c#8 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#14 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/perform.c#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#13 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/perform.c#8 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/pkg_create.1#12 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/pl.c#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/info.h#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/main.c#8 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/perform.c#5 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/pkg_info.1#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/show.c#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#10 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/plist.c#8 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/url.c#5 integrate .. //depot/projects/hammer/usr.sbin/portsnap/phttpget/phttpget.c#4 integrate .. //depot/projects/hammer/usr.sbin/portsnap/portsnap/portsnap.8#3 integrate .. //depot/projects/hammer/usr.sbin/portsnap/portsnap/portsnap.sh#3 integrate .. //depot/projects/hammer/usr.sbin/powerd/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/powerd/powerd.c#9 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/anonFTP.c#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#17 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dispatch.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#26 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/label.c#15 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/media.c#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#37 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.8#14 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#22 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/tcpip.c#7 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.8#8 integrate Differences ... ==== //depot/projects/hammer/etc/defaults/periodic.conf#15 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.34 2006/01/13 18:07:52 wollman Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.36 2006/01/30 19:23:24 matteo Exp $ # # What files override these defaults ? @@ -86,7 +86,7 @@ # 400.status-disks daily_status_disks_enable="YES" # Check disk status -daily_status_disks_df_flags="-k -t nonfs" # df(1) flags for check +daily_status_disks_df_flags="-l -h" # df(1) flags for check # 405.status-ata_raid daily_status_ata_raid_enable="NO" # Check ATA raid status ==== //depot/projects/hammer/etc/defaults/rc.conf#68 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.271 2006/01/21 18:08:15 yar Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.272 2006/01/29 05:51:58 njl Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -528,9 +528,9 @@ devfs_system_ruleset="" # The name of a ruleset to apply to /dev devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) -performance_cx_lowest="HIGH" # Online CPU idle state +performance_cx_lowest="LOW" # Online CPU idle state performance_cpu_freq="NONE" # Online CPU frequency -economy_cx_lowest="HIGH" # Offline CPU idle state +economy_cx_lowest="LOW" # Offline CPU idle state economy_cpu_freq="NONE" # Offline CPU frequency virecover_enable="YES" # Perform housekeeping for the vi(1) editor ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot ==== //depot/projects/hammer/etc/pf.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/pf.conf,v 1.2 2004/09/14 01:07:18 mlaier Exp $ +# $FreeBSD: src/etc/pf.conf,v 1.3 2006/01/27 17:16:20 mlaier Exp $ # $OpenBSD: pf.conf,v 1.21 2003/09/02 20:38:44 david Exp $ # # See pf.conf(5) and /usr/share/examples/pf for syntax and examples. @@ -72,6 +72,10 @@ #pass in on $ext_if proto { tcp, udp } from any to port 80 keep state # pass incoming ports for ftp-proxy +#pass in on $ext_if inet proto tcp from any to $ext_if port > 49151 keep state + +# Alternate rule to pass incoming ports for ftp-proxy +# NOTE: Please see pf.conf(5) BUGS section before using user/group rules. #pass in on $ext_if inet proto tcp from any to $ext_if user proxy keep state # assign packets to a queue. ==== //depot/projects/hammer/etc/rc.d/abi#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.6 2006/01/11 21:30:41 brooks Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.7 2006/01/24 18:58:48 netchild Exp $ # # PROVIDE: abi @@ -28,7 +28,7 @@ if ! kldstat -v | grep -E 'linux(aout|elf)' > /dev/null; then kldload linux > /dev/null 2>&1 fi - if [ -x /compat/linux/sbin/ldconfig ]; then + if [ -x /compat/linux/sbin/ldconfigDisabled ]; then _tmpdir=`mktemp -d -t linux-ldconfig` /compat/linux/sbin/ldconfig -C ${_tmpdir}/ld.so.cache if ! cmp -s ${_tmpdir}/ld.so.cache /compat/linux/etc/ld.so.cache; then ==== //depot/projects/hammer/etc/services#12 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.102 2004/08/16 11:52:22 cperciva Exp $ +# $FreeBSD: src/etc/services,v 1.103 2006/01/25 17:37:15 maxim Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -1917,6 +1917,8 @@ eppc 3031/udp #Remote AppleEvents/PPC Toolbox NSWS 3049/tcp NSWS 3049/udp +gds_db 3050/tcp #InterBase Database Remote Protocol +gds_db 3050/udp #InterBase Database Remote Protocol sj3 3086/tcp #SJ3 (kanji input) vmodem 3141/tcp vmodem 3141/udp ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#58 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.203 2006/01/21 14:16:01 matteo Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.205 2006/01/28 09:19:20 dds Exp $ % ======================================================================= @@ -29939,6 +29939,11 @@ what is essential is invisible to the eye. -- The Fox, 'The Little Prince" % +It is perfectly permissible for every system call to fail with [ENOTADUCK] +unless the first five bytes of the caller's address space contain the +word "quack". + -- Garrett Wollman +% It is possible by ingenuity and at the expense of clarity... {to do almost anything in any language}. However, the fact that it is possible to push a pea up a mountain with your nose does not mean that this is a sensible @@ -35390,6 +35395,10 @@ % Never delay the ending of a meeting or the beginning of a cocktail hour. % +Never do programs contain so few bugs as when no debugging tools +are available. + -- Niklaus Wirth +% Never do today what you can put off until tomorrow. % Never drink Coca-Cola in a moving elevator. The elevator's motion coupled ==== //depot/projects/hammer/include/nl_types.h#5 (text+ko) ==== @@ -35,7 +35,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/include/nl_types.h,v 1.11 2005/02/27 16:20:53 phantom Exp $ + * $FreeBSD: src/include/nl_types.h,v 1.12 2006/01/26 20:53:40 stefanf Exp $ */ #ifndef _NL_TYPES_H_ @@ -97,8 +97,7 @@ __BEGIN_DECLS nl_catd catopen(const char *, int); -char *catgets(nl_catd, int, int, const char *) - __attribute__((__format_arg__(4))); +char *catgets(nl_catd, int, int, const char *) __format_arg(4); int catclose(nl_catd); __END_DECLS ==== //depot/projects/hammer/include/printf.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/printf.h,v 1.1 2005/12/16 18:56:38 phk Exp $ + * $FreeBSD: src/include/printf.h,v 1.2 2006/01/25 12:45:24 phk Exp $ */ #ifndef _PRINTF_H_ @@ -124,16 +124,28 @@ int register_printf_render(int spec, printf_render *render, printf_arginfo_function *arginfo); int register_printf_render_std(const unsigned char *specs); +/* vprintf_errno.c */ +printf_arginfo_function __printf_arginfo_errno; +printf_render __printf_render_errno; + /* vprintf_float.c */ printf_arginfo_function __printf_arginfo_float; printf_render __printf_render_float; +/* vprintf_hexdump.c */ +printf_arginfo_function __printf_arginfo_hexdump; +printf_render __printf_render_hexdump; + /* vprintf_int.c */ printf_arginfo_function __printf_arginfo_ptr; printf_arginfo_function __printf_arginfo_int; printf_render __printf_render_ptr; printf_render __printf_render_int; +/* vprintf_quoute.c */ +printf_arginfo_function __printf_arginfo_quote; +printf_render __printf_render_quote; + /* vprintf_str.c */ printf_arginfo_function __printf_arginfo_chr; printf_render __printf_render_chr; @@ -144,10 +156,6 @@ printf_arginfo_function __printf_arginfo_time; printf_render __printf_render_time; -/* vprintf_hexdump.c */ -printf_arginfo_function __printf_arginfo_hexdump; -printf_render __printf_render_hexdump; - /* vprintf_vis.c */ printf_arginfo_function __printf_arginfo_vis; printf_render __printf_render_vis; ==== //depot/projects/hammer/include/stdio.h#10 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.56 2004/06/20 10:01:30 tjr Exp $ + * $FreeBSD: src/include/stdio.h,v 1.57 2006/01/26 20:53:40 stefanf Exp $ */ #ifndef _STDIO_H_ @@ -328,12 +328,7 @@ int asprintf(char **, const char *, ...) __printflike(2, 3); char *ctermid_r(char *); char *fgetln(FILE *, size_t *); -#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3 -#define __ATTR_FORMAT_ARG __attribute__((__format_arg__(2))) -#else -#define __ATTR_FORMAT_ARG -#endif -__const char *fmtcheck(const char *, const char *) __ATTR_FORMAT_ARG; +__const char *fmtcheck(const char *, const char *) __format_arg(2); int fpurge(FILE *); void setbuffer(FILE *, char *, int); int setlinebuf(FILE *); ==== //depot/projects/hammer/lib/Makefile#54 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.209 2005/12/29 14:40:20 dfr Exp $ +# $FreeBSD: src/lib/Makefile,v 1.210 2006/01/25 11:24:37 cognet Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -26,7 +26,7 @@ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ - libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ + libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \ libgssapi ${_libio} libipsec \ libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \ @@ -68,10 +68,6 @@ _libc_r= .endif -.if ${MACHINE_ARCH} != "arm" -_libdisk= libdisk -.endif - .if ${MACHINE_ARCH} == "alpha" _libio= libio .endif ==== //depot/projects/hammer/lib/libarchive/Makefile#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.44 2006/01/18 06:26:42 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.45 2006/01/26 05:28:56 kientzle Exp $ # This Makefile is for use with the FreeBSD buid system. For # non-FreeBSD systems, you should first "make distfile" on FreeBSD, @@ -68,6 +68,7 @@ archive_read_support_format_cpio.c \ archive_read_support_format_iso9660.c \ archive_read_support_format_tar.c \ + archive_read_support_format_tp.c \ archive_read_support_format_zip.c \ archive_string.c \ archive_string_sprintf.c \ ==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_tp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tp.c,v 1.1 2006/01/17 03:40:42 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tp.c,v 1.2 2006/01/26 05:28:56 kientzle Exp $"); #include @@ -274,6 +274,7 @@ struct stat st; struct tp *tp; struct file_info *file; + const void *v; const char *p; ssize_t bytes_read; int r; @@ -283,8 +284,7 @@ /* Read the entire TOC first. */ if (!tp->toc_read) { /* Skip the initial block. */ - bytes_read = (a->compression_read_ahead)(a, - (const void **)&p, 512); + bytes_read = (a->compression_read_ahead)(a, &v, 512); if (bytes_read < 512) return (ARCHIVE_FATAL); bytes_read = 512; @@ -294,12 +294,13 @@ /* Consume TOC entries. */ do { bytes_read = (a->compression_read_ahead)(a, - (const void **)&p, tp->toc_size); + &v, tp->toc_size); if (bytes_read < tp->toc_size) return (ARCHIVE_FATAL); bytes_read = tp->toc_size; tp->current_position += bytes_read; (a->compression_read_consume)(a, bytes_read); + p = (const char *)v; file = (*tp->parse_file_info)(a, p); if (file != NULL) add_entry(tp, file); ==== //depot/projects/hammer/lib/libc/gen/getttyent.c#3 (text+ko) ==== @@ -35,19 +35,25 @@ static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.13 2005/07/25 17:57:15 mdodd Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.15 2006/01/26 11:15:08 pjd Exp $"); #include #include #include #include #include +#include +#include static char zapchar; static FILE *tf; +static int maxpts = 0; +static int curpts = 0; +static int pts_valid = 0; static size_t lbsize; static char *line; +#define PTS "pts/" #define MALLOCCHUNK 100 static char *skip(char *); @@ -73,6 +79,7 @@ getttyent() { static struct ttyent tty; + static char devpts_name[] = "pts/4294967295"; char *p; int c; size_t i; @@ -80,8 +87,19 @@ if (!tf && !setttyent()) return (NULL); for (;;) { - if (!fgets(p = line, lbsize, tf)) + if (!fgets(p = line, lbsize, tf)) { + if (pts_valid == 1 && curpts <= maxpts) { + sprintf(devpts_name, "pts/%d", curpts++); + tty.ty_name = devpts_name; + tty.ty_getty = tty.ty_type = NULL; + tty.ty_status = TTY_NETWORK; + tty.ty_window = NULL; + tty.ty_comment = NULL; + tty.ty_group = _TTYS_NOGROUP; + return (&tty); + } return (NULL); + } /* extend buffer if line was too big, and retry */ while (!index(p, '\n')) { i = strlen(p); @@ -209,12 +227,29 @@ int setttyent() { + DIR *devpts_dir; if (line == NULL) { if ((line = malloc(MALLOCCHUNK)) == NULL) return (0); lbsize = MALLOCCHUNK; } + devpts_dir = opendir(_PATH_DEV PTS); + if (devpts_dir) { + struct dirent *dp; + + while ((dp = readdir(devpts_dir))) { + if (strcmp(dp->d_name, ".") != 0 && + strcmp(dp->d_name, "..") != 0) { + if (atoi(dp->d_name) > maxpts) { + maxpts = atoi(dp->d_name); + pts_valid = 1; + curpts = 0; + } + } + } + closedir(devpts_dir); + } if (tf) { rewind(tf); return (1); @@ -228,6 +263,7 @@ { int rval; + pts_valid = 0; /* * NB: Don't free `line' because getttynam() * may still be referencing it ==== //depot/projects/hammer/lib/libc/stdio/Makefile.inc#14 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 4/17/94 -# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.34 2005/12/16 18:56:38 phk Exp $ +# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.35 2006/01/25 12:45:24 phk Exp $ # stdio sources .PATH: ${.CURDIR}/stdio @@ -24,7 +24,8 @@ wsetup.c SRCS+= xprintf.c xprintf_float.c xprintf_int.c xprintf_str.c -SRCS+= xprintf_hexdump.c xprintf_time.c xprintf_vis.c +SRCS+= xprintf_errno.c xprintf_hexdump.c xprintf_quote.c +SRCS+= xprintf_time.c xprintf_vis.c MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \ flockfile.3 \ ==== //depot/projects/hammer/lib/libc/stdio/xprintf.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.1 2005/12/16 18:56:38 phk Exp $ + * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.2 2006/01/25 12:45:24 phk Exp $ */ #include @@ -655,6 +655,16 @@ __printf_render_hexdump, __printf_arginfo_hexdump); break; + case 'M': + register_printf_render(*specs, + __printf_render_errno, + __printf_arginfo_errno); + break; + case 'Q': + register_printf_render(*specs, + __printf_render_quote, + __printf_arginfo_quote); + break; case 'T': register_printf_render(*specs, __printf_render_time, ==== //depot/projects/hammer/lib/libc/stdio/xprintf_vis.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/stdio/xprintf_vis.c,v 1.1 2005/12/16 18:56:39 phk Exp $ + * $FreeBSD: src/lib/libc/stdio/xprintf_vis.c,v 1.2 2006/01/25 12:45:24 phk Exp $ */ #include @@ -54,6 +54,8 @@ ret = 0; p = *((char **)arg[0]); + if (p == NULL) + return (__printf_out(io, pi, "(null)", 6)); if (pi->prec >= 0) l = pi->prec; else ==== //depot/projects/hammer/lib/libc/stdlib/grantpt.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ #include #ifndef lint -__FBSDID("$FreeBSD: src/lib/libc/stdlib/grantpt.c,v 1.4 2005/07/07 17:48:40 marcus Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/grantpt.c,v 1.6 2006/01/29 00:02:57 cognet Exp $"); #endif /* not lint */ #include "namespace.h" @@ -41,6 +41,8 @@ #include #include #include +#include +#include #include #include @@ -56,6 +58,8 @@ #define PTM_PREFIX "pty" /* pseudo tty master naming convention */ #define PTS_PREFIX "tty" /* pseudo tty slave naming convention */ +#define NEWPTS_PREFIX "pts/" +#define PTMX "ptmx" /* * The following are range values for pseudo TTY devices. Pseudo TTYs have a @@ -78,6 +82,34 @@ minor((x).st_rdev) >= 0 && \ minor((x).st_rdev) < PT_MAX) + +static int +is_pts(int fd) +{ + int nb; + + return (_ioctl(fd, TIOCGPTN, &nb) == 0); +} + +int +__use_pts(void) +{ + int use_pts; + size_t len; + int error; + + len = sizeof(use_pts); + error = sysctlbyname("kern.pts.enable", &use_pts, &len, NULL, 0); + if (error) { + struct stat sb; + + if (stat("/dev/ptmx", &sb) != 0) + return (0); + use_pts = 1; + } + return (use_pts); +} + /* * grantpt(): grant ownership of a slave pseudo-terminal device to the * current user. @@ -180,6 +212,10 @@ if (oflag & ~(O_RDWR | O_NOCTTY)) errno = EINVAL; else { + if (__use_pts()) { + fildes = _open(_PATH_DEV PTMX, oflag); + return (fildes); + } mc1 = master + strlen(_PATH_DEV PTM_PREFIX); mc2 = mc1 + 1; @@ -214,6 +250,7 @@ ptsname(int fildes) { static char slave[] = _PATH_DEV PTS_PREFIX "XY"; + static char new_slave[] = _PATH_DEV NEWPTS_PREFIX "4294967295"; char *retval; struct stat sbuf; @@ -223,11 +260,19 @@ if (!ISPTM(sbuf)) errno = EINVAL; else { - (void)snprintf(slave, sizeof(slave), - _PATH_DEV PTS_PREFIX "%s", - devname(sbuf.st_rdev, S_IFCHR) + - strlen(PTM_PREFIX)); - retval = slave; + if (!is_pts(fildes)) { + (void)snprintf(slave, sizeof(slave), + _PATH_DEV PTS_PREFIX "%s", + devname(sbuf.st_rdev, S_IFCHR) + + strlen(PTM_PREFIX)); + retval = slave; + } else { + (void)snprintf(new_slave, sizeof(new_slave), + _PATH_DEV NEWPTS_PREFIX "%s", + devname(sbuf.st_rdev, S_IFCHR) + + strlen(PTM_PREFIX)); + retval = new_slave; + } } } ==== //depot/projects/hammer/lib/libc/stdlib/malloc.c#22 (text+ko) ==== @@ -133,10 +133,19 @@ /******************************************************************************/ -#define MALLOC_DEBUG +/* + * In order to disable various extra features that may have negative + * performance impacts, (assertions, expanded statistics, redzones), define + * NO_MALLOC_EXTRAS. + */ +/* #define NO_MALLOC_EXTRAS */ + +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_DEBUG +#endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.103 2006/01/23 03:32:38 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.110 2006/01/27 07:46:22 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -176,13 +185,16 @@ * Calculate statistics that can be used to get an idea of how well caching is * working. */ -#define MALLOC_STATS -#define MALLOC_STATS_ARENAS +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_STATS >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 30 23:02:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6784516A423; Mon, 30 Jan 2006 23:02:25 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1098E16A420 for ; Mon, 30 Jan 2006 23:02:25 +0000 (GMT) (envelope-from dunstan@zsno.ids.czest.pl) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93FFB43D58 for ; Mon, 30 Jan 2006 23:02:24 +0000 (GMT) (envelope-from dunstan@zsno.ids.czest.pl) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0UN2OIq064992 for ; Mon, 30 Jan 2006 23:02:24 GMT (envelope-from dunstan@zsno.ids.czest.pl) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0UN2Orn064989 for perforce@freebsd.org; Mon, 30 Jan 2006 23:02:24 GMT (envelope-from dunstan@zsno.ids.czest.pl) Date: Mon, 30 Jan 2006 23:02:24 GMT Message-Id: <200601302302.k0UN2Orn064989@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dunstan@zsno.ids.czest.pl using -f From: "Wojciech A. Koszek" To: Perforce Change Reviews Cc: Subject: PERFORCE change 90738 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 23:02:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=90738 Change 90738 by dunstan@dunstan_dunstan on 2006/01/30 23:01:25 Fix typo in comment. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#2 (text+ko) ==== @@ -902,7 +902,7 @@ } /* - * audit_syscall_enter() is called on entry to eatch system call. It is + * audit_syscall_enter() is called on entry to each system call. It is * responsible for deciding whether or not to audit the call (preselection), * and if so, allocating a per-thread audit record. audit_new() will fill in * basic thread/credential properties. From owner-p4-projects@FreeBSD.ORG Mon Jan 30 23:10:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C90816A423; Mon, 30 Jan 2006 23:10:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1611516A420 for ; Mon, 30 Jan 2006 23:10:41 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D91D343D79 for ; Mon, 30 Jan 2006 23:10:34 +0000 (GMT) (envelope-from peter@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 k0UNAYY9065372 for ; Mon, 30 Jan 2006 23:10:34 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0UNAY5a065369 for perforce@freebsd.org; Mon, 30 Jan 2006 23:10:34 GMT (envelope-from peter@freebsd.org) Date: Mon, 30 Jan 2006 23:10:34 GMT Message-Id: <200601302310.k0UNAY5a065369@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 90739 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 23:10:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=90739 Change 90739 by peter@peter_daintree on 2006/01/30 23:09:56 Integrate -b i386_hammer (state sync) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/trap.c#87 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#87 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jan 30 23:42:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9ACB616A423; Mon, 30 Jan 2006 23:42:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5893916A420 for ; Mon, 30 Jan 2006 23:42:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B4FD43D53 for ; Mon, 30 Jan 2006 23:42:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0UNgI1b068448 for ; Mon, 30 Jan 2006 23:42:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0UNgI1B068443 for perforce@freebsd.org; Mon, 30 Jan 2006 23:42:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 Jan 2006 23:42:18 GMT Message-Id: <200601302342.k0UNgI1B068443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 23:42:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=90741 Change 90741 by rwatson@rwatson_zoo on 2006/01/30 23:41:37 Allow comments in /etc/security/audit_event. A good idea if we ship a demo audit_event file with comments in it. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#10 $ */ #include @@ -133,21 +133,29 @@ if ((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) return (NULL); - if (fgets(linestr, AU_LINE_MAX, fp) == NULL) - return (NULL); + while (1) { + if (fgets(linestr, AU_LINE_MAX, fp) == NULL) + return (NULL); + + /* Remove new lines. */ + if ((nl = strrchr(linestr, '\n')) != NULL) + *nl = '\0'; - /* Remove new lines. */ - if ((nl = strrchr(linestr, '\n')) != NULL) - *nl = '\0'; + /* Skip comments. */ + if (linestr[0] == '#') + continue; - /* - * Get the next event structure. - * - * XXXRW: Perhaps we should keep reading lines until we find a valid - * one, rather than stopping when we hit an invalid one? - */ - if (eventfromstr(linestr, e) == NULL) - return (NULL); + /* + * Get the next event structure. + * + * XXXRW: Perhaps we should keep reading lines until we find + * a valid one, rather than stopping when we hit an invalid + * one? + */ + if (eventfromstr(linestr, e) == NULL) + return (NULL); + break; + } return (e); } From owner-p4-projects@FreeBSD.ORG Mon Jan 30 23:43:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44DF016A423; Mon, 30 Jan 2006 23:43:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0855F16A420 for ; Mon, 30 Jan 2006 23:43:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF61243D55 for ; Mon, 30 Jan 2006 23:43:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0UNhKIK068482 for ; Mon, 30 Jan 2006 23:43:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0UNhKL3068479 for perforce@freebsd.org; Mon, 30 Jan 2006 23:43:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 Jan 2006 23:43:20 GMT Message-Id: <200601302343.k0UNhKL3068479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 23:43:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=90742 Change 90742 by rwatson@rwatson_zoo on 2006/01/30 23:42:19 Audit vnode information in fstatfs() after acquiring Giant, not before. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#21 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#21 (text+ko) ==== @@ -329,17 +329,16 @@ if (error) return (error); + mp = fp->f_vnode->v_mount; + fdrop(fp, td); + if (mp == NULL) + return (EBADF); + mtx_lock(&Giant); #ifdef AUDIT vn_lock(fp->f_vnode, LK_EXCLUSIVE | LK_RETRY, td); AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1); VOP_UNLOCK(fp->f_vnode, 0, td); #endif - - mp = fp->f_vnode->v_mount; - fdrop(fp, td); - if (mp == NULL) - return (EBADF); - mtx_lock(&Giant); #ifdef MAC error = mac_check_mount_stat(td->td_ucred, mp); if (error) { From owner-p4-projects@FreeBSD.ORG Mon Jan 30 23:43:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4A9116A44F; Mon, 30 Jan 2006 23:43:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5942D16A427 for ; Mon, 30 Jan 2006 23:43:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A4E443D70 for ; Mon, 30 Jan 2006 23:43:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0UNhLqL068488 for ; Mon, 30 Jan 2006 23:43:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0UNhK2V068485 for perforce@freebsd.org; Mon, 30 Jan 2006 23:43:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 Jan 2006 23:43:20 GMT Message-Id: <200601302343.k0UNhK2V068485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90743 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 23:43:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=90743 Change 90743 by rwatson@rwatson_zoo on 2006/01/30 23:42:57 Integrate change to support comments in /etc/audit_event from the TrustedBSD OpenBSM branch to the TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#7 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#7 $ */ #include @@ -133,21 +133,29 @@ if ((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) return (NULL); - if (fgets(linestr, AU_LINE_MAX, fp) == NULL) - return (NULL); + while (1) { + if (fgets(linestr, AU_LINE_MAX, fp) == NULL) + return (NULL); + + /* Remove new lines. */ + if ((nl = strrchr(linestr, '\n')) != NULL) + *nl = '\0'; - /* Remove new lines. */ - if ((nl = strrchr(linestr, '\n')) != NULL) - *nl = '\0'; + /* Skip comments. */ + if (linestr[0] == '#') + continue; - /* - * Get the next event structure. - * - * XXXRW: Perhaps we should keep reading lines until we find a valid - * one, rather than stopping when we hit an invalid one? - */ - if (eventfromstr(linestr, e) == NULL) - return (NULL); + /* + * Get the next event structure. + * + * XXXRW: Perhaps we should keep reading lines until we find + * a valid one, rather than stopping when we hit an invalid + * one? + */ + if (eventfromstr(linestr, e) == NULL) + return (NULL); + break; + } return (e); } From owner-p4-projects@FreeBSD.ORG Tue Jan 31 00:07:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C42016A423; Tue, 31 Jan 2006 00:07:52 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD1B616A420 for ; Tue, 31 Jan 2006 00:07:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3C5B43D46 for ; Tue, 31 Jan 2006 00:07:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V07pwR069618 for ; Tue, 31 Jan 2006 00:07:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V07p4c069615 for perforce@freebsd.org; Tue, 31 Jan 2006 00:07:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 00:07:51 GMT Message-Id: <200601310007.k0V07p4c069615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 00:07:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=90745 Change 90745 by rwatson@rwatson_peppercorn on 2006/01/31 00:07:15 By default, audit a more limited set of system calls and events. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_control#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_control#3 (text+ko) ==== @@ -1,7 +1,7 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#3 $ # dir:/var/audit -flags:lo,ad,-all,^-fa,^-fc,^-cl +flags:lo minfree:20 naflags:lo From owner-p4-projects@FreeBSD.ORG Tue Jan 31 00:48:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE59316A423; Tue, 31 Jan 2006 00:48:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86B0116A420 for ; Tue, 31 Jan 2006 00:48:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4441543D49 for ; Tue, 31 Jan 2006 00:48:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V0mgZm078576 for ; Tue, 31 Jan 2006 00:48:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V0mfw8078573 for perforce@freebsd.org; Tue, 31 Jan 2006 00:48:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 00:48:41 GMT Message-Id: <200601310048.k0V0mfw8078573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90748 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 00:48:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=90748 Change 90748 by rwatson@rwatson_peppercorn on 2006/01/31 00:48:19 Update APSL->BSD license for auditd.c, missed in an earlier pass. Submitted by: Apple Computer, Inc. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#14 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#14 (text+ko) ==== @@ -1,25 +1,34 @@ /* - * Copyright (c) 2004 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004 Apple Computer, Inc. + * All rights reserved. * - * @APPLE_LICENSE_HEADER_START@ + * @APPLE_BSD_LICENSE_HEADER_START@ + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * "Portions Copyright (c) 2004 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_BSD_LICENSE_HEADER_END@ */ #include From owner-p4-projects@FreeBSD.ORG Tue Jan 31 00:49:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FFC516A424; Tue, 31 Jan 2006 00:49:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51ED616A420 for ; Tue, 31 Jan 2006 00:49:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0262243D49 for ; Tue, 31 Jan 2006 00:49:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V0nhgT078603 for ; Tue, 31 Jan 2006 00:49:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V0nh1x078600 for perforce@freebsd.org; Tue, 31 Jan 2006 00:49:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 00:49:43 GMT Message-Id: <200601310049.k0V0nh1x078600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90749 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 00:49:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=90749 Change 90749 by rwatson@rwatson_peppercorn on 2006/01/31 00:49:39 Import Apple's auditd, as found in audit3/contrib/audit_supt/auditd, into OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditd/rc.audit#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jan 31 01:15:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8BE416A423; Tue, 31 Jan 2006 01:15:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A1AB016A420 for ; Tue, 31 Jan 2006 01:15:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50FFB43D48 for ; Tue, 31 Jan 2006 01:15:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V1FFp4080435 for ; Tue, 31 Jan 2006 01:15:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V1FEUJ080432 for perforce@freebsd.org; Tue, 31 Jan 2006 01:15:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 01:15:14 GMT Message-Id: <200601310115.k0V1FEUJ080432@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 01:15:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=90750 Change 90750 by rwatson@rwatson_peppercorn on 2006/01/31 01:14:40 Makefile for auditd. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jan 31 01:17:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA4CD16A424; Tue, 31 Jan 2006 01:17:18 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D1AE16A420 for ; Tue, 31 Jan 2006 01:17:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A81443D49 for ; Tue, 31 Jan 2006 01:17:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V1HIoc080534 for ; Tue, 31 Jan 2006 01:17:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V1HH5w080531 for perforce@freebsd.org; Tue, 31 Jan 2006 01:17:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 01:17:17 GMT Message-Id: <200601310117.k0V1HH5w080531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90751 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 01:17:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=90751 Change 90751 by rwatson@rwatson_peppercorn on 2006/01/31 01:17:12 Define SRCS so audit_warn.c is also built. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#2 (text+ko) ==== @@ -1,9 +1,10 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#2 $ # CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. PROG= auditd +SRCS= audit_warn.c auditd.c MAN= auditd.8 DPADD= /usr/lib/libbsm.a LDADD= -lbsm From owner-p4-projects@FreeBSD.ORG Tue Jan 31 01:20:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 214F516A426; Tue, 31 Jan 2006 01:20:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A432016A420 for ; Tue, 31 Jan 2006 01:20:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8131343D5A for ; Tue, 31 Jan 2006 01:20:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V1KMhf080742 for ; Tue, 31 Jan 2006 01:20:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V1KMm9080739 for perforce@freebsd.org; Tue, 31 Jan 2006 01:20:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 01:20:22 GMT Message-Id: <200601310120.k0V1KMm9080739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90752 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 01:20:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=90752 Change 90752 by rwatson@rwatson_peppercorn on 2006/01/31 01:19:40 style(9), staticize some functions. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#2 (text+ko) ==== @@ -36,36 +36,44 @@ #include "auditd.h" -/* Write to the audit log. */ -static int auditwarnlog(char *args[]) +/* + * Write to the audit log. + */ +static int +auditwarnlog(char *args[]) { char *loc_args[9]; + pid_t pid; int i; - pid_t pid; loc_args[0] = AUDITWARN_SCRIPT; - for (i = 0; args[i] != NULL && i < 8; i++) { + for (i = 0; args[i] != NULL && i < 8; i++) loc_args[i+1] = args[i]; - } loc_args[i+1] = NULL; pid = fork(); - if (pid == 0) { // child + if (pid == -1) + return (-1); + if (pid == 0) { + /* + * Child. + */ execv(AUDITWARN_SCRIPT, loc_args); syslog(LOG_ERR, "Could not exec %s\n", AUDITWARN_SCRIPT); - exit (1); // if we reach here, the exec failed - } else if (pid == -1) { - return -1; - } else { // parent - return 0; + exit(1); } + /* + * Parent. + */ + return (0); } /* - * Indicates that the hard limit for all filesystems - * has been exceeded count times + * Indicates that the hard limit for all filesystems has been exceeded count + * times. */ -int audit_warn_allhard(int count) +int +audit_warn_allhard(int count) { char intstr[12]; char *args[3]; @@ -76,61 +84,62 @@ args[1] = intstr; args[2] = NULL; - return auditwarnlog(args); + return (auditwarnlog(args)); } /* - * Indicates that the soft limit for all filesystems - * has been exceeded + * Indicates that the soft limit for all filesystems has been exceeded. */ -int audit_warn_allsoft() +int +audit_warn_allsoft(void) { char *args[2]; args[0] = SOFTLIM_ALL_WARN; args[1] = NULL; - return auditwarnlog(args); + return (auditwarnlog(args)); } /* - * Indicates that someone other than the audit daemon - * turned off auditing - * XXX Its not clear at this point how this function will - * XXX be invoked + * Indicates that someone other than the audit daemon turned off auditing. + * XXX Its not clear at this point how this function will be invoked. + * XXXRW: This function is not used. */ -int audit_warn_auditoff() +int +audit_warn_auditoff(void) { char *args[2]; args[0] = AUDITOFF_WARN; args[1] = NULL; - return auditwarnlog(args); + return (auditwarnlog(args)); } /* * Indicates that the audit deammn is already running */ -int audit_warn_ebusy() +int +audit_warn_ebusy(void) { char *args[2]; args[0] = EBUSY_WARN; args[1] = NULL; - return auditwarnlog(args); - + return (auditwarnlog(args)); } /* - * Indicates that there is a problem getting the directory - * from audit_control + * Indicates that there is a problem getting the directory from + * audit_control. * - * XXX Note that we take the filename instead of a count - * XXX as the argument here (different from BSM) + * XXX Note that we take the filename instead of a count as the argument here + * (different from BSM). */ -int audit_warn_getacdir(char *filename) +int +audit_warn_getacdir(char *filename) { char *args[3]; @@ -138,15 +147,14 @@ args[1] = filename; args[2] = NULL; - return auditwarnlog(args); + return (auditwarnlog(args)); } - /* - * Indicates that the hard limit for this file has been - * exceeded + * Indicates that the hard limit for this file has been exceeded. */ -int audit_warn_hard(char *filename) +int +audit_warn_hard(char *filename) { char *args[3]; @@ -154,42 +162,43 @@ args[1] = filename; args[2] = NULL; - return auditwarnlog(args); - + return (auditwarnlog(args)); } /* - * Indicates that auditing could not be started + * Indicates that auditing could not be started. */ -int audit_warn_nostart() +int +audit_warn_nostart(void) { char *args[2]; args[0] = NOSTART_WARN; args[1] = NULL; - return auditwarnlog(args); + return (auditwarnlog(args)); } /* - * Indicaes that an error occrred during the orderly shutdown - * of the audit daemon + * Indicaes that an error occrred during the orderly shutdown of the audit + * daemon. */ -int audit_warn_postsigterm() +int +audit_warn_postsigterm(void) { char *args[2]; args[0] = POSTSIGTERM_WARN; args[1] = NULL; - return auditwarnlog(args); + return (auditwarnlog(args)); } /* - * Indicates that the soft limit for this file has been - * exceeded + * Indicates that the soft limit for this file has been exceeded. */ -int audit_warn_soft(char *filename) +int +audit_warn_soft(char *filename) { char *args[3]; @@ -197,20 +206,20 @@ args[1] = filename; args[2] = NULL; - return auditwarnlog(args); - + return (auditwarnlog(args)); } /* - * Indicates that the temporary audit file already exists - * indicating a fatal error + * Indicates that the temporary audit file already exists indicating a fatal + * error. */ -int audit_warn_tmpfile() +int +audit_warn_tmpfile(void) { char *args[2]; args[0] = TMPFILE_WARN; args[1] = NULL; - return auditwarnlog(args); + return (auditwarnlog(args)); } ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#2 (text+ko) ==== @@ -61,19 +61,24 @@ static int allhardcount = 0; static int triggerfd = 0; -TAILQ_HEAD(, dir_ent) dir_q; +static TAILQ_HEAD(, dir_ent) dir_q; -/* Error starting auditd */ -void fail_exit() +/* + * Error starting auditd + */ +static void +fail_exit(void) { + audit_warn_nostart(); exit(1); } /* - * Free our local list of directory names + * Free our local list of directory names. */ -void free_dir_q() +static void +free_dir_q() { struct dir_ent *dirent; @@ -85,30 +90,29 @@ } /* - * generate the timestamp string + * Generate the timestamp string. */ -int getTSstr(char *buf, int len) +static int +getTSstr(char *buf, int len) { struct timeval ts; struct timezone tzp; time_t tt; - if(gettimeofday(&ts, &tzp) != 0) { - return -1; - } + if (gettimeofday(&ts, &tzp) != 0) + return (-1); tt = (time_t)ts.tv_sec; - if(!strftime(buf, len, "%Y%m%d%H%M%S", gmtime(&tt))) { - return -1; - } - - return 0; + if (!strftime(buf, len, "%Y%m%d%H%M%S", gmtime(&tt))) + return (-1); + return (0); } /* - * Concat the directory name to the given file name + * Concat the directory name to the given file name. * XXX We should affix the hostname also */ -char *affixdir(char *name, struct dir_ent *dirent) +static char * +affixdir(char *name, struct dir_ent *dirent) { char *fn; char *curdir; @@ -117,59 +121,53 @@ curdir = dirent->dirname; syslog(LOG_INFO, "dir = %s\n", dirent->dirname); - fn = (char *) malloc (strlen(curdir) + strlen(sep) - + (2 * POSTFIX_LEN) + 1); - if(fn == NULL) { - return NULL; - } + fn = malloc(strlen(curdir) + strlen(sep) + (2 * POSTFIX_LEN) + 1); + if (fn == NULL) + return (NULL); strcpy(fn, curdir); strcat(fn, sep); strcat(fn, name); - - return fn; + return (fn); } -/* Close the previous audit trail file */ -int close_lastfile(char *TS) +/* + * Close the previous audit trail file. + */ +static int +close_lastfile(char *TS) { char *ptr; char *oldname; - if(lastfile != NULL) { + if (lastfile != NULL) { oldname = (char *)malloc(strlen(lastfile) + 1); - if(oldname == NULL) { - return -1; - } + if (oldname == NULL) + return (-1); strcpy(oldname, lastfile); - /* rename the last file -- append timestamp */ - - if((ptr = strstr(lastfile, NOT_TERMINATED)) != NULL) { + /* Rename the last file -- append timestamp. */ + if ((ptr = strstr(lastfile, NOT_TERMINATED)) != NULL) { *ptr = '.'; strcpy(ptr+1, TS); - if(rename(oldname, lastfile) != 0) { + if (rename(oldname, lastfile) != 0) syslog(LOG_ERR, "Could not rename %s to %s \n", - oldname, lastfile); - } - else { + oldname, lastfile); + else syslog(LOG_INFO, "renamed %s to %s \n", - oldname, lastfile); - } + oldname, lastfile); } - free(lastfile); free(oldname); - lastfile = NULL; } - - return 0; + return (0); } /* - * Create the new file name, swap with existing audit file + * Create the new file name, swap with existing audit file. */ -int swap_audit_file() +static int +swap_audit_file(void) { char timestr[2 * POSTFIX_LEN]; char *fn; @@ -177,19 +175,18 @@ struct dir_ent *dirent; int fd; - if(getTSstr(TS, POSTFIX_LEN) != 0) { - return -1; - } + if (getTSstr(TS, POSTFIX_LEN) != 0) + return (-1); strcpy(timestr, TS); strcat(timestr, NOT_TERMINATED); - /* try until we succeed */ - while((dirent = TAILQ_FIRST(&dir_q))) { - if((fn = affixdir(timestr, dirent)) == NULL) { + /* Try until we succeed. */ + while ((dirent = TAILQ_FIRST(&dir_q))) { + if ((fn = affixdir(timestr, dirent)) == NULL) { syslog(LOG_INFO, "Failed to swap log at time %s\n", timestr); - return -1; + return (-1); } /* @@ -198,77 +195,80 @@ */ syslog(LOG_INFO, "New audit file is %s\n", fn); fd = open(fn, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP); - if (fd < 0) { + if (fd < 0) perror("File open"); - } else if (auditctl(fn) != 0) { - syslog(LOG_ERR, - "auditctl failed setting log file! : %s\n", - strerror(errno)); + syslog(LOG_ERR, + "auditctl failed setting log file! : %s\n", + strerror(errno)); close(fd); - } - else { - /* Success */ + } else { + /* Success. */ close_lastfile(TS); lastfile = fn; close(fd); - return 0; + return (0); } - /* Tell the administrator about lack of permissions for dir */ + /* + * Tell the administrator about lack of permissions for dir. + */ audit_warn_getacdir(dirent->dirname); - /* Try again with a different directory */ + /* Try again with a different directory. */ TAILQ_REMOVE(&dir_q, dirent, dirs); free(dirent->dirname); free(dirent); } syslog(LOG_INFO, "Log directories exhausted\n"); - return -1; + return (-1); } /* - * Read the audit_control file contents + * Read the audit_control file contents. */ -int read_control_file() +static int +read_control_file(void) { char cur_dir[MAXNAMLEN]; struct dir_ent *dirent; au_qctrl_t qctrl; - /* Clear old values */ + /* + * Clear old values. Force a re-read of the file the next time. + */ free_dir_q(); - endac(); // force a re-read of the file the next time + endac(); - /* Read the list of directories into a local linked list */ - /* XXX We should use the reentrant interfaces once they are available */ - while(getacdir(cur_dir, MAXNAMLEN) >= 0) { - dirent = (struct dir_ent *) malloc (sizeof(struct dir_ent)); - if(dirent == NULL) { - return -1; - } - + /* + * Read the list of directories into a local linked list. + * + * XXX We should use the reentrant interfaces once they are + * available. + */ + while (getacdir(cur_dir, MAXNAMLEN) >= 0) { + dirent = (struct dir_ent *) malloc(sizeof(struct dir_ent)); + if (dirent == NULL) + return (-1); dirent->softlim = 0; - dirent->dirname = (char *) malloc (MAXNAMLEN); - if(dirent->dirname == NULL) { + dirent->dirname = (char *) malloc(MAXNAMLEN); + if (dirent->dirname == NULL) { free(dirent); - return -1; + return (-1); } - strcpy(dirent->dirname, cur_dir); TAILQ_INSERT_TAIL(&dir_q, dirent, dirs); } allhardcount = 0; - - if(swap_audit_file() == -1) { + if (swap_audit_file() == -1) { syslog(LOG_ERR, "Could not swap audit file\n"); /* * XXX Faulty directory listing? - user should be given * XXX an opportunity to change the audit_control file * XXX switch to a reduced mode of auditing? */ - return -1; + return (-1); } /* @@ -276,24 +276,22 @@ * XXX what should we do if a trigger for the earlier limit * XXX is generated here? */ - if(0 == (ret = getacmin(&minval))) { - + if (0 == (ret = getacmin(&minval))) { syslog(LOG_INFO, "min free = %d\n", minval); - if (auditon(A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) { - syslog(LOG_ERR, - "could not get audit queue settings\n"); - return -1; + syslog(LOG_ERR, + "could not get audit queue settings\n"); + return (-1); } qctrl.aq_minfree = minval; if (auditon(A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) { - syslog(LOG_ERR, - "could not set audit queue settings\n"); - return -1; + syslog(LOG_ERR, + "could not set audit queue settings\n"); + return (-1); } } - return 0; + return (0); } /* @@ -308,15 +306,15 @@ long cond; /* Generate an audit record */ - if((aufd = au_open()) == -1) { + if ((aufd = au_open()) == -1) { syslog(LOG_ERR, "Could not create audit shutdown event.\n"); } else { - if((tok = au_to_text("auditd::Audit shutdown")) != NULL) { + if ((tok = au_to_text("auditd::Audit shutdown")) != NULL) { au_write(aufd, tok); } - if(au_close(aufd, 1, AUE_audit_shutdown) == -1) { + if (au_close(aufd, 1, AUE_audit_shutdown) == -1) { syslog(LOG_ERR, "Could not close audit shutdown event.\n"); } } @@ -329,21 +327,21 @@ strerror(errno)); err_ret = 1; } - if(getTSstr(TS, POSTFIX_LEN) == 0) { + if (getTSstr(TS, POSTFIX_LEN) == 0) { close_lastfile(TS); } - if(lastfile != NULL) + if (lastfile != NULL) free(lastfile); free_dir_q(); - if((remove(AUDITD_PIDFILE) == -1) || err_ret) { + if ((remove(AUDITD_PIDFILE) == -1) || err_ret) { syslog(LOG_ERR, "Could not unregister\n"); audit_warn_postsigterm(); return (1); } endac(); - if(close(triggerfd) != 0) { + if (close(triggerfd) != 0) { syslog(LOG_ERR, "Error closing control file\n"); } syslog(LOG_INFO, "Finished.\n"); @@ -351,24 +349,29 @@ } /* - * When we get a signal, we are often not at a clean point. - * So, little can be done in the signal handler itself. Instead, - * we send a message to the main servicing loop to do proper - * handling from a non-signal-handler context. + * When we get a signal, we are often not at a clean point. So, little can + * be done in the signal handler itself. Instead, we send a message to the + * main servicing loop to do proper handling from a non-signal-handler + * context. + * + * XXXRW: I don't see that happening here. */ static void relay_signal(int signal) { } -/* registering the daemon */ -int register_daemon() +/* + * Registering the daemon. + */ +static int +register_daemon(void) { FILE * pidfile; int fd; pid_t pid; - /* Set up the signal hander */ + /* Set up the signal hander. */ if (signal(SIGTERM, relay_signal) == SIG_ERR) { syslog(LOG_ERR, "Could not set signal handler for SIGTERM\n"); @@ -384,37 +387,36 @@ syslog(LOG_ERR, "Could not open PID file\n"); audit_warn_tmpfile(); - return -1; + return (-1); } - /* attempt to lock the pid file; if a lock is present, exit */ + /* Attempt to lock the pid file; if a lock is present, exit. */ fd = fileno(pidfile); - if(flock(fd, LOCK_EX | LOCK_NB) < 0) { + if (flock(fd, LOCK_EX | LOCK_NB) < 0) { syslog(LOG_ERR, "PID file is locked (is another auditd running?).\n"); audit_warn_ebusy(); - return -1; + return (-1); } pid = getpid(); ftruncate(fd, 0); - if(fprintf(pidfile, "%u\n", pid) < 0) { - /* should not start the daemon */ + if (fprintf(pidfile, "%u\n", pid) < 0) { + /* Should not start the daemon. */ fail_exit(); } fflush(pidfile); - return 0; + return (0); } /* - * Suppress duplicate messages within a 30 second interval. - * This should be enough to time to rotate log files without - * thrashing from soft warnings generated before the log is - * actually rotated. + * Suppress duplicate messages within a 30 second interval. This should be + * enough to time to rotate log files without thrashing from soft warnings + * generated before the log is actually rotated. */ #define DUPLICATE_INTERVAL 30 -void +static void handle_audit_trigger(int trigger) { static int last_trigger; @@ -430,49 +432,47 @@ struct timezone tzp; time_t tt; - if(gettimeofday(&ts, &tzp) == 0) { + if (gettimeofday(&ts, &tzp) == 0) { tt = (time_t)ts.tv_sec; if ((trigger == last_trigger) && - (tt < (last_time + DUPLICATE_INTERVAL))) { + (tt < (last_time + DUPLICATE_INTERVAL))) return; - } last_trigger = trigger; last_time = tt; } /* - * Message processing is done here + * Message processing is done here. */ dirent = TAILQ_FIRST(&dir_q); switch(trigger) { case AUDIT_TRIGGER_LOW_SPACE: syslog(LOG_INFO, "Got low space trigger\n"); - if(dirent && (dirent->softlim != 1)) { + if (dirent && (dirent->softlim != 1)) { TAILQ_REMOVE(&dir_q, dirent, dirs); - /* add this node to the end of the list */ + /* Add this node to the end of the list. */ TAILQ_INSERT_TAIL(&dir_q, dirent, dirs); audit_warn_soft(dirent->dirname); dirent->softlim = 1; if (TAILQ_NEXT(TAILQ_FIRST(&dir_q), dirs) != NULL && - swap_audit_file() == -1) { + swap_audit_file() == -1) syslog(LOG_ERR, "Error swapping audit file\n"); - } /* - * check if the next dir has already reached its - * soft limit + * Check if the next dir has already reached its soft + * limit. */ dirent = TAILQ_FIRST(&dir_q); - if(dirent->softlim == 1) { - /* all dirs have reached their soft limit */ + if (dirent->softlim == 1) { + /* All dirs have reached their soft limit. */ audit_warn_allsoft(); } } else { /* - * Continue auditing to the current file - * Also generate an allsoft warning + * Continue auditing to the current file. Also + * generate an allsoft warning. * XXX do we want to do this ? */ audit_warn_allsoft(); @@ -482,46 +482,46 @@ case AUDIT_TRIGGER_NO_SPACE: syslog(LOG_INFO, "Got no space trigger\n"); - /* delete current dir, go on to next */ + /* Delete current dir, go on to next. */ TAILQ_REMOVE(&dir_q, dirent, dirs); audit_warn_hard(dirent->dirname); free(dirent->dirname); free(dirent); - if(swap_audit_file() == -1) + if (swap_audit_file() == -1) syslog(LOG_ERR, "Error swapping audit file\n"); - /* We are out of log directories */ + /* We are out of log directories. */ audit_warn_allhard(++allhardcount); - break; - case AUDIT_TRIGGER_OPEN_NEW : + case AUDIT_TRIGGER_OPEN_NEW: + /* + * Create a new file and swap with the one being used in + * kernel + */ syslog(LOG_INFO, "Got open new trigger\n"); - /* create a new file and swap with the one being - * used in kernel */ - if(swap_audit_file() == -1) + if (swap_audit_file() == -1) syslog(LOG_ERR, "Error swapping audit file\n"); break; - case AUDIT_TRIGGER_READ_FILE : + case AUDIT_TRIGGER_READ_FILE: syslog(LOG_INFO, "Got read file trigger\n"); - if(read_control_file() == -1) { - syslog(LOG_ERR, "Error in audit control file\n"); - } + if (read_control_file() == -1) + syslog(LOG_ERR, "Error in audit control file\n"); break; - default : + default: syslog(LOG_ERR, "Got unknown trigger %d\n", trigger); break; } - return; } /* * Read the control file for triggers and handle appropriately. */ -int wait_for_triggers() +static int +wait_for_triggers(void) { int num; unsigned int trigger; @@ -542,7 +542,7 @@ else handle_audit_trigger(trigger); } - return(close_all()); + return (close_all()); } /* @@ -555,15 +555,13 @@ int wstatus; while ((child = waitpid(-1, &wstatus, WNOHANG)) > 0) { - if (wstatus) { - syslog(LOG_INFO, "warn process [pid=%d] %s %d.\n", child, - ((WIFEXITED(wstatus)) ? - "exited with non-zero status" : - "exited as a result of signal"), - ((WIFEXITED(wstatus)) ? - WEXITSTATUS(wstatus) : - WTERMSIG(wstatus))); - } + if (!wstatus) + continue; + syslog(LOG_INFO, "warn process [pid=%d] %s %d.\n", child, + ((WIFEXITED(wstatus)) ? "exited with non-zero status" : + "exited as a result of signal"), + ((WIFEXITED(wstatus)) ? WEXITSTATUS(wstatus) : + WTERMSIG(wstatus))); } } @@ -571,7 +569,8 @@ * Configure the audit controls in the kernel: the event to class mapping, * kernel preselection mask, etc. */ -int config_audit_controls(long flags) +static int +config_audit_controls(long flags) { au_event_ent_t ev, *evp; au_evclass_map_t evc_map; @@ -579,14 +578,14 @@ int ctr = 0; char naeventstr[NA_EVENT_STR_SIZE]; - /* Process the audit event file, obtaining a class mapping for each + /* + * Process the audit event file, obtaining a class mapping for each * event, and send that mapping into the kernel. * XXX There's a risk here that the BSM library will return NULL * for an event when it can't properly map it to a class. In that * case, we will not process any events beyond the one that failed, * but should. We need a way to get a count of the events. */ - ev.ae_name = (char *)malloc(AU_EVENT_NAME_MAX); ev.ae_desc = (char *)malloc(AU_EVENT_DESC_MAX); if ((ev.ae_name == NULL) || (ev.ae_desc == NULL)) { @@ -595,17 +594,16 @@ return (-1); } evp = &ev; - while((evp = getauevent_r(evp)) != NULL) { + while ((evp = getauevent_r(evp)) != NULL) { evc_map.ec_number = evp->ae_number; evc_map.ec_class = evp->ae_class; - if (auditon(A_SETCLASS, &evc_map, - sizeof(au_evclass_map_t)) != 0) { + if (auditon(A_SETCLASS, &evc_map, sizeof(au_evclass_map_t)) + != 0) syslog(LOG_ERR, "Failed to register class mapping for event %s", evp->ae_name); - } else { + else ctr++; - } } endauevent(); free(ev.ae_name); @@ -613,37 +611,36 @@ if (ctr == 0) syslog(LOG_ERR, "No events to class mappings registered."); else - syslog(LOG_INFO, "Registered %d event to class mappings.", ctr); + syslog(LOG_INFO, "Registered %d event to class mappings.", + ctr); - /* Get the non-attributable event string and set the kernel mask - * from that. + /* + * Get the non-attributable event string and set the kernel mask from + * that. */ - if ((getacna(naeventstr, NA_EVENT_STR_SIZE) == 0) - && ( getauditflagsbin(naeventstr, &aumask) == 0)) { - - if (auditon(A_SETKMASK, &aumask, sizeof(au_mask_t))){ + if ((getacna(naeventstr, NA_EVENT_STR_SIZE) == 0) && + (getauditflagsbin(naeventstr, &aumask) == 0)) { + if (auditon(A_SETKMASK, &aumask, sizeof(au_mask_t))) syslog(LOG_ERR, - "Failed to register non-attributable event mask."); - } else { - syslog(LOG_INFO, "Registered non-attributable event mask."); - } - - } else { - syslog(LOG_ERR,"Failed to obtain non-attributable event mask."); - } + "Failed to register non-attributable event mask."); + else + syslog(LOG_INFO, + "Registered non-attributable event mask."); + } else + syslog(LOG_ERR, + "Failed to obtain non-attributable event mask."); /* * Set the audit policy flags based on passed in parameter values. */ - if (auditon(A_SETPOLICY, &flags, sizeof(flags))) { - syslog(LOG_ERR, - "Failed to set audit policy."); - } + if (auditon(A_SETPOLICY, &flags, sizeof(flags))) + syslog(LOG_ERR, "Failed to set audit policy."); - return 0; + return (0); } -void setup(long flags) +static void +setup(long flags) { int aufd; token_t *tok; @@ -654,34 +651,30 @@ } TAILQ_INIT(&dir_q); - - if(read_control_file() == -1) { + if (read_control_file() == -1) { syslog(LOG_ERR, "Error reading control file\n"); fail_exit(); } - /* Generate an audit record */ - if((aufd = au_open()) == -1) { + /* Generate an audit record. */ + if ((aufd = au_open()) == -1) syslog(LOG_ERR, "Could not create audit startup event.\n"); - } else { - - if((tok = au_to_text("auditd::Audit startup")) != NULL) { + else { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 31 01:23:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 392FF16A423; Tue, 31 Jan 2006 01:23:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED21716A420 for ; Tue, 31 Jan 2006 01:23:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AFC5743D45 for ; Tue, 31 Jan 2006 01:23:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V1NQ9u081465 for ; Tue, 31 Jan 2006 01:23:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V1NQP4081462 for perforce@freebsd.org; Tue, 31 Jan 2006 01:23:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 01:23:26 GMT Message-Id: <200601310123.k0V1NQP4081462@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90753 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 01:23:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=90753 Change 90753 by rwatson@rwatson_peppercorn on 2006/01/31 01:22:49 Correct an inaccurate comment: we send audit log errors to the system log, not the audit log, for obvious reasons. Log errno information when exec() fails. Fix formatting. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include "auditd.h" /* - * Write to the audit log. + * Write an audit-related error to the system log via syslog(3). */ static int auditwarnlog(char *args[]) @@ -59,7 +59,8 @@ * Child. */ execv(AUDITWARN_SCRIPT, loc_args); - syslog(LOG_ERR, "Could not exec %s\n", AUDITWARN_SCRIPT); + syslog(LOG_ERR, "Could not exec %s (%m)\n", + AUDITWARN_SCRIPT); exit(1); } /* @@ -104,6 +105,7 @@ /* * Indicates that someone other than the audit daemon turned off auditing. * XXX Its not clear at this point how this function will be invoked. + * * XXXRW: This function is not used. */ int From owner-p4-projects@FreeBSD.ORG Tue Jan 31 01:26:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CB9016A423; Tue, 31 Jan 2006 01:26:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5100916A420 for ; Tue, 31 Jan 2006 01:26:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF38043D45 for ; Tue, 31 Jan 2006 01:26:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V1QUf4082273 for ; Tue, 31 Jan 2006 01:26:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V1QUTE082270 for perforce@freebsd.org; Tue, 31 Jan 2006 01:26:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 01:26:30 GMT Message-Id: <200601310126.k0V1QUTE082270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90754 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 01:26:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=90754 Change 90754 by rwatson@rwatson_peppercorn on 2006/01/31 01:25:44 A few missed instances that required style(9). Staticize one more function. This file is really long. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#3 (text+ko) ==== @@ -53,15 +53,15 @@ #include #include "auditd.h" -#define NA_EVENT_STR_SIZE 25 -static int ret, minval; -static char *lastfile = NULL; +#define NA_EVENT_STR_SIZE 25 -static int allhardcount = 0; -static int triggerfd = 0; +static int ret, minval; +static char *lastfile = NULL; +static int allhardcount = 0; +static int triggerfd = 0; -static TAILQ_HEAD(, dir_ent) dir_q; +static TAILQ_HEAD(, dir_ent) dir_q; /* * Error starting auditd @@ -297,7 +297,8 @@ /* * Close all log files, control files, and tell the audit system. */ -int close_all() +static int +close_all(void) { int err_ret = 0; char TS[POSTFIX_LEN]; @@ -305,31 +306,27 @@ token_t *tok; long cond; - /* Generate an audit record */ - if ((aufd = au_open()) == -1) { + /* Generate an audit record. */ + if ((aufd = au_open()) == -1) syslog(LOG_ERR, "Could not create audit shutdown event.\n"); - } else { - - if ((tok = au_to_text("auditd::Audit shutdown")) != NULL) { + else { + if ((tok = au_to_text("auditd::Audit shutdown")) != NULL) au_write(aufd, tok); - } - - if (au_close(aufd, 1, AUE_audit_shutdown) == -1) { - syslog(LOG_ERR, "Could not close audit shutdown event.\n"); - } + if (au_close(aufd, 1, AUE_audit_shutdown) == -1) + syslog(LOG_ERR, + "Could not close audit shutdown event.\n"); } - /* flush contents */ + /* Flush contents. */ cond = AUC_DISABLED; err_ret = auditon(A_SETCOND, &cond, sizeof(cond)); if (err_ret != 0) { syslog(LOG_ERR, "Disabling audit failed! : %s\n", - strerror(errno)); + strerror(errno)); err_ret = 1; } - if (getTSstr(TS, POSTFIX_LEN) == 0) { + if (getTSstr(TS, POSTFIX_LEN) == 0) close_lastfile(TS); - } if (lastfile != NULL) free(lastfile); @@ -341,9 +338,8 @@ } endac(); - if (close(triggerfd) != 0) { + if (close(triggerfd) != 0) syslog(LOG_ERR, "Error closing control file\n"); - } syslog(LOG_INFO, "Finished.\n"); return (0); } @@ -415,7 +411,7 @@ * enough to time to rotate log files without thrashing from soft warnings * generated before the log is actually rotated. */ -#define DUPLICATE_INTERVAL 30 +#define DUPLICATE_INTERVAL 30 static void handle_audit_trigger(int trigger) { From owner-p4-projects@FreeBSD.ORG Tue Jan 31 01:27:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26AB016A423; Tue, 31 Jan 2006 01:27:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE7F816A420 for ; Tue, 31 Jan 2006 01:27:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B244F43D48 for ; Tue, 31 Jan 2006 01:27:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V1RWrF082301 for ; Tue, 31 Jan 2006 01:27:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V1RWnL082298 for perforce@freebsd.org; Tue, 31 Jan 2006 01:27:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 01:27:32 GMT Message-Id: <200601310127.k0V1RWnL082298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 01:27:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=90755 Change 90755 by rwatson@rwatson_peppercorn on 2006/01/31 01:27:29 Add OpenBSM man page trailer. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#2 (text+ko) ==== @@ -74,3 +74,15 @@ .El .Sh SEE ALSO .Xr audit 1 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. From owner-p4-projects@FreeBSD.ORG Tue Jan 31 01:30:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9663916A423; Tue, 31 Jan 2006 01:30:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 524A916A420 for ; Tue, 31 Jan 2006 01:30:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 009EF43D49 for ; Tue, 31 Jan 2006 01:30:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V1UbTv082529 for ; Tue, 31 Jan 2006 01:30:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V1UbKw082522 for perforce@freebsd.org; Tue, 31 Jan 2006 01:30:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 01:30:37 GMT Message-Id: <200601310130.k0V1UbKw082522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90756 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 01:30:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=90756 Change 90756 by rwatson@rwatson_peppercorn on 2006/01/31 01:29:47 Don't ship Mac OS X rc.audit with OpenBSM, that is provided by the OS vendor. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/rc.audit#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jan 31 01:31:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBB9216A425; Tue, 31 Jan 2006 01:31:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 977D616A420 for ; Tue, 31 Jan 2006 01:31:40 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7C5543D46 for ; Tue, 31 Jan 2006 01:31:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V1Vdl9083749 for ; Tue, 31 Jan 2006 01:31:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V1VdOf083746 for perforce@freebsd.org; Tue, 31 Jan 2006 01:31:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 01:31:39 GMT Message-Id: <200601310131.k0V1VdOf083746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90757 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 01:31:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=90757 Change 90757 by rwatson@rwatson_peppercorn on 2006/01/31 01:30:38 Build auditd with OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/Makefile#3 (text+ko) ==== @@ -1,8 +1,9 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile#3 $ # -SUBDIR= auditreduce \ +SUBDIR= auditd \ + auditreduce \ praudit .include From owner-p4-projects@FreeBSD.ORG Tue Jan 31 01:31:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4882716A43D; Tue, 31 Jan 2006 01:31:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C1F5B16A422 for ; Tue, 31 Jan 2006 01:31:40 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 314A743D49 for ; Tue, 31 Jan 2006 01:31:40 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V1VdM3083755 for ; Tue, 31 Jan 2006 01:31:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V1Vd2E083752 for perforce@freebsd.org; Tue, 31 Jan 2006 01:31:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 01:31:39 GMT Message-Id: <200601310131.k0V1Vd2E083752@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90758 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 01:31:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=90758 Change 90758 by rwatson@rwatson_peppercorn on 2006/01/31 01:31:12 Annotate addition of auditd(8) to OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/CHANGELOG#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/CHANGELOG#5 (text+ko) ==== @@ -62,5 +62,6 @@ _free() calls dropped as a result, and source code compatibility with OpenSolaris improved significantly. - Annotate BSM events with origin OS and compatibility information. +- auditd(8) added to the OpenBSM distribution. -$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#4 $ +$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#5 $ From owner-p4-projects@FreeBSD.ORG Tue Jan 31 01:38:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E400116A423; Tue, 31 Jan 2006 01:38:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A23C16A420 for ; Tue, 31 Jan 2006 01:38:49 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32CDC43D46 for ; Tue, 31 Jan 2006 01:38:49 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V1cniw084047 for ; Tue, 31 Jan 2006 01:38:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V1cmEq084044 for perforce@freebsd.org; Tue, 31 Jan 2006 01:38:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 01:38:48 GMT Message-Id: <200601310138.k0V1cmEq084044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90759 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 01:38:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=90759 Change 90759 by rwatson@rwatson_peppercorn on 2006/01/31 01:38:20 $P4$, canonicalize copyrights. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#4 (text+ko) ==== @@ -1,5 +1,6 @@ /* - * Copyright (c) 2005 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2005 Apple Computer, Inc. + * All rights reserved. * * @APPLE_BSD_LICENSE_HEADER_START@ * @@ -28,6 +29,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * @APPLE_BSD_LICENSE_HEADER_END@ + * + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#4 $ */ #include ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#3 (text+ko) ==== @@ -1,4 +1,5 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. All rights reserved. +.\" Copyright (c) 2004 Apple Computer, Inc. +.\" All rights reserved. .\" .\" @APPLE_BSD_LICENSE_HEADER_START@ .\" @@ -28,6 +29,8 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#3 $ +.\" .Dd Jan 24, 2004 .Dt AUDITD 8 .Os ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#4 (text+ko) ==== @@ -29,6 +29,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * @APPLE_BSD_LICENSE_HEADER_END@ + * + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#4 $ */ #include ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#3 (text+ko) ==== @@ -1,5 +1,6 @@ /* - * Copyright (c) 2005 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2005 Apple Computer, Inc. + * All rights reserved. * * @APPLE_BSD_LICENSE_HEADER_START@ * @@ -28,6 +29,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * @APPLE_BSD_LICENSE_HEADER_END@ + * + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#3 $ */ #ifndef _AUDITD_H_ From owner-p4-projects@FreeBSD.ORG Tue Jan 31 01:43:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9899116A423; Tue, 31 Jan 2006 01:43:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D2C116A420 for ; Tue, 31 Jan 2006 01:43:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E660143D58 for ; Tue, 31 Jan 2006 01:43:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0V1htma084254 for ; Tue, 31 Jan 2006 01:43:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V1htiN084251 for perforce@freebsd.org; Tue, 31 Jan 2006 01:43:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 01:43:55 GMT Message-Id: <200601310143.k0V1htiN084251@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90760 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 01:43:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=90760 Change 90760 by rwatson@rwatson_peppercorn on 2006/01/31 01:43:27 Just when you think it's style(9), you remember about trailing white space. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#5 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#5 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#5 (text+ko) ==== @@ -3,20 +3,20 @@ * All rights reserved. * * @APPLE_BSD_LICENSE_HEADER_START@ - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -27,10 +27,10 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#5 $ */ #include @@ -44,7 +44,7 @@ */ static int auditwarnlog(char *args[]) -{ +{ char *loc_args[9]; pid_t pid; int i; @@ -53,7 +53,7 @@ for (i = 0; args[i] != NULL && i < 8; i++) loc_args[i+1] = args[i]; loc_args[i+1] = NULL; - + pid = fork(); if (pid == -1) return (-1); @@ -81,11 +81,11 @@ { char intstr[12]; char *args[3]; - - snprintf(intstr, 12, "%d", count); + + snprintf(intstr, 12, "%d", count); args[0] = HARDLIM_ALL_WARN; - args[1] = intstr; + args[1] = intstr; args[2] = NULL; return (auditwarnlog(args)); @@ -98,7 +98,7 @@ audit_warn_allsoft(void) { char *args[2]; - + args[0] = SOFTLIM_ALL_WARN; args[1] = NULL; @@ -115,7 +115,7 @@ audit_warn_auditoff(void) { char *args[2]; - + args[0] = AUDITOFF_WARN; args[1] = NULL; @@ -129,7 +129,7 @@ audit_warn_ebusy(void) { char *args[2]; - + args[0] = EBUSY_WARN; args[1] = NULL; @@ -147,9 +147,9 @@ audit_warn_getacdir(char *filename) { char *args[3]; - + args[0] = GETACDIR_WARN; - args[1] = filename; + args[1] = filename; args[2] = NULL; return (auditwarnlog(args)); @@ -162,9 +162,9 @@ audit_warn_hard(char *filename) { char *args[3]; - + args[0] = HARDLIM_WARN; - args[1] = filename; + args[1] = filename; args[2] = NULL; return (auditwarnlog(args)); @@ -177,7 +177,7 @@ audit_warn_nostart(void) { char *args[2]; - + args[0] = NOSTART_WARN; args[1] = NULL; @@ -192,7 +192,7 @@ audit_warn_postsigterm(void) { char *args[2]; - + args[0] = POSTSIGTERM_WARN; args[1] = NULL; @@ -206,9 +206,9 @@ audit_warn_soft(char *filename) { char *args[3]; - + args[0] = SOFTLIM_WARN; - args[1] = filename; + args[1] = filename; args[2] = NULL; return (auditwarnlog(args)); @@ -222,7 +222,7 @@ audit_warn_tmpfile(void) { char *args[2]; - + args[0] = TMPFILE_WARN; args[1] = NULL; ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#4 (text+ko) ==== @@ -2,20 +2,20 @@ .\" All rights reserved. .\" .\" @APPLE_BSD_LICENSE_HEADER_START@ -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: -.\" +.\" .\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. +.\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. +.\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of .\" its contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" +.\" from this software without specific prior written permission. +.\" .\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED .\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -26,10 +26,10 @@ .\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" +.\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#4 $ .\" .Dd Jan 24, 2004 .Dt AUDITD 8 @@ -42,7 +42,7 @@ .Op Fl dhs .Sh DESCRIPTION The -.Nm +.Nm daemon responds to requests from the audit(1) utility and notifications from the kernel. It manages the resulting audit log files and specified log file locations. ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#5 (text+ko) ==== @@ -3,20 +3,20 @@ * All rights reserved. * * @APPLE_BSD_LICENSE_HEADER_START@ - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -27,10 +27,10 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#5 $ */ #include @@ -84,7 +84,7 @@ { struct dir_ent *dirent; - while ((dirent = TAILQ_FIRST(&dir_q))) { + while ((dirent = TAILQ_FIRST(&dir_q))) { TAILQ_REMOVE(&dir_q, dirent, dirs); free(dirent->dirname); free(dirent); @@ -114,7 +114,7 @@ * XXX We should affix the hostname also */ static char * -affixdir(char *name, struct dir_ent *dirent) +affixdir(char *name, struct dir_ent *dirent) { char *fn; char *curdir; @@ -149,7 +149,7 @@ /* Rename the last file -- append timestamp. */ if ((ptr = strstr(lastfile, NOT_TERMINATED)) != NULL) { - *ptr = '.'; + *ptr = '.'; strcpy(ptr+1, TS); if (rename(oldname, lastfile) != 0) syslog(LOG_ERR, "Could not rename %s to %s \n", @@ -158,7 +158,7 @@ syslog(LOG_INFO, "renamed %s to %s \n", oldname, lastfile); } - free(lastfile); + free(lastfile); free(oldname); lastfile = NULL; } @@ -186,7 +186,7 @@ /* Try until we succeed. */ while ((dirent = TAILQ_FIRST(&dir_q))) { if ((fn = affixdir(timestr, dirent)) == NULL) { - syslog(LOG_INFO, "Failed to swap log at time %s\n", + syslog(LOG_INFO, "Failed to swap log at time %s\n", timestr); return (-1); } @@ -201,11 +201,11 @@ perror("File open"); else if (auditctl(fn) != 0) { syslog(LOG_ERR, - "auditctl failed setting log file! : %s\n", + "auditctl failed setting log file! : %s\n", strerror(errno)); close(fd); } else { - /* Success. */ + /* Success. */ close_lastfile(TS); lastfile = fn; close(fd); @@ -214,7 +214,7 @@ /* * Tell the administrator about lack of permissions for dir. - */ + */ audit_warn_getacdir(dirent->dirname); /* Try again with a different directory. */ @@ -264,10 +264,10 @@ allhardcount = 0; if (swap_audit_file() == -1) { - syslog(LOG_ERR, "Could not swap audit file\n"); + syslog(LOG_ERR, "Could not swap audit file\n"); /* - * XXX Faulty directory listing? - user should be given - * XXX an opportunity to change the audit_control file + * XXX Faulty directory listing? - user should be given + * XXX an opportunity to change the audit_control file * XXX switch to a reduced mode of auditing? */ return (-1); @@ -276,7 +276,7 @@ /* * XXX There are synchronization problems here * XXX what should we do if a trigger for the earlier limit - * XXX is generated here? + * XXX is generated here? */ if (0 == (ret = getacmin(&minval))) { syslog(LOG_INFO, "min free = %d\n", minval); @@ -286,8 +286,8 @@ return (-1); } qctrl.aq_minfree = minval; - if (auditon(A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) { - syslog(LOG_ERR, + if (auditon(A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) { + syslog(LOG_ERR, "could not set audit queue settings\n"); return (-1); } @@ -300,7 +300,7 @@ * Close all log files, control files, and tell the audit system. */ static int -close_all(void) +close_all(void) { int err_ret = 0; char TS[POSTFIX_LEN]; @@ -323,7 +323,7 @@ cond = AUC_DISABLED; err_ret = auditon(A_SETCOND, &cond, sizeof(cond)); if (err_ret != 0) { - syslog(LOG_ERR, "Disabling audit failed! : %s\n", + syslog(LOG_ERR, "Disabling audit failed! : %s\n", strerror(errno)); err_ret = 1; } @@ -371,18 +371,18 @@ /* Set up the signal hander. */ if (signal(SIGTERM, relay_signal) == SIG_ERR) { - syslog(LOG_ERR, + syslog(LOG_ERR, "Could not set signal handler for SIGTERM\n"); fail_exit(); } if (signal(SIGCHLD, relay_signal) == SIG_ERR) { - syslog(LOG_ERR, + syslog(LOG_ERR, "Could not set signal handler for SIGCHLD\n"); fail_exit(); } if ((pidfile = fopen(AUDITD_PIDFILE, "a")) == NULL) { - syslog(LOG_ERR, + syslog(LOG_ERR, "Could not open PID file\n"); audit_warn_tmpfile(); return (-1); @@ -391,7 +391,7 @@ /* Attempt to lock the pid file; if a lock is present, exit. */ fd = fileno(pidfile); if (flock(fd, LOCK_EX | LOCK_NB) < 0) { - syslog(LOG_ERR, + syslog(LOG_ERR, "PID file is locked (is another auditd running?).\n"); audit_warn_ebusy(); return (-1); @@ -423,7 +423,7 @@ int rc; /* - * Suppres duplicate messages from the kernel within the specified + * Suppres duplicate messages from the kernel within the specified * interval. */ struct timeval ts; @@ -432,17 +432,17 @@ if (gettimeofday(&ts, &tzp) == 0) { tt = (time_t)ts.tv_sec; - if ((trigger == last_trigger) && + if ((trigger == last_trigger) && (tt < (last_time + DUPLICATE_INTERVAL))) return; last_trigger = trigger; last_time = tt; } - /* + /* * Message processing is done here. */ - dirent = TAILQ_FIRST(&dir_q); + dirent = TAILQ_FIRST(&dir_q); switch(trigger) { case AUDIT_TRIGGER_LOW_SPACE: @@ -453,12 +453,12 @@ TAILQ_INSERT_TAIL(&dir_q, dirent, dirs); audit_warn_soft(dirent->dirname); dirent->softlim = 1; - - if (TAILQ_NEXT(TAILQ_FIRST(&dir_q), dirs) != NULL && + + if (TAILQ_NEXT(TAILQ_FIRST(&dir_q), dirs) != NULL && swap_audit_file() == -1) syslog(LOG_ERR, "Error swapping audit file\n"); - /* + /* * Check if the next dir has already reached its soft * limit. */ @@ -468,7 +468,7 @@ audit_warn_allsoft(); } } else { - /* + /* * Continue auditing to the current file. Also * generate an allsoft warning. * XXX do we want to do this ? @@ -487,7 +487,7 @@ free(dirent); if (swap_audit_file() == -1) - syslog(LOG_ERR, "Error swapping audit file\n"); + syslog(LOG_ERR, "Error swapping audit file\n"); /* We are out of log directories. */ audit_warn_allhard(++allhardcount); @@ -500,7 +500,7 @@ */ syslog(LOG_INFO, "Got open new trigger\n"); if (swap_audit_file() == -1) - syslog(LOG_ERR, "Error swapping audit file\n"); + syslog(LOG_ERR, "Error swapping audit file\n"); break; case AUDIT_TRIGGER_READ_FILE: @@ -535,7 +535,7 @@ return (-1); } syslog(LOG_INFO, "%s: read %d\n", __FUNCTION__, trigger); - if (trigger == AUDIT_TRIGGER_CLOSE_AND_DIE) + if (trigger == AUDIT_TRIGGER_CLOSE_AND_DIE) break; else handle_audit_trigger(trigger); @@ -558,7 +558,7 @@ syslog(LOG_INFO, "warn process [pid=%d] %s %d.\n", child, ((WIFEXITED(wstatus)) ? "exited with non-zero status" : "exited as a result of signal"), - ((WIFEXITED(wstatus)) ? WEXITSTATUS(wstatus) : + ((WIFEXITED(wstatus)) ? WEXITSTATUS(wstatus) : WTERMSIG(wstatus))); } } @@ -597,7 +597,7 @@ evc_map.ec_class = evp->ae_class; if (auditon(A_SETCLASS, &evc_map, sizeof(au_evclass_map_t)) != 0) - syslog(LOG_ERR, + syslog(LOG_ERR, "Failed to register class mapping for event %s", evp->ae_name); else @@ -707,7 +707,7 @@ openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); syslog(LOG_INFO, "starting...\n"); - if (debug == 0 && daemon(0, 0) == -1) { + if (debug == 0 && daemon(0, 0) == -1) { syslog(LOG_ERR, "Failed to daemonize\n"); exit(1); } ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#4 (text+ko) ==== @@ -3,20 +3,20 @@ * All rights reserved. * * @APPLE_BSD_LICENSE_HEADER_START@ - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -27,24 +27,24 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#4 $ */ #ifndef _AUDITD_H_ -#define _AUDITD_H_ +#define _AUDITD_H_ #include #include #include -#define MAX_DIR_SIZE 255 -#define AUDITD_NAME "auditd" +#define MAX_DIR_SIZE 255 +#define AUDITD_NAME "auditd" -#define POSTFIX_LEN 16 -#define NOT_TERMINATED ".not_terminated" +#define POSTFIX_LEN 16 +#define NOT_TERMINATED ".not_terminated" struct dir_ent { char *dirname; @@ -52,19 +52,19 @@ TAILQ_ENTRY(dir_ent) dirs; }; -#define HARDLIM_ALL_WARN "allhard" -#define SOFTLIM_ALL_WARN "allsoft" -#define AUDITOFF_WARN "aditoff" -#define EBUSY_WARN "ebusy" -#define GETACDIR_WARN "getacdir" -#define HARDLIM_WARN "hard" -#define NOSTART_WARN "nostart" -#define POSTSIGTERM_WARN "postsigterm" -#define SOFTLIM_WARN "soft" -#define TMPFILE_WARN "tmpfile" +#define HARDLIM_ALL_WARN "allhard" +#define SOFTLIM_ALL_WARN "allsoft" +#define AUDITOFF_WARN "aditoff" +#define EBUSY_WARN "ebusy" +#define GETACDIR_WARN "getacdir" +#define HARDLIM_WARN "hard" +#define NOSTART_WARN "nostart" +#define POSTSIGTERM_WARN "postsigterm" +#define SOFTLIM_WARN "soft" +#define TMPFILE_WARN "tmpfile" -#define AUDITWARN_SCRIPT "/etc/security/audit_warn" -#define AUDITD_PIDFILE "/var/run/auditd.pid" +#define AUDITWARN_SCRIPT "/etc/security/audit_warn" +#define AUDITD_PIDFILE "/var/run/auditd.pid" int audit_warn_allhard(int count); int audit_warn_allsoft(void); From owner-p4-projects@FreeBSD.ORG Tue Jan 31 04:54:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B03816A423; Tue, 31 Jan 2006 04:54:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47C8A16A420 for ; Tue, 31 Jan 2006 04:54:47 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA57543D46 for ; Tue, 31 Jan 2006 04:54:46 +0000 (GMT) (envelope-from kmacy@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 k0V4skV7001690 for ; Tue, 31 Jan 2006 04:54:46 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V4skq7001687 for perforce@freebsd.org; Tue, 31 Jan 2006 04:54:46 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 31 Jan 2006 04:54:46 GMT Message-Id: <200601310454.k0V4skq7001687@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 90763 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 04:54:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=90763 Change 90763 by kmacy@kmacy:freebsd7_xen3 on 2006/01/31 04:53:45 re-enable support for isa add back in missed default devices Affected files ... .. //depot/projects/xen3/src/sys/conf/files.i386-xen#4 edit .. //depot/projects/xen3/src/sys/i386-xen/conf/XENCONF#4 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/exception.s#2 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#7 edit .. //depot/projects/xen3/src/sys/i386/isa/atpic.c#2 edit Differences ... ==== //depot/projects/xen3/src/sys/conf/files.i386-xen#4 (text+ko) ==== @@ -303,7 +303,7 @@ i386/ibcs2/ibcs2_xenix.c optional ibcs2 i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 -#i386/isa/atpic.c standard +i386/isa/atpic.c standard #i386/isa/atpic_vector.s standard i386/isa/elcr.c standard i386/isa/elink.c optional ep | ie ==== //depot/projects/xen3/src/sys/i386-xen/conf/XENCONF#4 (text+ko) ==== @@ -96,9 +96,21 @@ #device agp # support several AGP chipsets + + +#defaults # Floating point support - do not disable. device npx +device isa + +device mem +device io + +####################################### + + + # Serial (COM) ports #device sio # 8250, 16[45]50 based serial ports ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/exception.s#2 (text+ko) ==== @@ -264,9 +264,9 @@ .text SUPERALIGN_TEXT MCOUNT_LABEL(bintr) -#ifndef XEN + #include -#endif + #ifdef DEV_APIC .data .p2align 4 ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#7 (text+ko) ==== @@ -2387,8 +2387,10 @@ printf("WARNING: loader(8) metadata is missing!\n"); #ifdef DEV_ISA - elcr_probe(); - atpic_startup(); + if (xen_start_info->flags & SIF_PRIVILEGED) { + elcr_probe(); + atpic_startup(); + } #endif #ifdef DDB ==== //depot/projects/xen3/src/sys/i386/isa/atpic.c#2 (text+ko) ==== @@ -112,6 +112,7 @@ static void atpic_init(void *dummy); unsigned int imen; /* XXX */ +extern int running_xen; inthand_t IDTVEC(atpic_intr0), IDTVEC(atpic_intr1), IDTVEC(atpic_intr2), @@ -516,6 +517,9 @@ struct atpic_intsrc *ai; int i; + if (running_xen) + return; + /* * If any of the ISA IRQs have an interrupt source already, then * assume that the APICs are being used and don't register any From owner-p4-projects@FreeBSD.ORG Tue Jan 31 06:09:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6033716A423; Tue, 31 Jan 2006 06:09:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0414C16A420 for ; Tue, 31 Jan 2006 06:09:17 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8740343D46 for ; Tue, 31 Jan 2006 06:09:16 +0000 (GMT) (envelope-from kmacy@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 k0V69GOH004315 for ; Tue, 31 Jan 2006 06:09:16 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V69GLw004312 for perforce@freebsd.org; Tue, 31 Jan 2006 06:09:16 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 31 Jan 2006 06:09:16 GMT Message-Id: <200601310609.k0V69GLw004312@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 90764 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 06:09:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=90764 Change 90764 by kmacy@kmacy:freebsd7_xen3 on 2006/01/31 06:08:44 gdb macro for backtracing an arbitrary process scottl was complaining about not being able to examine blocked threads based on btp - but gives more complete output Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/debugscripts/gdbinit.i386-xen#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jan 31 07:45:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DC9416A423; Tue, 31 Jan 2006 07:45:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4AA3416A420 for ; Tue, 31 Jan 2006 07:45:17 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D59443D45 for ; Tue, 31 Jan 2006 07:45:17 +0000 (GMT) (envelope-from alc@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 k0V7jGYT007918 for ; Tue, 31 Jan 2006 07:45:16 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0V7jG9i007915 for perforce@freebsd.org; Tue, 31 Jan 2006 07:45:16 GMT (envelope-from alc@freebsd.org) Date: Tue, 31 Jan 2006 07:45:16 GMT Message-Id: <200601310745.k0V7jG9i007915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 07:45:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=90768 Change 90768 by alc@alc_home on 2006/01/31 07:44:37 Change #if defined(DIAGNOSTIC) to KASSERT. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_page.c#15 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_page.c#15 (text+ko) ==== @@ -832,10 +832,9 @@ */ vm_page_lock_queues(); if ((m = vm_page_select_cache()) == NULL) { -#if defined(DIAGNOSTIC) - if (cnt.v_cache_count > 0) - printf("vm_page_alloc(NORMAL): missing pages on cache queue: %d\n", cnt.v_cache_count); -#endif + KASSERT(cnt.v_cache_count == 0, + ("vm_page_alloc: cache queue is missing %d pages", + cnt.v_cache_count)); vm_page_unlock_queues(); atomic_add_int(&vm_pageout_deficit, 1); pagedaemon_wakeup(); From owner-p4-projects@FreeBSD.ORG Tue Jan 31 12:38:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94B0C16A423; Tue, 31 Jan 2006 12:38:50 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A86F16A420 for ; Tue, 31 Jan 2006 12:38:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3A3243D46 for ; Tue, 31 Jan 2006 12:38:49 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VCcnkt029375 for ; Tue, 31 Jan 2006 12:38:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VCcnXq029372 for perforce@freebsd.org; Tue, 31 Jan 2006 12:38:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 12:38:49 GMT Message-Id: <200601311238.k0VCcnXq029372@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90781 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 12:38:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=90781 Change 90781 by rwatson@rwatson_peppercorn on 2006/01/31 12:38:17 Listen for SIGTERM instead of SIGHUP for exit -- this will result in greater happiness if init is killing everything. HUP is more traditionally use for reloading configuration information. When this is integrated to audit3, the rc.d script will need updating. Use setauevent() to reset the event pointer before starting. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#5 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#5 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#5 $ .\" .Dd Jan 24, 2004 .Dt AUDITD 8 @@ -67,7 +67,10 @@ should be used to inform the daemon to change state/configuration after altering the audit_control file. .Pp -Sending a SIGHUP to a running +.\" Sending a SIGHUP to a running +.\" .Nm auditd +.\" daemon will force it to exit. +Sending a SIGTERM to a running .Nm auditd daemon will force it to exit. .Sh FILES ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#6 $ */ #include @@ -62,6 +62,8 @@ static char *lastfile = NULL; static int allhardcount = 0; static int triggerfd = 0; +static int sighups, sighups_handled; +static int sigterms, sigterms_handled; static TAILQ_HEAD(, dir_ent) dir_q; @@ -351,12 +353,15 @@ * be done in the signal handler itself. Instead, we send a message to the * main servicing loop to do proper handling from a non-signal-handler * context. - * - * XXXRW: I don't see that happening here. */ static void relay_signal(int signal) { + + if (signal == SIGHUP) + sighups++; + if (signal == SIGTERM) + sigterms++; } /* @@ -380,6 +385,11 @@ "Could not set signal handler for SIGCHLD\n"); fail_exit(); } + if (signal(SIGHUP, relay_signal) == SIG_ERR) { + syslog(LOG_ERR, + "Could not set signal handler for SIGHUP\n"); + fail_exit(); + } if ((pidfile = fopen(AUDITD_PIDFILE, "a")) == NULL) { syslog(LOG_ERR, @@ -534,6 +544,10 @@ syslog(LOG_INFO, "%s: read EOF\n", __FUNCTION__); return (-1); } + if (sigterms != sigterms_handled) { + syslog(LOG_INFO, "%s: SIGTERM", __FUNCTION__); + break; + } syslog(LOG_INFO, "%s: read %d\n", __FUNCTION__, trigger); if (trigger == AUDIT_TRIGGER_CLOSE_AND_DIE) break; @@ -592,6 +606,7 @@ return (-1); } evp = &ev; + setauevent(); while ((evp = getauevent_r(evp)) != NULL) { evc_map.ec_number = evp->ae_number; evc_map.ec_class = evp->ae_class; From owner-p4-projects@FreeBSD.ORG Tue Jan 31 15:15:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4F7716A426; Tue, 31 Jan 2006 15:15:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 34E9816A423 for ; Tue, 31 Jan 2006 15:15:16 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CD3543D8F for ; Tue, 31 Jan 2006 15:15:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VFF0fa044447 for ; Tue, 31 Jan 2006 15:15:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VFF0lL044436 for perforce@freebsd.org; Tue, 31 Jan 2006 15:15:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 15:15:00 GMT Message-Id: <200601311515.k0VFF0lL044436@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 15:15:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=90786 Change 90786 by rwatson@rwatson_zoo on 2006/01/31 15:14:04 Convert local 'flags' to 'global_flags' and make global, so that the flags generated from the command line are accessible after auditd has started. Add handle_sighup(), which calls config_audit_controls() to update the auditd configuration in the event that SIGHUP is received. If EINTR is returned by the read on the device or fifo, continue rather than logging that -1 was received. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#6 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#7 $ */ #include @@ -64,9 +64,12 @@ static int triggerfd = 0; static int sighups, sighups_handled; static int sigterms, sigterms_handled; +static long global_flags; static TAILQ_HEAD(, dir_ent) dir_q; +static int config_audit_controls(void); + /* * Error starting auditd */ @@ -525,6 +528,14 @@ } } +static void +handle_sighup(void) +{ + + sighups_handled = sighups; + config_audit_controls(); +} + /* * Read the control file for triggers and handle appropriately. */ @@ -540,14 +551,20 @@ syslog(LOG_ERR, "%s: error %d\n", __FUNCTION__, errno); return (-1); } + if (sigterms != sigterms_handled) { + syslog(LOG_INFO, "%s: SIGTERM", __FUNCTION__); + break; + } + if (sighups != sighups_handled) { + syslog(LOG_INFO, "%s: SIGHUP", __FUNCTION__); + handle_sighup(); + } + if ((num == -1) && (errno == EINTR)) + continue; if (num == 0) { syslog(LOG_INFO, "%s: read EOF\n", __FUNCTION__); return (-1); } - if (sigterms != sigterms_handled) { - syslog(LOG_INFO, "%s: SIGTERM", __FUNCTION__); - break; - } syslog(LOG_INFO, "%s: read %d\n", __FUNCTION__, trigger); if (trigger == AUDIT_TRIGGER_CLOSE_AND_DIE) break; @@ -582,7 +599,7 @@ * kernel preselection mask, etc. */ static int -config_audit_controls(long flags) +config_audit_controls(void) { au_event_ent_t ev, *evp; au_evclass_map_t evc_map; @@ -646,14 +663,14 @@ /* * Set the audit policy flags based on passed in parameter values. */ - if (auditon(A_SETPOLICY, &flags, sizeof(flags))) + if (auditon(A_SETPOLICY, &global_flags, sizeof(global_flags))) syslog(LOG_ERR, "Failed to set audit policy."); return (0); } static void -setup(long flags) +setup(void) { int aufd; token_t *tok; @@ -680,7 +697,7 @@ "Could not close audit startup event.\n"); } - if (config_audit_controls(flags) == 0) + if (config_audit_controls() == 0) syslog(LOG_INFO, "Audit controls init successful\n"); else syslog(LOG_INFO, "Audit controls init failed\n"); @@ -690,10 +707,10 @@ main(int argc, char **argv) { char ch; - long flags = AUDIT_CNT; int debug = 0; int rc; + global_flags |= AUDIT_CNT; while ((ch = getopt(argc, argv, "dhs")) != -1) { switch(ch) { case 'd': @@ -703,12 +720,12 @@ case 's': /* Fail-stop option. */ - flags &= ~(AUDIT_CNT); + global_flags &= ~(AUDIT_CNT); break; case 'h': /* Halt-stop option. */ - flags |= AUDIT_AHLT; + global_flags |= AUDIT_AHLT; break; case '?': @@ -732,7 +749,7 @@ exit(1); } - setup(flags); + setup(); rc = wait_for_triggers(); syslog(LOG_INFO, "auditd exiting.\n"); From owner-p4-projects@FreeBSD.ORG Tue Jan 31 15:40:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00DC816A45D; Tue, 31 Jan 2006 15:40:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B164E16A457 for ; Tue, 31 Jan 2006 15:40:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 778BF43D46 for ; Tue, 31 Jan 2006 15:40:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VFeWQt045857 for ; Tue, 31 Jan 2006 15:40:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VFeW7G045854 for perforce@freebsd.org; Tue, 31 Jan 2006 15:40:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 15:40:32 GMT Message-Id: <200601311540.k0VFeW7G045854@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90789 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 15:40:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=90789 Change 90789 by rwatson@rwatson_zoo on 2006/01/31 15:40:21 audit(1) should be audit(8). Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#6 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#6 $ .\" .Dd Jan 24, 2004 .Dt AUDITD 8 @@ -79,7 +79,7 @@ Default directory for storing audit log files. .El .Sh SEE ALSO -.Xr audit 1 +.Xr audit 8 .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. From owner-p4-projects@FreeBSD.ORG Tue Jan 31 15:41:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B428C16A423; Tue, 31 Jan 2006 15:41:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7009516A420 for ; Tue, 31 Jan 2006 15:41:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3674043D45 for ; Tue, 31 Jan 2006 15:41:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VFfY8H045958 for ; Tue, 31 Jan 2006 15:41:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VFfX64045955 for perforce@freebsd.org; Tue, 31 Jan 2006 15:41:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 15:41:33 GMT Message-Id: <200601311541.k0VFfX64045955@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90790 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 15:41:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=90790 Change 90790 by rwatson@rwatson_zoo on 2006/01/31 15:40:44 When re-reading the audit configuration files due to a read file trigger, also set the kernel state. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#8 $ */ #include @@ -520,6 +520,8 @@ syslog(LOG_INFO, "Got read file trigger\n"); if (read_control_file() == -1) syslog(LOG_ERR, "Error in audit control file\n"); + if (config_audit_controls() == -1) + syslog(LOG_ERR, "Error setting audit controls\n"); break; default: From owner-p4-projects@FreeBSD.ORG Tue Jan 31 15:42:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87DB016A423; Tue, 31 Jan 2006 15:42:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 495F816A420 for ; Tue, 31 Jan 2006 15:42:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECFBC43D45 for ; Tue, 31 Jan 2006 15:42:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VFgZ1c046012 for ; Tue, 31 Jan 2006 15:42:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VFgZEZ046009 for perforce@freebsd.org; Tue, 31 Jan 2006 15:42:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 15:42:35 GMT Message-Id: <200601311542.k0VFgZEZ046009@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90791 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 15:42:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=90791 Change 90791 by rwatson@rwatson_zoo on 2006/01/31 15:41:45 Move audit(1) in contrib/audit_supt to audit(8) in OpenBSM, as it is the matching control tool for auditd(8), which is now also in OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#1 add .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#1 add .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jan 31 15:44:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCE4A16A423; Tue, 31 Jan 2006 15:44:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F55716A420 for ; Tue, 31 Jan 2006 15:44:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 072AA43D49 for ; Tue, 31 Jan 2006 15:44:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VFic5w046242 for ; Tue, 31 Jan 2006 15:44:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VFic2K046239 for perforce@freebsd.org; Tue, 31 Jan 2006 15:44:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 15:44:38 GMT Message-Id: <200601311544.k0VFic2K046239@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90792 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 15:44:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=90792 Change 90792 by rwatson@rwatson_zoo on 2006/01/31 15:43:51 Copyright canonicalization. $P4$ Minor style tweaks. OpenBSM man page trailer. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#2 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#2 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#2 $ # CFLAGS+= -I- -I ../.. -I ../../libbsm -L ../../libbsm -I. ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#2 (text+ko) ==== @@ -1,4 +1,5 @@ -.\" Copyright (c) 2004, Apple Computer, Inc. All rights reserved. +.\" Copyright (c) 2004 Apple Computer, Inc. +.\" All rights reserved. .\" .\" @APPLE_BSD_LICENSE_HEADER_START@ .\" @@ -28,6 +29,8 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#2 $ +.\" .Dd Jan 24, 2004 .Dt AUDIT 8 .Os @@ -69,3 +72,15 @@ .Sh SEE ALSO .Xr auditd 8 .Xr audit_control 5 +.Sh AUTHORS +This software was created by McAfee Research, the security research division +of McAfee, Inc., under contract to Apple Computer Inc. +Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +.Pp +The Basic Security Module (BSM) interface to audit records and audit event +stream format were defined by Sun Microsystems. +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#2 (text+ko) ==== @@ -1,21 +1,22 @@ /* - * Copyright (c) 2005 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2005 Apple Computer, Inc. + * All rights reserved. * * @APPLE_BSD_LICENSE_HEADER_START@ - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -26,8 +27,10 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * @APPLE_BSD_LICENSE_HEADER_END@ + * + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#2 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -48,8 +51,10 @@ #include #include -void usage() +static void +usage(void) { + (void)fprintf(stderr, "Usage: audit -n | -s | -t \n"); exit(-1); } @@ -57,12 +62,13 @@ /* * Main routine to process command line options. */ -int main(int argc, char **argv) +int +main(int argc, char **argv) { char ch; unsigned int trigger = 0; - if (argc != 2) + if (argc != 2) usage(); while ((ch = getopt(argc, argv, "nst")) != -1) { @@ -72,7 +78,7 @@ trigger = AUDIT_TRIGGER_OPEN_NEW; break; - case 's': + case 's': trigger = AUDIT_TRIGGER_READ_FILE; break; From owner-p4-projects@FreeBSD.ORG Tue Jan 31 15:45:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9529A16A423; Tue, 31 Jan 2006 15:45:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5665016A420 for ; Tue, 31 Jan 2006 15:45:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D2BE43D45 for ; Tue, 31 Jan 2006 15:45:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VFjf7h046449 for ; Tue, 31 Jan 2006 15:45:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VFjeUn046446 for perforce@freebsd.org; Tue, 31 Jan 2006 15:45:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 15:45:40 GMT Message-Id: <200601311545.k0VFjeUn046446@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90794 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 15:45:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=90794 Change 90794 by rwatson@rwatson_zoo on 2006/01/31 15:45:04 Update CHANGELOG for auditd(8) and audit(8) activities. Affected files ... .. //depot/projects/trustedbsd/openbsm/CHANGELOG#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/CHANGELOG#6 (text+ko) ==== @@ -62,6 +62,7 @@ _free() calls dropped as a result, and source code compatibility with OpenSolaris improved significantly. - Annotate BSM events with origin OS and compatibility information. -- auditd(8) added to the OpenBSM distribution. +- auditd(8), audit(8) added to the OpenBSM distribution. auditd extended + to support reloading of kernel event table. -$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#5 $ +$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#6 $ From owner-p4-projects@FreeBSD.ORG Tue Jan 31 15:45:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4516016A46E; Tue, 31 Jan 2006 15:45:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A378B16A422 for ; Tue, 31 Jan 2006 15:45:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BA4643D45 for ; Tue, 31 Jan 2006 15:45:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VFjfo1046455 for ; Tue, 31 Jan 2006 15:45:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VFjfAc046452 for perforce@freebsd.org; Tue, 31 Jan 2006 15:45:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 15:45:41 GMT Message-Id: <200601311545.k0VFjfAc046452@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90795 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 15:45:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=90795 Change 90795 by rwatson@rwatson_zoo on 2006/01/31 15:45:32 Add audit(8) to the set of automatically built binaries in OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/Makefile#4 (text+ko) ==== @@ -1,8 +1,9 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile#3 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile#4 $ # -SUBDIR= auditd \ +SUBDIR= audit \ + auditd \ auditreduce \ praudit From owner-p4-projects@FreeBSD.ORG Tue Jan 31 15:51:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64CC316A423; Tue, 31 Jan 2006 15:51:53 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 246FC16A420 for ; Tue, 31 Jan 2006 15:51:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C36AF43D53 for ; Tue, 31 Jan 2006 15:51:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VFpqju046891 for ; Tue, 31 Jan 2006 15:51:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VFpqBP046888 for perforce@freebsd.org; Tue, 31 Jan 2006 15:51:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 15:51:52 GMT Message-Id: <200601311551.k0VFpqBP046888@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 15:51:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=90796 Change 90796 by rwatson@rwatson_zoo on 2006/01/31 15:50:51 Integrate TrustedBSD audit3 from TrustedBSD OpenBSM branch: - audit(8) and auditd(8) now in OpenBSM, with substantial cleanups and changes. - New, less noisy defaults for audit_control. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_control#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#4 (text+ko) ==== @@ -62,5 +62,7 @@ _free() calls dropped as a result, and source code compatibility with OpenSolaris improved significantly. - Annotate BSM events with origin OS and compatibility information. +- auditd(8), audit(8) added to the OpenBSM distribution. auditd extended + to support reloading of kernel event table. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#3 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#4 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#3 (text+ko) ==== @@ -1,8 +1,10 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#3 $ # -SUBDIR= auditreduce \ +SUBDIR= audit \ + auditd \ + auditreduce \ praudit .include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_control#3 (text+ko) ==== @@ -1,7 +1,7 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_control#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_control#3 $ # dir:/var/audit -flags:lo,ad,-all,^-fa,^-fc,^-cl +flags:lo minfree:20 naflags:lo From owner-p4-projects@FreeBSD.ORG Tue Jan 31 15:54:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB70816A423; Tue, 31 Jan 2006 15:53:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 73E9016A420 for ; Tue, 31 Jan 2006 15:53:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1E0D43D79 for ; Tue, 31 Jan 2006 15:53:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VFrt1E046959 for ; Tue, 31 Jan 2006 15:53:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VFrt6v046956 for perforce@freebsd.org; Tue, 31 Jan 2006 15:53:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 15:53:55 GMT Message-Id: <200601311553.k0VFrt6v046956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90797 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 15:54:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=90797 Change 90797 by rwatson@rwatson_zoo on 2006/01/31 15:53:11 Stop auditd and the audit subsystem using audit -t, not a signal to auditd. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#6 (text+ko) ==== @@ -22,10 +22,12 @@ auditd_stop() { + if [ -f /var/run/auditd.pid ]; then - kill -1 `cat /var/run/auditd.pid`; - else echo "The audit daemon is not running"; -fi + /usr/sbin/audit -t + else + echo "The audit daemon is not running"; + fi } load_rc_config $name From owner-p4-projects@FreeBSD.ORG Tue Jan 31 15:56:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF30516A425; Tue, 31 Jan 2006 15:56:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 99E5816A424 for ; Tue, 31 Jan 2006 15:56:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9F9943D69 for ; Tue, 31 Jan 2006 15:55:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VFtxcQ047177 for ; Tue, 31 Jan 2006 15:55:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VFtwjQ047171 for perforce@freebsd.org; Tue, 31 Jan 2006 15:55:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 15:55:58 GMT Message-Id: <200601311555.k0VFtwjQ047171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90798 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 15:56:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=90798 Change 90798 by rwatson@rwatson_zoo on 2006/01/31 15:55:25 Build audit(8) and auditd(8) from OpenBSM, not contrib/audit_supt. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/audit/Makefile#2 edit .. //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.sbin/audit/Makefile#2 (text+ko) ==== @@ -2,10 +2,13 @@ # $FreeBSD$ # -SRCDIR=${.CURDIR}/../../contrib/audit_supt/audit -.PATH: ${SRCDIR} +OPENBSMDIR=${.CURDIR}/../../contrib/openbsm +.PATH: ${OPENBSMDIR}/bin/audit PROG= audit -MAN= audit.1 +MAN= audit.8 + +DPADD= ${LIBBSM} +LDADD= -lbsm .include ==== //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#3 (text+ko) ==== @@ -2,12 +2,12 @@ # $FreeBSD$ # -SRCDIR=${.CURDIR}/../../contrib/audit_supt/auditd -.PATH: ${SRCDIR} +OPENBSMDIR=${.CURDIR}/../../contrib/openbsm +.PATH: ${OPENBSMDIR}/bin/auditd PROG= auditd +SRCS= auditd.c audit_warn.c MAN= auditd.8 -SRCS= auditd.c audit_warn.c DPADD= ${LIBBSM} LDADD= -lbsm From owner-p4-projects@FreeBSD.ORG Tue Jan 31 15:57:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3C8716A5D1; Tue, 31 Jan 2006 15:57:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 84C6516A45B for ; Tue, 31 Jan 2006 15:57:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D43843D48 for ; Tue, 31 Jan 2006 15:57:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VFv1Vw047343 for ; Tue, 31 Jan 2006 15:57:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VFv0G9047340 for perforce@freebsd.org; Tue, 31 Jan 2006 15:57:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 15:57:00 GMT Message-Id: <200601311557.k0VFv0G9047340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90799 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 15:57:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=90799 Change 90799 by rwatson@rwatson_zoo on 2006/01/31 15:56:09 audit(1) and auditd(8) now come from OpenBSM, no need for a separate audit_supt contrib package. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/Makefile#4 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/audit.1#4 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/audit/audit.c#7 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/Makefile#7 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/audit_warn.c#5 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.8#4 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#15 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.h#5 delete .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/rc.audit#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jan 31 17:49:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE59616A424; Tue, 31 Jan 2006 17:49:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 91DC416A422 for ; Tue, 31 Jan 2006 17:49:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5799343D46 for ; Tue, 31 Jan 2006 17:49:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VHns8k060233 for ; Tue, 31 Jan 2006 17:49:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VHnsCX060230 for perforce@freebsd.org; Tue, 31 Jan 2006 17:49:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 17:49:54 GMT Message-Id: <200601311749.k0VHnsCX060230@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90808 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 17:49:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=90808 Change 90808 by rwatson@rwatson_zoo on 2006/01/31 17:48:53 Permit audit_user file to have comments in it. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#14 $ */ #include @@ -122,16 +122,23 @@ if ((fp == NULL) && ((fp = fopen(AUDIT_USER_FILE, "r")) == NULL)) return (NULL); - if (fgets(linestr, AU_LINE_MAX, fp) == NULL) - return (NULL); + while (1) { + if (fgets(linestr, AU_LINE_MAX, fp) == NULL) + return (NULL); + + /* Remove new lines. */ + if ((nl = strrchr(linestr, '\n')) != NULL) + *nl = '\0'; - /* Remove new lines. */ - if ((nl = strrchr(linestr, '\n')) != NULL) - *nl = '\0'; + /* Skip comments. */ + if (linestr[0] == '#') + continue; - /* Get the next structure. */ - if (userfromstr(linestr, u) == NULL) - return (NULL); + /* Get the next structure. */ + if (userfromstr(linestr, u) == NULL) + return (NULL); + break; + } return (u); } From owner-p4-projects@FreeBSD.ORG Tue Jan 31 17:55:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C3EF16A423; Tue, 31 Jan 2006 17:55:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D214C16A420 for ; Tue, 31 Jan 2006 17:55:02 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79FDF43D46 for ; Tue, 31 Jan 2006 17:55:02 +0000 (GMT) (envelope-from imp@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 k0VHt2Z4060523 for ; Tue, 31 Jan 2006 17:55:02 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VHt1RY060505 for perforce@freebsd.org; Tue, 31 Jan 2006 17:55:01 GMT (envelope-from imp@freebsd.org) Date: Tue, 31 Jan 2006 17:55:01 GMT Message-Id: <200601311755.k0VHt1RY060505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 90811 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 17:55:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=90811 Change 90811 by imp@imp_harmony on 2006/01/31 17:54:32 IFC @90807 Affected files ... .. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/arm/src/sys/conf/Makefile.i386#4 integrate .. //depot/projects/arm/src/sys/conf/Makefile.pc98#4 integrate .. //depot/projects/arm/src/sys/conf/NOTES#13 integrate .. //depot/projects/arm/src/sys/conf/files#14 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/arm/src/sys/conf/options#13 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/arm/src/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#12 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/arm/src/sys/dev/le/am7990.c#1 branch .. //depot/projects/arm/src/sys/dev/le/am79900.c#1 branch .. //depot/projects/arm/src/sys/dev/le/am79900reg.h#1 branch .. //depot/projects/arm/src/sys/dev/le/am79900var.h#1 branch .. //depot/projects/arm/src/sys/dev/le/am7990reg.h#1 branch .. //depot/projects/arm/src/sys/dev/le/am7990var.h#1 branch .. //depot/projects/arm/src/sys/dev/le/if_le_ledma.c#1 branch .. //depot/projects/arm/src/sys/dev/le/if_le_pci.c#1 branch .. //depot/projects/arm/src/sys/dev/le/lance.c#1 branch .. //depot/projects/arm/src/sys/dev/le/lancereg.h#1 branch .. //depot/projects/arm/src/sys/dev/le/lancevar.h#1 branch .. //depot/projects/arm/src/sys/dev/md/md.c#5 integrate .. //depot/projects/arm/src/sys/dev/ral/if_ral.c#4 integrate .. //depot/projects/arm/src/sys/dev/ral/if_ralreg.h#3 integrate .. //depot/projects/arm/src/sys/dev/ral/if_ralvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/arm/src/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/arm/src/sys/i386/include/cserial.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/elf.h#3 integrate .. //depot/projects/arm/src/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_malloc.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_rwlock.c#1 branch .. //depot/projects/arm/src/sys/kern/subr_firmware.c#1 branch .. //depot/projects/arm/src/sys/kern/subr_lock.c#2 integrate .. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/arm/src/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/arm/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/arm/src/sys/kern/tty_pty.c#6 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/arm/src/sys/kern/vfs_default.c#7 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#9 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/arm/src/sys/modules/Makefile#9 integrate .. //depot/projects/arm/src/sys/modules/ce/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/firmware/Makefile#1 branch .. //depot/projects/arm/src/sys/net/if.c#6 integrate .. //depot/projects/arm/src/sys/net/if.h#4 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/arm/src/sys/net/if_gif.c#4 integrate .. //depot/projects/arm/src/sys/net/if_gif.h#4 integrate .. //depot/projects/arm/src/sys/net/if_var.h#4 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#5 integrate .. //depot/projects/arm/src/sys/net/if_vlan_var.h#5 integrate .. //depot/projects/arm/src/sys/netgraph/ng_sppp.c#3 integrate .. //depot/projects/arm/src/sys/netinet/if_ether.c#7 integrate .. //depot/projects/arm/src/sys/netinet/in_gif.c#4 integrate .. //depot/projects/arm/src/sys/netinet6/in6_gif.c#4 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/sbus/dma_sbus.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sbus/lsi64854.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/sbus/lsi64854var.h#3 integrate .. //depot/projects/arm/src/sys/sys/_rwlock.h#1 branch .. //depot/projects/arm/src/sys/sys/firmware.h#1 branch .. //depot/projects/arm/src/sys/sys/lock.h#6 integrate .. //depot/projects/arm/src/sys/sys/mbuf.h#8 integrate .. //depot/projects/arm/src/sys/sys/rwlock.h#1 branch .. //depot/projects/arm/src/sys/tools/fw_stub.awk#1 branch .. //depot/projects/arm/src/sys/vm/redzone.c#1 branch .. //depot/projects/arm/src/sys/vm/redzone.h#1 branch .. //depot/projects/arm/src/sys/vm/vm_contig.c#5 integrate .. //depot/projects/arm/src/usr.sbin/config/config.h#4 integrate .. //depot/projects/arm/src/usr.sbin/config/config.y#4 integrate .. //depot/projects/arm/src/usr.sbin/config/main.c#4 integrate .. //depot/projects/arm/src/usr.sbin/config/mkmakefile.c#3 integrate .. //depot/projects/arm/src/usr.sbin/config/mkoptions.c#2 integrate Differences ... ==== //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.185 2006/01/26 00:35:53 flz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.186 2006/01/30 20:27:44 flz Exp $"); #include @@ -427,6 +427,14 @@ {T_DIRECT, SIP_MEDIA_REMOVABLE, "*" , "USB DISK*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, + { + /* + * Genesys 6-in-1 Card Reader + * No PR, reported by anders + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic*", "STORAGE DEVICE*", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, }; static disk_strategy_t dastrategy; ==== //depot/projects/arm/src/sys/compat/linux/linux_getcwd.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.20 2005/12/04 02:12:39 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.21 2006/01/30 08:22:56 jeff Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -327,11 +327,8 @@ */ error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); - if (error) { - vrele(lvp); - lvp = NULL; - goto out; - } + if (error != 0) + panic("vn_lock LK_RETRY returned error %d", error); if (bufp) bp = *bpp; /* @@ -383,11 +380,8 @@ } VREF(lvp); error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); - if (error != 0) { - vrele(lvp); - lvp = NULL; - goto out; - } + if (error != 0) + panic("vn_lock LK_RETRY returned %d", error); } error = linux_getcwd_scandir(&lvp, &uvp, &bp, bufp, td); if (error) ==== //depot/projects/arm/src/sys/conf/Makefile.i386#4 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.i386,v 1.270 2005/11/28 17:51:30 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.i386,v 1.271 2006/01/29 03:32:19 nyan Exp $ # # Makefile for FreeBSD # @@ -30,7 +30,9 @@ .endif .include "$S/conf/kern.pre.mk" -MKMODULESENV+= MACHINE=i386 +MACHINE=i386 + +MKMODULESENV+= MACHINE=${MACHINE} %BEFORE_DEPEND ==== //depot/projects/arm/src/sys/conf/Makefile.pc98#4 (text+ko) ==== @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.172 2005/11/28 17:51:31 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.173 2006/01/29 03:32:19 nyan Exp $ # # Makefile for FreeBSD # @@ -30,7 +30,9 @@ .endif .include "$S/conf/kern.pre.mk" -MKMODULESENV+= MACHINE=pc98 +MACHINE=pc98 + +MKMODULESENV+= MACHINE=${MACHINE} %BEFORE_DEPEND ==== //depot/projects/arm/src/sys/conf/NOTES#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1346 2006/01/14 15:35:20 bz Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1348 2006/01/31 11:09:21 pjd Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -327,6 +327,12 @@ options DEBUG_MEMGUARD # +# DEBUG_REDZONE enables buffer underflows and buffer overflows detection for +# malloc(9). +# +options DEBUG_REDZONE + +# # KTRACE enables the system-call tracing facility ktrace(2). To be more # SMP-friendly, KTRACE uses a worker thread to process most trace events # asynchronously to the thread generating the event. This requires a @@ -1187,6 +1193,7 @@ device md #Memory/malloc disk device snp #Snoop device - to look at pty/vty/etc.. device ccd #Concatenated disk driver +device firmware #firmware(9) support # Kernel side iconv library options LIBICONV ==== //depot/projects/arm/src/sys/conf/files#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1086 2006/01/26 01:30:33 cognet Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1089 2006/01/31 11:09:21 pjd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1268,6 +1268,7 @@ kern/kern_proc.c standard kern/kern_prot.c standard kern/kern_resource.c standard +kern/kern_rwlock.c standard kern/kern_sema.c standard kern/kern_shutdown.c standard kern/kern_sig.c standard @@ -1297,6 +1298,7 @@ kern/subr_devstat.c standard kern/subr_disk.c standard kern/subr_eventhandler.c standard +kern/subr_firmware.c optional firmware kern/subr_hints.c standard kern/subr_kdb.c standard kern/subr_kobj.c standard @@ -1865,6 +1867,7 @@ vm/default_pager.c standard vm/device_pager.c standard vm/phys_pager.c standard +vm/redzone.c optional DEBUG_REDZONE vm/swap_pager.c standard vm/uma_core.c standard vm/uma_dbg.c standard ==== //depot/projects/arm/src/sys/conf/kmod.mk#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.200 2005/11/29 09:37:42 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.201 2006/01/29 02:52:41 mlaier Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -36,6 +36,8 @@ # # SRCS List of source files. # +# FIRMWS List of firmware images in format filename:shortname:version +# # DESTDIR The tree where the module gets installed. [not set] # # +++ targets +++ @@ -119,6 +121,32 @@ CFLAGS+= -mlongcall -fno-omit-frame-pointer .endif +.if defined(FIRMWS) +.if !exists(@) +${KMOD:S/$/.c/}: @ +.else +${KMOD:S/$/.c/}: @/tools/fw_stub.awk +.endif + ${AWK} -f @/tools/fw_stub.awk ${FIRMWS} -m${KMOD} -c${KMOD:S/$/.c/g} + +SRCS+= ${KMOD:S/$/.c/} +CLEANFILES+= ${KMOD:S/$/.c/} + +.for _firmw in ${FIRMWS} +${_firmw:C/\:.*$/.fwo/}: ${_firmw:C/\:.*$//} + @${ECHO} ${_firmw:C/\:.*$//} ${.ALLSRC:M*${_firmw:C/\:.*$//}} +.if !exists(${.CURDIR}/${_firmw:C/\:.*$//}) + ln -s ${.ALLSRC:M*${_firmw:C/\:.*$//}} ${_firmw:C/\:.*$//} + ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} ${_firmw:C/\:.*$//} + rm -f ${_firmw:C/\:.*$//} +.else + ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} ${_firmw:C/\:.*$//} +.endif + +OBJS+= ${_firmw:C/\:.*$/.fwo/} +.endfor +.endif + OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .if !defined(PROG) ==== //depot/projects/arm/src/sys/conf/options#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.524 2006/01/10 09:19:08 phk Exp $ +# $FreeBSD: src/sys/conf/options,v 1.527 2006/01/31 11:09:21 pjd Exp $ # # On the handling of kernel options # @@ -387,6 +387,8 @@ TCP_SIGNATURE opt_inet.h TCP_SACK_DEBUG opt_tcp_sack.h TCP_DROP_SYNFIN opt_tcp_input.h +DEV_VLAN opt_vlan.h +VLAN_ARRAY opt_vlan.h XBONEHACK # Netgraph(4). Use option NETGRAPH to enable the base netgraph code. @@ -515,6 +517,7 @@ MSIZE opt_global.h REGRESSION opt_global.h RESTARTABLE_PANICS opt_global.h +RWLOCK_NOINLINE opt_global.h VFS_BIO_DEBUG opt_global.h # These are VM related options @@ -529,6 +532,9 @@ # The MemGuard replacement allocator used for tamper-after-free detection DEBUG_MEMGUARD opt_vm.h +# The RedZone malloc(9) protection +DEBUG_REDZONE opt_vm.h + # Standard SMP options SMP opt_global.h ==== //depot/projects/arm/src/sys/dev/acpi_support/acpi_asus.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.25 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.27 2006/01/29 23:59:43 philip Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on @@ -146,6 +146,30 @@ .disp_set = "SDSP" }, { + .name = "A4D", + .mled_set = "MLED", + .brn_up = "\\_SB_.PCI0.SBRG.EC0._Q0E", + .brn_dn = "\\_SB_.PCI0.SBRG.EC0._Q0F", + .brn_get = "GPLV", + .brn_set = "SPLV", +#ifdef notyet + .disp_get = "\\_SB_.PCI0.SBRG.EC0._Q10", + .disp_set = "\\_SB_.PCI0.SBRG.EC0._Q11" +#endif + }, + { + .name = "A6V", + .bled_set = "BLED", + .mled_set = "MLED", + .wled_set = "WLED", + .lcd_get = NULL, + .lcd_set = "\\_SB.PCI0.SBRG.EC0._Q10", + .brn_get = "GPLV", + .brn_set = "SPLV", + .disp_get = "\\_SB.PCI0.P0P3.VGA.GETD", + .disp_set = "SDSP" + }, + { .name = "D1x", .mled_set = "MLED", .lcd_get = "\\GP11", ==== //depot/projects/arm/src/sys/dev/acpi_support/acpi_fujitsu.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002 Sean Bullington - * 2003-2005 Anish Mistry + * 2003-2006 Anish Mistry * 2004 Mark Santcroos * All Rights Reserved. * @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_fujitsu.c,v 1.3 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_fujitsu.c,v 1.4 2006/01/29 23:52:02 philip Exp $"); #include "opt_acpi.h" #include @@ -44,11 +44,8 @@ #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("Fujitsu") -/* Change and update bits for the buttons */ -#define MOUSE_UPDATED_BIT 0x80000000 +/* Change and update bits for the hotkeys */ #define VOLUME_MUTE_BIT 0x40000000 -#define VOLUME_CHANGE_BIT 0x80000000 -#define BRIGHTNESS_CHANGE_BIT 0x80000000 /* Values of settings */ #define GENERAL_SETTING_BITS 0x0fffffff @@ -57,9 +54,20 @@ #define BRIGHTNESS_SETTING_BITS GENERAL_SETTING_BITS /* Possible state changes */ -#define VOLUME_CHANGED 1 -#define BRIGHT_CHANGED 2 -#define MOUSE_CHANGED 3 +/* + * These are NOT arbitrary values. They are the + * GHKS return value from the device that says which + * hotkey is active. They should match up with a bit + * from the GSIF bitmask. + */ +#define BRIGHT_CHANGED 0x01 +#define VOLUME_CHANGED 0x04 +#define MOUSE_CHANGED 0x08 +/* + * It is unknown which hotkey this bit is supposed to indicate, but + * according to values from GSIF this is a valid flag. + */ +#define UNKNOWN_CHANGED 0x10 /* sysctl values */ #define FN_MUTE 0 @@ -72,6 +80,10 @@ #define METHOD_GMOU 2 #define METHOD_GVOL 3 #define METHOD_MUTE 4 +#define METHOD_RBLL 5 +#define METHOD_RVOL 6 +#define METHOD_GSIF 7 +#define METHOD_GHKS 8 /* Notify event */ #define ACPI_NOTIFY_STATUS_CHANGED 0x80 @@ -83,6 +95,7 @@ struct int_nameval { char *name; int value; + int exists; }; /* @@ -95,12 +108,13 @@ /* Control methods */ struct int_nameval _sta, /* unused */ gbll, /* brightness */ - ghks, /* unused */ + ghks, /* hotkey selector */ + gbuf, /* unused (buffer?) */ gmou, /* mouse */ - gsif, /* unused */ + gsif, /* function key bitmask */ gvol, /* volume */ - rbll, /* unused */ - rvol; /* unused */ + rbll, /* number of brightness levels (radix) */ + rvol; /* number of volume levels (radix) */ /* State variables */ uint8_t bIsMuted; /* Is volume muted */ @@ -126,6 +140,7 @@ /* Utility function declarations */ static uint8_t acpi_fujitsu_update(struct acpi_fujitsu_softc *sc); static uint8_t acpi_fujitsu_init(struct acpi_fujitsu_softc *sc); +static uint8_t acpi_fujitsu_check_hardware(struct acpi_fujitsu_softc *sc); /* Driver/Module specific structure definitions. */ static device_method_t acpi_fujitsu_methods[] = { @@ -144,13 +159,13 @@ sizeof(struct acpi_fujitsu_softc), }; -/* Prototype for function buttons for getting/setting a value. */ +/* Prototype for function hotkeys for getting/setting a value. */ static int acpi_fujitsu_method_get(struct acpi_fujitsu_softc *sc, int method); static int acpi_fujitsu_method_set(struct acpi_fujitsu_softc *sc, int method, int value); static char *fujitsu_ids[] = { "FUJ02B1", NULL }; -ACPI_SERIAL_DECL(fujitsu, "Fujitsu Function Buttons"); +ACPI_SERIAL_DECL(fujitsu, "Fujitsu Function Hotkeys"); /* sysctl names and function calls */ static struct { @@ -178,6 +193,16 @@ .method = METHOD_GVOL, .description = "Speakers/headphones volume level" }, + { + .name = "volume_radix", + .method = METHOD_RVOL, + .description = "Number of volume level steps" + }, + { + .name = "lcd_brightness_radix", + .method = METHOD_RBLL, + .description = "Number of brightness level steps" + }, { NULL, 0, NULL } }; @@ -191,13 +216,16 @@ static int acpi_fujitsu_probe(device_t dev) { + char *name; + char buffer[64]; - if (acpi_disabled("fujitsu") || - ACPI_ID_PROBE(device_get_parent(dev), dev, fujitsu_ids) == NULL || - device_get_unit(dev) != 0) + name = ACPI_ID_PROBE(device_get_parent(dev), dev, fujitsu_ids); + if (acpi_disabled("fujitsu") || name == NULL || + device_get_unit(dev) > 1) return (ENXIO); - device_set_desc(dev, "Fujitsu Function Buttons"); + sprintf(buffer, "Fujitsu Function Hotkeys %s", name); + device_set_desc_copy(dev, buffer); return (0); } @@ -217,10 +245,10 @@ AcpiInstallNotifyHandler(sc->handle, ACPI_DEVICE_NOTIFY, acpi_fujitsu_notify_handler, sc); - /* Snag our default values for the buttons / button states. */ + /* Snag our default values for the hotkys / hotkey states. */ ACPI_SERIAL_BEGIN(fujitsu); if (!acpi_fujitsu_init(sc)) - device_printf(dev, "Couldn't initialize button states!\n"); + device_printf(dev, "Couldn't initialize hotkey states!\n"); ACPI_SERIAL_END(fujitsu); return (0); @@ -251,10 +279,11 @@ */ ACPI_SERIAL_BEGIN(fujitsu); - status = acpi_SetInteger(sc->handle, "SMOU", 1); - if (ACPI_FAILURE(status)) - device_printf(sc->dev, "Couldn't enable pointer\n"); - + if(sc->gmou.exists) { + status = acpi_SetInteger(sc->handle, "SMOU", 1); + if (ACPI_FAILURE(status)) + device_printf(sc->dev, "Couldn't enable pointer\n"); + } ACPI_SERIAL_END(fujitsu); return (0); @@ -316,13 +345,13 @@ /* * Initializes the names of the ACPI control methods and grabs - * the current state of all of the ACPI buttons into the softc. + * the current state of all of the ACPI hotkeys into the softc. */ static uint8_t acpi_fujitsu_init(struct acpi_fujitsu_softc *sc) { struct acpi_softc *acpi_sc; - int i; + int i, exists; ACPI_SERIAL_ASSERT(fujitsu); @@ -333,9 +362,14 @@ sc->gmou.name = "GMOU"; sc->gsif.name = "GSIF"; sc->gvol.name = "GVOL"; + sc->ghks.name = "GHKS"; + sc->gsif.name = "GSIF"; sc->rbll.name = "RBLL"; sc->rvol.name = "RVOL"; + /* Determine what hardware functionality is available */ + acpi_fujitsu_check_hardware(sc); + /* Build the sysctl tree */ acpi_sc = acpi_device_get_parent_softc(sc->dev); sysctl_ctx_init(&sc->sysctl_ctx); @@ -344,6 +378,31 @@ OID_AUTO, "fujitsu", CTLFLAG_RD, 0, ""); for (i = 0; sysctl_table[i].name != NULL; i++) { + exists = 0; + switch(sysctl_table[i].method) { + case METHOD_GMOU: + exists = sc->gmou.exists; + break; + case METHOD_GBLL: + exists = sc->gbll.exists; + break; + case METHOD_GVOL: + case METHOD_MUTE: + exists = sc->gvol.exists; + break; + case METHOD_RVOL: + exists = sc->rvol.exists; + break; + case METHOD_RBLL: + exists = sc->rbll.exists; + break; + default: + /* Allow by default */ + exists = 1; + break; + } + if(!exists) + continue; SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, sysctl_table[i].name, @@ -352,9 +411,10 @@ sysctl_table[i].description); } - /* Set the buttons to their initial states */ + + /* Set the hotkeys to their initial states */ if (!acpi_fujitsu_update(sc)) { - device_printf(sc->dev, "Couldn't init button states\n"); + device_printf(sc->dev, "Couldn't init hotkey states\n"); return (FALSE); } @@ -409,13 +469,28 @@ case METHOD_MUTE: nv = sc->gvol; break; + case METHOD_GHKS: + nv = sc->ghks; + break; + case METHOD_GSIF: + nv = sc->gsif; + break; + case METHOD_RBLL: + nv = sc->rbll; + break; + case METHOD_RVOL: + nv = sc->rvol; + break; default: return (FALSE); } + if(!nv.exists) + return (EINVAL); + status = acpi_GetInteger(sc->handle, nv.name, &nv.value); if (ACPI_FAILURE(status)) { - device_printf(sc->dev, "Couldn't query method\n"); + device_printf(sc->dev, "Couldn't query method (%s)\n", nv.name); return (FALSE); } @@ -459,6 +534,9 @@ return (EINVAL); } + if(!nv.exists) + return (EINVAL); + if (method == METHOD_MUTE) { if (value == 1) value = nv.value | VOLUME_MUTE_BIT; @@ -471,7 +549,7 @@ status = acpi_SetInteger(sc->handle, control, value); if (ACPI_FAILURE(status)) { device_printf(sc->dev, "Couldn't update %s\n", control); - return (EINVAL); + return (FALSE); } sc->lastValChanged = changed; @@ -479,86 +557,160 @@ } /* - * Query each of the ACPI control methods that contain information we're - * interested in. We check the return values from the control methods and - * adjust any state variables if they should be adjusted. + * Query the get methods to determine what functionality is available + * from the hardware function hotkeys. */ static uint8_t -acpi_fujitsu_update(struct acpi_fujitsu_softc *sc) +acpi_fujitsu_check_hardware(struct acpi_fujitsu_softc *sc) { + int val; struct acpi_softc *acpi_sc; acpi_sc = acpi_device_get_parent_softc(sc->dev); ACPI_SERIAL_ASSERT(fujitsu); + /* save the hotkey bitmask */ + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, + sc->gsif.name, &(sc->gsif.value)))) { + sc->gsif.exists = 0; + device_printf(sc->dev, "Couldn't query bitmask value\n"); + } else { + sc->gsif.exists = 1; + } /* System Volume Level */ if (ACPI_FAILURE(acpi_GetInteger(sc->handle, - sc->gvol.name, &(sc->gvol.value)))) { - device_printf(sc->dev, "Couldn't query volume level\n"); - return (FALSE); + sc->gvol.name, &val))) { + sc->gvol.exists = 0; + } else { + sc->gvol.exists = 1; } - if (sc->gvol.value & VOLUME_CHANGE_BIT) { - sc->bIsMuted = - (uint8_t)((sc->gvol.value & VOLUME_MUTE_BIT) != 0); + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, + sc->gbll.name, &val))) { + sc->gbll.exists = 0; + } else { + sc->gbll.exists = 1; + } - /* Clear the modification bit */ - sc->gvol.value &= VOLUME_SETTING_BITS; + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, + sc->ghks.name, &val))) { + sc->ghks.exists = 0; + } else { + sc->ghks.exists = 1; + } - if (sc->bIsMuted) { - acpi_UserNotify("FUJITSU", sc->handle, FN_MUTE); - ACPI_VPRINT(sc->dev, acpi_sc, "Volume is now mute\n"); - } else - ACPI_VPRINT(sc->dev, acpi_sc, "Volume is now %d\n", - sc->gvol.value); + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, + sc->gmou.name, &val))) { + sc->gmou.exists = 0; + } else { + sc->gmou.exists = 1; + } - acpi_UserNotify("FUJITSU", sc->handle, FN_VOLUME); - - sc->lastValChanged = VOLUME_CHANGED; + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, + sc->rbll.name, &val))) { + sc->rbll.exists = 0; + } else { + sc->rbll.exists = 1; } - /* Internal mouse pointer (eraserhead) */ if (ACPI_FAILURE(acpi_GetInteger(sc->handle, - sc->gmou.name, &(sc->gmou.value)))) { - device_printf(sc->dev, "Couldn't query pointer state\n"); - return (FALSE); + sc->rvol.name, &val))) { + sc->rvol.exists = 0; + } else { + sc->rvol.exists = 1; } - if (sc->gmou.value & MOUSE_UPDATED_BIT) { - sc->bIntPtrEnabled = (uint8_t)(sc->gmou.value & 0x1); + return (TRUE); +} + +/* + * Query each of the ACPI control methods that contain information we're + * interested in. We check the return values from the control methods and + * adjust any state variables if they should be adjusted. + */ +static uint8_t +acpi_fujitsu_update(struct acpi_fujitsu_softc *sc) +{ + int changed; + struct acpi_softc *acpi_sc; - /* Clear the modification bit */ - sc->gmou.value &= MOUSE_SETTING_BITS; - - acpi_UserNotify("FUJITSU", sc->handle, FN_POINTER_ENABLE); + acpi_sc = acpi_device_get_parent_softc(sc->dev); - ACPI_VPRINT(sc->dev, acpi_sc, "Internal pointer is now %s\n", - (sc->bIntPtrEnabled) ? "enabled" : "disabled"); + ACPI_SERIAL_ASSERT(fujitsu); + if(sc->gsif.exists) + changed = sc->gsif.value & acpi_fujitsu_method_get(sc,METHOD_GHKS); + else + changed = 0; - sc->lastValChanged = MOUSE_CHANGED; + /* System Volume Level */ + if(sc->gvol.exists) { + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, + sc->gvol.name, &(sc->gvol.value)))) { + device_printf(sc->dev, "Couldn't query volume level\n"); + return (FALSE); + } + + if (changed & VOLUME_CHANGED) { + sc->bIsMuted = + (uint8_t)((sc->gvol.value & VOLUME_MUTE_BIT) != 0); + + /* Clear the modification bit */ + sc->gvol.value &= VOLUME_SETTING_BITS; + + if (sc->bIsMuted) { + acpi_UserNotify("FUJITSU", sc->handle, FN_MUTE); + ACPI_VPRINT(sc->dev, acpi_sc, "Volume is now mute\n"); + } else + ACPI_VPRINT(sc->dev, acpi_sc, "Volume is now %d\n", + sc->gvol.value); + + acpi_UserNotify("FUJITSU", sc->handle, FN_VOLUME); + } } - /* Screen Brightness Level */ - if (ACPI_FAILURE(acpi_GetInteger(sc->handle, - sc->gbll.name, &(sc->gbll.value)))) { - device_printf(sc->dev, "Couldn't query brightness level\n"); - return (FALSE); + /* Internal mouse pointer (eraserhead) */ + if(sc->gmou.exists) { + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, + sc->gmou.name, &(sc->gmou.value)))) { + device_printf(sc->dev, "Couldn't query pointer state\n"); + return (FALSE); + } + + if (changed & MOUSE_CHANGED) { + sc->bIntPtrEnabled = (uint8_t)(sc->gmou.value & 0x1); + + /* Clear the modification bit */ + sc->gmou.value &= MOUSE_SETTING_BITS; + + acpi_UserNotify("FUJITSU", sc->handle, FN_POINTER_ENABLE); + + ACPI_VPRINT(sc->dev, acpi_sc, "Internal pointer is now %s\n", + (sc->bIntPtrEnabled) ? "enabled" : "disabled"); + } } - if (sc->gbll.value & BRIGHTNESS_CHANGE_BIT) { - /* No state to record here. */ - - /* Clear the modification bit */ - sc->gbll.value &= BRIGHTNESS_SETTING_BITS; - - acpi_UserNotify("FUJITSU", sc->handle, FN_LCD_BRIGHTNESS); - - ACPI_VPRINT(sc->dev, acpi_sc, "Brightness level is now %d\n", - sc->gbll.value); - - sc->lastValChanged = BRIGHT_CHANGED; + /* Screen Brightness Level */ + if(sc->gbll.exists) { + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, + sc->gbll.name, &(sc->gbll.value)))) { + device_printf(sc->dev, "Couldn't query brightness level\n"); + return (FALSE); + } + + if (changed & BRIGHT_CHANGED) { + /* No state to record here. */ + + /* Clear the modification bit */ + sc->gbll.value &= BRIGHTNESS_SETTING_BITS; + + acpi_UserNotify("FUJITSU", sc->handle, FN_LCD_BRIGHTNESS); + + ACPI_VPRINT(sc->dev, acpi_sc, "Brightness level is now %d\n", + sc->gbll.value); + } } + sc->lastValChanged = changed; return (TRUE); } ==== //depot/projects/arm/src/sys/dev/bge/if_bge.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.117 2006/01/23 15:57:02 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.118 2006/01/30 13:45:55 glebius Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -2194,7 +2194,7 @@ IFQ_SET_READY(&ifp->if_snd); ifp->if_hwassist = BGE_CSUM_FEATURES; ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_VLAN_HWTAGGING | - IFCAP_VLAN_MTU; + IFCAP_VLAN_MTU | IFCAP_VLAN_HWCSUM; ifp->if_capenable = ifp->if_capabilities; #ifdef DEVICE_POLLING ifp->if_capabilities |= IFCAP_POLLING; @@ -3519,6 +3519,7 @@ ifp->if_hwassist = BGE_CSUM_FEATURES; else ifp->if_hwassist = 0; + VLAN_CAPABILITIES(ifp); } break; default: ==== //depot/projects/arm/src/sys/dev/ce/if_ce.c#2 (text+ko) ==== @@ -16,7 +16,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ce/if_ce.c,v 1.1 2006/01/27 09:02:09 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ce/if_ce.c,v 1.2 2006/01/30 21:12:49 rik Exp $"); #include @@ -256,6 +256,74 @@ static int ce_destroy = 0; +#if __FreeBSD_version < 500000 +static int ce_open (dev_t dev, int oflags, int devtype, struct proc *p); +static int ce_close (dev_t dev, int fflag, int devtype, struct proc *p); +static int ce_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p); +#else +static int ce_open (struct cdev *dev, int oflags, int devtype, struct thread *td); +static int ce_close (struct cdev *dev, int fflag, int devtype, struct thread *td); +static int ce_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td); +#endif +#if __FreeBSD_version < 500000 +static struct cdevsw ce_cdevsw = { + ce_open, ce_close, noread, nowrite, + ce_ioctl, nopoll, nommap, nostrategy, + "ce", CDEV_MAJOR, nodump, nopsize, + D_NAGGED, -1 + }; +#elif __FreeBSD_version == 500000 +static struct cdevsw ce_cdevsw = { + ce_open, ce_close, noread, nowrite, + ce_ioctl, nopoll, nommap, nostrategy, + "ce", CDEV_MAJOR, nodump, nopsize, + D_NAGGED, + }; +#elif __FreeBSD_version <= 501000 +static struct cdevsw ce_cdevsw = { + .d_open = ce_open, + .d_close = ce_close, + .d_read = noread, + .d_write = nowrite, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 31 17:56:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2CB716A423; Tue, 31 Jan 2006 17:56:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9301816A420 for ; Tue, 31 Jan 2006 17:56:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A9F643D45 for ; Tue, 31 Jan 2006 17:56:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VHu4lP060617 for ; Tue, 31 Jan 2006 17:56:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VHu3Su060614 for perforce@freebsd.org; Tue, 31 Jan 2006 17:56:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 17:56:03 GMT Message-Id: <200601311756.k0VHu3Su060614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90812 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 17:56:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=90812 Change 90812 by rwatson@rwatson_zoo on 2006/01/31 17:55:49 Restructure audit_class parsing to match other bsm database parsers. Remove inconsistent white space. Remove undesirable comment. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#11 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#13 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#11 $ */ #include @@ -104,19 +104,21 @@ while (1) { if (fgets(linestr, AU_LINE_MAX, fp) == NULL) return (NULL); - if (linestr[0] != '#') - break; - } - /* Remove trailing new line character. */ - if ((nl = strrchr(linestr, '\n')) != NULL) - *nl = '\0'; + /* Skip comments. */ + if (linestr[0] == '#') + continue; - tokptr = linestr; + /* Remove trailing new line character. */ + if ((nl = strrchr(linestr, '\n')) != NULL) + *nl = '\0'; - /* Parse tokptr to au_class_ent components. */ - if (classfromstr(tokptr, c) == NULL) - return (NULL); + /* Parse tokptr to au_class_ent components. */ + tokptr = linestr; + if (classfromstr(tokptr, c) == NULL) + return (NULL); + break; + } return (c); } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#13 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#13 $ */ #include @@ -78,7 +78,6 @@ if (linestr[0] == '#') continue; - /* Remove trailing new line character. */ if ((nl = strrchr(linestr, '\n')) != NULL) *nl = '\0'; ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#11 $ */ #include @@ -145,13 +145,7 @@ if (linestr[0] == '#') continue; - /* - * Get the next event structure. - * - * XXXRW: Perhaps we should keep reading lines until we find - * a valid one, rather than stopping when we hit an invalid - * one? - */ + /* Get the next event structure. */ if (eventfromstr(linestr, e) == NULL) return (NULL); break; From owner-p4-projects@FreeBSD.ORG Tue Jan 31 17:58:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 502FE16A423; Tue, 31 Jan 2006 17:58:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F039816A420 for ; Tue, 31 Jan 2006 17:58:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58CC643D6D for ; Tue, 31 Jan 2006 17:58:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VHw8RO060816 for ; Tue, 31 Jan 2006 17:58:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VHw6Hr060813 for perforce@freebsd.org; Tue, 31 Jan 2006 17:58:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 17:58:06 GMT Message-Id: <200601311758.k0VHw6Hr060813@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90813 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 17:58:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=90813 Change 90813 by rwatson@rwatson_zoo on 2006/01/31 17:57:23 Integrate TrustedBSD audit3 branch from TrustedBSD OpenBSM branch: - Comment parsing for class, user configuration files. - Cleanup. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_class.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#6 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_class.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_class.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_class.c#8 $ */ #include @@ -104,19 +104,21 @@ while (1) { if (fgets(linestr, AU_LINE_MAX, fp) == NULL) return (NULL); - if (linestr[0] != '#') - break; - } - /* Remove trailing new line character. */ - if ((nl = strrchr(linestr, '\n')) != NULL) - *nl = '\0'; + /* Skip comments. */ + if (linestr[0] == '#') + continue; - tokptr = linestr; + /* Remove trailing new line character. */ + if ((nl = strrchr(linestr, '\n')) != NULL) + *nl = '\0'; - /* Parse tokptr to au_class_ent components. */ - if (classfromstr(tokptr, c) == NULL) - return (NULL); + /* Parse tokptr to au_class_ent components. */ + tokptr = linestr; + if (classfromstr(tokptr, c) == NULL) + return (NULL); + break; + } return (c); } ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#7 $ */ #include @@ -78,7 +78,6 @@ if (linestr[0] == '#') continue; - /* Remove trailing new line character. */ if ((nl = strrchr(linestr, '\n')) != NULL) *nl = '\0'; ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#8 $ */ #include @@ -145,13 +145,7 @@ if (linestr[0] == '#') continue; - /* - * Get the next event structure. - * - * XXXRW: Perhaps we should keep reading lines until we find - * a valid one, rather than stopping when we hit an invalid - * one? - */ + /* Get the next event structure. */ if (eventfromstr(linestr, e) == NULL) return (NULL); break; ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#5 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#6 $ */ #include @@ -122,16 +122,23 @@ if ((fp == NULL) && ((fp = fopen(AUDIT_USER_FILE, "r")) == NULL)) return (NULL); - if (fgets(linestr, AU_LINE_MAX, fp) == NULL) - return (NULL); + while (1) { + if (fgets(linestr, AU_LINE_MAX, fp) == NULL) + return (NULL); + + /* Remove new lines. */ + if ((nl = strrchr(linestr, '\n')) != NULL) + *nl = '\0'; - /* Remove new lines. */ - if ((nl = strrchr(linestr, '\n')) != NULL) - *nl = '\0'; + /* Skip comments. */ + if (linestr[0] == '#') + continue; - /* Get the next structure. */ - if (userfromstr(linestr, u) == NULL) - return (NULL); + /* Get the next structure. */ + if (userfromstr(linestr, u) == NULL) + return (NULL); + break; + } return (u); } From owner-p4-projects@FreeBSD.ORG Tue Jan 31 19:36:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 628BE16A423; Tue, 31 Jan 2006 19:36:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BFCB16A420 for ; Tue, 31 Jan 2006 19:36:10 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0881043D45 for ; Tue, 31 Jan 2006 19:36:10 +0000 (GMT) (envelope-from alc@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 k0VJa9ia066326 for ; Tue, 31 Jan 2006 19:36:09 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VJa9He066323 for perforce@freebsd.org; Tue, 31 Jan 2006 19:36:09 GMT (envelope-from alc@freebsd.org) Date: Tue, 31 Jan 2006 19:36:09 GMT Message-Id: <200601311936.k0VJa9He066323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90820 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 19:36:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=90820 Change 90820 by alc@alc_home on 2006/01/31 19:35:43 Make another change to preempt_contig_alloc() in order to stop it from allocating base pages. Update an assertion accordingly. (The previous revision only handled one of the two ways that this could happen.) Change the creation of the reservation zone to include UMA_ZONE_NOFREE. (I don't know that this is needed. I'm being paranoid.) Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#13 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#13 (text+ko) ==== @@ -406,7 +406,7 @@ int i; sp_zone = uma_zcreate("VM RESERVE", sizeof(struct vm_reserve), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE | UMA_ZONE_VM); KASSERT(sp_zone,("preempt_init: unable to initialize sp_zone")); for (i = -1; i < SP_LEVELS - 1; i++) @@ -527,7 +527,7 @@ goto done; /* 2. retry free pool at level-1 if level=SP_LEVELS-1 */ - if (lev == SP_LEVELS - 1) { + if (lev > 0 && lev == SP_LEVELS - 1) { lev--; goto retry; } @@ -593,7 +593,7 @@ mtx_unlock(&rres_mtx); } done: - KASSERT(lev >= -1, ("preempt_contig_alloc: invalid level")); + KASSERT(lev > -1, ("preempt_contig_alloc: invalid level")); if (level != NULL) *level = lev; return (m); From owner-p4-projects@FreeBSD.ORG Tue Jan 31 19:55:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26C0616A425; Tue, 31 Jan 2006 19:55:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B490616A420 for ; Tue, 31 Jan 2006 19:55:41 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16B6943D53 for ; Tue, 31 Jan 2006 19:55:41 +0000 (GMT) (envelope-from alc@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 k0VJtfl7067100 for ; Tue, 31 Jan 2006 19:55:41 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VJtbk3067097 for perforce@freebsd.org; Tue, 31 Jan 2006 19:55:37 GMT (envelope-from alc@freebsd.org) Date: Tue, 31 Jan 2006 19:55:37 GMT Message-Id: <200601311955.k0VJtbk3067097@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 19:55:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=90822 Change 90822 by alc@alc_home on 2006/01/31 19:55:31 IFC @90821 Loop back the assertion that was added to vm_page_alloc(). Affected files ... .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#4 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#7 integrate .. //depot/projects/superpages/doc/share/pgpkeys/krion.key#2 integrate .. //depot/projects/superpages/doc/share/sgml/mirrors.xml#5 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/articles/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/articles/contributing/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/articles/contributing/article.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/articles/cvs-freebsd/article.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/faq/book.sgml#4 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/chapter.decl#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/chapters.ent#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/doc-build/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/examples/appendix.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/overview/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/see-also/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/structure/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/the-website/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/tools/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/translations/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/writing-style/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/advanced-networking/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/audit/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/audit/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/basics/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/bibliography/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/book.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/boot/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/boot/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/chapter.decl#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/chapters.ent#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/colophon.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/config/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/config/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/cutting-edge/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/desktop/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/disks/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/eresources/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/geom/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/install/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/linuxemu/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/multimedia/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/pgpkeys/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/ports/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/security/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/txtfiles.ent#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/users/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/porters-handbook/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/porters-handbook/book.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/authors.ent#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapter.decl#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters.ent#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/ack.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/charmap.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/compose.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/converter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/devel.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/dict.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/difficult.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/faq.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/fonts.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/l10n.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/mailclient.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/message.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/multimedia.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/net.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/other.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/outta.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/preface.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/print.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/software.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/stepbystep.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/view.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/wm.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/xwin.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/zh-tut.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/share/sgml/urls.ent#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmpd/main.c#4 integrate .. //depot/projects/superpages/src/etc/defaults/periodic.conf#3 integrate .. //depot/projects/superpages/src/etc/defaults/rc.conf#5 integrate .. //depot/projects/superpages/src/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/superpages/src/lib/libc/stdio/xprintf_time.c#2 integrate .. //depot/projects/superpages/src/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/superpages/src/lib/libc/sys/pipe.2#2 integrate .. //depot/projects/superpages/src/lib/libdisk/libdisk.3#4 integrate .. //depot/projects/superpages/src/lib/libutil/pidfile.3#3 integrate .. //depot/projects/superpages/src/libexec/ftpd/ftpd.8#3 integrate .. //depot/projects/superpages/src/libexec/rtld-elf/ia64/reloc.c#3 integrate .. //depot/projects/superpages/src/libexec/rtld-elf/ia64/rtld_start.S#2 integrate .. //depot/projects/superpages/src/libexec/rtld-elf/libmap.c#2 integrate .. //depot/projects/superpages/src/release/Makefile#3 integrate .. //depot/projects/superpages/src/sbin/atacontrol/atacontrol.c#3 integrate .. //depot/projects/superpages/src/sbin/devd/Makefile#3 integrate .. //depot/projects/superpages/src/sbin/devd/devd.cc#5 integrate .. //depot/projects/superpages/src/sbin/devd/devd.hh#2 integrate .. //depot/projects/superpages/src/sbin/geom/class/concat/gconcat.8#2 integrate .. //depot/projects/superpages/src/sbin/geom/class/concat/geom_concat.c#3 integrate .. //depot/projects/superpages/src/sbin/geom/class/eli/geom_eli.c#3 integrate .. //depot/projects/superpages/src/sbin/geom/core/geom.8#2 integrate .. //depot/projects/superpages/src/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/superpages/src/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/superpages/src/sbin/sconfig/sconfig.c#2 integrate .. //depot/projects/superpages/src/share/examples/cvsup/ports-supfile#3 integrate .. //depot/projects/superpages/src/share/examples/kld/Makefile#2 integrate .. //depot/projects/superpages/src/share/examples/kld/firmware/Makefile#1 branch .. //depot/projects/superpages/src/share/examples/kld/firmware/README#1 branch .. //depot/projects/superpages/src/share/examples/kld/firmware/fwconsumer/Makefile#1 branch .. //depot/projects/superpages/src/share/examples/kld/firmware/fwconsumer/fw_consumer.c#1 branch .. //depot/projects/superpages/src/share/examples/kld/firmware/fwimage/Makefile#1 branch .. //depot/projects/superpages/src/share/examples/kld/firmware/fwimage/firmware.img#1 branch .. //depot/projects/superpages/src/share/man/man3/pthread_mutex_lock.3#2 integrate .. //depot/projects/superpages/src/share/man/man4/altq.4#3 integrate .. //depot/projects/superpages/src/share/man/man4/ipw.4#4 integrate .. //depot/projects/superpages/src/share/man/man4/iwi.4#4 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/acpi_asus.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/ce.4#1 branch .. //depot/projects/superpages/src/share/man/man4/ral.4#4 integrate .. //depot/projects/superpages/src/share/man/man4/ural.4#4 integrate .. //depot/projects/superpages/src/share/man/man5/devfs.rules.5#2 integrate .. //depot/projects/superpages/src/share/man/man5/periodic.conf.5#3 integrate .. //depot/projects/superpages/src/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/superpages/src/share/man/man9/Makefile#4 integrate .. //depot/projects/superpages/src/share/man/man9/firmware.9#1 branch .. //depot/projects/superpages/src/share/man/man9/memguard.9#3 integrate .. //depot/projects/superpages/src/share/man/man9/redzone.9#1 branch .. //depot/projects/superpages/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/superpages/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/superpages/src/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/superpages/src/sys/conf/Makefile.i386#3 integrate .. //depot/projects/superpages/src/sys/conf/Makefile.pc98#3 integrate .. //depot/projects/superpages/src/sys/conf/NOTES#6 integrate .. //depot/projects/superpages/src/sys/conf/files#8 integrate .. //depot/projects/superpages/src/sys/conf/kmod.mk#5 integrate .. //depot/projects/superpages/src/sys/conf/options#6 integrate .. //depot/projects/superpages/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/superpages/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/superpages/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/superpages/src/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/superpages/src/sys/dev/em/if_em.c#5 integrate .. //depot/projects/superpages/src/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/superpages/src/sys/dev/iwi/if_iwireg.h#4 integrate .. //depot/projects/superpages/src/sys/dev/le/am7990.c#1 branch .. //depot/projects/superpages/src/sys/dev/le/am79900.c#1 branch .. //depot/projects/superpages/src/sys/dev/le/am79900reg.h#1 branch .. //depot/projects/superpages/src/sys/dev/le/am79900var.h#1 branch .. //depot/projects/superpages/src/sys/dev/le/am7990reg.h#1 branch .. //depot/projects/superpages/src/sys/dev/le/am7990var.h#1 branch .. //depot/projects/superpages/src/sys/dev/le/if_le_ledma.c#1 branch .. //depot/projects/superpages/src/sys/dev/le/if_le_pci.c#1 branch .. //depot/projects/superpages/src/sys/dev/le/lance.c#1 branch .. //depot/projects/superpages/src/sys/dev/le/lancereg.h#1 branch .. //depot/projects/superpages/src/sys/dev/le/lancevar.h#1 branch .. //depot/projects/superpages/src/sys/dev/md/md.c#5 integrate .. //depot/projects/superpages/src/sys/dev/ral/if_ral.c#3 integrate .. //depot/projects/superpages/src/sys/dev/ral/if_ralreg.h#3 integrate .. //depot/projects/superpages/src/sys/dev/ral/if_ralvar.h#2 integrate .. //depot/projects/superpages/src/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/superpages/src/sys/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/superpages/src/sys/dev/usb/umass.c#4 integrate .. //depot/projects/superpages/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/superpages/src/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/superpages/src/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/superpages/src/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/superpages/src/sys/i386/i386/trap.c#4 integrate .. //depot/projects/superpages/src/sys/i386/include/cserial.h#2 integrate .. //depot/projects/superpages/src/sys/ia64/include/elf.h#3 integrate .. //depot/projects/superpages/src/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/superpages/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/superpages/src/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/superpages/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/superpages/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/superpages/src/sys/kern/kern_rwlock.c#1 branch .. //depot/projects/superpages/src/sys/kern/subr_firmware.c#1 branch .. //depot/projects/superpages/src/sys/kern/subr_lock.c#2 integrate .. //depot/projects/superpages/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/superpages/src/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/superpages/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/superpages/src/sys/kern/tty_pts.c#4 integrate .. //depot/projects/superpages/src/sys/kern/tty_pty.c#5 integrate .. //depot/projects/superpages/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/superpages/src/sys/kern/vfs_default.c#3 integrate .. //depot/projects/superpages/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/superpages/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/superpages/src/sys/modules/Makefile#5 integrate .. //depot/projects/superpages/src/sys/modules/ce/Makefile#1 branch .. //depot/projects/superpages/src/sys/modules/firmware/Makefile#1 branch .. //depot/projects/superpages/src/sys/net/if.c#4 integrate .. //depot/projects/superpages/src/sys/net/if.h#2 integrate .. //depot/projects/superpages/src/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/superpages/src/sys/net/if_gif.c#4 integrate .. //depot/projects/superpages/src/sys/net/if_gif.h#3 integrate .. //depot/projects/superpages/src/sys/net/if_var.h#3 integrate .. //depot/projects/superpages/src/sys/net/if_vlan.c#4 integrate .. //depot/projects/superpages/src/sys/net/if_vlan_var.h#3 integrate .. //depot/projects/superpages/src/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/superpages/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/superpages/src/sys/netinet/in_gif.c#3 integrate .. //depot/projects/superpages/src/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/superpages/src/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/superpages/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/superpages/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/superpages/src/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/superpages/src/sys/sparc64/sbus/dma_sbus.c#4 integrate .. //depot/projects/superpages/src/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/superpages/src/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/superpages/src/sys/sys/_rwlock.h#1 branch .. //depot/projects/superpages/src/sys/sys/firmware.h#1 branch .. //depot/projects/superpages/src/sys/sys/lock.h#3 integrate .. //depot/projects/superpages/src/sys/sys/mbuf.h#3 integrate .. //depot/projects/superpages/src/sys/sys/proc.h#4 integrate .. //depot/projects/superpages/src/sys/sys/rwlock.h#1 branch .. //depot/projects/superpages/src/sys/sys/turnstile.h#3 integrate .. //depot/projects/superpages/src/sys/tools/fw_stub.awk#1 branch .. //depot/projects/superpages/src/sys/vm/redzone.c#1 branch .. //depot/projects/superpages/src/sys/vm/redzone.h#1 branch .. //depot/projects/superpages/src/sys/vm/swap_pager.c#2 integrate .. //depot/projects/superpages/src/sys/vm/uma_core.c#5 integrate .. //depot/projects/superpages/src/sys/vm/vm_contig.c#8 integrate .. //depot/projects/superpages/src/sys/vm/vm_page.c#16 integrate .. //depot/projects/superpages/src/tools/regression/redzone9/Makefile#1 branch .. //depot/projects/superpages/src/tools/regression/redzone9/README#1 branch .. //depot/projects/superpages/src/tools/regression/redzone9/redzone.c#1 branch .. //depot/projects/superpages/src/tools/regression/redzone9/test.sh#1 branch .. //depot/projects/superpages/src/tools/tools/genericize/genericize.pl#2 integrate .. //depot/projects/superpages/src/tools/tools/netrate/juggle/juggle.c#2 integrate .. //depot/projects/superpages/src/usr.bin/Makefile#2 integrate .. //depot/projects/superpages/src/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/superpages/src/usr.bin/ee/ee.c#2 integrate .. //depot/projects/superpages/src/usr.bin/elfdump/elfdump.c#3 integrate .. //depot/projects/superpages/src/usr.bin/fetch/fetch.c#2 integrate .. //depot/projects/superpages/src/usr.bin/fstat/fstat.c#3 integrate .. //depot/projects/superpages/src/usr.bin/gprof/powerpc.h#1 branch .. //depot/projects/superpages/src/usr.bin/ktrdump/ktrdump.c#3 integrate .. //depot/projects/superpages/src/usr.bin/mail/mail.1#3 integrate .. //depot/projects/superpages/src/usr.bin/mktemp/mktemp.1#2 integrate .. //depot/projects/superpages/src/usr.bin/mkuzip/mkuzip.c#2 integrate .. //depot/projects/superpages/src/usr.bin/netstat/Makefile#2 integrate .. //depot/projects/superpages/src/usr.bin/netstat/ipsec.c#2 integrate .. //depot/projects/superpages/src/usr.bin/netstat/main.c#4 integrate .. //depot/projects/superpages/src/usr.bin/netstat/netstat.h#3 integrate .. //depot/projects/superpages/src/usr.bin/netstat/pfkey.c#1 branch .. //depot/projects/superpages/src/usr.bin/su/su.1#2 integrate .. //depot/projects/superpages/src/usr.bin/su/su.c#2 integrate .. //depot/projects/superpages/src/usr.bin/tar/bsdtar.1#3 integrate .. //depot/projects/superpages/src/usr.bin/touch/touch.c#2 integrate .. //depot/projects/superpages/src/usr.bin/truss/alpha-fbsd.c#2 integrate .. //depot/projects/superpages/src/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/superpages/src/usr.bin/truss/extern.h#2 integrate .. //depot/projects/superpages/src/usr.bin/truss/i386-fbsd.c#2 integrate .. //depot/projects/superpages/src/usr.bin/truss/i386-linux.c#2 integrate .. //depot/projects/superpages/src/usr.bin/truss/ia64-fbsd.c#2 integrate .. //depot/projects/superpages/src/usr.bin/truss/main.c#2 integrate .. //depot/projects/superpages/src/usr.bin/truss/powerpc-fbsd.c#1 branch .. //depot/projects/superpages/src/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/superpages/src/usr.bin/truss/syscall.h#2 integrate .. //depot/projects/superpages/src/usr.bin/truss/syscalls.c#3 integrate .. //depot/projects/superpages/src/usr.bin/truss/truss.1#2 integrate .. //depot/projects/superpages/src/usr.bin/truss/truss.h#2 integrate .. //depot/projects/superpages/src/usr.bin/wall/ttymsg.c#2 integrate .. //depot/projects/superpages/src/usr.bin/whois/whois.1#2 integrate .. //depot/projects/superpages/src/usr.bin/whois/whois.c#2 integrate .. //depot/projects/superpages/src/usr.bin/xargs/strnsubst.c#2 integrate .. //depot/projects/superpages/src/usr.bin/xargs/xargs.1#3 integrate .. //depot/projects/superpages/src/usr.bin/xargs/xargs.c#3 integrate .. //depot/projects/superpages/src/usr.sbin/adduser/adduser.sh#2 integrate .. //depot/projects/superpages/src/usr.sbin/arp/arp.8#2 integrate .. //depot/projects/superpages/src/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/Makefile#2 integrate .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#1 branch .. //depot/projects/superpages/src/usr.sbin/btxld/Makefile#2 integrate .. //depot/projects/superpages/src/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/config/config.h#3 integrate .. //depot/projects/superpages/src/usr.sbin/config/config.y#3 integrate .. //depot/projects/superpages/src/usr.sbin/config/main.c#3 integrate .. //depot/projects/superpages/src/usr.sbin/config/mkmakefile.c#3 integrate .. //depot/projects/superpages/src/usr.sbin/config/mkoptions.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/cron/crontab/crontab.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/inetd/Makefile#2 integrate .. //depot/projects/superpages/src/usr.sbin/inetd/inetd.8#2 integrate .. //depot/projects/superpages/src/usr.sbin/inetd/inetd.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/inetd/inetd.h#2 integrate .. //depot/projects/superpages/src/usr.sbin/kbdcontrol/kbdcontrol.1#2 integrate .. //depot/projects/superpages/src/usr.sbin/kbdmap/kbdmap.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/kldxref/ef_obj.c#3 integrate .. //depot/projects/superpages/src/usr.sbin/mixer/mixer.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/mountd/exports.5#2 integrate .. //depot/projects/superpages/src/usr.sbin/newsyslog/newsyslog.c#3 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/add/add.h#3 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/add/extract.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/add/perform.c#3 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/create/perform.c#3 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/create/pkg_create.1#3 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/create/pl.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/info/info.h#2 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/info/main.c#3 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/info/perform.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/info/pkg_info.1#3 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/info/show.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/lib/plist.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/pkg_install/lib/url.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/portsnap/phttpget/phttpget.c#3 integrate .. //depot/projects/superpages/src/usr.sbin/portsnap/portsnap/portsnap.8#2 integrate .. //depot/projects/superpages/src/usr.sbin/portsnap/portsnap/portsnap.sh#2 integrate .. //depot/projects/superpages/src/usr.sbin/powerd/Makefile#3 integrate .. //depot/projects/superpages/src/usr.sbin/powerd/powerd.c#4 integrate .. //depot/projects/superpages/src/usr.sbin/sysinstall/anonFTP.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/sysinstall/disks.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/sysinstall/dispatch.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/sysinstall/install.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/sysinstall/label.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/sysinstall/media.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/superpages/src/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/superpages/src/usr.sbin/sysinstall/sysinstall.h#3 integrate .. //depot/projects/superpages/src/usr.sbin/sysinstall/tcpip.c#2 integrate .. //depot/projects/superpages/src/usr.sbin/traceroute6/traceroute6.8#3 integrate .. //depot/projects/superpages/www/en/donations/wantlist.sgml#9 integrate .. //depot/projects/superpages/www/en/platforms/amd64/motherboards.sgml#4 integrate .. //depot/projects/superpages/www/en/ports/categories#4 integrate .. //depot/projects/superpages/www/en/releases/6.1R/todo.sgml#4 integrate .. //depot/projects/superpages/www/en/releng/index.sgml#4 integrate .. //depot/projects/superpages/www/en/smp/index.sgml#5 integrate Differences ... ==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1811,6 +1811,15 @@ + ports-net-p2p + release=cvs + + + Peer to peer networking. + + + + ports-news release=cvs ==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -216,7 +216,7 @@ supported by the &man.snd.emu10k1.4; driver. To add the support for this card, use the following: - device "snd_emu10k1" + device snd_emu10k1 Be sure to read the manual page of the driver for the syntax to use. Information regarding the syntax of sound @@ -466,6 +466,10 @@ Setting Default Values for Mixer Channels + + This is only supported in &os; 5.3-RELEASE and later. + + The default values for the different mixer channels are hardcoded in the sourcecode of the &man.pcm.4; driver. There are a lot of different applications and daemons that allow @@ -477,11 +481,7 @@ hint.pcm.0.vol="100" This will set the volume channel to a default value of - 100, as soon as the &man.pcm.4; module gets loaded. - - - This is only supported in &os; 5.3-RELEASE and later. - + 100, when the &man.pcm.4; module is loaded. ==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4461,9 +4461,22 @@ + Dynamic Websites with Perl & PHP + In the past few years, more businesses have turned to the + Internet in order to enhance their revenue and increase + exposure. This has also increased the need for interactive + web content. While some companies, such as µsoft;, have + introduced solutions into their proprietary products, the + open source community answered the call. Two options for + dynamic web content include mod_perl & mod_php. + + mod_perl - Perl + + mod_perl + Perl + The Apache/Perl integration project brings together the full power of the Perl programming language and the Apache @@ -4473,14 +4486,22 @@ overhead of starting an external interpreter and the penalty of Perl start-up time. - If you have not yet installed - Apache, then a version of Apache - that includes mod_perl may be installed with the www/apache13-modperl port. - + mod_perl is available a few + different ways. To use mod_perl + remember that mod_perl 1.0 only + works with Apache 1.3 and + mod_perl 2.0 only works with + Apache 2. + mod_perl 1.0 is available in + www/mod_perl and a + statically compiled version is available in + www/apache13-modperl. + mod_perl 2.0 is avaliable in + www/mod_perl2. + - - + + Tom @@ -4488,25 +4509,21 @@ Written by - - PHP + + mod_php - PHP + + mod_php + PHP + - In the past few years, more businesses have turned to the - Internet in order to enhance their revenue and increase - exposure. This has also increased the need for interactive - web content. While some companies, such as µsoft;, have - introduced solutions into their proprietary products, the - open source community answered the call. One answer, widely - used, is known as PHP. - - PHP, also known as Hypertext Preprocessor - is a general-purpose scripting language that is especially - suited for Web development. Capable of being embedded into - HTML its syntax draws upon C, &java;, - and Perl with the intention of allowing web developers - write dynamically generated webpages quickly. + PHP, also known as PHP: + Hypertext Preprocessor is a general-purpose scripting + language that is especially suited for Web development. + Capable of being embedded into HTML its + syntax draws upon C, &java;, and Perl with the intention of + allowing web developers to write dynamically generated + webpages quickly. To gain support for PHP5 for the Apache web server, begin by @@ -4515,8 +4532,8 @@ port. This will install and configure the modules required - to support dynamic web applications. Check to ensure the - following lines have been added to + to support dynamic PHP applications. Check + to ensure the following lines have been added to /usr/local/etc/apache/httpd.conf: LoadModule php5_module libexec/apache/libphp5.so @@ -4530,28 +4547,34 @@ AddType application/x-httpd-php-source .phps </IfModule> - Once completed, a simple call to the - apachectl command for a graceful - restart: + Once completed, a simple call to the + apachectl command for a graceful + restart is needed to load the PHP + module: &prompt.root; apachectl graceful - The PHP support in &os; is extremely - modular. If support for any extensions is required, an - administrator only needs to install the appropriate port - and restart Apache like recommended - above. + The PHP support in &os; is extremely + modular so the base install is very limited. It is very easy + to add support using the + lang/php5-extensions port. + This port provides a menu driven interface to + PHP extension installation. + Alternatively, individual extensions can be installed using + the appropriate port. For instance, to add support for the MySQL database server to PHP5, simply install the databases/php5-mysql - and issue the following command: + port. + + After installing an extension, the + Apache server must be reloaded to + pick up the new configuration changes. &prompt.root; apachectl graceful - - Which will enable MySQL - support in PHP. + ==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ + net-p2p + Peer to peer network applications. + + + + news USENET news software. ==== //depot/projects/superpages/doc/share/pgpkeys/krion.key#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + uid Kirill Ponomarew uid Kirill Ponomarew +sub 1024D/05AC7CA0 2006-01-30 [expires: 2008-01-30] +sub 2048g/C3EE5537 2006-01-30 [expires: 2008-01-30] ]]> ==== //depot/projects/superpages/doc/share/sgml/mirrors.xml#5 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.45 2005/12/18 22:27:19 kuriyama Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.46 2006/01/30 11:47:34 kuriyama Exp $ @@ -1114,10 +1114,31 @@ http://www.lv.FreeBSD.org/ + + www2.lv.FreeBSD.org + http://www2.lv.FreeBSD.org/ + + cvsup.lv.FreeBSD.org + + cvsup2.lv.FreeBSD.org + + + + ftp.lv.FreeBSD.org + ftp://ftp.lv.FreeBSD.org/pub/FreeBSD/ + http://ftp.lv.FreeBSD.org/pub/FreeBSD/ + + + + ftp2.lv.FreeBSD.org + ftp://ftp2.lv.FreeBSD.org/pub/FreeBSD/ + + + hostmaster@lv.FreeBSD.org ==== //depot/projects/superpages/doc/zh_TW.Big5/articles/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: doc/zh_TW.Big5/articles/Makefile,v 1.1 2006/01/08 03:04:39 vanilla Exp $ +# $FreeBSD: doc/zh_TW.Big5/articles/Makefile,v 1.2 2006/01/31 01:30:59 vanilla Exp $ SUBDIR = +SUBDIR+= contributing SUBDIR+= cvs-freebsd DOC_PREFIX?= ${.CURDIR}/../.. ==== //depot/projects/superpages/doc/zh_TW.Big5/articles/cvs-freebsd/article.sgml#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 31 20:59:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E64216A424; Tue, 31 Jan 2006 20:59:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D499D16A420 for ; Tue, 31 Jan 2006 20:59:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62F7743D48 for ; Tue, 31 Jan 2006 20:59:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VKx0Aj078690 for ; Tue, 31 Jan 2006 20:59:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VKx0pQ078687 for perforce@freebsd.org; Tue, 31 Jan 2006 20:59:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 20:59:00 GMT Message-Id: <200601312059.k0VKx0pQ078687@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90829 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 20:59:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=90829 Change 90829 by rwatson@rwatson_peppercorn on 2006/01/31 20:58:26 Mildly resort kernel version of audit.h to more resemble the OpenBSM version; slight style changes. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#21 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#21 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#20 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#21 $ */ #ifndef _BSM_AUDIT_H @@ -45,21 +45,14 @@ #define MAX_AUDIT_RECORD_SIZE 4096 #define MIN_AUDIT_FILE_SIZE (512 * 1024) -/* The special device filename */ -#define AUDITDEV_FILENAME "audit" - -/* - * File that will be read for trigger events from the kerenl - */ -#define AUDIT_TRIGGER_FILE "/dev/audit" - /* * Minimum noumber of free blocks on the filesystem containing the audit * log necessary to avoid a hard log rotation. DO NOT SET THIS VALUE TO 0 * as the kernel does an unsigned compare, plus we want to leave a few blocks * free so userspace can terminate the log, etc. */ -#define AUDIT_HARD_LIMIT_FREE_BLOCKS 4 +#define AUDIT_HARD_LIMIT_FREE_BLOCKS 4 + /* * Triggers for the audit daemon */ @@ -72,11 +65,16 @@ #define AUDIT_TRIGGER_MAX 5 /* - * File that will be read for trigger events from the kernel + * File that will be read for trigger events from the kernel. */ #define AUDIT_TRIGGER_FILE "/dev/audit" /* + * The special device filename. + */ +#define AUDITDEV_FILENAME "audit" + +/* * Pre-defined audit IDs */ #define AU_DEFAUDITID -1 From owner-p4-projects@FreeBSD.ORG Tue Jan 31 21:02:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B19216A423; Tue, 31 Jan 2006 21:02:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C779616A420 for ; Tue, 31 Jan 2006 21:02:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CC2243D46 for ; Tue, 31 Jan 2006 21:02:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VL24OA078905 for ; Tue, 31 Jan 2006 21:02:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VL24It078902 for perforce@freebsd.org; Tue, 31 Jan 2006 21:02:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 21:02:04 GMT Message-Id: <200601312102.k0VL24It078902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 21:02:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=90830 Change 90830 by rwatson@rwatson_peppercorn on 2006/01/31 21:01:03 Sync to OpenBSM. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#22 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#22 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#21 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#22 $ */ #ifndef _BSM_AUDIT_H @@ -327,8 +327,7 @@ }; typedef struct au_evclass_map au_evclass_map_t; -#ifndef _KERNEL - +#if !defined(_KERNEL) && !defined(KERNEL) int audit(const void *, int); int auditon(int, void *, int); int auditctl(const char *); @@ -338,8 +337,7 @@ int setaudit(const struct auditinfo *); int getaudit_addr(struct auditinfo_addr *, int); int setaudit_addr(const struct auditinfo_addr *, int); - -#endif /* !_KERNEL */ +#endif /* defined(_KERNEL) || defined(KERNEL) */ __END_DECLS From owner-p4-projects@FreeBSD.ORG Tue Jan 31 21:03:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3C1116A423; Tue, 31 Jan 2006 21:03:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A4D9A16A420 for ; Tue, 31 Jan 2006 21:03:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62E2643D45 for ; Tue, 31 Jan 2006 21:03:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VL361X079021 for ; Tue, 31 Jan 2006 21:03:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VL35bP079018 for perforce@freebsd.org; Tue, 31 Jan 2006 21:03:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 21:03:05 GMT Message-Id: <200601312103.k0VL35bP079018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 21:03:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=90831 Change 90831 by rwatson@rwatson_peppercorn on 2006/01/31 21:02:12 Merge OpenBSM changes into kernel audit_uevents.h. Having trouble remembering why we needed it in the kernel source though. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_uevents.h#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_uevents.h#2 (text+ko) ==== @@ -1,5 +1,6 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004 Apple Computer, Inc. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -24,12 +25,14 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_uevents.h#2 $ */ #ifndef _BSM_AUDIT_UEVENTS_H_ -#define _BSM_AUDIT_UEVENTS_H_ +#define _BSM_AUDIT_UEVENTS_H_ -/* +/*- * User level audit event numbers * * Range of audit event numbers: @@ -40,60 +43,60 @@ * 36865 - 65535 Reserved for applications * */ -#define AUE_at_create 6144 -#define AUE_at_delete 6145 -#define AUE_at_perm 6146 -#define AUE_cron_invoke 6147 -#define AUE_crontab_create 6148 -#define AUE_crontab_delete 6149 -#define AUE_crontab_perm 6150 -#define AUE_inetd_connect 6151 -#define AUE_login 6152 -#define AUE_logout 6153 -#define AUE_telnet 6154 -#define AUE_rlogin 6155 -#define AUE_mountd_mount 6156 -#define AUE_mountd_umount 6157 -#define AUE_rshd 6158 -#define AUE_su 6159 -#define AUE_halt 6160 -#define AUE_reboot 6161 -#define AUE_rexecd 6162 -#define AUE_passwd 6163 -#define AUE_rexd 6164 -#define AUE_ftpd 6165 -#define AUE_init 6166 -#define AUE_uadmin 6167 -#define AUE_shutdown 6168 -#define AUE_poweroff 6169 -#define AUE_crontab_mod 6170 -#define AUE_audit_startup 6171 -#define AUE_audit_shutdown 6172 -#define AUE_allocate_succ 6200 -#define AUE_allocate_fail 6201 -#define AUE_deallocate_succ 6202 -#define AUE_deallocate_fail 6203 -#define AUE_listdevice_succ 6205 -#define AUE_listdevice_fail 6206 -#define AUE_create_user 6207 -#define AUE_modify_user 6208 -#define AUE_delete_user 6209 -#define AUE_disable_user 6210 -#define AUE_enable_user 6211 -#define AUE_sudo 6300 -#define AUE_modify_password 6501 /* not assigned by Sun */ -#define AUE_create_group 6511 /* not assigned by Sun */ -#define AUE_delete_group 6512 /* not assigned by Sun */ -#define AUE_modify_group 6513 /* not assigned by Sun */ -#define AUE_add_to_group 6514 /* not assigned by Sun */ -#define AUE_remove_from_group 6515 /* not assigned by Sun */ -#define AUE_revoke_obj 6521 /* not assigned by Sun; not curr. used */ -#define AUE_lw_login 6600 /* not assigned by Sun; tentative */ -#define AUE_lw_logout 6601 /* not assigned by Sun; tentative */ -#define AUE_auth_user 7000 /* not assigned by Sun */ -#define AUE_ssconn 7001 /* not assigned by Sun */ -#define AUE_ssauthorize 7002 /* not assigned by Sun */ -#define AUE_ssauthint 7003 /* not assigned by Sun */ -#define AUE_openssh 32800 +#define AUE_at_create 6144 +#define AUE_at_delete 6145 +#define AUE_at_perm 6146 +#define AUE_cron_invoke 6147 +#define AUE_crontab_create 6148 +#define AUE_crontab_delete 6149 +#define AUE_crontab_perm 6150 +#define AUE_inetd_connect 6151 +#define AUE_login 6152 +#define AUE_logout 6153 +#define AUE_telnet 6154 +#define AUE_rlogin 6155 +#define AUE_mountd_mount 6156 +#define AUE_mountd_umount 6157 +#define AUE_rshd 6158 +#define AUE_su 6159 +#define AUE_halt 6160 +#define AUE_reboot 6161 +#define AUE_rexecd 6162 +#define AUE_passwd 6163 +#define AUE_rexd 6164 +#define AUE_ftpd 6165 +#define AUE_init 6166 +#define AUE_uadmin 6167 +#define AUE_shutdown 6168 +#define AUE_poweroff 6169 +#define AUE_crontab_mod 6170 +#define AUE_audit_startup 6171 +#define AUE_audit_shutdown 6172 +#define AUE_allocate_succ 6200 +#define AUE_allocate_fail 6201 +#define AUE_deallocate_succ 6202 +#define AUE_deallocate_fail 6203 +#define AUE_listdevice_succ 6205 +#define AUE_listdevice_fail 6206 +#define AUE_create_user 6207 +#define AUE_modify_user 6208 +#define AUE_delete_user 6209 +#define AUE_disable_user 6210 +#define AUE_enable_user 6211 +#define AUE_sudo 6300 +#define AUE_modify_password 6501 /* Not assigned by Sun. */ +#define AUE_create_group 6511 /* Not assigned by Sun. */ +#define AUE_delete_group 6512 /* Not assigned by Sun. */ +#define AUE_modify_group 6513 /* Not assigned by Sun. */ +#define AUE_add_to_group 6514 /* Not assigned by Sun. */ +#define AUE_remove_from_group 6515 /* Not assigned by Sun. */ +#define AUE_revoke_obj 6521 /* Not assigned by Sun; not used. */ +#define AUE_lw_login 6600 /* Not assigned by Sun; tentative. */ +#define AUE_lw_logout 6601 /* Not assigned by Sun; tentative. */ +#define AUE_auth_user 7000 /* Not assigned by Sun. */ +#define AUE_ssconn 7001 /* Not assigned by Sun. */ +#define AUE_ssauthorize 7002 /* Not assigned by Sun. */ +#define AUE_ssauthint 7003 /* Not assigned by Sun. */ +#define AUE_openssh 32800 #endif /* !_BSM_AUDIT_UEVENTS_H_ */ From owner-p4-projects@FreeBSD.ORG Tue Jan 31 21:07:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E11D816A423; Tue, 31 Jan 2006 21:07:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 95E0516A420 for ; Tue, 31 Jan 2006 21:07:12 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40DCC43D48 for ; Tue, 31 Jan 2006 21:07:12 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VL7Cm7079446 for ; Tue, 31 Jan 2006 21:07:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VL7BKY079443 for perforce@freebsd.org; Tue, 31 Jan 2006 21:07:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 Jan 2006 21:07:11 GMT Message-Id: <200601312107.k0VL7BKY079443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90833 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 21:07:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=90833 Change 90833 by rwatson@rwatson_peppercorn on 2006/01/31 21:06:31 Synchronize to OpenBSM. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/libbsm.h#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/libbsm.h#2 (text+ko) ==== @@ -1,5 +1,6 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004 Apple Computer, Inc. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions From owner-p4-projects@FreeBSD.ORG Tue Jan 31 23:41:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82C6416A423; Tue, 31 Jan 2006 23:41:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C47216A420 for ; Tue, 31 Jan 2006 23:41:30 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2790B43D45 for ; Tue, 31 Jan 2006 23:41:30 +0000 (GMT) (envelope-from alc@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 k0VNfUGH090150 for ; Tue, 31 Jan 2006 23:41:30 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VNfTUp090146 for perforce@freebsd.org; Tue, 31 Jan 2006 23:41:29 GMT (envelope-from alc@freebsd.org) Date: Tue, 31 Jan 2006 23:41:29 GMT Message-Id: <200601312341.k0VNfTUp090146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90849 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2006 23:41:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=90849 Change 90849 by alc@alc_home on 2006/01/31 23:41:03 Introduce vm_buddyq_find() and use it to reclaim pages from the cache queues in vm_page_select_cache(). Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_buddy.h#8 edit .. //depot/projects/superpages/src/sys/vm/vm_page.c#17 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_buddy.h#8 (text+ko) ==== @@ -5,3 +5,16 @@ void buddy_free(vm_page_t m, int magn); void buddy_free_locked(int baseq, vm_page_t m, int magn); void buddy_unfree(vm_page_t m); + +static __inline vm_page_t +vm_buddyq_find(int baseq) +{ + vm_page_t m; + int q; + + q = 0; + while ((m = TAILQ_FIRST(&vm_page_queues[baseq + q].pl)) == NULL && + q < BUDDY_QUEUES) + q++; + return (m); +} ==== //depot/projects/superpages/src/sys/vm/vm_page.c#17 (text+ko) ==== @@ -737,7 +737,7 @@ boolean_t was_trylocked; mtx_assert(&vm_page_queue_mtx, MA_OWNED); - while ((m = TAILQ_FIRST(&vm_page_queues[PQ_CACHE].pl)) != NULL) { + while ((m = vm_buddyq_find(PQ_CACHE)) != NULL) { KASSERT(m->dirty == 0, ("Found dirty cache page %p", m)); KASSERT(!pmap_page_is_mapped(m), ("Found mapped cache page %p", m)); From owner-p4-projects@FreeBSD.ORG Wed Feb 1 01:42:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 702FA16A423; Wed, 1 Feb 2006 01:42:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F13D516A420 for ; Wed, 1 Feb 2006 01:42:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FF9043D45 for ; Wed, 1 Feb 2006 01:42:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k111gw5J005795 for ; Wed, 1 Feb 2006 01:42:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k111gwM1005792 for perforce@freebsd.org; Wed, 1 Feb 2006 01:42:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 Feb 2006 01:42:58 GMT Message-Id: <200602010142.k111gwM1005792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90854 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2006 01:43:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=90854 Change 90854 by rwatson@rwatson_zoo on 2006/02/01 01:41:58 Kernel source tree does not require dup'd copies of these two user space include files, so don't. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_uevents.h#3 delete .. //depot/projects/trustedbsd/audit3/sys/bsm/libbsm.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Feb 1 06:52:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B0A516A422; Wed, 1 Feb 2006 06:52:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 466E116A425 for ; Wed, 1 Feb 2006 06:52:14 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D94B43D49 for ; Wed, 1 Feb 2006 06:52:14 +0000 (GMT) (envelope-from alc@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 k116qDal026894 for ; Wed, 1 Feb 2006 06:52:13 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k116qDaw026891 for perforce@freebsd.org; Wed, 1 Feb 2006 06:52:13 GMT (envelope-from alc@freebsd.org) Date: Wed, 1 Feb 2006 06:52:13 GMT Message-Id: <200602010652.k116qDaw026891@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90859 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2006 06:52:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=90859 Change 90859 by alc@alc_home on 2006/02/01 06:51:49 Simplify. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#14 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#14 (text+ko) ==== @@ -513,7 +513,7 @@ static vm_page_t preempt_contig_alloc(int *level, int free_pool) { - int l, lev = level ? *level : -1; + int l, lev = *level; vm_object_t object; vm_page_t m = NULL; reservation_t sp, sp_next; @@ -594,8 +594,7 @@ } done: KASSERT(lev > -1, ("preempt_contig_alloc: invalid level")); - if (level != NULL) - *level = lev; + *level = lev; return (m); } From owner-p4-projects@FreeBSD.ORG Wed Feb 1 07:17:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58CF416A423; Wed, 1 Feb 2006 07:17:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1460816A420 for ; Wed, 1 Feb 2006 07:17:47 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B02EF43D45 for ; Wed, 1 Feb 2006 07:17:46 +0000 (GMT) (envelope-from trhodes@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 k117HkuY027776 for ; Wed, 1 Feb 2006 07:17:46 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k117HkFH027773 for perforce@freebsd.org; Wed, 1 Feb 2006 07:17:46 GMT (envelope-from trhodes@freebsd.org) Date: Wed, 1 Feb 2006 07:17:46 GMT Message-Id: <200602010717.k117HkFH027773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 90860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2006 07:17:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=90860 Change 90860 by trhodes@trhodes_local on 2006/02/01 07:17:19 Attempt to fill in System V IPC related bits, Fix markup causing a ".Dv" macro to appear instead of intented target, Hard sentence breaks and whitespace cleared in audit.8. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#3 edit .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#2 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#3 $ .\" .Dd Jan 24, 2004 .Dt AUDIT 8 @@ -44,10 +44,11 @@ .Sh DESCRIPTION The .Nm -utility controls the state of auditing system. The optional +utility controls the state of auditing system. +The optional .Ar file operand specifies the location of the audit control input file (default -/etc/security/audit_control). +.Pa /etc/security/audit_control ). .Pp The options are as follows: .Bl -tag -width Ds @@ -56,10 +57,11 @@ a new log file in a location specified in the audit control file. .It Fl s Specifies that the audit system should [re]synchronize its -configuration from the audit control file. A new log file will be -created. +configuration from the audit control file. +A new log file will be created. .It Fl t -Specifies that the audit system should terminate. Log files are closed +Specifies that the audit system should terminate. +Log files are closed and renamed to indicate the time of the shutdown. .El .Sh NOTES ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#7 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#7 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 @@ -304,7 +304,8 @@ .It Li "Terminal Machine Address" Ta "4 bytes" Ta "IP address of machine" .El .Ss Expanded Process Token -The .Dv expanded process +The +.Dv expanded process token contains the contents of the .Dv process token, with the addition of a machine address type and variable length @@ -411,7 +412,8 @@ .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.It Li "object ID type" Ta "1 byte" Ta "Object ID" +.It Li "Object ID" Ta "4 bytes" Ta "Object ID" .El .Ss Text Token The @@ -591,6 +593,7 @@ .It Li XXXXX .El .Sh SEE ALSO +.Xr audit 8, .Xr libbsm 3 .Sh AUTHORS The Basic Security Module (BSM) interface to audit records and audit event From owner-p4-projects@FreeBSD.ORG Wed Feb 1 08:39:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92A3D16A423; Wed, 1 Feb 2006 08:39:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49DD216A420 for ; Wed, 1 Feb 2006 08:39:27 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3E4643D48 for ; Wed, 1 Feb 2006 08:39:26 +0000 (GMT) (envelope-from kmacy@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 k118dQWn031046 for ; Wed, 1 Feb 2006 08:39:26 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k118dQUJ031043 for perforce@freebsd.org; Wed, 1 Feb 2006 08:39:26 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Feb 2006 08:39:26 GMT Message-Id: <200602010839.k118dQUJ031043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 90861 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2006 08:39:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=90861 Change 90861 by kmacy@kmacy:freebsd7_xen3 on 2006/02/01 08:38:24 cleanups related to adding back isa hole don't run bios checks unless privileged use IdlePTD where it was used previously have IdlePTD be physical address instead of machine address Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#8 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/pmap.c#2 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#8 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xenpmap.h#3 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xenvar.h#5 edit .. //depot/projects/xen3/src/sys/i386/i386/bios.c#2 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#8 (text+ko) ==== @@ -2449,7 +2449,7 @@ dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL); #ifndef XEN - /* can be made to work */ + /* XXX - this can be made to work */ vm86_initialize(); #endif getmemsize(first); @@ -2489,9 +2489,9 @@ /* setup proc 0's pcb */ thread0.td_pcb->pcb_flags = 0; /* XXXKSE */ #ifdef PAE - thread0.td_pcb->pcb_cr3 = xpmap_mtop((int)IdlePDPT); + thread0.td_pcb->pcb_cr3 = (int)IdlePDPT; #else - thread0.td_pcb->pcb_cr3 = xpmap_mtop((int)IdlePTD); + thread0.td_pcb->pcb_cr3 = (int)IdlePTD; #endif thread0.td_pcb->pcb_ext = 0; thread0.td_frame = &proc0_tf; ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/pmap.c#2 (text+ko) ==== @@ -378,11 +378,7 @@ * Initialize the kernel pmap (which is statically allocated). */ PMAP_LOCK_INIT(kernel_pmap); -#ifdef XEN - kernel_pmap->pm_pdir = (pd_entry_t *) xen_start_info->pt_base; -#else kernel_pmap->pm_pdir = (pd_entry_t *) (KERNBASE + (u_int)IdlePTD); -#endif #ifdef PAE kernel_pmap->pm_pdpt = (pdpt_entry_t *) (KERNBASE + (u_int)IdlePDPT); #endif @@ -1132,11 +1128,7 @@ { PMAP_LOCK_INIT(pmap); -#ifdef XEN - pmap->pm_pdir = (pd_entry_t *)(xen_start_info->pt_base); -#else pmap->pm_pdir = (pd_entry_t *)(KERNBASE + (vm_offset_t)IdlePTD); -#endif #ifdef PAE pmap->pm_pdpt = (pdpt_entry_t *)(KERNBASE + (vm_offset_t)IdlePDPT); #endif ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#8 (text+ko) ==== @@ -552,14 +552,14 @@ bootmem_current -= size; } - +static vm_offset_t *pdir_shadow; void initvalues(start_info_t *startinfo) { int i, round_tmpindex; - vm_paddr_t pdir_shadow_ma, KPTphys; - vm_offset_t *pdir_shadow; + vm_paddr_t pdir_shadow_ma, KPTphys, *IdlePTDma; + #ifdef SMP int j; #endif @@ -583,7 +583,8 @@ #endif bzero((char *)PFNTOV(tmpindex), (round_tmpindex - tmpindex)*PAGE_SIZE); - IdlePTD = (pd_entry_t *)xpmap_ptom(VTOP(startinfo->pt_base)); + IdlePTD = (pd_entry_t *)VTOP(startinfo->pt_base); + IdlePTDma = (pd_entry_t *)xpmap_ptom(VTOP(startinfo->pt_base)); KPTphys = xpmap_ptom(VTOP(startinfo->pt_base + PAGE_SIZE)); XENPRINTF("IdlePTD %p\n", IdlePTD); XENPRINTF("nr_pages: %ld shared_info: 0x%lx flags: 0x%lx pt_base: 0x%lx " @@ -619,11 +620,11 @@ /* setup shadow mapping first so vtomach will work */ xen_pt_pin((vm_paddr_t)pdir_shadow_ma); - xen_queue_pt_update((vm_paddr_t)(IdlePTD + PTDPTDI), + xen_queue_pt_update((vm_paddr_t)(IdlePTDma + PTDPTDI), pdir_shadow_ma | PG_KERNEL); xen_queue_pt_update(pdir_shadow_ma + PTDPTDI*sizeof(vm_paddr_t), - ((vm_paddr_t)IdlePTD) | PG_V | PG_A); - xen_queue_pt_update(pdir_shadow_ma + KPTDI*sizeof(vm_paddr_t), + ((vm_paddr_t)IdlePTDma) | PG_V | PG_A); + xen_queue_pt_update(pdir_shadow_ma + (KPTDI + ISA_PDR_OFFSET)*sizeof(vm_paddr_t), KPTphys | PG_V | PG_A); xen_flush_queue(); @@ -645,7 +646,7 @@ PT_SET_MA(SMPpt, *vtopte((vm_offset_t)SMPpt) & ~PG_RW); /* put the page table into the page directory */ - xen_queue_pt_update((vm_paddr_t)(IdlePTD + MPPTDI), + xen_queue_pt_update((vm_paddr_t)(IdlePTDma + MPPTDI), xpmap_ptom((tmpindex << PAGE_SHIFT))| PG_KERNEL); xen_queue_pt_update(pdir_shadow_ma + MPPTDI*sizeof(vm_paddr_t), xpmap_ptom((tmpindex << PAGE_SHIFT))| PG_V | PG_A); @@ -659,16 +660,18 @@ if (tmpindex > 980) __asm__("int3"); #endif - /* unmap remaining pages from initial 4MB chunk */ - for (i = tmpindex; i%1024 != 0; i++) + /* unmap remaining pages from initial 4MB chunk + */ + for (i = (tmpindex - ISA_INDEX_OFFSET); i%1024 != 0; i++) xen_queue_pt_update(KPTphys + i*sizeof(vm_paddr_t), 0); xen_flush_queue(); /* allocate remainder of NKPT pages */ for (i = 0; i < NKPT-1; i++, tmpindex++) { - xen_queue_pt_update((vm_paddr_t)(IdlePTD + KPTDI + i + 1), + /* KERNBASE left unmapped (+ 1) KERNLOAD already mapped (+1) == + 2 */ + xen_queue_pt_update((vm_paddr_t)(IdlePTDma + KPTDI + i + 1 + ISA_PDR_OFFSET), xpmap_ptom((tmpindex << PAGE_SHIFT)| PG_KERNEL)); - xen_queue_pt_update(pdir_shadow_ma + (KPTDI + i + 1)*sizeof(vm_paddr_t), + xen_queue_pt_update(pdir_shadow_ma + (KPTDI + i + 1 + ISA_PDR_OFFSET)*sizeof(vm_paddr_t), xpmap_ptom((tmpindex << PAGE_SHIFT)| PG_V | PG_A)); } tmpindex += NKPT-1; ==== //depot/projects/xen3/src/sys/i386-xen/include/xenpmap.h#3 (text+ko) ==== @@ -33,7 +33,6 @@ #ifndef _XEN_XENPMAP_H_ #define _XEN_XENPMAP_H_ -#include void xen_invlpg(vm_offset_t); void xen_load_cr3(vm_paddr_t); void xen_queue_pt_update(vm_paddr_t, vm_paddr_t); @@ -170,12 +169,10 @@ xen_flush_queue(); \ } while (/*CONSTCOND*/0) - static __inline uint32_t xpmap_mtop(uint32_t mpa) { - return (((xen_machine_phys[(mpa >> PAGE_SHIFT)]) << PAGE_SHIFT) - | (mpa & ~PG_FRAME)); + return machtophys(mpa) | (mpa & ~PG_FRAME); } static __inline vm_paddr_t ==== //depot/projects/xen3/src/sys/i386-xen/include/xenvar.h#5 (text+ko) ==== @@ -1,6 +1,5 @@ #ifndef XENVAR_H_ #define XENVAR_H_ - #define XBOOTUP 0x1 #define XPMAP 0x2 extern int xendebug_flags; @@ -16,15 +15,35 @@ if (xendebug_flags & argflags) XENPRINTF("(file=%s, line=%d) " _f "\n", __FILE__, __LINE__, ## _a); extern unsigned long *xen_machine_phys; -#define PFNTOMFN(i) (((unsigned long *)xen_phys_machine)[i]) -#define MFNTOPFN(i) (xen_machine_phys[i]) +/* Xen starts physical pages after the 4MB ISA hole - + * FreeBSD doesn't + */ + +#ifdef ADD_ISA_HOLE +#define ISA_INDEX_OFFSET 1024 +#define ISA_PDR_OFFSET 1 +#else +#define ISA_INDEX_OFFSET 0 +#define ISA_PDR_OFFSET 0 +#endif + + +#define PFNTOMFN(i) (((unsigned long *)xen_phys_machine)[(i) - ISA_INDEX_OFFSET]) +#define MFNTOPFN(i) (xen_machine_phys[i] + ISA_INDEX_OFFSET) + +#define VTOP(x) ((unsigned long)(x) - KERNBASE) +#define PTOV(x) ((unsigned long)(x) + KERNBASE) + +#define VTOPFN(x) (VTOP(x) >> PAGE_SHIFT) +#define PFNTOV(x) PTOV((unsigned long)(x) << PAGE_SHIFT) + #define VTOMFN(va) (vtomach(va) >> PAGE_SHIFT) #define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT) -#define VTOP(x) ((unsigned long)(x) - KERNBASE) -#define VTOPFN(x) (((unsigned long)(x) - KERNBASE) >> PAGE_SHIFT) -#define PFNTOV(x) (((unsigned long)(x) << PAGE_SHIFT) + KERNBASE) + +#define phystomach(pa) (PFNTOMFN((pa) >> PAGE_SHIFT) << PAGE_SHIFT) +#define machtophys(ma) (MFNTOPFN((ma) >> PAGE_SHIFT) << PAGE_SHIFT) + -#define phystomach(pa) ((((unsigned long *)xen_phys_machine)[(pa >> PAGE_SHIFT)]) << PAGE_SHIFT) void xpq_init(void); #define BITS_PER_LONG 32 ==== //depot/projects/xen3/src/sys/i386/i386/bios.c#2 (text+ko) ==== @@ -83,6 +83,9 @@ int i; char *p; +#if defined(XEN) && !defined(XEN_PRIVILEGED_GUEST) + return; +#endif /* * BIOS32 Service Directory, PCI BIOS */ From owner-p4-projects@FreeBSD.ORG Wed Feb 1 10:28:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CEAC16A423; Wed, 1 Feb 2006 10:28:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C598516A420 for ; Wed, 1 Feb 2006 10:28:37 +0000 (GMT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5FCD43D6E for ; Wed, 1 Feb 2006 10:28:26 +0000 (GMT) (envelope-from jmallett@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 k11ASQap049774 for ; Wed, 1 Feb 2006 10:28:26 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k11AQWVI049735 for perforce@freebsd.org; Wed, 1 Feb 2006 10:26:32 GMT (envelope-from jmallett@freebsd.org) Date: Wed, 1 Feb 2006 10:26:32 GMT Message-Id: <200602011026.k11AQWVI049735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Cc: Subject: PERFORCE change 90866 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2006 10:28:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=90866 Change 90866 by jmallett@jmallett_vpc6 on 2006/02/01 10:23:24 IFC. Affected files ... .. //depot/projects/mips/COPYRIGHT#4 integrate .. //depot/projects/mips/LOCKS#1 branch .. //depot/projects/mips/MAINTAINERS#18 integrate .. //depot/projects/mips/Makefile#14 integrate .. //depot/projects/mips/Makefile.inc1#30 integrate .. //depot/projects/mips/ObsoleteFiles.inc#1 branch .. //depot/projects/mips/UPDATING#23 integrate .. //depot/projects/mips/bin/chflags/chflags.1#7 integrate .. //depot/projects/mips/bin/chflags/chflags.c#7 integrate .. //depot/projects/mips/bin/cp/cp.c#8 integrate .. //depot/projects/mips/bin/cp/extern.h#5 integrate .. //depot/projects/mips/bin/cp/utils.c#8 integrate .. //depot/projects/mips/bin/csh/Makefile#5 integrate .. //depot/projects/mips/bin/csh/USD.doc/csh.2#4 integrate .. //depot/projects/mips/bin/csh/config.h#4 integrate .. //depot/projects/mips/bin/csh/config_p.h#1 branch .. //depot/projects/mips/bin/date/date.1#7 integrate .. //depot/projects/mips/bin/dd/dd.1#7 integrate .. //depot/projects/mips/bin/hostname/hostname.1#5 integrate .. //depot/projects/mips/bin/kenv/kenv.1#4 integrate .. //depot/projects/mips/bin/kenv/kenv.c#5 integrate .. //depot/projects/mips/bin/ls/cmp.c#6 integrate .. //depot/projects/mips/bin/ls/extern.h#6 integrate .. //depot/projects/mips/bin/ls/ls.1#13 integrate .. //depot/projects/mips/bin/ls/ls.c#13 integrate .. //depot/projects/mips/bin/ls/util.c#7 integrate .. //depot/projects/mips/bin/mv/mv.c#5 integrate .. //depot/projects/mips/bin/ps/keyword.c#11 integrate .. //depot/projects/mips/bin/ps/ps.1#11 integrate .. //depot/projects/mips/bin/rm/rm.1#6 integrate .. //depot/projects/mips/bin/rm/rm.c#8 integrate .. //depot/projects/mips/bin/rmail/Makefile#6 integrate .. //depot/projects/mips/bin/rmdir/rmdir.1#5 integrate .. //depot/projects/mips/bin/setfacl/setfacl.1#6 integrate .. //depot/projects/mips/bin/sh/Makefile#6 integrate .. //depot/projects/mips/bin/sh/alias.c#4 integrate .. //depot/projects/mips/bin/sh/arith.h#4 integrate .. //depot/projects/mips/bin/sh/arith.y#5 integrate .. //depot/projects/mips/bin/sh/arith_lex.l#5 integrate .. //depot/projects/mips/bin/sh/bltin/bltin.h#3 integrate .. //depot/projects/mips/bin/sh/builtins.def#5 integrate .. //depot/projects/mips/bin/sh/eval.c#7 integrate .. //depot/projects/mips/bin/sh/eval.h#3 integrate .. //depot/projects/mips/bin/sh/exec.c#5 integrate .. //depot/projects/mips/bin/sh/exec.h#4 integrate .. //depot/projects/mips/bin/sh/expand.c#7 integrate .. //depot/projects/mips/bin/sh/histedit.c#4 integrate .. //depot/projects/mips/bin/sh/jobs.c#9 integrate .. //depot/projects/mips/bin/sh/mail.c#3 integrate .. //depot/projects/mips/bin/sh/memalloc.c#7 integrate .. //depot/projects/mips/bin/sh/memalloc.h#3 integrate .. //depot/projects/mips/bin/sh/miscbltin.c#3 integrate .. //depot/projects/mips/bin/sh/mkbuiltins#6 integrate .. //depot/projects/mips/bin/sh/mkinit.c#3 integrate .. //depot/projects/mips/bin/sh/mksyntax.c#4 integrate .. //depot/projects/mips/bin/sh/options.c#4 integrate .. //depot/projects/mips/bin/sh/output.c#4 integrate .. //depot/projects/mips/bin/sh/parser.c#7 integrate .. //depot/projects/mips/bin/sh/sh.1#10 integrate .. //depot/projects/mips/bin/sh/show.c#4 integrate .. //depot/projects/mips/bin/sh/trap.c#4 integrate .. //depot/projects/mips/bin/sh/var.c#6 integrate .. //depot/projects/mips/bin/sleep/sleep.c#6 integrate .. //depot/projects/mips/bin/stty/print.c#3 integrate .. //depot/projects/mips/contrib/amd/amd/amd.8#5 integrate .. //depot/projects/mips/contrib/amd/amq/amq.8#5 integrate .. //depot/projects/mips/contrib/amd/amq/pawd.1#4 integrate .. //depot/projects/mips/contrib/amd/fixmount/fixmount.8#6 integrate .. //depot/projects/mips/contrib/amd/fsinfo/fsinfo.8#6 integrate .. //depot/projects/mips/contrib/amd/hlfsd/hlfsd.8#6 integrate .. //depot/projects/mips/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate .. //depot/projects/mips/contrib/amd/scripts/amd.conf.5#6 integrate .. //depot/projects/mips/contrib/amd/wire-test/wire-test.8#4 integrate .. //depot/projects/mips/contrib/bc/bc/main.c#3 integrate .. //depot/projects/mips/contrib/bind9/CHANGES#3 integrate .. //depot/projects/mips/contrib/bind9/FAQ#3 integrate .. //depot/projects/mips/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/mips/contrib/bind9/FREEBSD-Upgrade#4 integrate .. //depot/projects/mips/contrib/bind9/FREEBSD-Xlist#3 integrate .. //depot/projects/mips/contrib/bind9/README#3 integrate .. //depot/projects/mips/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/mips/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/mips/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/mips/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/mips/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/mips/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/mips/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/mips/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/mips/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/mips/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/mips/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/mips/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/mips/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/mips/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/mips/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/mips/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/mips/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/mips/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/mips/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/mips/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/mips/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/mips/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/mips/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/mips/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/mips/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/mips/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/mips/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/mips/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/mips/contrib/bind9/config.threads.in#1 branch .. //depot/projects/mips/contrib/bind9/configure.in#3 integrate .. //depot/projects/mips/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/mips/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/mips/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/mips/contrib/bind9/doc/arm/isc.color.gif#2 delete .. //depot/projects/mips/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete .. //depot/projects/mips/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete .. //depot/projects/mips/contrib/bind9/doc/arm/validate.sh.in#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete .. //depot/projects/mips/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/mips/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3757.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc3901.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc4025.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc4033.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc4034.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc4035.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc4074.txt#1 branch .. //depot/projects/mips/contrib/bind9/doc/rfc/rfc4159.txt#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/Makefile.in#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/port_after.h.in#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch .. //depot/projects/mips/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/bind9/getaddresses.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/rdata.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/mips/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch .. //depot/projects/mips/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/print.c#3 integrate .. //depot/projects/mips/contrib/bind9/lib/lwres/strtoul.c#1 branch .. //depot/projects/mips/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/mips/contrib/bind9/version#3 integrate .. //depot/projects/mips/contrib/binutils/opcodes/sparc-opc.c#4 integrate .. //depot/projects/mips/contrib/bsnmp/FREEBSD-Xlist#5 integrate .. //depot/projects/mips/contrib/bsnmp/NEWS#6 integrate .. //depot/projects/mips/contrib/bsnmp/VERSION#6 integrate .. //depot/projects/mips/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate .. //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate .. //depot/projects/mips/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate .. //depot/projects/mips/contrib/bsnmp/lib/asn1.3#6 integrate .. //depot/projects/mips/contrib/bsnmp/lib/asn1.c#4 integrate .. //depot/projects/mips/contrib/bsnmp/lib/asn1.h#4 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmpagent.3#6 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmpclient.3#6 integrate .. //depot/projects/mips/contrib/bsnmp/lib/bsnmplib.3#6 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmp.c#4 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpagent.c#6 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpclient.c#4 integrate .. //depot/projects/mips/contrib/bsnmp/lib/snmpclient.h#4 integrate .. //depot/projects/mips/contrib/bsnmp/oid-list#2 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII.h#4 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ip.c#4 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#5 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_route.c#4 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_tcp.c#4 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/mibII_udp.c#4 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate .. //depot/projects/mips/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_ntp/NTP-MIB.txt#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_ntp/NTP-PROXY-MIB.txt#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_ntp/ntp_tree.def#1 branch .. //depot/projects/mips/contrib/bsnmp/snmp_ntp/snmp_ntp.c#1 branch .. //depot/projects/mips/contrib/bsnmp/snmpd/.gdbinit#2 delete .. //depot/projects/mips/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/config.c#5 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/main.c#6 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpd.config#6 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpmod.3#6 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/snmpmod.h#4 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/trans_udp.c#3 integrate .. //depot/projects/mips/contrib/bsnmp/snmpd/trap.c#5 integrate .. //depot/projects/mips/contrib/bzip2/CHANGES#2 integrate .. //depot/projects/mips/contrib/bzip2/FREEBSD-Xlist#1 branch .. //depot/projects/mips/contrib/bzip2/FREEBSD-upgrade#2 integrate .. //depot/projects/mips/contrib/bzip2/LICENSE#2 integrate .. //depot/projects/mips/contrib/bzip2/Makefile#2 integrate .. //depot/projects/mips/contrib/bzip2/Makefile-libbz2_so#2 integrate .. //depot/projects/mips/contrib/bzip2/README#2 integrate .. //depot/projects/mips/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate .. //depot/projects/mips/contrib/bzip2/blocksort.c#2 integrate .. //depot/projects/mips/contrib/bzip2/bzip2.1#2 integrate .. //depot/projects/mips/contrib/bzip2/bzip2.c#2 integrate .. //depot/projects/mips/contrib/bzip2/bzip2recover.c#2 integrate .. //depot/projects/mips/contrib/bzip2/bzlib.c#2 integrate .. //depot/projects/mips/contrib/bzip2/bzlib.h#2 integrate .. //depot/projects/mips/contrib/bzip2/bzlib_private.h#2 integrate .. //depot/projects/mips/contrib/bzip2/compress.c#2 integrate .. //depot/projects/mips/contrib/bzip2/crctable.c#2 integrate .. //depot/projects/mips/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/mips/contrib/bzip2/huffman.c#2 integrate .. //depot/projects/mips/contrib/bzip2/randtable.c#2 integrate .. //depot/projects/mips/contrib/bzip2/sample1.bz2.uu#2 integrate .. //depot/projects/mips/contrib/bzip2/sample1.ref.gz.uu#2 integrate .. //depot/projects/mips/contrib/bzip2/sample2.bz2.uu#2 integrate .. //depot/projects/mips/contrib/bzip2/sample2.ref.gz.uu#2 integrate .. //depot/projects/mips/contrib/bzip2/sample3.bz2.uu#2 integrate .. //depot/projects/mips/contrib/bzip2/sample3.ref.gz.uu#2 integrate .. //depot/projects/mips/contrib/com_err/compile_et.1#2 integrate .. //depot/projects/mips/contrib/cpio/ABOUT-NLS#1 branch .. //depot/projects/mips/contrib/cpio/AUTHORS#1 branch .. //depot/projects/mips/contrib/cpio/COPYING#2 integrate .. //depot/projects/mips/contrib/cpio/COPYING.LIB#2 delete .. //depot/projects/mips/contrib/cpio/ChangeLog#2 integrate .. //depot/projects/mips/contrib/cpio/FREEBSD-upgrade#3 integrate .. //depot/projects/mips/contrib/cpio/INSTALL#1 branch .. //depot/projects/mips/contrib/cpio/NEWS#2 integrate .. //depot/projects/mips/contrib/cpio/README#2 integrate .. //depot/projects/mips/contrib/cpio/THANKS#1 branch .. //depot/projects/mips/contrib/cpio/TODO#1 branch .. //depot/projects/mips/contrib/cpio/alloca.c#2 delete .. //depot/projects/mips/contrib/cpio/copyin.c#2 delete .. //depot/projects/mips/contrib/cpio/copyout.c#2 delete .. //depot/projects/mips/contrib/cpio/copypass.c#3 delete .. //depot/projects/mips/contrib/cpio/cpio.1#2 delete .. //depot/projects/mips/contrib/cpio/cpio.h#2 delete .. //depot/projects/mips/contrib/cpio/cpio.texi#2 delete .. //depot/projects/mips/contrib/cpio/cpiohdr.h#2 delete .. //depot/projects/mips/contrib/cpio/defer.c#2 delete .. //depot/projects/mips/contrib/cpio/defer.h#2 delete .. //depot/projects/mips/contrib/cpio/dirname.c#2 delete .. //depot/projects/mips/contrib/cpio/doc/cpio.1#1 branch .. //depot/projects/mips/contrib/cpio/doc/cpio.texi#1 branch .. //depot/projects/mips/contrib/cpio/dstring.c#2 delete .. //depot/projects/mips/contrib/cpio/dstring.h#2 delete .. //depot/projects/mips/contrib/cpio/error.c#2 delete .. //depot/projects/mips/contrib/cpio/extern.h#2 delete .. //depot/projects/mips/contrib/cpio/filemode.c#2 delete .. //depot/projects/mips/contrib/cpio/filetypes.h#2 delete .. //depot/projects/mips/contrib/cpio/global.c#2 delete .. //depot/projects/mips/contrib/cpio/idcache.c#2 delete .. //depot/projects/mips/contrib/cpio/lib/alloca_.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/argp-ba.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/argp-eexst.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/argp-fmtstream.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/argp-fmtstream.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/argp-fs-xinl.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/argp-help.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/argp-namefrob.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/argp-parse.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/argp-pv.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/argp-pvh.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/argp-xinl.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/argp.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/basename.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/dirname.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/dirname.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/error.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/error.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/exit.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/exitfail.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/exitfail.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/full-write.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/full-write.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/getopt.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/getopt1.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/getopt_.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/getopt_int.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/gettext.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/localedir.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/mempcpy.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/mempcpy.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/rmt.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/rtapelib.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/safe-read.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/safe-read.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/safe-write.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/safe-write.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/savedir.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/savedir.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/strcase.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/strchrnul.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/strchrnul.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/stripslash.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/strndup.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/strndup.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/strnlen.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/system.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/unlocked-io.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/xalloc-die.c#1 branch .. //depot/projects/mips/contrib/cpio/lib/xalloc.h#1 branch .. //depot/projects/mips/contrib/cpio/lib/xmalloc.c#1 branch .. //depot/projects/mips/contrib/cpio/main.c#2 delete .. //depot/projects/mips/contrib/cpio/makepath.c#2 delete .. //depot/projects/mips/contrib/cpio/rmt.h#2 delete .. //depot/projects/mips/contrib/cpio/rtapelib.c#2 delete .. //depot/projects/mips/contrib/cpio/safe-stat.h#2 delete .. //depot/projects/mips/contrib/cpio/src/copyin.c#1 branch .. //depot/projects/mips/contrib/cpio/src/copyout.c#1 branch .. //depot/projects/mips/contrib/cpio/src/copypass.c#1 branch .. //depot/projects/mips/contrib/cpio/src/cpio.h#1 branch .. //depot/projects/mips/contrib/cpio/src/cpiohdr.h#1 branch .. //depot/projects/mips/contrib/cpio/src/defer.c#1 branch .. //depot/projects/mips/contrib/cpio/src/defer.h#1 branch .. //depot/projects/mips/contrib/cpio/src/dstring.c#1 branch .. //depot/projects/mips/contrib/cpio/src/dstring.h#1 branch .. //depot/projects/mips/contrib/cpio/src/extern.h#1 branch .. //depot/projects/mips/contrib/cpio/src/filemode.c#1 branch .. //depot/projects/mips/contrib/cpio/src/filetypes.h#1 branch .. //depot/projects/mips/contrib/cpio/src/global.c#1 branch .. //depot/projects/mips/contrib/cpio/src/idcache.c#1 branch .. //depot/projects/mips/contrib/cpio/src/main.c#1 branch .. //depot/projects/mips/contrib/cpio/src/makepath.c#1 branch .. //depot/projects/mips/contrib/cpio/src/safe-stat.h#1 branch .. //depot/projects/mips/contrib/cpio/src/tar.c#1 branch .. //depot/projects/mips/contrib/cpio/src/tar.h#1 branch .. //depot/projects/mips/contrib/cpio/src/tarhdr.h#1 branch .. //depot/projects/mips/contrib/cpio/src/userspec.c#1 branch .. //depot/projects/mips/contrib/cpio/src/util.c#1 branch .. //depot/projects/mips/contrib/cpio/stripslash.c#2 delete .. //depot/projects/mips/contrib/cpio/system.h#2 delete .. //depot/projects/mips/contrib/cpio/tar.c#3 delete .. //depot/projects/mips/contrib/cpio/tar.h#2 delete .. //depot/projects/mips/contrib/cpio/tarhdr.h#2 delete .. //depot/projects/mips/contrib/cpio/userspec.c#2 delete .. //depot/projects/mips/contrib/cpio/util.c#2 delete .. //depot/projects/mips/contrib/cpio/version.c#2 delete .. //depot/projects/mips/contrib/cpio/xmalloc.c#2 delete .. //depot/projects/mips/contrib/cpio/xstrdup.c#2 delete .. //depot/projects/mips/contrib/cvs/man/cvs.1#4 integrate .. //depot/projects/mips/contrib/cvs/src/cvsbug.in#4 integrate .. //depot/projects/mips/contrib/cvs/src/login.c#4 integrate .. //depot/projects/mips/contrib/cvs/src/patch.c#5 integrate .. //depot/projects/mips/contrib/cvs/src/rcs.c#6 integrate .. //depot/projects/mips/contrib/diff/diff.c#2 integrate .. //depot/projects/mips/contrib/gcc/ChangeLog#7 integrate .. //depot/projects/mips/contrib/gcc/Makefile.in#7 integrate .. //depot/projects/mips/contrib/gcc/attribs.c#4 integrate .. //depot/projects/mips/contrib/gcc/builtins.c#6 integrate .. //depot/projects/mips/contrib/gcc/c-common.c#6 integrate .. //depot/projects/mips/contrib/gcc/c-decl.c#7 integrate .. //depot/projects/mips/contrib/gcc/c-format.c#6 integrate .. //depot/projects/mips/contrib/gcc/c-opts.c#3 integrate .. //depot/projects/mips/contrib/gcc/c-parse.in#6 integrate .. //depot/projects/mips/contrib/gcc/c-ppoutput.c#2 integrate .. //depot/projects/mips/contrib/gcc/c-semantics.c#5 integrate .. //depot/projects/mips/contrib/gcc/c-typeck.c#5 integrate .. //depot/projects/mips/contrib/gcc/c.opt#2 integrate .. //depot/projects/mips/contrib/gcc/calls.c#7 integrate .. //depot/projects/mips/contrib/gcc/cfglayout.c#4 integrate .. //depot/projects/mips/contrib/gcc/cfgrtl.c#5 integrate .. //depot/projects/mips/contrib/gcc/collect2.c#4 integrate .. //depot/projects/mips/contrib/gcc/combine.c#5 integrate .. //depot/projects/mips/contrib/gcc/common.opt#2 integrate .. //depot/projects/mips/contrib/gcc/config.gcc#6 integrate .. //depot/projects/mips/contrib/gcc/config.in#4 integrate .. //depot/projects/mips/contrib/gcc/config/alpha/alpha.c#5 integrate .. //depot/projects/mips/contrib/gcc/config/alpha/alpha.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/alpha/alpha.md#4 integrate .. //depot/projects/mips/contrib/gcc/config/alpha/qrnnd.asm#2 integrate .. //depot/projects/mips/contrib/gcc/config/alpha/t-osf4#4 integrate .. //depot/projects/mips/contrib/gcc/config/arm/arm-protos.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/arm/arm.c#5 integrate .. //depot/projects/mips/contrib/gcc/config/arm/arm.h#5 integrate .. //depot/projects/mips/contrib/gcc/config/arm/arm.md#5 integrate .. //depot/projects/mips/contrib/gcc/config/arm/t-netbsd#4 integrate .. //depot/projects/mips/contrib/gcc/config/arm/t-rtems#1 branch .. //depot/projects/mips/contrib/gcc/config/darwin-protos.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/darwin.c#4 integrate .. //depot/projects/mips/contrib/gcc/config/darwin.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/freebsd-spec.h#7 integrate .. //depot/projects/mips/contrib/gcc/config/freebsd.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/i386/cygwin1.c#2 integrate .. //depot/projects/mips/contrib/gcc/config/i386/darwin.h#3 integrate .. //depot/projects/mips/contrib/gcc/config/i386/emmintrin.h#3 integrate .. //depot/projects/mips/contrib/gcc/config/i386/freebsd.h#8 integrate .. //depot/projects/mips/contrib/gcc/config/i386/gthr-win32.c#3 integrate .. //depot/projects/mips/contrib/gcc/config/i386/i386-modes.def#3 integrate .. //depot/projects/mips/contrib/gcc/config/i386/i386-protos.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/i386/i386.c#8 integrate .. //depot/projects/mips/contrib/gcc/config/i386/i386.h#8 integrate .. //depot/projects/mips/contrib/gcc/config/i386/i386.md#5 integrate .. //depot/projects/mips/contrib/gcc/config/i386/t-rtems-i386#2 integrate .. //depot/projects/mips/contrib/gcc/config/i386/xmmintrin.h#5 integrate .. //depot/projects/mips/contrib/gcc/config/ia64/ia64.c#4 integrate .. //depot/projects/mips/contrib/gcc/config/ia64/t-glibc#2 integrate .. //depot/projects/mips/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch .. //depot/projects/mips/contrib/gcc/config/ia64/t-hpux#4 integrate .. //depot/projects/mips/contrib/gcc/config/ia64/unwind-ia64.c#4 integrate .. //depot/projects/mips/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/aix.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/aix41.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/aix43.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/aix52.h#3 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/altivec.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/altivec.md#3 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/beos.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch .. //depot/projects/mips/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/darwin.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/eabi.asm#3 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/freebsd.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/linux-unwind.h#1 branch .. //depot/projects/mips/contrib/gcc/config/rs6000/linux.h#5 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/linux64.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/rs6000-c.c#3 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/rs6000.c#6 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/rs6000.h#4 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/rs6000.md#6 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/rtems.h#5 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/spe.h#3 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/spe.md#3 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/sysv4.h#6 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/t-aix43#4 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/t-aix52#2 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/t-linux64#4 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/t-newas#3 integrate .. //depot/projects/mips/contrib/gcc/config/rs6000/t-rtems#2 integrate .. //depot/projects/mips/contrib/gcc/config/s390/s390.md#4 integrate .. //depot/projects/mips/contrib/gcc/config/s390/tpf.h#2 integrate .. //depot/projects/mips/contrib/gcc/config/sparc/sparc.c#5 integrate .. //depot/projects/mips/contrib/gcc/config/sparc/sparc.md#5 integrate .. //depot/projects/mips/contrib/gcc/config/sparc/t-elf#2 integrate .. //depot/projects/mips/contrib/gcc/config/t-libunwind#3 integrate .. //depot/projects/mips/contrib/gcc/config/t-libunwind-elf#1 branch .. //depot/projects/mips/contrib/gcc/config/t-slibgcc-darwin#2 integrate .. //depot/projects/mips/contrib/gcc/config/t-slibgcc-elf-ver#4 integrate .. //depot/projects/mips/contrib/gcc/config/t-slibgcc-sld#3 integrate .. //depot/projects/mips/contrib/gcc/configure#6 integrate .. //depot/projects/mips/contrib/gcc/configure.ac#2 integrate .. //depot/projects/mips/contrib/gcc/cp-demangle.c#4 integrate .. //depot/projects/mips/contrib/gcc/cp/ChangeLog#7 integrate .. //depot/projects/mips/contrib/gcc/cp/Make-lang.in#5 integrate .. //depot/projects/mips/contrib/gcc/cp/call.c#4 integrate .. //depot/projects/mips/contrib/gcc/cp/class.c#5 integrate .. //depot/projects/mips/contrib/gcc/cp/cp-tree.h#7 integrate .. //depot/projects/mips/contrib/gcc/cp/cvt.c#6 integrate .. //depot/projects/mips/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/mips/contrib/gcc/cp/decl.c#7 integrate .. //depot/projects/mips/contrib/gcc/cp/decl2.c#7 integrate .. //depot/projects/mips/contrib/gcc/cp/error.c#5 integrate .. //depot/projects/mips/contrib/gcc/cp/except.c#6 integrate .. //depot/projects/mips/contrib/gcc/cp/g++spec.c#4 integrate .. //depot/projects/mips/contrib/gcc/cp/init.c#7 integrate .. //depot/projects/mips/contrib/gcc/cp/mangle.c#5 integrate .. //depot/projects/mips/contrib/gcc/cp/method.c#5 integrate .. //depot/projects/mips/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/mips/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/mips/contrib/gcc/cp/pt.c#7 integrate .. //depot/projects/mips/contrib/gcc/cp/search.c#5 integrate .. //depot/projects/mips/contrib/gcc/cp/semantics.c#6 integrate .. //depot/projects/mips/contrib/gcc/cp/tree.c#6 integrate .. //depot/projects/mips/contrib/gcc/cp/typeck.c#6 integrate .. //depot/projects/mips/contrib/gcc/cp/typeck2.c#5 integrate .. //depot/projects/mips/contrib/gcc/cppfiles.c#4 integrate .. //depot/projects/mips/contrib/gcc/cpplib.c#6 integrate .. //depot/projects/mips/contrib/gcc/cppmacro.c#5 integrate .. //depot/projects/mips/contrib/gcc/crtstuff.c#4 integrate .. //depot/projects/mips/contrib/gcc/cse.c#4 integrate .. //depot/projects/mips/contrib/gcc/cselib.c#4 integrate .. //depot/projects/mips/contrib/gcc/cselib.h#4 integrate .. //depot/projects/mips/contrib/gcc/dbxout.c#6 integrate .. //depot/projects/mips/contrib/gcc/defaults.h#4 integrate .. //depot/projects/mips/contrib/gcc/doc/extend.texi#5 integrate .. //depot/projects/mips/contrib/gcc/doc/include/gcc-common.texi#5 integrate .. //depot/projects/mips/contrib/gcc/doc/invoke.texi#7 integrate .. //depot/projects/mips/contrib/gcc/doc/md.texi#4 integrate .. //depot/projects/mips/contrib/gcc/doc/tm.texi#5 integrate .. //depot/projects/mips/contrib/gcc/doc/trouble.texi#4 integrate .. //depot/projects/mips/contrib/gcc/dojump.c#2 integrate .. //depot/projects/mips/contrib/gcc/dwarf2out.c#4 integrate .. //depot/projects/mips/contrib/gcc/emit-rtl.c#6 integrate .. //depot/projects/mips/contrib/gcc/explow.c#4 integrate .. //depot/projects/mips/contrib/gcc/expmed.c#5 integrate .. //depot/projects/mips/contrib/gcc/expr.c#7 integrate .. //depot/projects/mips/contrib/gcc/expr.h#5 integrate .. //depot/projects/mips/contrib/gcc/f/ChangeLog#6 integrate .. //depot/projects/mips/contrib/gcc/f/bld.c#4 integrate .. //depot/projects/mips/contrib/gcc/f/malloc.c#3 integrate .. //depot/projects/mips/contrib/gcc/f/news.texi#5 integrate .. //depot/projects/mips/contrib/gcc/flow.c#5 integrate .. //depot/projects/mips/contrib/gcc/fold-const.c#6 integrate .. //depot/projects/mips/contrib/gcc/function.c#7 integrate .. //depot/projects/mips/contrib/gcc/gcc.c#9 integrate .. //depot/projects/mips/contrib/gcc/gcov-io.h#4 integrate .. //depot/projects/mips/contrib/gcc/gcse.c#4 integrate .. //depot/projects/mips/contrib/gcc/ginclude/stddef.h#5 integrate .. //depot/projects/mips/contrib/gcc/gthr-win32.h#4 integrate .. //depot/projects/mips/contrib/gcc/hooks.c#5 integrate .. //depot/projects/mips/contrib/gcc/hooks.h#5 integrate .. //depot/projects/mips/contrib/gcc/ifcvt.c#4 integrate .. //depot/projects/mips/contrib/gcc/jump.c#7 integrate .. //depot/projects/mips/contrib/gcc/libgcc-darwin.ver#2 integrate .. //depot/projects/mips/contrib/gcc/libgcc-std.ver#4 integrate .. //depot/projects/mips/contrib/gcc/libgcc2.c#6 integrate .. //depot/projects/mips/contrib/gcc/libgcc2.h#4 integrate .. //depot/projects/mips/contrib/gcc/loop-unroll.c#2 integrate .. //depot/projects/mips/contrib/gcc/loop.c#7 integrate .. //depot/projects/mips/contrib/gcc/mkheaders.in#3 integrate .. //depot/projects/mips/contrib/gcc/mklibgcc.in#6 integrate .. //depot/projects/mips/contrib/gcc/objc/objc-act.c#4 integrate .. //depot/projects/mips/contrib/gcc/params.def#4 integrate .. //depot/projects/mips/contrib/gcc/params.h#4 integrate .. //depot/projects/mips/contrib/gcc/postreload.c#2 integrate .. //depot/projects/mips/contrib/gcc/predict.c#4 integrate .. //depot/projects/mips/contrib/gcc/real.c#4 integrate .. //depot/projects/mips/contrib/gcc/reg-stack.c#4 integrate .. //depot/projects/mips/contrib/gcc/regclass.c#4 integrate .. //depot/projects/mips/contrib/gcc/regrename.c#4 integrate .. //depot/projects/mips/contrib/gcc/regs.h#4 integrate .. //depot/projects/mips/contrib/gcc/reload.c#6 integrate .. //depot/projects/mips/contrib/gcc/reload1.c#6 integrate .. //depot/projects/mips/contrib/gcc/rtl.h#6 integrate .. //depot/projects/mips/contrib/gcc/sibcall.c#5 integrate .. //depot/projects/mips/contrib/gcc/simplify-rtx.c#4 integrate .. //depot/projects/mips/contrib/gcc/target-def.h#4 integrate .. //depot/projects/mips/contrib/gcc/target.h#4 integrate .. //depot/projects/mips/contrib/gcc/toplev.c#6 integrate .. //depot/projects/mips/contrib/gcc/tree-inline.c#5 integrate .. //depot/projects/mips/contrib/gcc/tree.c#6 integrate .. //depot/projects/mips/contrib/gcc/tree.h#7 integrate .. //depot/projects/mips/contrib/gcc/unwind-compat.c#1 branch .. //depot/projects/mips/contrib/gcc/unwind-compat.h#1 branch .. //depot/projects/mips/contrib/gcc/unwind-dw2-fde-compat.c#1 branch .. //depot/projects/mips/contrib/gcc/unwind-dw2-fde-glibc.c#4 integrate .. //depot/projects/mips/contrib/gcc/unwind-dw2.c#5 integrate .. //depot/projects/mips/contrib/gcc/varasm.c#6 integrate .. //depot/projects/mips/contrib/gcc/version.c#7 integrate .. //depot/projects/mips/contrib/groff/COPYING#2 integrate .. //depot/projects/mips/contrib/groff/ChangeLog#4 integrate .. //depot/projects/mips/contrib/groff/ChangeLog.115#1 branch .. //depot/projects/mips/contrib/groff/ChangeLog.116#1 branch .. //depot/projects/mips/contrib/groff/ChangeLog.117#1 branch .. //depot/projects/mips/contrib/groff/ChangeLog.118#1 branch .. //depot/projects/mips/contrib/groff/FDL#2 integrate .. //depot/projects/mips/contrib/groff/FREEBSD-upgrade#3 integrate .. //depot/projects/mips/contrib/groff/INSTALL#4 integrate .. //depot/projects/mips/contrib/groff/INSTALL.gen#3 integrate .. //depot/projects/mips/contrib/groff/LICENSE#1 branch .. //depot/projects/mips/contrib/groff/MANIFEST#3 integrate .. //depot/projects/mips/contrib/groff/MORE.STUFF#3 integrate .. //depot/projects/mips/contrib/groff/Makefile#2 integrate .. //depot/projects/mips/contrib/groff/Makefile.ccpg#4 integrate .. //depot/projects/mips/contrib/groff/Makefile.comm#4 integrate .. //depot/projects/mips/contrib/groff/Makefile.cpg#3 integrate .. //depot/projects/mips/contrib/groff/Makefile.in#4 integrate .. //depot/projects/mips/contrib/groff/Makefile.init#2 integrate .. //depot/projects/mips/contrib/groff/Makefile.sub#4 integrate .. //depot/projects/mips/contrib/groff/NEWS#4 integrate .. //depot/projects/mips/contrib/groff/PROBLEMS#4 integrate .. //depot/projects/mips/contrib/groff/PROJECTS#2 integrate .. //depot/projects/mips/contrib/groff/README#3 integrate .. //depot/projects/mips/contrib/groff/README.MinGW#1 branch .. //depot/projects/mips/contrib/groff/README.WIN32#2 delete .. //depot/projects/mips/contrib/groff/REVISION#4 integrate .. //depot/projects/mips/contrib/groff/TODO#2 integrate .. //depot/projects/mips/contrib/groff/aclocal.m4#4 integrate .. //depot/projects/mips/contrib/groff/configure#4 integrate .. //depot/projects/mips/contrib/groff/configure.ac#4 integrate .. //depot/projects/mips/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate .. //depot/projects/mips/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/README#1 branch .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/tests/file1#1 branch .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/tests/file2#1 branch .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch .. //depot/projects/mips/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch .. //depot/projects/mips/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch .. //depot/projects/mips/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch .. //depot/projects/mips/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch .. //depot/projects/mips/contrib/groff/contrib/groffer/ChangeLog#3 integrate .. //depot/projects/mips/contrib/groff/contrib/groffer/Makefile.sub#3 integrate .. //depot/projects/mips/contrib/groff/contrib/groffer/README#2 integrate .. //depot/projects/mips/contrib/groff/contrib/groffer/README_SH#1 branch .. //depot/projects/mips/contrib/groff/contrib/groffer/TODO#3 integrate .. //depot/projects/mips/contrib/groff/contrib/groffer/groffer.man#3 integrate .. //depot/projects/mips/contrib/groff/contrib/groffer/groffer.sh#3 integrate .. //depot/projects/mips/contrib/groff/contrib/groffer/groffer2.sh#1 branch .. //depot/projects/mips/contrib/groff/contrib/mm/ChangeLog#4 integrate .. //depot/projects/mips/contrib/groff/contrib/mm/groff_mm.man#4 integrate .. //depot/projects/mips/contrib/groff/contrib/mm/m.tmac#4 integrate .. //depot/projects/mips/contrib/groff/contrib/mm/mmroff.pl#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/BUGS#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/ChangeLog#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/Makefile.sub#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/NEWS#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/TODO#2 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/copyright#2 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/examples/README.mom#2 delete .. //depot/projects/mips/contrib/groff/contrib/mom/examples/README.txt#1 branch .. //depot/projects/mips/contrib/groff/contrib/mom/examples/elvis_syntax#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch .. //depot/projects/mips/contrib/groff/contrib/mom/examples/macros.mom#2 delete .. //depot/projects/mips/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch .. //depot/projects/mips/contrib/groff/contrib/mom/examples/typeset.mom#3 delete .. //depot/projects/mips/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch .. //depot/projects/mips/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete .. //depot/projects/mips/contrib/groff/contrib/mom/groff_mom.man#2 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/color.html#1 branch .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/docelement.html#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/docprocessing.html#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/goodies.html#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/inlines.html#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/intro.html#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/refer.html#1 branch .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/reserved.html#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/toc.html#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/typesetting.html#3 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/momdoc/using.html#2 integrate .. //depot/projects/mips/contrib/groff/contrib/mom/om.tmac#3 integrate .. //depot/projects/mips/contrib/groff/contrib/pdfmark/ChangeLog#1 branch .. //depot/projects/mips/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch .. //depot/projects/mips/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch .. //depot/projects/mips/contrib/groff/contrib/pdfmark/README#1 branch .. //depot/projects/mips/contrib/groff/contrib/pdfmark/TODO#1 branch .. //depot/projects/mips/contrib/groff/contrib/pdfmark/cover.ms#1 branch .. //depot/projects/mips/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch .. //depot/projects/mips/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch .. //depot/projects/mips/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch .. //depot/projects/mips/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch .. //depot/projects/mips/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch .. //depot/projects/mips/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate .. //depot/projects/mips/contrib/groff/contrib/pic2graph/pic2graph.sh#3 integrate .. //depot/projects/mips/contrib/groff/doc/Makefile.in#3 integrate .. //depot/projects/mips/contrib/groff/doc/Makefile.sub#3 integrate .. //depot/projects/mips/contrib/groff/doc/fdl.texi#2 integrate .. //depot/projects/mips/contrib/groff/doc/fixinfo.sh#1 branch .. //depot/projects/mips/contrib/groff/doc/groff#3 integrate .. //depot/projects/mips/contrib/groff/doc/groff-1#3 integrate .. //depot/projects/mips/contrib/groff/doc/groff-10#3 delete .. //depot/projects/mips/contrib/groff/doc/groff-11#3 delete .. //depot/projects/mips/contrib/groff/doc/groff-2#3 integrate .. //depot/projects/mips/contrib/groff/doc/groff-3#3 integrate .. //depot/projects/mips/contrib/groff/doc/groff-4#3 delete .. //depot/projects/mips/contrib/groff/doc/groff-5#3 delete .. //depot/projects/mips/contrib/groff/doc/groff-6#3 delete .. //depot/projects/mips/contrib/groff/doc/groff-7#3 delete .. //depot/projects/mips/contrib/groff/doc/groff-8#3 delete .. //depot/projects/mips/contrib/groff/doc/groff-9#3 delete .. //depot/projects/mips/contrib/groff/doc/groff.css#1 branch .. //depot/projects/mips/contrib/groff/doc/groff.texinfo#4 integrate .. //depot/projects/mips/contrib/groff/doc/meref.me#3 integrate .. //depot/projects/mips/contrib/groff/doc/pic.ms#4 integrate .. //depot/projects/mips/contrib/groff/doc/texinfo.tex#4 integrate .. //depot/projects/mips/contrib/groff/doc/webpage.ms#3 integrate .. //depot/projects/mips/contrib/groff/font/devdvi/generate/Makefile#4 integrate .. //depot/projects/mips/contrib/groff/font/devhtml/DESC.proto#4 integrate .. //depot/projects/mips/contrib/groff/font/devhtml/Makefile.sub#3 integrate .. //depot/projects/mips/contrib/groff/font/devhtml/R.proto#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/AB#1 branch .. //depot/projects/mips/contrib/groff/font/devlj4/ABI#1 branch .. //depot/projects/mips/contrib/groff/font/devlj4/AI#1 branch .. //depot/projects/mips/contrib/groff/font/devlj4/ALBB#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/ALBR#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/AOB#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/AOI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/AOR#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/AR#1 branch .. //depot/projects/mips/contrib/groff/font/devlj4/CB#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/CBI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/CI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/CLARENDON#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/CORONET#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/CR#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/GB#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/GBI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/GI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/GR#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/LGB#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/LGI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/LGR#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/MARIGOLD#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/Makefile.sub#2 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/OB#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/OBI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/OI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/OR#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/S#3 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/SYMBOL#1 branch .. //depot/projects/mips/contrib/groff/font/devlj4/TB#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/TBI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/TI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/TNRB#1 branch .. //depot/projects/mips/contrib/groff/font/devlj4/TNRBI#1 branch .. //depot/projects/mips/contrib/groff/font/devlj4/TNRI#1 branch .. //depot/projects/mips/contrib/groff/font/devlj4/TNRR#1 branch .. //depot/projects/mips/contrib/groff/font/devlj4/TR#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/UB#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/UBI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/UCB#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/UCBI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/UCI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/UCR#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/UI#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/UR#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/WINGDINGS#1 branch .. //depot/projects/mips/contrib/groff/font/devlj4/generate/Makefile#3 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/generate/special.awk#1 branch .. //depot/projects/mips/contrib/groff/font/devlj4/generate/special.map#3 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/generate/symbol.map#1 branch .. //depot/projects/mips/contrib/groff/font/devlj4/generate/text.map#4 integrate .. //depot/projects/mips/contrib/groff/font/devlj4/generate/wingdings.map#1 branch .. //depot/projects/mips/contrib/groff/font/devps/AB#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/ABI#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/AI#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/AR#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/HB#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/HBI#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/HI#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/HNB#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/HNBI#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/HNI#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/HNR#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/HR#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/NB#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/NBI#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/NI#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/NR#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/PB#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/PBI#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/PI#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/PR#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/S#4 integrate .. //depot/projects/mips/contrib/groff/font/devps/SS#3 integrate .. //depot/projects/mips/contrib/groff/font/devps/TB#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 1 16:02:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85D2316A423; Wed, 1 Feb 2006 16:02:25 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2CBA916A420 for ; Wed, 1 Feb 2006 16:02:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7FC643D48 for ; Wed, 1 Feb 2006 16:02:24 +0000 (GMT) (envelope-from jhb@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 k11G2OKZ072303 for ; Wed, 1 Feb 2006 16:02:24 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k11G2Osf072300 for perforce@freebsd.org; Wed, 1 Feb 2006 16:02:24 GMT (envelope-from jhb@freebsd.org) Date: Wed, 1 Feb 2006 16:02:24 GMT Message-Id: <200602011602.k11G2Osf072300@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 90882 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2006 16:02:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=90882 Change 90882 by jhb@jhb_slimer on 2006/02/01 16:01:47 IFC @90526 to just get the new files before subsequent fixes. Affected files ... .. //depot/projects/smpng/sys/conf/files#165 integrate .. //depot/projects/smpng/sys/conf/options#113 integrate .. //depot/projects/smpng/sys/kern/kern_ktr.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#1 branch .. //depot/projects/smpng/sys/kern/subr_lock.c#3 integrate .. //depot/projects/smpng/sys/sys/lock.h#38 integrate .. //depot/projects/smpng/sys/sys/proc.h#160 integrate .. //depot/projects/smpng/sys/sys/rwlock.h#1 branch Differences ... ==== //depot/projects/smpng/sys/conf/files#165 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1086 2006/01/26 01:30:33 cognet Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1087 2006/01/27 23:13:24 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1268,6 +1268,7 @@ kern/kern_proc.c standard kern/kern_prot.c standard kern/kern_resource.c standard +kern/kern_rwlock.c standard kern/kern_sema.c standard kern/kern_shutdown.c standard kern/kern_sig.c standard ==== //depot/projects/smpng/sys/conf/options#113 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.524 2006/01/10 09:19:08 phk Exp $ +# $FreeBSD: src/sys/conf/options,v 1.525 2006/01/27 23:13:25 jhb Exp $ # # On the handling of kernel options # @@ -513,6 +513,7 @@ MSIZE opt_global.h REGRESSION opt_global.h RESTARTABLE_PANICS opt_global.h +RWLOCK_NOINLINE opt_global.h VFS_BIO_DEBUG opt_global.h # These are VM related options ==== //depot/projects/smpng/sys/kern/kern_ktr.c#33 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_ktr.c,v 1.50 2006/01/27 22:17:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_ktr.c,v 1.51 2006/01/27 23:06:08 jhb Exp $"); #include "opt_ddb.h" #include "opt_ktr.h" @@ -154,9 +154,9 @@ enable = ktr_alq_enabled; - error = sysctl_handle_int(oidp, &enable, 0, req); - if (error || !req->newptr) - return (error); + error = sysctl_handle_int(oidp, &enable, 0, req); + if (error || !req->newptr) + return (error); if (enable) { if (ktr_alq_enabled) ==== //depot/projects/smpng/sys/kern/subr_lock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.3 2006/01/18 18:02:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.4 2006/01/27 23:13:25 jhb Exp $"); #include "opt_ddb.h" @@ -53,6 +53,7 @@ &lock_class_mtx_spin, &lock_class_mtx_sleep, &lock_class_sx, + &lock_class_rw, }; void ==== //depot/projects/smpng/sys/sys/lock.h#38 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/sys/lock.h,v 1.57 2006/01/27 22:20:14 jhb Exp $ + * $FreeBSD: src/sys/sys/lock.h,v 1.58 2006/01/27 23:13:26 jhb Exp $ */ #ifndef _SYS_LOCK_H_ @@ -211,6 +211,7 @@ extern struct lock_class lock_class_mtx_sleep; extern struct lock_class lock_class_mtx_spin; extern struct lock_class lock_class_sx; +extern struct lock_class lock_class_rw; extern struct lock_class *lock_classes[]; ==== //depot/projects/smpng/sys/sys/proc.h#160 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.447 2006/01/18 20:18:40 julian Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.448 2006/01/27 23:04:43 jhb Exp $ */ #ifndef _SYS_PROC_H_ @@ -269,6 +269,7 @@ u_char td_oncpu; /* (j) Which cpu we are on. */ volatile u_char td_owepreempt; /* (k*) Preempt on last critical_exit */ short td_locks; /* (k) DEBUG: lockmgr count of locks. */ + u_char td_tsqueue; /* (j) Turnstile queue blocked on. */ struct turnstile *td_blocked; /* (j) Lock thread is blocked on. */ const char *td_lockname; /* (j) Name of lock blocked on. */ LIST_HEAD(, turnstile) td_contested; /* (q) Contested locks. */ From owner-p4-projects@FreeBSD.ORG Wed Feb 1 16:43:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8595016A423; Wed, 1 Feb 2006 16:43:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40FB516A420 for ; Wed, 1 Feb 2006 16:43:17 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C648243D46 for ; Wed, 1 Feb 2006 16:43:16 +0000 (GMT) (envelope-from jhb@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 k11GhGvH073833 for ; Wed, 1 Feb 2006 16:43:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k11GhG1n073830 for perforce@freebsd.org; Wed, 1 Feb 2006 16:43:16 GMT (envelope-from jhb@freebsd.org) Date: Wed, 1 Feb 2006 16:43:16 GMT Message-Id: <200602011643.k11GhG1n073830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 90886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2006 16:43:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=90886 Change 90886 by jhb@jhb_slimer on 2006/02/01 16:42:32 IFC @90559. Affected files ... .. //depot/projects/smpng/sys/dev/em/if_em.c#64 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#22 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#119 integrate .. //depot/projects/smpng/sys/sys/_rwlock.h#1 branch Differences ... ==== //depot/projects/smpng/sys/dev/em/if_em.c#64 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.103 2006/01/22 01:06:55 mux Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.104 2006/01/28 15:50:19 scottl Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -2324,7 +2324,7 @@ size, /* maxsize */ 1, /* nsegments */ size, /* maxsegsize */ - BUS_DMA_ALLOCNOW, /* flags */ + 0, /* flags */ NULL, /* lockfunc */ NULL, /* lockarg */ &dma->dma_tag); ==== //depot/projects/smpng/sys/kern/subr_sleepqueue.c#22 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.22 2006/01/27 22:24:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.23 2006/01/28 00:49:31 imp Exp $"); #include "opt_sleepqueue_profiling.h" #include "opt_ddb.h" @@ -853,7 +853,9 @@ { struct sleepqueue_chain *sc; struct sleepqueue *sq; +#ifdef INVARIANTS struct lock_object *lock; +#endif struct thread *td; void *wchan; int i; ==== //depot/projects/smpng/sys/kern/vfs_subr.c#119 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.655 2006/01/21 19:42:10 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.656 2006/01/28 03:06:35 kris Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -1920,7 +1920,6 @@ { int oweinact; int oldflags; - int usecount; int error; error = 0; @@ -1942,7 +1941,6 @@ flags |= LK_EXCLUSIVE; oweinact = 1; } - usecount = vp->v_usecount; v_incr_usecount(vp); if ((error = vn_lock(vp, flags | LK_INTERLOCK, td)) != 0) { VI_LOCK(vp); @@ -1953,24 +1951,6 @@ * active. */ v_decr_usecount(vp); - /* - * Print warning when race below occur: - * - * thread1 thread2 - * ------- ------- - * v_usecount=0 - * vref(vp) v_usecount=1 - * vget(vp) - * v_incr_usecount(vp) v_usecount=2 - * vn_lock(vp) - * vrele(vp) v_usecount=1 - * v_decr_usecount(vp) v_usecount=0 - * - * In such situation VOP_INACTIVE() will not be called for - * the vnode vp. - */ - if (usecount > 0 && vp->v_usecount == 0) - printf("vinactive() won't be called for vp=%p\n", vp); return (error); } if (vp->v_iflag & VI_DOOMED && (flags & LK_RETRY) == 0) From owner-p4-projects@FreeBSD.ORG Wed Feb 1 17:15:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A0CB16A4C4; Wed, 1 Feb 2006 17:15:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 41FFB16A480 for ; Wed, 1 Feb 2006 17:15:03 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D88C043D46 for ; Wed, 1 Feb 2006 17:15:02 +0000 (GMT) (envelope-from jhb@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 k11HF2wH082858 for ; Wed, 1 Feb 2006 17:15:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k11HF2SI082844 for perforce@freebsd.org; Wed, 1 Feb 2006 17:15:02 GMT (envelope-from jhb@freebsd.org) Date: Wed, 1 Feb 2006 17:15:02 GMT Message-Id: <200602011715.k11HF2SI082844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 90890 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2006 17:15:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=90890 Change 90890 by jhb@jhb_slimer on 2006/02/01 17:14:07 IFC @90881. Affected files ... .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#64 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#26 integrate .. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#20 integrate .. //depot/projects/smpng/sys/conf/Makefile.i386#26 integrate .. //depot/projects/smpng/sys/conf/Makefile.pc98#25 integrate .. //depot/projects/smpng/sys/conf/NOTES#113 integrate .. //depot/projects/smpng/sys/conf/files#166 integrate .. //depot/projects/smpng/sys/conf/files.i386#92 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#54 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#54 integrate .. //depot/projects/smpng/sys/conf/options#114 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_fujitsu.c#4 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#70 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#39 integrate .. //depot/projects/smpng/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#65 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#13 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwireg.h#6 integrate .. //depot/projects/smpng/sys/dev/le/am7990.c#1 branch .. //depot/projects/smpng/sys/dev/le/am79900.c#1 branch .. //depot/projects/smpng/sys/dev/le/am79900reg.h#1 branch .. //depot/projects/smpng/sys/dev/le/am79900var.h#1 branch .. //depot/projects/smpng/sys/dev/le/am7990reg.h#1 branch .. //depot/projects/smpng/sys/dev/le/am7990var.h#1 branch .. //depot/projects/smpng/sys/dev/le/if_le_ledma.c#1 branch .. //depot/projects/smpng/sys/dev/le/if_le_pci.c#1 branch .. //depot/projects/smpng/sys/dev/le/lance.c#1 branch .. //depot/projects/smpng/sys/dev/le/lancereg.h#1 branch .. //depot/projects/smpng/sys/dev/le/lancevar.h#1 branch .. //depot/projects/smpng/sys/dev/md/md.c#73 integrate .. //depot/projects/smpng/sys/dev/pci/vga_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/ral/if_ral.c#13 integrate .. //depot/projects/smpng/sys/dev/ral/if_ralreg.h#3 integrate .. //depot/projects/smpng/sys/dev/ral/if_ralvar.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#35 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#53 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#85 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#54 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#34 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#15 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.h#9 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#7 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.h#4 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli_ctl.c#4 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/smpng/sys/geom/eli/pkcs5v2.c#2 integrate .. //depot/projects/smpng/sys/geom/eli/pkcs5v2.h#2 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#14 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.h#5 integrate .. //depot/projects/smpng/sys/geom/label/g_label.c#11 integrate .. //depot/projects/smpng/sys/geom/label/g_label.h#7 integrate .. //depot/projects/smpng/sys/geom/label/g_label_iso9660.c#4 integrate .. //depot/projects/smpng/sys/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/smpng/sys/geom/label/g_label_ufs.c#5 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#24 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#9 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#8 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.c#9 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#21 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.h#9 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3_ctl.c#9 integrate .. //depot/projects/smpng/sys/geom/shsec/g_shsec.c#4 integrate .. //depot/projects/smpng/sys/geom/shsec/g_shsec.h#3 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#15 integrate .. //depot/projects/smpng/sys/geom/stripe/g_stripe.h#7 integrate .. //depot/projects/smpng/sys/geom/zero/g_zero.c#4 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#114 integrate .. //depot/projects/smpng/sys/i386/include/cserial.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/elf.h#11 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_firmware.c#1 branch .. //depot/projects/smpng/sys/kern/sys_pipe.c#54 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#2 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#45 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#54 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#45 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#33 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#57 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#120 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#97 integrate .. //depot/projects/smpng/sys/modules/Makefile#115 integrate .. //depot/projects/smpng/sys/modules/ce/Makefile#1 branch .. //depot/projects/smpng/sys/modules/firmware/Makefile#1 branch .. //depot/projects/smpng/sys/modules/le/Makefile#1 branch .. //depot/projects/smpng/sys/net/if.c#78 integrate .. //depot/projects/smpng/sys/net/if.h#28 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#23 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#70 integrate .. //depot/projects/smpng/sys/net/if_gif.c#32 integrate .. //depot/projects/smpng/sys/net/if_gif.h#13 integrate .. //depot/projects/smpng/sys/net/if_var.h#43 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#44 integrate .. //depot/projects/smpng/sys/net/if_vlan_var.h#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_sppp.c#10 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#46 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#18 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#75 integrate .. //depot/projects/smpng/sys/netinet/ip_ipsec.c#1 branch .. //depot/projects/smpng/sys/netinet/ip_ipsec.h#1 branch .. //depot/projects/smpng/sys/netinet/ip_mroute.h#9 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#82 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#12 integrate .. //depot/projects/smpng/sys/nfsserver/nfs.h#17 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#44 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#24 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#28 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#27 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#21 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#64 integrate .. //depot/projects/smpng/sys/sparc64/sbus/dma_sbus.c#4 integrate .. //depot/projects/smpng/sys/sparc64/sbus/lsi64854.c#4 integrate .. //depot/projects/smpng/sys/sparc64/sbus/lsi64854var.h#3 integrate .. //depot/projects/smpng/sys/sys/_rwlock.h#2 integrate .. //depot/projects/smpng/sys/sys/firmware.h#1 branch .. //depot/projects/smpng/sys/sys/mbuf.h#59 integrate .. //depot/projects/smpng/sys/sys/rwlock.h#2 integrate .. //depot/projects/smpng/sys/sys/vnode.h#70 integrate .. //depot/projects/smpng/sys/tools/fw_stub.awk#1 branch .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#38 integrate .. //depot/projects/smpng/sys/vm/redzone.c#1 branch .. //depot/projects/smpng/sys/vm/redzone.h#1 branch .. //depot/projects/smpng/sys/vm/vm_contig.c#35 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#76 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#71 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#56 integrate Differences ... ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#64 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.185 2006/01/26 00:35:53 flz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.186 2006/01/30 20:27:44 flz Exp $"); #include @@ -427,6 +427,14 @@ {T_DIRECT, SIP_MEDIA_REMOVABLE, "*" , "USB DISK*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, + { + /* + * Genesys 6-in-1 Card Reader + * No PR, reported by anders + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic*", "STORAGE DEVICE*", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, }; static disk_strategy_t dastrategy; ==== //depot/projects/smpng/sys/coda/coda_vnops.c#26 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.67 2006/01/21 19:51:47 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.68 2006/02/01 00:25:24 jeff Exp $"); #include #include @@ -1289,21 +1289,18 @@ /* XXX - do we need to call cache pureg on the moved vnode? */ cache_purge(ap->a_fvp); - /* It seems to be incumbent on us to drop locks on all four vnodes */ - /* From-vnodes are not locked, only ref'd. To-vnodes are locked. */ - - vrele(ap->a_fvp); + /* Release parents first, then children. */ vrele(odvp); - if (ap->a_tvp) { - if (ap->a_tvp == ndvp) { - vrele(ap->a_tvp); - } else { - vput(ap->a_tvp); - } - } + if (ap->a_tvp == ndvp) + vrele(ndvp); + else + vput(ndvp); + vput(ap->a_tvp); + } else + vput(ndvp); + vrele(ap->a_fvp); - vput(ndvp); return(error); } ==== //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#20 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.20 2005/12/04 02:12:39 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.21 2006/01/30 08:22:56 jeff Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -327,11 +327,8 @@ */ error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); - if (error) { - vrele(lvp); - lvp = NULL; - goto out; - } + if (error != 0) + panic("vn_lock LK_RETRY returned error %d", error); if (bufp) bp = *bpp; /* @@ -383,11 +380,8 @@ } VREF(lvp); error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); - if (error != 0) { - vrele(lvp); - lvp = NULL; - goto out; - } + if (error != 0) + panic("vn_lock LK_RETRY returned %d", error); } error = linux_getcwd_scandir(&lvp, &uvp, &bp, bufp, td); if (error) ==== //depot/projects/smpng/sys/conf/Makefile.i386#26 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.i386,v 1.270 2005/11/28 17:51:30 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.i386,v 1.271 2006/01/29 03:32:19 nyan Exp $ # # Makefile for FreeBSD # @@ -30,7 +30,9 @@ .endif .include "$S/conf/kern.pre.mk" -MKMODULESENV+= MACHINE=i386 +MACHINE=i386 + +MKMODULESENV+= MACHINE=${MACHINE} %BEFORE_DEPEND ==== //depot/projects/smpng/sys/conf/Makefile.pc98#25 (text+ko) ==== @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.172 2005/11/28 17:51:31 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.173 2006/01/29 03:32:19 nyan Exp $ # # Makefile for FreeBSD # @@ -30,7 +30,9 @@ .endif .include "$S/conf/kern.pre.mk" -MKMODULESENV+= MACHINE=pc98 +MACHINE=pc98 + +MKMODULESENV+= MACHINE=${MACHINE} %BEFORE_DEPEND ==== //depot/projects/smpng/sys/conf/NOTES#113 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1346 2006/01/14 15:35:20 bz Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1350 2006/01/31 22:56:44 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -191,7 +191,7 @@ # MUTEX_NOINLINE forces mutex operations to call functions to perform each # operation rather than inlining the simple cases. This can be used to # shrink the size of the kernel text segment. Note that this behavior is -# already implied by the INVARIANT_SUPPORT, INVARIANTS, MUTEX_PROFILING, +# already implied by the INVARIANT_SUPPORT, INVARIANTS, KTR, MUTEX_PROFILING, # and WITNESS options. options MUTEX_NOINLINE @@ -200,6 +200,13 @@ # priority waiter. options MUTEX_WAKE_ALL +# RWLOCK_NOINLINE forces rwlock operations to call functions to perform each +# operation rather than inlining the simple cases. This can be used to +# shrink the size of the kernel text segment. Note that this behavior is +# already implied by the INVARIANT_SUPPORT, INVARIANTS, KTR, MUTEX_PROFILING, +# and WITNESS options. +options RWLOCK_NOINLINE + # SMP Debugging Options: # # PREEMPTION allows the threads that are in the kernel to be preempted @@ -327,6 +334,12 @@ options DEBUG_MEMGUARD # +# DEBUG_REDZONE enables buffer underflows and buffer overflows detection for +# malloc(9). +# +options DEBUG_REDZONE + +# # KTRACE enables the system-call tracing facility ktrace(2). To be more # SMP-friendly, KTRACE uses a worker thread to process most trace events # asynchronously to the thread generating the event. This requires a @@ -1187,6 +1200,7 @@ device md #Memory/malloc disk device snp #Snoop device - to look at pty/vty/etc.. device ccd #Concatenated disk driver +device firmware #firmware(9) support # Kernel side iconv library options LIBICONV @@ -1724,6 +1738,7 @@ # fxp: Intel EtherExpress Pro/100B # (hint of prefer_iomap can be done to prefer I/O instead of Mem mapping) # hme: Sun HME (Happy Meal Ethernet) +# le: AMD Am7900 LANCE and Am79C9xx PCnet # lge: Support for PCI gigabit ethernet adapters based on the Level 1 # LXT1001 NetCellerator chipset. This includes the D-Link DGE-500SX, # SMC TigerCard 1000 (SMC9462SX), and some Addtron cards. @@ -1839,6 +1854,7 @@ # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') +device le # AMD Am7900 LANCE and Am79C9xx PCnet device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') ==== //depot/projects/smpng/sys/conf/files#166 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1087 2006/01/27 23:13:24 jhb Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1091 2006/02/01 13:55:02 andre Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -679,6 +679,10 @@ dev/joy/joy_isa.c optional joy isa dev/joy/joy_pccard.c optional joy pccard dev/kbdmux/kbdmux.c optional kbdmux +dev/le/am7990.c optional le +dev/le/am79900.c optional le +dev/le/if_le_pci.c optional le pci +dev/le/lance.c optional le dev/led/led.c standard dev/lge/if_lge.c optional lge dev/lmc/if_lmc.c optional lmc @@ -1298,6 +1302,7 @@ kern/subr_devstat.c standard kern/subr_disk.c standard kern/subr_eventhandler.c standard +kern/subr_firmware.c optional firmware kern/subr_hints.c standard kern/subr_kdb.c standard kern/subr_kobj.c standard @@ -1649,6 +1654,8 @@ netinet/ip_fw_pfil.c optional ipfirewall netinet/ip_icmp.c optional inet netinet/ip_input.c optional inet +netinet/ip_ipsec.c optional ipsec +netinet/ip_ipsec.c optional fast_ipsec netinet/ip_mroute.c optional mrouting netinet/ip_options.c optional inet netinet/ip_output.c optional inet @@ -1866,6 +1873,7 @@ vm/default_pager.c standard vm/device_pager.c standard vm/phys_pager.c standard +vm/redzone.c optional DEBUG_REDZONE vm/swap_pager.c standard vm/uma_core.c standard vm/uma_dbg.c standard ==== //depot/projects/smpng/sys/conf/files.i386#92 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.550 2005/12/07 21:30:46 jkim Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.551 2006/01/31 23:11:34 rik Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -142,6 +142,9 @@ dev/atkbdc/atkbdc_isa.c optional atkbdc isa dev/atkbdc/atkbdc_subr.c optional atkbdc dev/atkbdc/psm.c optional psm atkbdc +dev/ce/ceddk.c optional ce +dev/ce/if_ce.c optional ce +dev/ce/tau32-ddk.c optional ce dev/cm/if_cm_isa.c optional cm isa dev/cp/cpddk.c optional cp dev/cp/if_cp.c optional cp ==== //depot/projects/smpng/sys/conf/files.sparc64#54 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.77 2005/11/27 21:41:58 ru Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.78 2006/01/31 22:34:12 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -36,6 +36,7 @@ dev/fb/splash.c optional splash dev/hwpmc/hwpmc_sparc64.c optional hwpmc dev/kbd/kbd.c optional atkbd | sc | ukbd +dev/le/if_le_ledma.c optional le sbus dev/ofw/ofw_bus_if.m standard dev/ofw/ofw_bus_subr.c standard dev/ofw/ofw_console.c optional ofw_console ==== //depot/projects/smpng/sys/conf/kmod.mk#54 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.200 2005/11/29 09:37:42 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.201 2006/01/29 02:52:41 mlaier Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -36,6 +36,8 @@ # # SRCS List of source files. # +# FIRMWS List of firmware images in format filename:shortname:version +# # DESTDIR The tree where the module gets installed. [not set] # # +++ targets +++ @@ -119,6 +121,32 @@ CFLAGS+= -mlongcall -fno-omit-frame-pointer .endif +.if defined(FIRMWS) +.if !exists(@) +${KMOD:S/$/.c/}: @ +.else +${KMOD:S/$/.c/}: @/tools/fw_stub.awk +.endif + ${AWK} -f @/tools/fw_stub.awk ${FIRMWS} -m${KMOD} -c${KMOD:S/$/.c/g} + +SRCS+= ${KMOD:S/$/.c/} +CLEANFILES+= ${KMOD:S/$/.c/} + +.for _firmw in ${FIRMWS} +${_firmw:C/\:.*$/.fwo/}: ${_firmw:C/\:.*$//} + @${ECHO} ${_firmw:C/\:.*$//} ${.ALLSRC:M*${_firmw:C/\:.*$//}} +.if !exists(${.CURDIR}/${_firmw:C/\:.*$//}) + ln -s ${.ALLSRC:M*${_firmw:C/\:.*$//}} ${_firmw:C/\:.*$//} + ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} ${_firmw:C/\:.*$//} + rm -f ${_firmw:C/\:.*$//} +.else + ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} ${_firmw:C/\:.*$//} +.endif + +OBJS+= ${_firmw:C/\:.*$/.fwo/} +.endfor +.endif + OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .if !defined(PROG) ==== //depot/projects/smpng/sys/conf/options#114 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.525 2006/01/27 23:13:25 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.527 2006/01/31 11:09:21 pjd Exp $ # # On the handling of kernel options # @@ -385,6 +385,8 @@ TCP_SIGNATURE opt_inet.h TCP_SACK_DEBUG opt_tcp_sack.h TCP_DROP_SYNFIN opt_tcp_input.h +DEV_VLAN opt_vlan.h +VLAN_ARRAY opt_vlan.h XBONEHACK # Netgraph(4). Use option NETGRAPH to enable the base netgraph code. @@ -528,6 +530,9 @@ # The MemGuard replacement allocator used for tamper-after-free detection DEBUG_MEMGUARD opt_vm.h +# The RedZone malloc(9) protection +DEBUG_REDZONE opt_vm.h + # Standard SMP options SMP opt_global.h ==== //depot/projects/smpng/sys/dev/acpi_support/acpi_asus.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.25 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.27 2006/01/29 23:59:43 philip Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on @@ -146,6 +146,30 @@ .disp_set = "SDSP" }, { + .name = "A4D", + .mled_set = "MLED", + .brn_up = "\\_SB_.PCI0.SBRG.EC0._Q0E", + .brn_dn = "\\_SB_.PCI0.SBRG.EC0._Q0F", + .brn_get = "GPLV", + .brn_set = "SPLV", +#ifdef notyet + .disp_get = "\\_SB_.PCI0.SBRG.EC0._Q10", + .disp_set = "\\_SB_.PCI0.SBRG.EC0._Q11" +#endif + }, + { + .name = "A6V", + .bled_set = "BLED", + .mled_set = "MLED", + .wled_set = "WLED", + .lcd_get = NULL, + .lcd_set = "\\_SB.PCI0.SBRG.EC0._Q10", + .brn_get = "GPLV", + .brn_set = "SPLV", + .disp_get = "\\_SB.PCI0.P0P3.VGA.GETD", + .disp_set = "SDSP" + }, + { .name = "D1x", .mled_set = "MLED", .lcd_get = "\\GP11", ==== //depot/projects/smpng/sys/dev/acpi_support/acpi_fujitsu.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002 Sean Bullington - * 2003-2005 Anish Mistry + * 2003-2006 Anish Mistry * 2004 Mark Santcroos * All Rights Reserved. * @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_fujitsu.c,v 1.3 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_fujitsu.c,v 1.4 2006/01/29 23:52:02 philip Exp $"); #include "opt_acpi.h" #include @@ -44,11 +44,8 @@ #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("Fujitsu") -/* Change and update bits for the buttons */ -#define MOUSE_UPDATED_BIT 0x80000000 +/* Change and update bits for the hotkeys */ #define VOLUME_MUTE_BIT 0x40000000 -#define VOLUME_CHANGE_BIT 0x80000000 -#define BRIGHTNESS_CHANGE_BIT 0x80000000 /* Values of settings */ #define GENERAL_SETTING_BITS 0x0fffffff @@ -57,9 +54,20 @@ #define BRIGHTNESS_SETTING_BITS GENERAL_SETTING_BITS /* Possible state changes */ -#define VOLUME_CHANGED 1 -#define BRIGHT_CHANGED 2 -#define MOUSE_CHANGED 3 +/* + * These are NOT arbitrary values. They are the + * GHKS return value from the device that says which + * hotkey is active. They should match up with a bit + * from the GSIF bitmask. + */ +#define BRIGHT_CHANGED 0x01 +#define VOLUME_CHANGED 0x04 +#define MOUSE_CHANGED 0x08 +/* + * It is unknown which hotkey this bit is supposed to indicate, but + * according to values from GSIF this is a valid flag. + */ +#define UNKNOWN_CHANGED 0x10 /* sysctl values */ #define FN_MUTE 0 @@ -72,6 +80,10 @@ #define METHOD_GMOU 2 #define METHOD_GVOL 3 #define METHOD_MUTE 4 +#define METHOD_RBLL 5 +#define METHOD_RVOL 6 +#define METHOD_GSIF 7 +#define METHOD_GHKS 8 /* Notify event */ #define ACPI_NOTIFY_STATUS_CHANGED 0x80 @@ -83,6 +95,7 @@ struct int_nameval { char *name; int value; + int exists; }; /* @@ -95,12 +108,13 @@ /* Control methods */ struct int_nameval _sta, /* unused */ gbll, /* brightness */ - ghks, /* unused */ + ghks, /* hotkey selector */ + gbuf, /* unused (buffer?) */ gmou, /* mouse */ - gsif, /* unused */ + gsif, /* function key bitmask */ gvol, /* volume */ - rbll, /* unused */ - rvol; /* unused */ + rbll, /* number of brightness levels (radix) */ + rvol; /* number of volume levels (radix) */ /* State variables */ uint8_t bIsMuted; /* Is volume muted */ @@ -126,6 +140,7 @@ /* Utility function declarations */ static uint8_t acpi_fujitsu_update(struct acpi_fujitsu_softc *sc); static uint8_t acpi_fujitsu_init(struct acpi_fujitsu_softc *sc); +static uint8_t acpi_fujitsu_check_hardware(struct acpi_fujitsu_softc *sc); /* Driver/Module specific structure definitions. */ static device_method_t acpi_fujitsu_methods[] = { @@ -144,13 +159,13 @@ sizeof(struct acpi_fujitsu_softc), }; -/* Prototype for function buttons for getting/setting a value. */ +/* Prototype for function hotkeys for getting/setting a value. */ static int acpi_fujitsu_method_get(struct acpi_fujitsu_softc *sc, int method); static int acpi_fujitsu_method_set(struct acpi_fujitsu_softc *sc, int method, int value); static char *fujitsu_ids[] = { "FUJ02B1", NULL }; -ACPI_SERIAL_DECL(fujitsu, "Fujitsu Function Buttons"); +ACPI_SERIAL_DECL(fujitsu, "Fujitsu Function Hotkeys"); /* sysctl names and function calls */ static struct { @@ -178,6 +193,16 @@ .method = METHOD_GVOL, .description = "Speakers/headphones volume level" }, + { + .name = "volume_radix", + .method = METHOD_RVOL, + .description = "Number of volume level steps" + }, + { + .name = "lcd_brightness_radix", + .method = METHOD_RBLL, + .description = "Number of brightness level steps" + }, { NULL, 0, NULL } }; @@ -191,13 +216,16 @@ static int acpi_fujitsu_probe(device_t dev) { + char *name; + char buffer[64]; - if (acpi_disabled("fujitsu") || - ACPI_ID_PROBE(device_get_parent(dev), dev, fujitsu_ids) == NULL || - device_get_unit(dev) != 0) + name = ACPI_ID_PROBE(device_get_parent(dev), dev, fujitsu_ids); + if (acpi_disabled("fujitsu") || name == NULL || + device_get_unit(dev) > 1) return (ENXIO); - device_set_desc(dev, "Fujitsu Function Buttons"); + sprintf(buffer, "Fujitsu Function Hotkeys %s", name); + device_set_desc_copy(dev, buffer); return (0); } @@ -217,10 +245,10 @@ AcpiInstallNotifyHandler(sc->handle, ACPI_DEVICE_NOTIFY, acpi_fujitsu_notify_handler, sc); - /* Snag our default values for the buttons / button states. */ + /* Snag our default values for the hotkys / hotkey states. */ ACPI_SERIAL_BEGIN(fujitsu); if (!acpi_fujitsu_init(sc)) - device_printf(dev, "Couldn't initialize button states!\n"); + device_printf(dev, "Couldn't initialize hotkey states!\n"); ACPI_SERIAL_END(fujitsu); return (0); @@ -251,10 +279,11 @@ */ ACPI_SERIAL_BEGIN(fujitsu); - status = acpi_SetInteger(sc->handle, "SMOU", 1); - if (ACPI_FAILURE(status)) - device_printf(sc->dev, "Couldn't enable pointer\n"); - + if(sc->gmou.exists) { + status = acpi_SetInteger(sc->handle, "SMOU", 1); + if (ACPI_FAILURE(status)) + device_printf(sc->dev, "Couldn't enable pointer\n"); + } ACPI_SERIAL_END(fujitsu); return (0); @@ -316,13 +345,13 @@ /* * Initializes the names of the ACPI control methods and grabs - * the current state of all of the ACPI buttons into the softc. + * the current state of all of the ACPI hotkeys into the softc. */ static uint8_t acpi_fujitsu_init(struct acpi_fujitsu_softc *sc) { struct acpi_softc *acpi_sc; - int i; + int i, exists; ACPI_SERIAL_ASSERT(fujitsu); @@ -333,9 +362,14 @@ sc->gmou.name = "GMOU"; sc->gsif.name = "GSIF"; sc->gvol.name = "GVOL"; + sc->ghks.name = "GHKS"; + sc->gsif.name = "GSIF"; sc->rbll.name = "RBLL"; sc->rvol.name = "RVOL"; + /* Determine what hardware functionality is available */ + acpi_fujitsu_check_hardware(sc); + /* Build the sysctl tree */ acpi_sc = acpi_device_get_parent_softc(sc->dev); sysctl_ctx_init(&sc->sysctl_ctx); @@ -344,6 +378,31 @@ OID_AUTO, "fujitsu", CTLFLAG_RD, 0, ""); for (i = 0; sysctl_table[i].name != NULL; i++) { + exists = 0; + switch(sysctl_table[i].method) { + case METHOD_GMOU: + exists = sc->gmou.exists; + break; + case METHOD_GBLL: + exists = sc->gbll.exists; + break; + case METHOD_GVOL: + case METHOD_MUTE: + exists = sc->gvol.exists; + break; + case METHOD_RVOL: + exists = sc->rvol.exists; + break; + case METHOD_RBLL: + exists = sc->rbll.exists; + break; + default: + /* Allow by default */ + exists = 1; + break; + } + if(!exists) + continue; SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, sysctl_table[i].name, @@ -352,9 +411,10 @@ sysctl_table[i].description); } - /* Set the buttons to their initial states */ + + /* Set the hotkeys to their initial states */ if (!acpi_fujitsu_update(sc)) { - device_printf(sc->dev, "Couldn't init button states\n"); + device_printf(sc->dev, "Couldn't init hotkey states\n"); return (FALSE); } @@ -409,13 +469,28 @@ case METHOD_MUTE: nv = sc->gvol; break; + case METHOD_GHKS: + nv = sc->ghks; + break; + case METHOD_GSIF: + nv = sc->gsif; + break; + case METHOD_RBLL: + nv = sc->rbll; + break; + case METHOD_RVOL: + nv = sc->rvol; + break; default: return (FALSE); } + if(!nv.exists) + return (EINVAL); + status = acpi_GetInteger(sc->handle, nv.name, &nv.value); if (ACPI_FAILURE(status)) { - device_printf(sc->dev, "Couldn't query method\n"); + device_printf(sc->dev, "Couldn't query method (%s)\n", nv.name); return (FALSE); } @@ -459,6 +534,9 @@ return (EINVAL); } + if(!nv.exists) + return (EINVAL); + if (method == METHOD_MUTE) { if (value == 1) value = nv.value | VOLUME_MUTE_BIT; @@ -471,7 +549,7 @@ status = acpi_SetInteger(sc->handle, control, value); if (ACPI_FAILURE(status)) { device_printf(sc->dev, "Couldn't update %s\n", control); - return (EINVAL); + return (FALSE); } sc->lastValChanged = changed; @@ -479,86 +557,160 @@ } /* - * Query each of the ACPI control methods that contain information we're - * interested in. We check the return values from the control methods and - * adjust any state variables if they should be adjusted. + * Query the get methods to determine what functionality is available + * from the hardware function hotkeys. */ static uint8_t -acpi_fujitsu_update(struct acpi_fujitsu_softc *sc) +acpi_fujitsu_check_hardware(struct acpi_fujitsu_softc *sc) { + int val; struct acpi_softc *acpi_sc; acpi_sc = acpi_device_get_parent_softc(sc->dev); ACPI_SERIAL_ASSERT(fujitsu); + /* save the hotkey bitmask */ + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, + sc->gsif.name, &(sc->gsif.value)))) { + sc->gsif.exists = 0; + device_printf(sc->dev, "Couldn't query bitmask value\n"); + } else { + sc->gsif.exists = 1; + } /* System Volume Level */ if (ACPI_FAILURE(acpi_GetInteger(sc->handle, - sc->gvol.name, &(sc->gvol.value)))) { - device_printf(sc->dev, "Couldn't query volume level\n"); - return (FALSE); + sc->gvol.name, &val))) { + sc->gvol.exists = 0; + } else { + sc->gvol.exists = 1; } - if (sc->gvol.value & VOLUME_CHANGE_BIT) { - sc->bIsMuted = - (uint8_t)((sc->gvol.value & VOLUME_MUTE_BIT) != 0); + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, + sc->gbll.name, &val))) { + sc->gbll.exists = 0; + } else { + sc->gbll.exists = 1; + } - /* Clear the modification bit */ - sc->gvol.value &= VOLUME_SETTING_BITS; + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, + sc->ghks.name, &val))) { + sc->ghks.exists = 0; + } else { + sc->ghks.exists = 1; + } - if (sc->bIsMuted) { - acpi_UserNotify("FUJITSU", sc->handle, FN_MUTE); - ACPI_VPRINT(sc->dev, acpi_sc, "Volume is now mute\n"); - } else - ACPI_VPRINT(sc->dev, acpi_sc, "Volume is now %d\n", - sc->gvol.value); + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, + sc->gmou.name, &val))) { + sc->gmou.exists = 0; + } else { + sc->gmou.exists = 1; + } - acpi_UserNotify("FUJITSU", sc->handle, FN_VOLUME); - - sc->lastValChanged = VOLUME_CHANGED; + if (ACPI_FAILURE(acpi_GetInteger(sc->handle, + sc->rbll.name, &val))) { + sc->rbll.exists = 0; + } else { + sc->rbll.exists = 1; } - /* Internal mouse pointer (eraserhead) */ if (ACPI_FAILURE(acpi_GetInteger(sc->handle, - sc->gmou.name, &(sc->gmou.value)))) { - device_printf(sc->dev, "Couldn't query pointer state\n"); - return (FALSE); + sc->rvol.name, &val))) { + sc->rvol.exists = 0; + } else { + sc->rvol.exists = 1; } - if (sc->gmou.value & MOUSE_UPDATED_BIT) { - sc->bIntPtrEnabled = (uint8_t)(sc->gmou.value & 0x1); + return (TRUE); +} + +/* + * Query each of the ACPI control methods that contain information we're + * interested in. We check the return values from the control methods and + * adjust any state variables if they should be adjusted. + */ +static uint8_t +acpi_fujitsu_update(struct acpi_fujitsu_softc *sc) +{ + int changed; + struct acpi_softc *acpi_sc; - /* Clear the modification bit */ - sc->gmou.value &= MOUSE_SETTING_BITS; - - acpi_UserNotify("FUJITSU", sc->handle, FN_POINTER_ENABLE); + acpi_sc = acpi_device_get_parent_softc(sc->dev); - ACPI_VPRINT(sc->dev, acpi_sc, "Internal pointer is now %s\n", >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Feb 1 23:09:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1328516A426; Wed, 1 Feb 2006 23:09:52 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7C7016A424 for ; Wed, 1 Feb 2006 23:09:51 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EA9E43DC3 for ; Wed, 1 Feb 2006 23:09:38 +0000 (GMT) (envelope-from millert@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 k11N9T2A009836 for ; Wed, 1 Feb 2006 23:09:29 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k11N9SrQ009833 for perforce@freebsd.org; Wed, 1 Feb 2006 23:09:28 GMT (envelope-from millert@freebsd.org) Date: Wed, 1 Feb 2006 23:09:28 GMT Message-Id: <200602012309.k11N9SrQ009833@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 90905 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2006 23:09:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=90905 Change 90905 by millert@millert_g4tower on 2006/02/01 23:09:27 We only want/need a single copy of the flask dir in the source tree. When installing the policy dir, just copy the flask bits from the sedarwin sources. Also sync the generated headers with the flask access_vectors file. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/excludes#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/flask/Makefile#4 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/flask/access_vectors#6 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/flask/initial_sids#4 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/flask/mkaccess_vector.sh#4 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/flask/mkflask.sh#4 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/flask/security_classes#5 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/class_to_string.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask.h#5 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile#6 (text+ko) ==== @@ -2,14 +2,15 @@ include $(DARWIN_ROOT)/build/Mig.mk POLICY= policy.16 +FLASK= ../sedarwin/flask SCRIPTS= create-extattr.sh sebsd-relabel.sh INSTALL?= install all: $(POLICY) sebsd_migscs -INPUTS = flask/security_classes mig_classes initial_sids \ - flask/access_vectors mig_access_vectors rules.m4 users initial_sid_contexts fs_use \ - devfs +INPUTS = $(FLASK)/security_classes mig_classes initial_sids \ + $(FLASK)/access_vectors mig_access_vectors rules.m4 users \ + initial_sid_contexts fs_use devfs policy.conf: $(INPUTS) cat $(INPUTS) > policy.conf @@ -38,12 +39,13 @@ $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 sebsd_migscs ${DESTDIR} $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 failsafe_context ${DESTDIR}/private/etc/sedarwin $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 700 ${SCRIPTS} ${DESTDIR}/private/etc/sedarwin - (cd $(CURDIR)/..; tar -X policy/excludes -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/; tar -xf -) + (cd $(CURDIR)/.. && tar -X policy/excludes -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/ && tar -xf -) + (cd $(FLASK)/.. && tar -cf - flask) | (cd $(DESTDIR)/private/etc/sedarwin/policy && tar -xf -) cp -f Makefile.install $(DESTDIR)/private/etc/sedarwin/policy/Makefile # Mig security classes and access vectors -DEFS = $(DARWIN_ROOT)/system_cmds/mach_init.tproj/bootstrap.defs +DEFS = $(DARWIN_ROOT)/system_cmds/mach_init.tproj/bootstrap.defs $(DARWIN_ROOT)/netinfo/servers/notifyd/notify_ipc.defs $(DARWIN_ROOT)/../../examples/mig/mtest.defs mig_msgids: $(DEFS) echo > $@ @@ -56,5 +58,5 @@ mig_classes: mig_access_vectors grep '^class' $< > $@ -sebsd_migscs: flask/security_classes mig_msgids - cat flask/security_classes mig_msgids | perl migscs.pl +sebsd_migscs: $(FLASK)/security_classes mig_msgids + cat $(FLASK)/security_classes mig_msgids | perl migscs.pl ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/excludes#2 (text+ko) ==== @@ -3,3 +3,4 @@ policy/create-extattr.sh policy/sebsd-relabel.sh policy/failsafe_context +policy/flask ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#5 (text+ko) ==== @@ -124,7 +124,6 @@ { SECCLASS_CAPABILITY, CAPABILITY__SYS_TIME, "sys_time" }, { SECCLASS_CAPABILITY, CAPABILITY__SYS_TTY_CONFIG, "sys_tty_config" }, { SECCLASS_CAPABILITY, CAPABILITY__MKNOD, "mknod" }, - { SECCLASS_CAPABILITY, CAPABILITY__LEASE, "lease" }, { SECCLASS_MACH_PORT, MACH_PORT__RELABELFROM, "relabelfrom" }, { SECCLASS_MACH_PORT, MACH_PORT__RELABELTO, "relabelto" }, { SECCLASS_MACH_PORT, MACH_PORT__SEND, "send" }, @@ -136,11 +135,6 @@ { SECCLASS_MACH_PORT, MACH_PORT__HOLD_RECV, "hold_recv" }, { SECCLASS_MACH_TASK, MACH_TASK__TERMINATE, "terminate" }, { SECCLASS_MACH_TASK, MACH_TASK__SET_SPECIAL_PORT, "set_special_port" }, - { SECCLASS_MACH_NAMES, MACH_NAMES__REGISTER, "register" }, - { SECCLASS_MACH_NAMES, MACH_NAMES__LOOK_UP, "look_up" }, - { SECCLASS_MACH_NAMES, MACH_NAMES__GETPARENT, "getparent" }, - { SECCLASS_MACH_NAMES, MACH_NAMES__MAKESUBSET, "makesubset" }, - { SECCLASS_MACH_NAMES, MACH_NAMES__CREATE_SERVER, "create_server" }, }; #define AV_PERM_TO_STRING_SIZE (sizeof(av_perm_to_string)/sizeof(av_perm_to_string_t)) ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#5 (text+ko) ==== @@ -600,7 +600,6 @@ #define CAPABILITY__SYS_TIME 0x0000000010000000UL #define CAPABILITY__SYS_TTY_CONFIG 0x0000000020000000UL #define CAPABILITY__MKNOD 0x0000000040000000UL -#define CAPABILITY__LEASE 0x000000007fffffffUL #define MACH_PORT__RELABELFROM 0x0000000000000001UL #define MACH_PORT__RELABELTO 0x0000000000000002UL @@ -615,11 +614,5 @@ #define MACH_TASK__TERMINATE 0x0000000000000001UL #define MACH_TASK__SET_SPECIAL_PORT 0x0000000000000002UL -#define MACH_NAMES__REGISTER 0x0000000000000001UL -#define MACH_NAMES__LOOK_UP 0x0000000000000002UL -#define MACH_NAMES__GETPARENT 0x0000000000000004UL -#define MACH_NAMES__MAKESUBSET 0x0000000000000008UL -#define MACH_NAMES__CREATE_SERVER 0x0000000000000010UL - /* FLASK */ ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/class_to_string.h#4 (text+ko) ==== @@ -35,10 +35,6 @@ "shm", "ipc", "mach_port", - "port_methods1", - "port_methods2", - "port_methods3", - "port_methods4", "mach_task", }; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask.h#5 (text+ko) ==== @@ -37,11 +37,7 @@ #define SECCLASS_SHM 28 #define SECCLASS_IPC 29 #define SECCLASS_MACH_PORT 30 -#define SECCLASS_PORT_METHODS1 31 -#define SECCLASS_PORT_METHODS2 32 -#define SECCLASS_PORT_METHODS3 33 -#define SECCLASS_PORT_METHODS4 34 -#define SECCLASS_MACH_TASK 35 +#define SECCLASS_MACH_TASK 31 /* * Security identifier indices for initial entities ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Feb 1 23:40:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4714216A423; Wed, 1 Feb 2006 23:40:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0DA6416A422 for ; Wed, 1 Feb 2006 23:40:38 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C91243DC4 for ; Wed, 1 Feb 2006 23:40:09 +0000 (GMT) (envelope-from kmacy@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 k11Ne6Oo011368 for ; Wed, 1 Feb 2006 23:40:06 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k11Ne61m011365 for perforce@freebsd.org; Wed, 1 Feb 2006 23:40:06 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Feb 2006 23:40:06 GMT Message-Id: <200602012340.k11Ne61m011365@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 90907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2006 23:40:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=90907 Change 90907 by kmacy@kmacy:freebsd7_xen3 on 2006/02/01 23:39:38 it turns out that doing the ISA hole shifting at the P2M interface would require too many changes to pmap.c this change shifts all the P2M mappings up by 4MB at init time when ADD_ISA_HOLE is set - this effectively throws away the upper 4MB of machine addresses that we are given Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#9 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xenvar.h#6 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#9 (text+ko) ==== @@ -554,6 +554,36 @@ static vm_offset_t *pdir_shadow; +#ifdef ADD_ISA_HOLE +static void +shift_phys_machine(unsigned long *phys_machine, int nr_pages) +{ + unsigned long *tmp_page, *current_page, *next_page; + int i; + + tmp_page = bootmem_alloc(PAGE_SIZE); + current_page = phys_machine; + next_page = phys_machine + (PAGE_SIZE/sizeof(unsigned long)); + bcopy(current_page, tmp_page, PAGE_SIZE); + + for (i = 0; i < (nr_pages - 1024); i++) { + xen_machphys_update(phys_machine[i], i + 1024); + } + while (next_page < (phys_machine + nr_pages)) { + bcopy(tmp_page, current_page, PAGE_SIZE); + bcopy(next_page, tmp_page, PAGE_SIZE); + + current_page += (PAGE_SIZE/sizeof(unsigned long)); + next_page += (PAGE_SIZE/sizeof(unsigned long)); + } + bootmem_free(tmp_page, PAGE_SIZE); + + + memset(phys_machine, INVALID_P2M_ENTRY, PAGE_SIZE); + +} +#endif + void initvalues(start_info_t *startinfo) { @@ -575,6 +605,15 @@ /* number of pages allocated after the pts + 1*/; unsigned long tmpindex = (VTOPFN(xen_start_info->pt_base) + xen_start_info->nr_pt_frames) + 3; xendebug_flags = 0xffffffff; + + /* allocate 4 pages for bootmem allocator */ + bootmem_start = bootmem_current = (char *)PFNTOV(tmpindex); + tmpindex += 4; + bootmem_end = (char *)PFNTOV(tmpindex); + +#ifdef ADD_ISA_HOLE + shift_phys_machine(xen_phys_machine, xen_start_info->nr_pages); +#endif /* * pre-zero unused mapped pages - mapped on 4MB boundary */ @@ -606,11 +645,6 @@ ldt = (union descriptor *)PFNTOV(tmpindex); tmpindex++; - /* allocate 4 pages for bootmem allocator */ - bootmem_start = bootmem_current = (char *)PFNTOV(tmpindex); - tmpindex += 4; - bootmem_end = (char *)PFNTOV(tmpindex); - /* initialize page directory shadow page */ pdir_shadow = (vm_offset_t *)PFNTOV(tmpindex); i686_pagezero(pdir_shadow); ==== //depot/projects/xen3/src/sys/i386-xen/include/xenvar.h#6 (text+ko) ==== @@ -28,8 +28,8 @@ #endif -#define PFNTOMFN(i) (((unsigned long *)xen_phys_machine)[(i) - ISA_INDEX_OFFSET]) -#define MFNTOPFN(i) (xen_machine_phys[i] + ISA_INDEX_OFFSET) +#define PFNTOMFN(i) (((unsigned long *)xen_phys_machine)[(i)]) +#define MFNTOPFN(i) (xen_machine_phys[i]) #define VTOP(x) ((unsigned long)(x) - KERNBASE) #define PTOV(x) ((unsigned long)(x) + KERNBASE) From owner-p4-projects@FreeBSD.ORG Wed Feb 1 23:40:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26A2B16A431; Wed, 1 Feb 2006 23:40:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D10AA16A42F for ; Wed, 1 Feb 2006 23:40:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEF1843DC3 for ; Wed, 1 Feb 2006 23:40:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k11Ne6qE011362 for ; Wed, 1 Feb 2006 23:40:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k11Ne6Y5011359 for perforce@freebsd.org; Wed, 1 Feb 2006 23:40:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 Feb 2006 23:40:06 GMT Message-Id: <200602012340.k11Ne6Y5011359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90906 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2006 23:40:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=90906 Change 90906 by rwatson@rwatson_zoo on 2006/02/01 23:39:33 For ABI reasons, move td_ar from the zero'd section of struct thread to the end, and add explicit zeroing. This will allow audit support to be merged to RELENG_6 without changing the layout of existing fields in struct thread. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#5 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#3 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#7 edit .. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#5 (text+ko) ==== @@ -43,6 +43,8 @@ #include #include +#include + #include #include #include @@ -133,6 +135,10 @@ * next thread. */ td->td_critnest = 1; + +#ifdef AUDIT + audit_thread_alloc(td); +#endif return (0); } ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#3 (text+ko) ==== @@ -1013,6 +1013,16 @@ //printf("audit_proc_alloc: pid %d p_au %p\n", p->p_pid, p->p_au); } +/* + * Allocate storage for a new thread. + */ +void +audit_thread_alloc(struct thread *td) +{ + + td->td_ar = NULL; +} + /* * Initialize the audit information for the a process, presumably the first * process in the system. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#7 (text+ko) ==== @@ -178,6 +178,7 @@ void audit_proc_fork(struct proc *parent, struct proc *child); void audit_proc_free(struct proc *p); +void audit_thread_alloc(struct thread *td); /* * Define a macro to wrap the audit_arg_* calls by checking the global ==== //depot/projects/trustedbsd/audit3/sys/sys/proc.h#11 (text+ko) ==== @@ -296,7 +296,6 @@ u_long td_profil_addr; /* (k) Temporary addr until AST. */ u_int td_profil_ticks; /* (k) Temporary ticks until AST. */ char td_name[MAXCOMLEN + 1]; /* (*) Thread name. */ - struct kaudit_record *td_ar; /* (k) Active audit record, if any. */ #define td_endzero td_base_pri /* Copied during fork1() or thread_sched_upcall(). */ @@ -329,6 +328,7 @@ volatile u_int td_critnest; /* (k*) Critical section nest level. */ struct mdthread td_md; /* (k) Any machine-dependent fields. */ struct td_sched *td_sched; /* (*) Scheduler-specific data. */ + struct kaudit_record *td_ar; /* (k) Active audit record, if any. */ }; /* From owner-p4-projects@FreeBSD.ORG Thu Feb 2 02:02:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FAD716A423; Thu, 2 Feb 2006 02:02:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46C1016A420 for ; Thu, 2 Feb 2006 02:02:12 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C0C643D46 for ; Thu, 2 Feb 2006 02:02:12 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1222Be8026134 for ; Thu, 2 Feb 2006 02:02:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1222BiZ026131 for perforce@freebsd.org; Thu, 2 Feb 2006 02:02:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 2 Feb 2006 02:02:11 GMT Message-Id: <200602020202.k1222BiZ026131@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 02:02:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=90909 Change 90909 by rwatson@rwatson_peppercorn on 2006/02/02 02:01:11 Stub comments about what audit for AUE_SENDFILE will need to capture. This also suppresses the conversion warning for event 364. Note: this may require some work, as up until now we've needed only to audit a single file descriptor per system call. sendfile() uses two, so will require expanding our in-kernel audit record. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#3 (text+ko) ==== @@ -439,6 +439,19 @@ } break; + case AUE_SENDFILE: + /* + * XXXRW: While sendfile() is effectively a combination of + * read() and write(), it is useful to audit if only because + * it performs IPC/network I/O. We will need to eventually + * audit the following information to be complete: + * + * - socket information + * - file descriptor information for two file descriptors + * - file information + */ + break; + case AUE_ACCT: if (ARG_IS_VALID(kar, ARG_UPATH1)) { UPATH1_VNODE1_TOKENS; From owner-p4-projects@FreeBSD.ORG Thu Feb 2 02:20:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8895716A423; Thu, 2 Feb 2006 02:20:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3534A16A420 for ; Thu, 2 Feb 2006 02:20:37 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0233343D45 for ; Thu, 2 Feb 2006 02:20:37 +0000 (GMT) (envelope-from trhodes@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 k122KaBM026792 for ; Thu, 2 Feb 2006 02:20:36 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k122KZT2026789 for perforce@freebsd.org; Thu, 2 Feb 2006 02:20:35 GMT (envelope-from trhodes@freebsd.org) Date: Thu, 2 Feb 2006 02:20:35 GMT Message-Id: <200602020220.k122KZT2026789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 90910 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 02:20:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=90910 Change 90910 by trhodes@trhodes_local on 2006/02/02 02:19:45 Hard sentence break before merge. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.1#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.1#4 (text+ko) ==== @@ -127,8 +127,9 @@ .Pp The .Nm -utility will submit an audit record when login succeeds or fails. Failure to -determine the current auditing state will result in an error exit from +utility will submit an audit record when login succeeds or fails. +Failure to determine the current auditing state will +result in an error exit from .Nm . .Sh FILES .Bl -tag -width ".Pa /etc/login.access" -compact From owner-p4-projects@FreeBSD.ORG Thu Feb 2 03:24:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9E4116A423; Thu, 2 Feb 2006 03:24:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B598516A420 for ; Thu, 2 Feb 2006 03:24:54 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EC0543D46 for ; Thu, 2 Feb 2006 03:24:54 +0000 (GMT) (envelope-from kmacy@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 k123Osfj030382 for ; Thu, 2 Feb 2006 03:24:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k123OsvR030379 for perforce@freebsd.org; Thu, 2 Feb 2006 03:24:54 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 2 Feb 2006 03:24:54 GMT Message-Id: <200602020324.k123OsvR030379@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 90911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 03:24:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=90911 Change 90911 by kmacy@kmacy:freebsd7_xen3 on 2006/02/02 03:24:14 bubble sort last 4MB phys page down to the beginning Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#10 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#10 (text+ko) ==== @@ -558,25 +558,32 @@ static void shift_phys_machine(unsigned long *phys_machine, int nr_pages) { + unsigned long *tmp_page, *current_page, *next_page; int i; tmp_page = bootmem_alloc(PAGE_SIZE); - current_page = phys_machine; - next_page = phys_machine + (PAGE_SIZE/sizeof(unsigned long)); - bcopy(current_page, tmp_page, PAGE_SIZE); + current_page = phys_machine + nr_pages - (PAGE_SIZE/sizeof(unsigned long)); + next_page = current_page - (PAGE_SIZE/sizeof(unsigned long)); + bcopy(phys_machine, tmp_page, PAGE_SIZE); - for (i = 0; i < (nr_pages - 1024); i++) { - xen_machphys_update(phys_machine[i], i + 1024); - } - while (next_page < (phys_machine + nr_pages)) { + while (current_page > phys_machine) { + /* save next page */ + bcopy(next_page, tmp_page, PAGE_SIZE); + /* shift down page */ + bcopy(current_page, next_page, PAGE_SIZE); + /* finish swap */ bcopy(tmp_page, current_page, PAGE_SIZE); - bcopy(next_page, tmp_page, PAGE_SIZE); - current_page += (PAGE_SIZE/sizeof(unsigned long)); - next_page += (PAGE_SIZE/sizeof(unsigned long)); + current_page -= (PAGE_SIZE/sizeof(unsigned long)); + next_page -= (PAGE_SIZE/sizeof(unsigned long)); + } + bootmem_free(tmp_page, PAGE_SIZE); + + for (i = 0; i < nr_pages; i++) { + xen_machphys_update(phys_machine[i], i); } - bootmem_free(tmp_page, PAGE_SIZE); + memset(phys_machine, INVALID_P2M_ENTRY, PAGE_SIZE); From owner-p4-projects@FreeBSD.ORG Thu Feb 2 05:02:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E038616A423; Thu, 2 Feb 2006 05:02:52 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B62F316A420 for ; Thu, 2 Feb 2006 05:02:52 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B4F843D45 for ; Thu, 2 Feb 2006 05:02:52 +0000 (GMT) (envelope-from kmacy@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 k1252qig042083 for ; Thu, 2 Feb 2006 05:02:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1252pdN042080 for perforce@freebsd.org; Thu, 2 Feb 2006 05:02:51 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 2 Feb 2006 05:02:51 GMT Message-Id: <200602020502.k1252pdN042080@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 90912 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 05:02:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=90912 Change 90912 by kmacy@kmacy:freebsd7_xen3 on 2006/02/02 05:01:51 add back in ISA hole Affected files ... .. //depot/projects/xen3/src/sys/conf/Makefile.i386-xen#2 edit .. //depot/projects/xen3/src/sys/conf/ldscript.i386-xen#2 delete .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/genassym.c#2 delete .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/pmap.c#3 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xenvar.h#7 edit Differences ... ==== //depot/projects/xen3/src/sys/conf/Makefile.i386-xen#2 (text+ko) ==== @@ -30,7 +30,6 @@ .endif .include "$S/conf/kern.pre.mk" -M= i386-xen MKMODULESENV+= MACHINE=i386-xen %BEFORE_DEPEND ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/pmap.c#3 (text+ko) ==== @@ -1211,7 +1211,7 @@ /* XXX copies current process, does not fill in MPPTDI */ #ifdef XEN bcopy(kernel_pmap->pm_pdir + KPTDI, pmap->pm_pdir + KPTDI, - nkpt * sizeof(pd_entry_t)); + NKPDE * sizeof(pd_entry_t)); /* XXX need to copy global address entries to page directory's L1 shadow */ ma = xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[NPGPTD])); /* L1 pin shadow page director{y,ies} */ ==== //depot/projects/xen3/src/sys/i386-xen/include/xenvar.h#7 (text+ko) ==== @@ -19,6 +19,9 @@ * FreeBSD doesn't */ + +#define ADD_ISA_HOLE + #ifdef ADD_ISA_HOLE #define ISA_INDEX_OFFSET 1024 #define ISA_PDR_OFFSET 1 From owner-p4-projects@FreeBSD.ORG Thu Feb 2 06:35:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 991B716A423; Thu, 2 Feb 2006 06:35:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F9F716A420 for ; Thu, 2 Feb 2006 06:35:44 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 240D943D45 for ; Thu, 2 Feb 2006 06:35:44 +0000 (GMT) (envelope-from alc@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 k126Zh0w047843 for ; Thu, 2 Feb 2006 06:35:44 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k126Zhe4047840 for perforce@freebsd.org; Thu, 2 Feb 2006 06:35:43 GMT (envelope-from alc@freebsd.org) Date: Thu, 2 Feb 2006 06:35:43 GMT Message-Id: <200602020635.k126Zhe4047840@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90913 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 06:35:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=90913 Change 90913 by alc@alc_home on 2006/02/02 06:35:21 Rename vm_buddyq_find() to vm_buddyq_first(). Add vm_buddyq_next(). Use these functions to transfer pages from the cache queues to the free queues in vm_pageout_scan(). Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_buddy.h#9 edit .. //depot/projects/superpages/src/sys/vm/vm_page.c#18 edit .. //depot/projects/superpages/src/sys/vm/vm_pageout.c#9 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_buddy.h#9 (text+ko) ==== @@ -7,7 +7,7 @@ void buddy_unfree(vm_page_t m); static __inline vm_page_t -vm_buddyq_find(int baseq) +vm_buddyq_first(int baseq) { vm_page_t m; int q; @@ -18,3 +18,16 @@ q++; return (m); } + +static __inline vm_page_t +vm_buddyq_next(vm_page_t m) +{ + int baseq, q; + + baseq = m->queue - m->buddyq; + q = m->buddyq; + m = TAILQ_NEXT(m, pageq); + while (m == NULL && ++q < BUDDY_QUEUES) + m = TAILQ_FIRST(&vm_page_queues[baseq + q].pl); + return (m); +} ==== //depot/projects/superpages/src/sys/vm/vm_page.c#18 (text+ko) ==== @@ -737,7 +737,7 @@ boolean_t was_trylocked; mtx_assert(&vm_page_queue_mtx, MA_OWNED); - while ((m = vm_buddyq_find(PQ_CACHE)) != NULL) { + while ((m = vm_buddyq_first(PQ_CACHE)) != NULL) { KASSERT(m->dirty == 0, ("Found dirty cache page %p", m)); KASSERT(!pmap_page_is_mapped(m), ("Found mapped cache page %p", m)); ==== //depot/projects/superpages/src/sys/vm/vm_pageout.c#9 (text+ko) ==== @@ -100,6 +100,7 @@ #include #include #include +#include #include #include #include @@ -1129,7 +1130,8 @@ * does not effect other calculations. */ while (cnt.v_free_count < cnt.v_free_reserved) { - TAILQ_FOREACH(m, &vm_page_queues[PQ_CACHE].pl, pageq) { + for (m = vm_buddyq_first(PQ_CACHE); m != NULL; + m = vm_buddyq_next(m)) { KASSERT(m->dirty == 0, ("Found dirty cache page %p", m)); KASSERT(!pmap_page_is_mapped(m), From owner-p4-projects@FreeBSD.ORG Thu Feb 2 06:57:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB5BD16A423; Thu, 2 Feb 2006 06:57:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A0B2016A420 for ; Thu, 2 Feb 2006 06:57:12 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F8BF43D45 for ; Thu, 2 Feb 2006 06:57:12 +0000 (GMT) (envelope-from kmacy@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 k126vCjQ048636 for ; Thu, 2 Feb 2006 06:57:12 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k126vC1R048633 for perforce@freebsd.org; Thu, 2 Feb 2006 06:57:12 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 2 Feb 2006 06:57:12 GMT Message-Id: <200602020657.k126vC1R048633@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 90915 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 06:57:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=90915 Change 90915 by kmacy@kmacy:freebsd7_xen3 on 2006/02/02 06:56:43 enable INITDOMAIN and PHYSDEV_ACCESS by default fix compile-time errors fix errors caused by running as domU with this set Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/conf/XENCONF#5 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#10 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#9 edit .. //depot/projects/xen3/src/sys/i386/i386/bios.c#3 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/conf/XENCONF#5 (text+ko) ==== @@ -144,6 +144,8 @@ #options BOOTP options XEN +options XEN_PHYSDEV_ACCESS +options XEN_PRIVILEGED_GUEST options MCLSHIFT=12 # this has to be enabled for Xen as we can only have one cluster per page options MSIZE=256 options DIAGNOSTIC ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#10 (text+ko) ==== @@ -109,6 +109,8 @@ #define RTC_UNLOCK mtx_unlock_spin(&clock_lock) static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31}; +static u_char rtc_statusb = RTCSB_24HR; + /* Values for timerX_state: */ #define RELEASED 0 @@ -517,6 +519,111 @@ rdtscll(alarm); } +/* + * RTC support routines + */ + +int +rtcin(reg) + int reg; +{ + u_char val; + + RTC_LOCK; + outb(IO_RTC, reg); + inb(0x84); + val = inb(IO_RTC + 1); + inb(0x84); + RTC_UNLOCK; + return (val); +} + +static __inline void +writertc(u_char reg, u_char val) +{ + + RTC_LOCK; + inb(0x84); + outb(IO_RTC, reg); + inb(0x84); + outb(IO_RTC + 1, val); + inb(0x84); /* XXX work around wrong order in rtcin() */ + RTC_UNLOCK; +} + +static __inline int +readrtc(int port) +{ + return(bcd2bin(rtcin(port))); +} + + +/* + * Initialize the time of day register, based on the time base which is, e.g. + * from a filesystem. + */ +static void +domu_inittodr(time_t base) +{ + unsigned long sec; + int s, y; + struct timespec ts; + + update_wallclock(); + + s = splclock(); + if (base) { + ts.tv_sec = base; + ts.tv_nsec = 0; + tc_setclock(&ts); + } + + sec += tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + + y = time_second - shadow_tv.tv_sec; + if (y <= -2 || y >= 2) { + /* badly off, adjust it */ + tc_setclock(&shadow_tv); + } + splx(s); +} + +/* + * Write system time back to RTC. + */ +static void +domu_resettodr(void) +{ + unsigned long tm; + int s; + dom0_op_t op; + struct shadow_time_info *shadow; + + shadow = &per_cpu(shadow_time, smp_processor_id()); + if (disable_rtc_set) + return; + + s = splclock(); + tm = time_second; + splx(s); + + tm -= tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + + if ((xen_start_info->flags & SIF_INITDOMAIN) && + !independent_wallclock) + { + op.cmd = DOM0_SETTIME; + op.u.settime.secs = tm; + op.u.settime.nsecs = 0; + op.u.settime.system_time = shadow->system_timestamp; + HYPERVISOR_dom0_op(&op); + update_wallclock(); + } else if (independent_wallclock) { + /* notyet */ + ; + } +} + #ifdef XEN_PRIVILEGED_GUEST /* * Initialize the time of day register, based on the time base which is, e.g. @@ -530,6 +637,11 @@ int y, m, s; struct timespec ts; + if (!(xen_start_info->flags & SIF_INITDOMAIN)) { + domu_inittodr(base); + return; + } + if (base) { s = splclock(); ts.tv_sec = base; @@ -605,6 +717,11 @@ unsigned long tm; int y, m, s; + if (!(xen_start_info->flags & SIF_INITDOMAIN)) { + domu_resettodr(); + return; + } + if (disable_rtc_set) return; @@ -654,113 +771,9 @@ rtcin(RTC_INTR); } -#else -/* - * Initialize the time of day register, based on the time base which is, e.g. - * from a filesystem. - */ -void -inittodr(time_t base) -{ - unsigned long sec; - int s, y; - struct timespec ts; - - update_wallclock(); - - s = splclock(); - if (base) { - ts.tv_sec = base; - ts.tv_nsec = 0; - tc_setclock(&ts); - } - - sec += tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); - - y = time_second - shadow_tv.tv_sec; - if (y <= -2 || y >= 2) { - /* badly off, adjust it */ - tc_setclock(&shadow_tv); - } - splx(s); -} - -/* - * Write system time back to RTC. - */ -void -resettodr() -{ - unsigned long tm; - int s; - dom0_op_t op; - struct shadow_time_info *shadow; - - shadow = &per_cpu(shadow_time, smp_processor_id()); - if (disable_rtc_set) - return; - - s = splclock(); - tm = time_second; - splx(s); - - tm -= tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); - - if ((xen_start_info->flags & SIF_INITDOMAIN) && - !independent_wallclock) - { - op.cmd = DOM0_SETTIME; - op.u.settime.secs = tm; - op.u.settime.nsecs = 0; - op.u.settime.system_time = shadow->system_timestamp; - HYPERVISOR_dom0_op(&op); - update_wallclock(); - } else if (independent_wallclock) { - /* notyet */ - ; - } -} #endif -/* - * RTC support routines - */ - -int -rtcin(reg) - int reg; -{ - u_char val; - - RTC_LOCK; - outb(IO_RTC, reg); - inb(0x84); - val = inb(IO_RTC + 1); - inb(0x84); - RTC_UNLOCK; - return (val); -} - -static __inline void -writertc(u_char reg, u_char val) -{ - - RTC_LOCK; - inb(0x84); - outb(IO_RTC, reg); - inb(0x84); - outb(IO_RTC + 1, val); - inb(0x84); /* XXX work around wrong order in rtcin() */ - RTC_UNLOCK; -} - -static __inline int -readrtc(int port) -{ - return(bcd2bin(rtcin(port))); -} - int acquire_timer2(int mode) { ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#9 (text+ko) ==== @@ -1695,20 +1695,22 @@ * this will panic with the current bootmem allocator - still need to * figure out how little I can get away with there */ + if (xen_start_info->flags & SIF_INITDOMAIN) { map = bootmem_alloc(PAGE_SIZE); op.cmd = DOM0_PHYSICAL_MEMORY_MAP; - op.u.physical_memory_map.memory_may = map; + op.u.physical_memory_map.memory_map = map; op.u.physical_memory_map.max_map_entries = PAGE_SIZE / sizeof(struct dom0_memory_map_entry); - PANIC_IF(HYPERVISOR_dom0_op(&ap)); + PANIC_IF(HYPERVISOR_dom0_op(&op)); last = 0x100000000ULL; gapstart = 0x10000000; gapsize = 0x400000; for (i = op.u.physical_memory_map.nr_map_entries - 1; i >= 0; i--) { +#if 0 struct resource *res; - +#endif if ((last > map[i].end) && ((last - map[i].end) > gapsize)) { gapsize = last - map[i].end; gapstart = map[i].end; @@ -1749,8 +1751,9 @@ printk("Allocating PCI resources starting at %08lx (gap: %08lx:%08lx)\n", pci_mem_start, gapstart, gapsize); #endif + } -#elif defined(XEN) +#if defined(XEN) Maxmem = xen_start_info->nr_pages - init_first; pmap_bootstrap((init_first << PAGE_SHIFT), 0); for (i = 0; i < 10; i++) @@ -1762,7 +1765,7 @@ phys_avail[1] = avail_end; return; #endif - +#endif hasbrokenint12 = 0; TUNABLE_INT_FETCH("hw.hasbrokenint12", &hasbrokenint12); bzero(&vmf, sizeof(vmf)); ==== //depot/projects/xen3/src/sys/i386/i386/bios.c#3 (text+ko) ==== @@ -83,8 +83,9 @@ int i; char *p; -#if defined(XEN) && !defined(XEN_PRIVILEGED_GUEST) - return; +#if defined(XEN) + if (!(xen_start_info->flags & SIF_INITDOMAIN)) + return; #endif /* * BIOS32 Service Directory, PCI BIOS From owner-p4-projects@FreeBSD.ORG Thu Feb 2 08:27:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8048D16A424; Thu, 2 Feb 2006 08:27:40 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC1A516A423 for ; Thu, 2 Feb 2006 08:27:39 +0000 (GMT) (envelope-from pawel.worach@gmail.com) Received: from uproxy.gmail.com (uproxy.gmail.com [66.249.92.198]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBA2643D4C for ; Thu, 2 Feb 2006 08:27:38 +0000 (GMT) (envelope-from pawel.worach@gmail.com) Received: by uproxy.gmail.com with SMTP id o2so144367uge for ; Thu, 02 Feb 2006 00:27:38 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding; b=ixRjkJJz2dFt8iG6cuBAWJJNUaIuLtuBiuIn9PDICBYohTZdLll4yF4amWWUvBVP8oo2XztarP/xJmQAt3YmE/3zkhsYPebvpKvFb9yiqugQ/NGgB4I9beWBWRmlS75JYCqXCjqqmouGBb+Ffgcs5Cxi1A3a0YvzfHKUVXI1PSg= Received: by 10.66.216.11 with SMTP id o11mr169584ugg; Thu, 02 Feb 2006 00:27:37 -0800 (PST) Received: from ?192.168.0.107? ( [80.217.193.226]) by mx.gmail.com with ESMTP id e1sm1162255ugf.2006.02.02.00.27.37; Thu, 02 Feb 2006 00:27:37 -0800 (PST) Message-ID: <43E1C275.8070600@gmail.com> Date: Thu, 02 Feb 2006 09:27:33 +0100 From: Pawel Worach User-Agent: Thunderbird 1.5 (X11/20060129) MIME-Version: 1.0 To: Robert Watson References: <200601312102.k0VL24It078902@repoman.freebsd.org> In-Reply-To: <200601312102.k0VL24It078902@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 90830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 08:27:41 -0000 Robert Watson wrote: > http://perforce.freebsd.org/chv.cgi?CH=90830 > > Change 90830 by rwatson@rwatson_peppercorn on 2006/01/31 21:01:03 > > Sync to OpenBSM. > > Affected files ... > > .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#22 edit > > +#if !defined(_KERNEL) && !defined(KERNEL) > +#endif /* defined(_KERNEL) || defined(KERNEL) */ Hi, One of those two looks like a typo. In sys/bsm/audit_record.h they are ORed so the most likely fix would be: --- sys/bsm/audit.h.orig Thu Feb 2 09:25:20 2006 +++ sys/bsm/audit.h Thu Feb 2 09:25:31 2006 @@ -328,7 +328,7 @@ }; typedef struct au_evclass_map au_evclass_map_t; -#if !defined(_KERNEL) && !defined(KERNEL) +#if !defined(_KERNEL) || !defined(KERNEL) int audit(const void *, int); int auditon(int, void *, int); int auditctl(const char *); Regards -- Pawel From owner-p4-projects@FreeBSD.ORG Thu Feb 2 15:07:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FBBB16A424; Thu, 2 Feb 2006 15:07:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E651A16A420 for ; Thu, 2 Feb 2006 15:07:27 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6E2243D49 for ; Thu, 2 Feb 2006 15:07:27 +0000 (GMT) (envelope-from millert@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 k12F7RDR088934 for ; Thu, 2 Feb 2006 15:07:27 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12F7RNc088931 for perforce@freebsd.org; Thu, 2 Feb 2006 15:07:27 GMT (envelope-from millert@freebsd.org) Date: Thu, 2 Feb 2006 15:07:27 GMT Message-Id: <200602021507.k12F7RNc088931@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 90922 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 15:07:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=90922 Change 90922 by millert@millert_g4tower on 2006/02/02 15:06:32 Sync access_vectors with what used to be in the policy dir (aka reality). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#6 (text+ko) ==== @@ -351,7 +351,6 @@ sys_time sys_tty_config mknod - lease } class mach_port @@ -372,12 +371,3 @@ terminate set_special_port } - -class mach_names -{ - register - look_up - getparent - makesubset - create_server -} From owner-p4-projects@FreeBSD.ORG Thu Feb 2 15:07:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81BAB16A43A; Thu, 2 Feb 2006 15:07:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BAC116A422 for ; Thu, 2 Feb 2006 15:07:28 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFCC043D49 for ; Thu, 2 Feb 2006 15:07:27 +0000 (GMT) (envelope-from millert@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 k12F7R8A088940 for ; Thu, 2 Feb 2006 15:07:27 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12F7RiR088937 for perforce@freebsd.org; Thu, 2 Feb 2006 15:07:27 GMT (envelope-from millert@freebsd.org) Date: Thu, 2 Feb 2006 15:07:27 GMT Message-Id: <200602021507.k12F7RiR088937@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 90923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 15:07:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=90923 Change 90923 by millert@millert_g4tower on 2006/02/02 15:06:51 Comment out .defs files we don't have in the tree yet. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile#7 (text+ko) ==== @@ -45,7 +45,9 @@ # Mig security classes and access vectors -DEFS = $(DARWIN_ROOT)/system_cmds/mach_init.tproj/bootstrap.defs $(DARWIN_ROOT)/netinfo/servers/notifyd/notify_ipc.defs $(DARWIN_ROOT)/../../examples/mig/mtest.defs +DEFS = $(DARWIN_ROOT)/system_cmds/mach_init.tproj/bootstrap.defs +#DEFS+= $(DARWIN_ROOT)/netinfo/servers/notifyd/notify_ipc.defs +#DEFS+= $(DARWIN_ROOT)/../../examples/mig/mtest.defs mig_msgids: $(DEFS) echo > $@ From owner-p4-projects@FreeBSD.ORG Thu Feb 2 18:39:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 392CE16A423; Thu, 2 Feb 2006 18:39:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C5F4B16A420; Thu, 2 Feb 2006 18:39:12 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from speedfactory.net (mail6.speedfactory.net [66.23.216.219]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EC4243D45; Thu, 2 Feb 2006 18:39:11 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (unverified [66.23.211.162]) by speedfactory.net (SurgeMail 3.5b3) with ESMTP id 7578348 for multiple; Thu, 02 Feb 2006 13:39:46 -0500 Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k12Id43K003311; Thu, 2 Feb 2006 13:39:07 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Pawel Worach Date: Thu, 2 Feb 2006 13:40:02 -0500 User-Agent: KMail/1.9.1 References: <200601312102.k0VL24It078902@repoman.freebsd.org> <43E1C275.8070600@gmail.com> In-Reply-To: <43E1C275.8070600@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200602021340.03928.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1270/Thu Feb 2 07:47:37 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED autolearn=failed version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx X-Server: High Performance Mail Server - http://surgemail.com r=1653887525 Cc: Perforce Change Reviews , Robert Watson Subject: Re: PERFORCE change 90830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 18:39:14 -0000 On Thursday 02 February 2006 03:27, Pawel Worach wrote: > Robert Watson wrote: > > http://perforce.freebsd.org/chv.cgi?CH=90830 > > > > Change 90830 by rwatson@rwatson_peppercorn on 2006/01/31 21:01:03 > > > > Sync to OpenBSM. > > > > Affected files ... > > > > .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#22 edit > > > > > > +#if !defined(_KERNEL) && !defined(KERNEL) > > > > +#endif /* defined(_KERNEL) || defined(KERNEL) */ > > Hi, > > One of those two looks like a typo. In sys/bsm/audit_record.h they are > ORed so the most likely fix would be: > > --- sys/bsm/audit.h.orig Thu Feb 2 09:25:20 2006 > +++ sys/bsm/audit.h Thu Feb 2 09:25:31 2006 > @@ -328,7 +328,7 @@ > }; > typedef struct au_evclass_map au_evclass_map_t; > > -#if !defined(_KERNEL) && !defined(KERNEL) > +#if !defined(_KERNEL) || !defined(KERNEL) > int audit(const void *, int); > int auditon(int, void *, int); > int auditctl(const char *); > > Regards Actually, I think && is right. The conditional code is meant to be exposed to userland and not the kernel and _KERNEL is for FreeBSD and KERNEL for OS X. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Thu Feb 2 19:02:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D434016A424; Thu, 2 Feb 2006 19:02:11 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE77716A420 for ; Thu, 2 Feb 2006 19:02:11 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 671C843D49 for ; Thu, 2 Feb 2006 19:02:11 +0000 (GMT) (envelope-from alc@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 k12J2BoW007126 for ; Thu, 2 Feb 2006 19:02:11 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12J2BuG007123 for perforce@freebsd.org; Thu, 2 Feb 2006 19:02:11 GMT (envelope-from alc@freebsd.org) Date: Thu, 2 Feb 2006 19:02:11 GMT Message-Id: <200602021902.k12J2BuG007123@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 19:02:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=90927 Change 90927 by alc@alc_home on 2006/02/02 19:01:47 Eliminate an unnecessary call to pmap_remove_all(). Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_pageout.c#10 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_pageout.c#10 (text+ko) ==== @@ -849,7 +849,6 @@ /* * Invalid pages can be easily freed */ - pmap_remove_all(m); vm_page_free(m); cnt.v_dfree++; --page_shortage; From owner-p4-projects@FreeBSD.ORG Thu Feb 2 20:42:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51D8016A423; Thu, 2 Feb 2006 20:42:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1255016A420 for ; Thu, 2 Feb 2006 20:42:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A83D043D48 for ; Thu, 2 Feb 2006 20:42:12 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k12KgC29013518 for ; Thu, 2 Feb 2006 20:42:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12KgCIV013513 for perforce@freebsd.org; Thu, 2 Feb 2006 20:42:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 2 Feb 2006 20:42:12 GMT Message-Id: <200602022042.k12KgCIV013513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90930 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 20:42:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=90930 Change 90930 by rwatson@rwatson_peppercorn on 2006/02/02 20:42:09 Slight style tweak to AUE_NMOUNT line. Add a number of POSIX.1b and Linux system call entries in order to reserve event identifiers for them. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#30 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#30 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#30 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -358,7 +358,18 @@ #define AUE_KQUEUE 377 /* FreeBSD-specific. */ #define AUE_KEVENT 378 /* FreeBSD-specific. */ #define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD-specific. */ +#define AUE_NMOUNT 380 /* FreeBSD-specific. */ +#define AUE_BDFLUSH 381 /* Linux-specific. */ +#define AUE_SETFSUID 382 /* Linux-specific. */ +#define AUE_GETFSUID 383 /* Linux-specific. */ +#define AUE_PERSONALITY 384 /* Linux-specific. */ +#define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ +#define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ +#define AUE_PRCTL 387 /* Linux-specific. */ +#define AUE_GETCWD 388 /* FreeBSD/Linux-specific. */ +#define AUE_CAPGET 389 /* Linux-specific. */ +#define AUE_CAPSET 390 /* Linux-specific. */ +#define AUE_PIVOT_ROOT 391 /* Linux-specific. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Thu Feb 2 20:43:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3191116A424; Thu, 2 Feb 2006 20:43:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0D3F16A420 for ; Thu, 2 Feb 2006 20:43:14 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B65343D49 for ; Thu, 2 Feb 2006 20:43:14 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k12KhEFk013674 for ; Thu, 2 Feb 2006 20:43:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12KhE0I013668 for perforce@freebsd.org; Thu, 2 Feb 2006 20:43:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 2 Feb 2006 20:43:14 GMT Message-Id: <200602022043.k12KhE0I013668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90931 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 20:43:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=90931 Change 90931 by rwatson@rwatson_peppercorn on 2006/02/02 20:42:25 For a number of system calls, use the appropriate audit event identifier. Fix comment. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/syscalls.master#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/syscalls.master#6 (text+ko) ==== @@ -4,7 +4,7 @@ ; System call name/number master file (or rather, slave, from LINUX). ; Processed to created linux_sysent.c, linux_syscalls.c and linux_syscall.h. -; Columns: number type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that @@ -49,13 +49,13 @@ 1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void 2 AUE_FORK MSTD { int linux_fork(void); } -3 AUE_NULL MNOPROTO { int read(int fd, char *buf, \ +3 AUE_READ MNOPROTO { int read(int fd, char *buf, \ u_int nbyte); } -4 AUE_NULL MNOPROTO { int write(int fd, char *buf, \ +4 AUE_WRITE MNOPROTO { int write(int fd, char *buf, \ u_int nbyte); } 5 AUE_NULL UNIMPL 6 AUE_CLOSE MNOPROTO { int close(int fd); } -7 AUE_O_WAIT MSTD { int osf1_wait4(int pid, int *status, \ +7 AUE_WAIT4 MSTD { int osf1_wait4(int pid, int *status, \ int options, \ struct osf1_rusage *rusage); } 8 AUE_NULL UNIMPL @@ -142,7 +142,7 @@ l_size_t len, l_ulong prot); } 75 AUE_MADVISE MNOPROTO { int madvise(void *addr, \ size_t len, int behav); } -76 AUE_NULL MSTD { int linux_vhangup(void); } +76 AUE_O_VHANGUP MSTD { int linux_vhangup(void); } 77 AUE_NULL UNIMPL 78 AUE_NULL UNIMPL 79 AUE_SETGROUPS MSTD { int linux_setgroups(l_int gidsetsize, \ @@ -446,7 +446,7 @@ 311 AUE_REBOOT MSTD { int linux_reboot(l_int magic1, \ l_int magic2, l_uint cmd, void *arg); } 312 AUE_RFORK MSTD { int linux_clone(l_int flags, void *stack); } -313 AUE_NULL STD { int linux_uselib(char *library); } +313 AUE_USELIB STD { int linux_uselib(char *library); } 314 AUE_MLOCK MNOPROTO { int mlock(const void *addr, \ size_t len); } 315 AUE_MUNLOCK MNOPROTO { int munlock(const void *addr, \ @@ -537,7 +537,7 @@ struct l_timeval *times); } 364 AUE_GETRUSAGE MNOPROTO { int getrusage(int who, \ struct rusage *rusage); } -365 AUE_O_WAIT MSTD { int linux_wait4(l_pid_t pid, \ +365 AUE_WAIT4 MSTD { int linux_wait4(l_pid_t pid, \ l_uint *status, l_int options, \ struct l_rusage *rusage); } 366 AUE_ADJTIME MSTD { int linux_adjtimex(void); } @@ -545,7 +545,7 @@ l_ulong bufsize); } 368 AUE_NULL MSTD { int linux_capget(void); } 369 AUE_NULL MSTD { int linux_capset(void); } -370 AUE_NULL MSTD { int linux_sendfile(void); } +370 AUE_SENDFILE MSTD { int linux_sendfile(void); } 371 AUE_SETRESGID MNOPROTO { int setresgid(gid_t rgid, \ gid_t egid, gid_t sgid); } 372 AUE_GETRESGID MNOPROTO { int getresgid(gid_t *rgid, \ From owner-p4-projects@FreeBSD.ORG Thu Feb 2 20:43:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D09D16A447; Thu, 2 Feb 2006 20:43:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 293DB16A422 for ; Thu, 2 Feb 2006 20:43:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D25ED43D4C for ; Thu, 2 Feb 2006 20:43:14 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k12KhEH6013680 for ; Thu, 2 Feb 2006 20:43:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12KhEKH013677 for perforce@freebsd.org; Thu, 2 Feb 2006 20:43:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 2 Feb 2006 20:43:14 GMT Message-Id: <200602022043.k12KhEKH013677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90932 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 20:43:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=90932 Change 90932 by rwatson@rwatson_peppercorn on 2006/02/02 20:42:47 Regenerate. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_proto.h#6 edit .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_syscall.h#6 edit .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_sysent.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_proto.h#6 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_syscall.h#6 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_sysent.c#6 (text+ko) ==== @@ -23,11 +23,11 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = */ { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ - { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ + { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_READ }, /* 3 = read */ + { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_WRITE }, /* 4 = write */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 5 = */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ - { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_O_WAIT }, /* 7 = osf1_wait4 */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_WAIT4 }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = */ { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ @@ -96,7 +96,7 @@ { SYF_MPSAFE | AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_MUNMAP }, /* 73 = linux_munmap */ { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 74 = linux_mprotect */ { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 75 = madvise */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 76 = linux_vhangup */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_O_VHANGUP }, /* 76 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 78 = */ { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 79 = linux_setgroups */ @@ -333,7 +333,7 @@ { SYF_MPSAFE | AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 310 = linux_syslog */ { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 311 = linux_reboot */ { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 312 = linux_clone */ - { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_NULL }, /* 313 = linux_uselib */ + { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_USELIB }, /* 313 = linux_uselib */ { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 314 = mlock */ { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 315 = munlock */ { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 316 = mlockall */ @@ -385,12 +385,12 @@ { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 362 = linux_setitimer */ { SYF_MPSAFE | AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES }, /* 363 = linux_utimes */ { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE }, /* 364 = getrusage */ - { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_O_WAIT }, /* 365 = linux_wait4 */ + { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 365 = linux_wait4 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 366 = linux_adjtimex */ { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_NULL }, /* 367 = linux_getcwd */ { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_NULL }, /* 368 = linux_capget */ { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_NULL }, /* 369 = linux_capset */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_NULL }, /* 370 = linux_sendfile */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 370 = linux_sendfile */ { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 371 = setresgid */ { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 372 = getresgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 373 = sys_dipc */ From owner-p4-projects@FreeBSD.ORG Thu Feb 2 20:58:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5052616A423; Thu, 2 Feb 2006 20:58:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB48516A420 for ; Thu, 2 Feb 2006 20:58:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1A0C43D49 for ; Thu, 2 Feb 2006 20:58:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k12KwXue021652 for ; Thu, 2 Feb 2006 20:58:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12KwXMc021649 for perforce@freebsd.org; Thu, 2 Feb 2006 20:58:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 2 Feb 2006 20:58:33 GMT Message-Id: <200602022058.k12KwXMc021649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90933 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 20:58:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=90933 Change 90933 by rwatson@rwatson_peppercorn on 2006/02/02 20:57:47 Additional audit event types for POSIX.1b and FreeBSD. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#31 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#31 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#30 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#31 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -370,6 +370,21 @@ #define AUE_CAPGET 389 /* Linux-specific. */ #define AUE_CAPSET 390 /* Linux-specific. */ #define AUE_PIVOT_ROOT 391 /* Linux-specific. */ +#define AUE_RTPRIO 392 /* FreeBSD-specific. */ +#define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ +#define AUE_SCHED_GETPARAM 394 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ +#define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ +#define AUE_ACL_GET_FILE 398 /* FreeBSD. */ +#define AUE_ACL_SET_FILE 399 /* FreeBSD. */ +#define AUE_ACL_GET_FD 400 /* FreeBSD. */ +#define AUE_ACL_SET_FD 401 /* FreeBSD. */ +#define AUE_ACL_DELETE_FILE 402 /* FreeBSD. */ +#define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ +#define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ +#define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ + /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the From owner-p4-projects@FreeBSD.ORG Thu Feb 2 21:24:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B2C716A424; Thu, 2 Feb 2006 21:24:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32A2316A420 for ; Thu, 2 Feb 2006 21:24:10 +0000 (GMT) (envelope-from pawel.worach@gmail.com) Received: from uproxy.gmail.com (uproxy.gmail.com [66.249.92.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEBFE43D5D for ; Thu, 2 Feb 2006 21:24:08 +0000 (GMT) (envelope-from pawel.worach@gmail.com) Received: by uproxy.gmail.com with SMTP id o2so46571uge for ; Thu, 02 Feb 2006 13:24:07 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding; b=uhovpFmSEOOxW/MzFr2ej3Y27zXwYPzW3MEFR+L2/6cb8ii1QymBtRlsXEDJCu1i3njqqjb/hyxxMzoc+2xwt8JSVf3zWGg6OVENYagiHYUkTFF2OnX8dvahPA7f69EA2FkE/oXgGLwT5HpF0XAP9de+pEn17WAHxLFbDsRI3no= Received: by 10.67.31.9 with SMTP id i9mr557946ugj; Thu, 02 Feb 2006 13:24:07 -0800 (PST) Received: from ?192.168.0.107? ( [80.217.193.226]) by mx.gmail.com with ESMTP id k30sm1673331ugc.2006.02.02.13.24.06; Thu, 02 Feb 2006 13:24:07 -0800 (PST) Message-ID: <43E27874.9060409@gmail.com> Date: Thu, 02 Feb 2006 22:24:04 +0100 From: Pawel Worach User-Agent: Thunderbird 1.5 (X11/20060129) MIME-Version: 1.0 To: John Baldwin References: <200601312102.k0VL24It078902@repoman.freebsd.org> <43E1C275.8070600@gmail.com> <200602021340.03928.jhb@freebsd.org> In-Reply-To: <200602021340.03928.jhb@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews , Robert Watson Subject: Re: PERFORCE change 90830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 21:24:11 -0000 John Baldwin wrote: > > Actually, I think && is right. The conditional code is meant to be exposed to > userland and not the kernel and _KERNEL is for FreeBSD and KERNEL for OS X. > Aha, in that case the #endif comment needs updating :) --- sys/bsm/audit.h.orig Thu Feb 2 21:40:33 2006 +++ sys/bsm/audit.h Thu Feb 2 21:40:44 2006 @@ -338,7 +338,7 @@ int setaudit(const struct auditinfo *); int getaudit_addr(struct auditinfo_addr *, int); int setaudit_addr(const struct auditinfo_addr *, int); -#endif /* defined(_KERNEL) || defined(KERNEL) */ +#endif /* defined(_KERNEL) && defined(KERNEL) */ __END_DECLS -- Pawel From owner-p4-projects@FreeBSD.ORG Thu Feb 2 21:29:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAFC616A424; Thu, 2 Feb 2006 21:29:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D7A016A420 for ; Thu, 2 Feb 2006 21:29:13 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49BB843D49 for ; Thu, 2 Feb 2006 21:29:13 +0000 (GMT) (envelope-from alc@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 k12LTDJj022881 for ; Thu, 2 Feb 2006 21:29:13 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12LTCRY022876 for perforce@freebsd.org; Thu, 2 Feb 2006 21:29:12 GMT (envelope-from alc@freebsd.org) Date: Thu, 2 Feb 2006 21:29:12 GMT Message-Id: <200602022129.k12LTCRY022876@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 21:29:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=90936 Change 90936 by alc@alc_home on 2006/02/02 21:29:10 Create the sysctl debug.promotion for controlling the printing of diagnostic messages. Affected files ... .. //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#8 edit Differences ... ==== //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -145,7 +145,10 @@ #include #endif -#define DPRINTF(x) do { if (0) printf x; } while (0) +static int debug_promotion; +SYSCTL_INT(_debug, OID_AUTO, promotion, CTLFLAG_RW, &debug_promotion, 0, ""); + +#define DPRINTF(x) do { if (debug_promotion) printf x; } while (0) #ifndef PMAP_SHPGPERPROC #define PMAP_SHPGPERPROC 200 From owner-p4-projects@FreeBSD.ORG Thu Feb 2 21:37:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0609216A423; Thu, 2 Feb 2006 21:37:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC16616A420 for ; Thu, 2 Feb 2006 21:37:14 +0000 (GMT) (envelope-from roam@ringlet.net) Received: from straylight.ringlet.net (nat114.cnsys.bg [85.95.80.114]) by mx1.FreeBSD.org (Postfix) with SMTP id CF00B43D60 for ; Thu, 2 Feb 2006 21:37:08 +0000 (GMT) (envelope-from roam@ringlet.net) Received: (qmail 1865 invoked by uid 1000); 2 Feb 2006 21:37:05 -0000 Date: Thu, 2 Feb 2006 23:37:04 +0200 From: Peter Pentchev To: Pawel Worach Message-ID: <20060202213704.GA956@straylight.m.ringlet.net> References: <200601312102.k0VL24It078902@repoman.freebsd.org> <43E1C275.8070600@gmail.com> <200602021340.03928.jhb@freebsd.org> <43E27874.9060409@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="SLDf9lqlvOQaIe6s" Content-Disposition: inline In-Reply-To: <43E27874.9060409@gmail.com> User-Agent: Mutt/1.5.11 Cc: Perforce Change Reviews , Robert Watson , John Baldwin Subject: Re: PERFORCE change 90830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 21:37:15 -0000 --SLDf9lqlvOQaIe6s Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 02, 2006 at 10:24:04PM +0100, Pawel Worach wrote: > John Baldwin wrote: > > > >Actually, I think && is right. The conditional code is meant to be=20 > >exposed to userland and not the kernel and _KERNEL is for FreeBSD and=20 > >KERNEL for OS X. > > >=20 > Aha, in that case the #endif comment needs updating :) >=20 > --- sys/bsm/audit.h.orig Thu Feb 2 21:40:33 2006 > +++ sys/bsm/audit.h Thu Feb 2 21:40:44 2006 > @@ -338,7 +338,7 @@ > int setaudit(const struct auditinfo *); > int getaudit_addr(struct auditinfo_addr *, int); > int setaudit_addr(const struct auditinfo_addr *, int); > -#endif /* defined(_KERNEL) || defined(KERNEL) */ > +#endif /* defined(_KERNEL) && defined(KERNEL) */ It seems that it ought indeed to be changed, but *with* the '!'s before the conditions - a && b and !a && !b are two completely different things, y'know :) !a && !b and a || b are related, true, but style(9) seems to say that it should indeed be !a && !b in this case. G'luck, Peter --=20 Peter Pentchev roam@ringlet.net roam@cnsys.bg roam@FreeBSD.org PGP key: http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint FDBA FD79 C26F 3C51 C95E DF9E ED18 B68D 1619 4553 If this sentence didn't exist, somebody would have invented it. --SLDf9lqlvOQaIe6s Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFD4nuA7Ri2jRYZRVMRAr8kAJ42IOM7S/qZbbKwsFUtpj+CuNmAbQCfaczr 017DzHFlzS0YXxJtftcKUQg= =LAsj -----END PGP SIGNATURE----- --SLDf9lqlvOQaIe6s-- From owner-p4-projects@FreeBSD.ORG Thu Feb 2 22:10:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2278316A424; Thu, 2 Feb 2006 22:10:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F11AE16A422 for ; Thu, 2 Feb 2006 22:10:04 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48F7343D5F for ; Thu, 2 Feb 2006 22:10:03 +0000 (GMT) (envelope-from alc@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 k12MA3sY024581 for ; Thu, 2 Feb 2006 22:10:03 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12MA2Q0024574 for perforce@freebsd.org; Thu, 2 Feb 2006 22:10:02 GMT (envelope-from alc@freebsd.org) Date: Thu, 2 Feb 2006 22:10:02 GMT Message-Id: <200602022210.k12MA2Q0024574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 22:10:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=90938 Change 90938 by alc@alc_home on 2006/02/02 22:09:18 Release pages from non-VMIO buffers on brelse() with B_RELBUF set. (This has nothing to do with superpages. I was, however, testing it on this source tree.) Submitted by: tegge Affected files ... .. //depot/projects/superpages/src/sys/kern/vfs_bio.c#7 edit Differences ... ==== //depot/projects/superpages/src/sys/kern/vfs_bio.c#7 (text+ko) ==== @@ -1312,6 +1312,11 @@ vfs_vmio_release(bp); } + } else if ((bp->b_flags & (B_INVAL | B_RELBUF)) != 0) { + if (bp->b_bufsize != 0) + allocbuf(bp, 0); + if (bp->b_vp != NULL) + brelvp(bp); } if (BUF_REFCNT(bp) > 1) { From owner-p4-projects@FreeBSD.ORG Thu Feb 2 22:11:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 608D816A423; Thu, 2 Feb 2006 22:11:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22EC216A420 for ; Thu, 2 Feb 2006 22:11:08 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C7EF43D45 for ; Thu, 2 Feb 2006 22:11:05 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k12MB4IY024663 for ; Thu, 2 Feb 2006 22:11:04 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12MB4mb024660 for perforce@freebsd.org; Thu, 2 Feb 2006 22:11:04 GMT (envelope-from wsalamon@computer.org) Date: Thu, 2 Feb 2006 22:11:04 GMT Message-Id: <200602022211.k12MB4mb024660@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 90939 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 22:11:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=90939 Change 90939 by wsalamon@gretsch on 2006/02/02 22:10:09 Missing word fix, pointed out by C. Brueffer. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#4 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#4 $ .\" .Dd Jan 24, 2004 .Dt AUDIT 8 @@ -44,7 +44,7 @@ .Sh DESCRIPTION The .Nm -utility controls the state of auditing system. +utility controls the state of the audit system. The optional .Ar file operand specifies the location of the audit control input file (default From owner-p4-projects@FreeBSD.ORG Thu Feb 2 22:15:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEB2516A423; Thu, 2 Feb 2006 22:15:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8EA7516A420 for ; Thu, 2 Feb 2006 22:15:10 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56CF643D45 for ; Thu, 2 Feb 2006 22:15:10 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k12MFA7R024899 for ; Thu, 2 Feb 2006 22:15:10 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12MFAAZ024896 for perforce@freebsd.org; Thu, 2 Feb 2006 22:15:10 GMT (envelope-from wsalamon@computer.org) Date: Thu, 2 Feb 2006 22:15:10 GMT Message-Id: <200602022215.k12MFAAZ024896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 90940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 22:15:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=90940 Change 90940 by wsalamon@gretsch on 2006/02/02 22:15:02 Integrate minor fix from OpenBSM. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#2 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#1 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.8#2 $ .\" .Dd Jan 24, 2004 .Dt AUDIT 8 @@ -44,10 +44,11 @@ .Sh DESCRIPTION The .Nm -utility controls the state of auditing system. The optional +utility controls the state of the audit system. +The optional .Ar file operand specifies the location of the audit control input file (default -/etc/security/audit_control). +.Pa /etc/security/audit_control ). .Pp The options are as follows: .Bl -tag -width Ds @@ -56,10 +57,11 @@ a new log file in a location specified in the audit control file. .It Fl s Specifies that the audit system should [re]synchronize its -configuration from the audit control file. A new log file will be -created. +configuration from the audit control file. +A new log file will be created. .It Fl t -Specifies that the audit system should terminate. Log files are closed +Specifies that the audit system should terminate. +Log files are closed and renamed to indicate the time of the shutdown. .El .Sh NOTES From owner-p4-projects@FreeBSD.ORG Thu Feb 2 22:31:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36DE116A423; Thu, 2 Feb 2006 22:31:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC6FE16A420 for ; Thu, 2 Feb 2006 22:31:30 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9EF9A43D53 for ; Thu, 2 Feb 2006 22:31:30 +0000 (GMT) (envelope-from alc@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 k12MVU7L025550 for ; Thu, 2 Feb 2006 22:31:30 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12MVUXc025547 for perforce@freebsd.org; Thu, 2 Feb 2006 22:31:30 GMT (envelope-from alc@freebsd.org) Date: Thu, 2 Feb 2006 22:31:30 GMT Message-Id: <200602022231.k12MVUXc025547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90941 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 22:31:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=90941 Change 90941 by alc@alc_home on 2006/02/02 22:30:48 Allow promotion of kmem_object pages. Affected files ... .. //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#9 edit Differences ... ==== //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -2196,7 +2196,7 @@ * be superpage aligned */ if (((mpte != NULL && mpte->wire_count == NPTEPG) || - m->object == kernel_object || (m->object == kmem_object && FALSE)) && + m->object == kernel_object || m->object == kmem_object) && m->reserv != NULL && m->reserv->refcnt == NBPDR / PAGE_SIZE) { DPRINTF(("%s: pmap %p va %lx XXX\n", __func__, pmap, va)); From owner-p4-projects@FreeBSD.ORG Thu Feb 2 23:47:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C51FB16A423; Thu, 2 Feb 2006 23:47:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83CE516A420 for ; Thu, 2 Feb 2006 23:47:01 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DF4543D45 for ; Thu, 2 Feb 2006 23:47:01 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k12Nl1Z4028642 for ; Thu, 2 Feb 2006 23:47:01 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12Nl16r028639 for perforce@freebsd.org; Thu, 2 Feb 2006 23:47:01 GMT (envelope-from wsalamon@computer.org) Date: Thu, 2 Feb 2006 23:47:01 GMT Message-Id: <200602022347.k12Nl16r028639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 90942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 23:47:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=90942 Change 90942 by wsalamon@gretsch on 2006/02/02 23:46:47 Punctuation fix, spotted by C. Brueffer. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#7 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#7 $ .\" .Dd Jan 24, 2004 .Dt AUDITREDUCE 1 @@ -84,7 +84,7 @@ This option cannot be used with .Fl a or -.Fl b +.Fl b. .It Fl e Ar euid Select records with the given effective user id or name. .It Fl f Ar egid From owner-p4-projects@FreeBSD.ORG Thu Feb 2 23:51:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A874016A423; Thu, 2 Feb 2006 23:51:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2887516A443 for ; Thu, 2 Feb 2006 23:51:14 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B804A43D68 for ; Thu, 2 Feb 2006 23:51:07 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k12Np6nm028835 for ; Thu, 2 Feb 2006 23:51:06 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k12Np6wj028832 for perforce@freebsd.org; Thu, 2 Feb 2006 23:51:06 GMT (envelope-from wsalamon@computer.org) Date: Thu, 2 Feb 2006 23:51:06 GMT Message-Id: <200602022351.k12Np6wj028832@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 90943 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 23:51:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=90943 Change 90943 by wsalamon@gretsch on 2006/02/02 23:50:51 Propagate typo fix from OpenBSM. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#4 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#4 $ .\" .Dd Jan 24, 2004 .Dt AUDITREDUCE 1 @@ -84,7 +84,7 @@ This option cannot be used with .Fl a or -.Fl b +.Fl b. .It Fl e Ar euid Select records with the given effective user id or name. .It Fl f Ar egid From owner-p4-projects@FreeBSD.ORG Fri Feb 3 02:29:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E817316A423; Fri, 3 Feb 2006 02:29:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A493C16A420 for ; Fri, 3 Feb 2006 02:29:25 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5579843D45 for ; Fri, 3 Feb 2006 02:29:25 +0000 (GMT) (envelope-from kmacy@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 k132TPIJ045211 for ; Fri, 3 Feb 2006 02:29:25 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k132TPEe045208 for perforce@freebsd.org; Fri, 3 Feb 2006 02:29:25 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 3 Feb 2006 02:29:25 GMT Message-Id: <200602030229.k132TPEe045208@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 90947 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 02:29:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=90947 Change 90947 by kmacy@kmacy:freebsd7_xen3 on 2006/02/03 02:28:50 sync xen headers with xen-unstable dom0 interface version has changed since I pulled the headers *sigh* Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/arch-x86_32.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/arch-x86_64.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/dom0_ops.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/version.h#2 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/xen.h#2 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/include/xen-public/arch-x86_32.h#2 (text+ko) ==== @@ -49,10 +49,15 @@ * machine->physical mapping table starts at this address, read-only. */ #ifdef CONFIG_X86_PAE -# define HYPERVISOR_VIRT_START (0xF5800000UL) +#define __HYPERVISOR_VIRT_START 0xF5800000 #else -# define HYPERVISOR_VIRT_START (0xFC000000UL) +#define __HYPERVISOR_VIRT_START 0xFC000000 +#endif + +#ifndef HYPERVISOR_VIRT_START +#define HYPERVISOR_VIRT_START mk_unsigned_long(__HYPERVISOR_VIRT_START) #endif + #ifndef machine_to_phys_mapping #define machine_to_phys_mapping ((unsigned long *)HYPERVISOR_VIRT_START) #endif @@ -109,11 +114,11 @@ /* FPU registers come first so they can be aligned for FXSAVE/FXRSTOR. */ struct { char x[512]; } fpu_ctxt; /* User-level FPU registers */ #define VGCF_I387_VALID (1<<0) -#define VGCF_VMX_GUEST (1<<1) +#define VGCF_HVM_GUEST (1<<1) #define VGCF_IN_KERNEL (1<<2) unsigned long flags; /* VGCF_* flags */ cpu_user_regs_t user_regs; /* User-level CPU registers */ - trap_info_t trap_ctxt[256]; /* Virtual IDT */ + struct trap_info trap_ctxt[256]; /* Virtual IDT */ unsigned long ldt_base, ldt_ents; /* LDT (linear address, # ents) */ unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents) */ unsigned long kernel_ss, kernel_sp; /* Virtual TSS (only SS1/SP1) */ @@ -130,6 +135,7 @@ unsigned long max_pfn; /* max pfn that appears in table */ /* Frame containing list of mfns containing list of mfns containing p2m. */ unsigned long pfn_to_mfn_frame_list_list; + unsigned long nmi_reason; } arch_shared_info_t; typedef struct { @@ -137,7 +143,7 @@ unsigned long pad[5]; /* sizeof(vcpu_info_t) == 64 */ } arch_vcpu_info_t; -#endif +#endif /* !__ASSEMBLY__ */ #endif ==== //depot/projects/xen3/src/sys/i386-xen/include/xen-public/arch-x86_64.h#2 (text+ko) ==== @@ -59,9 +59,12 @@ /* And the trap vector is... */ #define TRAP_INSTR "syscall" +#define __HYPERVISOR_VIRT_START 0xFFFF800000000000 +#define __HYPERVISOR_VIRT_END 0xFFFF880000000000 + #ifndef HYPERVISOR_VIRT_START -#define HYPERVISOR_VIRT_START (0xFFFF800000000000UL) -#define HYPERVISOR_VIRT_END (0xFFFF880000000000UL) +#define HYPERVISOR_VIRT_START mk_unsigned_long(__HYPERVISOR_VIRT_START) +#define HYPERVISOR_VIRT_END mk_unsigned_long(__HYPERVISOR_VIRT_END) #endif /* Maximum number of virtual CPUs in multi-processor guests. */ @@ -85,11 +88,20 @@ #define SEGBASE_GS_USER_SEL 3 /* Set user %gs specified in base[15:0] */ /* - * int HYPERVISOR_switch_to_user(void) + * int HYPERVISOR_iret(void) * All arguments are on the kernel stack, in the following format. * Never returns if successful. Current kernel context is lost. + * The saved CS is mapped as follows: + * RING0 -> RING3 kernel mode. + * RING1 -> RING3 kernel mode. + * RING2 -> RING3 kernel mode. + * RING3 -> RING3 user mode. + * However RING0 indicates that the guest kernel should return to iteself + * directly with + * orb $3,1*8(%rsp) + * iretq * If flags contains VGCF_IN_SYSCALL: - * Restore RAX, RIP, RFLAGS, RSP. + * Restore RAX, RIP, RFLAGS, RSP. * Discard R11, RCX, CS, SS. * Otherwise: * Restore RAX, R11, RCX, CS:RIP, RFLAGS, SS:RSP. @@ -97,10 +109,19 @@ */ /* Guest exited in SYSCALL context? Return to guest with SYSRET? */ #define VGCF_IN_SYSCALL (1<<8) +struct iret_context { + /* Top of stack (%rsp at point of hypercall). */ + uint64_t rax, r11, rcx, flags, rip, cs, rflags, rsp, ss; + /* Bottom of iret stack frame. */ +}; +/* + * For compatibility with HYPERVISOR_switch_to_user which is the old + * name for HYPERVISOR_iret. + */ struct switch_to_user { /* Top of stack (%rsp at point of hypercall). */ uint64_t rax, r11, rcx, flags, rip, cs, rflags, rsp, ss; - /* Bottom of switch_to_user stack frame. */ + /* Bottom of iret stack frame. */ }; /* @@ -175,11 +196,11 @@ /* FPU registers come first so they can be aligned for FXSAVE/FXRSTOR. */ struct { char x[512]; } fpu_ctxt; /* User-level FPU registers */ #define VGCF_I387_VALID (1<<0) -#define VGCF_VMX_GUEST (1<<1) +#define VGCF_HVM_GUEST (1<<1) #define VGCF_IN_KERNEL (1<<2) unsigned long flags; /* VGCF_* flags */ cpu_user_regs_t user_regs; /* User-level CPU registers */ - trap_info_t trap_ctxt[256]; /* Virtual IDT */ + struct trap_info trap_ctxt[256]; /* Virtual IDT */ unsigned long ldt_base, ldt_ents; /* LDT (linear address, # ents) */ unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents) */ unsigned long kernel_ss, kernel_sp; /* Virtual TSS (only SS1/SP1) */ @@ -199,6 +220,7 @@ unsigned long max_pfn; /* max pfn that appears in table */ /* Frame containing list of mfns containing list of mfns containing p2m. */ unsigned long pfn_to_mfn_frame_list_list; + unsigned long nmi_reason; } arch_shared_info_t; typedef struct { ==== //depot/projects/xen3/src/sys/i386-xen/include/xen-public/dom0_ops.h#2 (text+ko) ==== @@ -19,12 +19,12 @@ * This makes sure that old versions of dom0 tools will stop working in a * well-defined way (rather than crashing the machine, for instance). */ -#define DOM0_INTERFACE_VERSION 0xAAAA1014 +#define DOM0_INTERFACE_VERSION 0x03000000 /************************************************************************/ #define DOM0_GETMEMLIST 2 -typedef struct { +typedef struct dom0_getmemlist { /* IN variables. */ domid_t domain; unsigned long max_pfns; @@ -42,7 +42,7 @@ typedef struct sched_adjdom_cmd dom0_adjustdom_t; #define DOM0_CREATEDOMAIN 8 -typedef struct { +typedef struct dom0_createdomain { /* IN parameters */ uint32_t ssidref; xen_domain_handle_t handle; @@ -52,25 +52,25 @@ } dom0_createdomain_t; #define DOM0_DESTROYDOMAIN 9 -typedef struct { +typedef struct dom0_destroydomain { /* IN variables. */ domid_t domain; } dom0_destroydomain_t; #define DOM0_PAUSEDOMAIN 10 -typedef struct { +typedef struct dom0_pausedomain { /* IN parameters. */ domid_t domain; } dom0_pausedomain_t; #define DOM0_UNPAUSEDOMAIN 11 -typedef struct { +typedef struct dom0_unpausedomain { /* IN parameters. */ domid_t domain; } dom0_unpausedomain_t; #define DOM0_GETDOMAININFO 12 -typedef struct { +typedef struct dom0_getdomaininfo { /* IN variables. */ domid_t domain; /* NB. IN/OUT variable. */ /* OUT variables. */ @@ -94,17 +94,17 @@ xen_domain_handle_t handle; } dom0_getdomaininfo_t; -#define DOM0_SETDOMAININFO 13 -typedef struct { +#define DOM0_SETVCPUCONTEXT 13 +typedef struct dom0_setvcpucontext { /* IN variables. */ domid_t domain; uint32_t vcpu; /* IN/OUT parameters */ vcpu_guest_context_t *ctxt; -} dom0_setdomaininfo_t; +} dom0_setvcpucontext_t; #define DOM0_MSR 15 -typedef struct { +typedef struct dom0_msr { /* IN variables. */ uint32_t write; cpumap_t cpu_mask; @@ -121,7 +121,7 @@ * 1 January, 1970 if the current system time was . */ #define DOM0_SETTIME 17 -typedef struct { +typedef struct dom0_settime { /* IN variables. */ uint32_t secs; uint32_t nsecs; @@ -139,20 +139,20 @@ #define LTAB_MASK XTAB #define LTABTYPE_MASK (0x7<<28) -typedef struct { +typedef struct dom0_getpageframeinfo { /* IN variables. */ - unsigned long pfn; /* Machine page frame number to query. */ + unsigned long mfn; /* Machine page frame number to query. */ domid_t domain; /* To which domain does the frame belong? */ /* OUT variables. */ /* Is the page PINNED to a type? */ - uint32_t type; /* see above type defs */ + uint32_t type; /* see above type defs */ } dom0_getpageframeinfo_t; /* * Read console content from Xen buffer ring. */ #define DOM0_READCONSOLE 19 -typedef struct { +typedef struct dom0_readconsole { /* IN variables. */ uint32_t clear; /* Non-zero -> clear after reading. */ /* IN/OUT variables. */ @@ -163,17 +163,17 @@ /* * Set which physical cpus a vcpu can execute on. */ -#define DOM0_PINCPUDOMAIN 20 -typedef struct { +#define DOM0_SETVCPUAFFINITY 20 +typedef struct dom0_setvcpuaffinity { /* IN variables. */ domid_t domain; uint32_t vcpu; cpumap_t cpumap; -} dom0_pincpudomain_t; +} dom0_setvcpuaffinity_t; /* Get trace buffers machine base address */ #define DOM0_TBUFCONTROL 21 -typedef struct { +typedef struct dom0_tbufcontrol { /* IN variables */ #define DOM0_TBUF_GET_INFO 0 #define DOM0_TBUF_SET_CPU_MASK 1 @@ -194,7 +194,7 @@ * Get physical information about the host machine */ #define DOM0_PHYSINFO 22 -typedef struct { +typedef struct dom0_physinfo { uint32_t threads_per_core; uint32_t cores_per_socket; uint32_t sockets_per_node; @@ -209,7 +209,7 @@ * Get the ID of the current scheduler. */ #define DOM0_SCHED_ID 24 -typedef struct { +typedef struct dom0_sched_id { /* OUT variable */ uint32_t sched_id; } dom0_sched_id_t; @@ -228,15 +228,14 @@ #define DOM0_SHADOW_CONTROL_OP_CLEAN 11 #define DOM0_SHADOW_CONTROL_OP_PEEK 12 -typedef struct dom0_shadow_control -{ +typedef struct dom0_shadow_control_stats { uint32_t fault_count; uint32_t dirty_count; uint32_t dirty_net_count; uint32_t dirty_block_count; } dom0_shadow_control_stats_t; -typedef struct { +typedef struct dom0_shadow_control { /* IN variables. */ domid_t domain; uint32_t op; @@ -248,14 +247,14 @@ } dom0_shadow_control_t; #define DOM0_SETDOMAINMAXMEM 28 -typedef struct { +typedef struct dom0_setdomainmaxmem { /* IN variables. */ domid_t domain; unsigned long max_memkb; } dom0_setdomainmaxmem_t; #define DOM0_GETPAGEFRAMEINFO2 29 /* batched interface */ -typedef struct { +typedef struct dom0_getpageframeinfo2 { /* IN variables. */ domid_t domain; unsigned long num; @@ -264,17 +263,17 @@ } dom0_getpageframeinfo2_t; /* - * Request memory range (@pfn, @pfn+@nr_pfns-1) to have type @type. + * Request memory range (@mfn, @mfn+@nr_mfns-1) to have type @type. * On x86, @type is an architecture-defined MTRR memory type. * On success, returns the MTRR that was used (@reg) and a handle that can * be passed to DOM0_DEL_MEMTYPE to accurately tear down the new setting. * (x86-specific). */ #define DOM0_ADD_MEMTYPE 31 -typedef struct { +typedef struct dom0_add_memtype { /* IN variables. */ - unsigned long pfn; - unsigned long nr_pfns; + unsigned long mfn; + unsigned long nr_mfns; uint32_t type; /* OUT variables. */ uint32_t handle; @@ -289,7 +288,7 @@ * (x86-specific). */ #define DOM0_DEL_MEMTYPE 32 -typedef struct { +typedef struct dom0_del_memtype { /* IN variables. */ uint32_t handle; uint32_t reg; @@ -297,12 +296,12 @@ /* Read current type of an MTRR (x86-specific). */ #define DOM0_READ_MEMTYPE 33 -typedef struct { +typedef struct dom0_read_memtype { /* IN variables. */ uint32_t reg; /* OUT variables. */ - unsigned long pfn; - unsigned long nr_pfns; + unsigned long mfn; + unsigned long nr_mfns; uint32_t type; } dom0_read_memtype_t; @@ -311,12 +310,12 @@ /* Sub-operations: */ #define DOM0_PERFCCONTROL_OP_RESET 1 /* Reset all counters to zero. */ #define DOM0_PERFCCONTROL_OP_QUERY 2 /* Get perfctr information. */ -typedef struct { +typedef struct dom0_perfc_desc { uint8_t name[80]; /* name of perf counter */ uint32_t nr_vals; /* number of values for this counter */ uint32_t vals[64]; /* array of values */ } dom0_perfc_desc_t; -typedef struct { +typedef struct dom0_perfccontrol { /* IN variables. */ uint32_t op; /* DOM0_PERFCCONTROL_OP_??? */ /* OUT variables. */ @@ -325,14 +324,14 @@ } dom0_perfccontrol_t; #define DOM0_MICROCODE 35 -typedef struct { +typedef struct dom0_microcode { /* IN variables. */ void *data; /* Pointer to microcode data */ uint32_t length; /* Length of microcode data. */ } dom0_microcode_t; #define DOM0_IOPORT_PERMISSION 36 -typedef struct { +typedef struct dom0_ioport_permission { domid_t domain; /* domain to be affected */ uint32_t first_port; /* first port int range */ uint32_t nr_ports; /* size of port range */ @@ -340,7 +339,7 @@ } dom0_ioport_permission_t; #define DOM0_GETVCPUCONTEXT 37 -typedef struct { +typedef struct dom0_getvcpucontext { /* IN variables. */ domid_t domain; /* domain to be affected */ uint32_t vcpu; /* vcpu # */ @@ -349,7 +348,7 @@ } dom0_getvcpucontext_t; #define DOM0_GETVCPUINFO 43 -typedef struct { +typedef struct dom0_getvcpuinfo { /* IN variables. */ domid_t domain; /* domain to be affected */ uint32_t vcpu; /* vcpu # */ @@ -363,7 +362,7 @@ } dom0_getvcpuinfo_t; #define DOM0_GETDOMAININFOLIST 38 -typedef struct { +typedef struct dom0_getdomaininfolist { /* IN variables. */ domid_t first_domain; uint32_t max_domains; @@ -374,13 +373,13 @@ #define DOM0_PLATFORM_QUIRK 39 #define QUIRK_NOIRQBALANCING 1 -typedef struct { +typedef struct dom0_platform_quirk { /* IN variables. */ uint32_t quirk_id; } dom0_platform_quirk_t; #define DOM0_PHYSICAL_MEMORY_MAP 40 -typedef struct { +typedef struct dom0_physical_memory_map { /* IN variables. */ uint32_t max_map_entries; /* OUT variables. */ @@ -393,61 +392,85 @@ } dom0_physical_memory_map_t; #define DOM0_MAX_VCPUS 41 -typedef struct { +typedef struct dom0_max_vcpus { domid_t domain; /* domain to be affected */ uint32_t max; /* maximum number of vcpus */ } dom0_max_vcpus_t; #define DOM0_SETDOMAINHANDLE 44 -typedef struct { +typedef struct dom0_setdomainhandle { domid_t domain; xen_domain_handle_t handle; } dom0_setdomainhandle_t; -#define DOM0_SETPTRACE 45 -typedef struct { +#define DOM0_SETDEBUGGING 45 +typedef struct dom0_setdebugging { domid_t domain; uint8_t enable; -} dom0_setptrace_t; +} dom0_setdebugging_t; + +#define DOM0_IRQ_PERMISSION 46 +typedef struct dom0_irq_permission { + domid_t domain; /* domain to be affected */ + uint8_t pirq; + uint8_t allow_access; /* flag to specify enable/disable of IRQ access */ +} dom0_irq_permission_t; -typedef struct { +#define DOM0_IOMEM_PERMISSION 47 +typedef struct dom0_iomem_permission { + domid_t domain; /* domain to be affected */ + unsigned long first_mfn; /* first page (physical page number) in range */ + unsigned long nr_mfns; /* number of pages in range (>0) */ + uint8_t allow_access; /* allow (!0) or deny (0) access to range? */ +} dom0_iomem_permission_t; + +#define DOM0_HYPERCALL_INIT 48 +typedef struct dom0_hypercall_init { + domid_t domain; /* domain to be affected */ + unsigned long mfn; /* machine frame to be initialised */ +} dom0_hypercall_init_t; + +typedef struct dom0_op { uint32_t cmd; uint32_t interface_version; /* DOM0_INTERFACE_VERSION */ union { - dom0_createdomain_t createdomain; - dom0_pausedomain_t pausedomain; - dom0_unpausedomain_t unpausedomain; - dom0_destroydomain_t destroydomain; - dom0_getmemlist_t getmemlist; - dom0_schedctl_t schedctl; - dom0_adjustdom_t adjustdom; - dom0_setdomaininfo_t setdomaininfo; - dom0_getdomaininfo_t getdomaininfo; - dom0_getpageframeinfo_t getpageframeinfo; - dom0_msr_t msr; - dom0_settime_t settime; - dom0_readconsole_t readconsole; - dom0_pincpudomain_t pincpudomain; - dom0_tbufcontrol_t tbufcontrol; - dom0_physinfo_t physinfo; - dom0_sched_id_t sched_id; - dom0_shadow_control_t shadow_control; - dom0_setdomainmaxmem_t setdomainmaxmem; - dom0_getpageframeinfo2_t getpageframeinfo2; - dom0_add_memtype_t add_memtype; - dom0_del_memtype_t del_memtype; - dom0_read_memtype_t read_memtype; - dom0_perfccontrol_t perfccontrol; - dom0_microcode_t microcode; - dom0_ioport_permission_t ioport_permission; - dom0_getvcpucontext_t getvcpucontext; - dom0_getvcpuinfo_t getvcpuinfo; - dom0_getdomaininfolist_t getdomaininfolist; - dom0_platform_quirk_t platform_quirk; - dom0_physical_memory_map_t physical_memory_map; - dom0_max_vcpus_t max_vcpus; - dom0_setdomainhandle_t setdomainhandle; - dom0_setptrace_t setptrace; + struct dom0_createdomain createdomain; + struct dom0_pausedomain pausedomain; + struct dom0_unpausedomain unpausedomain; + struct dom0_destroydomain destroydomain; + struct dom0_getmemlist getmemlist; + struct sched_ctl_cmd schedctl; + struct sched_adjdom_cmd adjustdom; + struct dom0_setvcpucontext setvcpucontext; + struct dom0_getdomaininfo getdomaininfo; + struct dom0_getpageframeinfo getpageframeinfo; + struct dom0_msr msr; + struct dom0_settime settime; + struct dom0_readconsole readconsole; + struct dom0_setvcpuaffinity setvcpuaffinity; + struct dom0_tbufcontrol tbufcontrol; + struct dom0_physinfo physinfo; + struct dom0_sched_id sched_id; + struct dom0_shadow_control shadow_control; + struct dom0_setdomainmaxmem setdomainmaxmem; + struct dom0_getpageframeinfo2 getpageframeinfo2; + struct dom0_add_memtype add_memtype; + struct dom0_del_memtype del_memtype; + struct dom0_read_memtype read_memtype; + struct dom0_perfccontrol perfccontrol; + struct dom0_microcode microcode; + struct dom0_ioport_permission ioport_permission; + struct dom0_getvcpucontext getvcpucontext; + struct dom0_getvcpuinfo getvcpuinfo; + struct dom0_getdomaininfolist getdomaininfolist; + struct dom0_platform_quirk platform_quirk; + struct dom0_physical_memory_map physical_memory_map; + struct dom0_max_vcpus max_vcpus; + struct dom0_setdomainhandle setdomainhandle; + struct dom0_setdebugging setdebugging; + struct dom0_irq_permission irq_permission; + struct dom0_iomem_permission iomem_permission; + struct dom0_hypercall_init hypercall_init; uint8_t pad[128]; } u; } dom0_op_t; ==== //depot/projects/xen3/src/sys/i386-xen/include/xen-public/version.h#2 (text+ko) ==== @@ -39,6 +39,18 @@ unsigned long virt_start; } xen_platform_parameters_t; +#define XENVER_get_features 6 +typedef struct xen_feature_info { + unsigned int submap_idx; /* IN: which 32-bit submap to return */ + uint32_t submap; /* OUT: 32-bit submap */ +} xen_feature_info_t; + +#define XENFEAT_writable_page_tables 0 +#define XENFEAT_writable_descriptor_tables 1 +#define XENFEAT_auto_translated_physmap 2 + +#define XENFEAT_NR_SUBMAPS 1 + #endif /* __XEN_PUBLIC_VERSION_H__ */ /* ==== //depot/projects/xen3/src/sys/i386-xen/include/xen-public/xen.h#2 (text+ko) ==== @@ -12,7 +12,7 @@ #if defined(__i386__) #include #elif defined(__x86_64__) -#include "arch-x86_64.h" +#include #elif defined(__ia64__) #include "arch-ia64.h" #else @@ -53,12 +53,14 @@ #define __HYPERVISOR_grant_table_op 20 #define __HYPERVISOR_vm_assist 21 #define __HYPERVISOR_update_va_mapping_otherdomain 22 -#define __HYPERVISOR_switch_vm86 23 /* x86/32 only */ -#define __HYPERVISOR_switch_to_user 23 /* x86/64 only */ +#define __HYPERVISOR_iret 23 /* x86 only */ +#define __HYPERVISOR_switch_vm86 23 /* x86/32 only (obsolete name) */ +#define __HYPERVISOR_switch_to_user 23 /* x86/64 only (obsolete name) */ #define __HYPERVISOR_vcpu_op 24 #define __HYPERVISOR_set_segment_base 25 /* x86/64 only */ #define __HYPERVISOR_mmuext_op 26 #define __HYPERVISOR_acm_op 27 +#define __HYPERVISOR_nmi_op 28 /* * VIRTUAL INTERRUPTS @@ -67,12 +69,10 @@ */ #define VIRQ_TIMER 0 /* Timebase update, and/or requested timeout. */ #define VIRQ_DEBUG 1 /* Request guest to dump debug info. */ -#define VIRQ_CONSOLE 2 /* (DOM0) bytes received on emergency console. */ +#define VIRQ_CONSOLE 2 /* (DOM0) Bytes received on emergency console. */ #define VIRQ_DOM_EXC 3 /* (DOM0) Exceptional event for some domain. */ -#define VIRQ_PARITY_ERR 4 /* (DOM0) NMI parity error. */ -#define VIRQ_IO_ERR 5 /* (DOM0) NMI I/O error. */ #define VIRQ_DEBUGGER 6 /* (DOM0) A domain has paused for debugging. */ -#define NR_VIRQS 7 +#define NR_VIRQS 8 /* * MMU-UPDATE REQUESTS @@ -144,10 +144,6 @@ * cmd: MMUEXT_SET_LDT * linear_addr: Linear address of LDT base (NB. must be page-aligned). * nr_ents: Number of entries in LDT. - * - * cmd: MMUEXT_REASSIGN_PAGE - * mfn: Machine frame number to be reassigned to the FD. - * (NB. page must currently belong to the calling domain). */ #define MMUEXT_PIN_L1_TABLE 0 #define MMUEXT_PIN_L2_TABLE 1 @@ -163,14 +159,13 @@ #define MMUEXT_INVLPG_ALL 11 #define MMUEXT_FLUSH_CACHE 12 #define MMUEXT_SET_LDT 13 -#define MMUEXT_REASSIGN_PAGE 14 #define MMUEXT_NEW_USER_BASEPTR 15 #ifndef __ASSEMBLY__ struct mmuext_op { unsigned int cmd; union { - /* [UN]PIN_TABLE, NEW_BASEPTR, NEW_USER_BASEPTR, REASSIGN_PAGE */ + /* [UN]PIN_TABLE, NEW_BASEPTR, NEW_USER_BASEPTR */ unsigned long mfn; /* INVLPG_LOCAL, INVLPG_ALL, SET_LDT */ unsigned long linear_addr; @@ -244,8 +239,7 @@ * Send an array of these to HYPERVISOR_mmu_update(). * NB. The fields are natural pointer/address size for this architecture. */ -typedef struct -{ +typedef struct mmu_update { uint64_t ptr; /* Machine address of PTE. */ uint64_t val; /* New contents of PTE. */ } mmu_update_t; @@ -254,8 +248,7 @@ * Send an array of these to HYPERVISOR_multicall(). * NB. The fields are natural register size for this architecture. */ -typedef struct -{ +typedef struct multicall_entry { unsigned long op, result; unsigned long args[6]; } multicall_entry_t; @@ -430,6 +423,15 @@ typedef uint8_t xen_domain_handle_t[16]; +/* Turn a plain number into a C unsigned long constant. */ +#define __mk_unsigned_long(x) x ## UL +#define mk_unsigned_long(x) __mk_unsigned_long(x) + +#else /* __ASSEMBLY__ */ + +/* In assembly code we cannot use C numeric constant suffixes. */ +#define mk_unsigned_long(x) x + #endif /* !__ASSEMBLY__ */ #endif /* __XEN_PUBLIC_XEN_H__ */ From owner-p4-projects@FreeBSD.ORG Fri Feb 3 02:33:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D20516A423; Fri, 3 Feb 2006 02:33:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E3C316A420 for ; Fri, 3 Feb 2006 02:33:31 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D05D543D45 for ; Fri, 3 Feb 2006 02:33:30 +0000 (GMT) (envelope-from kmacy@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 k132XUB1045404 for ; Fri, 3 Feb 2006 02:33:30 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k132XU00045401 for perforce@freebsd.org; Fri, 3 Feb 2006 02:33:30 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 3 Feb 2006 02:33:30 GMT Message-Id: <200602030233.k132XU00045401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 90948 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 02:33:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=90948 Change 90948 by kmacy@kmacy:freebsd7_xen3 on 2006/02/03 02:32:36 bump PHYSMAP_SIZE fix formatting in memory map code enable IOPL for OS improve panic output when console isn't up Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#10 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#11 edit .. //depot/projects/xen3/src/sys/i386-xen/include/xen-os.h#3 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#10 (text+ko) ==== @@ -1640,7 +1640,7 @@ ssd->ssd_gran = sd->sd_gran; } -#define PHYSMAP_SIZE (2 * 8) +#define PHYSMAP_SIZE (2 * 12) /* * Populate the (physmap) array with base/bound pairs describing the @@ -1696,55 +1696,58 @@ * figure out how little I can get away with there */ if (xen_start_info->flags & SIF_INITDOMAIN) { - map = bootmem_alloc(PAGE_SIZE); - op.cmd = DOM0_PHYSICAL_MEMORY_MAP; - op.u.physical_memory_map.memory_map = map; - op.u.physical_memory_map.max_map_entries = - PAGE_SIZE / sizeof(struct dom0_memory_map_entry); - PANIC_IF(HYPERVISOR_dom0_op(&op)); - - last = 0x100000000ULL; - gapstart = 0x10000000; - gapsize = 0x400000; - - for (i = op.u.physical_memory_map.nr_map_entries - 1; i >= 0; i--) { + map = bootmem_alloc(PAGE_SIZE); + op.cmd = DOM0_PHYSICAL_MEMORY_MAP; + op.u.physical_memory_map.memory_map = map; + op.u.physical_memory_map.max_map_entries = + PAGE_SIZE / sizeof(struct dom0_memory_map_entry); + /* + * if this fails - check for a header versioning mismatch + */ + PANIC_IF(HYPERVISOR_dom0_op(&op)); + + last = 0x100000000ULL; + gapstart = 0x10000000; + gapsize = 0x400000; + + for (i = op.u.physical_memory_map.nr_map_entries - 1; i >= 0; i--) { #if 0 - struct resource *res; + struct resource *res; #endif - if ((last > map[i].end) && ((last - map[i].end) > gapsize)) { - gapsize = last - map[i].end; - gapstart = map[i].end; - } - if (map[i].start < last) - last = map[i].start; - - if (map[i].end > 0x100000000ULL) - continue; - /* XXXEN need to handle reserved */ - phys_avail[2*i] = map[i].start; - phys_avail[2*i + 1] = map[i].end; - PANIC_IF(i*2 >= PHYSMAP_SIZE); + if ((last > map[i].end) && ((last - map[i].end) > gapsize)) { + gapsize = last - map[i].end; + gapstart = map[i].end; + } + if (map[i].start < last) + last = map[i].start; + + if (map[i].end > 0x100000000ULL) + continue; + /* XXXEN need to handle reserved */ + phys_avail[2*i] = map[i].start; + phys_avail[2*i + 1] = map[i].end; + PANIC_IF(i*2 >= PHYSMAP_SIZE); #if 0 - res = bootmem_alloc(sizeof(struct resource)); - res->name = map[i].is_ram ? "System RAM" : "reserved"; - res->start = map[i].start; - res->end = map[i].end - 1; - res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; - request_resource(&iomem_resource, res); + res = bootmem_alloc(sizeof(struct resource)); + res->name = map[i].is_ram ? "System RAM" : "reserved"; + res->start = map[i].start; + res->end = map[i].end - 1; + res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; + request_resource(&iomem_resource, res); #endif - } - - bootmem_free(map, PAGE_SIZE); - - /* - * Start allocating dynamic PCI memory a bit into the gap, - * aligned up to the nearest megabyte. - * - * Question: should we try to pad it up a bit (do something - * like " + (gapsize >> 3)" in there too?). We now have the - * technology. - */ + } + + bootmem_free(map, PAGE_SIZE); + + /* + * Start allocating dynamic PCI memory a bit into the gap, + * aligned up to the nearest megabyte. + * + * Question: should we try to pad it up a bit (do something + * like " + (gapsize >> 3)" in there too?). We now have the + * technology. + */ #ifdef notyet pci_mem_start = (gapstart + 0xfffff) & ~0xfffff; @@ -1753,6 +1756,7 @@ #endif } +#endif #if defined(XEN) Maxmem = xen_start_info->nr_pages - init_first; pmap_bootstrap((init_first << PAGE_SHIFT), 0); @@ -1765,7 +1769,6 @@ phys_avail[1] = avail_end; return; #endif -#endif hasbrokenint12 = 0; TUNABLE_INT_FETCH("hw.hasbrokenint12", &hasbrokenint12); bzero(&vmf, sizeof(vmf)); @@ -2384,12 +2387,14 @@ /* * Initialize the console before we print anything out. */ + XENPRINTF("cninit\n"); cninit(); if (metadata_missing) printf("WARNING: loader(8) metadata is missing!\n"); #ifdef DEV_ISA + XENPRINTF("ISA probing\n"); if (xen_start_info->flags & SIF_PRIVILEGED) { elcr_probe(); atpic_startup(); ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#11 (text+ko) ==== @@ -596,6 +596,7 @@ { int i, round_tmpindex; vm_paddr_t pdir_shadow_ma, KPTphys, *IdlePTDma; + physdev_op_t op; #ifdef SMP int j; @@ -745,7 +746,23 @@ } xen_flush_queue(); #endif - + + op.cmd = PHYSDEVOP_SET_IOPL; + op.u.set_iopl.iopl = 1; + PANIC_IF(HYPERVISOR_physdev_op(&op)); + + if (xen_start_info->flags & SIF_INITDOMAIN) { + /* add page table for KERNBASE */ + xen_queue_pt_update((vm_paddr_t)(IdlePTDma + KPTDI), + xpmap_ptom((tmpindex << PAGE_SHIFT)| PG_KERNEL)); + xen_queue_pt_update(pdir_shadow_ma + KPTDI*sizeof(vm_paddr_t), + xpmap_ptom((tmpindex << PAGE_SHIFT)| PG_V | PG_A)); + xen_flush_queue(); + /* Map first megabyte */ + for (i = 0; i < (256 << PAGE_SHIFT); i += PAGE_SIZE) + PT_SET_MA(KERNBASE + i, i | PG_KERNEL | PG_NC_PCD); + xen_flush_queue(); + } init_first = tmpindex; } ==== //depot/projects/xen3/src/sys/i386-xen/include/xen-os.h#3 (text+ko) ==== @@ -14,7 +14,7 @@ #define strchr index #define strrchr rindex -#define PANIC_IF(exp) if (unlikely(exp)) {printk("%s failed\n",#exp); panic("%s: %s:%d", #exp, __FILE__, __LINE__);} +#define PANIC_IF(exp) if (unlikely(exp)) {printk("panic - %s: %s:%d\n",#exp, __FILE__, __LINE__); panic("%s: %s:%d", #exp, __FILE__, __LINE__);} /* Somewhere in the middle of the GCC 2.96 development cycle, we implemented a mechanism by which the user can annotate likely branch directions and From owner-p4-projects@FreeBSD.ORG Fri Feb 3 02:40:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9D8116A423; Fri, 3 Feb 2006 02:40:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6616116A422 for ; Fri, 3 Feb 2006 02:40:41 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C207A43D48 for ; Fri, 3 Feb 2006 02:40:40 +0000 (GMT) (envelope-from alc@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 k132eeWs045723 for ; Fri, 3 Feb 2006 02:40:40 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k132edcs045720 for perforce@freebsd.org; Fri, 3 Feb 2006 02:40:39 GMT (envelope-from alc@freebsd.org) Date: Fri, 3 Feb 2006 02:40:39 GMT Message-Id: <200602030240.k132edcs045720@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90949 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 02:40:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=90949 Change 90949 by alc@alc_home on 2006/02/03 02:39:48 IFC @90949 Affected files ... .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#5 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/multimedia/chapter.sgml#3 integrate .. //depot/projects/superpages/src/UPDATING#4 integrate .. //depot/projects/superpages/src/contrib/openbsm/CHANGELOG#1 branch .. //depot/projects/superpages/src/contrib/openbsm/LICENSE#1 branch .. //depot/projects/superpages/src/contrib/openbsm/Makefile#1 branch .. //depot/projects/superpages/src/contrib/openbsm/README#1 branch .. //depot/projects/superpages/src/contrib/openbsm/TODO#1 branch .. //depot/projects/superpages/src/contrib/openbsm/VERSION#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/Makefile#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/audit/Makefile#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/audit/audit.8#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/audit/audit.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/auditd/Makefile#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/auditd/audit_warn.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/auditd/auditd.8#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/auditd/auditd.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/auditd/auditd.h#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/auditreduce/Makefile#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/auditreduce/auditreduce.1#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/auditreduce/auditreduce.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/auditreduce/auditreduce.h#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/praudit/Makefile#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/praudit/praudit.1#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bin/praudit/praudit.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bsm/Makefile#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bsm/audit.h#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bsm/audit_internal.h#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bsm/audit_kevents.h#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bsm/audit_record.h#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bsm/audit_uevents.h#1 branch .. //depot/projects/superpages/src/contrib/openbsm/bsm/libbsm.h#1 branch .. //depot/projects/superpages/src/contrib/openbsm/compat/endian.h#1 branch .. //depot/projects/superpages/src/contrib/openbsm/etc/audit_class#1 branch .. //depot/projects/superpages/src/contrib/openbsm/etc/audit_control#1 branch .. //depot/projects/superpages/src/contrib/openbsm/etc/audit_event#1 branch .. //depot/projects/superpages/src/contrib/openbsm/etc/audit_user#1 branch .. //depot/projects/superpages/src/contrib/openbsm/etc/audit_warn#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/Makefile#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_class.3#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_control.3#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_event.3#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_free_token.3#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_io.3#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_mask.3#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_token.3#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/au_user.3#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_audit.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_class.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_control.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_event.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_flags.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_io.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_mask.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_notify.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_token.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_user.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/bsm_wrappers.c#1 branch .. //depot/projects/superpages/src/contrib/openbsm/libbsm/libbsm.3#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/Makefile#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/audit.2#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/audit.log.5#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/audit_class.5#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/audit_control.5#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/audit_event.5#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/audit_user.5#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/audit_warn.5#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/auditctl.2#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/auditon.2#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/getaudit.2#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/getauid.2#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/setaudit.2#1 branch .. //depot/projects/superpages/src/contrib/openbsm/man/setauid.2#1 branch .. //depot/projects/superpages/src/contrib/openbsm/tools/Makefile#1 branch .. //depot/projects/superpages/src/contrib/openbsm/tools/audump.c#1 branch .. //depot/projects/superpages/src/etc/Makefile#3 integrate .. //depot/projects/superpages/src/etc/defaults/rc.conf#6 integrate .. //depot/projects/superpages/src/etc/mtree/BSD.var.dist#2 integrate .. //depot/projects/superpages/src/etc/rc.d/Makefile#5 integrate .. //depot/projects/superpages/src/etc/rc.d/auditd#1 branch .. //depot/projects/superpages/src/etc/rc.d/hostapd#1 branch .. //depot/projects/superpages/src/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/superpages/src/lib/Makefile#4 integrate .. //depot/projects/superpages/src/lib/libbsm/Makefile#1 branch .. //depot/projects/superpages/src/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/superpages/src/release/picobsd/bridge/config#2 integrate .. //depot/projects/superpages/src/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/superpages/src/release/picobsd/build/picobsd#2 integrate .. //depot/projects/superpages/src/sbin/geom/class/concat/geom_concat.c#4 integrate .. //depot/projects/superpages/src/sbin/geom/class/eli/geli.8#3 integrate .. //depot/projects/superpages/src/sbin/geom/class/eli/geom_eli.c#4 integrate .. //depot/projects/superpages/src/sbin/geom/class/label/geom_label.c#3 integrate .. //depot/projects/superpages/src/sbin/geom/class/mirror/geom_mirror.c#3 integrate .. //depot/projects/superpages/src/sbin/geom/class/nop/geom_nop.c#3 integrate .. //depot/projects/superpages/src/sbin/geom/class/raid3/geom_raid3.c#3 integrate .. //depot/projects/superpages/src/sbin/geom/class/shsec/geom_shsec.c#3 integrate .. //depot/projects/superpages/src/sbin/geom/class/stripe/geom_stripe.c#3 integrate .. //depot/projects/superpages/src/sbin/geom/core/geom.c#3 integrate .. //depot/projects/superpages/src/sbin/geom/core/geom.h#2 integrate .. //depot/projects/superpages/src/sbin/geom/misc/subr.c#3 integrate .. //depot/projects/superpages/src/sbin/geom/misc/subr.h#3 integrate .. //depot/projects/superpages/src/share/man/man4/Makefile#5 integrate .. //depot/projects/superpages/src/share/man/man4/audit.4#1 branch .. //depot/projects/superpages/src/share/man/man4/le.4#1 branch .. //depot/projects/superpages/src/share/man/man4/man4.i386/Makefile#3 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/ce.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/cs.4#4 integrate .. //depot/projects/superpages/src/share/man/man4/man4.i386/ep.4#4 integrate .. //depot/projects/superpages/src/share/man/man4/man4.sparc64/sbus.4#2 integrate .. //depot/projects/superpages/src/share/man/man4/ng_pppoe.4#3 integrate .. //depot/projects/superpages/src/share/man/man4/pcn.4#3 integrate .. //depot/projects/superpages/src/share/man/man4/pty.4#3 integrate .. //depot/projects/superpages/src/share/man/man4/vlan.4#3 integrate .. //depot/projects/superpages/src/share/man/man5/devfs.rules.5#3 integrate .. //depot/projects/superpages/src/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/superpages/src/share/man/man8/picobsd.8#2 integrate .. //depot/projects/superpages/src/share/man/man9/Makefile#5 integrate .. //depot/projects/superpages/src/share/man/man9/condvar.9#2 integrate .. //depot/projects/superpages/src/share/man/man9/mutex.9#2 integrate .. //depot/projects/superpages/src/share/man/man9/rwlock.9#1 branch .. //depot/projects/superpages/src/share/man/man9/sema.9#2 integrate .. //depot/projects/superpages/src/share/man/man9/sx.9#2 integrate .. //depot/projects/superpages/src/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/superpages/src/sys/bsm/audit.h#2 integrate .. //depot/projects/superpages/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/superpages/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/superpages/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/superpages/src/sys/coda/coda_vnops.c#3 integrate .. //depot/projects/superpages/src/sys/conf/NOTES#7 integrate .. //depot/projects/superpages/src/sys/conf/files#9 integrate .. //depot/projects/superpages/src/sys/conf/files.i386#3 integrate .. //depot/projects/superpages/src/sys/conf/files.sparc64#3 integrate .. //depot/projects/superpages/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/superpages/src/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/superpages/src/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/superpages/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/superpages/src/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/superpages/src/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/superpages/src/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/superpages/src/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/superpages/src/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/superpages/src/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/superpages/src/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/superpages/src/sys/geom/eli/pkcs5v2.c#2 integrate .. //depot/projects/superpages/src/sys/geom/eli/pkcs5v2.h#2 integrate .. //depot/projects/superpages/src/sys/geom/gate/g_gate.c#3 integrate .. //depot/projects/superpages/src/sys/geom/gate/g_gate.h#2 integrate .. //depot/projects/superpages/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/superpages/src/sys/geom/label/g_label.h#2 integrate .. //depot/projects/superpages/src/sys/geom/label/g_label_iso9660.c#3 integrate .. //depot/projects/superpages/src/sys/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/superpages/src/sys/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/superpages/src/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/superpages/src/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/superpages/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/superpages/src/sys/geom/nop/g_nop.c#3 integrate .. //depot/projects/superpages/src/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/superpages/src/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/superpages/src/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/superpages/src/sys/geom/shsec/g_shsec.c#3 integrate .. //depot/projects/superpages/src/sys/geom/shsec/g_shsec.h#2 integrate .. //depot/projects/superpages/src/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/superpages/src/sys/geom/stripe/g_stripe.h#2 integrate .. //depot/projects/superpages/src/sys/geom/zero/g_zero.c#3 integrate .. //depot/projects/superpages/src/sys/i386/conf/NOTES#5 integrate .. //depot/projects/superpages/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/superpages/src/sys/kern/tty_pts.c#5 integrate .. //depot/projects/superpages/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/superpages/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/superpages/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/superpages/src/sys/modules/Makefile#6 integrate .. //depot/projects/superpages/src/sys/modules/le/Makefile#1 branch .. //depot/projects/superpages/src/sys/net/if_bridge.c#7 integrate .. //depot/projects/superpages/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/superpages/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/superpages/src/sys/netinet/ip_ipsec.c#1 branch .. //depot/projects/superpages/src/sys/netinet/ip_ipsec.h#1 branch .. //depot/projects/superpages/src/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/superpages/src/sys/netinet/ip_output.c#3 integrate .. //depot/projects/superpages/src/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/superpages/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/superpages/src/sys/pci/agp_i810.c#3 integrate .. //depot/projects/superpages/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/superpages/src/sys/sys/vnode.h#4 integrate .. //depot/projects/superpages/src/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/superpages/src/sys/vm/vm_object.c#8 integrate .. //depot/projects/superpages/src/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/superpages/src/tools/regression/geom_eli/nokey.t#1 branch .. //depot/projects/superpages/src/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#2 integrate .. //depot/projects/superpages/src/usr.sbin/portsnap/portsnap/portsnap.8#3 integrate .. //depot/projects/superpages/www/en/developers.sgml#5 integrate .. //depot/projects/superpages/www/en/news/news.xml#7 integrate .. //depot/projects/superpages/www/en/projects/ideas/index.sgml#2 integrate .. //depot/projects/superpages/www/en/releases/6.1R/todo.sgml#5 integrate .. //depot/projects/superpages/www/es/includes.xsl#5 integrate .. //depot/projects/superpages/www/share/sgml/advisories.xml#5 integrate Differences ... ==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -376,7 +376,7 @@ By default, when you build a custom kernel, - all kernel modules also will be rebuilded. + all kernel modules will be rebuilt as well. If you want to update a kernel faster or to build only custom modules, you should edit /etc/make.conf before starting to build the kernel: ==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -387,7 +387,6 @@ (Use cvs login and enter the password anoncvs when prompted.) - USA: anoncvs@anoncvs1.FreeBSD.org:/home/ncvs (ssh only - no ==== //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/advanced-networking/chapter.sgml#2 (text+ko) ==== @@ -1,10 +1,10 @@ @@ -58,7 +58,7 @@ - ëÁË ÎÁÓÔÒÏÉÔØ ATM × &os; 5.X. + ëÁË ÎÁÓÔÒÏÉÔØ ATM. @@ -869,7 +869,7 @@ ÐÒÉ ÐÏÍÏÝÉ &man.sysctl.8;: &prompt.root; sysctl net.link.ether.bridge.enable=1 -&prompt.root; sysctl net.link.ether.bridge.config="wi0,xl0" +&prompt.root; sysctl net.link.ether.bridge.config="wi0 xl0" &prompt.root; sysctl net.inet.ip.forwarding=1 ÷ ×ÅÒÓÉÑÈ &os;, ÐÒÅÄÛÅÓÔ×ÕÀÝÉÈ 5.2, ×ÍÅÓÔÏ ÕËÁÚÁÎÎÙÈ ÎÕÖÎÏ @@ -1226,7 +1226,7 @@ &man.ndis.4;. ðÏÄ root: &prompt.root; cd /usr/src/sys/modules/ndis -&prompt.root; make && make install +&prompt.root; make && make install ïÐÒÅÄÅÌÉÔÅ ÍÅÓÔÏÐÏÌÏÖÅÎÉÅ ÆÁÊÌÏ× ÄÌÑ ×ÁÛÅÊ ËÁÒÔÙ. ïÂÙÞÎÏ ÉÈ ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ ×ÈÏÄÑÝÅÍ × ËÏÍÐÌÅËÔ CD ÉÌÉ ÎÁ Web-ÓÁÊÔÅ @@ -1308,7 +1308,7 @@ ôÅËÓÔ ÐÒÅÄÏÓÔÁ×ÉÌ -
pav@oook.cz
+
pav@FreeBSD.org
 @@ -1364,6 +1364,11 @@ ubt0: Interface 1 (alt.config 5) endpoints: isoc-in=0x83, isoc-out=0x3, wMaxPacketSize=49, nframes=6, buffer size=294 + + óÔÅË ÐÒÏÔÏËÏÌÏ× Bluetooth ÚÁÐÕÓËÁÅÔÓÑ ×ÒÕÞÎÕÀ ×Ï &os; 6.0, É ×Ï + &os; 5.X, ÐÅÒÅÄ 5.5. üÔÏ ÄÅÌÁÅÔÓÑ Á×ÔÏÍÁÔÉÞÅÓËÉ ÞÅÒÅÚ &man.devd.8; + ×Ï &os; 5.5, 6.1 É × ÂÏÌÅÅ ÎÏ×ÙÈ ×ÅÒÓÉÑÈ. + óËÏÐÉÒÕÊÔÅ ÆÁÊÌ /usr/share/examples/netgraph/bluetooth/rc.bluetooth × ËÁËÏÅ-ÎÉÂÕÄØ ÐÏÄÈÏÄÑÝÅÅ ÍÅÓÔÏ, ÎÁÐÒÉÍÅÒ, × ÆÁÊÌ @@ -1385,6 +1390,7 @@ Number of ACL packets: 8 Max. SCO packet size: 64 bytes Number of SCO packets: 8 + HCI @@ -1619,8 +1625,17 @@ ÚÁÐÒÏÓÉÔØ PIN-ËÏÄ. ÷×ÅÄÉÔÅ ÔÏÔ ÖÅ ÓÁÍÙÊ ËÏÄ, ÞÔÏ ÎÁÈÏÄÉÔÓÑ × hcsecd.conf. ôÅÐÅÒØ ×ÁÛ ðë É ÕÄÁÌ£ÎÎÏÅ ÕÓÔÒÏÊÓÔ×Ï ÓÐÁÒÅÎÙ. áÌØÔÅÒÎÁÔÉ×ÎÙÍ ÓÐÏÓÏÂÏÍ Ñ×ÌÑÅÔÓÑ ÉÎÉÃÉÁÃÉÑ ÐÒÏÃÅÓÓÁ ÓÏÚÄÁÎÉÑ - ÐÁÒÙ ÎÁ ÕÄÁÌ£ÎÎÏÍ ÕÓÔÒÏÊÓÔ×Å. îÉÖÅ ÄÁ£ÔÓÑ ÐÒÉÍÅÒ ×ÙÄÁÞÉ ÐÒÏÔÏËÏÌÁ - ËÏÍÁÎÄÙ hcsecd: + ÐÁÒÙ ÎÁ ÕÄÁÌ£ÎÎÏÍ ÕÓÔÒÏÊÓÔ×Å. + + ÷Ï &os; 5.5, 6.1 É × ÂÏÌÅÅ ÎÏ×ÙÈ, ÓÌÅÄÕÀÝÁÑ ÓÔÒÏËÁ ÍÏÖÅÔ ÂÙÔØ + ÄÏÂÁ×ÌÅÎÁ Ë /etc/rc.conf, ÞÔÏÂÙ + hcsecd ÚÁÐÕÓËÁÌÓÑ Á×ÔÏÍÁÔÉÞÅÓËÉ ×Ï ×ÒÅÍÑ ÓÔÁÒÔÁ + ÓÉÓÔÅÍÙ: + + hcsecd_enable="YES" + + îÉÖÅ ÄÁ£ÔÓÑ ÐÒÉÍÅÒ ×ÙÄÁÞÉ ÐÒÏÔÏËÏÌÁ + ËÏÍÁÎÄÙ hcsecd: hcsecd[16484]: Got Link_Key_Request event from 'ubt0hci', remote bdaddr 0:80:37:29:19:a4 hcsecd[16484]: Found matching entry, remote bdaddr 0:80:37:29:19:a4, name 'Pav's T39', link key doesn't exist @@ -1699,7 +1714,19 @@ &prompt.user; sdpcontrol -a 00:01:03:fc:6e:ec search OPUSH ÷Ï &os; ÐÒÅÄÏÓÔÁ×ÌÅÎÉÅ ÓÅÒ×ÉÓÏ× ËÌÉÅÎÔÁÍ Bluetooth ÏÓÕÝÅÓÔ×ÌÑÅÔÓÑ - ÓÅÒ×ÅÒÏÍ &man.sdpd.8;: + ÓÅÒ×ÅÒÏÍ &man.sdpd.8;. ÷Ï &os; 5.5, 6.1 É × ÂÏÌÅÅ ÎÏ×ÙÈ, ÓÌÅÄÕÀÝÁÑ ÓÔÒÏËÁ + ÍÏÖÅÔ ÂÙÔØ ÄÏÂÁ×ÌÅÎÁ × ÆÁÊÌ /etc/rc.conf: + + sdpd_enable="YES" + + ðÏÓÌÅ ÜÔÏÇÏ sdpd ÄÁÅÍÏÎ ÍÏÖÅÔ ÂÙÔØ ÚÁÐÕÝÅÎ + Ó ÐÏÍÏÝØÀ: + + &prompt.root; /etc/rc.d/sdpd start + + ÷Ï &os; 6.0, É ×Ï &os; 5.X ÐÅÒÅÄ 5.5, + sdpd ÎÅ ÉÎÔÅÇÒÉÒÏ×ÁÎ × ÓËÒÉÐÔÙ ÚÁÇÒÕÚËÉ + ÓÉÓÔÅÍÙ. ïÎ ÄÏÌÖÅÎ ÚÁÐÕÓËÁÔØÓÑ Á×ÔÏÍÁÔÉÞÅÓËÉ ËÏÍÁÎÄÏÊ: &prompt.root; sdpd @@ -2748,7 +2775,7 @@ #!/bin/sh export DESTDIR=/data/misc/diskless mkdir -p ${DESTDIR} -cd /usr/src; make world && make kernel +cd /usr/src; make world && make kernel cd /usr/src/etc; make distribution ëÁË ÔÏÌØËÏ ÜÔÏ ÂÕÄÅÔ ÓÄÅÌÁÎÏ, ×ÁÍ ÍÏÖÅÔ ÐÏÔÒÅÂÏ×ÁÔØÓÑ @@ -3343,6 +3370,12 @@ ÄÒÕÇÏÊ ÄÌÑ ÐÏÄËÌÀÞÅÎÉÑ Ë ì÷ó. ÷ÓÅ ÍÁÛÉÎÙ × ÌÏËÁÌØÎÏÊ ÓÅÔÉ ÐÏÄËÌÀÞÁÀÔÓÑ ÞÅÒÅÚ ÓÅÔÅ×ÏÊ ËÏÎÃÅÎÔÒÁÔÏÒ ÉÌÉ ËÏÍÍÕÔÁÔÏÒ. + + óÕÝÅÓÔ×ÕÅÔ ÍÎÏÇÏ ÓÐÏÓÏÂÏ× ÐÏÄÓÏÅÄÉÎÉÔØ ÌÏËÁÌØÎÕÀ ÓÅÔØ Ë + Internet ÞÅÒÅÚ ÛÌÀÚ &os;. üÔÏÔ ÐÒÉÍÅÒ ÐÏËÁÚÙ×ÁÅÔ ÛÌÀÚ c + Ä×ÕÍÑ ÓÅÔÅ×ÙÍÉ ËÁÒÔÁÍÉ. + + @@ -3881,9 +3914,10 @@ îÅÈ×ÁÔËÁ ÁÄÒÅÓÏ×. óÅÇÏÄÎÑ ÜÔÏ ÎÅ ÔÁËÁÑ ÂÏÌØÛÁÑ ÐÒÏÂÌÅÍÁ, ÔÁË ËÁË - ÓÔÁÌÉ ÐÒÉÍÅÎÑÔØÓÑ ÁÄÒÅÓÎÙÅ ÐÒÏÓÔÒÁÎÓÔ×Á ÄÌÑ ÞÁÓÔÎÙÈ ÓÅÔÅÊ - (10.0.0.0/8, 192.168.0.0/24 É ÔÁË ÄÁÌÅÅ) É ÔÅÈÎÏÌÏÇÉÑ + ÓÔÁÌÉ ÐÒÉÍÅÎÑÔØÓÑ ÁÄÒÅÓÎÙÅ ÐÒÏÓÔÒÁÎÓÔ×Á ÄÌÑ ÞÁÓÔÎÙÈ ÓÅÔÅÊ (RFC1918) + (10.0.0.0/8, + 172.16.0.0/12 É 192.168.0.0/24) É ÔÅÈÎÏÌÏÇÉÑ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ ÓÅÔÅ×ÙÈ ÁÄÒÅÓÏ× (NAT - Network Address Translation). @@ -4163,8 +4197,8 @@ &prompt.root; ifconfig gif0 create &prompt.root; ifconfig gif0 gif0: flags=8010<POINTOPOINT,MULTICAST> mtu 1280 -&prompt.root; ifconfig gif0 tunnel MY_IPv4_ADDR HIS_IPv4_ADDR -&prompt.root; ifconfig gif0 inet6 alias MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR +&prompt.root; ifconfig gif0 tunnel MY_IPv4_ADDR MY_IPv4_REMOTE_TUNNEL_ENDPOINT_ADDR +&prompt.root; ifconfig gif0 inet6 alias MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR MY_IPv6_REMOTE_TUNNEL_ENDPOINT_ADDR úÁÍÅÎÉÔÅ ÓÌÏ×Á, ÎÁÐÉÓÁÎÎÙÅ ÚÁÇÌÁ×ÎÙÍÉ ÂÕË×ÁÍÉ, ÉÎÆÏÒÍÁÃÉÅÊ, ËÏÔÏÒÕÀ ×ÁÍ ÄÁÌ ×ÙÛÅÓÔÏÑÝÉÊ ÕÚÅÌ 6bone. @@ -4351,7 +4385,7 @@ - áÓÉÎÈÒÏÎÎÙÊ ÒÅÖÉÍ ÐÅÒÅÄÁÞÉ (ATM) × &os; 5.X + áÓÉÎÈÒÏÎÎÙÊ ÒÅÖÉÍ ÐÅÒÅÄÁÞÉ (ATM) ëÌÁÓÓÉÞÅÓËÁÑ ÎÁÓÔÒÏÊËÁ IP ÞÅÒÅÚ ATM (PVC) ==== //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/basics/chapter.sgml#2 (text+ko) ==== @@ -1,10 +1,10 @@ @@ -164,7 +164,7 @@ ìÀÂÏÊ ÍÎÏÇÏÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ ÓÉÓÔÅÍÅ ÎÕÖÅÎ ÓÐÏÓÏ ÏÔÌÉÞÁÔØ ËÁÖÄÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ ÏÔ ÏÓÔÁÌØÎÙÈ. ÷ FreeBSD (É ×ÓÅÈ - &unix; ÐÏÄÏÂÎÙÈ ÏÐÅÒÁÃÉÏÎÎÙÈ ÓÉÓÔÅÍÁÈ), ÜÔÁ ÚÁÄÁÞÁ ÒÅÛÁÅÔÓÑ ÐÕÔÅÍ + &unix;-ÐÏÄÏÂÎÙÈ ÏÐÅÒÁÃÉÏÎÎÙÈ ÓÉÓÔÅÍÁÈ), ÜÔÁ ÚÁÄÁÞÁ ÒÅÛÁÅÔÓÑ ÐÕÔÅÍ ×ÈÏÄÁ ÐÏÌØÚÏ×ÁÔÅÌÑ × ÓÉÓÔÅÍÕ ÐÅÒÅÄ ÚÁÐÕÓËÏÍ ËÁËÉÈ-ÌÉÂÏ ÐÒÏÇÒÁÍÍ. õ ËÁÖÄÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ ÅÓÔØ ÕÎÉËÁÌØÎÏÅ ÉÍÑ (ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ) É ÐÅÒÓÏÎÁÌØÎÙÊ, ÓÅËÒÅÔÎÙÊ ËÌÀÞ @@ -594,8 +594,8 @@ - ôÏÍ - òÏÄÅÓ + Tom + Rhodes ôÅËÓÔ ÐÒÅÄÏÓÔÁ×ÉÌ @@ -610,7 +610,7 @@ üÔÉ ÆÌÁÇÉ ÄÏÂÁ×ÌÑÀÔ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ×ÏÚÍÏÖÎÏÓÔÉ ËÏÎÔÒÏÌÑ ÎÁÄ ÆÁÊÌÁÍÉ, ÏÂÅÓÐÅÞÉ×ÁÑ (ÐÒÉ ÏÐÒÅÄÅÌÅÎÎÙÈ ÕÓÌÏ×ÉÑÈ) ÎÅ×ÏÚÍÏÖÎÏÓÔØ ÉÈ - ÕÄÁÌÅÎÉÑ ÄÁÖÅ ÐÏÌØÚÏ×ÁÔÅÌÀ root. + ÕÄÁÌÅÎÉÑ ÉÌÉ ÉÚÍÅÎÅÎÉÑ ÄÁÖÅ ÐÏÌØÚÏ×ÁÔÅÌÀ root. æÁÊÌÏ×ÙÅ ÆÌÁÇÉ ÉÚÍÅÎÑÀÔÓÑ ÐÒÉ ÐÏÍÏÝÉ ÕÔÉÌÉÔÙ &man.chflags.1; ÐÏÓÒÅÄÓÔ×ÏÍ ÐÒÏÓÔÏÇÏ ÉÎÔÅÒÆÅÊÓÁ. ë ÐÒÉÍÅÒÕ, ÞÔÏÂÙ ÕÓÔÁÎÏ×ÉÔØ @@ -655,8 +655,9 @@ ÍÏÎÔÉÒÏ×ÁÎÉÑ ×ÓÅÈ ÄÒÕÇÉÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ. ôÏÞËÏÊ ÍÏÎÔÉÒÏ×ÁÎÉÑ ÎÁÚÙ×ÁÅÔÓÑ ËÁÔÁÌÏÇ, ËÏÔÏÒÙÊ ÂÕÄÅÔ - ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÔØ ËÏÒÎÀ ÐÒÉÍÏÎÔÉÒÏ×ÁÎÏÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ. óÔÁÎÄÁÒÔÎÙÅ - ÔÏÞËÉ ÍÏÎÔÉÒÏ×ÁÎÉÑ ×ËÌÀÞÁÀÔ /usr, + ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÔØ ËÏÒÎÀ ÐÒÉÍÏÎÔÉÒÏ×ÁÎÏÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ. + âÏÌÅÅ ÄÅÔÁÌØÎÏ ÜÔÏ ÏÐÉÓÙ×ÁÅÔÓÑ × . + óÔÁÎÄÁÒÔÎÙÅ ÔÏÞËÉ ÍÏÎÔÉÒÏ×ÁÎÉÑ ×ËÌÀÞÁÀÔ /usr, /var, /tmp, /mnt É /cdrom. üÔÉ ËÁÔÁÌÏÇÉ ÏÂÙÞÎÏ ÐÅÒÅÞÉÓÌÅÎÙ × @@ -679,7 +680,7 @@ ïÐÉÓÁÎÉÅ - + / ëÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ. @@ -788,9 +789,16 @@ /tmp/ - ÷ÒÅÍÅÎÎÙÊ ËÁÔÁÌÏÇ (ÞÁÓÔÏ ÍÏÎÔÉÒÕÅÔÓÑ ËÁË - &man.mfs.8;; ÏÂÙÞÎÏ ÓÏÄÅÒÖÉÍÏÅ ÜÔÏÇÏ ËÁÔÁÌÏÇÁ - ÔÅÒÑÅÔÓÑ ×Ï ×ÒÅÍÑ ÐÅÒÅÚÁÇÒÕÚËÉ ÓÉÓÔÅÍÙ). + ÷ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ. óÏÄÅÒÖÉÍÏÅ + /tmp ÏÂÙÞÎÏ + ÔÅÒÑÅÔÓÑ ×Ï ×ÒÅÍÑ ÐÅÒÅÚÁÇÒÕÚËÉ ÓÉÓÔÅÍÙ. æÁÊÌÏ×ÁÑ + ÓÉÓÔÅÍÁ × ÐÁÍÑÔÉ ÞÁÓÔÏ ÍÏÎÔÉÒÕÅÔÓÑ × + /tmp. üÔÏ + ÍÏÖÅÔ ÂÙÔØ Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÎÎÏ Ó ÐÏÍÏÝØÀ ÐÅÒÅÍÅÎÎÙÈ + ÏÔÎÏÓÉÔÅÌØÎÏ tmpmfs ÉÚ &man.rc.conf.5; (ÉÌÉ ÖÅ Ó + ÐÏÍÏÝØÀ ÚÁÐÉÓÉ × /etc/fstab; + ÏÂÒÁÝÁÊÔÅÓØ Ë &man.mdmfs.8;, ÉÌÉ × ÓÌÕÞÁÅ + FreeBSD 4.X Ë &man.mfs.8;). @@ -879,7 +887,14 @@ /var/ æÁÊÌÙ ÖÕÒÎÁÌÏ× ÏÂÝÅÇÏ ÎÁÚÎÁÞÅÎÉÑ, ×ÒÅÍÅÎÎÙÅ, - ÐÅÒÅÍÅÝÁÅÍÙÅ ÆÁÊÌÙ É ÆÁÊÌÙ ÏÞÅÒÅÄÅÊ. + ÐÅÒÅÍÅÝÁÅÍÙÅ ÆÁÊÌÙ É ÆÁÊÌÙ ÏÞÅÒÅÄÅÊ. æÁÊÌÏ×ÁÑ + ÓÉÓÔÅÍÁ × ÐÁÍÑÔÉ ÉÎÏÇÄÁ ÍÏÎÔÉÒÕÅÔÓÑ × + /var. üÔÏ + ÍÏÖÅÔ ÂÙÔØ Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÎÎÏ Ó ÐÏÍÏÝØÀ ÐÅÒÅÍÅÎÎÙÈ + ÏÔÎÏÓÉÔÅÌØÎÏ varmfs ÉÚ &man.rc.conf.5; (ÉÌÉ ÖÅ Ó + ÐÏÍÏÝØÀ ÚÁÐÉÓÉ × /etc/fstab; + ÏÂÒÁÝÁÊÔÅÓØ Ë &man.mdmfs.8;, ÉÌÉ × ÓÌÕÞÁÅ + FreeBSD 4.X Ë &man.mfs.8;). @@ -899,8 +914,10 @@ /var/tmp/ - ÷ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ, ËÏÔÏÒÙÅ ÎÅÏÂÈÏÄÉÍÏ ÓÏÈÒÁÎÑÔØ ÍÅÖÄÕ - ÐÅÒÅÚÁÇÒÕÚËÁÍÉ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ. + ÷ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ, ËÏÔÏÒÙÅ ÏÂÙÞÎÏ ÓÏÈÒÁÎÑÀÔÓÑ ×Ï ×ÒÅÍÑ + ÐÅÒÅÚÁÇÒÕÚËÉ ÓÉÓÔÅÍÙ, ÅÓÌÉ ÔÏÌØËÏ + /var ÎÅ Ñ×ÌÑÅÔÓÑ + ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÏÊ × ÐÁÍÑÔÉ. @@ -939,7 +956,7 @@ ÐÕÔØ Ë ÆÁÊÌÕ ÂÕÄÅÔ foo/bar/readme.txt. - ëÁÔÁÌÏÇÉ ÈÒÁÎÑÔÓÑ × ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍÁÈ. ëÁÖÄÁÑ ÆÁÊÌÏ×ÁÑ ÓÉÓÔÅÍÁ + ëÁÔÁÌÏÇÉ É ÆÁÊÌÙ ÈÒÁÎÑÔÓÑ × ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ. ëÁÖÄÁÑ ÆÁÊÌÏ×ÁÑ ÓÉÓÔÅÍÁ ÓÏÄÅÒÖÉÔ ÏÄÉÎ ËÁÔÁÌÏÇ ÎÁ ×ÅÒÈÎÅÍ ÕÒÏ×ÎÅ, ÎÁÚÙ×ÁÅÍÙÊ ËÏÒÎÅ×ÙÍ ËÁÔÁÌÏÇÏÍ ÜÔÏÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ. üÔÏÔ ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ ÄÒÕÇÉÅ ËÁÔÁÌÏÇÉ. @@ -1199,7 +1216,7 @@ - + a @@ -2201,9 +2218,6 @@ &prompt.user; chsh -s /usr/local/bin/bash - ôÁËÖÅ ÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ chsh ÂÅÚ ÐÁÒÁÍÅÔÒÏ× É - ÉÚÍÅÎÉÔØ ÉÎÔÅÒÐÒÅÔÁÔÏÒ ÐÏ ÕÍÏÌÞÁÎÉÀ × ÒÅÄÁËÔÏÒÅ. - éÎÔÅÒÐÒÅÔÁÔÏÒ, ËÏÔÏÒÙÊ ×Ù ÂÕÄÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ, ÏÂÑÚÁÔÅÌØÎÏ ÄÏÌÖÅÎ ÂÙÔØ × ÆÁÊÌÅ ==== //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/desktop/chapter.sgml#2 (text+ko) ==== @@ -1,10 +1,10 @@ @@ -320,7 +320,7 @@ ðÌÁÇÉÎ linuxpluginwrapper ÒÁÂÏÔÁÅÔ - ÔÏÌØËÏ ÎÁ ÁÒÈÉÔÅËÔÕÒÅ i386. + ÔÏÌØËÏ ÎÁ ÁÒÈÉÔÅËÔÕÒÅ &i386;. @@ -333,11 +333,7 @@ Opera ÜÔÏ ÏÞÅÎØ ÂÙÓÔÒÙÊ, ÐÏÌÎÏÃÅÎÎÙÊ É ÓÏ×ÍÅÓÔÉÍÙÊ ÓÏ ÓÔÁÎÄÁÒÔÁÍÉ ÂÒÁÕÚÅÒ. ïÎ ÐÏÓÔÁ×ÌÑÅÔÓÑ × Ä×ÕÈ ×ÁÒÉÁÎÔÁÈ: ÒÏÄÎÁÑ ÄÌÑ FreeBSD ×ÅÒÓÉÑ É ×ÅÒÓÉÑ, - ÚÁÐÕÓËÁÅÍÁÑ × ÒÅÖÉÍÅ ÜÍÕÌÑÃÉÉ Linux. - äÌÑ ËÁÖÄÏÊ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ ÅÓÔØ ÂÅÓÐÌÁÔÎÁÑ ×ÅÒÓÉÑ - ÂÒÁÕÚÅÒÁ, ÐÏËÁÚÙ×ÁÀÝÁÑ ÂÁÎÎÅÒÙ, É ×ÅÒÓÉÑ ÂÅÚ - ÂÁÎÎÅÒÏ×, ËÏÔÏÒÕÀ ÍÏÖÎÏ ËÕÐÉÔØ ÎÁ ×Å ÓÁÊÔÅ Opera. + ÚÁÐÕÓËÁÅÍÁÑ × ÒÅÖÉÍÅ ÜÍÕÌÑÃÉÉ Linux. äÌÑ ÒÁÂÏÔÙ × ÓÅÔÉ Ó ÐÏÍÏÝØÀ FreeBSD ×ÅÒÓÉÉ Opera ÕÓÔÁÎÏ×ÉÔÅ @@ -460,7 +456,7 @@ OpenOffice.org ÂÏÌØÛÁÑ ÏÞÅÎØ ÔÑÖÅÌÁÑ - GCC 3.1, &jdk; 1.3, Mozilla + &jdk; 1.4, Mozilla @@ -603,10 +599,10 @@ É &macos; X. äÏÐÏÌÎÉÔÅÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï OpenOffice.org ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ ×Å ÓÁÊÔÅ - OpenOffice. ðÏÌÕÞÉÔØ ÓÐÅÃÉÆÉÞÎÕÀ ÄÌÑ FreeBSD ÉÎÆÏÒÍÁÃÉÀ É + OpenOffice.org. ðÏÌÕÞÉÔØ ÓÐÅÃÉÆÉÞÎÕÀ ÄÌÑ FreeBSD ÉÎÆÏÒÍÁÃÉÀ É ÚÁÇÒÕÚÉÔØ ÐÁËÅÔÙ ÍÏÖÎÏ Ó ×Å ÓÁÊÔÁ ËÏÍÁÎÄÙ ÐÏÒÔÉÒÏ×ÁÎÉÑ OpenOffice ÎÁ FreeBSD (FreeBSD OpenOffice + url="http://porting.openoffice.org/freebsd/">FreeBSD OpenOffice.org Porting Team). äÌÑ ÕÓÔÁÎÏ×ËÉ OpenOffice.org, @@ -617,176 +613,50 @@ üÔÁ ÏÐÅÒÁÃÉÑ ÄÏÌÖÎÁ ÒÁÂÏÔÁÔØ ÄÌÑ ÌÀÂÏÇÏ ÒÅÌÉÚÁ (-RELEASE) &os;. åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ÉÎÙÅ ×ÅÒÓÉÉ (-STABLE, -CURRENT), ÎÕÖÎÙÊ ÐÁËÅÔ - ÍÏÖÅÔ ÂÙÔØ ÚÁÇÒÕÖÅÎ Ó ÓÁÊÔÁ ÇÒÕÐÐÙ ÐÏÄÄÅÒÖËÉ OpenOffice É ÚÁÔÅÍ + ÍÏÖÅÔ ÂÙÔØ ÚÁÇÒÕÖÅÎ Ó ÓÁÊÔÁ ÇÒÕÐÐÙ ÐÏÄÄÅÒÖËÉ OpenOffice.org É ÚÁÔÅÍ ÕÓÔÁÎÏ×ÌÅÎ ÐÒÉ ÐÏÍÏÝÉ &man.pkg.add.1;. îÁ ÓÁÊÔÅ ×Ù ÎÁÊÄÅÔÅ ËÁË ÐÏÓÌÅÄÎÉÊ ÓÔÁÂÉÌØÎÙÊ ÒÅÌÉÚ, ÔÁË É ÔÅËÕÝÕÀ ×ÅÒÓÉÀ, ÎÁÈÏÄÑÝÕÀÓÑ × ÒÁÚÒÁÂÏÔËÅ. - ðÏÓÌÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ ÚÁÐÕÓÔÉÔÅ ÐÒÏÇÒÁÍÍÕ ÎÁÓÔÒÏÊËÉ É - ×ÙÂÅÒÉÔÅ . - úÁÐÕÓÔÉÔÅ ÜÔÕ ËÏÍÁÎÄÕ ÉÚ ÐÏÄ ÐÏÌØÚÏ×ÁÔÅÌÑ, ËÏÔÏÒÙÊ ÂÕÄÅÔ - ÉÓÐÏÌØÚÏ×ÁÔØ OpenOffice.org: + ðÏÓÌÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ ÐÒÏÓÔÏ ÎÁÂÅÒÉÔÅ ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ ÄÌÑ + ÚÁÐÕÓËÁ OpenOffice.org: + + &prompt.user; openoffice.org - &prompt.user; openoffice-setup + + ÷Ï ×ÒÅÍÑ ÐÅÒ×ÏÇÏ ÚÁÐÕÓËÁ, ×ÁÍ ÂÕÄÕÔ ÚÁÄÁÎÙ ÎÅÓËÏÌØËÏ ×ÏÐÒÏÓÏ× + É × ×ÁÛÅÊ ÄÏÍÁÛÎÅÊ ÄÉÒÅËÔÏÒÉÉ ÂÕÄÅÔ ÓÏÚÄÁÎ ËÁÔÁÌÏÇ + .openoffice.org2. + åÓÌÉ ÐÁËÅÔÙ OpenOffice.org ÎÅÄÏÓÔÕÐÎÙ, ÍÏÖÎÏ ×ÙÂÒÁÔØ ËÏÍÐÉÌÑÃÉÀ ÐÏÒÔÁ. ïÄÎÁËÏ, ×Ù ÄÏÌÖÎÙ ÐÏÍÎÉÔØ, ÞÔÏ ÜÔÏ ÐÏÔÒÅÂÕÅÔ ÍÎÏÇÏ ÍÅÓÔÁ ÎÁ ÄÉÓËÅ É ËÏÍÐÉÌÑÃÉÑ ÂÕÄÅÔ ÄÏ×ÏÌØÎÏ ÄÏÌÇÏÊ. - &prompt.root; cd /usr/ports/editors/openoffice-1.1 + &prompt.root; cd /usr/ports/editors/openoffice.org-2.0 &prompt.root; make install clean - ðÏÔÏÍ ÚÁÐÕÓÔÉÔÅ ÎÁÓÔÒÏÊËÕ ÐÏÄ ÐÏÌØÚÏ×ÁÔÅÌÅÍ, ËÏÔÏÒÙÊ ÂÕÄÅÔ - ÉÓÐÏÌØÚÏ×ÁÔØ OpenOffice.org É ×ÙÂÅÒÉÔÅ - : + + åÓÌÉ ×Ù ÈÏÔÉÔÅ ÓÏÂÒÁÔØ ÌÏËÁÌÉÚÏ×ÁÎÎÕÀ ×ÅÒÓÉÀ, ÔÏ ×ÍÅÓÔÏ + ÐÒÅÄÙÄÕÝÅÊ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ ÉÓÐÏÌØÚÕÊÔÅ ÓÌÅÄÕÀÝÅÅ: - &prompt.user; cd /usr/ports/editors/openoffice -&prompt.user; make install-user + &prompt.root; make LOCALIZED_LANG=your_language install clean - åÓÌÉ ×Ù ÈÏÔÉÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÌÏËÁÌÉÚÏ×ÁÎÎÕÀ ×ÅÒÓÉÀ, ×ÏÔ ÄÏÓÔÕÐÎÙÅ - ÐÏÒÔÙ: + ÷ÁÍ ÓÌÅÄÕÅÔ ÉÚÍÅÎÉÔØ + your_language ÎÁ ËÏÒÒÅËÔÎÙÊ ISO + ËÏÄ ÑÚÙËÁ. óÐÉÓÏË ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÑÚÙËÏ×ÙÈ ËÏÄÏ× ÄÏÓÔÕÐÅÎ × + ÆÁÊÌÅ files/Makefile.localized, ÒÁÓÐÏÌÏÖÅÎÎÙÊ + × ÄÉÒÅËÔÏÒÉÉ ÐÏÒÔÁ. + - - - - - - - ñÚÙË - ðÏÒÔ - - + ðÏÓÌÅ ÔÏÇÏ, ËÁË ÜÔÏ ÂÙÌÏ ÓÄÅÌÁÎÏ + OpenOffice.org ÍÏÖÅÔ ÂÙÔØ ÚÁÐÕÝÅÎ + ËÏÍÁÎÄÏÊ: - - - áÒÁÂÓËÉÊ - arabic/openoffice-1.1 - - - - ÷ÅÎÇÅÒÓËÉÊ - hungarian/openoffice-1.1 - - - - çÏÌÌÁÎÄÓËÉÊ - editors/openoffice-1.1-nl - - - - çÒÅÞÅÓËÉÊ - editors/openoffice-1.1-el - - - - äÁÔÓËÉÊ - editors/openoffice-1.1-dk - - - - éÓÐÁÎÓËÉÊ - editors/openoffice-1.1-es - - - - éÔÁÌØÑÎÓËÉÊ - editors/openoffice-1.1-it - - - - ëÁÔÁÌÁÎÓËÉÊ - editors/openoffice-1.1-ca - - - - ëÉÔÁÊÓËÉÊ (ÔÒÁÄÉÃÉÏÎÎÙÊ) - chinese/openoffice-1.1-zh_TW - - - - ëÉÔÁÊÓËÉÊ (ÕÐÒÏÝÅÎÎÙÊ) - chinese/openoffice-1.1-zh_CN - - - - ëÏÒÅÊÓËÉÊ - korean/openoffice-1.1 - - - - îÅÍÅÃËÉÊ - german/openoffice-1.1 - - - - ðÏÌØÓËÉÊ - polish/openoffice-1.1 - - - - ðÏÒÔÕÇÁÌØÓËÉÊ (âÒÁÚÉÌÉÑ) - portuguese/openoffice-1.1-pt_BR - - - - ðÏÒÔÕÇÁÌØÓËÉÊ - portuguese/openoffice-1.1-pt_PT - - - - òÕÓÓËÉÊ - russian/openoffice-1.1 - - - - óÌÏ×ÁÃËÉÊ - editors/openoffice-1.1-sk - + &prompt.user; openoffice.org - - óÌÏ×ÅÎÓËÉÊ - editors/openoffice-1.1-sl_SI - - - - ôÕÒÅÃËÉÊ - editors/openoffice-1.1-tr - - - - æÉÎÓËÉÊ - editors/openoffice-1.1-fi - - - - æÒÁÎÃÕÚÓËÉÊ - french/openoffice-1.1 - - - - þÅÛÓËÉÊ - editors/openoffice-1.1-cs - - - - û×ÅÄÓËÉÊ - editors/openoffice-1.1-se - - - - üÓÔÏÎÓËÉÊ - editors/openoffice-1.1-et - - - - ñÐÏÎÓËÉÊ - japanese/openoffice-1.1 - - - - ==== //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.sgml#3 (text+ko) ==== @@ -1,10 +1,10 @@ @@ -327,7 +327,7 @@ äÌÑ ELF-ÆÁÊÌÏ× ÉÎÏÇÄÁ ÔÒÅÂÕÅÔÓÑ ÓÄÅÌÁÔØ ÔÁË ÎÁÚÙ×ÁÅÍÙÊ branding (ÍÁÒËÉÒÏ×ÁÔØ ÅÇÏ). åÓÌÉ ÐÏÐÙÔÁÔØÓÑ - ÚÁÐÕÓÔÉÔØ ÎÅÍÁÒËÉÒÏ×ÁÎÎÙÊ ELF-ÆÁÊÌ, ×Ù ÐÏÌÕÞÉÔÅ ÓÌÅÄÕÀÝÅÅ ÓÏÏÂÝÅÎÉÅ + ÚÁÐÕÓÔÉÔØ ÎÅ ÍÁÒËÉÒÏ×ÁÎÎÙÊ ELF-ÆÁÊÌ, ×Ù ÐÏÌÕÞÉÔÅ ÓÌÅÄÕÀÝÅÅ ÓÏÏÂÝÅÎÉÅ Ï ÏÛÉÂËÅ: &prompt.user; ./ÍÏÑ-linux-elf-ÐÒÏÇÒÁÍÍÁ @@ -377,16 +377,9 @@ - Murray - Stokely - ïÂÎÏ×ÉÌ ÄÌÑ Mathematica 4.X - - - - - Bojan - Bistrovic - ïÂßÅÄÉÎÅÎÏ Ó ÒÁÂÏÔÏÊ + Boris + Hollas + ïÂÎÏ×ÉÌ ÄÌÑ Mathematica 5.X @@ -399,80 +392,96 @@ îÉÖÅ ÏÐÉÓÁÎÏ, ËÁË ÕÓÔÁÎÏ×ÉÔØ Linux–×ÅÒÓÉÀ ÐÁËÅÔÁ - &mathematica; 4.X + &mathematica; 5.X ÎÁ ÓÉÓÔÅÍÕ FreeBSD. - Linux–×ÅÒÓÉÑ &mathematica; ÏÔÌÉÞÎÏ - ÒÁÂÏÔÁÅÔ ÐÏÄ FreeBSD, ÏÄÎÁËÏ - ×ÙÐÏÌÎÑÅÍÙÅ ÆÁÊÌÙ, ÐÏÓÔÁ×ÌÑÅÍÙÅ Wolfram, ÄÏÌÖÎÙ ÂÙÔØ ÍÁÒËÉÒÏ×ÁÎÙ - ÕÔÉÌÉÔÏÊ &man.brandelf.1;, ÞÔÏÂÙ FreeBSD ÚÎÁÌÁ Ï ÎÅÏÂÈÏÄÉÍÏÓÔÉ - ÉÓÐÏÌØÚÏ×ÁÎÉÑ Linux ABI ÄÌÑ ÉÈ ×ÙÐÏÌÎÅÎÉÑ. - - Linux–×ÅÒÓÉÀ ÐÁËÅÔÁ &mathematica; + Linux ×ÅÒÓÉÑ &mathematica; ÉÌÉ &mathematica; for Students ÍÏÖÎÏ ÚÁËÁÚÁÔØ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ × ËÏÍÐÁÎÉÉ Wolfram ÐÏ ÁÄÒÅÓÕ . - íÁÒËÉÒÏ×ËÁ Ä×ÏÉÞÎÙÈ ÆÁÊÌÏ× Linux + éÓÐÏÌØÚÏ×ÁÎÉÅ ÕÓÔÁÎÏ×ÝÉËÁ &mathematica; - ä×ÏÉÞÎÙÅ ÆÁÊÌÙ Linux ÎÁÈÏÄÑÔÓÑ × ËÁÔÁÌÏÇÅ - Unix ÎÁ ËÏÍÐÁËÔ-ÄÉÓËÅ Ó ÄÉÓÔÒÉÂÕÔÉ×ÏÍ - &mathematica; ÏÔ Wolfram. - óËÏÐÉÒÕÊÔÅ ÜÔÏÔ ËÁÔÁÌÏÇ (×ÍÅÓÔÅ ÓÏ ×ÓÅÍÉ ÐÏÄËÁÔÁÌÏÇÁÍÉ) ÎÁ ×ÁÛ - ÖÅÓÔËÉÊ ÄÉÓË, ÞÔÏÂÙ ÐÒÏÍÁÒËÉÒÏ×ÁÔØ (ÕÔÉÌÉÔÏÊ &man.brandelf.1;) - Ä×ÏÉÞÎÙÅ ÆÁÊÌÙ Linux ÐÅÒÅÄ ÉÎÓÔÁÌÌÑÃÉÅÊ: - - &prompt.root; mount /cdrom -&prompt.root; cp -rp /cdrom/Unix/ /localdir/ -&prompt.root; brandelf -t Linux /localdir/Files/SystemFiles/Kernel/Binaries/Linux/* -&prompt.root; brandelf -t Linux /localdir/Files/SystemFiles/FrontEnd/Binaries/Linux/* -&prompt.root; brandelf -t Linux /localdir/Files/SystemFiles/Installation/Binaries/Linux/* -&prompt.root; brandelf -t Linux /localdir/Files/SystemFiles/Graphics/Binaries/Linux/* -&prompt.root; brandelf -t Linux /localdir/Files/SystemFiles/Converters/Binaries/Linux/* -&prompt.root; brandelf -t Linux /localdir/Files/SystemFiles/LicenseManager/Binaries/Linux/mathlm -&prompt.root; cd /localdir/Installers/Linux/ -&prompt.root; ./MathInstaller + óÎÁÞÁÌÁ ×Ù ÄÏÌÖÎÙ ÕËÁÚÁÔØ &os;, ÞÔÏ Linux ÂÉÎÁÒÎÉËÉ ÏÔ + &mathematica; ÉÓÐÏÌØÚÕÀÔ Linux + ABI. óÁÍÙÊ ÐÒÏÓÔÏÊ ÐÕÔØ ÓÄÅÌÁÔØ ÜÔÏ—ÕÓÔÁÎÏ×ÉÔØ ÍÁÒËÕ + ELF Linux ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ×ÓÅÈ ÎÅÍÁÒËÉÒÏ×ÁÎÎÙÈ Ä×ÏÉÞÎÙÈ + ÆÁÊÌÏ× Ó ÐÏÍÏÝØÀ ËÏÍÁÎÄÙ: - ÷Ù ÔÁËÖÅ ÍÏÖÅÔÅ ÕÓÔÁÎÏ×ÉÔØ ÍÁÒËÕ ELF Linux ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ×ÓÅÈ - ÎÅÍÁÒËÉÒÏ×ÁÎÎÙÈ Ä×ÏÉÞÎÙÈ ÆÁÊÌÏ× Ó ÐÏÍÏÝØÀ ËÏÍÁÎÄÙ: - &prompt.root; sysctl kern.fallback_elf_brand=3 - FreeBSD ÂÕÄÅÔ ÓÞÉÔÁÔØ, ÞÔÏ ×ÓÅ ÎÅÍÁÒËÉÒÏ×ÁÎÎÙÅ Ä×ÏÉÞÎÙÅ + &os; ÂÕÄÅÔ ÓÞÉÔÁÔØ, ÞÔÏ ×ÓÅ ÎÅÍÁÒËÉÒÏ×ÁÎÎÙÅ Ä×ÏÉÞÎÙÅ ELF-ÆÁÊÌÙ ÉÓÐÏÌØÚÕÀÔ Linux ABI, É ×Ù ÓÍÏÖÅÔÅ ÚÁÐÕÓÔÉÔØ MathInstaller ÐÒÑÍÏ Ó CDROM. + + ôÅÐÅÒØ, ÓËÏÐÉÒÕÊÔÅ ÆÁÊÌ MathInstaller ÎÁ + ×ÁÛ Ö£ÓÔËÉÊ ÄÉÓË: + + &prompt.root; mount /cdrom +&prompt.root; cp /cdrom/Unix/Installers/Linux/MathInstaller /localdir/ + + É × ÜÔÏÍ ÆÁÊÌÅ ÚÁÍÅÎÉÔÅ /bin/sh × + × ÐÅÒ×ÏÊ ÓÔÒÏËÅ ÎÁ /compat/linux/bin/sh. + üÔÉÍ ÍÙ ÕÂÅÄÉÍÓÑ, ÞÔÏ ÕÓÔÁÎÏ×ÝÉË ÂÕÄÅÔ ×ÙÐÏÌÎÑÔØÓÑ Linux + ×ÅÒÓÉÅÊ &man.sh.1;. äÁÌØÛÅ, ÚÁÍÅÎÉÔÅ ×ÓÅ ×ÈÏÖÄÅÎÉÑ + Linux) ÎÁ FreeBSD) Ó + ÐÏÍÏÝØÀ ÔÅËÓÔÏ×ÏÇÏ ÒÅÄÁËÔÏÒÁ ÉÌÉ Ó ÐÏÍÏÝØÀ ÓËÒÉÐÔÁ, + ÐÒÅÄÓÔÁ×ÌÅÎÎÏÇÏ ÎÉÖÅ, × ÓÌÅÄÕÀÝÅÊ ÇÌÁ×Å. üÔÏ ÕËÁÖÅÔ + ÕÓÔÁÎÏ×ÝÉËÕ &mathematica;, + ×ÙÚÙ×ÁÀÝÅÍÕ uname -s ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ + ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ, ÏÔÎÏÓÉÔØÓÑ Ë &os;, ËÁË Ë Linux + ÐÏÄÏÂÎÏÊ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÅ. ôÅÐÅÒØ, ÚÁÐÕÓË + MathInstaller ÕÓÔÁÎÏ×ÉÔ + &mathematica;. + + + + Modifying the &mathematica; Executables + + óËÒÉÐÔÙ ËÏÍÁÎÄÎÏÊ ÏÂÏÌÏÞËÉ, ËÏÔÏÒÙÅ + &mathematica; ÓÏÚÄÁÌÁ ×Ï + ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÄÏÌÖÎÙ ÂÙÔØ ÉÚÍÅÎÅÎÅÎÙ ÐÅÒÅÄ ÔÅÍ, ËÁË + ×Ù ÓÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÉÈ. åÓÌÉ ×Ù ×ÙÂÒÁÌÉ + /usr/local/bin × + ËÁÞÅÓÔ×Å ÄÉÒÅËÔÏÒÉÉ ÄÌÑ ÐÏÍÅÝÅÎÉÑ ÉÓÐÏÌÎÑÅÍÙÈ ÆÁÊÌÏ× + &mathematica;, ÔÏ ×Ù ÏÂÎÁÒÕÖÉÔÅ + × ÜÔÏÍ ËÁÔÁÌÏÇÅ ÓÓÙÌËÉ ÎÁ ÆÁÊÌÙ math, + mathematica, Mathematica, É + MathKernel. ÷ ËÁÖÄÏÍ ÉÚ ÎÉÈ ÚÁÍÅÎÉÔÅ + Linux) ÎÁ FreeBSD) Ó + ÐÏÍÏÝØÀ ÔÅËÓÔÏ×ÏÇÏ ÒÅÄÁËÔÏÒÁ ÉÌÉ Ó ÐÏÍÏÝØÀ ÓÌÅÄÕÀÝÅÇÏ ÓËÒÉÐÔÁ + ËÏÍÁÎÄÎÏÊ ÏÂÏÌÏÞËÉ: + + #!/bin/sh +cd /usr/local/bin +for i in math mathematica Mathematica MathKernel + do sed 's/Linux)/FreeBSD)/g' $i > $i.tmp + sed 's/\/bin\/sh/\/compat\/linux\/bin\/sh/g' $i.tmp > $i + rm $i.tmp + chmod a+x $i +done ðÏÌÕÞÅÎÉÅ ÐÁÒÏÌÑ Ë ÐÁËÅÔÕ &mathematica; - ðÒÅÖÄÅ ÞÅÍ ÚÁÐÕÓËÁÔØ &mathematica;, - ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÐÏÌÕÞÉÔØ ÏÔ ËÏÍÐÁÎÉÉ Wolfram ÐÁÒÏÌØ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÊ - ÉÄÅÎÔÉÆÉËÁÔÏÒÕ ÍÁÛÉÎÙ. - Ethernet MAC-ÁÄÒÅÓ - ðÏÓÌÅ ÔÏÇÏ, ËÁË ×Ù ÕÓÔÁÎÏ×ÉÌÉ ÎÅÏÂÈÏÄÉÍÙÅ ÂÉÂÌÉÏÔÅËÉ É >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 3 04:43:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35E8716A423; Fri, 3 Feb 2006 04:43:11 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0EA6616A420 for ; Fri, 3 Feb 2006 04:43:11 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF1AD43D45 for ; Fri, 3 Feb 2006 04:43:10 +0000 (GMT) (envelope-from imp@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 k134hA3C050301 for ; Fri, 3 Feb 2006 04:43:10 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k134hAjd050298 for perforce@freebsd.org; Fri, 3 Feb 2006 04:43:10 GMT (envelope-from imp@freebsd.org) Date: Fri, 3 Feb 2006 04:43:10 GMT Message-Id: <200602030443.k134hAjd050298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 90953 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 04:43:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=90953 Change 90953 by imp@imp_harmony on 2006/02/03 04:42:27 IFC @90951 Affected files ... .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/arm/src/sys/bsm/audit.h#2 integrate .. //depot/projects/arm/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/arm/src/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/arm/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/arm/src/sys/coda/coda_vnops.c#5 integrate .. //depot/projects/arm/src/sys/conf/NOTES#14 integrate .. //depot/projects/arm/src/sys/conf/files#15 integrate .. //depot/projects/arm/src/sys/conf/files.i386#9 integrate .. //depot/projects/arm/src/sys/conf/files.sparc64#5 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/arm/src/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/arm/src/sys/geom/concat/g_concat.c#5 integrate .. //depot/projects/arm/src/sys/geom/concat/g_concat.h#3 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/arm/src/sys/geom/eli/pkcs5v2.c#2 integrate .. //depot/projects/arm/src/sys/geom/eli/pkcs5v2.h#2 integrate .. //depot/projects/arm/src/sys/geom/gate/g_gate.c#3 integrate .. //depot/projects/arm/src/sys/geom/gate/g_gate.h#3 integrate .. //depot/projects/arm/src/sys/geom/label/g_label.c#4 integrate .. //depot/projects/arm/src/sys/geom/label/g_label.h#4 integrate .. //depot/projects/arm/src/sys/geom/label/g_label_iso9660.c#4 integrate .. //depot/projects/arm/src/sys/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/arm/src/sys/geom/label/g_label_ufs.c#4 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#6 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror_ctl.c#3 integrate .. //depot/projects/arm/src/sys/geom/nop/g_nop.c#5 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3_ctl.c#3 integrate .. //depot/projects/arm/src/sys/geom/shsec/g_shsec.c#4 integrate .. //depot/projects/arm/src/sys/geom/shsec/g_shsec.h#3 integrate .. //depot/projects/arm/src/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/arm/src/sys/geom/stripe/g_stripe.h#4 integrate .. //depot/projects/arm/src/sys/geom/zero/g_zero.c#4 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#9 integrate .. //depot/projects/arm/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/arm/src/sys/kern/tty_pts.c#3 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/arm/src/sys/modules/Makefile#10 integrate .. //depot/projects/arm/src/sys/modules/le/Makefile#1 branch .. //depot/projects/arm/src/sys/net/if_bridge.c#8 integrate .. //depot/projects/arm/src/sys/netinet/if_ether.c#8 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#8 integrate .. //depot/projects/arm/src/sys/netinet/ip_ipsec.c#1 branch .. //depot/projects/arm/src/sys/netinet/ip_ipsec.h#1 branch .. //depot/projects/arm/src/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#7 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/arm/src/sys/pci/agp_i810.c#5 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#10 integrate .. //depot/projects/arm/src/sys/sys/_rwlock.h#2 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#8 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#6 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#7 integrate .. //depot/projects/arm/src/sys/vm/vnode_pager.c#5 integrate Differences ... ==== //depot/projects/arm/src/sys/amd64/amd64/machdep.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.645 2005/11/24 08:16:17 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.646 2006/02/03 02:49:14 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1561,16 +1561,17 @@ mcp->mc_rbp = tp->tf_rbp; mcp->mc_rbx = tp->tf_rbx; mcp->mc_rcx = tp->tf_rcx; + mcp->mc_rflags = tp->tf_rflags; if (flags & GET_MC_CLEAR_RET) { mcp->mc_rax = 0; mcp->mc_rdx = 0; + mcp->mc_rflags &= ~PSL_C; } else { mcp->mc_rax = tp->tf_rax; mcp->mc_rdx = tp->tf_rdx; } mcp->mc_rip = tp->tf_rip; mcp->mc_cs = tp->tf_cs; - mcp->mc_rflags = tp->tf_rflags; mcp->mc_rsp = tp->tf_rsp; mcp->mc_ss = tp->tf_ss; mcp->mc_len = sizeof(*mcp); ==== //depot/projects/arm/src/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.535 2005/11/20 06:09:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.536 2006/02/03 00:16:36 peter Exp $"); /* * Manages physical address maps. @@ -183,8 +183,8 @@ * Data for the pv entry allocation mechanism */ static uma_zone_t pvzone; -static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; +static int shpgperproc = PMAP_SHPGPERPROC; /* * All those kernel PT submaps that BSD is so fond of @@ -563,7 +563,6 @@ void pmap_init(void) { - int shpgperproc = PMAP_SHPGPERPROC; /* * Initialize the address space (zone) for the pv entries. Set a @@ -571,13 +570,43 @@ * numbers of pv entries. */ pvzone = uma_zcreate("PV ENTRY", sizeof(struct pv_entry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); + NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); - uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); +} + +SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters"); +static int +pmap_pventry_proc(SYSCTL_HANDLER_ARGS) +{ + int error; + + error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); + if (error == 0 && req->newptr) { + shpgperproc = (pv_entry_max - cnt.v_page_count) / maxproc; + pv_entry_high_water = 9 * (pv_entry_max / 10); + } + return (error); +} +SYSCTL_PROC(_vm_pmap, OID_AUTO, pv_entry_max, CTLTYPE_INT|CTLFLAG_RW, + &pv_entry_max, 0, pmap_pventry_proc, "IU", "Max number of PV entries"); + +static int +pmap_shpgperproc_proc(SYSCTL_HANDLER_ARGS) +{ + int error; + + error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); + if (error == 0 && req->newptr) { + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_high_water = 9 * (pv_entry_max / 10); + } + return (error); } +SYSCTL_PROC(_vm_pmap, OID_AUTO, shpgperproc, CTLTYPE_INT|CTLFLAG_RW, + &shpgperproc, 0, pmap_shpgperproc_proc, "IU", "Page share factor per proc"); /*************************************************** @@ -1452,8 +1481,9 @@ * mappings to active pages. */ if (ratecheck(&lastprint, &printinterval)) - printf("Approaching the limit on PV entries, " - "increase the vm.pmap.shpgperproc tunable.\n"); + printf("Approaching the limit on PV entries, consider " + "increasing sysctl vm.pmap.shpgperproc or " + "vm.pmap.pv_entry_max\n"); vpq = &vm_page_queues[PQ_INACTIVE]; retry: TAILQ_FOREACH(m, &vpq->pl, pageq) { ==== //depot/projects/arm/src/sys/bsm/audit.h#2 (text+ko) ==== @@ -1,39 +1,345 @@ -/*- - * Copyright (c) 2005 Robert N. M. Watson +/* + * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * + * @APPLE_BSD_LICENSE_HEADER_START@ + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * @APPLE_BSD_LICENSE_HEADER_END@ * - * $FreeBSD: src/sys/bsm/audit.h,v 1.1 2005/05/29 16:10:33 rwatson Exp $ + * $P4: //depot/projects/arm/src/sys/bsm/audit.h#2 $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.2 2006/02/01 19:54:22 rwatson Exp $ + */ + +#ifndef _BSM_AUDIT_H +#define _BSM_AUDIT_H + +#include +#include +#include + +#define AUDIT_RECORD_MAGIC 0x828a0f1b +#define MAX_AUDIT_RECORDS 20 +#define MAX_AUDIT_RECORD_SIZE 4096 +#define MIN_AUDIT_FILE_SIZE (512 * 1024) + +/* + * Minimum noumber of free blocks on the filesystem containing the audit + * log necessary to avoid a hard log rotation. DO NOT SET THIS VALUE TO 0 + * as the kernel does an unsigned compare, plus we want to leave a few blocks + * free so userspace can terminate the log, etc. + */ +#define AUDIT_HARD_LIMIT_FREE_BLOCKS 4 + +/* + * Triggers for the audit daemon + */ +#define AUDIT_TRIGGER_MIN 1 +#define AUDIT_TRIGGER_LOW_SPACE 1 +#define AUDIT_TRIGGER_OPEN_NEW 2 +#define AUDIT_TRIGGER_READ_FILE 3 +#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 +#define AUDIT_TRIGGER_NO_SPACE 5 +#define AUDIT_TRIGGER_MAX 5 + +/* + * File that will be read for trigger events from the kernel. + */ +#define AUDIT_TRIGGER_FILE "/dev/audit" + +/* + * The special device filename. + */ +#define AUDITDEV_FILENAME "audit" + +/* + * Pre-defined audit IDs + */ +#define AU_DEFAUDITID -1 + +/* + * Define the masks for the classes of audit events. + */ +#define AU_NULL 0x00000000 +#define AU_FREAD 0x00000001 +#define AU_FWRITE 0x00000002 +#define AU_FACCESS 0x00000004 +#define AU_FMODIFY 0x00000008 +#define AU_FCREATE 0x00000010 +#define AU_FDELETE 0x00000020 +#define AU_CLOSE 0x00000040 +#define AU_PROCESS 0x00000080 +#define AU_NET 0x00000100 +#define AU_IPC 0x00000200 +#define AU_NONAT 0x00000400 +#define AU_ADMIN 0x00000800 +#define AU_LOGIN 0x00001000 +#define AU_TFM 0x00002000 +#define AU_APPL 0x00004000 +#define AU_SETL 0x00008000 +#define AU_IFLOAT 0x00010000 +#define AU_PRIV 0x00020000 +#define AU_MAC_RW 0x00040000 +#define AU_XCONN 0x00080000 +#define AU_XCREATE 0x00100000 +#define AU_XDELETE 0x00200000 +#define AU_XIFLOAT 0x00400000 +#define AU_XPRIVS 0x00800000 +#define AU_XPRIVF 0x01000000 +#define AU_XMOVE 0x02000000 +#define AU_XDACF 0x04000000 +#define AU_XMACF 0x08000000 +#define AU_XSECATTR 0x10000000 +#define AU_IOCTL 0x20000000 +#define AU_EXEC 0x40000000 +#define AU_OTHER 0x80000000 +#define AU_ALL 0xffffffff + +/* + * IPC types + */ +#define AT_IPC_MSG ((u_char)1) /* Message IPC id. */ +#define AT_IPC_SEM ((u_char)2) /* Semaphore IPC id. */ +#define AT_IPC_SHM ((u_char)3) /* Shared mem IPC id. */ + +/* + * Audit conditions. + */ +#define AUC_UNSET 0 +#define AUC_AUDITING 1 +#define AUC_NOAUDIT 2 +#define AUC_DISABLED -1 + +/* + * auditon(2) commands. + */ +#define A_GETPOLICY 2 +#define A_SETPOLICY 3 +#define A_GETKMASK 4 +#define A_SETKMASK 5 +#define A_GETQCTRL 6 +#define A_SETQCTRL 7 +#define A_GETCWD 8 +#define A_GETCAR 9 +#define A_GETSTAT 12 +#define A_SETSTAT 13 +#define A_SETUMASK 14 +#define A_SETSMASK 15 +#define A_GETCOND 20 +#define A_SETCOND 21 +#define A_GETCLASS 22 +#define A_SETCLASS 23 +#define A_GETPINFO 24 +#define A_SETPMASK 25 +#define A_SETFSIZE 26 +#define A_GETFSIZE 27 +#define A_GETPINFO_ADDR 28 +#define A_GETKAUDIT 29 +#define A_SETKAUDIT 30 +#define A_SENDTRIGGER 31 + +/* + * Audit policy controls. + */ +#define AUDIT_CNT 0x0001 +#define AUDIT_AHLT 0x0002 +#define AUDIT_ARGV 0x0004 +#define AUDIT_ARGE 0x0008 +#define AUDIT_PASSWD 0x0010 +#define AUDIT_SEQ 0x0020 +#define AUDIT_WINDATA 0x0040 +#define AUDIT_USER 0x0080 +#define AUDIT_GROUP 0x0100 +#define AUDIT_TRAIL 0x0200 +#define AUDIT_PATH 0x0400 + +/* + * Audit queue control parameters */ +#define AQ_HIWATER 100 +#define AQ_MAXHIGH 10000 +#define AQ_LOWATER 10 +#define AQ_BUFSZ 1024 +#define AQ_MAXBUFSZ 1048576 -#ifndef _BSM_AUDIT_H_ -#define _BSM_AUDIT_H_ +/* + * Default minimum percentage free space on file system. + */ +#define AU_FS_MINFREE 20 /* - * This is a place-holder include file that defines only the minimal BSM - * types to allow the system call table to contain stub event identifiers. - * Additional types and defines will be introduced later. + * Type definitions used indicating the length of variable length addresses + * in tokens containing addresses, such as header fields. */ +#define AU_IPv4 4 +#define AU_IPv6 16 + +__BEGIN_DECLS + +typedef uid_t au_id_t; +typedef pid_t au_asid_t; typedef u_int16_t au_event_t; +typedef u_int16_t au_emod_t; +typedef u_int32_t au_class_t; + +struct au_tid { + dev_t port; + u_int32_t machine; +}; +typedef struct au_tid au_tid_t; + +struct au_tid_addr { + dev_t at_port; + u_int32_t at_type; + u_int32_t at_addr[4]; +}; +typedef struct au_tid_addr au_tid_addr_t; + +struct au_mask { + unsigned int am_success; /* Success bits. */ + unsigned int am_failure; /* Failure bits. */ +}; +typedef struct au_mask au_mask_t; + +struct auditinfo { + au_id_t ai_auid; /* Audit user ID. */ + au_mask_t ai_mask; /* Audit masks. */ + au_tid_t ai_termid; /* Terminal ID. */ + au_asid_t ai_asid; /* Audit session ID. */ +}; +typedef struct auditinfo auditinfo_t; + +struct auditinfo_addr { + au_id_t ai_auid; /* Audit user ID. */ + au_mask_t ai_mask; /* Audit masks. */ + au_tid_addr_t ai_termid; /* Terminal ID. */ + au_asid_t ai_asid; /* Audit session ID. */ +}; +typedef struct auditinfo_addr auditinfo_addr_t; + +struct auditpinfo { + pid_t ap_pid; /* ID of target process. */ + au_id_t ap_auid; /* Audit user ID. */ + au_mask_t ap_mask; /* Audit masks. */ + au_tid_t ap_termid; /* Terminal ID. */ + au_asid_t ap_asid; /* Audit session ID. */ +}; +typedef struct auditpinfo auditpinfo_t; + +struct auditpinfo_addr { + pid_t ap_pid; /* ID of target process. */ + au_id_t ap_auid; /* Audit user ID. */ + au_mask_t ap_mask; /* Audit masks. */ + au_tid_addr_t ap_termid; /* Terminal ID. */ + au_asid_t ap_asid; /* Audit session ID. */ +}; +typedef struct auditpinfo_addr auditpinfo_addr_t; + +/* Token and record structures. */ + +struct au_token { + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; +}; +typedef struct au_token token_t; -#endif /* !_BSM_AUDIT_H_ */ +struct au_record { + char used; /* Record currently in use? */ + int desc; /* Descriptor for record. */ + TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ + u_char *data; + size_t len; + LIST_ENTRY(au_record) au_rec_q; +}; +typedef struct au_record au_record_t; + +/* + * Kernel audit queue control parameters. + */ +struct au_qctrl { + size_t aq_hiwater; + size_t aq_lowater; + size_t aq_bufsz; + clock_t aq_delay; + int aq_minfree; /* Minimum filesystem percent free space. */ +}; +typedef struct au_qctrl au_qctrl_t; + +/* + * Structure for the audit statistics. + */ +struct audit_stat { + unsigned int as_version; + unsigned int as_numevent; + int as_generated; + int as_nonattring; + int as_kernel; + int as_audit; + int as_auditctl; + int as_enqueu; + int as_written; + int as_wblocked; + int as_rblocked; + int as_dropped; + int as_totalsize; + unsigned int as_memused; +}; +typedef struct audit_stat au_stat_t; + +/* + * Structure for the audit file statistics. + */ +struct audit_fstat { + u_quad_t af_filesz; + u_quad_t af_currsz; +}; +typedef struct audit_fstat au_fstat_t; + +/* + * Audit to event class mapping. + */ +struct au_evclass_map { + au_event_t ec_number; + au_class_t ec_class; +}; +typedef struct au_evclass_map au_evclass_map_t; + +#if !defined(_KERNEL) && !defined(KERNEL) +int audit(const void *, int); +int auditon(int, void *, int); +int auditctl(const char *); +int getauid(au_id_t *); +int setauid(const au_id_t *); +int getaudit(struct auditinfo *); +int setaudit(const struct auditinfo *); +int getaudit_addr(struct auditinfo_addr *, int); +int setaudit_addr(const struct auditinfo_addr *, int); +#endif /* defined(_KERNEL) || defined(KERNEL) */ + +__END_DECLS + +#endif /* !_BSM_AUDIT_H */ ==== //depot/projects/arm/src/sys/bsm/audit_kevents.h#3 (text+ko) ==== @@ -1,38 +1,495 @@ -/*- - * Copyright (c) 2005 Robert N. M. Watson +/* + * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * + * @APPLE_BSD_LICENSE_HEADER_START@ + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * @APPLE_BSD_LICENSE_HEADER_END@ * - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.2 2005/05/29 16:11:34 rwatson Exp $ + * $P4: //depot/projects/arm/src/sys/bsm/audit_kevents.h#3 $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.3 2006/02/01 19:54:22 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ #define _BSM_AUDIT_KEVENTS_H_ /* - * This is a place-holder include file that defines exactly one audit event: - * the null event. The real list of audit events will be introduced later. + * Values marked as AUE_NULL are not required to be audited as per CAPP. + * + * Some conflicts exist in the assignment of name to event number mappings + * between BSM implementations. In general, we prefer the OpenSolaris + * definition as we consider Solaris BSM to be authoritative. _DARWIN_ has + * been inserted for the Darwin variants. If necessary, other tags will be + * added in the future. + */ + +#define AUE_NULL 0 +#define AUE_EXIT 1 +#define AUE_FORK 2 +#define AUE_OPEN 3 +#define AUE_CREAT 4 +#define AUE_LINK 5 +#define AUE_UNLINK 6 +#define AUE_DELETE AUE_UNLINK +#define AUE_EXEC 7 +#define AUE_CHDIR 8 +#define AUE_MKNOD 9 +#define AUE_CHMOD 10 +#define AUE_CHOWN 11 +#define AUE_UMOUNT 12 +#define AUE_JUNK 13 /* Solaris-specific. */ +#define AUE_ACCESS 14 +#define AUE_CHECKUSERACCESS AUE_ACCESS +#define AUE_KILL 15 +#define AUE_STAT 16 +#define AUE_LSTAT 17 +#define AUE_ACCT 18 +#define AUE_MCTL 19 /* Solaris-specific. */ +#define AUE_REBOOT 20 /* XXX: Darwin conflict. */ +#define AUE_SYMLINK 21 +#define AUE_READLINK 22 +#define AUE_EXECVE 23 +#define AUE_CHROOT 24 +#define AUE_VFORK 25 +#define AUE_SETGROUPS 26 +#define AUE_SETPGRP 27 +#define AUE_SWAPON 28 +#define AUE_SETHOSTNAME 29 /* XXX: Darwin conflict. */ +#define AUE_FCNTL 30 +#define AUE_SETPRIORITY 31 /* XXX: Darwin conflict. */ +#define AUE_CONNECT 32 +#define AUE_ACCEPT 33 +#define AUE_BIND 34 +#define AUE_SETSOCKOPT 35 +#define AUE_VTRACE 36 /* Solaris-specific. */ +#define AUE_SETTIMEOFDAY 37 /* XXX: Darwin conflict. */ +#define AUE_FCHOWN 38 +#define AUE_FCHMOD 39 +#define AUE_SETREUID 40 +#define AUE_SETREGID 41 +#define AUE_RENAME 42 +#define AUE_TRUNCATE 43 /* XXX: Darwin conflict. */ +#define AUE_FTRUNCATE 44 /* XXX: Darwin conflict. */ +#define AUE_FLOCK 45 /* XXX: Darwin conflict. */ +#define AUE_SHUTDOWN 46 +#define AUE_MKDIR 47 +#define AUE_RMDIR 48 +#define AUE_UTIMES 49 +#define AUE_ADJTIME 50 +#define AUE_SETRLIMIT 51 +#define AUE_KILLPG 52 +#define AUE_NFS_SVC 53 /* XXX: Darwin conflict. */ +#define AUE_STATFS 54 +#define AUE_FSTATFS 55 +#define AUE_UNMOUNT 56 /* XXX: Darwin conflict. */ +#define AUE_ASYNC_DAEMON 57 +#define AUE_NFS_GETFH 58 /* XXX: Darwin conflict. */ +#define AUE_SETDOMAINNAME 59 +#define AUE_QUOTACTL 60 /* XXX: Darwin conflict. */ +#define AUE_EXPORTFS 61 +#define AUE_MOUNT 62 +#define AUE_SEMSYS 63 +#define AUE_MSGSYS 64 +#define AUE_SHMSYS 65 +#define AUE_BSMSYS 66 /* Solaris-specific. */ +#define AUE_RFSSYS 67 /* Solaris-specific. */ +#define AUE_FCHDIR 68 +#define AUE_FCHROOT 69 +#define AUE_VPIXSYS 70 /* Solaris-specific. */ +#define AUE_PATHCONF 71 +#define AUE_OPEN_R 72 +#define AUE_OPEN_RC 73 +#define AUE_OPEN_RT 74 +#define AUE_OPEN_RTC 75 +#define AUE_OPEN_W 76 +#define AUE_OPEN_WC 77 +#define AUE_OPEN_WT 78 +#define AUE_OPEN_WTC 79 +#define AUE_OPEN_RW 80 +#define AUE_OPEN_RWC 81 +#define AUE_OPEN_RWT 82 +#define AUE_OPEN_RWTC 83 +#define AUE_MSGCTL 84 +#define AUE_MSGCTL_RMID 85 +#define AUE_MSGCTL_SET 86 +#define AUE_MSGCTL_STAT 87 +#define AUE_MSGGET 88 +#define AUE_MSGRCV 89 +#define AUE_MSGSND 90 +#define AUE_SHMCTL 91 +#define AUE_SHMCTL_RMID 92 +#define AUE_SHMCTL_SET 93 +#define AUE_SHMCTL_STAT 94 +#define AUE_SHMGET 95 +#define AUE_SHMAT 96 +#define AUE_SHMDT 97 +#define AUE_SEMCTL 98 +#define AUE_SEMCTL_RMID 99 +#define AUE_SEMCTL_SET 100 +#define AUE_SEMCTL_STAT 101 +#define AUE_SEMCTL_GETNCNT 102 +#define AUE_SEMCTL_GETPID 103 +#define AUE_SEMCTL_GETVAL 104 +#define AUE_SEMCTL_GETALL 105 +#define AUE_SEMCTL_GETZCNT 106 +#define AUE_SEMCTL_SETVAL 107 +#define AUE_SEMCTL_SETALL 108 +#define AUE_SEMGET 109 +#define AUE_SEMOP 110 +#define AUE_CORE 111 /* Solaris-specific, currently. */ +#define AUE_CLOSE 112 +#define AUE_SYSTEMBOOT 113 +#define AUE_ASYNC_DAEMON_EXIT 114 /* Solaris-specific. */ +#define AUE_NFSSVC_EXIT 115 /* Solaris-specific. */ +#define AUE_WRITEL 128 /* Solaris-specific. */ +#define AUE_WRITEVL 129 /* Solaris-specific. */ +#define AUE_GETAUID 130 +#define AUE_SETAUID 131 +#define AUE_GETAUDIT 132 +#define AUE_SETAUDIT 133 +#define AUE_GETUSERAUDIT 134 /* Solaris-specific. */ +#define AUE_SETUSERAUDIT 135 /* Solaris-specific. */ +#define AUE_AUDITSVC 136 /* Solaris-specific. */ +#define AUE_AUDITUSER 137 /* Solaris-specific. */ +#define AUE_AUDITON 138 +#define AUE_AUDITON_GTERMID 139 /* Solaris-specific. */ +#define AUE_AUDITON_STERMID 140 /* Solaris-specific. */ +#define AUE_AUDITON_GPOLICY 141 +#define AUE_AUDITON_SPOLICY 142 +#define AUE_AUDITON_GQCTRL 145 +#define AUE_AUDITON_SQCTRL 146 +#define AUE_GETKERNSTATE 147 /* Solaris-specific. */ +#define AUE_SETKERNSTATE 148 /* Solaris-specific. */ +#define AUE_GETPORTAUDIT 149 /* Solaris-specific. */ +#define AUE_AUDISTAT 150 /* Solaris-specific. */ +#define AUE_ENTERPROM 153 /* Solaris-specific. */ +#define AUE_EXITPROM 154 /* Solaris-specific. */ +#define AUE_IOCTL 158 +#define AUE_SOCKET 183 +#define AUE_SENDTO 184 +#define AUE_PIPE 185 +#define AUE_SOCKETPAIR 186 /* XXX: Darwin conflict. */ +#define AUE_SEND 187 +#define AUE_SENDMSG 188 +#define AUE_RECV 189 +#define AUE_RECVMSG 190 +#define AUE_RECVFROM 191 +#define AUE_READ 192 +#define AUE_LSEEK 194 +#define AUE_WRITE 195 +#define AUE_WRITEV 196 +#define AUE_NFS 197 /* Solaris-specific. */ +#define AUE_READV 198 + /* XXXRW: XXX Solaris old stat()? */ +#define AUE_SETUID 200 /* XXXRW: Solaris old setuid? */ +#define AUE_STIME 201 /* XXXRW: Solaris old stime? */ +#define AUE_UTIME 202 /* XXXRW: Solaris old utime? */ +#define AUE_NICE 203 /* XXXRW: Solaris old nice? */ + /* XXXRW: Solaris old setpgrp? */ +#define AUE_SETGID 205 /* XXXRW: Solaris old setgid? */ + /* XXXRW: Solaris readl? */ + /* XXXRW: Solaris readvl()? */ +#define AUE_DUP2 209 +#define AUE_MMAP 210 +#define AUE_AUDIT 211 +#define AUE_PRIOCNTLSYS 212 +#define AUE_MUNMAP 213 +#define AUE_SETEGID 214 +#define AUE_SETEUID 215 +#define AUE_PUTMSG 216 +#define AUE_GETMSG 217 /* Solaris-specific. */ +#define AUE_PUTPMSG 218 /* Solaris-specific. */ +#define AUE_GETPMSG 219 /* Solaris-specific. */ +#define AUE_AUDITSYS 220 /* Solaris-specific. */ +#define AUE_AUDITON_GETKMASK 221 +#define AUE_AUDITON_SETKMASK 222 +#define AUE_AUDITON_GETCWD 223 +#define AUE_AUDITON_GETCAR 224 +#define AUE_AUDITON_GETSTAT 225 +#define AUE_AUDITON_SETSTAT 226 +#define AUE_AUDITON_SETUMASK 227 +#define AUE_AUDITON_SETSMASK 228 +#define AUE_AUDITON_GETCOND 229 +#define AUE_AUDITON_SETCOND 230 +#define AUE_AUDITON_GETCLASS 231 +#define AUE_AUDITON_SETCLASS 232 +#define AUE_UTSSYS 233 /* Solaris-specific. */ +#define AUE_STATVFS 234 +#define AUE_XSTAT 235 +#define AUE_LXSTAT 236 +#define AUE_LCHOWN 237 +#define AUE_MEMCNTL 238 /* Solaris-specific. */ +#define AUE_SYSINFO 239 /* Solaris-specific. */ +#define AUE_XMKNOD 240 /* Solaris-specific. */ +#define AUE_FORK1 241 + /* XXXRW: Solaris modctl()? */ +#define AUE_MODLOAD 243 +#define AUE_MODUNLOAD 244 +#define AUE_MODCONFIG 245 /* Solaris-specific. */ +#define AUE_MODADDMAJ 246 /* Solaris-specific. */ +#define AUE_SOCKACCEPT 247 +#define AUE_SOCKCONNECT 248 +#define AUE_SOCKSEND 249 +#define AUE_SOCKRECEIVE 250 +#define AUE_ACLSET 251 +#define AUE_FACLSET 252 +#define AUE_DOORFS_DOOR_CALL 254 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_RETURN 255 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_CREATE 256 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_REVOKE 257 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_INFO 258 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_CRED 259 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_BIND 260 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_UNBIND 261 /* Solaris-specific. */ +#define AUE_P_ONLINE 262 /* Solaris-specific. */ +#define AUE_PROCESSOR_BIND 263 /* Solaris-specific. */ +#define AUE_INST_SYNC 264 /* Solaris-specific. */ +#define AUE_SOCK_CONFIG 265 /* Solaris-specific. */ +#define AUE_SETAUDIT_ADDR 266 +#define AUE_GETAUDIT_ADDR 267 +#define AUE_CLOCK_SETTIME 287 +#define AUE_NTP_ADJTIME 288 + +/* + * Events not present in OpenSolaris BSM, generally derived from Apple Darwin + * BSM or added in OpenBSM. This start a little too close to the top end of + * the OpenSolaris event list for my comfort. + */ +#define AUE_GETFSSTAT 301 +#define AUE_PTRACE 302 +#define AUE_CHFLAGS 303 +#define AUE_FCHFLAGS 304 +#define AUE_PROFILE 305 +#define AUE_KTRACE 306 +#define AUE_SETLOGIN 307 +#define AUE_DARWIN_REBOOT 308 /* XXX: See AUE_REBOOT. */ +#define AUE_REVOKE 309 +#define AUE_UMASK 310 +#define AUE_MPROTECT 311 +#define AUE_DARWIN_SETPRIORITY 312 /* XXX: See AUE_SETPRIORITY. */ +#define AUE_DARWIN_SETTIMEOFDAY 313 /* XXX: See AUE_SETTIMEOFDAY. */ +#define AUE_DARWIN_FLOCK 314 /* XXX: See AUE_FLOCK. */ +#define AUE_MKFIFO 315 +#define AUE_POLL 316 +#define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ +#define AUE_FUTIMES 318 +#define AUE_SETSID 319 +#define AUE_SETPRIVEXEC 320 /* Darwin-specific. */ +#define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ +#define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ +#define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ +#define AUE_ADDPROFILE 324 /* Darwin-specific. */ +#define AUE_KDEBUGTRACE 325 /* Darwin-specific. */ +#define AUE_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_FSTAT 326 +#define AUE_FPATHCONF 327 +#define AUE_GETDIRENTRIES 328 +#define AUE_DARWIN_TRUNCATE 329 /* XXX: See AUE_TRUNCATE. */ +#define AUE_DARWIN_FTRUNCATE 330 /* XXX: See AUE_FTRUNCATE. */ +#define AUE_SYSCTL 331 +#define AUE_MLOCK 332 +#define AUE_MUNLOCK 333 +#define AUE_UNDELETE 334 +#define AUE_GETATTRLIST 335 /* Darwin-specific. */ +#define AUE_SETATTRLIST 336 /* Darwin-specific. */ +#define AUE_GETDIRENTRIESATTR 337 /* Darwin-specific. */ +#define AUE_EXCHANGEDATA 338 /* Darwin-specific. */ +#define AUE_SEARCHFS 339 /* Darwin-specific. */ +#define AUE_MINHERIT 340 +#define AUE_SEMCONFIG 341 +#define AUE_SEMOPEN 342 +#define AUE_SEMCLOSE 343 +#define AUE_SEMUNLINK 344 +#define AUE_SHMOPEN 345 +#define AUE_SHMUNLINK 346 +#define AUE_LOADSHFILE 347 /* Darwin-specific. */ +#define AUE_RESETSHFILE 348 /* Darwin-specific. */ +#define AUE_NEWSYSTEMSHREG 349 /* Darwin-specific. */ +#define AUE_PTHREADKILL 350 /* Darwin-specific. */ +#define AUE_PTHREADSIGMASK 351 /* Darwin-specific. */ +#define AUE_AUDITCTL 352 +#define AUE_RFORK 353 +#define AUE_LCHMOD 354 +#define AUE_SWAPOFF 355 +#define AUE_INITPROCESS 356 /* Darwin-specific. */ +#define AUE_MAPFD 357 /* Darwin-specific. */ +#define AUE_TASKFORPID 358 /* Darwin-specific. */ +#define AUE_PIDFORTASK 359 /* Darwin-specific. */ +#define AUE_SYSCTL_NONADMIN 360 +#define AUE_COPYFILE 361 /* Darwin-specific. */ +#define AUE_LUTIMES 362 +#define AUE_LCHFLAGS 363 /* FreeBSD-specific. */ +#define AUE_SENDFILE 364 /* BSD/Linux-specific. */ +#define AUE_USELIB 365 /* Linux-specific. */ +#define AUE_GETRESUID 366 +#define AUE_SETRESUID 367 +#define AUE_GETRESGID 368 +#define AUE_SETRESGID 369 +#define AUE_WAIT4 370 /* FreeBSD-specific. */ +#define AUE_LGETFH 371 /* FreeBSD-specific. */ +#define AUE_FHSTATFS 372 /* FreeBSD-specific. */ +#define AUE_FHOPEN 373 /* FreeBSD-specific. */ +#define AUE_FHSTAT 374 /* FreeBSD-specific. */ +#define AUE_JAIL 375 /* FreeBSD-specific. */ +#define AUE_EACCESS 376 /* FreeBSD-specific. */ +#define AUE_KQUEUE 377 /* FreeBSD-specific. */ +#define AUE_KEVENT 378 /* FreeBSD-specific. */ +#define AUE_FSYNC 379 +#define AUE_NMOUNT 380 /* FreeBSD-specific. */ + +/* + * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the + * normal Solaris BSM identifiers. _O_ refers to it being an old, or compat + * interface. In most cases, Darwin has never implemented these system calls + * but picked up the fields in their system call table from their FreeBSD + * import. Happily, these have different names than the AUE_O* definitions + * in Solaris BSM. + */ +#define AUE_O_CREAT AUE_OPEN_RWTC /* Darwin */ +#define AUE_O_EXECVE AUE_NULL /* Darwin */ +#define AUE_O_SBREAK AUE_NULL /* Darwin */ +#define AUE_O_LSEEK AUE_NULL /* Darwin */ +#define AUE_O_MOUNT AUE_NULL /* Darwin */ +#define AUE_O_UMOUNT AUE_NULL /* Darwin */ +#define AUE_O_STAT AUE_STAT /* Darwin */ +#define AUE_O_LSTAT AUE_LSTAT /* Darwin */ +#define AUE_O_FSTAT AUE_FSTAT /* Darwin */ +#define AUE_O_GETPAGESIZE AUE_NULL /* Darwin */ +#define AUE_O_VREAD AUE_NULL /* Darwin */ +#define AUE_O_VWRITE AUE_NULL /* Darwin */ +#define AUE_O_MMAP AUE_MMAP /* Darwin */ +#define AUE_O_VADVISE AUE_NULL /* Darwin */ +#define AUE_O_VHANGUP AUE_NULL /* Darwin */ +#define AUE_O_VLIMIT AUE_NULL /* Darwin */ +#define AUE_O_WAIT AUE_NULL /* Darwin */ +#define AUE_O_GETHOSTNAME AUE_NULL /* Darwin */ +#define AUE_O_SETHOSTNAME AUE_SYSCTL /* Darwin */ +#define AUE_O_GETDOPT AUE_NULL /* Darwin */ +#define AUE_O_SETDOPT AUE_NULL /* Darwin */ +#define AUE_O_ACCEPT AUE_NULL /* Darwin */ +#define AUE_O_SEND AUE_SENDMSG /* Darwin */ +#define AUE_O_RECV AUE_RECVMSG /* Darwin */ +#define AUE_O_VTIMES AUE_NULL /* Darwin */ +#define AUE_O_SIGVEC AUE_NULL /* Darwin */ +#define AUE_O_SIGBLOCK AUE_NULL /* Darwin */ +#define AUE_O_SIGSETMASK AUE_NULL /* Darwin */ +#define AUE_O_SIGSTACK AUE_NULL /* Darwin */ +#define AUE_O_RECVMSG AUE_RECVMSG /* Darwin */ +#define AUE_O_SENDMSG AUE_SENDMSG /* Darwin */ +#define AUE_O_VTRACE AUE_NULL /* Darwin */ +#define AUE_O_RESUBA AUE_NULL /* Darwin */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 3 06:24:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 600C216A423; Fri, 3 Feb 2006 06:24:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B4EB16A420 for ; Fri, 3 Feb 2006 06:24:16 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B60643D5C for ; Fri, 3 Feb 2006 06:24:12 +0000 (GMT) (envelope-from imp@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 k136OBjG063644 for ; Fri, 3 Feb 2006 06:24:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k136OBdO063641 for perforce@freebsd.org; Fri, 3 Feb 2006 06:24:11 GMT (envelope-from imp@freebsd.org) Date: Fri, 3 Feb 2006 06:24:11 GMT Message-Id: <200602030624.k136OBdO063641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 90954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 06:24:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=90954 Change 90954 by imp@imp_hammer on 2006/02/03 06:24:00 -current has void here. Reduce diffs to current Affected files ... .. //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_irqhandler.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_irqhandler.c#5 (text+ko) ==== @@ -120,6 +120,7 @@ return (-1); } +void arm_mask_irq(uintptr_t irq) { From owner-p4-projects@FreeBSD.ORG Fri Feb 3 06:30:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54CA216A423; Fri, 3 Feb 2006 06:30:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2ADF016A420 for ; Fri, 3 Feb 2006 06:30:20 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE6D043D45 for ; Fri, 3 Feb 2006 06:30:19 +0000 (GMT) (envelope-from imp@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 k136UJVR063984 for ; Fri, 3 Feb 2006 06:30:19 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k136UJpC063981 for perforce@freebsd.org; Fri, 3 Feb 2006 06:30:19 GMT (envelope-from imp@freebsd.org) Date: Fri, 3 Feb 2006 06:30:19 GMT Message-Id: <200602030630.k136UJpC063981@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 90955 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 06:30:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=90955 Change 90955 by imp@imp_hammer on 2006/02/03 06:30:00 Diff reduction to head. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/trap.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/trap.c#5 (text+ko) ==== @@ -156,9 +156,9 @@ static const struct data_abort data_aborts[] = { {dab_fatal, "Vector Exception"}, - {dab_align, "Alignment Fault"}, + {dab_align, "Alignment Fault 1"}, {dab_fatal, "Terminal Exception"}, - {dab_align, "Alignment Fault"}, + {dab_align, "Alignment Fault 3"}, {dab_buserr, "External Linefetch Abort (S)"}, {NULL, "Translation Fault (S)"}, {dab_buserr, "External Linefetch Abort (P)"}, From owner-p4-projects@FreeBSD.ORG Fri Feb 3 06:48:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A656816A423; Fri, 3 Feb 2006 06:48:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8086B16A420 for ; Fri, 3 Feb 2006 06:48:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3350E43D46 for ; Fri, 3 Feb 2006 06:48:43 +0000 (GMT) (envelope-from imp@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 k136mhMD064691 for ; Fri, 3 Feb 2006 06:48:43 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k136mgC2064688 for perforce@freebsd.org; Fri, 3 Feb 2006 06:48:42 GMT (envelope-from imp@freebsd.org) Date: Fri, 3 Feb 2006 06:48:42 GMT Message-Id: <200602030648.k136mgC2064688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 90958 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 06:48:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=90958 Change 90958 by imp@imp_hammer on 2006/02/03 06:48:12 Diff reduction to -current. Remove left-over debugs from the board bring up. # all that's left is mapping the system devices, which I'm unsure # if I should remove from here or add to current Affected files ... .. //depot/projects/arm/src/sys/arm/arm/locore.S#18 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/locore.S#18 (text+ko) ==== @@ -68,43 +68,6 @@ ASENTRY_NP(_start) -#define R7SYS \ - mov r7, #0 ; \ - add r7, r7, #0xfffff000 - -#define LED1OFF \ - mov r6, #262144 /* 18 */ ; \ - str r6, [r7, #2096] /* SODR */ -#define LED2OFF \ - mov r6, #524288 /* 19 */ ; \ - str r6, [r7, #2096] /* SODR */ -#define LED3OFF \ - mov r6, #1048576 /* 20 */ ; \ - str r6, [r7, #2096] /* SODR */ -#define LED1ON \ - mov r6, #262144 /* 18 */ ; \ - str r6, [r7, #2100] /* CODR */ -#define LED2ON \ - mov r6, #524288 /* 19 */ ; \ - str r6, [r7, #2100] /* CODR */ -#define LED3ON \ - mov r6, #1048576 /* 20 */ ; \ - str r6, [r7, #2100] /* CODR */ - - R7SYS - mov r6, #262144 /* 18 */ - str r6, [r7, #2048] /* PER */ - str r6, [r7, #2064] /* OER */ - str r6, [r7, #2096] /* SODR */ - mov r6, #524288 /* 19 */ - str r6, [r7, #2048] /* PER */ - str r6, [r7, #2064] /* OER */ - str r6, [r7, #2096] /* SODR */ - mov r6, #1048576 /* 20 */ - str r6, [r7, #2048] /* PER */ - str r6, [r7, #2064] /* OER */ - str r6, [r7, #2096] /* SODR */ - /* Check if we are running on RAM, if not move ourself to RAM */ #if 0 cmp pc, #PHYSADDR @@ -158,7 +121,6 @@ mov pc, r7 Lunmapped: - R7SYS #ifdef STARTUP_PAGETABLE_ADDR /* build page table from scratch */ ldr r0, Lstartup_pagetable @@ -206,15 +168,14 @@ subs r2, r2, #4 bgt .L1 ldr pc, .Lvirt_done + virt_done: - LED1ON mov fp, #0 /* trace back starts here */ bl _C_LABEL(initarm) /* Off we go */ /* init arm will return the new stack pointer. */ mov sp, r0 - LED2ON bl _C_LABEL(mi_startup) /* call mi_startup()! */ adr r0, .Lmainreturned @@ -356,14 +317,6 @@ mov pc, r7 #endif -#if 0 -/* XXX - putc to UART1 of ep93xx */ -ENTRY(asm_putc) - ldr r1, =0xf01c0000 - strb r0, [r1] - mov pc, lr -#endif - /* * setjump + longjmp */ From owner-p4-projects@FreeBSD.ORG Fri Feb 3 07:05:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FAC316A423; Fri, 3 Feb 2006 07:05:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECD5716A420 for ; Fri, 3 Feb 2006 07:05:15 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBC4443D46 for ; Fri, 3 Feb 2006 07:05:15 +0000 (GMT) (envelope-from imp@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 k1375FaP065355 for ; Fri, 3 Feb 2006 07:05:15 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1375FWo065350 for perforce@freebsd.org; Fri, 3 Feb 2006 07:05:15 GMT (envelope-from imp@freebsd.org) Date: Fri, 3 Feb 2006 07:05:15 GMT Message-Id: <200602030705.k1375FWo065350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 90961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 07:05:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=90961 Change 90961 by imp@imp_harmony on 2006/02/03 07:04:45 IFC @90960 (loopback) Affected files ... .. //depot/projects/arm/src/sys/arm/arm/identcpu.c#6 integrate .. //depot/projects/arm/src/sys/arm/arm/undefined.c#4 integrate Differences ... ==== //depot/projects/arm/src/sys/arm/arm/identcpu.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.6 2005/12/31 14:39:18 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.7 2006/02/03 06:39:57 imp Exp $"); #include #include #include ==== //depot/projects/arm/src/sys/arm/arm/undefined.c#4 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.9 2005/10/14 12:43:44 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.10 2006/02/03 06:27:51 imp Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Fri Feb 3 07:50:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5068116A423; Fri, 3 Feb 2006 07:50:11 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0AA2016A420 for ; Fri, 3 Feb 2006 07:50:11 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A516343D46 for ; Fri, 3 Feb 2006 07:50:10 +0000 (GMT) (envelope-from imp@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 k137oAxH067112 for ; Fri, 3 Feb 2006 07:50:10 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k137oAIN067109 for perforce@freebsd.org; Fri, 3 Feb 2006 07:50:10 GMT (envelope-from imp@freebsd.org) Date: Fri, 3 Feb 2006 07:50:10 GMT Message-Id: <200602030750.k137oAIN067109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 90962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 07:50:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=90962 Change 90962 by imp@imp_Speedy on 2006/02/03 07:50:03 Nits, mostly comments. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#23 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#23 (text+ko) ==== @@ -22,6 +22,18 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* TODO: (in no order) + * + * 1) detach + * 2) Free dma setup + * 3) Turn on the clock in pmc and turn on pins? Turn off? + * 4) Setup multicast filters + * 5) Setup RX buffers in ateinit_locked + * 6) Interrupt bits as appropriate + * 7) Keep track of the mbufs in flight on TX and free them in the ISR. + * 8) Need to sync busdma goo in atestop + */ + #include __FBSDID("$FreeBSD$"); @@ -85,10 +97,6 @@ struct mbuf *rx_mbuf[ATE_MAX_RX_BUFFERS]; /* RX mbufs */ bus_addr_t rx_desc_phys; eth_rx_desc_t *rx_descs; - - // XXX bogus - int intr; - struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ }; @@ -517,7 +525,6 @@ int status; int i; - sc->intr++; status = RD4(sc, ETH_ISR); if (status == 0) return; From owner-p4-projects@FreeBSD.ORG Fri Feb 3 14:24:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AD6F16A424; Fri, 3 Feb 2006 14:24:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E370D16A420 for ; Fri, 3 Feb 2006 14:23:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 003AD43D69 for ; Fri, 3 Feb 2006 14:23:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k13ENvYn098393 for ; Fri, 3 Feb 2006 14:23:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13ENvL3098390 for perforce@freebsd.org; Fri, 3 Feb 2006 14:23:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Feb 2006 14:23:57 GMT Message-Id: <200602031423.k13ENvL3098390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 14:24:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=90969 Change 90969 by rwatson@rwatson_zoo on 2006/02/03 14:23:31 White space consistency with base tree. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#10 (text+ko) ==== @@ -16,7 +16,6 @@ ; [M]LIBCOMPAT, [M]NODEF, [M]NOARGS, [M]NOPROTO, [M]NOIMPL, ; [M]NOSTD ; name psuedo-prototype of syscall routine -; ; If one of the following alts is different, then all appear: ; altname name of system call if different ; alttag name of args struct tag if different from [o]`name'"_args" From owner-p4-projects@FreeBSD.ORG Fri Feb 3 15:32:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF2E316A427; Fri, 3 Feb 2006 15:32:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8427516A420 for ; Fri, 3 Feb 2006 15:32:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17E9B43D60 for ; Fri, 3 Feb 2006 15:32:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k13FWKHL001778 for ; Fri, 3 Feb 2006 15:32:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13FWKR9001775 for perforce@freebsd.org; Fri, 3 Feb 2006 15:32:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Feb 2006 15:32:20 GMT Message-Id: <200602031532.k13FWKR9001775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 15:32:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=90971 Change 90971 by rwatson@rwatson_zoo on 2006/02/03 15:31:37 Don't include user.h -- it appears not to provide benefit, but does cause dependency on fields from machine/pcb.h. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#8 (text+ko) ==== @@ -43,7 +43,6 @@ #include #include -#include /* * Audit subsystem condition flags. The audit_enabled flag is set and From owner-p4-projects@FreeBSD.ORG Fri Feb 3 15:35:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B127F16A423; Fri, 3 Feb 2006 15:35:25 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A82B16A420 for ; Fri, 3 Feb 2006 15:35:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 386F043D45 for ; Fri, 3 Feb 2006 15:35:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k13FZPTi001962 for ; Fri, 3 Feb 2006 15:35:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13FZOFv001959 for perforce@freebsd.org; Fri, 3 Feb 2006 15:35:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Feb 2006 15:35:24 GMT Message-Id: <200602031535.k13FZOFv001959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90972 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 15:35:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=90972 Change 90972 by rwatson@rwatson_zoo on 2006/02/03 15:34:30 Don't conditionalize include of segments.h now that user.h is not included from audit.h. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/include/pcb.h#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/include/pcb.h#6 (text+ko) ==== @@ -39,9 +39,9 @@ /* * Intel 386 process control block */ -//#ifndef _KERNEL +#ifndef _KERNEL #include -//#endif +#endif #include struct pcb { From owner-p4-projects@FreeBSD.ORG Fri Feb 3 16:41:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A25116A423; Fri, 3 Feb 2006 16:41:50 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B42616A420 for ; Fri, 3 Feb 2006 16:41:50 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0130643D45 for ; Fri, 3 Feb 2006 16:41:50 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k13GfnFG009763 for ; Fri, 3 Feb 2006 16:41:49 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13GfnSo009754 for perforce@freebsd.org; Fri, 3 Feb 2006 16:41:49 GMT (envelope-from wsalamon@computer.org) Date: Fri, 3 Feb 2006 16:41:49 GMT Message-Id: <200602031641.k13GfnSo009754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 90980 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 16:41:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=90980 Change 90980 by wsalamon@gretsch on 2006/02/03 16:41:14 Insert space for proper display formatting. Pointed out by C. Brueffer and P. Pentchev. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#8 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#8 $ .\" .Dd Jan 24, 2004 .Dt AUDITREDUCE 1 @@ -84,7 +84,7 @@ This option cannot be used with .Fl a or -.Fl b. +.Fl b . .It Fl e Ar euid Select records with the given effective user id or name. .It Fl f Ar egid From owner-p4-projects@FreeBSD.ORG Fri Feb 3 16:45:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAAF416A423; Fri, 3 Feb 2006 16:45:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD8FD16A420 for ; Fri, 3 Feb 2006 16:45:55 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7388943D45 for ; Fri, 3 Feb 2006 16:45:55 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k13GjtKg012269 for ; Fri, 3 Feb 2006 16:45:55 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13Gjt6Y012266 for perforce@freebsd.org; Fri, 3 Feb 2006 16:45:55 GMT (envelope-from wsalamon@computer.org) Date: Fri, 3 Feb 2006 16:45:55 GMT Message-Id: <200602031645.k13Gjt6Y012266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 90981 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 16:45:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=90981 Change 90981 by wsalamon@gretsch on 2006/02/03 16:45:32 Integrate space formatting fix from OpenBSM. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#5 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#5 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#4 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#5 $ .\" .Dd Jan 24, 2004 .Dt AUDITREDUCE 1 @@ -84,7 +84,7 @@ This option cannot be used with .Fl a or -.Fl b. +.Fl b . .It Fl e Ar euid Select records with the given effective user id or name. .It Fl f Ar egid From owner-p4-projects@FreeBSD.ORG Fri Feb 3 17:12:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89FFB16A426; Fri, 3 Feb 2006 17:12:29 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60A8916A422 for ; Fri, 3 Feb 2006 17:12:29 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27D3043D46 for ; Fri, 3 Feb 2006 17:12:29 +0000 (GMT) (envelope-from alc@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 k13HCT29020967 for ; Fri, 3 Feb 2006 17:12:29 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13HCSHU020964 for perforce@freebsd.org; Fri, 3 Feb 2006 17:12:28 GMT (envelope-from alc@freebsd.org) Date: Fri, 3 Feb 2006 17:12:28 GMT Message-Id: <200602031712.k13HCSHU020964@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 17:12:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=90984 Change 90984 by alc@alc_home on 2006/02/03 17:12:16 Enable the use of superpages within the kernel object. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_object.c#9 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_object.c#9 (text+ko) ==== @@ -230,6 +230,8 @@ VM_OBJECT_LOCK_INIT(&kernel_object_store, "kernel object"); _vm_object_allocate(OBJT_DEFAULT, OFF_TO_IDX(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS), kernel_object); + kernel_object->pg_color = (u_short)atop(VM_MIN_KERNEL_ADDRESS); + vm_object_set_flag(kernel_object, OBJ_SUPERPAGES); VM_OBJECT_LOCK_INIT(&kmem_object_store, "kmem object"); _vm_object_allocate(OBJT_DEFAULT, OFF_TO_IDX(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS), From owner-p4-projects@FreeBSD.ORG Fri Feb 3 17:35:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D267916A423; Fri, 3 Feb 2006 17:35:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8EAA016A420 for ; Fri, 3 Feb 2006 17:35:58 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5122F43D46 for ; Fri, 3 Feb 2006 17:35:58 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k13HZwSv022289 for ; Fri, 3 Feb 2006 17:35:58 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13HZw5x022286 for perforce@freebsd.org; Fri, 3 Feb 2006 17:35:58 GMT (envelope-from wsalamon@computer.org) Date: Fri, 3 Feb 2006 17:35:58 GMT Message-Id: <200602031735.k13HZw5x022286@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 90986 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 17:35:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=90986 Change 90986 by wsalamon@gretsch on 2006/02/03 17:35:22 Add a function that determines whether a buffer contains a printable string. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#2 (text+ko) ==== @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include @@ -534,3 +535,21 @@ strlcpy(cpath, bufp, MAXPATHLEN); } } + +/* + * Determine if an array contains a printable string, without the terminiating + * NULL character. + */ +int +is_auditable_string(void *buf, int len) +{ + int i; + char *str; + + str = (char *)buf; + for (i = 0; i < len; i++) + if (!isprint(str[i])) + return (0); + + return (1); +} ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#13 (text+ko) ==== @@ -279,6 +279,7 @@ int msgctl_to_event(int cmd); int semctl_to_event(int cmr); void canon_path(struct thread *td, char *path, char *cpath); +int is_auditable_string(void *buf, int len); /* * Audit trigger events notify user space of kernel audit conditions From owner-p4-projects@FreeBSD.ORG Fri Feb 3 19:27:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C460116A423; Fri, 3 Feb 2006 19:27:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7DD0716A420 for ; Fri, 3 Feb 2006 19:27:39 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 222AC43D45 for ; Fri, 3 Feb 2006 19:27:39 +0000 (GMT) (envelope-from jhb@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 k13JRc8s026897 for ; Fri, 3 Feb 2006 19:27:39 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13JRcqW026894 for perforce@freebsd.org; Fri, 3 Feb 2006 19:27:38 GMT (envelope-from jhb@freebsd.org) Date: Fri, 3 Feb 2006 19:27:38 GMT Message-Id: <200602031927.k13JRcqW026894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 90991 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 19:27:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=90991 Change 90991 by jhb@jhb_slimer on 2006/02/03 19:26:37 IFC @90988. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#49 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#51 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/undefined.c#9 integrate .. //depot/projects/smpng/sys/bsm/audit.h#2 integrate .. //depot/projects/smpng/sys/bsm/audit_internal.h#1 branch .. //depot/projects/smpng/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/smpng/sys/bsm/audit_record.h#1 branch Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#49 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.645 2005/11/24 08:16:17 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.646 2006/02/03 02:49:14 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1561,16 +1561,17 @@ mcp->mc_rbp = tp->tf_rbp; mcp->mc_rbx = tp->tf_rbx; mcp->mc_rcx = tp->tf_rcx; + mcp->mc_rflags = tp->tf_rflags; if (flags & GET_MC_CLEAR_RET) { mcp->mc_rax = 0; mcp->mc_rdx = 0; + mcp->mc_rflags &= ~PSL_C; } else { mcp->mc_rax = tp->tf_rax; mcp->mc_rdx = tp->tf_rdx; } mcp->mc_rip = tp->tf_rip; mcp->mc_cs = tp->tf_cs; - mcp->mc_rflags = tp->tf_rflags; mcp->mc_rsp = tp->tf_rsp; mcp->mc_ss = tp->tf_ss; mcp->mc_len = sizeof(*mcp); ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#51 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.535 2005/11/20 06:09:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.536 2006/02/03 00:16:36 peter Exp $"); /* * Manages physical address maps. @@ -183,8 +183,8 @@ * Data for the pv entry allocation mechanism */ static uma_zone_t pvzone; -static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; +static int shpgperproc = PMAP_SHPGPERPROC; /* * All those kernel PT submaps that BSD is so fond of @@ -563,7 +563,6 @@ void pmap_init(void) { - int shpgperproc = PMAP_SHPGPERPROC; /* * Initialize the address space (zone) for the pv entries. Set a @@ -571,13 +570,43 @@ * numbers of pv entries. */ pvzone = uma_zcreate("PV ENTRY", sizeof(struct pv_entry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); + NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); - uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); +} + +SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters"); +static int +pmap_pventry_proc(SYSCTL_HANDLER_ARGS) +{ + int error; + + error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); + if (error == 0 && req->newptr) { + shpgperproc = (pv_entry_max - cnt.v_page_count) / maxproc; + pv_entry_high_water = 9 * (pv_entry_max / 10); + } + return (error); +} +SYSCTL_PROC(_vm_pmap, OID_AUTO, pv_entry_max, CTLTYPE_INT|CTLFLAG_RW, + &pv_entry_max, 0, pmap_pventry_proc, "IU", "Max number of PV entries"); + +static int +pmap_shpgperproc_proc(SYSCTL_HANDLER_ARGS) +{ + int error; + + error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); + if (error == 0 && req->newptr) { + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_high_water = 9 * (pv_entry_max / 10); + } + return (error); } +SYSCTL_PROC(_vm_pmap, OID_AUTO, shpgperproc, CTLTYPE_INT|CTLFLAG_RW, + &shpgperproc, 0, pmap_shpgperproc_proc, "IU", "Page share factor per proc"); /*************************************************** @@ -1452,8 +1481,9 @@ * mappings to active pages. */ if (ratecheck(&lastprint, &printinterval)) - printf("Approaching the limit on PV entries, " - "increase the vm.pmap.shpgperproc tunable.\n"); + printf("Approaching the limit on PV entries, consider " + "increasing sysctl vm.pmap.shpgperproc or " + "vm.pmap.pv_entry_max\n"); vpq = &vm_page_queues[PQ_INACTIVE]; retry: TAILQ_FOREACH(m, &vpq->pl, pageq) { ==== //depot/projects/smpng/sys/arm/arm/identcpu.c#7 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.6 2005/12/31 14:39:18 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.7 2006/02/03 06:39:57 imp Exp $"); #include #include #include @@ -266,7 +266,7 @@ { "ARM7", "CPU_ARM7" }, /* CPU_CLASS_ARM7 */ { "ARM7TDMI", "CPU_ARM7TDMI" }, /* CPU_CLASS_ARM7TDMI */ { "ARM8", "CPU_ARM8" }, /* CPU_CLASS_ARM8 */ - { "ARM9TDMI", NULL }, /* CPU_CLASS_ARM9TDMI */ + { "ARM9TDMI", "CPU_ARM9TDMI" }, /* CPU_CLASS_ARM9TDMI */ { "ARM9E-S", NULL }, /* CPU_CLASS_ARM9ES */ { "ARM10E", "CPU_ARM10" }, /* CPU_CLASS_ARM10E */ { "SA-1", "CPU_SA110" }, /* CPU_CLASS_SA1 */ @@ -325,7 +325,7 @@ for (i = 0; cpuids[i].cpuid != 0; i++) if (cpuids[i].cpuid == (cpuid & CPU_ID_CPU_MASK)) { cpu_class = cpuids[i].cpu_class; - printf("%s %s (%s core)\n", + printf("CPU: %s %s (%s core)\n", cpuids[i].cpu_name, cpuids[i].cpu_steppings[cpuid & CPU_ID_REVISION_MASK], @@ -335,6 +335,7 @@ if (cpuids[i].cpuid == 0) printf("unknown CPU (ID = 0x%x)\n", cpuid); + printf(" "); switch (cpu_class) { case CPU_CLASS_ARM6: case CPU_CLASS_ARM7: @@ -374,24 +375,24 @@ if (ctrl & CPU_CONTROL_BPRD_ENABLE) printf(" branch prediction enabled"); + printf("\n"); /* Print cache info. */ if (arm_picache_line_size == 0 && arm_pdcache_line_size == 0) return; if (arm_pcache_unified) { - printf("%dKB/%dB %d-way %s unified cache\n", + printf(" %dKB/%dB %d-way %s unified cache\n", arm_pdcache_size / 1024, arm_pdcache_line_size, arm_pdcache_ways, wtnames[arm_pcache_type]); } else { - printf("%dKB/%dB %d-way Instruction cache\n", + printf(" %dKB/%dB %d-way Instruction cache\n", arm_picache_size / 1024, arm_picache_line_size, arm_picache_ways); - printf("%dKB/%dB %d-way %s Data cache\n", + printf(" %dKB/%dB %d-way %s Data cache\n", arm_pdcache_size / 1024, arm_pdcache_line_size, arm_pdcache_ways, wtnames[arm_pcache_type]); } - printf("\n"); } ==== //depot/projects/smpng/sys/arm/arm/undefined.c#9 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.9 2005/10/14 12:43:44 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.10 2006/02/03 06:27:51 imp Exp $"); #include #include @@ -277,11 +277,11 @@ if ((fault_code & FAULT_USER) == 0) { if (fault_instruction == KERNEL_BREAKPOINT) { #ifdef KDB - kdb_trap(T_BREAKPOINT, 0, frame); + kdb_trap(T_BREAKPOINT, 0, frame); #else - printf("No debugger in kernel.\n"); + printf("No debugger in kernel.\n"); #endif - return; + return; } else panic("Undefined instruction in kernel.\n"); } ==== //depot/projects/smpng/sys/bsm/audit.h#2 (text+ko) ==== @@ -1,39 +1,345 @@ -/*- - * Copyright (c) 2005 Robert N. M. Watson +/* + * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * + * @APPLE_BSD_LICENSE_HEADER_START@ + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * @APPLE_BSD_LICENSE_HEADER_END@ * - * $FreeBSD: src/sys/bsm/audit.h,v 1.1 2005/05/29 16:10:33 rwatson Exp $ + * $P4: //depot/projects/smpng/sys/bsm/audit.h#2 $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.2 2006/02/01 19:54:22 rwatson Exp $ + */ + +#ifndef _BSM_AUDIT_H +#define _BSM_AUDIT_H + +#include +#include +#include + +#define AUDIT_RECORD_MAGIC 0x828a0f1b +#define MAX_AUDIT_RECORDS 20 +#define MAX_AUDIT_RECORD_SIZE 4096 +#define MIN_AUDIT_FILE_SIZE (512 * 1024) + +/* + * Minimum noumber of free blocks on the filesystem containing the audit + * log necessary to avoid a hard log rotation. DO NOT SET THIS VALUE TO 0 + * as the kernel does an unsigned compare, plus we want to leave a few blocks + * free so userspace can terminate the log, etc. + */ +#define AUDIT_HARD_LIMIT_FREE_BLOCKS 4 + +/* + * Triggers for the audit daemon + */ +#define AUDIT_TRIGGER_MIN 1 +#define AUDIT_TRIGGER_LOW_SPACE 1 +#define AUDIT_TRIGGER_OPEN_NEW 2 +#define AUDIT_TRIGGER_READ_FILE 3 +#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 +#define AUDIT_TRIGGER_NO_SPACE 5 +#define AUDIT_TRIGGER_MAX 5 + +/* + * File that will be read for trigger events from the kernel. + */ +#define AUDIT_TRIGGER_FILE "/dev/audit" + +/* + * The special device filename. + */ +#define AUDITDEV_FILENAME "audit" + +/* + * Pre-defined audit IDs + */ +#define AU_DEFAUDITID -1 + +/* + * Define the masks for the classes of audit events. + */ +#define AU_NULL 0x00000000 +#define AU_FREAD 0x00000001 +#define AU_FWRITE 0x00000002 +#define AU_FACCESS 0x00000004 +#define AU_FMODIFY 0x00000008 +#define AU_FCREATE 0x00000010 +#define AU_FDELETE 0x00000020 +#define AU_CLOSE 0x00000040 +#define AU_PROCESS 0x00000080 +#define AU_NET 0x00000100 +#define AU_IPC 0x00000200 +#define AU_NONAT 0x00000400 +#define AU_ADMIN 0x00000800 +#define AU_LOGIN 0x00001000 +#define AU_TFM 0x00002000 +#define AU_APPL 0x00004000 +#define AU_SETL 0x00008000 +#define AU_IFLOAT 0x00010000 +#define AU_PRIV 0x00020000 +#define AU_MAC_RW 0x00040000 +#define AU_XCONN 0x00080000 +#define AU_XCREATE 0x00100000 +#define AU_XDELETE 0x00200000 +#define AU_XIFLOAT 0x00400000 +#define AU_XPRIVS 0x00800000 +#define AU_XPRIVF 0x01000000 +#define AU_XMOVE 0x02000000 +#define AU_XDACF 0x04000000 +#define AU_XMACF 0x08000000 +#define AU_XSECATTR 0x10000000 +#define AU_IOCTL 0x20000000 +#define AU_EXEC 0x40000000 +#define AU_OTHER 0x80000000 +#define AU_ALL 0xffffffff + +/* + * IPC types + */ +#define AT_IPC_MSG ((u_char)1) /* Message IPC id. */ +#define AT_IPC_SEM ((u_char)2) /* Semaphore IPC id. */ +#define AT_IPC_SHM ((u_char)3) /* Shared mem IPC id. */ + +/* + * Audit conditions. + */ +#define AUC_UNSET 0 +#define AUC_AUDITING 1 +#define AUC_NOAUDIT 2 +#define AUC_DISABLED -1 + +/* + * auditon(2) commands. + */ +#define A_GETPOLICY 2 +#define A_SETPOLICY 3 +#define A_GETKMASK 4 +#define A_SETKMASK 5 +#define A_GETQCTRL 6 +#define A_SETQCTRL 7 +#define A_GETCWD 8 +#define A_GETCAR 9 +#define A_GETSTAT 12 +#define A_SETSTAT 13 +#define A_SETUMASK 14 +#define A_SETSMASK 15 +#define A_GETCOND 20 +#define A_SETCOND 21 +#define A_GETCLASS 22 +#define A_SETCLASS 23 +#define A_GETPINFO 24 +#define A_SETPMASK 25 +#define A_SETFSIZE 26 +#define A_GETFSIZE 27 +#define A_GETPINFO_ADDR 28 +#define A_GETKAUDIT 29 +#define A_SETKAUDIT 30 +#define A_SENDTRIGGER 31 + +/* + * Audit policy controls. + */ +#define AUDIT_CNT 0x0001 +#define AUDIT_AHLT 0x0002 +#define AUDIT_ARGV 0x0004 +#define AUDIT_ARGE 0x0008 +#define AUDIT_PASSWD 0x0010 +#define AUDIT_SEQ 0x0020 +#define AUDIT_WINDATA 0x0040 +#define AUDIT_USER 0x0080 +#define AUDIT_GROUP 0x0100 +#define AUDIT_TRAIL 0x0200 +#define AUDIT_PATH 0x0400 + +/* + * Audit queue control parameters */ +#define AQ_HIWATER 100 +#define AQ_MAXHIGH 10000 +#define AQ_LOWATER 10 +#define AQ_BUFSZ 1024 +#define AQ_MAXBUFSZ 1048576 -#ifndef _BSM_AUDIT_H_ -#define _BSM_AUDIT_H_ +/* + * Default minimum percentage free space on file system. + */ +#define AU_FS_MINFREE 20 /* - * This is a place-holder include file that defines only the minimal BSM - * types to allow the system call table to contain stub event identifiers. - * Additional types and defines will be introduced later. + * Type definitions used indicating the length of variable length addresses + * in tokens containing addresses, such as header fields. */ +#define AU_IPv4 4 +#define AU_IPv6 16 + +__BEGIN_DECLS + +typedef uid_t au_id_t; +typedef pid_t au_asid_t; typedef u_int16_t au_event_t; +typedef u_int16_t au_emod_t; +typedef u_int32_t au_class_t; + +struct au_tid { + dev_t port; + u_int32_t machine; +}; +typedef struct au_tid au_tid_t; + +struct au_tid_addr { + dev_t at_port; + u_int32_t at_type; + u_int32_t at_addr[4]; +}; +typedef struct au_tid_addr au_tid_addr_t; + +struct au_mask { + unsigned int am_success; /* Success bits. */ + unsigned int am_failure; /* Failure bits. */ +}; +typedef struct au_mask au_mask_t; + +struct auditinfo { + au_id_t ai_auid; /* Audit user ID. */ + au_mask_t ai_mask; /* Audit masks. */ + au_tid_t ai_termid; /* Terminal ID. */ + au_asid_t ai_asid; /* Audit session ID. */ +}; +typedef struct auditinfo auditinfo_t; + +struct auditinfo_addr { + au_id_t ai_auid; /* Audit user ID. */ + au_mask_t ai_mask; /* Audit masks. */ + au_tid_addr_t ai_termid; /* Terminal ID. */ + au_asid_t ai_asid; /* Audit session ID. */ +}; +typedef struct auditinfo_addr auditinfo_addr_t; + +struct auditpinfo { + pid_t ap_pid; /* ID of target process. */ + au_id_t ap_auid; /* Audit user ID. */ + au_mask_t ap_mask; /* Audit masks. */ + au_tid_t ap_termid; /* Terminal ID. */ + au_asid_t ap_asid; /* Audit session ID. */ +}; +typedef struct auditpinfo auditpinfo_t; + +struct auditpinfo_addr { + pid_t ap_pid; /* ID of target process. */ + au_id_t ap_auid; /* Audit user ID. */ + au_mask_t ap_mask; /* Audit masks. */ + au_tid_addr_t ap_termid; /* Terminal ID. */ + au_asid_t ap_asid; /* Audit session ID. */ +}; +typedef struct auditpinfo_addr auditpinfo_addr_t; + +/* Token and record structures. */ + +struct au_token { + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; +}; +typedef struct au_token token_t; -#endif /* !_BSM_AUDIT_H_ */ +struct au_record { + char used; /* Record currently in use? */ + int desc; /* Descriptor for record. */ + TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ + u_char *data; + size_t len; + LIST_ENTRY(au_record) au_rec_q; +}; +typedef struct au_record au_record_t; + +/* + * Kernel audit queue control parameters. + */ +struct au_qctrl { + size_t aq_hiwater; + size_t aq_lowater; + size_t aq_bufsz; + clock_t aq_delay; + int aq_minfree; /* Minimum filesystem percent free space. */ +}; +typedef struct au_qctrl au_qctrl_t; + +/* + * Structure for the audit statistics. + */ +struct audit_stat { + unsigned int as_version; + unsigned int as_numevent; + int as_generated; + int as_nonattring; + int as_kernel; + int as_audit; + int as_auditctl; + int as_enqueu; + int as_written; + int as_wblocked; + int as_rblocked; + int as_dropped; + int as_totalsize; + unsigned int as_memused; +}; +typedef struct audit_stat au_stat_t; + +/* + * Structure for the audit file statistics. + */ +struct audit_fstat { + u_quad_t af_filesz; + u_quad_t af_currsz; +}; +typedef struct audit_fstat au_fstat_t; + +/* + * Audit to event class mapping. + */ +struct au_evclass_map { + au_event_t ec_number; + au_class_t ec_class; +}; +typedef struct au_evclass_map au_evclass_map_t; + +#if !defined(_KERNEL) && !defined(KERNEL) +int audit(const void *, int); +int auditon(int, void *, int); +int auditctl(const char *); +int getauid(au_id_t *); +int setauid(const au_id_t *); +int getaudit(struct auditinfo *); +int setaudit(const struct auditinfo *); +int getaudit_addr(struct auditinfo_addr *, int); +int setaudit_addr(const struct auditinfo_addr *, int); +#endif /* defined(_KERNEL) || defined(KERNEL) */ + +__END_DECLS + +#endif /* !_BSM_AUDIT_H */ ==== //depot/projects/smpng/sys/bsm/audit_kevents.h#3 (text+ko) ==== @@ -1,38 +1,495 @@ -/*- - * Copyright (c) 2005 Robert N. M. Watson +/* + * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * + * @APPLE_BSD_LICENSE_HEADER_START@ + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * @APPLE_BSD_LICENSE_HEADER_END@ * - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.2 2005/05/29 16:11:34 rwatson Exp $ + * $P4: //depot/projects/smpng/sys/bsm/audit_kevents.h#3 $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.3 2006/02/01 19:54:22 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ #define _BSM_AUDIT_KEVENTS_H_ /* - * This is a place-holder include file that defines exactly one audit event: - * the null event. The real list of audit events will be introduced later. + * Values marked as AUE_NULL are not required to be audited as per CAPP. + * + * Some conflicts exist in the assignment of name to event number mappings + * between BSM implementations. In general, we prefer the OpenSolaris + * definition as we consider Solaris BSM to be authoritative. _DARWIN_ has + * been inserted for the Darwin variants. If necessary, other tags will be + * added in the future. + */ + +#define AUE_NULL 0 +#define AUE_EXIT 1 +#define AUE_FORK 2 +#define AUE_OPEN 3 +#define AUE_CREAT 4 +#define AUE_LINK 5 +#define AUE_UNLINK 6 +#define AUE_DELETE AUE_UNLINK +#define AUE_EXEC 7 +#define AUE_CHDIR 8 +#define AUE_MKNOD 9 +#define AUE_CHMOD 10 +#define AUE_CHOWN 11 +#define AUE_UMOUNT 12 +#define AUE_JUNK 13 /* Solaris-specific. */ +#define AUE_ACCESS 14 +#define AUE_CHECKUSERACCESS AUE_ACCESS +#define AUE_KILL 15 +#define AUE_STAT 16 +#define AUE_LSTAT 17 +#define AUE_ACCT 18 +#define AUE_MCTL 19 /* Solaris-specific. */ +#define AUE_REBOOT 20 /* XXX: Darwin conflict. */ +#define AUE_SYMLINK 21 +#define AUE_READLINK 22 +#define AUE_EXECVE 23 +#define AUE_CHROOT 24 +#define AUE_VFORK 25 +#define AUE_SETGROUPS 26 +#define AUE_SETPGRP 27 +#define AUE_SWAPON 28 +#define AUE_SETHOSTNAME 29 /* XXX: Darwin conflict. */ +#define AUE_FCNTL 30 +#define AUE_SETPRIORITY 31 /* XXX: Darwin conflict. */ +#define AUE_CONNECT 32 +#define AUE_ACCEPT 33 +#define AUE_BIND 34 +#define AUE_SETSOCKOPT 35 +#define AUE_VTRACE 36 /* Solaris-specific. */ +#define AUE_SETTIMEOFDAY 37 /* XXX: Darwin conflict. */ +#define AUE_FCHOWN 38 +#define AUE_FCHMOD 39 +#define AUE_SETREUID 40 +#define AUE_SETREGID 41 +#define AUE_RENAME 42 +#define AUE_TRUNCATE 43 /* XXX: Darwin conflict. */ +#define AUE_FTRUNCATE 44 /* XXX: Darwin conflict. */ +#define AUE_FLOCK 45 /* XXX: Darwin conflict. */ +#define AUE_SHUTDOWN 46 +#define AUE_MKDIR 47 +#define AUE_RMDIR 48 +#define AUE_UTIMES 49 +#define AUE_ADJTIME 50 +#define AUE_SETRLIMIT 51 +#define AUE_KILLPG 52 +#define AUE_NFS_SVC 53 /* XXX: Darwin conflict. */ +#define AUE_STATFS 54 +#define AUE_FSTATFS 55 +#define AUE_UNMOUNT 56 /* XXX: Darwin conflict. */ +#define AUE_ASYNC_DAEMON 57 +#define AUE_NFS_GETFH 58 /* XXX: Darwin conflict. */ +#define AUE_SETDOMAINNAME 59 +#define AUE_QUOTACTL 60 /* XXX: Darwin conflict. */ +#define AUE_EXPORTFS 61 +#define AUE_MOUNT 62 +#define AUE_SEMSYS 63 +#define AUE_MSGSYS 64 +#define AUE_SHMSYS 65 +#define AUE_BSMSYS 66 /* Solaris-specific. */ +#define AUE_RFSSYS 67 /* Solaris-specific. */ +#define AUE_FCHDIR 68 +#define AUE_FCHROOT 69 +#define AUE_VPIXSYS 70 /* Solaris-specific. */ +#define AUE_PATHCONF 71 +#define AUE_OPEN_R 72 +#define AUE_OPEN_RC 73 +#define AUE_OPEN_RT 74 +#define AUE_OPEN_RTC 75 +#define AUE_OPEN_W 76 +#define AUE_OPEN_WC 77 +#define AUE_OPEN_WT 78 +#define AUE_OPEN_WTC 79 +#define AUE_OPEN_RW 80 +#define AUE_OPEN_RWC 81 +#define AUE_OPEN_RWT 82 +#define AUE_OPEN_RWTC 83 +#define AUE_MSGCTL 84 +#define AUE_MSGCTL_RMID 85 +#define AUE_MSGCTL_SET 86 +#define AUE_MSGCTL_STAT 87 +#define AUE_MSGGET 88 +#define AUE_MSGRCV 89 +#define AUE_MSGSND 90 +#define AUE_SHMCTL 91 +#define AUE_SHMCTL_RMID 92 +#define AUE_SHMCTL_SET 93 +#define AUE_SHMCTL_STAT 94 +#define AUE_SHMGET 95 +#define AUE_SHMAT 96 +#define AUE_SHMDT 97 +#define AUE_SEMCTL 98 +#define AUE_SEMCTL_RMID 99 +#define AUE_SEMCTL_SET 100 +#define AUE_SEMCTL_STAT 101 +#define AUE_SEMCTL_GETNCNT 102 +#define AUE_SEMCTL_GETPID 103 +#define AUE_SEMCTL_GETVAL 104 +#define AUE_SEMCTL_GETALL 105 +#define AUE_SEMCTL_GETZCNT 106 +#define AUE_SEMCTL_SETVAL 107 +#define AUE_SEMCTL_SETALL 108 +#define AUE_SEMGET 109 +#define AUE_SEMOP 110 +#define AUE_CORE 111 /* Solaris-specific, currently. */ +#define AUE_CLOSE 112 +#define AUE_SYSTEMBOOT 113 +#define AUE_ASYNC_DAEMON_EXIT 114 /* Solaris-specific. */ +#define AUE_NFSSVC_EXIT 115 /* Solaris-specific. */ +#define AUE_WRITEL 128 /* Solaris-specific. */ +#define AUE_WRITEVL 129 /* Solaris-specific. */ +#define AUE_GETAUID 130 +#define AUE_SETAUID 131 +#define AUE_GETAUDIT 132 +#define AUE_SETAUDIT 133 +#define AUE_GETUSERAUDIT 134 /* Solaris-specific. */ +#define AUE_SETUSERAUDIT 135 /* Solaris-specific. */ +#define AUE_AUDITSVC 136 /* Solaris-specific. */ +#define AUE_AUDITUSER 137 /* Solaris-specific. */ +#define AUE_AUDITON 138 +#define AUE_AUDITON_GTERMID 139 /* Solaris-specific. */ +#define AUE_AUDITON_STERMID 140 /* Solaris-specific. */ +#define AUE_AUDITON_GPOLICY 141 +#define AUE_AUDITON_SPOLICY 142 +#define AUE_AUDITON_GQCTRL 145 +#define AUE_AUDITON_SQCTRL 146 +#define AUE_GETKERNSTATE 147 /* Solaris-specific. */ +#define AUE_SETKERNSTATE 148 /* Solaris-specific. */ +#define AUE_GETPORTAUDIT 149 /* Solaris-specific. */ +#define AUE_AUDISTAT 150 /* Solaris-specific. */ +#define AUE_ENTERPROM 153 /* Solaris-specific. */ +#define AUE_EXITPROM 154 /* Solaris-specific. */ +#define AUE_IOCTL 158 +#define AUE_SOCKET 183 +#define AUE_SENDTO 184 +#define AUE_PIPE 185 +#define AUE_SOCKETPAIR 186 /* XXX: Darwin conflict. */ +#define AUE_SEND 187 +#define AUE_SENDMSG 188 +#define AUE_RECV 189 +#define AUE_RECVMSG 190 +#define AUE_RECVFROM 191 +#define AUE_READ 192 +#define AUE_LSEEK 194 +#define AUE_WRITE 195 +#define AUE_WRITEV 196 +#define AUE_NFS 197 /* Solaris-specific. */ +#define AUE_READV 198 + /* XXXRW: XXX Solaris old stat()? */ +#define AUE_SETUID 200 /* XXXRW: Solaris old setuid? */ +#define AUE_STIME 201 /* XXXRW: Solaris old stime? */ +#define AUE_UTIME 202 /* XXXRW: Solaris old utime? */ +#define AUE_NICE 203 /* XXXRW: Solaris old nice? */ + /* XXXRW: Solaris old setpgrp? */ +#define AUE_SETGID 205 /* XXXRW: Solaris old setgid? */ + /* XXXRW: Solaris readl? */ + /* XXXRW: Solaris readvl()? */ +#define AUE_DUP2 209 +#define AUE_MMAP 210 +#define AUE_AUDIT 211 +#define AUE_PRIOCNTLSYS 212 +#define AUE_MUNMAP 213 +#define AUE_SETEGID 214 +#define AUE_SETEUID 215 +#define AUE_PUTMSG 216 +#define AUE_GETMSG 217 /* Solaris-specific. */ +#define AUE_PUTPMSG 218 /* Solaris-specific. */ +#define AUE_GETPMSG 219 /* Solaris-specific. */ +#define AUE_AUDITSYS 220 /* Solaris-specific. */ +#define AUE_AUDITON_GETKMASK 221 +#define AUE_AUDITON_SETKMASK 222 +#define AUE_AUDITON_GETCWD 223 +#define AUE_AUDITON_GETCAR 224 +#define AUE_AUDITON_GETSTAT 225 +#define AUE_AUDITON_SETSTAT 226 +#define AUE_AUDITON_SETUMASK 227 +#define AUE_AUDITON_SETSMASK 228 +#define AUE_AUDITON_GETCOND 229 +#define AUE_AUDITON_SETCOND 230 +#define AUE_AUDITON_GETCLASS 231 +#define AUE_AUDITON_SETCLASS 232 +#define AUE_UTSSYS 233 /* Solaris-specific. */ +#define AUE_STATVFS 234 +#define AUE_XSTAT 235 +#define AUE_LXSTAT 236 +#define AUE_LCHOWN 237 +#define AUE_MEMCNTL 238 /* Solaris-specific. */ +#define AUE_SYSINFO 239 /* Solaris-specific. */ +#define AUE_XMKNOD 240 /* Solaris-specific. */ +#define AUE_FORK1 241 + /* XXXRW: Solaris modctl()? */ +#define AUE_MODLOAD 243 +#define AUE_MODUNLOAD 244 +#define AUE_MODCONFIG 245 /* Solaris-specific. */ +#define AUE_MODADDMAJ 246 /* Solaris-specific. */ +#define AUE_SOCKACCEPT 247 +#define AUE_SOCKCONNECT 248 +#define AUE_SOCKSEND 249 +#define AUE_SOCKRECEIVE 250 +#define AUE_ACLSET 251 +#define AUE_FACLSET 252 +#define AUE_DOORFS_DOOR_CALL 254 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_RETURN 255 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_CREATE 256 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_REVOKE 257 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_INFO 258 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_CRED 259 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_BIND 260 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_UNBIND 261 /* Solaris-specific. */ +#define AUE_P_ONLINE 262 /* Solaris-specific. */ +#define AUE_PROCESSOR_BIND 263 /* Solaris-specific. */ +#define AUE_INST_SYNC 264 /* Solaris-specific. */ +#define AUE_SOCK_CONFIG 265 /* Solaris-specific. */ +#define AUE_SETAUDIT_ADDR 266 +#define AUE_GETAUDIT_ADDR 267 +#define AUE_CLOCK_SETTIME 287 +#define AUE_NTP_ADJTIME 288 + +/* + * Events not present in OpenSolaris BSM, generally derived from Apple Darwin + * BSM or added in OpenBSM. This start a little too close to the top end of + * the OpenSolaris event list for my comfort. + */ +#define AUE_GETFSSTAT 301 +#define AUE_PTRACE 302 +#define AUE_CHFLAGS 303 +#define AUE_FCHFLAGS 304 +#define AUE_PROFILE 305 +#define AUE_KTRACE 306 +#define AUE_SETLOGIN 307 +#define AUE_DARWIN_REBOOT 308 /* XXX: See AUE_REBOOT. */ +#define AUE_REVOKE 309 +#define AUE_UMASK 310 +#define AUE_MPROTECT 311 +#define AUE_DARWIN_SETPRIORITY 312 /* XXX: See AUE_SETPRIORITY. */ +#define AUE_DARWIN_SETTIMEOFDAY 313 /* XXX: See AUE_SETTIMEOFDAY. */ +#define AUE_DARWIN_FLOCK 314 /* XXX: See AUE_FLOCK. */ +#define AUE_MKFIFO 315 +#define AUE_POLL 316 +#define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ +#define AUE_FUTIMES 318 +#define AUE_SETSID 319 +#define AUE_SETPRIVEXEC 320 /* Darwin-specific. */ +#define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ +#define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ +#define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ +#define AUE_ADDPROFILE 324 /* Darwin-specific. */ +#define AUE_KDEBUGTRACE 325 /* Darwin-specific. */ +#define AUE_KDBUGTRACE AUE_KDEBUGTRACE +#define AUE_FSTAT 326 +#define AUE_FPATHCONF 327 +#define AUE_GETDIRENTRIES 328 +#define AUE_DARWIN_TRUNCATE 329 /* XXX: See AUE_TRUNCATE. */ +#define AUE_DARWIN_FTRUNCATE 330 /* XXX: See AUE_FTRUNCATE. */ +#define AUE_SYSCTL 331 +#define AUE_MLOCK 332 +#define AUE_MUNLOCK 333 +#define AUE_UNDELETE 334 +#define AUE_GETATTRLIST 335 /* Darwin-specific. */ +#define AUE_SETATTRLIST 336 /* Darwin-specific. */ +#define AUE_GETDIRENTRIESATTR 337 /* Darwin-specific. */ +#define AUE_EXCHANGEDATA 338 /* Darwin-specific. */ +#define AUE_SEARCHFS 339 /* Darwin-specific. */ +#define AUE_MINHERIT 340 +#define AUE_SEMCONFIG 341 +#define AUE_SEMOPEN 342 +#define AUE_SEMCLOSE 343 +#define AUE_SEMUNLINK 344 +#define AUE_SHMOPEN 345 +#define AUE_SHMUNLINK 346 +#define AUE_LOADSHFILE 347 /* Darwin-specific. */ +#define AUE_RESETSHFILE 348 /* Darwin-specific. */ +#define AUE_NEWSYSTEMSHREG 349 /* Darwin-specific. */ +#define AUE_PTHREADKILL 350 /* Darwin-specific. */ +#define AUE_PTHREADSIGMASK 351 /* Darwin-specific. */ +#define AUE_AUDITCTL 352 +#define AUE_RFORK 353 +#define AUE_LCHMOD 354 +#define AUE_SWAPOFF 355 +#define AUE_INITPROCESS 356 /* Darwin-specific. */ +#define AUE_MAPFD 357 /* Darwin-specific. */ +#define AUE_TASKFORPID 358 /* Darwin-specific. */ +#define AUE_PIDFORTASK 359 /* Darwin-specific. */ +#define AUE_SYSCTL_NONADMIN 360 +#define AUE_COPYFILE 361 /* Darwin-specific. */ +#define AUE_LUTIMES 362 +#define AUE_LCHFLAGS 363 /* FreeBSD-specific. */ +#define AUE_SENDFILE 364 /* BSD/Linux-specific. */ +#define AUE_USELIB 365 /* Linux-specific. */ +#define AUE_GETRESUID 366 +#define AUE_SETRESUID 367 +#define AUE_GETRESGID 368 +#define AUE_SETRESGID 369 +#define AUE_WAIT4 370 /* FreeBSD-specific. */ +#define AUE_LGETFH 371 /* FreeBSD-specific. */ +#define AUE_FHSTATFS 372 /* FreeBSD-specific. */ +#define AUE_FHOPEN 373 /* FreeBSD-specific. */ +#define AUE_FHSTAT 374 /* FreeBSD-specific. */ +#define AUE_JAIL 375 /* FreeBSD-specific. */ +#define AUE_EACCESS 376 /* FreeBSD-specific. */ +#define AUE_KQUEUE 377 /* FreeBSD-specific. */ +#define AUE_KEVENT 378 /* FreeBSD-specific. */ +#define AUE_FSYNC 379 +#define AUE_NMOUNT 380 /* FreeBSD-specific. */ + +/* + * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the + * normal Solaris BSM identifiers. _O_ refers to it being an old, or compat + * interface. In most cases, Darwin has never implemented these system calls + * but picked up the fields in their system call table from their FreeBSD + * import. Happily, these have different names than the AUE_O* definitions + * in Solaris BSM. + */ +#define AUE_O_CREAT AUE_OPEN_RWTC /* Darwin */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 3 19:43:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE3B916A423; Fri, 3 Feb 2006 19:42:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F05016A420 for ; Fri, 3 Feb 2006 19:42:59 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 29FFE43D45 for ; Fri, 3 Feb 2006 19:42:59 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k13JgwST027577 for ; Fri, 3 Feb 2006 19:42:59 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13JgwAM027574 for perforce@freebsd.org; Fri, 3 Feb 2006 19:42:58 GMT (envelope-from wsalamon@computer.org) Date: Fri, 3 Feb 2006 19:42:58 GMT Message-Id: <200602031942.k13JgwAM027574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 90993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 19:43:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=90993 Change 90993 by wsalamon@gretsch on 2006/02/03 19:42:13 Add the capability of auditing the strings contained within an iovec object. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#4 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#9 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#10 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#14 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#4 (text+ko) ==== @@ -206,6 +206,9 @@ if (ar->k_ar.ar_arg_text != NULL) { free(ar->k_ar.ar_arg_text, M_AUDITTEXT); } + if (ar->k_ar.ar_arg_iovecstr != NULL) { + free(ar->k_ar.ar_arg_iovecstr, M_AUDITTEXT); + } if (ar->k_udata != NULL) { free(ar->k_udata, M_AUDITDATA); } ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#9 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include +#include #include /* @@ -109,6 +110,7 @@ #define ARG_MACHPORT1 0x0000100000000000ULL #define ARG_MACHPORT2 0x0000200000000000ULL #define ARG_EXIT 0x0000400000000000ULL +#define ARG_IOVECSTR 0x0000800000000000ULL #define ARG_NONE 0x0000000000000000ULL #define ARG_ALL 0xFFFFFFFFFFFFFFFFULL @@ -159,6 +161,8 @@ u_int64_t flags); void audit_arg_vnode(struct vnode *vp, u_int64_t flags); void audit_arg_text(char *text); +void audit_arg_iovec(struct iovec *iov, + unsigned int iovcnt); void audit_arg_cmd(int cmd); void audit_arg_svipc_cmd(int cmd); void audit_arg_svipc_perm(struct ipc_perm *perm); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#10 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -489,6 +490,43 @@ } void +audit_arg_iovec(struct iovec *iov, unsigned int iovcnt) +{ + int ret; + int i; + struct kaudit_record *ar; + int first; + struct sbuf sb; + + ar = currecord(); + if (ar == NULL) + return; + + /* Only capture from the iovec what we have room for. */ + ar->k_ar.ar_arg_iovecstr = malloc(MAXPATHLEN, M_AUDITTEXT, M_WAITOK); + sbuf_new(&sb, ar->k_ar.ar_arg_iovecstr, MAXIOVSTRLEN, SBUF_FIXEDLEN); + + first = 1; + for (i = 0; i < iovcnt; i++) { + if (!is_auditable_string(iov[i].iov_base, iov[i].iov_len)) + continue; + + if (first) { + ret = sbuf_printf(&sb, "%s", (char *)iov[i].iov_base); + first = 0; + } else { + ret = sbuf_printf(&sb, ":%s", (char *)iov[i].iov_base); + } + if (ret != 0) + break; + } + sbuf_trim(&sb); + sbuf_finish(&sb); + + ARG_SET_VALID(ar, ARG_IOVECSTR); +} + +void audit_arg_cmd(int cmd) { struct kaudit_record *ar; ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#14 (text+ko) ==== @@ -128,6 +128,12 @@ mode_t pipc_mode; }; +/* The maximum length of a iovec represented as a string */ +/* XXXAUDIT This value should be based on some BSM constant, like + * MAX_AUDITSTRING_LEN. + */ +#define MAXIOVSTRLEN 256 + struct audit_record { /* Audit record header. */ u_int32_t ar_magic; @@ -180,6 +186,7 @@ char *ar_arg_upath1; char *ar_arg_upath2; char *ar_arg_text; + char *ar_arg_iovecstr; struct au_mask ar_arg_amask; struct vnode_au_info ar_arg_vnode1; struct vnode_au_info ar_arg_vnode2; From owner-p4-projects@FreeBSD.ORG Fri Feb 3 20:09:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6CE316A423; Fri, 3 Feb 2006 20:09:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2EE616A420 for ; Fri, 3 Feb 2006 20:09:31 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 662D443D45 for ; Fri, 3 Feb 2006 20:09:31 +0000 (GMT) (envelope-from jhb@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 k13K9VYX029388 for ; Fri, 3 Feb 2006 20:09:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13K9VPm029385 for perforce@freebsd.org; Fri, 3 Feb 2006 20:09:31 GMT (envelope-from jhb@freebsd.org) Date: Fri, 3 Feb 2006 20:09:31 GMT Message-Id: <200602032009.k13K9VPm029385@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 90994 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 20:09:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=90994 Change 90994 by jhb@jhb_slimer on 2006/02/03 20:08:50 Sabotage panic() into printf() in for rw_assert() and witness for now. Affected files ... .. //depot/projects/smpng/sys/kern/kern_rwlock.c#3 edit .. //depot/projects/smpng/sys/kern/subr_witness.c#150 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_rwlock.c#3 (text+ko) ==== @@ -493,6 +493,9 @@ #undef _rw_assert #endif +/* XXX: no commit! */ +#define panic printf + /* * In the non-WITNESS case, rw_assert() can only detect that at least * *some* thread owns an rlock, but it cannot guarantee that *this* ==== //depot/projects/smpng/sys/kern/subr_witness.c#150 (text+ko) ==== @@ -798,6 +798,9 @@ return (0); } +/* XXX: no commit! */ +#define panic printf + void witness_checkorder(struct lock_object *lock, int flags, const char *file, int line) @@ -1245,6 +1248,7 @@ } panic("lock (%s) %s not locked @ %s:%d", class->lc_name, lock->lo_name, file, line); + return; found: /* First, check for shared/exclusive mismatches. */ From owner-p4-projects@FreeBSD.ORG Fri Feb 3 20:10:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A861516A423; Fri, 3 Feb 2006 20:10:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6950916A420 for ; Fri, 3 Feb 2006 20:10:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2776043D45 for ; Fri, 3 Feb 2006 20:10:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k13KAXAR029529 for ; Fri, 3 Feb 2006 20:10:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13KAWOZ029526 for perforce@freebsd.org; Fri, 3 Feb 2006 20:10:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Feb 2006 20:10:32 GMT Message-Id: <200602032010.k13KAWOZ029526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 90995 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 20:10:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=90995 Change 90995 by rwatson@rwatson_peppercorn on 2006/02/03 20:09:52 Remove class 'tf', as we don't reference it in audit_events. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_class#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_class#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_class#3 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_class#4 $ # # This file must match audit.h # @@ -17,7 +17,6 @@ 0x00000400:na:non attributable 0x00000800:ad:administrative 0x00001000:lo:login_logout -0x00002000:tf:tfm 0x00004000:ap:application 0x20000000:io:ioctl 0x40000000:ex:exec From owner-p4-projects@FreeBSD.ORG Fri Feb 3 21:34:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 174E916A423; Fri, 3 Feb 2006 21:34:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E133316A420 for ; Fri, 3 Feb 2006 21:34:14 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A30F443D45 for ; Fri, 3 Feb 2006 21:34:14 +0000 (GMT) (envelope-from sam@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 k13LYESq041279 for ; Fri, 3 Feb 2006 21:34:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13LYEIt041276 for perforce@freebsd.org; Fri, 3 Feb 2006 21:34:14 GMT (envelope-from sam@freebsd.org) Date: Fri, 3 Feb 2006 21:34:14 GMT Message-Id: <200602032134.k13LYEIt041276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 90997 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 21:34:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=90997 Change 90997 by sam@sam_ebb on 2006/02/03 21:33:30 two fixes from atheros: o channel powers are in 1/2 not 1/4 dbm units o when joining an ibss/bss defer beacon timer setup until a recent beacon has been received; otherwise nexttbtt may be misprogrammed using a value too far out of date Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#124 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#124 (text+ko) ==== @@ -5010,7 +5010,17 @@ error = ath_beacon_alloc(sc, ni); if (error != 0) goto bad; - ath_beacon_config(sc); + /* + * If joining an adhoc network defer beacon timer + * configuration to the next beacon frame so we + * have a current TSF to use. Otherwise we're + * starting an ibss/bss so there's no need to delay. + */ + if (ic->ic_opmode == IEEE80211_M_IBSS && + ic->ic_bss->ni_tstamp.tsf != 0) + sc->sc_syncbeacon = 1; + else + ath_beacon_config(sc); break; case IEEE80211_M_STA: /* @@ -5020,7 +5030,12 @@ sc->sc_hasclrkey && ni->ni_ucastkey.wk_keyix == IEEE80211_KEYIX_NONE) ath_setup_stationkey(ni); - ath_beacon_config(sc); + /* + * Defer beacon timer configuration to the next + * beacon frame so we have a current TSF to use + * (any TSF collected when scanning is likely old). + */ + sc->sc_syncbeacon = 1; break; default: break; @@ -5148,8 +5163,8 @@ ichan->ic_freq = c->channel; ichan->ic_flags = c->channelFlags; ichan->ic_maxregpower = c->maxRegTxPower; /* dBm */ - ichan->ic_maxpower = c->maxTxPower / 4; /* 1/4 dBm */ - ichan->ic_minpower = c->minTxPower / 4; /* 1/4 dBm */ + ichan->ic_maxpower = c->maxTxPower / 2; /* 1/2 dBm */ + ichan->ic_minpower = c->minTxPower / 2; /* 1/2 dBm */ } ic->ic_nchans = nchan; free(chans, M_TEMP); From owner-p4-projects@FreeBSD.ORG Fri Feb 3 21:35:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB39016A423; Fri, 3 Feb 2006 21:35:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B60A716A420 for ; Fri, 3 Feb 2006 21:35:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 774BA43D45 for ; Fri, 3 Feb 2006 21:35:16 +0000 (GMT) (envelope-from jhb@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 k13LZGR9041407 for ; Fri, 3 Feb 2006 21:35:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13LZGGX041404 for perforce@freebsd.org; Fri, 3 Feb 2006 21:35:16 GMT (envelope-from jhb@freebsd.org) Date: Fri, 3 Feb 2006 21:35:16 GMT Message-Id: <200602032135.k13LZGGX041404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 90998 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 21:35:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=90998 Change 90998 by jhb@jhb_slimer on 2006/02/03 21:34:55 Block in exit1() until all holds on a process are released. Affected files ... .. //depot/projects/smpng/sys/kern/kern_exit.c#109 edit .. //depot/projects/smpng/sys/sys/proc.h#161 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exit.c#109 (text+ko) ==== @@ -175,6 +175,13 @@ p->p_flag |= P_WEXIT; + /* + * Wait for any processes that have a hold on our vmspace to + * release their reference. + */ + while (p->p_lock > 0) + msleep(&p->p_lock, &p->p_mtx, PWAIT, "exithold", 0); + PROC_LOCK(p->p_pptr); sigqueue_take(p->p_ksi); PROC_UNLOCK(p->p_pptr); ==== //depot/projects/smpng/sys/sys/proc.h#161 (text+ko) ==== @@ -785,6 +785,7 @@ } while (0) #define _PHOLD(p) do { \ PROC_LOCK_ASSERT((p), MA_OWNED); \ + KASSERT(!((p)->p_flag & P_WEXIT), ("PHOLD of exiting process"));\ (p)->p_lock++; \ if (((p)->p_sflag & PS_INMEM) == 0) \ faultin((p)); \ @@ -798,6 +799,8 @@ #define _PRELE(p) do { \ PROC_LOCK_ASSERT((p), MA_OWNED); \ (--(p)->p_lock); \ + if (((p)->p_flag & P_WEXIT) && (p)->p_lock == 0) \ + wakeup(&(p)->p_lock); \ } while (0) /* Check whether a thread is safe to be swapped out. */ From owner-p4-projects@FreeBSD.ORG Fri Feb 3 21:36:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4DC616A423; Fri, 3 Feb 2006 21:36:18 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 95B1E16A420 for ; Fri, 3 Feb 2006 21:36:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F51943D46 for ; Fri, 3 Feb 2006 21:36:18 +0000 (GMT) (envelope-from jhb@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 k13LaIH2041444 for ; Fri, 3 Feb 2006 21:36:18 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13LaHN8041441 for perforce@freebsd.org; Fri, 3 Feb 2006 21:36:17 GMT (envelope-from jhb@freebsd.org) Date: Fri, 3 Feb 2006 21:36:17 GMT Message-Id: <200602032136.k13LaHN8041441@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 90999 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 21:36:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=90999 Change 90999 by jhb@jhb_slimer on 2006/02/03 21:35:34 Add some simple rwlock tests. Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#29 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#29 (text+ko) ==== @@ -86,6 +86,95 @@ /* Events. */ #ifdef WITNESS + +static void +rw_sleep(void) +{ + rw_init(&baz, "baz"); + rw_rlock(&baz); + tsleep(&baz, curthread->td_priority, "-", 1); + rw_runlock(&baz); + rw_destroy(&baz); +} +CRASH_EVENT("test sleeping with rw lock held", rw_sleep); + +static void +rw_order_sx(void) +{ + rw_init(&baz, "baz"); + printf("Should get a LOR due to baz -> foo:\n"); + rw_wlock(&baz); + sx_slock(&foo); + rw_wunlock(&baz); + sx_sunlock(&foo); + rw_destroy(&baz); +} +CRASH_EVENT("test sx and rw orders", rw_order_sx); + +static void +rw_order_mtx(void) +{ + + rw_init(&baz, "baz"); + mtx_lock(&test_mtx); + rw_rlock(&baz); + rw_runlock(&baz); + mtx_unlock(&test_mtx); + printf("Should get a LOR due to baz -> test_mtx:\n"); + rw_wlock(&baz); + mtx_lock(&test_mtx); + mtx_unlock(&test_mtx); + rw_wunlock(&baz); + rw_destroy(&baz); +} +CRASH_EVENT("test mutex and rw orders", rw_order_mtx); + +#endif + +static void +rw_assert_false(void) +{ + + printf("All of these tests should trigger. You probably want to hack witness and\nrw_assert() to use printf in place of panic first.\n"); + rw_init(&baz, "baz"); + printf("Asserting when unlocked:\n"); + rw_assert(&baz, RA_LOCKED); + rw_assert(&baz, RA_RLOCKED); + rw_assert(&baz, RA_WLOCKED); + printf("Asserting when read locked:\n"); + rw_rlock(&baz); + rw_assert(&baz, RA_WLOCKED); + rw_assert(&baz, RA_UNLOCKED); + rw_runlock(&baz); + printf("Asserting when write locked:\n"); + rw_wlock(&baz); + rw_assert(&baz, RA_RLOCKED); + rw_assert(&baz, RA_UNLOCKED); + rw_wunlock(&baz); + rw_destroy(&baz); +} +CRASH_EVENT("rwlock assertions that should faile", rw_assert_false); + +static void +rw_assert_true(void) +{ + + rw_init(&baz, "baz"); + rw_assert(&baz, RA_UNLOCKED); + rw_rlock(&baz); + rw_assert(&baz, RA_RLOCKED); + rw_assert(&baz, RA_LOCKED); + rw_runlock(&baz); + rw_wlock(&baz); + rw_assert(&baz, RA_WLOCKED); + rw_assert(&baz, RA_LOCKED); + rw_wunlock(&baz); + rw_destroy(&baz); + printf("Passed all tests\n"); +} +CRASH_EVENT("rwlock assertions that should pass", rw_assert_true); + +#ifdef WITNESS static void fault_with_lock(void) { From owner-p4-projects@FreeBSD.ORG Fri Feb 3 21:54:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AA5416A423; Fri, 3 Feb 2006 21:54:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9EC9216A422 for ; Fri, 3 Feb 2006 21:54:41 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2720243D48 for ; Fri, 3 Feb 2006 21:54:41 +0000 (GMT) (envelope-from kmacy@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 k13LsehZ042120 for ; Fri, 3 Feb 2006 21:54:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13Lse22042117 for perforce@freebsd.org; Fri, 3 Feb 2006 21:54:40 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 3 Feb 2006 21:54:40 GMT Message-Id: <200602032154.k13Lse22042117@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 21:54:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=91000 Change 91000 by kmacy@kmacy:freebsd7_xen3 on 2006/02/03 21:54:37 enable DDB - fix console compiler error always map a page table for the first 4MB of kernel so that pmap_growkernel doesn't get confused and set nkpt to 1 bump tmpindex when doing mapping so that we don't re-use said page table elsewhere only copy nkpt pages of page table in pmap_pinit to match native Affected files ... .. //depot/projects/xen3/src/sys/dev/xen/console/console.c#6 edit .. //depot/projects/xen3/src/sys/i386-xen/conf/XENCONF#6 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/pmap.c#4 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#12 edit Differences ... ==== //depot/projects/xen3/src/sys/dev/xen/console/console.c#6 (text+ko) ==== @@ -171,6 +171,7 @@ HYPERVISOR_console_io(CONSOLEIO_write, 1, (char *)&c); } +extern int db_active; static boolean_t xcons_putc(int c) { ==== //depot/projects/xen3/src/sys/i386-xen/conf/XENCONF#6 (text+ko) ==== @@ -142,7 +142,6 @@ # Be aware of the administrative consequences of enabling this! device bpf # Berkeley packet filter -#options BOOTP options XEN options XEN_PHYSDEV_ACCESS options XEN_PRIVILEGED_GUEST @@ -151,4 +150,4 @@ options DIAGNOSTIC options MAXMEM=(256*1024) #options NOXENDEBUG=1 # Turn off Debugging printfs - +options DDB ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/pmap.c#4 (text+ko) ==== @@ -289,7 +289,7 @@ #endif #ifdef XEN -static void pmap_copy_ma(vm_paddr_t src, vm_paddr_t dst); +static void pmap_copy_ma_range(vm_paddr_t src, vm_paddr_t dst, uint32_t soff, uint32_t eoff); void pd_set(struct pmap *pmap, vm_paddr_t *ptr, vm_paddr_t val, int type) @@ -1211,13 +1211,14 @@ /* XXX copies current process, does not fill in MPPTDI */ #ifdef XEN bcopy(kernel_pmap->pm_pdir + KPTDI, pmap->pm_pdir + KPTDI, - NKPDE * sizeof(pd_entry_t)); + nkpt * sizeof(pd_entry_t)); /* XXX need to copy global address entries to page directory's L1 shadow */ ma = xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[NPGPTD])); /* L1 pin shadow page director{y,ies} */ for (i = 0; i < NPGPTD; i++) { ma = xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[NPGPTD + i])); - pmap_copy_ma(kernel_pmap->pm_pdir[PTDPTDI + i] & ~(PG_RW|PG_M), ma); + pmap_copy_ma_range(kernel_pmap->pm_pdir[PTDPTDI + i] & ~(PG_RW|PG_M), ma, + KPTDI*sizeof(pd_entry_t), nkpt*sizeof(pd_entry_t)); xen_pt_pin(ma); } @@ -2791,7 +2792,7 @@ } void -pmap_copy_ma(vm_paddr_t src, vm_paddr_t dst) +pmap_copy_ma_range(vm_paddr_t src, vm_paddr_t dst, uint32_t soff, uint32_t len) { struct sysmaps *sysmaps; @@ -2810,7 +2811,7 @@ PT_SET_VA_MA(sysmaps->CMAP1, PG_V | src | PG_A, FALSE); PT_SET_VA_MA(sysmaps->CMAP2, PG_V | PG_RW | dst | PG_A | PG_M, TRUE); - bcopy(sysmaps->CADDR1, sysmaps->CADDR2, PAGE_SIZE); + bcopy(sysmaps->CADDR1 + soff, sysmaps->CADDR2 + soff, len); PT_CLEAR_VA(sysmaps->CMAP1, FALSE); PT_CLEAR_VA(sysmaps->CMAP2, TRUE); sched_unpin(); ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#12 (text+ko) ==== @@ -751,13 +751,15 @@ op.u.set_iopl.iopl = 1; PANIC_IF(HYPERVISOR_physdev_op(&op)); + /* add page table for KERNBASE */ + xen_queue_pt_update((vm_paddr_t)(IdlePTDma + KPTDI), + xpmap_ptom((tmpindex << PAGE_SHIFT)| PG_KERNEL)); + xen_queue_pt_update(pdir_shadow_ma + KPTDI*sizeof(vm_paddr_t), + xpmap_ptom((tmpindex << PAGE_SHIFT)| PG_V | PG_A)); + xen_flush_queue(); + tmpindex++; + if (xen_start_info->flags & SIF_INITDOMAIN) { - /* add page table for KERNBASE */ - xen_queue_pt_update((vm_paddr_t)(IdlePTDma + KPTDI), - xpmap_ptom((tmpindex << PAGE_SHIFT)| PG_KERNEL)); - xen_queue_pt_update(pdir_shadow_ma + KPTDI*sizeof(vm_paddr_t), - xpmap_ptom((tmpindex << PAGE_SHIFT)| PG_V | PG_A)); - xen_flush_queue(); /* Map first megabyte */ for (i = 0; i < (256 << PAGE_SHIFT); i += PAGE_SIZE) PT_SET_MA(KERNBASE + i, i | PG_KERNEL | PG_NC_PCD); From owner-p4-projects@FreeBSD.ORG Fri Feb 3 22:14:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 884FA16A423; Fri, 3 Feb 2006 22:14:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C3F716A420 for ; Fri, 3 Feb 2006 22:14:05 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D22D43D45 for ; Fri, 3 Feb 2006 22:14:05 +0000 (GMT) (envelope-from jhb@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 k13ME4VN042855 for ; Fri, 3 Feb 2006 22:14:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13ME43l042852 for perforce@freebsd.org; Fri, 3 Feb 2006 22:14:04 GMT (envelope-from jhb@freebsd.org) Date: Fri, 3 Feb 2006 22:14:04 GMT Message-Id: <200602032214.k13ME43l042852@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91001 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 22:14:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=91001 Change 91001 by jhb@jhb_twclab on 2006/02/03 22:14:01 More hacking. Affected files ... .. //depot/projects/smpng/sys/kern/subr_witness.c#151 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#151 (text+ko) ==== @@ -1880,6 +1880,7 @@ else { panic("Lock (%s) %s is not sleep or spin!", class->lc_name, lock->lo_name); + return; } file = fixup_filename(file); switch (flags) { From owner-p4-projects@FreeBSD.ORG Fri Feb 3 22:34:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B8D816A423; Fri, 3 Feb 2006 22:34:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1514916A420 for ; Fri, 3 Feb 2006 22:34:30 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D294B43D45 for ; Fri, 3 Feb 2006 22:34:29 +0000 (GMT) (envelope-from kmacy@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 k13MYTWv043800 for ; Fri, 3 Feb 2006 22:34:29 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13MYTQq043797 for perforce@freebsd.org; Fri, 3 Feb 2006 22:34:29 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 3 Feb 2006 22:34:29 GMT Message-Id: <200602032234.k13MYTQq043797@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91002 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 22:34:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=91002 Change 91002 by kmacy@kmacy:freebsd7_xen3 on 2006/02/03 22:34:10 pnp probing is VERY slow - disable under xen bios pnp needs extra segments - nix for now Affected files ... .. //depot/projects/xen3/src/sys/i386/i386/bios.c#4 edit .. //depot/projects/xen3/src/sys/isa/pnp.c#2 edit Differences ... ==== //depot/projects/xen3/src/sys/i386/i386/bios.c#4 (text+ko) ==== @@ -617,6 +617,9 @@ int idx, left; device_t dev; +#ifdef XEN + return; +#endif /* no PnP BIOS information */ if (pt == NULL) return; ==== //depot/projects/xen3/src/sys/isa/pnp.c#2 (text+ko) ==== @@ -792,7 +792,9 @@ pnp_identify(driver_t *driver, device_t parent) { int num_pnp_devs; - +#ifdef XEN + return; +#endif /* Try various READ_DATA ports from 0x203-0x3ff */ for (pnp_rd_port = 0x80; (pnp_rd_port < 0xff); pnp_rd_port += 0x10) { if (bootverbose) From owner-p4-projects@FreeBSD.ORG Fri Feb 3 23:10:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A8FC16A423; Fri, 3 Feb 2006 23:10:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E75816A420 for ; Fri, 3 Feb 2006 23:10:15 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B973A43D46 for ; Fri, 3 Feb 2006 23:10:14 +0000 (GMT) (envelope-from jhb@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 k13NAEku045533 for ; Fri, 3 Feb 2006 23:10:14 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13NAEAr045530 for perforce@freebsd.org; Fri, 3 Feb 2006 23:10:14 GMT (envelope-from jhb@freebsd.org) Date: Fri, 3 Feb 2006 23:10:14 GMT Message-Id: <200602032310.k13NAEAr045530@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 91004 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 23:10:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=91004 Change 91004 by jhb@jhb_twclab on 2006/02/03 23:09:54 Don't PHOLD() kthreads. It is redundant due to P_SYSTEM, and exit1() was hanging since there wasn't a corresponding PRELE(). Affected files ... .. //depot/projects/smpng/sys/kern/kern_kthread.c#16 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_kthread.c#16 (text+ko) ==== @@ -98,7 +98,6 @@ mtx_lock(&p2->p_sigacts->ps_mtx); p2->p_sigacts->ps_flag |= PS_NOCLDWAIT; mtx_unlock(&p2->p_sigacts->ps_mtx); - _PHOLD(p2); PROC_UNLOCK(p2); /* set up arg0 for 'ps', et al */ From owner-p4-projects@FreeBSD.ORG Fri Feb 3 23:48:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0417316A462; Fri, 3 Feb 2006 23:48:02 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C740A16A45B for ; Fri, 3 Feb 2006 23:48:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9080D43D46 for ; Fri, 3 Feb 2006 23:48:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k13Nm1Al047416 for ; Fri, 3 Feb 2006 23:48:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13Nm1qs047413 for perforce@freebsd.org; Fri, 3 Feb 2006 23:48:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Feb 2006 23:48:01 GMT Message-Id: <200602032348.k13Nm1qs047413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2006 23:48:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=91007 Change 91007 by rwatson@rwatson_peppercorn on 2006/02/03 23:47:45 Fix INVARIANTS build on amd64. Submitted by: mlaier Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#11 (text+ko) ==== @@ -710,9 +710,9 @@ * XXXAUDIT: Witness warning for possible sleep here? */ KASSERT((flag == ARG_UPATH1) || (flag == ARG_UPATH2), - ("audit_arg_upath: flag %llu", flag)); + ("audit_arg_upath: flag %llu", (unsigned long long)flag)); KASSERT((flag != ARG_UPATH1) || (flag != ARG_UPATH2), - ("audit_arg_upath: flag %llu", flag)); + ("audit_arg_upath: flag %llu", (unsigned long long)flag)); ar = currecord(); if (ar == NULL) From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:11:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7A5616A423; Sat, 4 Feb 2006 00:11:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 76FCB16A420 for ; Sat, 4 Feb 2006 00:11:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25CF343D45 for ; Sat, 4 Feb 2006 00:11:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k140BU5d049147 for ; Sat, 4 Feb 2006 00:11:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k140BT1R049144 for perforce@freebsd.org; Sat, 4 Feb 2006 00:11:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 00:11:29 GMT Message-Id: <200602040011.k140BT1R049144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91008 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 00:11:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=91008 Change 91008 by rwatson@rwatson_freefall on 2006/02/04 00:11:29 Before casting to an integer, first cast a pointer to (uintptr_t). That way the truncating cast occurs on a compatible type. We need to investigate if Solaris has 64-bit versions of the records that place pointers in tokens, and/or if they just use a 64-bit arg token instead here. That way we could avoid truncating the addresses. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#4 (text+ko) ==== @@ -694,7 +694,8 @@ kau_write(rec, tok); } if (ARG_IS_VALID(kar, ARG_ADDR)) { - tok = au_to_arg32(1, "arg", (u_int32_t)ar->ar_arg_addr); + tok = au_to_arg32(1, "arg", + (u_int32_t)(uintptr_t)ar->ar_arg_addr); kau_write(rec, tok); } if (ARG_IS_VALID(kar, ARG_VNODE1)) { @@ -743,7 +744,7 @@ case AUE_LOADSHFILE: if (ARG_IS_VALID(kar, ARG_ADDR)) { tok = au_to_arg32(4, "base addr", - (u_int32_t)ar->ar_arg_addr); + (u_int32_t)(uintptr_t)ar->ar_arg_addr); kau_write(rec, tok); } UPATH1_VNODE1_TOKENS; @@ -777,7 +778,7 @@ case AUE_MINHERIT: if (ARG_IS_VALID(kar, ARG_ADDR)) { tok = au_to_arg32(1, "addr", - (u_int32_t)ar->ar_arg_addr); + (u_int32_t)(uintptr_t)ar->ar_arg_addr); kau_write(rec, tok); } if (ARG_IS_VALID(kar, ARG_LEN)) { @@ -843,7 +844,7 @@ case AUE_RESETSHFILE: if (ARG_IS_VALID(kar, ARG_ADDR)) { tok = au_to_arg32(1, "base addr", - (u_int32_t)ar->ar_arg_addr); + (u_int32_t)(uintptr_t)ar->ar_arg_addr); kau_write(rec, tok); } break; @@ -881,7 +882,7 @@ } if (ARG_IS_VALID(kar, ARG_ADDR)) { tok = au_to_arg32(3, "addr", - (u_int32_t)ar->ar_arg_addr); + (u_int32_t)(uintptr_t)ar->ar_arg_addr); kau_write(rec, tok); } if (ARG_IS_VALID(kar, ARG_VALUE)) { @@ -1055,7 +1056,7 @@ } if (ARG_IS_VALID(kar, ARG_SVIPC_ADDR)) { tok = au_to_arg32(2, "shmaddr", - (int)ar->ar_arg_svipc_addr); + (int)(uintptr_t)ar->ar_arg_svipc_addr); kau_write(rec, tok); } if (ARG_IS_VALID(kar, ARG_SVIPC_PERM)) { @@ -1094,7 +1095,7 @@ case AUE_SHMDT: if (ARG_IS_VALID(kar, ARG_SVIPC_ADDR)) { tok = au_to_arg32(1, "shmaddr", - (int)ar->ar_arg_svipc_addr); + (int)(uintptr_t)ar->ar_arg_svipc_addr); kau_write(rec, tok); } break; From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:48:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4C3A16A423; Sat, 4 Feb 2006 00:48:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF21916A420 for ; Sat, 4 Feb 2006 00:48:21 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C06243D45 for ; Sat, 4 Feb 2006 00:48:21 +0000 (GMT) (envelope-from sam@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 k140mLtU058255 for ; Sat, 4 Feb 2006 00:48:21 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k140mLUX058252 for perforce@freebsd.org; Sat, 4 Feb 2006 00:48:21 GMT (envelope-from sam@freebsd.org) Date: Sat, 4 Feb 2006 00:48:21 GMT Message-Id: <200602040048.k140mLUX058252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 91012 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 00:48:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=91012 Change 91012 by sam@sam_ebb on 2006/02/04 00:47:20 honor active channel list when constructing scan set Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#9 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#9 (text+ko) ==== @@ -515,6 +515,11 @@ */ if (IEEE80211_IS_CHAN_DTURBO(c)) continue; + /* + * Skip channels not in the active list. + */ + if (isclr(ic->ic_chan_active, c->ic_ieee)) + continue; mode = ieee80211_chan2mode(c); if (ic->ic_des_mode != IEEE80211_MODE_AUTO) { /* From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:48:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CD6A16A427; Sat, 4 Feb 2006 00:48:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2360116A424 for ; Sat, 4 Feb 2006 00:48:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AD8943D48 for ; Sat, 4 Feb 2006 00:48:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k140mL6X058261 for ; Sat, 4 Feb 2006 00:48:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k140mLra058258 for perforce@freebsd.org; Sat, 4 Feb 2006 00:48:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 00:48:21 GMT Message-Id: <200602040048.k140mLra058258@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91013 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 00:48:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=91013 Change 91013 by rwatson@rwatson_peppercorn on 2006/02/04 00:47:21 Correct a spelling error in the freebsd32 audit event list, regenerate. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#9 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#9 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#9 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#10 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#9 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#9 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#9 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#10 (text+ko) ==== @@ -35,11 +35,11 @@ { SYF_MPSAFE | 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = syscall */ { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ { SYF_MPSAFE | 0, (sy_call_t *)fork, AUE_FORK }, /* 2 = fork */ - { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ + { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_READ }, /* 3 = read */ + { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_WRITE }, /* 4 = write */ { SYF_MPSAFE | AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC }, /* 5 = open */ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ - { SYF_MPSAFE | AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4, AUE_NULL }, /* 7 = freebsd32_wait4 */ + { SYF_MPSAFE | AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4, AUE_WAIT4 }, /* 7 = freebsd32_wait4 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = obsolete old creat */ { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_LINK }, /* 9 = link */ { SYF_MPSAFE | AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK }, /* 10 = unlink */ @@ -56,8 +56,8 @@ { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT }, /* 21 = mount */ { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT }, /* 22 = unmount */ { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_NULL }, /* 24 = getuid */ - { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_NULL }, /* 25 = geteuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ + { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 25 = geteuid */ { SYF_MPSAFE | AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE }, /* 26 = ptrace */ { SYF_MPSAFE | AS(freebsd32_recvmsg_args), (sy_call_t *)freebsd32_recvmsg, AUE_RECVMSG }, /* 27 = freebsd32_recvmsg */ { SYF_MPSAFE | AS(freebsd32_sendmsg_args), (sy_call_t *)freebsd32_sendmsg, AUE_SENDMSG }, /* 28 = freebsd32_sendmsg */ @@ -132,7 +132,7 @@ { SYF_MPSAFE | AS(socket_args), (sy_call_t *)socket, AUE_SOCKET }, /* 97 = socket */ { SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect, AUE_CONNECT }, /* 98 = connect */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 99 = obsolete oaccept */ - { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORIT }, /* 100 = getpriority */ + { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY }, /* 100 = getpriority */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 101 = obsolete osend */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 102 = obsolete orecv */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 103 = obsolete osigreturn */ @@ -150,7 +150,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = obsolete vtrace */ { SYF_MPSAFE | AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday, AUE_GETTIMEOFDAY }, /* 116 = freebsd32_gettimeofday */ { SYF_MPSAFE | AS(freebsd32_getrusage_args), (sy_call_t *)freebsd32_getrusage, AUE_GETRUSAGE }, /* 117 = freebsd32_getrusage */ - { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GTSOCKOPT }, /* 118 = getsockopt */ + { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = resuba */ { SYF_MPSAFE | AS(freebsd32_readv_args), (sy_call_t *)freebsd32_readv, AUE_READV }, /* 120 = freebsd32_readv */ { SYF_MPSAFE | AS(freebsd32_writev_args), (sy_call_t *)freebsd32_writev, AUE_WRITEV }, /* 121 = freebsd32_writev */ @@ -158,8 +158,8 @@ { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 125 = obsolete orecvfrom */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_O_SETREUID }, /* 126 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_O_SETREGID }, /* 127 = setregid */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ { SYF_MPSAFE | AS(rename_args), (sy_call_t *)rename, AUE_RENAME }, /* 128 = rename */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 129 = obsolete otruncate */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 130 = obsolete ftruncate */ @@ -265,7 +265,7 @@ { SYF_MPSAFE | AS(shmdt_args), (sy_call_t *)shmdt, AUE_SHMDT }, /* 230 = shmdt */ { SYF_MPSAFE | AS(shmget_args), (sy_call_t *)shmget, AUE_SHMGET }, /* 231 = shmget */ { SYF_MPSAFE | AS(freebsd32_clock_gettime_args), (sy_call_t *)freebsd32_clock_gettime, AUE_NULL }, /* 232 = freebsd32_clock_gettime */ - { SYF_MPSAFE | AS(freebsd32_clock_settime_args), (sy_call_t *)freebsd32_clock_settime, AUE_NULL }, /* 233 = freebsd32_clock_settime */ + { SYF_MPSAFE | AS(freebsd32_clock_settime_args), (sy_call_t *)freebsd32_clock_settime, AUE_CLOCK_SETTIME }, /* 233 = freebsd32_clock_settime */ { SYF_MPSAFE | AS(freebsd32_clock_getres_args), (sy_call_t *)freebsd32_clock_getres, AUE_NULL }, /* 234 = freebsd32_clock_getres */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 235 = timer_create */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 236 = timer_delete */ @@ -284,7 +284,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = nosys */ { SYF_MPSAFE | AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT }, /* 250 = minherit */ { SYF_MPSAFE | AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK }, /* 251 = rfork */ - { SYF_MPSAFE | AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_NULL }, /* 252 = openbsd_poll */ + { SYF_MPSAFE | AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL }, /* 252 = openbsd_poll */ { SYF_MPSAFE | 0, (sy_call_t *)issetugid, AUE_ISSETUGID }, /* 253 = issetugid */ { SYF_MPSAFE | AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN }, /* 254 = lchown */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 255 = nosys */ @@ -310,9 +310,9 @@ { SYF_MPSAFE | AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN }, /* 275 = netbsd_lchown */ { SYF_MPSAFE | AS(freebsd32_lutimes_args), (sy_call_t *)freebsd32_lutimes, AUE_LUTIMES }, /* 276 = freebsd32_lutimes */ { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_MSYNC }, /* 277 = netbsd_msync */ - { SYF_MPSAFE | AS(nstat_args), (sy_call_t *)nstat, AUE_NULL }, /* 278 = nstat */ - { SYF_MPSAFE | AS(nfstat_args), (sy_call_t *)nfstat, AUE_NULL }, /* 279 = nfstat */ - { SYF_MPSAFE | AS(nlstat_args), (sy_call_t *)nlstat, AUE_NULL }, /* 280 = nlstat */ + { SYF_MPSAFE | AS(nstat_args), (sy_call_t *)nstat, AUE_STAT }, /* 278 = nstat */ + { SYF_MPSAFE | AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT }, /* 279 = nfstat */ + { SYF_MPSAFE | AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT }, /* 280 = nlstat */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = nosys */ @@ -321,17 +321,17 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 286 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 287 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 288 = nosys */ - { SYF_MPSAFE | AS(freebsd32_preadv_args), (sy_call_t *)freebsd32_preadv, AUE_NULL }, /* 289 = freebsd32_preadv */ - { SYF_MPSAFE | AS(freebsd32_pwritev_args), (sy_call_t *)freebsd32_pwritev, AUE_NULL }, /* 290 = freebsd32_pwritev */ + { SYF_MPSAFE | AS(freebsd32_preadv_args), (sy_call_t *)freebsd32_preadv, AUE_PREADV }, /* 289 = freebsd32_preadv */ + { SYF_MPSAFE | AS(freebsd32_pwritev_args), (sy_call_t *)freebsd32_pwritev, AUE_PWRITEV }, /* 290 = freebsd32_pwritev */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 291 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 292 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 293 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = nosys */ - { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_fhstatfs_args),freebsd32_fhstatfs), AUE_NULL }, /* 297 = old freebsd32_fhstatfs */ - { SYF_MPSAFE | AS(fhopen_args), (sy_call_t *)fhopen, AUE_NULL }, /* 298 = fhopen */ - { SYF_MPSAFE | AS(fhstat_args), (sy_call_t *)fhstat, AUE_NULL }, /* 299 = fhstat */ + { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_fhstatfs_args),freebsd32_fhstatfs), AUE_FHSTATFS }, /* 297 = old freebsd32_fhstatfs */ + { SYF_MPSAFE | AS(fhopen_args), (sy_call_t *)fhopen, AUE_FHOPEN }, /* 298 = fhopen */ + { SYF_MPSAFE | AS(fhstat_args), (sy_call_t *)fhstat, AUE_FHSTAT }, /* 299 = fhstat */ { SYF_MPSAFE | AS(modnext_args), (sy_call_t *)modnext, AUE_NULL }, /* 300 = modnext */ { SYF_MPSAFE | AS(freebsd32_modstat_args), (sy_call_t *)freebsd32_modstat, AUE_NULL }, /* 301 = freebsd32_modstat */ { SYF_MPSAFE | AS(modfnext_args), (sy_call_t *)modfnext, AUE_NULL }, /* 302 = modfnext */ @@ -343,8 +343,8 @@ { SYF_MPSAFE | AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL }, /* 308 = kldstat */ { SYF_MPSAFE | AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL }, /* 309 = kldfirstmod */ { SYF_MPSAFE | AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID }, /* 310 = getsid */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 311 = setresuid */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_NULL }, /* 312 = setresgid */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 311 = setresuid */ + { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 312 = setresgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 313 = obsolete signanosleep */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 314 = aio_return */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 315 = aio_suspend */ @@ -368,7 +368,7 @@ { SYF_MPSAFE | AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL }, /* 333 = sched_get_priority_min */ { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 334 = sched_rr_get_interval */ { SYF_MPSAFE | AS(utrace_args), (sy_call_t *)utrace, AUE_NULL }, /* 335 = utrace */ - { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_NULL }, /* 336 = old freebsd32_sendfile */ + { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_SENDFILE }, /* 336 = old freebsd32_sendfile */ { SYF_MPSAFE | AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL }, /* 337 = kldsym */ { SYF_MPSAFE | AS(jail_args), (sy_call_t *)jail, AUE_NULL }, /* 338 = jail */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 339 = pioctl */ @@ -379,7 +379,7 @@ { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn), AUE_SIGRETURN }, /* 344 = old freebsd32_sigreturn */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 345 = sigtimedwait */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 346 = sigwaitinfo */ - { SYF_MPSAFE | AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL }, /* 347 = __acl_get_file */ + { SYF_MPSAFE | AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_JAIL }, /* 347 = __acl_get_file */ { SYF_MPSAFE | AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL }, /* 348 = __acl_set_file */ { SYF_MPSAFE | AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL }, /* 349 = __acl_get_fd */ { SYF_MPSAFE | AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL }, /* 350 = __acl_set_fd */ ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#11 (text+ko) ==== @@ -5,7 +5,7 @@ ; System call name/number master file. ; Processed to created init_sysent.c, syscalls.c and syscall.h. -; Columns: number [M]type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit [M]type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that @@ -54,16 +54,16 @@ 1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void 2 AUE_FORK MNOPROTO { int fork(void); } -3 AUE_NULL MNOPROTO { ssize_t read(int fd, void *buf, \ +3 AUE_READ MNOPROTO { ssize_t read(int fd, void *buf, \ size_t nbyte); } -4 AUE_NULL MNOPROTO { ssize_t write(int fd, const void *buf, \ +4 AUE_WRITE MNOPROTO { ssize_t write(int fd, const void *buf, \ size_t nbyte); } 5 AUE_OPEN_RWTC MNOPROTO { int open(char *path, int flags, \ int mode); } 6 AUE_CLOSE MNOPROTO { int close(int fd); } -7 AUE_NULL MSTD { int freebsd32_wait4(int pid, int *status, \ +7 AUE_WAIT4 MSTD { int freebsd32_wait4(int pid, int *status, \ int options, struct rusage32 *rusage); } -8 AUE_O_CREAT OBSOL old creat +8 AUE_CREAT OBSOL old creat 9 AUE_LINK MNOPROTO { int link(char *path, char *link); } 10 AUE_UNLINK MNOPROTO { int unlink(char *path); } 11 AUE_NULL OBSOL execv @@ -83,8 +83,8 @@ int flags, caddr_t data); } 22 AUE_UMOUNT NOPROTO { int unmount(char *path, int flags); } 23 AUE_SETUID MNOPROTO { int setuid(uid_t uid); } -24 AUE_NULL MNOPROTO { uid_t getuid(void); } -25 AUE_NULL MNOPROTO { uid_t geteuid(void); } +24 AUE_GETUID MNOPROTO { uid_t getuid(void); } +25 AUE_GETEUID MNOPROTO { uid_t geteuid(void); } 26 AUE_PTRACE MNOPROTO { int ptrace(int req, pid_t pid, \ caddr_t addr, int data); } ; XXX implement @@ -174,7 +174,7 @@ 83 AUE_SETITIMER MSTD { int freebsd32_setitimer(u_int which, \ struct itimerval32 *itv, \ struct itimerval32 *oitv); } -84 AUE_O_WAIT OBSOL owait +84 AUE_NULL OBSOL owait ; XXX implement 85 AUE_SWAPON OBSOL oswapon 86 AUE_GETITIMER MSTD { int freebsd32_getitimer(u_int which, \ @@ -197,11 +197,11 @@ int protocol); } 98 AUE_CONNECT MNOPROTO { int connect(int s, caddr_t name, \ int namelen); } -99 AUE_ACCEPT OBSOL oaccept -100 AUE_GETPRIORIT MNOPROTO { int getpriority(int which, int who); } -101 AUE_O_SEND OBSOL osend -102 AUE_O_RECV OBSOL orecv -103 AUE_SIGRETURN OBSOL osigreturn +99 AUE_NULL OBSOL oaccept +100 AUE_GETPRIORITY MNOPROTO { int getpriority(int which, int who); } +101 AUE_NULL OBSOL osend +102 AUE_NULL OBSOL orecv +103 AUE_NULL OBSOL osigreturn 104 AUE_BIND MNOPROTO { int bind(int s, caddr_t name, \ int namelen); } 105 AUE_SETSOCKOPT MNOPROTO { int setsockopt(int s, int level, \ @@ -217,15 +217,15 @@ 112 AUE_O_SIGSTACK MCOMPAT { int freebsd32_sigstack( \ struct sigstack32 *nss, \ struct sigstack32 *oss); } -113 AUE_O_RECVMSG OBSOL orecvmsg -114 AUE_O_SENDMSG OBSOL osendmsg +113 AUE_NULL OBSOL orecvmsg +114 AUE_NULL OBSOL osendmsg 115 AUE_NULL OBSOL vtrace 116 AUE_GETTIMEOFDAY MSTD { int freebsd32_gettimeofday( \ struct timeval32 *tp, \ struct timezone *tzp); } 117 AUE_GETRUSAGE MSTD { int freebsd32_getrusage(int who, \ struct rusage32 *rusage); } -118 AUE_GTSOCKOPT MNOPROTO { int getsockopt(int s, int level, \ +118 AUE_GETSOCKOPT MNOPROTO { int getsockopt(int s, int level, \ int name, caddr_t val, int *avalsize); } 119 AUE_NULL UNIMPL resuba (BSD/OS 2.x) 120 AUE_READV MSTD { int freebsd32_readv(int fd, \ @@ -238,11 +238,11 @@ 123 AUE_FCHOWN MNOPROTO { int fchown(int fd, int uid, int gid); } 124 AUE_FCHMOD MNOPROTO { int fchmod(int fd, int mode); } 125 AUE_RECVFROM OBSOL orecvfrom -126 AUE_O_SETREUID MNOPROTO { int setreuid(int ruid, int euid); } -127 AUE_O_SETREGID MNOPROTO { int setregid(int rgid, int egid); } +126 AUE_SETREUID MNOPROTO { int setreuid(int ruid, int euid); } +127 AUE_SETREGID MNOPROTO { int setregid(int rgid, int egid); } 128 AUE_RENAME MNOPROTO { int rename(char *from, char *to); } -129 AUE_O_TRUNCATE OBSOL otruncate -130 AUE_O_FTRUNCATE OBSOL ftruncate +129 AUE_NULL OBSOL otruncate +130 AUE_NULL OBSOL ftruncate 131 AUE_FLOCK MNOPROTO { int flock(int fd, int how); } 132 AUE_MKFIFO MNOPROTO { int mkfifo(char *path, int mode); } 133 AUE_SENDTO MNOPROTO { int sendto(int s, caddr_t buf, \ @@ -259,17 +259,17 @@ 140 AUE_ADJTIME MSTD { int freebsd32_adjtime( \ struct timeval32 *delta, \ struct timeval32 *olddelta); } -141 AUE_O_GETPEERNAME OBSOL ogetpeername -142 AUE_O_GETHOSTID OBSOL ogethostid -143 AUE_O_SETHOSTID OBSOL sethostid -144 AUE_O_GETRLIMIT OBSOL getrlimit -145 AUE_O_SETRLIMIT OBSOL setrlimit -146 AUE_O_KILLPG OBSOL killpg +141 AUE_NULL OBSOL ogetpeername +142 AUE_NULL OBSOL ogethostid +143 AUE_NULL OBSOL sethostid +144 AUE_NULL OBSOL getrlimit +145 AUE_NULL OBSOL setrlimit +146 AUE_NULL OBSOL killpg 147 AUE_SETSID MNOPROTO { int setsid(void); } 148 AUE_QUOTACTL MNOPROTO { int quotactl(char *path, int cmd, int uid, \ caddr_t arg); } -149 AUE_O_QUOTA OBSOL oquota -150 AUE_GETSOCKNAME OBSOL ogetsockname +149 AUE_NULL OBSOL oquota +150 AUE_NULL OBSOL ogetsockname ; Syscalls 151-180 inclusive are reserved for vendor-specific ; system calls. (This includes various calls added for compatibity @@ -282,7 +282,7 @@ ; 155 is initialized by the NFS code, if present. ; XXX this is a problem!!! 155 AUE_NFSSVC UNIMPL nfssvc -156 AUE_O_GETDIRENTRIES OBSOL ogetdirentries +156 AUE_NULL OBSOL ogetdirentries 157 AUE_STATFS MCOMPAT4 { int freebsd32_statfs(char *path, \ struct statfs32 *buf); } 158 AUE_FSTATFS MCOMPAT4 { int freebsd32_fstatfs(int fd, \ @@ -423,7 +423,7 @@ ; 232 AUE_NULL MSTD { int freebsd32_clock_gettime(clockid_t clock_id, \ struct timespec32 *tp); } -233 AUE_NULL MSTD { int freebsd32_clock_settime(clockid_t clock_id, \ +233 AUE_CLOCK_SETTIME MSTD { int freebsd32_clock_settime(clockid_t clock_id, \ const struct timespec32 *tp); } 234 AUE_NULL MSTD { int freebsd32_clock_getres(clockid_t clock_id, \ struct timespec32 *tp); } @@ -448,7 +448,7 @@ 250 AUE_MINHERIT MNOPROTO { int minherit(void *addr, size_t len, \ int inherit); } 251 AUE_RFORK MNOPROTO { int rfork(int flags); } -252 AUE_NULL MNOPROTO { int openbsd_poll(struct pollfd *fds, \ +252 AUE_POLL MNOPROTO { int openbsd_poll(struct pollfd *fds, \ u_int nfds, int timeout); } 253 AUE_ISSETUGID MNOPROTO { int issetugid(void); } 254 AUE_LCHOWN MNOPROTO { int lchown(char *path, int uid, int gid); } @@ -480,9 +480,9 @@ struct timeval32 *tptr); } 277 AUE_MSYNC MNOPROTO { int msync(void *addr, size_t len, \ int flags); } netbsd_msync msync_args int -278 AUE_NULL MNOPROTO { int nstat(char *path, struct nstat *ub); } -279 AUE_NULL MNOPROTO { int nfstat(int fd, struct nstat *sb); } -280 AUE_NULL MNOPROTO { int nlstat(char *path, struct nstat *ub); } +278 AUE_STAT MNOPROTO { int nstat(char *path, struct nstat *ub); } +279 AUE_FSTAT MNOPROTO { int nfstat(int fd, struct nstat *sb); } +280 AUE_LSTAT MNOPROTO { int nlstat(char *path, struct nstat *ub); } 281 AUE_NULL UNIMPL nosys 282 AUE_NULL UNIMPL nosys 283 AUE_NULL UNIMPL nosys @@ -492,11 +492,11 @@ 287 AUE_NULL UNIMPL nosys 288 AUE_NULL UNIMPL nosys ; 289 and 290 from NetBSD (OpenBSD: 267 and 268) -289 AUE_NULL MSTD { ssize_t freebsd32_preadv(int fd, \ +289 AUE_PREADV MSTD { ssize_t freebsd32_preadv(int fd, \ struct iovec32 *iovp, \ u_int iovcnt, off_t offset); } ; XXX note - bigendian is different -290 AUE_NULL MSTD { ssize_t freebsd32_pwritev(int fd, \ +290 AUE_PWRITEV MSTD { ssize_t freebsd32_pwritev(int fd, \ struct iovec32 *iovp, \ u_int iovcnt, off_t offset); } ; XXX note - bigendian is different @@ -507,12 +507,12 @@ 295 AUE_NULL UNIMPL nosys 296 AUE_NULL UNIMPL nosys ; XXX 297 is 300 in NetBSD -297 AUE_NULL MCOMPAT4 { int freebsd32_fhstatfs( \ +297 AUE_FHSTATFS MCOMPAT4 { int freebsd32_fhstatfs( \ const struct fhandle *u_fhp, \ struct statfs32 *buf); } -298 AUE_NULL MNOPROTO { int fhopen(const struct fhandle *u_fhp, \ +298 AUE_FHOPEN MNOPROTO { int fhopen(const struct fhandle *u_fhp, \ int flags); } -299 AUE_NULL MNOPROTO { int fhstat(const struct fhandle *u_fhp, \ +299 AUE_FHSTAT MNOPROTO { int fhstat(const struct fhandle *u_fhp, \ struct stat *sb); } ; syscall numbers for FreeBSD 300 AUE_NULL MNOPROTO { int modnext(int modid); } @@ -528,9 +528,9 @@ struct kld_file_stat* stat); } 309 AUE_NULL MNOPROTO { int kldfirstmod(int fileid); } 310 AUE_GETSID MNOPROTO { int getsid(pid_t pid); } -311 AUE_NULL MNOPROTO { int setresuid(uid_t ruid, uid_t euid, \ +311 AUE_SETRESUID MNOPROTO { int setresuid(uid_t ruid, uid_t euid, \ uid_t suid); } -312 AUE_NULL MNOPROTO { int setresgid(gid_t rgid, gid_t egid, \ +312 AUE_SETRESGID MNOPROTO { int setresgid(gid_t rgid, gid_t egid, \ gid_t sgid); } 313 AUE_NULL OBSOL signanosleep 314 AUE_NULL UNIMPL aio_return @@ -564,7 +564,7 @@ struct timespec *interval); } 335 AUE_NULL MNOPROTO { int utrace(const void *addr, size_t len); } ; XXX note - bigendian is different -336 AUE_NULL MCOMPAT4 { int freebsd32_sendfile(int fd, int s, \ +336 AUE_SENDFILE MCOMPAT4 { int freebsd32_sendfile(int fd, int s, \ u_int32_t offsetlo, u_int32_t offsethi, \ size_t nbytes, struct sf_hdtr *hdtr, \ off_t *sbytes, int flags); } @@ -585,7 +585,7 @@ 345 AUE_NULL UNIMPL sigtimedwait ; XXX implement 346 AUE_NULL UNIMPL sigwaitinfo -347 AUE_NULL MNOPROTO { int __acl_get_file(const char *path, \ +347 AUE_JAIL MNOPROTO { int __acl_get_file(const char *path, \ acl_type_t type, struct acl *aclp); } 348 AUE_NULL MNOPROTO { int __acl_set_file(const char *path, \ acl_type_t type, struct acl *aclp); } From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:48:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DBA816A474; Sat, 4 Feb 2006 00:48:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2965316A425 for ; Sat, 4 Feb 2006 00:48:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C5D043D4C for ; Sat, 4 Feb 2006 00:48:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k140mMCW058274 for ; Sat, 4 Feb 2006 00:48:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k140mMVU058271 for perforce@freebsd.org; Sat, 4 Feb 2006 00:48:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 00:48:22 GMT Message-Id: <200602040048.k140mMVU058271@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91015 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 00:48:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=91015 Change 91015 by rwatson@rwatson_peppercorn on 2006/02/04 00:48:17 Re-spell AUE_GETFH, now renamed. Regenerate. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#10 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#10 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#10 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#11 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#12 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#10 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#10 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#10 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#11 (text+ko) ==== @@ -193,7 +193,7 @@ { compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs), AUE_FSTATFS }, /* 158 = old freebsd32_fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 159 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 160 = nosys */ - { SYF_MPSAFE | AS(getfh_args), (sy_call_t *)getfh, AUE_GETFH }, /* 161 = getfh */ + { SYF_MPSAFE | AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH }, /* 161 = getfh */ { SYF_MPSAFE | AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_O_GETDOMAINNAME }, /* 162 = getdomainname */ { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_O_SETDOMAINNAME }, /* 163 = setdomainname */ { SYF_MPSAFE | AS(uname_args), (sy_call_t *)uname, AUE_NULL }, /* 164 = uname */ ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#12 (text+ko) ==== @@ -289,7 +289,7 @@ struct statfs32 *buf); } 159 AUE_NULL UNIMPL nosys 160 AUE_NULL UNIMPL nosys -161 AUE_GETFH MNOPROTO { int getfh(char *fname, \ +161 AUE_NFS_GETFH MNOPROTO { int getfh(char *fname, \ struct fhandle *fhp); } 162 AUE_O_GETDOMAINNAME MNOPROTO { int getdomainname(char *domainname, \ int len); } From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:48:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB35316A48F; Sat, 4 Feb 2006 00:48:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22EDB16A420 for ; Sat, 4 Feb 2006 00:48:23 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26B4D43D45 for ; Sat, 4 Feb 2006 00:48:22 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k140mLlI058268 for ; Sat, 4 Feb 2006 00:48:21 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k140mLkb058264 for perforce@freebsd.org; Sat, 4 Feb 2006 00:48:21 GMT (envelope-from wsalamon@computer.org) Date: Sat, 4 Feb 2006 00:48:21 GMT Message-Id: <200602040048.k140mLkb058264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 91014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 00:48:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=91014 Change 91014 by wsalamon@gretsch on 2006/02/04 00:47:28 Audit the nmount(2) system call. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#24 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#15 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#27 edit .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#8 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#5 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#15 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#16 edit .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#19 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#24 (text+ko) ==== @@ -407,7 +407,7 @@ { AS(nfsclnt_args), (sy_call_t *)nosys, AUE_NULL }, /* 375 = nfsclnt */ { SYF_MPSAFE | AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS }, /* 376 = eaccess */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 377 = afs_syscall */ - { AS(nmount_args), (sy_call_t *)nmount, AUE_NULL }, /* 378 = nmount */ + { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT }, /* 378 = nmount */ { SYF_MPSAFE | 0, (sy_call_t *)kse_exit, AUE_NULL }, /* 379 = kse_exit */ { SYF_MPSAFE | AS(kse_wakeup_args), (sy_call_t *)kse_wakeup, AUE_NULL }, /* 380 = kse_wakeup */ { SYF_MPSAFE | AS(kse_create_args), (sy_call_t *)kse_create, AUE_NULL }, /* 381 = kse_create */ ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#15 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#27 (text+ko) ==== @@ -662,7 +662,7 @@ 375 AUE_NULL NOIMPL { int nfsclnt(int flag, caddr_t argp); } 376 AUE_EACCESS MSTD { int eaccess(char *path, int flags); } 377 AUE_NULL UNIMPL afs_syscall -378 AUE_NULL STD { int nmount(struct iovec *iovp, \ +378 AUE_NMOUNT STD { int nmount(struct iovec *iovp, \ unsigned int iovcnt, int flags); } 379 AUE_NULL MSTD { int kse_exit(void); } 380 AUE_NULL MSTD { int kse_wakeup(struct kse_mailbox *mbx); } ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#8 (text+ko) ==== @@ -373,9 +373,6 @@ int error; u_int iovcnt; - /* XXXAUDIT Audit is not complete for nmount() yet; need to create - * a new audit event. - */ AUDIT_ARG(fflags, uap->flags); /* Kick out MNT_ROOTFS early as it is legal internally */ @@ -394,6 +391,7 @@ if (error) return (error); iov = auio->uio_iov; + AUDIT_ARG(iovec, iov, iovcnt); for (i = 0; i < iovcnt; i++) { if (iov->iov_len > MMAXOPTIONLEN) { free(auio, M_IOV); ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#5 (text+ko) ==== @@ -818,6 +818,18 @@ UPATH1_VNODE1_TOKENS; break; + case AUE_NMOUNT: + if (ARG_IS_VALID(kar, ARG_FFLAGS)) { + tok = au_to_arg32(3, "flags", ar->ar_arg_fflags); + kau_write(rec, tok); + } + if (ARG_IS_VALID(kar, ARG_IOVECSTR)) { + tok = au_to_text(ar->ar_arg_iovecstr); + kau_write(rec, tok); + } + UPATH1_VNODE1_TOKENS; + break; + case AUE_MSGCTL: ar->ar_event = msgctl_to_event(ar->ar_arg_svipc_cmd); /* Fall through */ ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#15 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#16 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#19 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:50:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E389C16A423; Sat, 4 Feb 2006 00:50:25 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A33D16A420 for ; Sat, 4 Feb 2006 00:50:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56B8043D6B for ; Sat, 4 Feb 2006 00:50:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k140oPUB058596 for ; Sat, 4 Feb 2006 00:50:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k140oP5G058593 for perforce@freebsd.org; Sat, 4 Feb 2006 00:50:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 00:50:25 GMT Message-Id: <200602040050.k140oP5G058593@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 00:50:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=91016 Change 91016 by rwatson@rwatson_peppercorn on 2006/02/04 00:49:25 Dummy names for AUE_PREADV and AUE_PWRITEV. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#32 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#32 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#31 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#32 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -493,6 +493,8 @@ #define AUE_MUNLOCKALL AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL +#define AUE_PREADV AUE_NULL +#define AUE_PWRITEV AUE_NULL #define AUE_SBRK AUE_NULL #define AUE_SELECT AUE_NULL #define AUE_SEMDESTROY AUE_NULL From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:51:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A832616A423; Sat, 4 Feb 2006 00:51:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C6C716A420 for ; Sat, 4 Feb 2006 00:51:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D7E043D45 for ; Sat, 4 Feb 2006 00:51:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k140pRGj058647 for ; Sat, 4 Feb 2006 00:51:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k140pQNY058644 for perforce@freebsd.org; Sat, 4 Feb 2006 00:51:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 00:51:26 GMT Message-Id: <200602040051.k140pQNY058644@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 00:51:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=91017 Change 91017 by rwatson@rwatson_peppercorn on 2006/02/04 00:50:42 Merge man page fixes, removal of tfm class, additional audit event types for FreeBSD (etc) from TrustedBSD OpenBSM branch to TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#15 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#4 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#15 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#14 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#15 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -358,7 +358,33 @@ #define AUE_KQUEUE 377 /* FreeBSD-specific. */ #define AUE_KEVENT 378 /* FreeBSD-specific. */ #define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD-specific. */ +#define AUE_NMOUNT 380 /* FreeBSD-specific. */ +#define AUE_BDFLUSH 381 /* Linux-specific. */ +#define AUE_SETFSUID 382 /* Linux-specific. */ +#define AUE_GETFSUID 383 /* Linux-specific. */ +#define AUE_PERSONALITY 384 /* Linux-specific. */ +#define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ +#define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ +#define AUE_PRCTL 387 /* Linux-specific. */ +#define AUE_GETCWD 388 /* FreeBSD/Linux-specific. */ +#define AUE_CAPGET 389 /* Linux-specific. */ +#define AUE_CAPSET 390 /* Linux-specific. */ +#define AUE_PIVOT_ROOT 391 /* Linux-specific. */ +#define AUE_RTPRIO 392 /* FreeBSD-specific. */ +#define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ +#define AUE_SCHED_GETPARAM 394 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ +#define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ +#define AUE_ACL_GET_FILE 398 /* FreeBSD. */ +#define AUE_ACL_SET_FILE 399 /* FreeBSD. */ +#define AUE_ACL_GET_FD 400 /* FreeBSD. */ +#define AUE_ACL_SET_FD 401 /* FreeBSD. */ +#define AUE_ACL_DELETE_FILE 402 /* FreeBSD. */ +#define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ +#define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ +#define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ + /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -467,6 +493,8 @@ #define AUE_MUNLOCKALL AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL +#define AUE_PREADV AUE_NULL +#define AUE_PWRITEV AUE_NULL #define AUE_SBRK AUE_NULL #define AUE_SELECT AUE_NULL #define AUE_SEMDESTROY AUE_NULL ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#4 $ # # This file must match audit.h # @@ -17,7 +17,6 @@ 0x00000400:na:non attributable 0x00000800:ad:administrative 0x00001000:lo:login_logout -0x00002000:tf:tfm 0x00004000:ap:application 0x20000000:io:ioctl 0x40000000:ex:exec ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#4 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 @@ -304,7 +304,8 @@ .It Li "Terminal Machine Address" Ta "4 bytes" Ta "IP address of machine" .El .Ss Expanded Process Token -The .Dv expanded process +The +.Dv expanded process token contains the contents of the .Dv process token, with the addition of a machine address type and variable length @@ -411,7 +412,8 @@ .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.It Li "object ID type" Ta "1 byte" Ta "Object ID" +.It Li "Object ID" Ta "4 bytes" Ta "Object ID" .El .Ss Text Token The @@ -591,6 +593,7 @@ .It Li XXXXX .El .Sh SEE ALSO +.Xr audit 8, .Xr libbsm 3 .Sh AUTHORS The Basic Security Module (BSM) interface to audit records and audit event From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:52:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B092816A423; Sat, 4 Feb 2006 00:52:29 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7057316A420 for ; Sat, 4 Feb 2006 00:52:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC59843D45 for ; Sat, 4 Feb 2006 00:52:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k140qSht058738 for ; Sat, 4 Feb 2006 00:52:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k140qSs5058735 for perforce@freebsd.org; Sat, 4 Feb 2006 00:52:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 00:52:28 GMT Message-Id: <200602040052.k140qSs5058735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91018 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 00:52:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=91018 Change 91018 by rwatson@rwatson_peppercorn on 2006/02/04 00:51:42 Integrate new OpenBSM event identifiers from contrib/openbsm/bsm in audit3 to sys/bsm. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#16 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#16 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#15 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#16 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -358,7 +358,33 @@ #define AUE_KQUEUE 377 /* FreeBSD-specific. */ #define AUE_KEVENT 378 /* FreeBSD-specific. */ #define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD-specific. */ +#define AUE_NMOUNT 380 /* FreeBSD-specific. */ +#define AUE_BDFLUSH 381 /* Linux-specific. */ +#define AUE_SETFSUID 382 /* Linux-specific. */ +#define AUE_GETFSUID 383 /* Linux-specific. */ +#define AUE_PERSONALITY 384 /* Linux-specific. */ +#define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ +#define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ +#define AUE_PRCTL 387 /* Linux-specific. */ +#define AUE_GETCWD 388 /* FreeBSD/Linux-specific. */ +#define AUE_CAPGET 389 /* Linux-specific. */ +#define AUE_CAPSET 390 /* Linux-specific. */ +#define AUE_PIVOT_ROOT 391 /* Linux-specific. */ +#define AUE_RTPRIO 392 /* FreeBSD-specific. */ +#define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ +#define AUE_SCHED_GETPARAM 394 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ +#define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ +#define AUE_ACL_GET_FILE 398 /* FreeBSD. */ +#define AUE_ACL_SET_FILE 399 /* FreeBSD. */ +#define AUE_ACL_GET_FD 400 /* FreeBSD. */ +#define AUE_ACL_SET_FD 401 /* FreeBSD. */ +#define AUE_ACL_DELETE_FILE 402 /* FreeBSD. */ +#define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ +#define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ +#define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ + /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -467,6 +493,8 @@ #define AUE_MUNLOCKALL AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL +#define AUE_PREADV AUE_NULL +#define AUE_PWRITEV AUE_NULL #define AUE_SBRK AUE_NULL #define AUE_SELECT AUE_NULL #define AUE_SEMDESTROY AUE_NULL From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:53:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28D5C16A423; Sat, 4 Feb 2006 00:53:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF92D16A420 for ; Sat, 4 Feb 2006 00:53:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC47743D46 for ; Sat, 4 Feb 2006 00:53:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k140rUce058814 for ; Sat, 4 Feb 2006 00:53:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k140rURi058811 for perforce@freebsd.org; Sat, 4 Feb 2006 00:53:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 00:53:30 GMT Message-Id: <200602040053.k140rURi058811@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 00:53:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=91019 Change 91019 by rwatson@rwatson_peppercorn on 2006/02/04 00:52:38 Fix typo in naming of audit event -- SET, not a second GET. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#33 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#33 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#32 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#33 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -372,7 +372,7 @@ #define AUE_PIVOT_ROOT 391 /* Linux-specific. */ #define AUE_RTPRIO 392 /* FreeBSD-specific. */ #define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ -#define AUE_SCHED_GETPARAM 394 /* POSIX.1b. */ +#define AUE_SCHED_SETPARAM 394 /* POSIX.1b. */ #define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ #define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ #define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:53:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97FEC16A42A; Sat, 4 Feb 2006 00:53:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40FEE16A427 for ; Sat, 4 Feb 2006 00:53:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0693243D46 for ; Sat, 4 Feb 2006 00:53:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k140rUIa058820 for ; Sat, 4 Feb 2006 00:53:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k140rUYs058817 for perforce@freebsd.org; Sat, 4 Feb 2006 00:53:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 00:53:30 GMT Message-Id: <200602040053.k140rUYs058817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91020 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 00:53:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=91020 Change 91020 by rwatson@rwatson_peppercorn on 2006/02/04 00:53:08 Merge event fix from OpenBSM branch to audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#16 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#16 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#15 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#16 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -372,7 +372,7 @@ #define AUE_PIVOT_ROOT 391 /* Linux-specific. */ #define AUE_RTPRIO 392 /* FreeBSD-specific. */ #define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ -#define AUE_SCHED_GETPARAM 394 /* POSIX.1b. */ +#define AUE_SCHED_SETPARAM 394 /* POSIX.1b. */ #define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ #define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ #define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:54:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3732016A423; Sat, 4 Feb 2006 00:54:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC32716A420 for ; Sat, 4 Feb 2006 00:54:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B838F43D46 for ; Sat, 4 Feb 2006 00:54:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k140sWvS058996 for ; Sat, 4 Feb 2006 00:54:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k140sWx8058993 for perforce@freebsd.org; Sat, 4 Feb 2006 00:54:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 00:54:32 GMT Message-Id: <200602040054.k140sWx8058993@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 00:54:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=91021 Change 91021 by rwatson@rwatson_peppercorn on 2006/02/04 00:53:39 Merge audit event name fix from audit3 contrib/openbsm/bsm to sys/bsm. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#17 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#17 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#16 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#17 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -372,7 +372,7 @@ #define AUE_PIVOT_ROOT 391 /* Linux-specific. */ #define AUE_RTPRIO 392 /* FreeBSD-specific. */ #define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ -#define AUE_SCHED_GETPARAM 394 /* POSIX.1b. */ +#define AUE_SCHED_SETPARAM 394 /* POSIX.1b. */ #define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ #define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ #define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:57:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8006B16A423; Sat, 4 Feb 2006 00:57:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4317D16A420 for ; Sat, 4 Feb 2006 00:57:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E91F943D46 for ; Sat, 4 Feb 2006 00:57:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k140vaXt059163 for ; Sat, 4 Feb 2006 00:57:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k140vamQ059160 for perforce@freebsd.org; Sat, 4 Feb 2006 00:57:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 00:57:36 GMT Message-Id: <200602040057.k140vamQ059160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91022 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 00:57:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=91022 Change 91022 by rwatson@rwatson_peppercorn on 2006/02/04 00:56:42 Correct spelling of audit event identifier. Regenerate. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#11 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#11 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#11 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#12 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#11 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#11 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#11 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#12 (text+ko) ==== @@ -337,7 +337,7 @@ { SYF_MPSAFE | AS(modfnext_args), (sy_call_t *)modfnext, AUE_NULL }, /* 302 = modfnext */ { SYF_MPSAFE | AS(modfind_args), (sy_call_t *)modfind, AUE_NULL }, /* 303 = modfind */ { SYF_MPSAFE | AS(kldload_args), (sy_call_t *)kldload, AUE_MODLOAD }, /* 304 = kldload */ - { SYF_MPSAFE | AS(kldunload_args), (sy_call_t *)kldunload, AUE_UNMODLOAD }, /* 305 = kldunload */ + { SYF_MPSAFE | AS(kldunload_args), (sy_call_t *)kldunload, AUE_MODUNLOAD }, /* 305 = kldunload */ { SYF_MPSAFE | AS(kldfind_args), (sy_call_t *)kldfind, AUE_NULL }, /* 306 = kldfind */ { SYF_MPSAFE | AS(kldnext_args), (sy_call_t *)kldnext, AUE_NULL }, /* 307 = kldnext */ { SYF_MPSAFE | AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL }, /* 308 = kldstat */ ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#13 (text+ko) ==== @@ -521,7 +521,7 @@ 302 AUE_NULL MNOPROTO { int modfnext(int modid); } 303 AUE_NULL MNOPROTO { int modfind(const char *name); } 304 AUE_MODLOAD MNOPROTO { int kldload(const char *file); } -305 AUE_UNMODLOAD MNOPROTO { int kldunload(int fileid); } +305 AUE_MODUNLOAD MNOPROTO { int kldunload(int fileid); } 306 AUE_NULL MNOPROTO { int kldfind(const char *file); } 307 AUE_NULL MNOPROTO { int kldnext(int fileid); } 308 AUE_NULL MNOPROTO { int kldstat(int fileid, \ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:58:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5396116A423; Sat, 4 Feb 2006 00:58:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1439116A420 for ; Sat, 4 Feb 2006 00:58:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B910E43D48 for ; Sat, 4 Feb 2006 00:58:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k140wcer059281 for ; Sat, 4 Feb 2006 00:58:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k140wcnc059278 for perforce@freebsd.org; Sat, 4 Feb 2006 00:58:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 00:58:38 GMT Message-Id: <200602040058.k140wcnc059278@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91023 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 00:58:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=91023 Change 91023 by rwatson@rwatson_peppercorn on 2006/02/04 00:57:53 Respell another audit event identifier. Regenerate. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#12 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#12 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#12 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#13 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#14 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#12 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#12 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#12 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#13 (text+ko) ==== @@ -429,7 +429,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 394 = mac_syscall */ { SYF_MPSAFE | AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT }, /* 395 = getfsstat */ { SYF_MPSAFE | AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS }, /* 396 = statfs */ - { SYF_MPSAFE | AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSSTATFS }, /* 397 = fstatfs */ + { SYF_MPSAFE | AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS }, /* 397 = fstatfs */ { SYF_MPSAFE | AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_NULL }, /* 398 = fhstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 399 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 400 = ksem_close */ ==== //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#14 (text+ko) ==== @@ -673,7 +673,7 @@ long bufsize, int flags); } 396 AUE_STATFS MNOPROTO { int statfs(char *path, \ struct statfs *buf); } -397 AUE_FSSTATFS MNOPROTO { int fstatfs(int fd, struct statfs *buf); } +397 AUE_FSTATFS MNOPROTO { int fstatfs(int fd, struct statfs *buf); } 398 AUE_NULL MNOPROTO { int fhstatfs(const struct fhandle *u_fhp, \ struct statfs *buf); } 399 AUE_NULL UNIMPL nosys From owner-p4-projects@FreeBSD.ORG Sat Feb 4 02:42:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A058A16A423; Sat, 4 Feb 2006 02:42:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6582616A420 for ; Sat, 4 Feb 2006 02:42:45 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B17E43D53 for ; Sat, 4 Feb 2006 02:42:44 +0000 (GMT) (envelope-from cognet@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 k142giZV063341 for ; Sat, 4 Feb 2006 02:42:44 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k142giNw063338 for perforce@freebsd.org; Sat, 4 Feb 2006 02:42:44 GMT (envelope-from cognet@freebsd.org) Date: Sat, 4 Feb 2006 02:42:44 GMT Message-Id: <200602040242.k142giNw063338@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 91025 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 02:42:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=91025 Change 91025 by cognet@cognet on 2006/02/04 02:42:20 Use m_defrag to make sure we only have one mbuf. Enable RX and TX interrupts. TX seems to work, RX not yet, it doesn't even generate an interrupt when it receives a packet. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#24 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#24 (text+ko) ==== @@ -434,7 +434,7 @@ /* * The KB920x boot loader tests ETH_SR & ETH_SR_LINK and will ask * the MII if there's a link if this bit is clear. Not sure if we - * should do the same thing ehre or not. + * should do the same thing here or not. */ ATE_ASSERT_LOCKED(sc); if (sc->miibus != NULL) { @@ -528,6 +528,7 @@ status = RD4(sc, ETH_ISR); if (status == 0) return; + printf("IT IS %x\n", RD4(sc, ETH_RSR)); if (status & ETH_ISR_RCOM) { bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_POSTREAD); @@ -538,6 +539,7 @@ int rx_stat = sc->rx_descs[i].status; int nsegs; + printf("GOT ONE\n"); bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_POSTREAD); bus_dmamap_unload(sc->rxtag, @@ -601,6 +603,11 @@ sc->txcur = 0; } } + if (status & ETH_ISR_RBNA) { + /* Workaround Errata #11 */ + WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) &~ ETH_CTL_RE); + WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) | ETH_CTL_RE); + } } /* @@ -635,6 +642,8 @@ #endif WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) | ETH_CTL_TE | ETH_CTL_RE); + WR4(sc, ETH_IER, /*ETH_ISR_RCOM | ETH_ISR_TCOM | ETH_ISR_RBNA*/ + 0xffffffff); /* * Boot loader fills in MAC address. If that's not the case, then @@ -644,8 +653,6 @@ */ /* XXX need to setup multicast filters */ - /* XXX need to setup rx buffers and assoc structures */ - /* XXX need to enable appropriate interrupt masks */ /* * Set 'running' flag, and clear output active flag @@ -665,7 +672,7 @@ atestart_locked(struct ifnet *ifp) { struct ate_softc *sc = ifp->if_softc; - struct mbuf *m; + struct mbuf *m, *mdefrag; bus_dma_segment_t segs[1]; int nseg; @@ -694,8 +701,13 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; return; } + mdefrag = m_defrag(m, M_DONTWAIT); + if (mdefrag == NULL) { + m_freem(m); + return; + } + m = mdefrag; - m = m_pullup(m, m_length(m, NULL)); if (bus_dmamap_load_mbuf_sg(sc->mtag, sc->tx_map[sc->txcur], m, segs, &nseg, 0) != 0) { m_free(m); From owner-p4-projects@FreeBSD.ORG Sat Feb 4 08:48:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F06BB16A423; Sat, 4 Feb 2006 08:48:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB31416A420 for ; Sat, 4 Feb 2006 08:48:16 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EF8F43D48 for ; Sat, 4 Feb 2006 08:48:16 +0000 (GMT) (envelope-from imp@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 k148mG4S092834 for ; Sat, 4 Feb 2006 08:48:16 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k148mGe8092825 for perforce@freebsd.org; Sat, 4 Feb 2006 08:48:16 GMT (envelope-from imp@freebsd.org) Date: Sat, 4 Feb 2006 08:48:16 GMT Message-Id: <200602040848.k148mGe8092825@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91040 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 08:48:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=91040 Change 91040 by imp@imp_hammer on 2006/02/04 08:46:55 first cut at multicast support. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#25 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#25 (text+ko) ==== @@ -24,11 +24,11 @@ /* TODO: (in no order) * + * 5) Setup RX buffers in ateinit_locked + * * 1) detach * 2) Free dma setup * 3) Turn on the clock in pmc and turn on pins? Turn off? - * 4) Setup multicast filters - * 5) Setup RX buffers in ateinit_locked * 6) Interrupt bits as appropriate * 7) Keep track of the mbufs in flight on TX and free them in the ISR. * 8) Need to sync busdma goo in atestop @@ -241,6 +241,36 @@ sc->rx_desc_phys = segs[0].ds_addr; } +/* + * Compute the multicast filter for this device using the standard + * algorithm. I wonder why this isn't in ether somewhere as a lot + * of different MAC chips use this method (or the reverse the bits) + * method. + */ +static void +ate_setmcaf(struct ate_softc *sc) +{ + uint32_t index; + uint32_t mcaf[2]; + u_char *af = (u_char *) mcaf; + struct ifmultiaddr *ifma; + + mcaf[0] = 0; + mcaf[1] = 0; + + IF_ADDR_LOCK(sc->ifp); + TAILQ_FOREACH(ifma, &sc->ifp->if_multiaddrs, ifma_link) { + if (ifma->ifma_addr->sa_family != AF_LINK) + continue; + index = ether_crc32_be(LLADDR((struct sockaddr_dl *) + ifma->ifma_addr), ETHER_ADDR_LEN) >> 26; + af[index >> 3] |= 1 << (index & 7); + } + IF_ADDR_UNLOCK(sc->ifp); + WR4(sc, ETH_HSL, mcaf[0]); + WR4(sc, ETH_HSH, mcaf[1]); +} + static int ate_activate(device_t dev) { @@ -303,8 +333,8 @@ &sc->rx_desc_map) != 0) goto errout; if (bus_dmamap_load(sc->rx_desc_tag, sc->rx_desc_map, - sc->rx_descs, ATE_MAX_RX_BUFFERS * sizeof(eth_rx_desc_t), ate_getaddr, - sc, 0) != 0) + sc->rx_descs, ATE_MAX_RX_BUFFERS * sizeof(eth_rx_desc_t), + ate_getaddr, sc, 0) != 0) goto errout; for (i = 0; i < ATE_MAX_RX_BUFFERS; i++) { bus_dma_segment_t seg; @@ -640,6 +670,12 @@ #else WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_RMII); #endif + /* + * Turn on the multicast hash, and write 0's to it. + */ + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_MTI); + WR4(sc, ETH_HSH, 0); + WR4(sc, ETH_HSL, 0); WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) | ETH_CTL_TE | ETH_CTL_RE); WR4(sc, ETH_IER, /*ETH_ISR_RCOM | ETH_ISR_TCOM | ETH_ISR_RBNA*/ @@ -681,11 +717,6 @@ return; outloop: - /* XXX ed checks to see if there are buffered packets and an idle - * transmitter and kicks something if so. This shouldn't happen - * for this device, and I note it here only in passing - */ - /* * check to see if there's room to put another packet into the * xmit queue. The EMAC chip has a ping-pong buffer for xmit @@ -846,19 +877,7 @@ ATE_UNLOCK(sc); break; -#ifdef notyet - case SIOCGHWADDR: - bcopy((caddr_t) sc->sc_addr, (caddr_t) & ifr->ifr_data, - sizeof(sc->sc_addr)); - break; - case SIOCADDMULTI: - /* update multicast filter list. */ - ATE_LOCK(sc); - ate_setmcast(sc); - error = 0; - ATE_UNLOCK(sc); - break; case SIOCDELMULTI: /* update multicast filter list. */ ATE_LOCK(sc); @@ -866,9 +885,8 @@ error = 0; ATE_UNLOCK(sc); break; -#endif + default: - error = EINVAL; error = ether_ioctl(ifp, cmd, data); break; } From owner-p4-projects@FreeBSD.ORG Sat Feb 4 09:03:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94A0016A423; Sat, 4 Feb 2006 09:03:48 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A84516A420 for ; Sat, 4 Feb 2006 09:03:48 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3395143D45 for ; Sat, 4 Feb 2006 09:03:48 +0000 (GMT) (envelope-from imp@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 k1493l8j093405 for ; Sat, 4 Feb 2006 09:03:47 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1493lFu093402 for perforce@freebsd.org; Sat, 4 Feb 2006 09:03:47 GMT (envelope-from imp@freebsd.org) Date: Sat, 4 Feb 2006 09:03:47 GMT Message-Id: <200602040903.k1493lFu093402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91042 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 09:03:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=91042 Change 91042 by imp@imp_plunger on 2006/02/04 09:02:46 Fix spelling error Move locking to avoid nesting the locking and to give the locking a smaller scope. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#26 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#26 (text+ko) ==== @@ -248,7 +248,7 @@ * method. */ static void -ate_setmcaf(struct ate_softc *sc) +ate_setmcast(struct ate_softc *sc) { uint32_t index; uint32_t mcaf[2]; @@ -267,8 +267,18 @@ af[index >> 3] |= 1 << (index & 7); } IF_ADDR_UNLOCK(sc->ifp); + + /* + * Write the hash to the hash register. This card can also + * accept unicast packets as well as multicast packets using this + * register for easier bridging operations, but we don't take + * advantage of that. Locks here are to avoid LOR with the + * IF_ADDR_LOCK, but might not be strictly necessary. + */ + ATE_LOCK(sc); WR4(sc, ETH_HSL, mcaf[0]); WR4(sc, ETH_HSH, mcaf[1]); + ATE_UNLOCK(sc); } static int @@ -880,10 +890,8 @@ case SIOCADDMULTI: case SIOCDELMULTI: /* update multicast filter list. */ - ATE_LOCK(sc); ate_setmcast(sc); error = 0; - ATE_UNLOCK(sc); break; default: From owner-p4-projects@FreeBSD.ORG Sat Feb 4 12:43:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 599EA16A423; Sat, 4 Feb 2006 12:43:25 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 059E716A420 for ; Sat, 4 Feb 2006 12:43:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0E7243D49 for ; Sat, 4 Feb 2006 12:43:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14ChNNM003307 for ; Sat, 4 Feb 2006 12:43:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14ChNAE003304 for perforce@freebsd.org; Sat, 4 Feb 2006 12:43:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 12:43:23 GMT Message-Id: <200602041243.k14ChNAE003304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91047 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 12:43:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=91047 Change 91047 by rwatson@rwatson_peppercorn on 2006/02/04 12:42:21 Update comment. Regenerate. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#25 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#16 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#28 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#16 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#17 edit .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#20 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#25 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#16 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#28 (text+ko) ==== @@ -4,7 +4,7 @@ ; System call name/number master file. ; Processed to created init_sysent.c, syscalls.c and syscall.h. -; Columns: number [M]type name audit alt{name,tag,rtyp}/comments +; Columns: number audit [M]type name audit alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#16 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#17 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#20 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Feb 4 12:53:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 542D616A425; Sat, 4 Feb 2006 12:53:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D851216A422 for ; Sat, 4 Feb 2006 12:53:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3B2743D5F for ; Sat, 4 Feb 2006 12:53:40 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14CreTx011089 for ; Sat, 4 Feb 2006 12:53:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14Crecf011086 for perforce@freebsd.org; Sat, 4 Feb 2006 12:53:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 12:53:40 GMT Message-Id: <200602041253.k14Crecf011086@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91049 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 12:53:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=91049 Change 91049 by rwatson@rwatson_peppercorn on 2006/02/04 12:53:12 When GC'ing a thread, assert that it has no active audit record. This should not happen, but with this assert, brueffer and I would not have spent 45 minutes trying to figure out why he wasn't seeing audit records with the audit version in CVS. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#6 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#5 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#6 (text+ko) ==== @@ -172,7 +172,9 @@ /* NOTREACHED */ } #endif - +#ifdef AUDIT + audit_thread_free(td); +#endif free_unr(tid_unrhdr, td->td_tid); sched_newthread(td); } ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#5 (text+ko) ==== @@ -1026,6 +1026,16 @@ td->td_ar = NULL; } +/* + * Thread destruction. + */ +void +audit_thread_free(struct thread *td) +{ + + KASSERT(td->td_ar == NULL, ("audit_thread_free: td_ar != NULL")); +} + /* * Initialize the audit information for the a process, presumably the first * process in the system. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#10 (text+ko) ==== @@ -182,6 +182,7 @@ struct proc *child); void audit_proc_free(struct proc *p); void audit_thread_alloc(struct thread *td); +void audit_thread_free(struct thread *td); /* * Define a macro to wrap the audit_arg_* calls by checking the global From owner-p4-projects@FreeBSD.ORG Sat Feb 4 13:03:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED5D616A423; Sat, 4 Feb 2006 13:03:53 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9514516A420 for ; Sat, 4 Feb 2006 13:03:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DE0843D46 for ; Sat, 4 Feb 2006 13:03:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14D3rjh011582 for ; Sat, 4 Feb 2006 13:03:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14D3rTO011579 for perforce@freebsd.org; Sat, 4 Feb 2006 13:03:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 13:03:53 GMT Message-Id: <200602041303.k14D3rTO011579@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91050 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 13:03:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=91050 Change 91050 by rwatson@rwatson_peppercorn on 2006/02/04 13:03:35 Minor white space changes. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#34 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#34 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#33 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#34 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -45,7 +45,6 @@ * been inserted for the Darwin variants. If necessary, other tags will be * added in the future. */ - #define AUE_NULL 0 #define AUE_EXIT 1 #define AUE_FORK 2 @@ -385,7 +384,6 @@ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ - /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the * normal Solaris BSM identifiers. _O_ refers to it being an old, or compat From owner-p4-projects@FreeBSD.ORG Sat Feb 4 13:09:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E110F16A423; Sat, 4 Feb 2006 13:09:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D21916A420 for ; Sat, 4 Feb 2006 13:09:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 45D3A43D4C for ; Sat, 4 Feb 2006 13:09:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14D90ta011834 for ; Sat, 4 Feb 2006 13:09:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14D8xRv011831 for perforce@freebsd.org; Sat, 4 Feb 2006 13:08:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 13:08:59 GMT Message-Id: <200602041308.k14D8xRv011831@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91051 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 13:09:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=91051 Change 91051 by rwatson@rwatson_fledge on 2006/02/04 13:08:47 Add AUE_O_GETDIRENTRIES definition used by Darwin. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#35 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#35 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#34 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#35 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -428,6 +428,7 @@ #define AUE_O_RECVFROM AUE_RECVFROM /* Darwin */ #define AUE_O_SETREUID AUE_SETREUID /* Darwin */ #define AUE_O_SETREGID AUE_SETREGID /* Darwin */ +#define AUE_O_GETDIRENTRIES AUE_GETDIRENTRIES /* Darwin */ #define AUE_O_TRUNCATE AUE_TRUNCATE /* Darwin */ #define AUE_O_FTRUNCATE AUE_FTRUNCATE /* Darwin */ #define AUE_O_GETPEERNAME AUE_NULL /* Darwin */ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 13:10:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F05DD16A423; Sat, 4 Feb 2006 13:10:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B109316A420 for ; Sat, 4 Feb 2006 13:10:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F21743D5A for ; Sat, 4 Feb 2006 13:10:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14DA1iS011937 for ; Sat, 4 Feb 2006 13:10:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14DA17m011934 for perforce@freebsd.org; Sat, 4 Feb 2006 13:10:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 13:10:01 GMT Message-Id: <200602041310.k14DA17m011934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91052 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 13:10:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=91052 Change 91052 by rwatson@rwatson_peppercorn on 2006/02/04 13:09:13 OpenBSM alpha 2 information. Affected files ... .. //depot/projects/trustedbsd/openbsm/CHANGELOG#7 edit .. //depot/projects/trustedbsd/openbsm/VERSION#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/CHANGELOG#7 (text+ko) ==== @@ -1,4 +1,11 @@ -OpenBSM 1.0 +OpenBSM 1.0 alpha 2 + +- Man page formatting improvements. +- A number of new audit event identifiers for FreeBSD, Linux, and POSIX.1b + events. +- Remove 'tfm' class, unused in OpenBSM. + +OpenBSM 1.0 alpha 1 - Import of Darwin74 BSM drop - Use 'syslog' for audit log warnings, rather than echoing to a file in @@ -65,4 +72,4 @@ - auditd(8), audit(8) added to the OpenBSM distribution. auditd extended to support reloading of kernel event table. -$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#6 $ +$P4: //depot/projects/trustedbsd/openbsm/CHANGELOG#7 $ ==== //depot/projects/trustedbsd/openbsm/VERSION#5 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_1 +OPENBSM_1_0_ALPHA_2 From owner-p4-projects@FreeBSD.ORG Sat Feb 4 13:12:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36E7716A423; Sat, 4 Feb 2006 13:12:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D876016A420 for ; Sat, 4 Feb 2006 13:12:05 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83CF343D48 for ; Sat, 4 Feb 2006 13:12:05 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14DC5tH012077 for ; Sat, 4 Feb 2006 13:12:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14DC5Gs012074 for perforce@freebsd.org; Sat, 4 Feb 2006 13:12:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 13:12:05 GMT Message-Id: <200602041312.k14DC5Gs012074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91053 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 13:12:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=91053 Change 91053 by rwatson@rwatson_peppercorn on 2006/02/04 13:11:58 Integrate final changes for OpenBSM 1.0 alpha 2 into audit3 branch; most alpha 2 changes were already integrated. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#17 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#5 (text+ko) ==== @@ -1,4 +1,11 @@ -OpenBSM 1.0 +OpenBSM 1.0 alpha 2 + +- Man page formatting improvements. +- A number of new audit event identifiers for FreeBSD, Linux, and POSIX.1b + events. +- Remove 'tfm' class, unused in OpenBSM. + +OpenBSM 1.0 alpha 1 - Import of Darwin74 BSM drop - Use 'syslog' for audit log warnings, rather than echoing to a file in @@ -65,4 +72,4 @@ - auditd(8), audit(8) added to the OpenBSM distribution. auditd extended to support reloading of kernel event table. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#4 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#5 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#3 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_1 +OPENBSM_1_0_ALPHA_2 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#17 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#16 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#17 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -45,7 +45,6 @@ * been inserted for the Darwin variants. If necessary, other tags will be * added in the future. */ - #define AUE_NULL 0 #define AUE_EXIT 1 #define AUE_FORK 2 @@ -385,7 +384,6 @@ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ - /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the * normal Solaris BSM identifiers. _O_ refers to it being an old, or compat @@ -430,6 +428,7 @@ #define AUE_O_RECVFROM AUE_RECVFROM /* Darwin */ #define AUE_O_SETREUID AUE_SETREUID /* Darwin */ #define AUE_O_SETREGID AUE_SETREGID /* Darwin */ +#define AUE_O_GETDIRENTRIES AUE_GETDIRENTRIES /* Darwin */ #define AUE_O_TRUNCATE AUE_TRUNCATE /* Darwin */ #define AUE_O_FTRUNCATE AUE_FTRUNCATE /* Darwin */ #define AUE_O_GETPEERNAME AUE_NULL /* Darwin */ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 13:14:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13FD616A423; Sat, 4 Feb 2006 13:14:09 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB54416A420 for ; Sat, 4 Feb 2006 13:14:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8116743D46 for ; Sat, 4 Feb 2006 13:14:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14DE8Kj012230 for ; Sat, 4 Feb 2006 13:14:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14DE88B012227 for perforce@freebsd.org; Sat, 4 Feb 2006 13:14:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 13:14:08 GMT Message-Id: <200602041314.k14DE88B012227@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 13:14:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=91054 Change 91054 by rwatson@rwatson_peppercorn on 2006/02/04 13:13:23 Integrate final bsm/* include file changes for OpenBSM 1.0 alpha 2 from contrib/openbsm/bsm to src/sys/bsm. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#18 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#18 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#17 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#18 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -45,7 +45,6 @@ * been inserted for the Darwin variants. If necessary, other tags will be * added in the future. */ - #define AUE_NULL 0 #define AUE_EXIT 1 #define AUE_FORK 2 @@ -385,7 +384,6 @@ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ - /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the * normal Solaris BSM identifiers. _O_ refers to it being an old, or compat @@ -430,6 +428,7 @@ #define AUE_O_RECVFROM AUE_RECVFROM /* Darwin */ #define AUE_O_SETREUID AUE_SETREUID /* Darwin */ #define AUE_O_SETREGID AUE_SETREGID /* Darwin */ +#define AUE_O_GETDIRENTRIES AUE_GETDIRENTRIES /* Darwin */ #define AUE_O_TRUNCATE AUE_TRUNCATE /* Darwin */ #define AUE_O_FTRUNCATE AUE_FTRUNCATE /* Darwin */ #define AUE_O_GETPEERNAME AUE_NULL /* Darwin */ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 13:43:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9044F16A423; Sat, 4 Feb 2006 13:43:51 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F96C16A422 for ; Sat, 4 Feb 2006 13:43:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD3EE43D45 for ; Sat, 4 Feb 2006 13:43:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14DhogY014012 for ; Sat, 4 Feb 2006 13:43:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14Dhoaa014009 for perforce@freebsd.org; Sat, 4 Feb 2006 13:43:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 13:43:50 GMT Message-Id: <200602041343.k14Dhoaa014009@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 13:43:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=91059 Change 91059 by rwatson@rwatson_peppercorn on 2006/02/04 13:43:31 Further tweaks to main system call audit events: - Prefer AUE_FOO over AUE_O_FOO. - Use AUE_SYSCTL instead of AUE_O_FOO for system calls now implemented as wrappers around sysctl. - Mark as AUE_NULL calls that we probably won't implement auditing for, and where the AUE_FOO define is to AUE_NULL. - Use correct spelling for AUE_GETSOCKOPT rather than compatibility spelling for Darwin. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#26 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#17 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#29 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#26 (text+ko) ==== @@ -113,11 +113,11 @@ { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 81 = getpgrp */ { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 82 = setpgid */ { SYF_MPSAFE | AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER }, /* 83 = setitimer */ - { compat(SYF_MPSAFE | 0,wait), AUE_O_WAIT }, /* 84 = old wait */ + { compat(SYF_MPSAFE | 0,wait), AUE_WAIT4 }, /* 84 = old wait */ { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 85 = swapon */ { SYF_MPSAFE | AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER }, /* 86 = getitimer */ - { compat(SYF_MPSAFE | AS(gethostname_args),gethostname), AUE_O_GETHOSTNAME }, /* 87 = old gethostname */ - { compat(SYF_MPSAFE | AS(sethostname_args),sethostname), AUE_O_SETHOSTNAME }, /* 88 = old sethostname */ + { compat(SYF_MPSAFE | AS(gethostname_args),gethostname), AUE_SYSCTL }, /* 87 = old gethostname */ + { compat(SYF_MPSAFE | AS(sethostname_args),sethostname), AUE_SYSCTL }, /* 88 = old sethostname */ { SYF_MPSAFE | 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE }, /* 89 = getdtablesize */ { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 91 = getdopt */ @@ -130,24 +130,24 @@ { SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect, AUE_CONNECT }, /* 98 = connect */ { compat(SYF_MPSAFE | AS(accept_args),accept), AUE_ACCEPT }, /* 99 = old accept */ { SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY }, /* 100 = getpriority */ - { compat(SYF_MPSAFE | AS(osend_args),send), AUE_O_SEND }, /* 101 = old send */ - { compat(SYF_MPSAFE | AS(orecv_args),recv), AUE_O_RECV }, /* 102 = old recv */ + { compat(SYF_MPSAFE | AS(osend_args),send), AUE_SEND }, /* 101 = old send */ + { compat(SYF_MPSAFE | AS(orecv_args),recv), AUE_RECV }, /* 102 = old recv */ { compat(SYF_MPSAFE | AS(osigreturn_args),sigreturn), AUE_SIGRETURN }, /* 103 = old sigreturn */ { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_LISTEN }, /* 106 = listen */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = obsolete vtimes */ - { compat(SYF_MPSAFE | AS(osigvec_args),sigvec), AUE_O_SIGVEC }, /* 108 = old sigvec */ - { compat(SYF_MPSAFE | AS(osigblock_args),sigblock), AUE_O_SIGBLOCK }, /* 109 = old sigblock */ - { compat(SYF_MPSAFE | AS(osigsetmask_args),sigsetmask), AUE_O_SIGSETMASK }, /* 110 = old sigsetmask */ - { compat(SYF_MPSAFE | AS(osigsuspend_args),sigsuspend), AUE_SIGSUSPEND }, /* 111 = old sigsuspend */ - { compat(SYF_MPSAFE | AS(osigstack_args),sigstack), AUE_O_SIGSTACK }, /* 112 = old sigstack */ - { compat(SYF_MPSAFE | AS(orecvmsg_args),recvmsg), AUE_O_RECVMSG }, /* 113 = old recvmsg */ - { compat(SYF_MPSAFE | AS(osendmsg_args),sendmsg), AUE_O_SENDMSG }, /* 114 = old sendmsg */ + { compat(SYF_MPSAFE | AS(osigvec_args),sigvec), AUE_NULL }, /* 108 = old sigvec */ + { compat(SYF_MPSAFE | AS(osigblock_args),sigblock), AUE_NULL }, /* 109 = old sigblock */ + { compat(SYF_MPSAFE | AS(osigsetmask_args),sigsetmask), AUE_NULL }, /* 110 = old sigsetmask */ + { compat(SYF_MPSAFE | AS(osigsuspend_args),sigsuspend), AUE_NULL }, /* 111 = old sigsuspend */ + { compat(SYF_MPSAFE | AS(osigstack_args),sigstack), AUE_NULL }, /* 112 = old sigstack */ + { compat(SYF_MPSAFE | AS(orecvmsg_args),recvmsg), AUE_RECVMSG }, /* 113 = old recvmsg */ + { compat(SYF_MPSAFE | AS(osendmsg_args),sendmsg), AUE_SENDMSG }, /* 114 = old sendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = obsolete vtrace */ { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTIMEOFDAY }, /* 116 = gettimeofday */ { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE }, /* 117 = getrusage */ - { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GTSOCKOPT }, /* 118 = getsockopt */ + { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = resuba */ { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_READV }, /* 120 = readv */ { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_WRITEV }, /* 121 = writev */ @@ -158,8 +158,8 @@ { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ { SYF_MPSAFE | AS(rename_args), (sy_call_t *)rename, AUE_RENAME }, /* 128 = rename */ - { compat(SYF_MPSAFE | AS(otruncate_args),truncate), AUE_O_TRUNCATE }, /* 129 = old truncate */ - { compat(SYF_MPSAFE | AS(oftruncate_args),ftruncate), AUE_O_FTRUNCATE }, /* 130 = old ftruncate */ + { compat(SYF_MPSAFE | AS(otruncate_args),truncate), AUE_TRUNCATE }, /* 129 = old truncate */ + { compat(SYF_MPSAFE | AS(oftruncate_args),ftruncate), AUE_FTRUNCATE }, /* 130 = old ftruncate */ { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ { SYF_MPSAFE | AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO }, /* 132 = mkfifo */ { SYF_MPSAFE | AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO }, /* 133 = sendto */ @@ -170,12 +170,12 @@ { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = obsolete 4.2 sigreturn */ { SYF_MPSAFE | AS(adjtime_args), (sy_call_t *)adjtime, AUE_ADJTIME }, /* 140 = adjtime */ - { compat(SYF_MPSAFE | AS(ogetpeername_args),getpeername), AUE_O_GETPEERNAME }, /* 141 = old getpeername */ - { compat(SYF_MPSAFE | 0,gethostid), AUE_O_GETHOSTID }, /* 142 = old gethostid */ - { compat(SYF_MPSAFE | AS(osethostid_args),sethostid), AUE_O_SETHOSTID }, /* 143 = old sethostid */ - { compat(SYF_MPSAFE | AS(ogetrlimit_args),getrlimit), AUE_O_GETRLIMIT }, /* 144 = old getrlimit */ - { compat(SYF_MPSAFE | AS(osetrlimit_args),setrlimit), AUE_O_SETRLIMIT }, /* 145 = old setrlimit */ - { compat(SYF_MPSAFE | AS(okillpg_args),killpg), AUE_O_KILLPG }, /* 146 = old killpg */ + { compat(SYF_MPSAFE | AS(ogetpeername_args),getpeername), AUE_GETPEERNAME }, /* 141 = old getpeername */ + { compat(SYF_MPSAFE | 0,gethostid), AUE_SYSCTL }, /* 142 = old gethostid */ + { compat(SYF_MPSAFE | AS(osethostid_args),sethostid), AUE_SYSCTL }, /* 143 = old sethostid */ + { compat(SYF_MPSAFE | AS(ogetrlimit_args),getrlimit), AUE_GETRLIMIT }, /* 144 = old getrlimit */ + { compat(SYF_MPSAFE | AS(osetrlimit_args),setrlimit), AUE_SETRLIMIT }, /* 145 = old setrlimit */ + { compat(SYF_MPSAFE | AS(okillpg_args),killpg), AUE_KILLPG }, /* 146 = old killpg */ { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ { SYF_MPSAFE | AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL }, /* 148 = quotactl */ { compat(SYF_MPSAFE | 0,quota), AUE_O_QUOTA }, /* 149 = old quota */ ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#17 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#29 (text+ko) ==== @@ -184,14 +184,14 @@ 82 AUE_SETPGRP MSTD { int setpgid(int pid, int pgid); } 83 AUE_SETITIMER MSTD { int setitimer(u_int which, struct \ itimerval *itv, struct itimerval *oitv); } -84 AUE_O_WAIT MCOMPAT { int wait(void); } +84 AUE_WAIT4 MCOMPAT { int wait(void); } 85 AUE_SWAPON MSTD { int swapon(char *name); } 86 AUE_GETITIMER MSTD { int getitimer(u_int which, \ struct itimerval *itv); } -87 AUE_O_GETHOSTNAME MCOMPAT { int gethostname(char *hostname, \ +87 AUE_SYSCTL MCOMPAT { int gethostname(char *hostname, \ u_int len); } gethostname \ gethostname_args int -88 AUE_O_SETHOSTNAME MCOMPAT { int sethostname(char *hostname, \ +88 AUE_SYSCTL MCOMPAT { int sethostname(char *hostname, \ u_int len); } sethostname \ sethostname_args int 89 AUE_GETDTABLESIZE MSTD { int getdtablesize(void); } @@ -213,9 +213,9 @@ 99 AUE_ACCEPT MCPT_NOA { int accept(int s, caddr_t name, \ int *anamelen); } accept accept_args int 100 AUE_GETPRIORITY MSTD { int getpriority(int which, int who); } -101 AUE_O_SEND MCOMPAT { int send(int s, caddr_t buf, int len, \ +101 AUE_SEND MCOMPAT { int send(int s, caddr_t buf, int len, \ int flags); } -102 AUE_O_RECV MCOMPAT { int recv(int s, caddr_t buf, int len, \ +102 AUE_RECV MCOMPAT { int recv(int s, caddr_t buf, int len, \ int flags); } 103 AUE_SIGRETURN MCOMPAT { int sigreturn( \ struct osigcontext *sigcntxp); } @@ -225,25 +225,25 @@ caddr_t val, int valsize); } 106 AUE_LISTEN MSTD { int listen(int s, int backlog); } 107 AUE_NULL OBSOL vtimes -108 AUE_O_SIGVEC MCOMPAT { int sigvec(int signum, struct sigvec *nsv, \ +108 AUE_NULL MCOMPAT { int sigvec(int signum, struct sigvec *nsv, \ struct sigvec *osv); } -109 AUE_O_SIGBLOCK MCOMPAT { int sigblock(int mask); } -110 AUE_O_SIGSETMASK MCOMPAT { int sigsetmask(int mask); } -111 AUE_SIGSUSPEND MCOMPAT { int sigsuspend(osigset_t mask); } +109 AUE_NULL MCOMPAT { int sigblock(int mask); } +110 AUE_NULL MCOMPAT { int sigsetmask(int mask); } +111 AUE_NULL MCOMPAT { int sigsuspend(osigset_t mask); } ; XXX note nonstandard (bogus) calling convention - the libc stub passes ; us the mask, not a pointer to it. -112 AUE_O_SIGSTACK MCOMPAT { int sigstack(struct sigstack *nss, \ +112 AUE_NULL MCOMPAT { int sigstack(struct sigstack *nss, \ struct sigstack *oss); } -113 AUE_O_RECVMSG MCOMPAT { int recvmsg(int s, struct omsghdr *msg, \ +113 AUE_RECVMSG MCOMPAT { int recvmsg(int s, struct omsghdr *msg, \ int flags); } -114 AUE_O_SENDMSG MCOMPAT { int sendmsg(int s, caddr_t msg, \ +114 AUE_SENDMSG MCOMPAT { int sendmsg(int s, caddr_t msg, \ int flags); } 115 AUE_NULL OBSOL vtrace 116 AUE_GETTIMEOFDAY MSTD { int gettimeofday(struct timeval *tp, \ struct timezone *tzp); } 117 AUE_GETRUSAGE MSTD { int getrusage(int who, \ struct rusage *rusage); } -118 AUE_GTSOCKOPT MSTD { int getsockopt(int s, int level, int name, \ +118 AUE_GETSOCKOPT MSTD { int getsockopt(int s, int level, int name, \ caddr_t val, int *avalsize); } 119 AUE_NULL UNIMPL resuba (BSD/OS 2.x) 120 AUE_READV MSTD { int readv(int fd, struct iovec *iovp, \ @@ -261,8 +261,8 @@ 126 AUE_SETREUID MSTD { int setreuid(int ruid, int euid); } 127 AUE_SETREGID MSTD { int setregid(int rgid, int egid); } 128 AUE_RENAME MSTD { int rename(char *from, char *to); } -129 AUE_O_TRUNCATE MCOMPAT { int truncate(char *path, long length); } -130 AUE_O_FTRUNCATE MCOMPAT { int ftruncate(int fd, long length); } +129 AUE_TRUNCATE MCOMPAT { int truncate(char *path, long length); } +130 AUE_FTRUNCATE MCOMPAT { int ftruncate(int fd, long length); } 131 AUE_FLOCK MSTD { int flock(int fd, int how); } 132 AUE_MKFIFO MSTD { int mkfifo(char *path, int mode); } 133 AUE_SENDTO MSTD { int sendto(int s, caddr_t buf, size_t len, \ @@ -277,15 +277,15 @@ 139 AUE_NULL OBSOL 4.2 sigreturn 140 AUE_ADJTIME MSTD { int adjtime(struct timeval *delta, \ struct timeval *olddelta); } -141 AUE_O_GETPEERNAME MCOMPAT { int getpeername(int fdes, caddr_t asa, \ +141 AUE_GETPEERNAME MCOMPAT { int getpeername(int fdes, caddr_t asa, \ int *alen); } -142 AUE_O_GETHOSTID MCOMPAT { long gethostid(void); } -143 AUE_O_SETHOSTID MCOMPAT { int sethostid(long hostid); } -144 AUE_O_GETRLIMIT MCOMPAT { int getrlimit(u_int which, struct \ +142 AUE_SYSCTL MCOMPAT { long gethostid(void); } +143 AUE_SYSCTL MCOMPAT { int sethostid(long hostid); } +144 AUE_GETRLIMIT MCOMPAT { int getrlimit(u_int which, struct \ orlimit *rlp); } -145 AUE_O_SETRLIMIT MCOMPAT { int setrlimit(u_int which, \ +145 AUE_SETRLIMIT MCOMPAT { int setrlimit(u_int which, \ struct orlimit *rlp); } -146 AUE_O_KILLPG MCOMPAT { int killpg(int pgid, int signum); } +146 AUE_KILLPG MCOMPAT { int killpg(int pgid, int signum); } 147 AUE_SETSID MSTD { int setsid(void); } 148 AUE_QUOTACTL MSTD { int quotactl(char *path, int cmd, int uid, \ caddr_t arg); } From owner-p4-projects@FreeBSD.ORG Sat Feb 4 13:56:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1884E16A423; Sat, 4 Feb 2006 13:56:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C81EF16A420 for ; Sat, 4 Feb 2006 13:56:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71B4443D46 for ; Sat, 4 Feb 2006 13:56:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14Du6nc014494 for ; Sat, 4 Feb 2006 13:56:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14Du6Ml014491 for perforce@freebsd.org; Sat, 4 Feb 2006 13:56:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 13:56:06 GMT Message-Id: <200602041356.k14Du6Ml014491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 13:56:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=91060 Change 91060 by rwatson@rwatson_freefall on 2006/02/04 13:55:32 Update alpha linux system call to audit event mapping: - Fix some spelling errors. - Where event identifiers now exist (OpenBSM 1.0 alpha 2), assign them. - Remove references to some event identifiers that have values of AUE_NULL and are unlikely to be audited. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_proto.h#7 edit .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_syscall.h#7 edit .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_sysent.c#7 edit .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/syscalls.master#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_proto.h#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_syscall.h#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_sysent.c#7 (text+ko) ==== @@ -107,8 +107,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = osf_getitimer */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_O_GETHOSTNAME }, /* 87 = linux_gethostname */ - { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_O_SETHOSTNAME }, /* 88 = osethostname */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_SYSCTL }, /* 87 = linux_gethostname */ + { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_SYSCTL }, /* 88 = osethostname */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_GETDTABLESIZE }, /* 89 = linux_getdtablesize */ { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 91 = linux_newfstat */ @@ -123,7 +123,7 @@ { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 100 = linux_getpriority */ { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_SEND }, /* 101 = osend */ { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_RECV }, /* 102 = orecv */ - { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_SIGRETURN }, /* 103 = osf1_sigreturn */ + { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_NULL }, /* 103 = osf1_sigreturn */ { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_LISTEN }, /* 106 = listen */ @@ -131,12 +131,12 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 108 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 109 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = */ - { SYF_MPSAFE | AS(osf1_sigsuspend_args), (sy_call_t *)osf1_sigsuspend, AUE_SIGSUSPEND }, /* 111 = osf1_sigsuspend */ + { SYF_MPSAFE | AS(osf1_sigsuspend_args), (sy_call_t *)osf1_sigsuspend, AUE_NULL }, /* 111 = osf1_sigsuspend */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = osf_sigstack */ { SYF_MPSAFE | 0, (sy_call_t *)linux_recvmsg, AUE_RECVMSG }, /* 113 = linux_recvmsg */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sendmsg, AUE_SENDMSG }, /* 114 = linux_sendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = */ - { SYF_MPSAFE | AS(osf1_gettimeofday_args), (sy_call_t *)osf1_gettimeofday, AUE_GETTIMEOFDAY }, /* 116 = osf1_gettimeofday */ + { SYF_MPSAFE | AS(osf1_gettimeofday_args), (sy_call_t *)osf1_gettimeofday, AUE_NULL }, /* 116 = osf1_gettimeofday */ { SYF_MPSAFE | AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_GETRUSAGE }, /* 117 = osf1_getrusage */ { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = */ @@ -176,7 +176,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 155 = */ - { SYF_MPSAFE | AS(osf1_sigaction_args), (sy_call_t *)osf1_sigaction, AUE_SIGCTION }, /* 156 = osf1_sigaction */ + { SYF_MPSAFE | AS(osf1_sigaction_args), (sy_call_t *)osf1_sigaction, AUE_NULL }, /* 156 = osf1_sigaction */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 157 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 158 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 159 = osf_getdirentries */ @@ -186,7 +186,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 163 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 164 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 165 = osf_getdomainname */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_O_GETDOMAINNAME }, /* 166 = setdomainname */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 166 = setdomainname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 167 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 168 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 169 = */ @@ -255,7 +255,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 232 = */ { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPPID }, /* 233 = getpgid */ { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 234 = linux_getsid */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sigaltstack, AUE_SIGALTSTACK }, /* 235 = linux_sigaltstack */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 235 = linux_sigaltstack */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 236 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 237 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 238 = */ @@ -320,7 +320,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 300 = linux_bdflush */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 300 = linux_bdflush */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sethae, AUE_NULL }, /* 301 = linux_sethae */ { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 302 = linux_mount */ { SYF_MPSAFE | 0, (sy_call_t *)linux_old_adjtimex, AUE_ADJTIME }, /* 303 = linux_old_adjtimex */ @@ -344,20 +344,20 @@ { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 321 = linux_oldumount */ { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 322 = swapon */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 323 = linux_times */ - { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_NULL }, /* 324 = linux_personality */ - { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_NULL }, /* 325 = linux_setfsuid */ - { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_NULL }, /* 326 = linux_setfsgid */ + { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 324 = linux_personality */ + { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 325 = linux_setfsuid */ + { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_GETFSUID }, /* 326 = linux_setfsgid */ { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 327 = linux_ustat */ { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 328 = linux_statfs */ { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 329 = linux_fstatfs */ - { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 330 = sched_setparam */ - { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 331 = sched_getparam */ - { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_NULL }, /* 332 = linux_sched_setscheduler */ - { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_NULL }, /* 333 = linux_sched_getscheduler */ + { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 330 = sched_setparam */ + { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 331 = sched_getparam */ + { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 332 = linux_sched_setscheduler */ + { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 333 = linux_sched_getscheduler */ { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 334 = sched_yield */ - { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_GETPRIORITY }, /* 335 = linux_sched_get_priority_max */ - { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_GETPRIORITY }, /* 336 = linux_sched_get_priority_min */ - { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 337 = sched_rr_get_interval */ + { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 335 = linux_sched_get_priority_max */ + { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 336 = linux_sched_get_priority_min */ + { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 337 = sched_rr_get_interval */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 338 = sys_afs_syscall */ { SYF_MPSAFE | AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 339 = linux_newuname */ { SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL }, /* 340 = nanosleep */ @@ -368,18 +368,18 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_read, AUE_NULL }, /* 345 = linux_pciconfig_read */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_write, AUE_NULL }, /* 346 = linux_pciconfig_write */ { SYF_MPSAFE | 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 347 = linux_query_module */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 348 = linux_prctl */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 348 = linux_prctl */ { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 349 = linux_pread */ { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 350 = linux_pwrite */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigreturn, AUE_SIGRETURN }, /* 351 = linux_rt_sigreturn */ - { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_SIGACTION }, /* 352 = linux_rt_sigaction */ - { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_SIGPROCMASK }, /* 353 = linux_rt_sigprocmask */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigpending, AUE_SIGPENDING }, /* 354 = linux_rt_sigpending */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_SIGWAIT }, /* 355 = linux_rt_sigtimedwait */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 351 = linux_rt_sigreturn */ + { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 352 = linux_rt_sigaction */ + { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 353 = linux_rt_sigprocmask */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 354 = linux_rt_sigpending */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 355 = linux_rt_sigtimedwait */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 356 = linux_rt_sigqueueinfo */ - { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_SIGSUSPEND }, /* 357 = linux_rt_sigsuspend */ + { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 357 = linux_rt_sigsuspend */ { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 358 = linux_select */ - { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTMEOFDAY }, /* 359 = gettimeofday */ + { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_NULL }, /* 359 = gettimeofday */ { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY }, /* 360 = settimeofday */ { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 361 = linux_getitimer */ { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 362 = linux_setitimer */ @@ -387,14 +387,14 @@ { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE }, /* 364 = getrusage */ { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 365 = linux_wait4 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 366 = linux_adjtimex */ - { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_NULL }, /* 367 = linux_getcwd */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_NULL }, /* 368 = linux_capget */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_NULL }, /* 369 = linux_capset */ + { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 367 = linux_getcwd */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 368 = linux_capget */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 369 = linux_capset */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 370 = linux_sendfile */ { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 371 = setresgid */ { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 372 = getresgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 373 = sys_dipc */ - { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL }, /* 374 = linux_pivot_root */ + { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 374 = linux_pivot_root */ { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 375 = linux_mincore */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_iobase, AUE_NULL }, /* 376 = linux_pciconfig_iobase */ { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 377 = linux_getdents64 */ ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/syscalls.master#7 (text+ko) ==== @@ -157,8 +157,8 @@ 84 AUE_NULL UNIMPL 85 AUE_NULL UNIMPL 86 AUE_GETITIMER UNIMPL osf_getitimer -87 AUE_O_GETHOSTNAME MSTD { int linux_gethostname(void); } -88 AUE_O_SETHOSTNAME MNOPROTO { int osethostname(char *hostname, \ +87 AUE_SYSCTL MSTD { int linux_gethostname(void); } +88 AUE_SYSCTL MNOPROTO { int osethostname(char *hostname, \ u_int len); } osethostname \ sethostname_args int 89 AUE_GETDTABLESIZE MSTD { int linux_getdtablesize(void); } @@ -186,7 +186,7 @@ int flags); } 102 AUE_RECV MNOPROTO { int orecv(int s, caddr_t buf, int len, \ int flags); } -103 AUE_SIGRETURN MSTD { int osf1_sigreturn( \ +103 AUE_NULL MSTD { int osf1_sigreturn( \ struct osigcontext *sigcntxp); } 104 AUE_BIND MNOPROTO { int bind(int s, caddr_t name, \ int namelen); } @@ -197,12 +197,12 @@ 108 AUE_NULL UNIMPL 109 AUE_NULL UNIMPL 110 AUE_NULL UNIMPL -111 AUE_SIGSUSPEND MSTD { int osf1_sigsuspend(unsigned long ss); } -112 AUE_O_SIGSTACK UNIMPL osf_sigstack +111 AUE_NULL MSTD { int osf1_sigsuspend(unsigned long ss); } +112 AUE_NULL UNIMPL osf_sigstack 113 AUE_RECVMSG MSTD { int linux_recvmsg(void); } 114 AUE_SENDMSG MSTD { int linux_sendmsg(void); } 115 AUE_NULL UNIMPL -116 AUE_GETTIMEOFDAY MSTD { int osf1_gettimeofday( \ +116 AUE_NULL MSTD { int osf1_gettimeofday( \ struct timeval *tp, \ struct timezone *tzp); } 117 AUE_GETRUSAGE MSTD { int osf1_getrusage(long who, \ @@ -260,7 +260,7 @@ 153 AUE_NULL UNIMPL 154 AUE_NULL UNIMPL 155 AUE_NULL UNIMPL -156 AUE_SIGCTION MSTD { int osf1_sigaction(int sig, \ +156 AUE_NULL MSTD { int osf1_sigaction(int sig, \ struct osf1_sigaction *nsa, \ struct osf1_sigaction *osa); } 157 AUE_NULL UNIMPL @@ -271,8 +271,8 @@ 162 AUE_NULL UNIMPL 163 AUE_NULL UNIMPL 164 AUE_NULL UNIMPL -165 AUE_O_GETDOMAINNAME UNIMPL osf_getdomainname -166 AUE_O_GETDOMAINNAME MNOPROTO { int setdomainname( \ +165 AUE_SYSCTL UNIMPL osf_getdomainname +166 AUE_SYSCTL MNOPROTO { int setdomainname( \ char *name, int len); } 167 AUE_NULL UNIMPL 168 AUE_NULL UNIMPL @@ -357,7 +357,7 @@ 232 AUE_NULL UNIMPL 233 AUE_GETPPID MNOPROTO { int getpgid(int pid); } 234 AUE_GETSID MSTD { int linux_getsid(l_pid_t pid); } -235 AUE_SIGALTSTACK MSTD { int linux_sigaltstack(void); } +235 AUE_NULL MSTD { int linux_sigaltstack(void); } 236 AUE_NULL UNIMPL 237 AUE_NULL UNIMPL 238 AUE_NULL UNIMPL @@ -428,7 +428,7 @@ 297 AUE_NULL UNIMPL 298 AUE_NULL UNIMPL 299 AUE_NULL UNIMPL -300 AUE_NULL MSTD { int linux_bdflush(void); } +300 AUE_BDFLUSH MSTD { int linux_bdflush(void); } 301 AUE_NULL MSTD { int linux_sethae(void); } 302 AUE_MOUNT STD { int linux_mount(char *specialfile, \ char *dir, char *filesystemtype, \ @@ -460,29 +460,29 @@ 321 AUE_UMOUNT STD { int linux_oldumount(char *path); } 322 AUE_SWAPON MNOPROTO { int swapon(char *name); } 323 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } -324 AUE_NULL MSTD { int linux_personality(l_ulong per); } -325 AUE_NULL MSTD { int linux_setfsuid(l_uid_t uid); } -326 AUE_NULL MSTD { int linux_setfsgid(l_gid_t gid); } +324 AUE_PERSONALITY MSTD { int linux_personality(l_ulong per); } +325 AUE_SETFSUID MSTD { int linux_setfsuid(l_uid_t uid); } +326 AUE_GETFSUID MSTD { int linux_setfsgid(l_gid_t gid); } 327 AUE_NULL MSTD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } 328 AUE_STATFS MSTD { int linux_statfs(char *path, \ struct l_statfs_buf *buf); } 329 AUE_FSTATFS MSTD { int linux_fstatfs(l_uint fd, \ struct l_statfs_buf *buf); } -330 AUE_NULL MNOPROTO { int sched_setparam(pid_t pid, \ +330 AUE_SCHED_SETPARAM MNOPROTO { int sched_setparam(pid_t pid, \ const struct sched_param *param); } -331 AUE_NULL MNOPROTO { int sched_getparam(pid_t pid, \ +331 AUE_SCHED_GETPARAM MNOPROTO { int sched_getparam(pid_t pid, \ struct sched_param *param); } -332 AUE_NULL MSTD { int linux_sched_setscheduler(l_pid_t pid, \ +332 AUE_SCHED_SETSCHEDULER MSTD { int linux_sched_setscheduler(l_pid_t pid, \ l_int policy, \ struct l_sched_param *param); } -333 AUE_NULL MSTD { int linux_sched_getscheduler(l_pid_t pid); } +333 AUE_SCHED_GETSCHEDULER MSTD { int linux_sched_getscheduler(l_pid_t pid); } 334 AUE_NULL MNOPROTO { int sched_yield(void); } -335 AUE_GETPRIORITY MSTD { int linux_sched_get_priority_max( \ +335 AUE_SCHED_GET_PRIORITY_MAX MSTD { int linux_sched_get_priority_max( \ l_int policy); } -336 AUE_GETPRIORITY MSTD { int linux_sched_get_priority_min( \ +336 AUE_SCHED_GET_PRIORITY_MIN MSTD { int linux_sched_get_priority_min( \ l_int policy); } -337 AUE_NULL MNOPROTO { int sched_rr_get_interval (pid_t pid, \ +337 AUE_SCHED_RR_GET_INTERVAL MNOPROTO { int sched_rr_get_interval (pid_t pid, \ struct timespec *interval); } 338 AUE_NULL UNIMPL sys_afs_syscall 339 AUE_NULL MSTD { int linux_newuname( \ @@ -501,28 +501,28 @@ 345 AUE_NULL MSTD { int linux_pciconfig_read(void); } 346 AUE_NULL MSTD { int linux_pciconfig_write(void); } 347 AUE_NULL MSTD { int linux_query_module(void); } -348 AUE_NULL MSTD { int linux_prctl(void); } +348 AUE_PRCTL MSTD { int linux_prctl(void); } 349 AUE_PREAD MSTD { int linux_pread(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } 350 AUE_PWRITE MSTD { int linux_pwrite(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } -351 AUE_SIGRETURN MSTD { int linux_rt_sigreturn(void); } -352 AUE_SIGACTION MSTD { int linux_rt_sigaction(l_int sig, \ +351 AUE_NULL MSTD { int linux_rt_sigreturn(void); } +352 AUE_NULL MSTD { int linux_rt_sigaction(l_int sig, \ l_sigaction_t *act, l_sigaction_t *oact, \ l_size_t sigsetsize); } -353 AUE_SIGPROCMASK MSTD { int linux_rt_sigprocmask(l_int how, \ +353 AUE_NULL MSTD { int linux_rt_sigprocmask(l_int how, \ l_sigset_t *mask, l_sigset_t *omask, \ l_size_t sigsetsize); } -354 AUE_SIGPENDING MSTD { int linux_rt_sigpending(void); } -355 AUE_SIGWAIT MSTD { int linux_rt_sigtimedwait(void); } +354 AUE_NULL MSTD { int linux_rt_sigpending(void); } +355 AUE_NULL MSTD { int linux_rt_sigtimedwait(void); } 356 AUE_NULL MSTD { int linux_rt_sigqueueinfo(void); } -357 AUE_SIGSUSPEND MSTD { int linux_rt_sigsuspend(l_sigset_t \ +357 AUE_NULL MSTD { int linux_rt_sigsuspend(l_sigset_t \ *newset, l_size_t sigsetsize); } 358 AUE_SELECT MSTD { int linux_select(l_int nfds, \ l_fd_set *readfds, l_fd_set *writefds, \ l_fd_set *exceptfds, \ struct l_timeval *timeout); } -359 AUE_GETTMEOFDAY MNOPROTO { int gettimeofday( \ +359 AUE_NULL MNOPROTO { int gettimeofday( \ struct timeval *tp, \ struct timezone *tzp); } 360 AUE_SETTIMEOFDAY MNOPROTO { int settimeofday( \ @@ -541,17 +541,17 @@ l_uint *status, l_int options, \ struct l_rusage *rusage); } 366 AUE_ADJTIME MSTD { int linux_adjtimex(void); } -367 AUE_NULL MSTD { int linux_getcwd(char *buf, \ +367 AUE_GETCWD MSTD { int linux_getcwd(char *buf, \ l_ulong bufsize); } -368 AUE_NULL MSTD { int linux_capget(void); } -369 AUE_NULL MSTD { int linux_capset(void); } +368 AUE_CAPGET MSTD { int linux_capget(void); } +369 AUE_CAPSET MSTD { int linux_capset(void); } 370 AUE_SENDFILE MSTD { int linux_sendfile(void); } 371 AUE_SETRESGID MNOPROTO { int setresgid(gid_t rgid, \ gid_t egid, gid_t sgid); } 372 AUE_GETRESGID MNOPROTO { int getresgid(gid_t *rgid, \ gid_t *egid, gid_t *sgid); } 373 AUE_NULL UNIMPL sys_dipc -374 AUE_NULL MSTD { int linux_pivot_root(char *new_root, \ +374 AUE_PIVOT_ROOT MSTD { int linux_pivot_root(char *new_root, \ char *put_old); } 375 AUE_MINCORE MSTD { int linux_mincore(l_ulong start, \ l_size_t len, u_char *vec); } From owner-p4-projects@FreeBSD.ORG Sat Feb 4 14:52:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12C9016A423; Sat, 4 Feb 2006 14:52:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0CB816A420 for ; Sat, 4 Feb 2006 14:52:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A0E2043D8E for ; Sat, 4 Feb 2006 14:52:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14EqHqV017227 for ; Sat, 4 Feb 2006 14:52:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14EqHSA017224 for perforce@freebsd.org; Sat, 4 Feb 2006 14:52:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 14:52:17 GMT Message-Id: <200602041452.k14EqHSA017224@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 14:52:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=91064 Change 91064 by rwatson@rwatson_peppercorn on 2006/02/04 14:51:17 Correct transcription error: Linux has the ability to set the fsuid and fsgid, but not retrieve the fsuid. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#36 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#36 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#35 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#36 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -360,7 +360,7 @@ #define AUE_NMOUNT 380 /* FreeBSD-specific. */ #define AUE_BDFLUSH 381 /* Linux-specific. */ #define AUE_SETFSUID 382 /* Linux-specific. */ -#define AUE_GETFSUID 383 /* Linux-specific. */ +#define AUE_SETFSGID 383 /* Linux-specific. */ #define AUE_PERSONALITY 384 /* Linux-specific. */ #define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ #define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 14:53:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D27316A424; Sat, 4 Feb 2006 14:53:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5EBB316A423 for ; Sat, 4 Feb 2006 14:53:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D863343D70 for ; Sat, 4 Feb 2006 14:53:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14ErJrQ017272 for ; Sat, 4 Feb 2006 14:53:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14ErJQA017269 for perforce@freebsd.org; Sat, 4 Feb 2006 14:53:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 14:53:19 GMT Message-Id: <200602041453.k14ErJQA017269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 14:53:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=91065 Change 91065 by rwatson@rwatson_peppercorn on 2006/02/04 14:52:53 Merge corrected AUE_SETFSGID from OpenBSM branch to audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#18 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#18 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#17 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#18 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -360,7 +360,7 @@ #define AUE_NMOUNT 380 /* FreeBSD-specific. */ #define AUE_BDFLUSH 381 /* Linux-specific. */ #define AUE_SETFSUID 382 /* Linux-specific. */ -#define AUE_GETFSUID 383 /* Linux-specific. */ +#define AUE_SETFSGID 383 /* Linux-specific. */ #define AUE_PERSONALITY 384 /* Linux-specific. */ #define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ #define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 14:54:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33BB616A423; Sat, 4 Feb 2006 14:54:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EBB1716A420 for ; Sat, 4 Feb 2006 14:54:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C2A443D48 for ; Sat, 4 Feb 2006 14:54:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14EsLiO017341 for ; Sat, 4 Feb 2006 14:54:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14EsLjd017338 for perforce@freebsd.org; Sat, 4 Feb 2006 14:54:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 14:54:21 GMT Message-Id: <200602041454.k14EsLjd017338@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 14:54:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=91066 Change 91066 by rwatson@rwatson_peppercorn on 2006/02/04 14:53:39 Integrate AUE_SETFSGID respelling from contrib/openbsm/bsm to sys/bsm in audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#19 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#19 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#18 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#19 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -360,7 +360,7 @@ #define AUE_NMOUNT 380 /* FreeBSD-specific. */ #define AUE_BDFLUSH 381 /* Linux-specific. */ #define AUE_SETFSUID 382 /* Linux-specific. */ -#define AUE_GETFSUID 383 /* Linux-specific. */ +#define AUE_SETFSGID 383 /* Linux-specific. */ #define AUE_PERSONALITY 384 /* Linux-specific. */ #define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ #define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 14:54:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CEB916A443; Sat, 4 Feb 2006 14:54:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 358A916A420 for ; Sat, 4 Feb 2006 14:54:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDB3743D46 for ; Sat, 4 Feb 2006 14:54:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14EsLc9017347 for ; Sat, 4 Feb 2006 14:54:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14EsLE9017344 for perforce@freebsd.org; Sat, 4 Feb 2006 14:54:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 14:54:21 GMT Message-Id: <200602041454.k14EsLE9017344@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 14:54:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=91067 Change 91067 by rwatson@rwatson_peppercorn on 2006/02/04 14:54:00 Correct transcription error: setfsgid, not getfsuid. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/syscalls.master#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/syscalls.master#8 (text+ko) ==== @@ -462,7 +462,7 @@ 323 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } 324 AUE_PERSONALITY MSTD { int linux_personality(l_ulong per); } 325 AUE_SETFSUID MSTD { int linux_setfsuid(l_uid_t uid); } -326 AUE_GETFSUID MSTD { int linux_setfsgid(l_gid_t gid); } +326 AUE_SETFSGID MSTD { int linux_setfsgid(l_gid_t gid); } 327 AUE_NULL MSTD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } 328 AUE_STATFS MSTD { int linux_statfs(char *path, \ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 14:54:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F29B16A463; Sat, 4 Feb 2006 14:54:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8C99E16A428 for ; Sat, 4 Feb 2006 14:54:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4978643D46 for ; Sat, 4 Feb 2006 14:54:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14EsMi8017354 for ; Sat, 4 Feb 2006 14:54:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14EsMtu017350 for perforce@freebsd.org; Sat, 4 Feb 2006 14:54:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 14:54:22 GMT Message-Id: <200602041454.k14EsMtu017350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 14:54:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=91068 Change 91068 by rwatson@rwatson_peppercorn on 2006/02/04 14:54:20 Regenerate. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_proto.h#8 edit .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_syscall.h#8 edit .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_sysent.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_proto.h#8 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_syscall.h#8 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_sysent.c#8 (text+ko) ==== @@ -346,7 +346,7 @@ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 323 = linux_times */ { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 324 = linux_personality */ { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 325 = linux_setfsuid */ - { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_GETFSUID }, /* 326 = linux_setfsgid */ + { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 326 = linux_setfsgid */ { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 327 = linux_ustat */ { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 328 = linux_statfs */ { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 329 = linux_fstatfs */ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 16:07:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35BC816A423; Sat, 4 Feb 2006 16:07:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE09B16A420 for ; Sat, 4 Feb 2006 16:07:53 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DBB544644 for ; Sat, 4 Feb 2006 16:07:53 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14G7rHP021049 for ; Sat, 4 Feb 2006 16:07:53 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14G7r4W021046 for perforce@freebsd.org; Sat, 4 Feb 2006 16:07:53 GMT (envelope-from wsalamon@computer.org) Date: Sat, 4 Feb 2006 16:07:53 GMT Message-Id: <200602041607.k14G7r4W021046@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 91073 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 16:07:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=91073 Change 91073 by wsalamon@gretsch on 2006/02/04 16:07:32 Update the TODO list. Some things have actually been done. Affected files ... .. //depot/projects/trustedbsd/audit3/notes/TODO_audit.txt#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/notes/TODO_audit.txt#2 (text+ko) ==== @@ -7,7 +7,7 @@ - Add a file token to the audit startup record, containing the audit log file. -- Look at what audited writes when the file is rotated. +- Look at what auditd writes when the file is rotated. - Sweep of system call tables to see if any new BSM types are needed, that all system calls have the right BSM types assigned, and so on. (See the @@ -26,8 +26,6 @@ tokens. Existing tests verify at the record level, not token level. So we have EVENT->RECORD tests, need RECORD->TOKENS tests. -- Fix up pathname lookups in kernel. [IN PROGRESS] - - MAC->Audit integration, where the audit system pulls MAC label information from policies. @@ -40,9 +38,6 @@ - Sweep of BSM event types to see what should or shouldn't be coalesced or renamed. -- Restructure sys/security/audit to even out the sizes a bit, break it down, -clean it up, etc. [IN PROGRESS] - - Review set of user space programs and libraries to identify audit-relevant events and plan out how each needs audit support. For example, login has basic support right now, but sshd, etc, don't. @@ -53,14 +48,9 @@ - Expand praudit to speak Sun's new XML output format. -- Fix licenses and copyrights, with the help of Apple [IN PROGRESS] - - Investigate Sun's enhanced audit API they've been working on, decide what if anything to do with it. -- Remove pathname lookup for file descriptor based calls as it is not -reliable. - - Write test code for converting BSM to/from text. - Write test code to make sure auditd handles triggers, rotates log files, @@ -71,3 +61,6 @@ - Add a function to the audit test library to load the kernel event->class mapping so auditd need not be run before testing. + +- Expand the subject token to include jail information. Add this informtion +for processes that are running in a jail. From owner-p4-projects@FreeBSD.ORG Sat Feb 4 16:09:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D14316A423; Sat, 4 Feb 2006 16:09:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED97816A420 for ; Sat, 4 Feb 2006 16:09:56 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B26CE44644 for ; Sat, 4 Feb 2006 16:09:56 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14G9uNI021143 for ; Sat, 4 Feb 2006 16:09:56 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14G9ucx021140 for perforce@freebsd.org; Sat, 4 Feb 2006 16:09:56 GMT (envelope-from wsalamon@computer.org) Date: Sat, 4 Feb 2006 16:09:56 GMT Message-Id: <200602041609.k14G9ucx021140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 91074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 16:09:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=91074 Change 91074 by wsalamon@gretsch on 2006/02/04 16:09:08 Updated list of audited system calls, with some additional notes. Affected files ... .. //depot/projects/trustedbsd/audit3/notes/syscall_audit.tsv#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/notes/syscall_audit.tsv#4 (text+ko) ==== @@ -7,9 +7,12 @@ # Field 5 -> Comments # # For many of the fd-based ops, will need to create an attr token when vnode -# is available. If an audited arg is followed by ?, need to decide whether to -# audit. For some calls, the returned fd(s) probably should be audited because -# pathname auditing for fd-based calls isn't reliable, so auditing the +# is available. We will also audit the file decriptor to allow for +# easier tracing through the log file, even though the attr token contains the +# file ID. +# If an audited arg is followed by ?, need to decide whether to audit +# For some calls, the returned fd(s) probably should be audited because +# pathname auditing for fd-based calls isn't done, therefore auditing the # returned fd at time of creation (open, etc.) should be done so later calls # can be traced back to a path in the audit trail. # @@ -28,14 +31,14 @@ SYS_unlink 10 Y Y path, attr SYS_chdir 12 Y Y -SYS_fchdir 13 Y N path; should fd be audited? -SYS_mknod 14 Y N mode, dev, path +SYS_fchdir 13 Y Y attr, fd +SYS_mknod 14 Y Y mode, dev, path SYS_chmod 15 Y Y mode, path SYS_chown 16 Y Y uid, gid, path SYS_break 17 N N SYS_getpid 20 N N -SYS_mount 21 Y N type, dir, flagsr; data? +SYS_mount 21 Y N type, dir, flags SYS_unmount 22 Y N dir, flags SYS_setuid 23 Y N uid SYS_getuid 24 N N @@ -49,7 +52,7 @@ SYS_getsockname 32 ? N if audited: s, name; namelen? SYS_access 33 Y N path, mode SYS_chflags 34 Y Y path, flags, attr -SYS_fchflags 35 Y Y fd, fflags +SYS_fchflags 35 Y Y fd, attr, fflags SYS_sync 36 Y N SYS_kill 37 Y N pid, sig @@ -75,7 +78,7 @@ SYS_readlink 58 Y N path, buf, bufsiz SYS_execve 59 Y N path, argv, envp? SYS_umask 60 Y N numask -SYS_chroot 61 Y N dirname +SYS_chroot 61 Y Y dirname SYS_old.fstat 62 ? N SYS_old.getkerninfo 63 N N @@ -109,7 +112,7 @@ SYS_dup2 90 N N SYS_fcntl 92 Y N SYS_select 93 N N -SYS_fsync 95 Y N +SYS_fsync 95 Y Y fd, attr SYS_setpriority 96 Y N SYS_socket 97 Y N SYS_connect 98 Y N @@ -126,14 +129,14 @@ SYS_readv 120 N N SYS_writev 121 N N SYS_settimeofday 122 Y N -SYS_fchown 123 Y Y -SYS_fchmod 124 Y Y +SYS_fchown 123 Y Y fd, attr, new uid, new gid +SYS_fchmod 124 Y Y fd, attr, new mode SYS_setreuid 126 Y N SYS_setregid 127 Y N SYS_rename 128 Y N -SYS_flock 131 Y N +SYS_flock 131 Y N fd, operation, addr SYS_mkfifo 132 Y N SYS_sendto 133 Y N SYS_shutdown 134 Y N @@ -206,8 +209,8 @@ SYS_issetugid 253 N N SYS_lchown 254 Y Y SYS_getdents 272 Y N -SYS_lchmod 274 Y Y -SYS_netbsd_lchown 275 Y N +SYS_lchmod 274 Y Y path, attr, new mode +SYS_netbsd_lchown 275 Y N path, attr, new mode SYS_lutimes 276 Y N SYS_netbsd_msync 277 N N file writes are not audited SYS_nstat 278 Y Y @@ -284,7 +287,7 @@ SYS___setugid 374 ? N SYS_nfsclnt 375 ? N SYS_eaccess 376 ? N -SYS_nmount 378 Y N +SYS_nmount 378 Y Y iovec strings audited SYS_kse_exit 379 ? N SYS_kse_wakeup 380 ? N SYS_kse_create 381 ? N From owner-p4-projects@FreeBSD.ORG Sat Feb 4 16:20:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C2CA16A423; Sat, 4 Feb 2006 16:20:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88DB116A422 for ; Sat, 4 Feb 2006 16:20:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B752F444AF for ; Sat, 4 Feb 2006 15:56:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14FucWX020412 for ; Sat, 4 Feb 2006 15:56:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14Fuc8n020409 for perforce@freebsd.org; Sat, 4 Feb 2006 15:56:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 15:56:38 GMT Message-Id: <200602041556.k14Fuc8n020409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 16:20:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=91070 Change 91070 by rwatson@rwatson_peppercorn on 2006/02/04 15:55:41 Clean up i386 linux system call table: - Update comment. - Prefer AUE_FOO to AUE_O_FOO. - Replace AUE_NULL with AUE_FOO in a number of cases, including for Linux system calls that now have identifiers but didn't previously. - Replace AUE_FOO with AUE_NULL in some case where AUE_FOO is defined as AUE_NULL and we are unlikely to change it. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#12 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#12 (text+ko) ==== @@ -4,7 +4,7 @@ ; System call name/number master file (or rather, slave, from LINUX). ; Processed to create linux_sysent.c, linux_proto.h and linux_syscall.h. -; Columns: number type nargs name alt{name,tag,rtyp}/comments +; Columns: number audit type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order ; audit the audit event associated with the system call ; A value of AUE_NULL means no auditing, but it also means that @@ -55,7 +55,7 @@ 5 AUE_OPEN_RWTC MSTD { int linux_open(char *path, l_int flags, \ l_int mode); } 6 AUE_CLOSE MNOPROTO { int close(int fd); } -7 AUE_O_WAIT MSTD { int linux_waitpid(l_pid_t pid, \ +7 AUE_WAIT4 MSTD { int linux_waitpid(l_pid_t pid, \ l_int *status, l_int options); } 8 AUE_O_CREAT MSTD { int linux_creat(char *path, \ l_int mode); } @@ -83,7 +83,7 @@ 22 AUE_UMOUNT STD { int linux_oldumount(char *path); } 23 AUE_SETUID MSTD { int linux_setuid16(l_uid16_t uid); } 24 AUE_GETUID MSTD { int linux_getuid16(void); } -25 AUE_NULL MSTD { int linux_stime(void); } +25 AUE_SETTIMEOFDAY MSTD { int linux_stime(void); } 26 AUE_PTRACE MSTD { int linux_ptrace(l_long req, l_long pid, \ l_long addr, l_long data); } 27 AUE_NULL MSTD { int linux_alarm(l_uint secs); } @@ -132,7 +132,7 @@ 64 AUE_GETPPID MNOPROTO { int getppid(void); } 65 AUE_GETPGRP MNOPROTO { int getpgrp(void); } 66 AUE_SETSID MNOPROTO { int setsid(void); } -67 AUE_SIGACTION MSTD { int linux_sigaction(l_int sig, \ +67 AUE_NULL MSTD { int linux_sigaction(l_int sig, \ l_osigaction_t *nsa, \ l_osigaction_t *osa); } 68 AUE_NULL MSTD { int linux_sgetmask(void); } @@ -141,10 +141,10 @@ l_uid16_t euid); } 71 AUE_SETREGID MSTD { int linux_setregid16(l_gid16_t rgid, \ l_gid16_t egid); } -72 AUE_SIGSUSPEND MSTD { int linux_sigsuspend(l_int hist0, \ +72 AUE_NULL MSTD { int linux_sigsuspend(l_int hist0, \ l_int hist1, l_osigset_t mask); } -73 AUE_SIGPENDING MSTD { int linux_sigpending(l_osigset_t *mask); } -74 AUE_O_SETHOSTNAME MNOPROTO { int osethostname(char *hostname, \ +73 AUE_NULL MSTD { int linux_sigpending(l_osigset_t *mask); } +74 AUE_SYSCTL MNOPROTO { int osethostname(char *hostname, \ u_int len); } osethostname \ sethostname_args int 75 AUE_SETRLIMIT MSTD { int linux_setrlimit(l_uint resource, \ @@ -153,7 +153,7 @@ struct l_rlimit *rlim); } 77 AUE_GETRUSAGE MNOPROTO { int getrusage(int who, \ struct rusage *rusage); } -78 AUE_GETTIMEOFDAY MNOPROTO { int gettimeofday( \ +78 AUE_NULL MNOPROTO { int gettimeofday( \ struct timeval *tp, \ struct timezone *tzp); } 79 AUE_SETTIMEOFDAY MNOPROTO { int settimeofday( \ @@ -169,11 +169,11 @@ 84 AUE_STAT NOPROTO { int ostat(char *path, struct ostat *up); } 85 AUE_READLINK MSTD { int linux_readlink(char *name, char *buf, \ l_int count); } -86 AUE_NULL STD { int linux_uselib(char *library); } +86 AUE_USELIB STD { int linux_uselib(char *library); } 87 AUE_SWAPON MNOPROTO { int swapon(char *name); } 88 AUE_REBOOT MSTD { int linux_reboot(l_int magic1, \ l_int magic2, l_uint cmd, void *arg); } -89 AUE_NULL STD { int linux_readdir(l_uint fd, \ +89 AUE_O_GETDENTS STD { int linux_readdir(l_uint fd, \ struct l_dirent *dent, l_uint count); } 90 AUE_MMAP MSTD { int linux_mmap(struct l_mmap_argv *ptr); } 91 AUE_MUNMAP MNOPROTO { int munmap(caddr_t addr, int len); } @@ -185,7 +185,7 @@ 96 AUE_GETPRIORITY MSTD { int linux_getpriority(int which, int who); } 97 AUE_SETPRIORITY MNOPROTO { int setpriority(int which, int who, \ int prio); } -98 AUE_NULL UNIMPL profil +98 AUE_AUE_PROFILE UNIMPL profil 99 AUE_STATFS MSTD { int linux_statfs(char *path, \ struct l_statfs_buf *buf); } 100 AUE_FSTATFS MSTD { int linux_fstatfs(l_uint fd, \ @@ -212,7 +212,7 @@ 111 AUE_NULL MSTD { int linux_vhangup(void); } 112 AUE_NULL UNIMPL idle 113 AUE_NULL MSTD { int linux_vm86old(void); } -114 AUE_O_WAIT MSTD { int linux_wait4(l_pid_t pid, \ +114 AUE_WAIT4 MSTD { int linux_wait4(l_pid_t pid, \ l_uint *status, l_int options, \ struct l_rusage *rusage); } 115 AUE_SWAPOFF MSTD { int linux_swapoff(void); } @@ -224,7 +224,7 @@ 119 AUE_SIGRETURN MSTD { int linux_sigreturn( \ struct l_sigframe *sfp); } 120 AUE_RFORK MSTD { int linux_clone(l_int flags, void *stack); } -121 AUE_O_SETDOMAINNAME MNOPROTO { int setdomainname(char *name, \ +121 AUE_SYSCTL MNOPROTO { int setdomainname(char *name, \ int len); } 122 AUE_NULL MSTD { int linux_newuname( \ struct l_new_utsname *buf); } @@ -242,13 +242,13 @@ 131 AUE_QUOTACTL MSTD { int linux_quotactl(void); } 132 AUE_GETPGID MNOPROTO { int getpgid(int pid); } 133 AUE_FCHDIR MNOPROTO { int fchdir(int fd); } -134 AUE_NULL MSTD { int linux_bdflush(void); } +134 AUE_BDFLUSH MSTD { int linux_bdflush(void); } 135 AUE_NULL MSTD { int linux_sysfs(l_int option, \ l_ulong arg1, l_ulong arg2); } -136 AUE_NULL MSTD { int linux_personality(l_ulong per); } +136 AUE_PERSONALITY MSTD { int linux_personality(l_ulong per); } 137 AUE_NULL UNIMPL afs_syscall -138 AUE_NULL MSTD { int linux_setfsuid16(l_uid16_t uid); } -139 AUE_NULL MSTD { int linux_setfsgid16(l_gid16_t gid); } +138 AUE_SETFSUID MSTD { int linux_setfsuid16(l_uid16_t uid); } +139 AUE_SETFSGID MSTD { int linux_setfsgid16(l_gid16_t gid); } 140 AUE_LSEEK MSTD { int linux_llseek(l_int fd, l_ulong ohigh, \ l_ulong olow, l_loff_t *res, \ l_uint whence); } @@ -267,26 +267,26 @@ u_int iovcnt); } 147 AUE_GETSID MSTD { int linux_getsid(l_pid_t pid); } 148 AUE_NULL MSTD { int linux_fdatasync(l_uint fd); } -149 AUE_NULL MSTD { int linux_sysctl( \ +149 AUE_SYSCTL MSTD { int linux_sysctl( \ struct l___sysctl_args *args); } 150 AUE_MLOCK MNOPROTO { int mlock(const void *addr, size_t len); } 151 AUE_MUNLOCK MNOPROTO { int munlock(const void *addr, size_t len); } 152 AUE_MLOCKALL MNOPROTO { int mlockall(int how); } 153 AUE_MUNLOCKALL MNOPROTO { int munlockall(void); } -154 AUE_NULL MNOPROTO { int sched_setparam(pid_t pid, \ +154 AUE_SCHED_SETPARAM MNOPROTO { int sched_setparam(pid_t pid, \ const struct sched_param *param); } -155 AUE_NULL MNOPROTO { int sched_getparam(pid_t pid, \ +155 AUE_SCHED_GETPARAM MNOPROTO { int sched_getparam(pid_t pid, \ struct sched_param *param); } -156 AUE_NULL MSTD { int linux_sched_setscheduler(l_pid_t pid, \ +156 AUE_SCHED_SETSCHEDULER MSTD { int linux_sched_setscheduler(l_pid_t pid, \ l_int policy, \ struct l_sched_param *param); } -157 AUE_NULL MSTD { int linux_sched_getscheduler(l_pid_t pid); } +157 AUE_SCHED_GETSCHEDULER MSTD { int linux_sched_getscheduler(l_pid_t pid); } 158 AUE_NULL MNOPROTO { int sched_yield(void); } -159 AUE_NULL MSTD { int linux_sched_get_priority_max( \ +159 AUE_SCHED_GET_PRIORITY_MAX MSTD { int linux_sched_get_priority_max( \ l_int policy); } -160 AUE_NULL MSTD { int linux_sched_get_priority_min( \ +160 AUE_SCHED_GET_PRIORITY_MIN MSTD { int linux_sched_get_priority_min( \ l_int policy); } -161 AUE_NULL MNOPROTO { int sched_rr_get_interval(l_pid_t pid, \ +161 AUE_SCHED_RR_GET_INTERVAL MNOPROTO { int sched_rr_get_interval(l_pid_t pid, \ struct l_timespec *interval); } 162 AUE_NULL MNOPROTO { int nanosleep( \ const struct timespec *rqtp, \ @@ -296,7 +296,7 @@ l_ulong flags, l_ulong new_addr); } 164 AUE_SETRESUID MSTD { int linux_setresuid16(l_uid16_t ruid, \ l_uid16_t euid, l_uid16_t suid); } -165 AUE_NULL MSTD { int linux_getresuid16(l_uid16_t *ruid, \ +165 AUE_GETRESUID MSTD { int linux_getresuid16(l_uid16_t *ruid, \ l_uid16_t *euid, l_uid16_t *suid); } 166 AUE_NULL MSTD { int linux_vm86(void); } 167 AUE_NULL MSTD { int linux_query_module(void); } @@ -305,21 +305,21 @@ 169 AUE_NULL MSTD { int linux_nfsservctl(void); } 170 AUE_SETRESGID MSTD { int linux_setresgid16(l_gid16_t rgid, \ l_gid16_t egid, l_gid16_t sgid); } -171 AUE_NULL MSTD { int linux_getresgid16(l_gid16_t *rgid, \ +171 AUE_GETRESGID MSTD { int linux_getresgid16(l_gid16_t *rgid, \ l_gid16_t *egid, l_gid16_t *sgid); } -172 AUE_NULL MSTD { int linux_prctl(void); } -173 AUE_SIGRETURN MSTD { int linux_rt_sigreturn( \ +172 AUE_PRCTL MSTD { int linux_prctl(void); } +173 AUE_NULL MSTD { int linux_rt_sigreturn( \ struct l_ucontext *ucp); } -174 AUE_SIGACTION MSTD { int linux_rt_sigaction(l_int sig, \ +174 AUE_NULL MSTD { int linux_rt_sigaction(l_int sig, \ l_sigaction_t *act, l_sigaction_t *oact, \ l_size_t sigsetsize); } -175 AUE_SIGPROCMASK MSTD { int linux_rt_sigprocmask(l_int how, \ +175 AUE_NULL MSTD { int linux_rt_sigprocmask(l_int how, \ l_sigset_t *mask, l_sigset_t *omask, \ l_size_t sigsetsize); } -176 AUE_SIGPENDING MSTD { int linux_rt_sigpending(void); } -177 AUE_SIGWAIT MSTD { int linux_rt_sigtimedwait(void); } +176 AUE_NULL MSTD { int linux_rt_sigpending(void); } +177 AUE_NULL MSTD { int linux_rt_sigtimedwait(void); } 178 AUE_NULL MSTD { int linux_rt_sigqueueinfo(void); } -179 AUE_SIGSUSPEND MSTD { int linux_rt_sigsuspend( \ +179 AUE_NULL MSTD { int linux_rt_sigsuspend( \ l_sigset_t *newset, \ l_size_t sigsetsize); } 180 AUE_PREAD MSTD { int linux_pread(l_uint fd, char *buf, \ @@ -328,15 +328,15 @@ l_size_t nbyte, l_loff_t offset); } 182 AUE_CHOWN MSTD { int linux_chown16(char *path, \ l_uid16_t uid, l_gid16_t gid); } -183 AUE_NULL MSTD { int linux_getcwd(char *buf, \ +183 AUE_GETCWD MSTD { int linux_getcwd(char *buf, \ l_ulong bufsize); } -184 AUE_NULL MSTD { int linux_capget(void); } -185 AUE_NULL MSTD { int linux_capset(void); } +184 AUE_CAPGET MSTD { int linux_capget(void); } +185 AUE_CAPSET MSTD { int linux_capset(void); } 186 AUE_NULL MSTD { int linux_sigaltstack(l_stack_t *uss, \ l_stack_t *uoss); } -187 AUE_NULL MSTD { int linux_sendfile(void); } -188 AUE_NULL UNIMPL getpmsg -189 AUE_NULL UNIMPL putpmsg +187 AUE_SENDFILE MSTD { int linux_sendfile(void); } +188 AUE_GETPMSG UNIMPL getpmsg +189 AUE_PUTPMSG UNIMPL putpmsg 190 AUE_VFORK MSTD { int linux_vfork(void); } 191 AUE_GETRLIMIT MSTD { int linux_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } @@ -368,19 +368,19 @@ 207 AUE_FCHOWN NODEF fchown fchown fchown_args int 208 AUE_SETRESUID MNOPROTO { int setresuid(uid_t ruid, uid_t euid, \ uid_t suid); } -209 AUE_NULL MNOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ +209 AUE_GETRESUID MNOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ uid_t *suid); } 210 AUE_SETRESGID MNOPROTO { int setresgid(gid_t rgid, gid_t egid, \ gid_t sgid); } -211 AUE_NULL MNOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ +211 AUE_GETRESGID MNOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ gid_t *sgid); } 212 AUE_CHOWN MSTD { int linux_chown(char *path, l_uid_t uid, \ l_gid_t gid); } 213 AUE_SETUID MNOPROTO { int setuid(uid_t uid); } 214 AUE_SETGID MNOPROTO { int setgid(gid_t gid); } -215 AUE_NULL MSTD { int linux_setfsuid(l_uid_t uid); } -216 AUE_NULL MSTD { int linux_setfsgid(l_gid_t gid); } -217 AUE_NULL MSTD { int linux_pivot_root(char *new_root, \ +215 AUE_SETFSUID MSTD { int linux_setfsuid(l_uid_t uid); } +216 AUE_SETFSGID MSTD { int linux_setfsgid(l_gid_t gid); } +217 AUE_PIVOT_ROOT MSTD { int linux_pivot_root(char *new_root, \ char *put_old); } 218 AUE_MINCORE MSTD { int linux_mincore(l_ulong start, \ l_size_t len, u_char *vec); } @@ -407,7 +407,7 @@ 236 AUE_NULL MSTD { int linux_lremovexattr(void); } 237 AUE_NULL MSTD { int linux_fremovexattr(void); } 238 AUE_NULL MSTD { int linux_tkill(int tid, int sig); } -239 AUE_NULL UNIMPL linux_sendfile64 +239 AUE_SENDFILE UNIMPL linux_sendfile64 240 AUE_NULL UNIMPL linux_futex 241 AUE_NULL UNIMPL linux_sched_setaffinity 242 AUE_NULL UNIMPL linux_sched_getaffinity @@ -433,7 +433,7 @@ 261 AUE_NULL UNIMPL linux_timer_gettime 262 AUE_NULL UNIMPL linux_timer_getoverrun 263 AUE_NULL UNIMPL linux_timer_delete -264 AUE_NULL UNIMPL linux_clock_settime +264 AUE_CLOCK_SETTIME UNIMPL linux_clock_settime 265 AUE_NULL UNIMPL linux_clock_gettime 266 AUE_NULL UNIMPL linux_clock_getres 267 AUE_NULL UNIMPL linux_clock_nanosleep From owner-p4-projects@FreeBSD.ORG Sat Feb 4 16:22:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC34D16A543; Sat, 4 Feb 2006 16:21:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D40516A49E for ; Sat, 4 Feb 2006 16:21:49 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EDEC444B0 for ; Sat, 4 Feb 2006 15:56:39 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14FucYp020418 for ; Sat, 4 Feb 2006 15:56:38 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14FucJY020415 for perforce@freebsd.org; Sat, 4 Feb 2006 15:56:38 GMT (envelope-from wsalamon@computer.org) Date: Sat, 4 Feb 2006 15:56:38 GMT Message-Id: <200602041556.k14FucJY020415@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 91071 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 16:22:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=91071 Change 91071 by wsalamon@gretsch on 2006/02/04 15:56:37 Call the audit hooks for the amd64 architectures. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#7 edit .. //depot/projects/trustedbsd/audit3/sys/amd64/ia32/ia32_syscall.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#7 (text+ko) ==== @@ -75,6 +75,7 @@ #ifdef HWPMC_HOOKS #include #endif +#include #include #include @@ -823,10 +824,15 @@ if ((callp->sy_narg & SYF_MPSAFE) == 0) { mtx_lock(&Giant); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, argp); + AUDIT_SYSCALL_EXIT(error, td); mtx_unlock(&Giant); - } else + } else { + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, argp); + AUDIT_SYSCALL_EXIT(error, td); + } } switch (error) { ==== //depot/projects/trustedbsd/audit3/sys/amd64/ia32/ia32_syscall.c#5 (text+ko) ==== @@ -66,6 +66,7 @@ #ifdef KTRACE #include #endif +#include #include #include @@ -184,7 +185,9 @@ STOPEVENT(p, S_SCE, narg); + AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args64); + AUDIT_SYSCALL_EXIT(error, td); } switch (error) { From owner-p4-projects@FreeBSD.ORG Sat Feb 4 16:31:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC2A816A424; Sat, 4 Feb 2006 16:31:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CC4A16A420 for ; Sat, 4 Feb 2006 16:31:23 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DD9B43D5E for ; Sat, 4 Feb 2006 16:31:23 +0000 (GMT) (envelope-from imp@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 k14GVM4o022397 for ; Sat, 4 Feb 2006 16:31:22 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14GVMpf022394 for perforce@freebsd.org; Sat, 4 Feb 2006 16:31:22 GMT (envelope-from imp@freebsd.org) Date: Sat, 4 Feb 2006 16:31:22 GMT Message-Id: <200602041631.k14GVMpf022394@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 16:31:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=91075 Change 91075 by imp@imp_plunger on 2006/02/04 16:30:31 I think this is close to basically working now. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#27 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#27 (text+ko) ==== @@ -25,13 +25,13 @@ /* TODO: (in no order) * * 5) Setup RX buffers in ateinit_locked + * 8) Need to sync busdma goo in atestop + * 9) atestop should maybe free the mbufs? + * 10) On Rx, how do we get a new mbuf? * * 1) detach * 2) Free dma setup * 3) Turn on the clock in pmc and turn on pins? Turn off? - * 6) Interrupt bits as appropriate - * 7) Keep track of the mbufs in flight on TX and free them in the ISR. - * 8) Need to sync busdma goo in atestop */ #include @@ -227,7 +227,7 @@ static int ate_detach(device_t dev) { - return EBUSY; /* XXX */ + return EBUSY; /* XXX TODO(1) */ } static void @@ -346,6 +346,7 @@ sc->rx_descs, ATE_MAX_RX_BUFFERS * sizeof(eth_rx_desc_t), ate_getaddr, sc, 0) != 0) goto errout; + /* XXX TODO(5) Put this in ateinit_locked? */ for (i = 0; i < ATE_MAX_RX_BUFFERS; i++) { bus_dma_segment_t seg; int nsegs; @@ -381,7 +382,7 @@ struct ate_softc *sc; sc = device_get_softc(dev); - /* XXX teardown busdma junk, below from fxp -- customize */ + /* XXX TODO(2) teardown busdma junk, below from fxp -- customize */ #if 0 if (sc->fxp_mtag) { for (i = 0; i < FXP_NRFABUFS; i++) { @@ -584,10 +585,12 @@ sc->rx_map[i], BUS_DMASYNC_POSTREAD); bus_dmamap_unload(sc->rxtag, sc->rx_map[i]); + WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); /* - * Clear the corresponding bits in RSR. + * Allocate a new buffer to replace this one. + * if we cannot, then we drop this packet + * and keep the old buffer we had. */ - WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); sc->rx_mbuf[i] = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); if (!sc->rx_mbuf[i]) { @@ -596,7 +599,7 @@ bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); - break; + continue; } if (bus_dmamap_load_mbuf_sg(sc->rxtag, sc->rx_map[i], @@ -606,7 +609,7 @@ bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); - break; + continue; } /* * For the last buffer, set the wrap bit so @@ -620,8 +623,6 @@ mb->m_len = rx_stat & ETH_LEN_MASK; (*sc->ifp->if_input)(sc->ifp, mb); break; - - } } } @@ -662,7 +663,8 @@ ATE_ASSERT_LOCKED(sc); /* - * XXX we need to turn on the EMAC clock in the pmc. With the + * XXX TODO(3) + * we need to turn on the EMAC clock in the pmc. With the * default boot loader, this is already turned on. However, we * need to think about how best to turn it on/off as the interface * is brought up/down, as well as dealing with the mii bus... @@ -698,7 +700,7 @@ * swapping to do. Again, if we need it (which I don't think we do). */ - /* XXX need to setup multicast filters */ + ate_setmcast(sc); /* * Set 'running' flag, and clear output active flag @@ -766,19 +768,16 @@ WR4(sc, ETH_TAR, segs[0].ds_addr); WR4(sc, ETH_TCR, segs[0].ds_len); - /* XXX the following is wrong, we need to keep track of the mbuf and - * only free it when the ISR fires indicating xmit complete. - */ - /* * Tap off here if there is a bpf listener. */ BPF_MTAP(ifp, m); - m_freem(m); /* - * Once we've queued one packet, we'll do the rest via the ISR + * Once we've queued one packet, we'll do the rest via the ISR, + * save off a pointer. */ + sc->sent_mbuf[1] = m; } static void @@ -843,7 +842,8 @@ WR4(sc, ETH_RSR, 0xffffffff); /* - * XXX need to worry about the busdma resources? Yes, I think we need + * XXX TODO(8) + * need to worry about the busdma resources? Yes, I think we need * to sync and unload them. We may also need to release the mbufs * that are assocaited with RX and TX operations. */ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 16:43:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EADE16A423; Sat, 4 Feb 2006 16:43:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 127F716A420 for ; Sat, 4 Feb 2006 16:43:39 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D512E43D5E for ; Sat, 4 Feb 2006 16:43:38 +0000 (GMT) (envelope-from cognet@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 k14GhcQf026321 for ; Sat, 4 Feb 2006 16:43:38 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14GhcwP026318 for perforce@freebsd.org; Sat, 4 Feb 2006 16:43:38 GMT (envelope-from cognet@freebsd.org) Date: Sat, 4 Feb 2006 16:43:38 GMT Message-Id: <200602041643.k14GhcwP026318@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 91077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 16:43:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=91077 Change 91077 by cognet@cognet on 2006/02/04 16:42:42 Use an explicitely signed char for getopt() return value. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#9 $ */ #include @@ -708,7 +708,7 @@ int main(int argc, char **argv) { - char ch; + signed char ch; int debug = 0; int rc; From owner-p4-projects@FreeBSD.ORG Sat Feb 4 16:56:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E0C816A423; Sat, 4 Feb 2006 16:56:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F340616A420 for ; Sat, 4 Feb 2006 16:56:55 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C126443D46 for ; Sat, 4 Feb 2006 16:56:55 +0000 (GMT) (envelope-from cognet@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 k14GutPL034272 for ; Sat, 4 Feb 2006 16:56:55 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14GutTF034269 for perforce@freebsd.org; Sat, 4 Feb 2006 16:56:55 GMT (envelope-from cognet@freebsd.org) Date: Sat, 4 Feb 2006 16:56:55 GMT Message-Id: <200602041656.k14GutTF034269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 91079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 16:56:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=91079 Change 91079 by cognet@cognet on 2006/02/04 16:56:38 More signed char for getopt(). Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#12 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#3 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -65,7 +65,7 @@ int main(int argc, char **argv) { - char ch; + signed char ch; unsigned int trigger = 0; if (argc != 2) ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#12 $ */ /* @@ -529,7 +529,7 @@ FILE *fp; int i; char *objval, *converr; - char ch; + signed char ch; char timestr[128]; char *fname; ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#8 $ */ /* @@ -105,7 +105,7 @@ int main(int argc, char **argv) { - char ch; + signed char ch; int i; FILE *fp; From owner-p4-projects@FreeBSD.ORG Sat Feb 4 17:01:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A280816A423; Sat, 4 Feb 2006 17:01:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 647DB16A420 for ; Sat, 4 Feb 2006 17:01:01 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18FB843D46 for ; Sat, 4 Feb 2006 17:01:01 +0000 (GMT) (envelope-from cognet@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 k14H10kU034651 for ; Sat, 4 Feb 2006 17:01:00 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14H10ec034648 for perforce@freebsd.org; Sat, 4 Feb 2006 17:01:00 GMT (envelope-from cognet@freebsd.org) Date: Sat, 4 Feb 2006 17:01:00 GMT Message-Id: <200602041701.k14H10ec034648@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 91080 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 17:01:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=91080 Change 91080 by cognet@cognet on 2006/02/04 17:00:11 getopt() returns an int, so use that instead of a signed char. Spotted out by: mux Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#10 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#13 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#4 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -65,7 +65,7 @@ int main(int argc, char **argv) { - signed char ch; + int ch; unsigned int trigger = 0; if (argc != 2) ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#10 $ */ #include @@ -708,7 +708,7 @@ int main(int argc, char **argv) { - signed char ch; + int ch; int debug = 0; int rc; ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#13 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#13 $ */ /* @@ -529,7 +529,7 @@ FILE *fp; int i; char *objval, *converr; - signed char ch; + int ch; char timestr[128]; char *fname; ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#9 $ */ /* @@ -105,7 +105,7 @@ int main(int argc, char **argv) { - signed char ch; + int ch; int i; FILE *fp; From owner-p4-projects@FreeBSD.ORG Sat Feb 4 17:02:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14F9E16A425; Sat, 4 Feb 2006 17:02:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9F0B16A422 for ; Sat, 4 Feb 2006 17:02:03 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E397B43D4C for ; Sat, 4 Feb 2006 17:02:02 +0000 (GMT) (envelope-from brueffer@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 k14H22sM034724 for ; Sat, 4 Feb 2006 17:02:02 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14H22JL034721 for perforce@freebsd.org; Sat, 4 Feb 2006 17:02:02 GMT (envelope-from brueffer@freebsd.org) Date: Sat, 4 Feb 2006 17:02:02 GMT Message-Id: <200602041702.k14H22JL034721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91081 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 17:02:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=91081 Change 91081 by brueffer@brueffer_serenity on 2006/02/04 17:01:41 Various spelling and formatting fixes. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#8 edit .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#6 edit .. //depot/projects/trustedbsd/openbsm/man/audit_event.5#6 edit .. //depot/projects/trustedbsd/openbsm/man/auditon.2#7 edit .. //depot/projects/trustedbsd/openbsm/man/getaudit.2#5 edit .. //depot/projects/trustedbsd/openbsm/man/getauid.2#5 edit .. //depot/projects/trustedbsd/openbsm/man/setaudit.2#5 edit .. //depot/projects/trustedbsd/openbsm/man/setauid.2#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#8 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 @@ -204,7 +204,7 @@ token contains an IP packet header in network byte order. An .Dv ip -token can be cread using +token can be created using .Xr au_to_ip 3 . .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description @@ -249,7 +249,7 @@ A .Dv path token can be created using -.Xr auto_path 3 . +.Xr au_to_path 3 . .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" @@ -262,7 +262,7 @@ token contains a set of nul-terminated path names. The .Xr libbsm 3 -API cannot currently create an +API cannot currently create a .Dv path_attr token. .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" @@ -283,7 +283,7 @@ This includes both the traditional .Ux security properties, such as user IDs and group IDs, but also audit -information such as the audit user ID and sesion. +information such as the audit user ID and session. A .Dv process token can be created using @@ -310,12 +310,12 @@ .Dv process token, with the addition of a machine address type and variable length address storage capable of containing IPv6 addresses. -A +An .Dv expanded process token can be created using .Xr au_to_process32_ex 3 or -.Xr au_to_process64 3 . +.Xr au_to_process64_ex 3 . .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" @@ -385,7 +385,7 @@ .Dv subject token, with the addition of type/length and variable size machine address information in the terminal ID. -A +An .Dv expanded subject token can be created using .Xr au_to_subject32_ex 3 @@ -412,7 +412,7 @@ .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "object ID type" Ta "1 byte" Ta "Object ID" +.It Li "Object ID type" Ta "1 byte" Ta "Object ID" .It Li "Object ID" Ta "4 bytes" Ta "Object ID" .El .Ss Text Token @@ -438,7 +438,7 @@ .Dv path tokens may also be present in an audit record indicating which path, if any, was used to reach the object. -A +An .Dv attribute token can be created using .Xr au_to_attr32 3 @@ -593,8 +593,8 @@ .It Li XXXXX .El .Sh SEE ALSO -.Xr audit 8, -.Xr libbsm 3 +.Xr libbsm 3 , +.Xr audit 8 .Sh AUTHORS The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#6 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#6 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_CONTROL 5 @@ -63,7 +63,7 @@ Not currently used as the value of 20 percent is chosen by the kernel. .El .Sh AUDIT FLAGS -Audit flags are a comma delimited list of audit classes as defined in the +Audit flags are a comma-delimited list of audit classes as defined in the audit_class file. See .Xr audit_class 5 @@ -78,9 +78,9 @@ .It ^ Record both successful and failed events .It ^+ -Don't record successful events +Do not record successful events .It ^- -Don't record failed events +Do not record failed events .El .Sh DEFAULT The following settings appear in the default @@ -104,9 +104,9 @@ .El .Sh SEE ALSO .Xr audit 1 , -.Xr auditd 8 , .Xr audit_class 5 , -.Xr audit_user 5 +.Xr audit_user 5 , +.Xr auditd 8 .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. ==== //depot/projects/trustedbsd/openbsm/man/audit_event.5#6 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#6 $ .\" .Dd Jan 24, 2004 .Dt AUDIT_EVENT 5 @@ -42,7 +42,9 @@ .Dl eventnum:eventname:description:eventclass . Each .Vt eventclass -should have a corresponding entry in the audit_class file. +should have a corresponding entry in the +.Pa audit_class +file. See .Xr audit_class 5 for details. ==== //depot/projects/trustedbsd/openbsm/man/auditon.2#7 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#7 $ .\" .Dd April 19, 2005 .Dt AUDITON 2 @@ -53,8 +53,9 @@ .It Dv A_SETPOLICY Set audit policy flags. .Ft *data -must point to an long value set to one of the audit -policy control values defined in audit.h. +must point to a long value set to one of the audit +policy control values defined in +.Pa audit.h . Currently, only .Dv AUDIT_CNT and @@ -83,7 +84,7 @@ .It Dv A_SETQCTRL Set kernel audit queue parameters. .Ft *data -must point to a +must point to a .Ft au_qctrl_t structure containing the kernel audit queue control settings: @@ -106,7 +107,7 @@ .It Dv A_SETCOND Set the current auditing condition. .Ft *data -must point to an long value containing the new +must point to a long value containing the new audit condition, one of .Dv AUC_AUDITING , .Dv AUC_NOAUDIT , @@ -115,13 +116,13 @@ .It Dv A_SETCLASS Set the event class preselection mask for an audit event. .Ft *data -must point to a +must point to a .Ft au_evclass_map_t structure containing the audit event and mask. .It Dv A_SETPMASK Set the preselection masks for a process. .Ft *data -must point to a +must point to a .Ft auditpinfo_t structure that contains the given process's audit preselection masks for both success and failure. @@ -167,7 +168,7 @@ .It Dv A_GETPOLICY Return the current audit policy setting. .Ft *data -must point to an long value which will be set to +must point to a long value which will be set to one of the current audit policy flags. Currently, only .Dv AUDIT_CNT @@ -188,8 +189,8 @@ .Ft au_fstat_t structure. The .Ft af_filesz -field will set to the maximum audit log file size. A value of 0 -indicates no limit to the size. +field will be set to the maximum audit log file size. +A value of 0 indicates no limit to the size. The .Ft af_filesz will be set to the current audit log file size. @@ -227,7 +228,9 @@ .Dv AUDIT_TRIGGER_OPEN_NEW (open a new audit log file), .Dv AUDIT_TRIGGER_READ_FILE -(read the audit_control file), +(read the +.Pa audit_control +file), .Dv AUDIT_TRIGGER_CLOSE_AND_DIE (close the current log file and exit), or ==== //depot/projects/trustedbsd/openbsm/man/getaudit.2#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#5 $ .\" .Dd April 19, 2005 .Dt GETAUDIT 2 @@ -50,7 +50,7 @@ and .Va length . .Pp -This system call required appropriate privilege to complete. +This system call requires appropriate privilege to complete. .Sh RETURN VALUES .Nm returns 0 on success, or returns -1 on failure, providing additional error ==== //depot/projects/trustedbsd/openbsm/man/getauid.2#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/getauid.2#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/getauid.2#5 $ .\" .Dd April 19, 2005 .Dt GETAUID 2 @@ -42,7 +42,7 @@ pointed to by .Va auid . .Pp -This system call required appropriate privilege to complete. +This system call requires appropriate privilege to complete. .Sh RETURN VALUES .Nm returns 0 on success, or returns -1 on failure, providing additional error ==== //depot/projects/trustedbsd/openbsm/man/setaudit.2#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#5 $ .\" .Dd April 19, 2005 .Dt SETAUDIT 2 @@ -50,7 +50,7 @@ and .Va length . .Pp -This system call required appropriate privilege to complete. +This system call requires appropriate privilege to complete. .Sh RETURN VALUES .Nm returns 0 on success, or returns -1 on failure, providing additional error ==== //depot/projects/trustedbsd/openbsm/man/setauid.2#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/setauid.2#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/setauid.2#5 $ .\" .Dd April 19, 2005 .Dt SETAUID 2 @@ -42,7 +42,7 @@ pointed to by .Va auid . .Pp -This system call required appropriate privilege to complete. +This system call requires appropriate privilege to complete. .Sh RETURN VALUES .Nm returns 0 on success, or returns -1 on failure, providing additional error From owner-p4-projects@FreeBSD.ORG Sat Feb 4 18:01:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D37816A423; Sat, 4 Feb 2006 18:01:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE5EB16A420 for ; Sat, 4 Feb 2006 18:01:14 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0DAD43D45 for ; Sat, 4 Feb 2006 18:01:14 +0000 (GMT) (envelope-from brueffer@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 k14I1EXC037054 for ; Sat, 4 Feb 2006 18:01:14 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14I1EsV037051 for perforce@freebsd.org; Sat, 4 Feb 2006 18:01:14 GMT (envelope-from brueffer@freebsd.org) Date: Sat, 4 Feb 2006 18:01:14 GMT Message-Id: <200602041801.k14I1EsV037051@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91083 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 18:01:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=91083 Change 91083 by brueffer@brueffer_serenity on 2006/02/04 18:00:19 Adapt to a recent change of audit_control defaults. While here, properly mark up a filename. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#7 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#7 $ .\" -.Dd Jan 24, 2004 +.Dd Jan 04, 2006 .Dt AUDIT_CONTROL 5 .Os .Sh NAME @@ -64,7 +64,8 @@ .El .Sh AUDIT FLAGS Audit flags are a comma-delimited list of audit classes as defined in the -audit_class file. +.Pa audit_class +file. See .Xr audit_class 5 for details. @@ -88,7 +89,7 @@ file: .Bd -literal -offset indent dir:/var/audit -flags:lo,ad,-all,^-fc,^-cl +flags:lo minfree:20 naflags:lo .Ed @@ -96,8 +97,7 @@ The .Va flags parameter above specifies the system-wide mask corresponding to login/logout -events, administrative events, and all failures except for failures in creating -or closing files. +events. .Sh FILES .Bl -tag -width "/etc/security/audit_control" -compact .It Pa /etc/security/audit_control From owner-p4-projects@FreeBSD.ORG Sat Feb 4 18:10:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE44C16A423; Sat, 4 Feb 2006 18:10:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A046816A420 for ; Sat, 4 Feb 2006 18:10:27 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5826243D45 for ; Sat, 4 Feb 2006 18:10:27 +0000 (GMT) (envelope-from brueffer@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 k14IARaU037461 for ; Sat, 4 Feb 2006 18:10:27 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14IAQQ5037458 for perforce@freebsd.org; Sat, 4 Feb 2006 18:10:26 GMT (envelope-from brueffer@freebsd.org) Date: Sat, 4 Feb 2006 18:10:26 GMT Message-Id: <200602041810.k14IAQQ5037458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91086 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 18:10:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=91086 Change 91086 by brueffer@brueffer_serenity on 2006/02/04 18:09:36 Use the standard mdoc date format. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit_class.5#6 edit .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#8 edit .. //depot/projects/trustedbsd/openbsm/man/audit_event.5#7 edit .. //depot/projects/trustedbsd/openbsm/man/audit_user.5#6 edit .. //depot/projects/trustedbsd/openbsm/man/audit_warn.5#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit_class.5#6 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#6 $ .\" -.Dd Jan 24, 2004 +.Dd January 24, 2004 .Dt AUDIT_CLASS 5 .Os .Sh NAME ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#8 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#8 $ .\" -.Dd Jan 04, 2006 +.Dd January 4, 2006 .Dt AUDIT_CONTROL 5 .Os .Sh NAME ==== //depot/projects/trustedbsd/openbsm/man/audit_event.5#7 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#7 $ .\" -.Dd Jan 24, 2004 +.Dd January 24, 2004 .Dt AUDIT_EVENT 5 .Os .Sh NAME ==== //depot/projects/trustedbsd/openbsm/man/audit_user.5#6 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#6 $ .\" -.Dd Jan 24, 2004 +.Dd January 24, 2004 .Dt AUDIT_USER 5 .Os .Sh NAME ==== //depot/projects/trustedbsd/openbsm/man/audit_warn.5#6 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_warn.5#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_warn.5#6 $ .\" -.Dd Mar 17, 2004 +.Dd March 17, 2004 .Dt AUDIT_WARN 5 .Os .Sh NAME From owner-p4-projects@FreeBSD.ORG Sat Feb 4 18:31:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1503C16A423; Sat, 4 Feb 2006 18:31:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CDB5A16A420 for ; Sat, 4 Feb 2006 18:31:53 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87D1843D45 for ; Sat, 4 Feb 2006 18:31:53 +0000 (GMT) (envelope-from brueffer@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 k14IVrEZ038431 for ; Sat, 4 Feb 2006 18:31:53 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14IVriT038428 for perforce@freebsd.org; Sat, 4 Feb 2006 18:31:53 GMT (envelope-from brueffer@freebsd.org) Date: Sat, 4 Feb 2006 18:31:53 GMT Message-Id: <200602041831.k14IVriT038428@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91087 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 18:31:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=91087 Change 91087 by brueffer@brueffer_serenity on 2006/02/04 18:31:05 Use standard mdoc date format. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#5 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#7 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#9 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#5 (text+ko) ==== @@ -29,9 +29,9 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#5 $ .\" -.Dd Jan 24, 2004 +.Dd January 24, 2004 .Dt AUDIT 8 .Os .Sh NAME ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#7 (text+ko) ==== @@ -29,9 +29,9 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#7 $ .\" -.Dd Jan 24, 2004 +.Dd January 24, 2004 .Dt AUDITD 8 .Os .Sh NAME ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#9 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#9 $ .\" -.Dd Jan 24, 2004 +.Dd January 24, 2004 .Dt AUDITREDUCE 1 .Os .Sh NAME ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#8 (text+ko) ==== @@ -25,9 +25,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#8 $ .\" -.Dd Jan 24, 2004 +.Dd January 24, 2004 .Dt PRAUDIT 1 .Os .Sh NAME From owner-p4-projects@FreeBSD.ORG Sat Feb 4 18:34:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C0B916A423; Sat, 4 Feb 2006 18:34:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F2A3616A420 for ; Sat, 4 Feb 2006 18:34:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B14C043D46 for ; Sat, 4 Feb 2006 18:34:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14IYvaQ038561 for ; Sat, 4 Feb 2006 18:34:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14IYvjR038558 for perforce@freebsd.org; Sat, 4 Feb 2006 18:34:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 18:34:57 GMT Message-Id: <200602041834.k14IYvjR038558@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91088 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 18:34:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=91088 Change 91088 by rwatson@rwatson_peppercorn on 2006/02/04 18:34:31 Integrate login.c to login_audit.c, which will hold audit-related routines. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Feb 4 18:42:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A62D516A423; Sat, 4 Feb 2006 18:42:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3998D16A420 for ; Sat, 4 Feb 2006 18:42:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDA3B43D45 for ; Sat, 4 Feb 2006 18:42:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14Ig0OS038944 for ; Sat, 4 Feb 2006 18:42:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14Ig0Po038938 for perforce@freebsd.org; Sat, 4 Feb 2006 18:42:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 18:42:00 GMT Message-Id: <200602041842.k14Ig0Po038938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91090 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 18:42:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=91090 Change 91090 by rwatson@rwatson_peppercorn on 2006/02/04 18:41:45 Move audit code from login.c to login_audit.c. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#5 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#9 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.h#2 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#5 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/usr.bin/login/Makefile,v 1.48 2004/11/03 18:01:19 ru Exp $ PROG= login -SRCS= login.c login_fbtab.c +SRCS= login.c login_audit.c login_fbtab.c CFLAGS+=-DLOGALL DPADD= ${LIBUTIL} ${LIBPAM} LDADD+= -lutil ${MINUSLPAM} -lbsm ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#9 (text+ko) ==== @@ -37,37 +37,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* - * Copyright (c) 2005 Apple Computer, Inc. All rights reserved. - * - * @APPLE_BSD_LICENSE_HEADER_START@ - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * @APPLE_BSD_LICENSE_HEADER_END@ - */ #if 0 #ifndef lint @@ -130,8 +99,6 @@ static void sigint(int); static void timedout(int); static void usage(void); -static void au_success(void); -static void au_fail(char *, int); #define TTYGRPNAME "tty" /* group to own ttys */ #define DEFAULT_BACKOFF 3 @@ -807,152 +774,6 @@ return (1); } -/* - * The following tokens are included in the audit record for a successful - * login: header, subject, return. - */ -static void -au_success(void) -{ - token_t *tok; - int aufd; - au_mask_t aumask; - auditinfo_t auinfo; - uid_t uid = pwd->pw_uid; - gid_t gid = pwd->pw_gid; - pid_t pid = getpid(); - long au_cond; - - /* If we are not auditing, don't cut an audit record; just return. */ - if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { - if (errno == ENOSYS) - return; - fprintf(stderr, - "login: Could not determine audit condition\n"); - exit(1); - } - if (au_cond == AUC_NOAUDIT) - return; - - /* Compute and set the user's preselection mask. */ - if (au_user_mask(pwd->pw_name, &aumask) == -1) { - fprintf(stderr, "login: Could not set audit mask\n"); - exit(1); - } - - /* Set the audit info for the user. */ - auinfo.ai_auid = uid; - auinfo.ai_asid = pid; - bcopy(&tid, &auinfo.ai_termid, sizeof(auinfo.ai_termid)); - bcopy(&aumask, &auinfo.ai_mask, sizeof(auinfo.ai_mask)); - if (setaudit(&auinfo) != 0) { - fprintf(stderr, "login: setaudit failed: %s\n", - strerror(errno)); - exit(1); - } - - if ((aufd = au_open()) == -1) { - fprintf(stderr, "login: Audit Error: au_open() failed\n"); - exit(1); - } - - /* The subject that is created (euid, egid of the current process). */ - if ((tok = au_to_subject32(uid, geteuid(), getegid(), - uid, gid, pid, pid, &tid)) == NULL) { - fprintf(stderr, - "login: Audit Error: au_to_subject32() failed\n"); - exit(1); - } - au_write(aufd, tok); - - if ((tok = au_to_return32(0, 0)) == NULL) { - fprintf(stderr, - "login: Audit Error: au_to_return32() failed\n"); - exit(1); - } - au_write(aufd, tok); - - if (au_close(aufd, 1, AUE_login) == -1) { - fprintf(stderr, "login: Audit Record was not committed.\n"); - exit(1); - } -} - -/* - * The following tokens are included in the audit record for failed - * login attempts: header, subject, text, return. - */ -static void -au_fail(char *errmsg, int na) -{ - token_t *tok; - int aufd; - long au_cond; - uid_t uid; - gid_t gid; - pid_t pid = getpid(); - - /* If we are not auditing, don't cut an audit record; just return. */ - if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { - if (errno == ENOSYS) - return; - fprintf(stderr, - "login: Could not determine audit condition\n"); - exit(1); - } - if (au_cond == AUC_NOAUDIT) - return; - - if ((aufd = au_open()) == -1) { - fprintf(stderr, "login: Audit Error: au_open() failed\n"); - exit(1); - } - - if (na) { - /* - * Non attributable event. Assuming that login is not called - * within a user's session => auid,asid == -1. - */ - if ((tok = au_to_subject32(-1, geteuid(), getegid(), -1, -1, - pid, -1, &tid)) == NULL) { - fprintf(stderr, - "login: Audit Error: au_to_subject32() failed\n"); - exit(1); - } - } else { - /* We know the subject -- so use its value instead. */ - uid = pwd->pw_uid; - gid = pwd->pw_gid; - if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, - gid, pid, pid, &tid)) == NULL) { - fprintf(stderr, - "login: Audit Error: au_to_subject32() failed\n"); - exit(1); - } - } - au_write(aufd, tok); - - /* Include the error message. */ - if ((tok = au_to_text(errmsg)) == NULL) { - fprintf(stderr, "login: Audit Error: au_to_text() failed\n"); - exit(1); - } - au_write(aufd, tok); - - if ((tok = au_to_return32(1, errno)) == NULL) { - fprintf(stderr, - "login: Audit Error: au_to_return32() failed\n"); - exit(1); - } - au_write(aufd, tok); - - if (au_close(aufd, 1, AUE_login) == -1) { - fprintf(stderr, - "login: Audit Error: au_close() was not committed\n"); - exit(1); - } -} - static void usage() { ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.h#2 (text+ko) ==== @@ -27,4 +27,8 @@ void login_fbtab(char *, uid_t, gid_t); -extern char **environ; +void au_success(void); +void au_fail(char *errmsg, int na); + +extern char **environ; +extern struct passwd *pwd; ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#2 (text+ko) ==== @@ -1,42 +1,3 @@ -/*- - * Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * Copyright (c) 2002 Networks Associates Technologies, Inc. - * All rights reserved. - * - * Portions of this software were developed for the FreeBSD Project by - * ThinkSec AS and NAI Labs, the Security Research Division of Network - * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 - * ("CBOSS"), as part of the DARPA CHATS research program. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ /* * Copyright (c) 2005 Apple Computer, Inc. All rights reserved. * @@ -76,7 +37,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/login/login.c,v 1.99 2005/06/01 12:23:06 maxim Exp $"); +__FBSDID("$FreeBSD$"); /* * login [ name ] @@ -84,7 +45,6 @@ * login -f name (for pre-authenticated login: datakit, xterm, etc.) */ -#include #include #include #include @@ -116,702 +76,16 @@ #include "login.h" #include "pathnames.h" -static int auth_pam(void); -static void bail(int, int); -static int export(const char *); -static void export_pam_environment(void); -static int motd(const char *); -static void badlogin(char *); -static char *getloginname(void); -static void pam_syslog(const char *); -static void pam_cleanup(void); -static void refused(const char *, const char *, int); -static const char *stypeof(char *); -static void sigint(int); -static void timedout(int); -static void usage(void); -static void au_success(void); -static void au_fail(char *, int); - -#define TTYGRPNAME "tty" /* group to own ttys */ -#define DEFAULT_BACKOFF 3 -#define DEFAULT_RETRIES 10 -#define DEFAULT_PROMPT "login: " -#define DEFAULT_PASSWD_PROMPT "Password:" -#define TERM_UNKNOWN "su" -#define DEFAULT_WARN (2L * 7L * 86400L) /* Two weeks */ -#define NO_SLEEP_EXIT 0 -#define SLEEP_EXIT 5 - -/* - * This bounds the time given to login. Not a define so it can - * be patched on machines where it's too small. - */ -static u_int timeout = 300; - -/* Buffer for signal handling of timeout */ -static jmp_buf timeout_buf; - -struct passwd *pwd; -static int failures; - -static char *envinit[1]; /* empty environment list */ - -/* - * Command line flags and arguments - */ -static int fflag; /* -f: do not perform authentication */ -static int hflag; /* -h: login from remote host */ -static char *hostname; /* hostname from command line */ -static int pflag; /* -p: preserve environment */ - /* - * User name - */ -static char *username; /* user name */ -static char *olduser; /* previous user name */ - -/* - * Prompts - */ -static char default_prompt[] = DEFAULT_PROMPT; -static const char *prompt; -static char default_passwd_prompt[] = DEFAULT_PASSWD_PROMPT; -static const char *passwd_prompt; - -static char *tty; - -/* - * PAM data - */ -static pam_handle_t *pamh = NULL; -static struct pam_conv pamc = { openpam_ttyconv, NULL }; -static int pam_err; -static int pam_silent = PAM_SILENT; -static int pam_cred_established; -static int pam_session_established; - -/* * Audit data */ au_tid_t tid; -int -main(int argc, char *argv[]) -{ - struct group *gr; - struct stat st; - int retries, backoff; - int ask, ch, cnt, quietlog, rootlogin, rval; - uid_t uid, euid; - gid_t egid; - char *term; - char *p, *ttyn; - char tname[sizeof(_PATH_TTY) + 10]; - char *arg0; - const char *tp; - const char *shell = NULL; - login_cap_t *lc = NULL; - login_cap_t *lc_user = NULL; - pid_t pid; - char auditsuccess = 1; - - (void)signal(SIGQUIT, SIG_IGN); - (void)signal(SIGINT, SIG_IGN); - (void)signal(SIGHUP, SIG_IGN); - if (setjmp(timeout_buf)) { - if (failures) - badlogin(username); - (void)fprintf(stderr, "Login timed out after %d seconds\n", - timeout); - bail(NO_SLEEP_EXIT, 0); - } - (void)signal(SIGALRM, timedout); - (void)alarm(timeout); - (void)setpriority(PRIO_PROCESS, 0, 0); - - openlog("login", LOG_ODELAY, LOG_AUTH); - - uid = getuid(); - euid = geteuid(); - egid = getegid(); - - while ((ch = getopt(argc, argv, "fh:p")) != -1) - switch (ch) { - case 'f': - fflag = 1; - break; - case 'h': - if (uid != 0) - errx(1, "-h option: %s", strerror(EPERM)); - if (strlen(optarg) >= MAXHOSTNAMELEN) - errx(1, "-h option: %s: exceeds maximum " - "hostname size", optarg); - hflag = 1; - hostname = optarg; - break; - case 'p': - pflag = 1; - break; - case '?': - default: - if (uid == 0) - syslog(LOG_ERR, "invalid flag %c", ch); - usage(); - } - argc -= optind; - argv += optind; - - if (argc > 0) { - username = strdup(*argv); - if (username == NULL) - err(1, "strdup()"); - ask = 0; - } else { - ask = 1; - } - - setproctitle("-%s", getprogname()); - - for (cnt = getdtablesize(); cnt > 2; cnt--) - (void)close(cnt); - - /* - * Get current TTY - */ - ttyn = ttyname(STDIN_FILENO); - if (ttyn == NULL || *ttyn == '\0') { - (void)snprintf(tname, sizeof(tname), "%s??", _PATH_TTY); - ttyn = tname; - } - if ((tty = strrchr(ttyn, '/')) != NULL) - ++tty; - else - tty = ttyn; - - /* - * Get "login-retries" & "login-backoff" from default class - */ - lc = login_getclass(NULL); - prompt = login_getcapstr(lc, "login_prompt", - default_prompt, default_prompt); - passwd_prompt = login_getcapstr(lc, "passwd_prompt", - default_passwd_prompt, default_passwd_prompt); - retries = login_getcapnum(lc, "login-retries", - DEFAULT_RETRIES, DEFAULT_RETRIES); - backoff = login_getcapnum(lc, "login-backoff", - DEFAULT_BACKOFF, DEFAULT_BACKOFF); - login_close(lc); - lc = NULL; - - /* - * Try to authenticate the user until we succeed or time out. - */ - for (cnt = 0;; ask = 1) { - if (ask) { - fflag = 0; - if (olduser != NULL) - free(olduser); - olduser = username; - username = getloginname(); - } - rootlogin = 0; - - /* - * Note if trying multiple user names; log failures for - * previous user name, but don't bother logging one failure - * for nonexistent name (mistyped username). - */ - if (failures && strcmp(olduser, username) != 0) { - if (failures > (pwd ? 0 : 1)) - badlogin(olduser); - } - - /* - * Load the PAM policy and set some variables - */ - pam_err = pam_start("login", username, &pamc, &pamh); - if (pam_err != PAM_SUCCESS) { - pam_syslog("pam_start()"); - au_fail("PAM Error", 1); - bail(NO_SLEEP_EXIT, 1); - } - pam_err = pam_set_item(pamh, PAM_TTY, tty); - if (pam_err != PAM_SUCCESS) { - pam_syslog("pam_set_item(PAM_TTY)"); - au_fail("PAM Error", 1); - bail(NO_SLEEP_EXIT, 1); - } - pam_err = pam_set_item(pamh, PAM_RHOST, hostname); - if (pam_err != PAM_SUCCESS) { - pam_syslog("pam_set_item(PAM_RHOST)"); - au_fail("PAM Error", 1); - bail(NO_SLEEP_EXIT, 1); - } - - pwd = getpwnam(username); - if (pwd != NULL && pwd->pw_uid == 0) - rootlogin = 1; - - /* - * If the -f option was specified and the caller is - * root or the caller isn't changing their uid, don't - * authenticate. - */ - if (pwd != NULL && fflag && - (uid == (uid_t)0 || uid == (uid_t)pwd->pw_uid)) { - /* already authenticated */ - rval = 0; - auditsuccess = 0; /* opened a terminal window only */ - } else { - fflag = 0; - (void)setpriority(PRIO_PROCESS, 0, -4); - rval = auth_pam(); - (void)setpriority(PRIO_PROCESS, 0, 0); - } - - if (pwd && rval == 0) - break; - - pam_cleanup(); - - /* - * We are not exiting here, but this corresponds to a failed - * login event, so set exitstatus to 1. - */ - au_fail("Login incorrect", 1); - - (void)printf("Login incorrect\n"); - failures++; - - /* - * Allow up to 'retry' (10) attempts, but start - * backing off after 'backoff' (3) attempts. - */ - if (++cnt > backoff) { - if (cnt >= retries) { - badlogin(username); - bail(SLEEP_EXIT, 1); - } - sleep((u_int)((cnt - backoff) * 5)); - } - } - - /* committed to login -- turn off timeout */ - (void)alarm((u_int)0); - (void)signal(SIGHUP, SIG_DFL); - - endpwent(); - - /* Audit successful login. */ - if (auditsuccess) - au_success(); - - /* - * Establish the login class. - */ - lc = login_getpwclass(pwd); - lc_user = login_getuserclass(pwd); - - if (!(quietlog = login_getcapbool(lc_user, "hushlogin", 0))) - quietlog = login_getcapbool(lc, "hushlogin", 0); - - /* - * Switching needed for NFS with root access disabled. - * - * XXX: This change fails to modify the additional groups for the - * process, and as such, may restrict rights normally granted - * through those groups. - */ - (void)setegid(pwd->pw_gid); - (void)seteuid(rootlogin ? 0 : pwd->pw_uid); - if (!*pwd->pw_dir || chdir(pwd->pw_dir) < 0) { - if (login_getcapbool(lc, "requirehome", 0)) - refused("Home directory not available", "HOMEDIR", 1); - if (chdir("/") < 0) - refused("Cannot find root directory", "ROOTDIR", 1); - if (!quietlog || *pwd->pw_dir) - printf("No home directory.\nLogging in with home = \"/\".\n"); - pwd->pw_dir = strdup("/"); - if (pwd->pw_dir == NULL) { - syslog(LOG_NOTICE, "strdup(): %m"); - bail(SLEEP_EXIT, 1); - } - } - (void)seteuid(euid); - (void)setegid(egid); - if (!quietlog) { - quietlog = access(_PATH_HUSHLOGIN, F_OK) == 0; - if (!quietlog) - pam_silent = 0; - } - - shell = login_getcapstr(lc, "shell", pwd->pw_shell, pwd->pw_shell); - if (*pwd->pw_shell == '\0') - pwd->pw_shell = strdup(_PATH_BSHELL); - if (pwd->pw_shell == NULL) { - syslog(LOG_NOTICE, "strdup(): %m"); - bail(SLEEP_EXIT, 1); - } - if (*shell == '\0') /* Not overridden */ - shell = pwd->pw_shell; - if ((shell = strdup(shell)) == NULL) { - syslog(LOG_NOTICE, "strdup(): %m"); - bail(SLEEP_EXIT, 1); - } - - /* - * Set device protections, depending on what terminal the - * user is logged in. This feature is used on Suns to give - * console users better privacy. - */ - login_fbtab(tty, pwd->pw_uid, pwd->pw_gid); - - /* - * Clear flags of the tty. None should be set, and when the - * user sets them otherwise, this can cause the chown to fail. - * Since it isn't clear that flags are useful on character - * devices, we just clear them. - * - * We don't log in the case of EOPNOTSUPP because dev might be - * on NFS, which doesn't support chflags. - * - * We don't log in the EROFS because that means that /dev is on - * a read only file system and we assume that the permissions there - * are sane. - */ - if (ttyn != tname && chflags(ttyn, 0)) - if (errno != EOPNOTSUPP && errno != EROFS) - syslog(LOG_ERR, "chflags(%s): %m", ttyn); - if (ttyn != tname && chown(ttyn, pwd->pw_uid, - (gr = getgrnam(TTYGRPNAME)) ? gr->gr_gid : pwd->pw_gid)) - if (errno != EROFS) - syslog(LOG_ERR, "chown(%s): %m", ttyn); - - /* - * Exclude cons/vt/ptys only, assume dialup otherwise - * TODO: Make dialup tty determination a library call - * for consistency (finger etc.) - */ - if (hflag && isdialuptty(tty)) - syslog(LOG_INFO, "DIALUP %s, %s", tty, pwd->pw_name); - -#ifdef LOGALL - /* - * Syslog each successful login, so we don't have to watch - * hundreds of wtmp or lastlogin files. - */ - if (hflag) - syslog(LOG_INFO, "login from %s on %s as %s", - hostname, tty, pwd->pw_name); - else - syslog(LOG_INFO, "login on %s as %s", - tty, pwd->pw_name); -#endif - - /* - * If fflag is on, assume caller/authenticator has logged root - * login. - */ - if (rootlogin && fflag == 0) { - if (hflag) - syslog(LOG_NOTICE, "ROOT LOGIN (%s) ON %s FROM %s", - username, tty, hostname); - else - syslog(LOG_NOTICE, "ROOT LOGIN (%s) ON %s", - username, tty); - } - - /* - * Destroy environment unless user has requested its - * preservation - but preserve TERM in all cases - */ - term = getenv("TERM"); - if (!pflag) - environ = envinit; - if (term != NULL) - setenv("TERM", term, 0); - - /* - * PAM modules might add supplementary groups during pam_setcred(). - */ - if (setusercontext(lc, pwd, pwd->pw_uid, LOGIN_SETGROUP) != 0) { - syslog(LOG_ERR, "setusercontext() failed - exiting"); - bail(NO_SLEEP_EXIT, 1); - } - - pam_err = pam_setcred(pamh, pam_silent|PAM_ESTABLISH_CRED); - if (pam_err != PAM_SUCCESS) { - pam_syslog("pam_setcred()"); - bail(NO_SLEEP_EXIT, 1); - } - pam_cred_established = 1; - - pam_err = pam_open_session(pamh, pam_silent); - if (pam_err != PAM_SUCCESS) { - pam_syslog("pam_open_session()"); - bail(NO_SLEEP_EXIT, 1); - } - pam_session_established = 1; - - /* - * We must fork() before setuid() because we need to call - * pam_close_session() as root. - */ - pid = fork(); - if (pid < 0) { - err(1, "fork"); - } else if (pid != 0) { - /* - * Parent: wait for child to finish, then clean up - * session. - */ - int status; - setproctitle("-%s [pam]", getprogname()); - waitpid(pid, &status, 0); - bail(NO_SLEEP_EXIT, 0); - } - - /* - * NOTICE: We are now in the child process! - */ - - /* - * Add any environment variables the PAM modules may have set. - */ - export_pam_environment(); - - /* - * We're done with PAM now; our parent will deal with the rest. - */ - pam_end(pamh, 0); - pamh = NULL; - - /* - * We don't need to be root anymore, so set the login name and - * the UID. - */ - if (setlogin(username) != 0) { - syslog(LOG_ERR, "setlogin(%s): %m - exiting", username); - bail(NO_SLEEP_EXIT, 1); - } - if (setusercontext(lc, pwd, pwd->pw_uid, - LOGIN_SETALL & ~(LOGIN_SETLOGIN|LOGIN_SETGROUP)) != 0) { - syslog(LOG_ERR, "setusercontext() failed - exiting"); - exit(1); - } - - (void)setenv("SHELL", pwd->pw_shell, 1); - (void)setenv("HOME", pwd->pw_dir, 1); - /* Overwrite "term" from login.conf(5) for any known TERM */ - if (term == NULL && (tp = stypeof(tty)) != NULL) - (void)setenv("TERM", tp, 1); - else - (void)setenv("TERM", TERM_UNKNOWN, 0); - (void)setenv("LOGNAME", username, 1); - (void)setenv("USER", username, 1); - (void)setenv("PATH", rootlogin ? _PATH_STDPATH : _PATH_DEFPATH, 0); - - if (!quietlog) { - const char *cw; - - cw = login_getcapstr(lc, "copyright", NULL, NULL); - if (cw == NULL || motd(cw) == -1) - (void)printf("%s", copyright); - - (void)printf("\n"); - - cw = login_getcapstr(lc, "welcome", NULL, NULL); - if (cw != NULL && access(cw, F_OK) == 0) - motd(cw); - else - motd(_PATH_MOTDFILE); - - if (login_getcapbool(lc_user, "nocheckmail", 0) == 0 && - login_getcapbool(lc, "nocheckmail", 0) == 0) { - char *cx; - - /* $MAIL may have been set by class. */ - cx = getenv("MAIL"); - if (cx == NULL) { - asprintf(&cx, "%s/%s", - _PATH_MAILDIR, pwd->pw_name); - } - if (cx && stat(cx, &st) == 0 && st.st_size != 0) - (void)printf("You have %smail.\n", - (st.st_mtime > st.st_atime) ? "new " : ""); - if (getenv("MAIL") == NULL) - free(cx); - } - } - - login_close(lc_user); - login_close(lc); - - (void)signal(SIGALRM, SIG_DFL); - (void)signal(SIGQUIT, SIG_DFL); - (void)signal(SIGINT, SIG_DFL); - (void)signal(SIGTSTP, SIG_IGN); - - /* - * Login shells have a leading '-' in front of argv[0] - */ - p = strrchr(pwd->pw_shell, '/'); - if (asprintf(&arg0, "-%s", p ? p + 1 : pwd->pw_shell) >= MAXPATHLEN) { - syslog(LOG_ERR, "user: %s: shell exceeds maximum pathname size", - username); - errx(1, "shell exceeds maximum pathname size"); - } else if (arg0 == NULL) { - err(1, "asprintf()"); - } - - execlp(shell, arg0, (char *)0); - err(1, "%s", shell); - - /* - * That's it, folks! - */ -} - -/* - * Attempt to authenticate the user using PAM. Returns 0 if the user is - * authenticated, or 1 if not authenticated. If some sort of PAM system - * error occurs (e.g., the "/etc/pam.conf" file is missing) then this - * function returns -1. This can be used as an indication that we should - * fall back to a different authentication mechanism. - */ -static int -auth_pam(void) -{ - const char *tmpl_user; - const void *item; - int rval; - - pam_err = pam_authenticate(pamh, pam_silent); - switch (pam_err) { - - case PAM_SUCCESS: - /* - * With PAM we support the concept of a "template" - * user. The user enters a login name which is - * authenticated by PAM, usually via a remote service - * such as RADIUS or TACACS+. If authentication - * succeeds, a different but related "template" name - * is used for setting the credentials, shell, and - * home directory. The name the user enters need only - * exist on the remote authentication server, but the - * template name must be present in the local password - * database. - * - * This is supported by two various mechanisms in the - * individual modules. However, from the application's - * point of view, the template user is always passed - * back as a changed value of the PAM_USER item. - */ - pam_err = pam_get_item(pamh, PAM_USER, &item); - if (pam_err == PAM_SUCCESS) { - tmpl_user = (const char *)item; - if (strcmp(username, tmpl_user) != 0) - pwd = getpwnam(tmpl_user); - } else { - pam_syslog("pam_get_item(PAM_USER)"); - } - rval = 0; - break; - - case PAM_AUTH_ERR: - case PAM_USER_UNKNOWN: - case PAM_MAXTRIES: - rval = 1; - break; - - default: - pam_syslog("pam_authenticate()"); - rval = -1; - break; - } - - if (rval == 0) { - pam_err = pam_acct_mgmt(pamh, pam_silent); - switch (pam_err) { - case PAM_SUCCESS: - break; - case PAM_NEW_AUTHTOK_REQD: - pam_err = pam_chauthtok(pamh, - pam_silent|PAM_CHANGE_EXPIRED_AUTHTOK); - if (pam_err != PAM_SUCCESS) { - pam_syslog("pam_chauthtok()"); - rval = 1; - } - break; - default: - pam_syslog("pam_acct_mgmt()"); - rval = 1; - break; - } - } - - if (rval != 0) { - pam_end(pamh, pam_err); - pamh = NULL; - } - return (rval); -} - -/* - * Export any environment variables PAM modules may have set - */ -static void -export_pam_environment() -{ - char **pam_env; - char **pp; - - pam_env = pam_getenvlist(pamh); - if (pam_env != NULL) { - for (pp = pam_env; *pp != NULL; pp++) { - (void)export(*pp); - free(*pp); - } - } -} - -/* - * Perform sanity checks on an environment variable: - * - Make sure there is an '=' in the string. - * - Make sure the string doesn't run on too long. - * - Do not export certain variables. This list was taken from the - * Solaris pam_putenv(3) man page. - * Then export it. - */ -static int -export(const char *s) -{ - static const char *noexport[] = { - "SHELL", "HOME", "LOGNAME", "MAIL", "CDPATH", - "IFS", "PATH", NULL - }; - const char **pp; - size_t n; - - if (strlen(s) > 1024 || strchr(s, '=') == NULL) - return (0); - if (strncmp(s, "LD_", 3) == 0) - return (0); - for (pp = noexport; *pp != NULL; pp++) { - n = strlen(*pp); - if (s[n] == '=' && strncmp(s, *pp, n) == 0) - return (0); - } - (void)putenv(s); - return (1); -} - /* * The following tokens are included in the audit record for a successful >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 4 18:44:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 874E216A423; Sat, 4 Feb 2006 18:44:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B1E216A420 for ; Sat, 4 Feb 2006 18:44:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F336543D4C for ; Sat, 4 Feb 2006 18:44:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14Ii3dh039081 for ; Sat, 4 Feb 2006 18:44:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14Ii3DB039078 for perforce@freebsd.org; Sat, 4 Feb 2006 18:44:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 18:44:03 GMT Message-Id: <200602041844.k14Ii3DB039078@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 18:44:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=91091 Change 91091 by rwatson@rwatson_peppercorn on 2006/02/04 18:43:10 Rename audit functions to indicate that they are associated with login, so that when we add a logout function they are distinct. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#10 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.h#3 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#10 (text+ko) ==== @@ -300,19 +300,19 @@ pam_err = pam_start("login", username, &pamc, &pamh); if (pam_err != PAM_SUCCESS) { pam_syslog("pam_start()"); - au_fail("PAM Error", 1); + au_login_fail("PAM Error", 1); bail(NO_SLEEP_EXIT, 1); } pam_err = pam_set_item(pamh, PAM_TTY, tty); if (pam_err != PAM_SUCCESS) { pam_syslog("pam_set_item(PAM_TTY)"); - au_fail("PAM Error", 1); + au_login_fail("PAM Error", 1); bail(NO_SLEEP_EXIT, 1); } pam_err = pam_set_item(pamh, PAM_RHOST, hostname); if (pam_err != PAM_SUCCESS) { pam_syslog("pam_set_item(PAM_RHOST)"); - au_fail("PAM Error", 1); + au_login_fail("PAM Error", 1); bail(NO_SLEEP_EXIT, 1); } @@ -346,7 +346,7 @@ * We are not exiting here, but this corresponds to a failed * login event, so set exitstatus to 1. */ - au_fail("Login incorrect", 1); + au_login_fail("Login incorrect", 1); (void)printf("Login incorrect\n"); failures++; @@ -372,7 +372,7 @@ /* Audit successful login. */ if (auditsuccess) - au_success(); + au_login_success(); /* * Establish the login class. ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.h#3 (text+ko) ==== @@ -27,8 +27,8 @@ void login_fbtab(char *, uid_t, gid_t); -void au_success(void); -void au_fail(char *errmsg, int na); +void au_login_success(void); +void au_login_fail(char *errmsg, int na); extern char **environ; extern struct passwd *pwd; ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#3 (text+ko) ==== @@ -86,7 +86,7 @@ * login: header, subject, return. */ void -au_success(void) +au_login_success(void) { token_t *tok; int aufd; @@ -157,7 +157,7 @@ * login attempts: header, subject, text, return. */ void -au_fail(char *errmsg, int na) +au_login_fail(char *errmsg, int na) { token_t *tok; int aufd; From owner-p4-projects@FreeBSD.ORG Sat Feb 4 18:52:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4676A16A423; Sat, 4 Feb 2006 18:52:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F09D616A420 for ; Sat, 4 Feb 2006 18:52:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5688143D4C for ; Sat, 4 Feb 2006 18:52:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14IqHTk039412 for ; Sat, 4 Feb 2006 18:52:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14IqHJn039409 for perforce@freebsd.org; Sat, 4 Feb 2006 18:52:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 18:52:17 GMT Message-Id: <200602041852.k14IqHJn039409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 18:52:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=91092 Change 91092 by rwatson@rwatson_peppercorn on 2006/02/04 18:51:55 Audit logout. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#11 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#11 (text+ko) ==== @@ -959,6 +959,7 @@ { pam_cleanup(); + audit_logout(); (void)sleep(sec); exit(eval); } ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#4 (text+ko) ==== @@ -226,3 +226,57 @@ exit(1); } } + +/* + * The following tokens are included in the audit record for a logout: + * header, subject, return. + */ +void +audit_logout(void) +{ + token_t *tok; + int aufd; + au_mask_t aumask; + auditinfo_t auinfo; + uid_t uid = pwd->pw_uid; + gid_t gid = pwd->pw_gid; + pid_t pid = getpid(); + long au_cond; + + /* If we are not auditing, don't cut an audit record; just return. */ + if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { + if (errno == ENOSYS) + return; + fprintf(stderr, + "login: Could not determine audit condition\n"); + exit(1); + } + if (au_cond == AUC_NOAUDIT) + return; + + if ((aufd = au_open()) == -1) { + fprintf(stderr, "login: Audit Error: au_open() failed\n"); + exit(1); + } + + /* The subject that is created (euid, egid of the current process). */ + if ((tok = au_to_subject32(uid, geteuid(), getegid(), + uid, gid, pid, pid, &tid)) == NULL) { + fprintf(stderr, + "login: Audit Error: au_to_subject32() failed\n"); + exit(1); + } + au_write(aufd, tok); + + if ((tok = au_to_return32(0, 0)) == NULL) { + fprintf(stderr, + "login: Audit Error: au_to_return32() failed\n"); + exit(1); + } + au_write(aufd, tok); + + if (au_close(aufd, 1, AUE_logout) == -1) { + fprintf(stderr, "login: Audit Record was not committed.\n"); + exit(1); + } +} From owner-p4-projects@FreeBSD.ORG Sat Feb 4 19:07:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B35C16A423; Sat, 4 Feb 2006 19:07:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E89F16A420 for ; Sat, 4 Feb 2006 19:07:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13A4C43D46 for ; Sat, 4 Feb 2006 19:07:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14J7aiY039948 for ; Sat, 4 Feb 2006 19:07:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14J7aR5039945 for perforce@freebsd.org; Sat, 4 Feb 2006 19:07:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 19:07:36 GMT Message-Id: <200602041907.k14J7aR5039945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91093 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 19:07:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=91093 Change 91093 by rwatson@rwatson_zoo on 2006/02/04 19:06:37 Revert change from = to += in the audit3 branch, unclear how this crept in. Submitted by: wsalamon Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#6 (text+ko) ==== @@ -5,7 +5,7 @@ SRCS= login.c login_audit.c login_fbtab.c CFLAGS+=-DLOGALL DPADD= ${LIBUTIL} ${LIBPAM} -LDADD+= -lutil ${MINUSLPAM} -lbsm +LDADD= -lutil ${MINUSLPAM} -lbsm MAN= login.1 login.access.5 .if !defined(NO_SETUID_LOGIN) BINOWN= root From owner-p4-projects@FreeBSD.ORG Sat Feb 4 19:13:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99F1516A423; Sat, 4 Feb 2006 19:13:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 72E6F16A420 for ; Sat, 4 Feb 2006 19:13:45 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3EF7543D4C for ; Sat, 4 Feb 2006 19:13:45 +0000 (GMT) (envelope-from alc@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 k14JDjms040235 for ; Sat, 4 Feb 2006 19:13:45 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14JDiMg040232 for perforce@freebsd.org; Sat, 4 Feb 2006 19:13:44 GMT (envelope-from alc@freebsd.org) Date: Sat, 4 Feb 2006 19:13:44 GMT Message-Id: <200602041913.k14JDiMg040232@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 91094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 19:13:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=91094 Change 91094 by alc@alc_home on 2006/02/04 19:13:32 Preallocate memory for the reservation structures at initialization time. Use a simple free list to manage them. The motivation is that reservation allocation must not fail in certain circumstances, such as when a reservation is being preempted under low memory conditions. This change also permits the use of superpages within the kmem object on i386 because there is no longer the possibility of recursion within UMA. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_page.c#19 edit .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#15 edit .. //depot/projects/superpages/src/sys/vm/vm_reserve.h#3 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_page.c#19 (text+ko) ==== @@ -171,7 +171,7 @@ vm_page_startup(vm_offset_t vaddr) { vm_offset_t mapped; - vm_size_t npages; + vm_size_t npages, nreservations; vm_paddr_t page_range; vm_paddr_t new_end; int i; @@ -234,8 +234,22 @@ VM_PROT_READ | VM_PROT_WRITE); bzero((void *)mapped, end - new_end); uma_startup((void *)mapped, boot_pages); + end = new_end; /* + * Initialize the reservation structures. + */ + nreservations = 0; + for (i = 0; i < SP_LEVELS; i++) + nreservations += total >> (SP_ORDER(i) + PAGE_SHIFT); + new_end = end - (nreservations * sizeof(struct vm_reserve)); + new_end = trunc_page(new_end); + mapped = pmap_map(&vaddr, new_end, end, VM_PROT_READ | VM_PROT_WRITE); + bzero((void *)mapped, end - new_end); + preempt_init((void *)mapped, nreservations); + end = new_end; + + /* * Compute the number of pages of memory that will be available for * use (taking into account the overhead of a page structure per * page). @@ -243,8 +257,8 @@ first_page = phys_avail[0] / PAGE_SIZE; page_range = phys_avail[(nblocks - 1) * 2 + 1] / PAGE_SIZE - first_page; npages = (total - (page_range * sizeof(struct vm_page)) - - (end - new_end)) / PAGE_SIZE; - end = new_end; + round_page(boot_pages * UMA_SLAB_SIZE) - + round_page(nreservations * sizeof(struct vm_reserve))) / PAGE_SIZE; /* * Reserve an unmapped guard page to trap access to vm_page_array[-1]. @@ -283,11 +297,6 @@ pa += PAGE_SIZE; } } - - /* - * Initialize the reservation structures. - */ - preempt_init(); return (vaddr); } ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#15 (text+ko) ==== @@ -61,17 +61,16 @@ static reservation_t new_reserve(int level, vm_object_t object); static void reserve_procreate(reservation_t, vm_page_t); -static uma_zone_t sp_zone; - /* * Reservations in rres[level], with level=-1..SP_LEVELS-2, are those that, * if broken, will yield chunks of size at most SP_MAGN(level). * Fully populated reservations don't go here */ TAILQ_HEAD(sp_list, vm_reserve); -struct sp_list rres_store[SP_LEVELS]; -struct sp_list *rres = &rres_store[1]; /* just to shift indexes */ -struct mtx rres_mtx; +static struct sp_list rres_free; +static struct sp_list rres_store[SP_LEVELS]; +static struct sp_list *rres = &rres_store[1]; /* just to shift indexes */ +static struct mtx rres_mtx; /* * Determine the size of the reservation to create for the given @@ -127,7 +126,9 @@ if (child != NULL && child->popfrom == child->popto) { KASSERT(child->refcnt == 0, ("update_maxavail: child->refcnt != 0")); - uma_zfree(sp_zone, child); + mtx_lock(&rres_mtx); + TAILQ_INSERT_HEAD(&rres_free, child, next); + mtx_unlock(&rres_mtx); child = res->child[i] = NULL; } if (child == NULL) @@ -227,8 +228,11 @@ m->reserv = res->child[IDX(m, res)]; KASSERT(res->refcnt > 0, ("reserve_lazy_update: refcnt <= 0")); - if (--res->refcnt == 0) - uma_zfree(sp_zone, res); + if (--res->refcnt == 0) { + mtx_lock(&rres_mtx); + TAILQ_INSERT_HEAD(&rres_free, res, next); + mtx_unlock(&rres_mtx); + } } return (res); } @@ -236,9 +240,15 @@ static reservation_t new_reserve(int level, vm_object_t object) { + reservation_t sp; + KASSERT(level > -1, ("level > -1")); - reservation_t sp = uma_zalloc(sp_zone, M_NOWAIT | M_ZERO); + mtx_lock(&rres_mtx); + sp = TAILQ_FIRST(&rres_free); + TAILQ_REMOVE(&rres_free, sp, next); + mtx_unlock(&rres_mtx); KASSERT(sp,("new_reservation, uma_zalloc failed")); + bzero(sp, sizeof(*sp)); sp->level = level; sp->order = SP_ORDER(level); sp->rql = NO_RESQ; @@ -401,14 +411,15 @@ } void -preempt_init(void) +preempt_init(reservation_t reservation, int nreservations) { int i; - sp_zone = uma_zcreate("VM RESERVE", sizeof(struct vm_reserve), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE | UMA_ZONE_VM); - KASSERT(sp_zone,("preempt_init: unable to initialize sp_zone")); - + TAILQ_INIT(&rres_free); + for (i = 0; i < nreservations; i++) { + TAILQ_INSERT_TAIL(&rres_free, reservation, next); + reservation++; + } for (i = -1; i < SP_LEVELS - 1; i++) TAILQ_INIT(&rres[i]); mtx_init(&rres_mtx, "reservation queues", NULL, MTX_DEF); @@ -628,7 +639,9 @@ else if (sp->refcnt == 0) { /* empty: free */ KASSERT(sp->maxavail == 1 << sp->order, ("preempt_move maxavail=%d\n", sp->maxavail)); buddy_free(sp->first_page, sp->order); - uma_zfree(sp_zone, sp); + mtx_lock(&rres_mtx); + TAILQ_INSERT_HEAD(&rres_free, sp, next); + mtx_unlock(&rres_mtx); } else { KASSERT(sp->popto != sp->popfrom,("preempt_move: popto = popfrom")); sp->rql = logf(sp->maxavail); ==== //depot/projects/superpages/src/sys/vm/vm_reserve.h#3 (text+ko) ==== @@ -77,5 +77,5 @@ void reserve_populate(vm_page_t, reservation_t); void reserve_unpopulate(vm_page_t); -void preempt_init(void) ; +void preempt_init(reservation_t reservation, int nreservations); void preempt_destroy(vm_page_t m); From owner-p4-projects@FreeBSD.ORG Sat Feb 4 19:17:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29D8B16A423; Sat, 4 Feb 2006 19:17:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E13CD16A422 for ; Sat, 4 Feb 2006 19:17:02 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40F1B43D5F for ; Sat, 4 Feb 2006 19:16:52 +0000 (GMT) (envelope-from alc@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 k14JGnn7040382 for ; Sat, 4 Feb 2006 19:16:49 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14JGnwr040379 for perforce@freebsd.org; Sat, 4 Feb 2006 19:16:49 GMT (envelope-from alc@freebsd.org) Date: Sat, 4 Feb 2006 19:16:49 GMT Message-Id: <200602041916.k14JGnwr040379@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 91095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 19:17:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=91095 Change 91095 by alc@alc_home on 2006/02/04 19:16:37 Enable the use of superpages within the kmem object. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_object.c#10 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_object.c#10 (text+ko) ==== @@ -236,6 +236,8 @@ VM_OBJECT_LOCK_INIT(&kmem_object_store, "kmem object"); _vm_object_allocate(OBJT_DEFAULT, OFF_TO_IDX(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS), kmem_object); + kmem_object->pg_color = (u_short)atop(VM_MIN_KERNEL_ADDRESS); + vm_object_set_flag(kmem_object, OBJ_SUPERPAGES); /* * The lock portion of struct vm_object must be type stable due From owner-p4-projects@FreeBSD.ORG Sat Feb 4 19:21:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A184616A420; Sat, 4 Feb 2006 19:21:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5447D16A420 for ; Sat, 4 Feb 2006 19:21:56 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 172CD43D46 for ; Sat, 4 Feb 2006 19:21:56 +0000 (GMT) (envelope-from alc@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 k14JLt0B040582 for ; Sat, 4 Feb 2006 19:21:55 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14JLtmG040579 for perforce@freebsd.org; Sat, 4 Feb 2006 19:21:55 GMT (envelope-from alc@freebsd.org) Date: Sat, 4 Feb 2006 19:21:55 GMT Message-Id: <200602041921.k14JLtmG040579@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 91096 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 19:21:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=91096 Change 91096 by alc@alc_home on 2006/02/04 19:21:22 Enable promotion of superpages within the kmem object. Affected files ... .. //depot/projects/superpages/src/sys/i386/i386/pmap.c#6 edit Differences ... ==== //depot/projects/superpages/src/sys/i386/i386/pmap.c#6 (text+ko) ==== @@ -2198,7 +2198,7 @@ * be superpage aligned */ if (((mpte != NULL && mpte->wire_count == NPTEPG) || - m->object == kernel_object || (m->object == kmem_object && FALSE)) && + m->object == kernel_object || m->object == kmem_object) && m->reserv != NULL && m->reserv->refcnt == NBPDR / PAGE_SIZE) { #ifdef INVARIANTS From owner-p4-projects@FreeBSD.ORG Sat Feb 4 19:43:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CB4016A423; Sat, 4 Feb 2006 19:43:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4400016A420 for ; Sat, 4 Feb 2006 19:43:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE8A843D46 for ; Sat, 4 Feb 2006 19:43:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14JhMZ2042073 for ; Sat, 4 Feb 2006 19:43:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14JhMxd042070 for perforce@freebsd.org; Sat, 4 Feb 2006 19:43:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 19:43:22 GMT Message-Id: <200602041943.k14JhMxd042070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 19:43:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=91098 Change 91098 by rwatson@rwatson_zoo on 2006/02/04 19:43:03 Remove trailing white space. Remove unneeded includes. Use errx(3) and err(3) instead of fprintf()/exit(). Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#5 (text+ko) ==== @@ -2,20 +2,20 @@ * Copyright (c) 2005 Apple Computer, Inc. All rights reserved. * * @APPLE_BSD_LICENSE_HEADER_START@ - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -26,16 +26,10 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * @APPLE_BSD_LICENSE_HEADER_END@ */ -#if 0 -#ifndef lint -static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94"; -#endif -#endif - #include __FBSDID("$FreeBSD$"); @@ -45,36 +39,17 @@ * login -f name (for pre-authenticated login: datakit, xterm, etc.) */ -#include -#include -#include -#include -#include -#include +#include #include #include #include #include -#include -#include -#include #include -#include -#include #include -#include -#include -#include -#include -#include - -#include -#include #include "login.h" -#include "pathnames.h" /* * Audit data @@ -82,9 +57,9 @@ au_tid_t tid; /* - * The following tokens are included in the audit record for a successful + * The following tokens are included in the audit record for a successful * login: header, subject, return. - */ + */ void au_login_success(void) { @@ -101,61 +76,43 @@ if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno == ENOSYS) return; - fprintf(stderr, - "login: Could not determine audit condition\n"); - exit(1); + errx(1, "login: Could not determine audit condition"); } if (au_cond == AUC_NOAUDIT) return; - /* Compute and set the user's preselection mask. */ - if (au_user_mask(pwd->pw_name, &aumask) == -1) { - fprintf(stderr, "login: Could not set audit mask\n"); - exit(1); - } + /* Compute and set the user's preselection mask. */ + if (au_user_mask(pwd->pw_name, &aumask) == -1) + errx(1, "login: Could not set audit mask\n"); /* Set the audit info for the user. */ auinfo.ai_auid = uid; auinfo.ai_asid = pid; bcopy(&tid, &auinfo.ai_termid, sizeof(auinfo.ai_termid)); bcopy(&aumask, &auinfo.ai_mask, sizeof(auinfo.ai_mask)); - if (setaudit(&auinfo) != 0) { - fprintf(stderr, "login: setaudit failed: %s\n", - strerror(errno)); - exit(1); - } + if (setaudit(&auinfo) != 0) + err(1, "login: setaudit failed"); - if ((aufd = au_open()) == -1) { - fprintf(stderr, "login: Audit Error: au_open() failed\n"); - exit(1); - } + if ((aufd = au_open()) == -1) + errx(1,"login: Audit Error: au_open() failed"); - /* The subject that is created (euid, egid of the current process). */ - if ((tok = au_to_subject32(uid, geteuid(), getegid(), - uid, gid, pid, pid, &tid)) == NULL) { - fprintf(stderr, - "login: Audit Error: au_to_subject32() failed\n"); - exit(1); - } + if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, gid, pid, + pid, &tid)) == NULL) + errx(1, "login: Audit Error: au_to_subject32() failed"); au_write(aufd, tok); - if ((tok = au_to_return32(0, 0)) == NULL) { - fprintf(stderr, - "login: Audit Error: au_to_return32() failed\n"); - exit(1); - } + if ((tok = au_to_return32(0, 0)) == NULL) + errx(1, "login: Audit Error: au_to_return32() failed"); au_write(aufd, tok); - if (au_close(aufd, 1, AUE_login) == -1) { - fprintf(stderr, "login: Audit Record was not committed.\n"); - exit(1); - } + if (au_close(aufd, 1, AUE_login) == -1) + errx(1, "login: Audit Record was not committed."); } /* - * The following tokens are included in the audit record for failed + * The following tokens are included in the audit record for failed * login attempts: header, subject, text, return. - */ + */ void au_login_fail(char *errmsg, int na) { @@ -170,67 +127,49 @@ if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno == ENOSYS) return; - fprintf(stderr, - "login: Could not determine audit condition\n"); - exit(1); + errx(1, "login: Could not determine audit condition"); } if (au_cond == AUC_NOAUDIT) return; - if ((aufd = au_open()) == -1) { - fprintf(stderr, "login: Audit Error: au_open() failed\n"); - exit(1); - } + if ((aufd = au_open()) == -1) + errx(1, "login: Audit Error: au_open() failed"); if (na) { /* * Non attributable event. Assuming that login is not called * within a user's session => auid,asid == -1. */ - if ((tok = au_to_subject32(-1, geteuid(), getegid(), -1, -1, - pid, -1, &tid)) == NULL) { - fprintf(stderr, - "login: Audit Error: au_to_subject32() failed\n"); - exit(1); - } + if ((tok = au_to_subject32(-1, geteuid(), getegid(), -1, -1, + pid, -1, &tid)) == NULL) + errx(1, "login: Audit Error: au_to_subject32() failed"); } else { /* We know the subject -- so use its value instead. */ uid = pwd->pw_uid; gid = pwd->pw_gid; if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, - gid, pid, pid, &tid)) == NULL) { - fprintf(stderr, - "login: Audit Error: au_to_subject32() failed\n"); - exit(1); - } + gid, pid, pid, &tid)) == NULL) + errx(1, "login: Audit Error: au_to_subject32() failed"); } au_write(aufd, tok); /* Include the error message. */ - if ((tok = au_to_text(errmsg)) == NULL) { - fprintf(stderr, "login: Audit Error: au_to_text() failed\n"); - exit(1); - } + if ((tok = au_to_text(errmsg)) == NULL) + errx(1, "login: Audit Error: au_to_text() failed"); au_write(aufd, tok); - if ((tok = au_to_return32(1, errno)) == NULL) { - fprintf(stderr, - "login: Audit Error: au_to_return32() failed\n"); - exit(1); - } + if ((tok = au_to_return32(1, errno)) == NULL) + errx(1, "login: Audit Error: au_to_return32() failed"); au_write(aufd, tok); - if (au_close(aufd, 1, AUE_login) == -1) { - fprintf(stderr, - "login: Audit Error: au_close() was not committed\n"); - exit(1); - } + if (au_close(aufd, 1, AUE_login) == -1) + errx(1, "login: Audit Error: au_close() was not committed"); } /* * The following tokens are included in the audit record for a logout: * header, subject, return. - */ + */ void audit_logout(void) { @@ -247,36 +186,24 @@ if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (errno == ENOSYS) return; - fprintf(stderr, - "login: Could not determine audit condition\n"); - exit(1); + errx(1, "login: Could not determine audit condition"); } if (au_cond == AUC_NOAUDIT) return; - if ((aufd = au_open()) == -1) { - fprintf(stderr, "login: Audit Error: au_open() failed\n"); - exit(1); - } + if ((aufd = au_open()) == -1) + errx(1, "login: Audit Error: au_open() failed"); /* The subject that is created (euid, egid of the current process). */ - if ((tok = au_to_subject32(uid, geteuid(), getegid(), - uid, gid, pid, pid, &tid)) == NULL) { - fprintf(stderr, - "login: Audit Error: au_to_subject32() failed\n"); - exit(1); - } + if ((tok = au_to_subject32(uid, geteuid(), getegid(), uid, gid, pid, + pid, &tid)) == NULL) + errx(1, "login: Audit Error: au_to_subject32() failed"); au_write(aufd, tok); - if ((tok = au_to_return32(0, 0)) == NULL) { - fprintf(stderr, - "login: Audit Error: au_to_return32() failed\n"); - exit(1); - } + if ((tok = au_to_return32(0, 0)) == NULL) + errx(1, "login: Audit Error: au_to_return32() failed"); au_write(aufd, tok); - if (au_close(aufd, 1, AUE_logout) == -1) { - fprintf(stderr, "login: Audit Record was not committed.\n"); - exit(1); - } + if (au_close(aufd, 1, AUE_logout) == -1) + errx(1, "login: Audit Record was not committed."); } From owner-p4-projects@FreeBSD.ORG Sat Feb 4 19:44:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABF0916A43B; Sat, 4 Feb 2006 19:44:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E593C16A4D7 for ; Sat, 4 Feb 2006 19:44:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF4E443D5D for ; Sat, 4 Feb 2006 19:44:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14JiOAj042267 for ; Sat, 4 Feb 2006 19:44:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14JiOcl042264 for perforce@freebsd.org; Sat, 4 Feb 2006 19:44:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 19:44:24 GMT Message-Id: <200602041944.k14JiOcl042264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 19:44:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=91099 Change 91099 by rwatson@rwatson_zoo on 2006/02/04 19:43:29 No longer need audit state in login.c. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#12 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#12 (text+ko) ==== @@ -158,11 +158,6 @@ static int pam_cred_established; static int pam_session_established; -/* - * Audit data - */ -au_tid_t tid; - int main(int argc, char *argv[]) { From owner-p4-projects@FreeBSD.ORG Sat Feb 4 19:44:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D62EC16A4E5; Sat, 4 Feb 2006 19:44:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6BADB16A438 for ; Sat, 4 Feb 2006 19:44:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 223E543D62 for ; Sat, 4 Feb 2006 19:44:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14JiOgY042273 for ; Sat, 4 Feb 2006 19:44:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14JiO8b042270 for perforce@freebsd.org; Sat, 4 Feb 2006 19:44:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 19:44:24 GMT Message-Id: <200602041944.k14JiO8b042270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91100 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 19:44:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=91100 Change 91100 by rwatson@rwatson_zoo on 2006/02/04 19:44:00 Staticize audit state. Remove stale comment. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#6 (text+ko) ==== @@ -33,12 +33,6 @@ #include __FBSDID("$FreeBSD$"); -/* - * login [ name ] - * login -h hostname (for telnetd, etc.) - * login -f name (for pre-authenticated login: datakit, xterm, etc.) - */ - #include #include @@ -54,7 +48,7 @@ /* * Audit data */ -au_tid_t tid; +static au_tid_t tid; /* * The following tokens are included in the audit record for a successful From owner-p4-projects@FreeBSD.ORG Sat Feb 4 19:45:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7577C16A424; Sat, 4 Feb 2006 19:45:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 21BD216A420 for ; Sat, 4 Feb 2006 19:45:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D367743D45 for ; Sat, 4 Feb 2006 19:45:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14JjQLB042377 for ; Sat, 4 Feb 2006 19:45:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14JjQNk042374 for perforce@freebsd.org; Sat, 4 Feb 2006 19:45:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 19:45:26 GMT Message-Id: <200602041945.k14JjQNk042374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 19:45:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=91101 Change 91101 by rwatson@rwatson_zoo on 2006/02/04 19:44:49 Audit includes no longer needed in login.c. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#13 (text+ko) ==== @@ -61,9 +61,6 @@ #include #include -#include -#include - #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Feb 4 19:46:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8395116A423; Sat, 4 Feb 2006 19:46:29 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3148616A420 for ; Sat, 4 Feb 2006 19:46:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E46B243D45 for ; Sat, 4 Feb 2006 19:46:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14JkSqn042609 for ; Sat, 4 Feb 2006 19:46:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14JkSfd042606 for perforce@freebsd.org; Sat, 4 Feb 2006 19:46:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 19:46:28 GMT Message-Id: <200602041946.k14JkSfd042606@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91103 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 19:46:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=91103 Change 91103 by rwatson@rwatson_zoo on 2006/02/04 19:45:57 Canonicalize copyright. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/login_audit.c#7 (text+ko) ==== @@ -1,5 +1,6 @@ /* - * Copyright (c) 2005 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2005 Apple Computer, Inc. + * All rights reserved. * * @APPLE_BSD_LICENSE_HEADER_START@ * From owner-p4-projects@FreeBSD.ORG Sat Feb 4 20:10:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A85316A423; Sat, 4 Feb 2006 20:10:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA4AF16A420 for ; Sat, 4 Feb 2006 20:10:58 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B76B043D46 for ; Sat, 4 Feb 2006 20:10:58 +0000 (GMT) (envelope-from brueffer@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 k14KAwLG045972 for ; Sat, 4 Feb 2006 20:10:58 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14KAw3w045969 for perforce@freebsd.org; Sat, 4 Feb 2006 20:10:58 GMT (envelope-from brueffer@freebsd.org) Date: Sat, 4 Feb 2006 20:10:58 GMT Message-Id: <200602042010.k14KAw3w045969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91104 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 20:11:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=91104 Change 91104 by brueffer@brueffer_serenity on 2006/02/04 20:10:02 Formatting fixes, new sentence -> new line, sorted SEE ALSO sections, corrected manpage sections. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#6 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#8 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#6 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#6 $ .\" .Dd January 24, 2004 .Dt AUDIT 8 @@ -48,7 +48,7 @@ The optional .Ar file operand specifies the location of the audit control input file (default -.Pa /etc/security/audit_control ). +.Pa /etc/security/audit_control ) . .Pp The options are as follows: .Bl -tag -width Ds @@ -65,15 +65,17 @@ and renamed to indicate the time of the shutdown. .El .Sh NOTES -The auditd(8) daemon must already be running. +The +.Xr auditd 8 +daemon must already be running. .Sh FILES .Bl -tag -width "/etc/security/audit_control" -compact .It Pa /etc/security/audit_control Default audit policy file used to configure the auditing system. .El .Sh SEE ALSO +.Xr audit_control 5 , .Xr auditd 8 -.Xr audit_control 5 .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#8 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#8 $ .\" .Dd January 24, 2004 .Dt AUDITD 8 @@ -63,9 +63,14 @@ .Pp To assure uninterrupted audit support, the .Nm auditd -daemon should not be started and stopped manually. Instead, the audit(1) command +daemon should not be started and stopped manually. +Instead, the +.Xr audit 8 +command should be used to inform the daemon to change state/configuration after altering -the audit_control file. +the +.Pa audit_control +file. .Pp .\" Sending a SIGHUP to a running .\" .Nm auditd ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#10 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#9 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#10 $ .\" .Dd January 24, 2004 .Dt AUDITREDUCE 1 @@ -124,7 +124,8 @@ .Sh Examples .Pp To select all records associated with effective user ID root from the audit -log /var/audit/20031016184719.20031017122634: +log +.Pa /var/audit/20031016184719.20031017122634 : .Pp .Nm -e root /var/audit/20031016184719.20031017122634 @@ -136,9 +137,9 @@ .Nm -m AUE_SETLOGIN /var/audit/20031016184719.20031017122634 .Sh SEE ALSO +.Xr praudit 1 , .Xr audit_control 5 , -.Xr audit_event 5 , -.Xr praudit 1 +.Xr audit_event 5 .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. From owner-p4-projects@FreeBSD.ORG Sat Feb 4 20:39:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7960E16A423; Sat, 4 Feb 2006 20:39:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 54C6C16A420 for ; Sat, 4 Feb 2006 20:39:35 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2084743D4C for ; Sat, 4 Feb 2006 20:39:35 +0000 (GMT) (envelope-from kmacy@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 k14KdZ9l047271 for ; Sat, 4 Feb 2006 20:39:35 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14KdYj5047268 for perforce@freebsd.org; Sat, 4 Feb 2006 20:39:34 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 4 Feb 2006 20:39:34 GMT Message-Id: <200602042039.k14KdYj5047268@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 91108 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 20:39:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=91108 Change 91108 by kmacy@kmacy:freebsd7_xen3 on 2006/02/04 20:38:49 all vm86_initialize to proceed don't call vm86_intcall in atkbd code as it is only needed for bios option checking Affected files ... .. //depot/projects/xen3/src/sys/dev/atkbdc/atkbd.c#2 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#11 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#13 edit Differences ... ==== //depot/projects/xen3/src/sys/dev/atkbdc/atkbd.c#2 (text+ko) ==== @@ -1056,7 +1056,7 @@ static int get_typematic(keyboard_t *kbd) { -#ifdef __i386__ +#if defined(__i386__) && !defined(XEN) /* * Only some systems allow us to retrieve the keyboard repeat * rate previously set via the BIOS... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#11 (text+ko) ==== @@ -2456,10 +2456,7 @@ dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL); dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL); -#ifndef XEN - /* XXX - this can be made to work */ vm86_initialize(); -#endif getmemsize(first); init_param2(physmem); ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#13 (text+ko) ==== @@ -520,6 +520,7 @@ extern unsigned long *SMPpt; extern struct user *proc0uarea; extern vm_offset_t proc0kstack; +extern int vm86paddr, vm86phystk; char *bootmem_start, *bootmem_current, *bootmem_end; pteinfo_t *pteinfo_list; @@ -653,6 +654,14 @@ ldt = (union descriptor *)PFNTOV(tmpindex); tmpindex++; + /* vm86/bios stack */ + tmpindex += 1; + + /* Map space for the vm86 region */ + vm86paddr = (vm_offset_t)PFNTOV(tmpindex); + tmpindex += 3; + + /* initialize page directory shadow page */ pdir_shadow = (vm_offset_t *)PFNTOV(tmpindex); i686_pagezero(pdir_shadow); @@ -670,7 +679,7 @@ KPTphys | PG_V | PG_A); xen_flush_queue(); - /* allocate remainder of NKPT pages */ + #ifdef SMP From owner-p4-projects@FreeBSD.ORG Sat Feb 4 21:17:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAC8116A423; Sat, 4 Feb 2006 21:17:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 53DD816A420 for ; Sat, 4 Feb 2006 21:17:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3083E43D72 for ; Sat, 4 Feb 2006 21:17:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14LHL2C056228 for ; Sat, 4 Feb 2006 21:17:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14LHLsw056225 for perforce@freebsd.org; Sat, 4 Feb 2006 21:17:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 21:17:21 GMT Message-Id: <200602042117.k14LHLsw056225@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91111 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 21:17:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=91111 Change 91111 by rwatson@rwatson_fledge on 2006/02/04 21:16:25 Add Christian Brueffer to the credits. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#12 (text+ko) ==== @@ -62,6 +62,7 @@ Wojciech Koszek Chunyang Yuan Poul-Henning Kamp + Christian Brueffer In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -83,4 +84,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#11 $ +$P4: //depot/projects/trustedbsd/openbsm/README#12 $ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 21:37:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64E9616A424; Sat, 4 Feb 2006 21:37:43 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 26AF316A422; Sat, 4 Feb 2006 21:37:43 +0000 (GMT) (envelope-from trhodes@FreeBSD.org) Received: from pittgoth.com (ns1.pittgoth.com [216.38.206.188]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE70143D45; Sat, 4 Feb 2006 21:37:42 +0000 (GMT) (envelope-from trhodes@FreeBSD.org) Received: from localhost (ip68-105-180-11.dc.dc.cox.net [68.105.180.11]) (authenticated bits=0) by pittgoth.com (8.13.4/8.13.4) with ESMTP id k14MIfLk086461 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 4 Feb 2006 17:18:47 -0500 (EST) (envelope-from trhodes@FreeBSD.org) Date: Sat, 4 Feb 2006 16:37:23 -0500 From: Tom Rhodes To: Robert Watson Message-Id: <20060204163723.63a536fc.trhodes@FreeBSD.org> In-Reply-To: <200602041253.k14Crecf011086@repoman.freebsd.org> References: <200602041253.k14Crecf011086@repoman.freebsd.org> X-Mailer: Sylpheed version 1.0.5 (GTK+ 1.2.10; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: perforce@FreeBSD.org Subject: Re: PERFORCE change 91049 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 21:37:44 -0000 On Sat, 4 Feb 2006 12:53:40 GMT Robert Watson wrote: > http://perforce.freebsd.org/chv.cgi?CH=91049 > > Change 91049 by rwatson@rwatson_peppercorn on 2006/02/04 12:53:12 > > When GC'ing a thread, assert that it has no active audit record. > This should not happen, but with this assert, brueffer and I would > not have spent 45 minutes trying to figure out why he wasn't > seeing audit records with the audit version in CVS. > Good catch! I had just booted the new CURRENT and was wondering about this. Thanks! -- Tom Rhodes From owner-p4-projects@FreeBSD.ORG Sat Feb 4 21:53:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 115E116A423; Sat, 4 Feb 2006 21:53:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C806816A420 for ; Sat, 4 Feb 2006 21:53:06 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81F6643D6B for ; Sat, 4 Feb 2006 21:53:06 +0000 (GMT) (envelope-from trhodes@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 k14Lr6tP058252 for ; Sat, 4 Feb 2006 21:53:06 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14Lr6c3058249 for perforce@freebsd.org; Sat, 4 Feb 2006 21:53:06 GMT (envelope-from trhodes@freebsd.org) Date: Sat, 4 Feb 2006 21:53:06 GMT Message-Id: <200602042153.k14Lr6c3058249@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 91114 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 21:53:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=91114 Change 91114 by trhodes@trhodes_local on 2006/02/04 21:52:56 The pid check is not really a requirement. Discussed with dougb. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#7 (text+ko) ==== @@ -23,11 +23,7 @@ auditd_stop() { - if [ -f /var/run/auditd.pid ]; then /usr/sbin/audit -t - else - echo "The audit daemon is not running"; - fi } load_rc_config $name From owner-p4-projects@FreeBSD.ORG Sat Feb 4 22:15:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7C0116A423; Sat, 4 Feb 2006 22:15:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A34F16A420 for ; Sat, 4 Feb 2006 22:15:35 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48C4C43D46 for ; Sat, 4 Feb 2006 22:15:35 +0000 (GMT) (envelope-from brueffer@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 k14MFZ5f060932 for ; Sat, 4 Feb 2006 22:15:35 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14MFY1x060929 for perforce@freebsd.org; Sat, 4 Feb 2006 22:15:34 GMT (envelope-from brueffer@freebsd.org) Date: Sat, 4 Feb 2006 22:15:34 GMT Message-Id: <200602042215.k14MFY1x060929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 22:15:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=91117 Change 91117 by brueffer@brueffer_serenity on 2006/02/04 22:15:06 Add missing MLINKS for reentrant functions. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile#12 (text+ko) ==== @@ -1,7 +1,7 @@ # # OpenBSM libbsm # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile#11 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile#12 $ # LIB= bsm @@ -35,7 +35,9 @@ MLINKS= libbsm.3 bsm.3 \ au_class.3 getauclassent.3 \ + au_class.3 getauclassent_r.3 \ au_class.3 getauclassnam.3 \ + au_class.3 getauclassnam_r.3 \ au_class.3 setauclass.3 \ au_class.3 endauclass.3 \ au_control.3 setac.3 \ @@ -47,9 +49,12 @@ au_event.3 setauevent.3 \ au_event.3 endauevent.3 \ au_event.3 getauevent.3 \ + au_event.3 getauevent_r.3 \ au_event.3 getauevnam.3 \ + au_event.3 getauevnam_r.3 \ au_event.3 getauevnum.3 \ - au_event.3 getauevnonam.3 \ + au_event.3 getauevnum_r.3 \ + au_event.3 getauevnonam_r.3 \ au_io.3 au_fetch_tok.3 \ au_io.3 au_print_tok.3 \ au_io.3 au_read_rec.3 \ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 22:17:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2328816A424; Sat, 4 Feb 2006 22:17:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7EE716A422 for ; Sat, 4 Feb 2006 22:17:38 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 922E443D45 for ; Sat, 4 Feb 2006 22:17:38 +0000 (GMT) (envelope-from trhodes@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 k14MHcUL061179 for ; Sat, 4 Feb 2006 22:17:38 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14MHcV1061173 for perforce@freebsd.org; Sat, 4 Feb 2006 22:17:38 GMT (envelope-from trhodes@freebsd.org) Date: Sat, 4 Feb 2006 22:17:38 GMT Message-Id: <200602042217.k14MHcV1061173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 91119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 22:17:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=91119 Change 91119 by trhodes@trhodes_local on 2006/02/04 22:17:21 Add shutdown KEYWORD. Recommended by dougb Affected files ... .. //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#8 (text+ko) ==== @@ -8,6 +8,7 @@ # PROVIDE: auditd # REQUIRE: syslogd # BEFORE: DAEMON +# KEYWORD: shutdown . /etc/rc.subr From owner-p4-projects@FreeBSD.ORG Sat Feb 4 22:19:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5724016A424; Sat, 4 Feb 2006 22:19:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3FE916A422 for ; Sat, 4 Feb 2006 22:19:42 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A56DC43D53 for ; Sat, 4 Feb 2006 22:19:41 +0000 (GMT) (envelope-from brueffer@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 k14MJfKJ061498 for ; Sat, 4 Feb 2006 22:19:41 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14MJftT061495 for perforce@freebsd.org; Sat, 4 Feb 2006 22:19:41 GMT (envelope-from brueffer@freebsd.org) Date: Sat, 4 Feb 2006 22:19:41 GMT Message-Id: <200602042219.k14MJftT061495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 22:19:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=91120 Change 91120 by brueffer@brueffer_serenity on 2006/02/04 22:18:45 Sort manpage references. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#4 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 @@ -48,57 +48,56 @@ interfaces, I/O interfaces, mask interfaces, notification interfaces, token interfaces, and user interfaces. These are described respectively in the -.Xr au_stream 3 , .Xr au_class 3 , .Xr au_control 3 , .Xr au_event 3 , .Xr au_mask 3 , .Xr au_notify 3 , +.Xr au_stream 3 , .Xr au_token 3 , .Xr au_user 3 man pages. .Ss Audit Event Stream Interfaces Audit event stream interfaces support interaction with file-backed audit event streams: -.Xr au_free_token 3 , +.Xr au_close 3 . .Xr au_free_token 3 , .Xr au_open 3 , .Xr au_write 3 , -.Xr au_close 3 . .Ss Audit Class Interfaces Audit class interfaces support the look up of information from the .Xr audit_class 5 database: +.Xr endauclass 3 , .Xr getauclassent 3 , .Xr getauclassent_r 3 , .Xr getauclassnam 3 , .Xr getauclassnam_r 3 , -.Xr setauclass 3 , -.Xr endauclass 3 . +.Xr setauclass 3 . .Ss Audit Control Interfaces Audit control interfaces support the look up of information from the .Xr audit_control 5 database: +.Xr endac 3 , .Xr setac 3 , -.Xr endac 3 , .Xr getacdir 3 , +.Xr getacflg 3 , .Xr getacmin 3 , -.Xr getacflg 3 , .Xr getacna 3 . .Ss Audit Event Interfaces Audit event interfaces support the look up of information from the .Xr audit_event 5 database: +.Xr endauevent 3 , .Xr setauevent 3 , -.Xr endauevent 3 , .Xr getauevent 3 , .Xr getauevent_r 3 , .Xr getauevnam 3 , .Xr getauevnam_r 3 , -.Xr getauevnum 3 , -.Xr getauevnum_r 3 , .Xr getauevnonam 3 , .Xr getauevnonam_r 3 , +.Xr getauevnum 3 , +.Xr getauevnum_r 3 . .Ss Audit I/O Interfaces Audit I/O interfaces support the processing and printing of tokens, as well as the reading of audit records: @@ -117,9 +116,9 @@ .Ss Audit Notification Interfaces Audit notification routines track audit state in a form permitting efficient update, avoiding frequent system calls to check the kernel audit state: +.Xr au_get_state 3 , .Xr au_notify_initialize 3 , -.Xr au_notify_terminate 3 , -.Xr au_get_state 3 . +.Xr au_notify_terminate 3 . These interfaces are implemented only for Darwin/Mac OS X. .Ss Audit Token Interface Audit token interfaces permit the creation of tokens for use in creating @@ -127,63 +126,63 @@ Each interface converts a C type to its .Vt token_t representation. +.Xr au_to_arg 3 , .Xr au_to_arg32 3 , .Xr au_to_arg64 3 , -.Xr au_to_arg 3 , .Xr au_to_attr64 3 , .Xr au_to_data 3 , +.Xr au_to_exec_args 3 , +.Xr au_to_exec_env 3 , .Xr au_to_exit 3 , +.Xr au_to_file 3 , .Xr au_to_groups 3 , -.Xr au_to_newgroups 3 , +.Xr au_to_header32 3 , +.Xr au_to_header64 3 , .Xr au_to_in_addr 3 , .Xr au_to_in_addr_ex 3 , .Xr au_to_ip 3 , .Xr au_to_ipc 3 , .Xr au_to_ipc_perm 3 , .Xr au_to_iport 3 , +.Xr au_to_me 3 , +.Xr au_to_newgroups 3 , .Xr au_to_opaque 3 , -.Xr au_to_file 3 , -.Xr au_to_text 3 , .Xr au_to_path 3 , +.Xr au_to_process 3 , .Xr au_to_process32 3 , .Xr au_to_process64 3 , -.Xr au_to_process 3 , +.Xr au_to_process_ex 3 , .Xr au_to_process32_ex 3 , .Xr au_to_process64_ex 3 , -.Xr au_to_process_ex 3 , +.Xr au_to_return 3 , .Xr au_to_return32 3 , .Xr au_to_return64 3 , -.Xr au_to_return 3 , .Xr au_to_seq 3 , .Xr au_to_socket 3 , .Xr au_to_socket_ex_32 3 , .Xr au_to_socket_ex_128 3 , +.Xr au_to_sock_inet 3 , .Xr au_to_sock_inet32 3 , .Xr au_to_sock_inet128 3 , -.Xr au_to_sock_inet 3 , +.Xr au_to_subject 3 , .Xr au_to_subject32 3 , .Xr au_to_subject64 3 , -.Xr au_to_subject 3 , +.Xr au_to_subject_ex 3 , .Xr au_to_subject32_ex 3 , .Xr au_to_subject64_ex 3 , -.Xr au_to_subject_ex 3 , -.Xr au_to_me 3 , -.Xr au_to_exec_args 3 , -.Xr au_to_exec_env 3 , -.Xr au_to_header32 3 , -.Xr au_to_header64 3 , +.Xr au_to_text 3 , .Xr au_to_trailer 3 . .Ss Audit User Interfaces Audit user interfaces support the look up of information from the .Xr audit_user 5 database: +.Xr au_user_mask 3 , +.Xr endauuser 3 , .Xr setauuser 3 , -.Xr endauuser 3 , .Xr getauuserent 3 , .Xr getauuserent_r 3 , .Xr getauusernam 3 , .Xr getauusernam_r 3 , -.Xr au_user_mask 3 , .Xr getfauditflags 3 . .Sh SEE ALSO .Xr au_class 3 , From owner-p4-projects@FreeBSD.ORG Sat Feb 4 22:23:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B344E16A423; Sat, 4 Feb 2006 22:23:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5DAE916A420 for ; Sat, 4 Feb 2006 22:23:47 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12C3A43D45 for ; Sat, 4 Feb 2006 22:23:47 +0000 (GMT) (envelope-from trhodes@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 k14MNkAi061994 for ; Sat, 4 Feb 2006 22:23:46 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14MNkjI061991 for perforce@freebsd.org; Sat, 4 Feb 2006 22:23:46 GMT (envelope-from trhodes@freebsd.org) Date: Sat, 4 Feb 2006 22:23:46 GMT Message-Id: <200602042223.k14MNkjI061991@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 91121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 22:23:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=91121 Change 91121 by trhodes@trhodes_local on 2006/02/04 22:23:07 Remove now unneeded tab. Spotted by: rwatson Affected files ... .. //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/rc.d/auditd#9 (text+ko) ==== @@ -24,7 +24,7 @@ auditd_stop() { - /usr/sbin/audit -t + /usr/sbin/audit -t } load_rc_config $name From owner-p4-projects@FreeBSD.ORG Sat Feb 4 22:30:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FFEA16A423; Sat, 4 Feb 2006 22:30:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52F4116A420 for ; Sat, 4 Feb 2006 22:30:56 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20B7043D46 for ; Sat, 4 Feb 2006 22:30:56 +0000 (GMT) (envelope-from brueffer@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 k14MUuZp062844 for ; Sat, 4 Feb 2006 22:30:56 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14MUt1V062841 for perforce@freebsd.org; Sat, 4 Feb 2006 22:30:55 GMT (envelope-from brueffer@freebsd.org) Date: Sat, 4 Feb 2006 22:30:55 GMT Message-Id: <200602042230.k14MUt1V062841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91122 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 22:30:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=91122 Change 91122 by brueffer@brueffer_serenity on 2006/02/04 22:30:24 Put back MLINK to getauevnonam.3 accidently removed in the last revision. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile#13 (text+ko) ==== @@ -1,7 +1,7 @@ # # OpenBSM libbsm # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile#12 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile#13 $ # LIB= bsm @@ -54,6 +54,7 @@ au_event.3 getauevnam_r.3 \ au_event.3 getauevnum.3 \ au_event.3 getauevnum_r.3 \ + au_event.3 getauevnonam.3 \ au_event.3 getauevnonam_r.3 \ au_io.3 au_fetch_tok.3 \ au_io.3 au_print_tok.3 \ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 22:47:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2738F16A423; Sat, 4 Feb 2006 22:47:18 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D9ED316A420 for ; Sat, 4 Feb 2006 22:47:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3A0243D49 for ; Sat, 4 Feb 2006 22:47:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k14MlHp4064810 for ; Sat, 4 Feb 2006 22:47:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14MlH0X064807 for perforce@freebsd.org; Sat, 4 Feb 2006 22:47:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 22:47:17 GMT Message-Id: <200602042247.k14MlH0X064807@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 91126 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 22:47:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=91126 Change 91126 by rwatson@rwatson_fledge on 2006/02/04 22:46:17 Credit Olivier for arm tweaks to OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#13 (text+ko) ==== @@ -63,6 +63,7 @@ Chunyang Yuan Poul-Henning Kamp Christian Brueffer + Olivier Houchard In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -84,4 +85,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#12 $ +$P4: //depot/projects/trustedbsd/openbsm/README#13 $ From owner-p4-projects@FreeBSD.ORG Sat Feb 4 22:52:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF55516A423; Sat, 4 Feb 2006 22:52:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A227216A420 for ; Sat, 4 Feb 2006 22:52:24 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F35743D45 for ; Sat, 4 Feb 2006 22:52:24 +0000 (GMT) (envelope-from brueffer@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 k14MqOgB065434 for ; Sat, 4 Feb 2006 22:52:24 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k14MqN68065431 for perforce@freebsd.org; Sat, 4 Feb 2006 22:52:23 GMT (envelope-from brueffer@freebsd.org) Date: Sat, 4 Feb 2006 22:52:23 GMT Message-Id: <200602042252.k14MqN68065431@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 91127 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 22:52:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=91127 Change 91127 by brueffer@brueffer_serenity on 2006/02/04 22:51:56 Numerous spelling and formatting fixes. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_free_token.3#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#5 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#2 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#3 $ .\" .Dd April 19, 2005 .Dt AU_CONTROL 3 @@ -67,7 +67,7 @@ database. .Pp .Fn getacdir -Return the name of the directory where log data is stored via the passed +returns the name of the directory where log data is stored via the passed character buffer .Va name of length ==== //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#4 $ .\" .Dd April 19, 2005 .Dt AU_EVENT 3 @@ -123,9 +123,9 @@ and .Fn getauevnuam will return a reference to a -.Dt struct au_event_ent +.Ft struct au_event_ent or -.Dt au_event_t +.Ft au_event_t on success, or .Dv NULL on failure, with .Va errno ==== //depot/projects/trustedbsd/openbsm/libbsm/au_free_token.3#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_free_token.3#2 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_free_token.3#3 $ .\" .Dd April 19, 2005 .Dt AU_FREE_TOKEN 3 @@ -40,7 +40,7 @@ .Sh SYNOPSIS .In libbsm.h .Ft void -.Fn au_free_tokenen "token_t *tok" +.Fn au_free_token "token_t *tok" .Sh DESCRIPTION The BSM API generally manages deallocation of .Vt token_t ==== //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#2 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#3 $ .\" .Dd April 19, 2005 .Dt AU_MASK 3 @@ -109,7 +109,7 @@ .Sh IMPLEMENTATION NOTES .Fn au_preselect makes implicit use of various audit database routines, and may influence -the behavior of simultaenous or interleaved processing of those databases by +the behavior of simultaneous or interleaved processing of those databases by other code. .Sh SEE ALSO .Xr libbsm 3 , ==== //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#5 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -179,10 +179,10 @@ .Fn au_to_trailer "int rec_size" .Sh DESCRIPTION These interfaces support the allocation of BSM audit tokens, represented by -.Dt token_t , +.Ft token_t , for various data types. .Sh RETURN VALUES -On sucess, a pointer to a +On success, a pointer to a .Vt token_t will be returned; the allocated .Vt token_t ==== //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#4 $ .\" .Dd April 19, 2005 .Dt AU_USER 3 @@ -72,7 +72,7 @@ .Dv au_never . .Pp .Fn getauuserent -return the next user found in the +returns the next user found in the .Xr audit_user 5 database, or the first if the function has not yet been called. .Dv NULL @@ -96,7 +96,7 @@ database, if open. .Pp .Nm au_user_mask -calculate a new session audit mask to be returned via +calculates a new session audit mask to be returned via .Dv mask_p for the user identified by .Dv username .