From owner-p4-projects@FreeBSD.ORG Sun Feb 26 02:46: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 71A0D16A423; Sun, 26 Feb 2006 02:46: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 17D3B16A420 for ; Sun, 26 Feb 2006 02:46: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 D06BD43D45 for ; Sun, 26 Feb 2006 02:46: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 k1Q2k5tQ056869 for ; Sun, 26 Feb 2006 02:46: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 k1Q2k5Rs056866 for perforce@freebsd.org; Sun, 26 Feb 2006 02:46:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Feb 2006 02:46:05 GMT Message-Id: <200602260246.k1Q2k5Rs056866@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 92403 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, 26 Feb 2006 02:46:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=92403 Change 92403 by rwatson@rwatson_peppercorn on 2006/02/26 02:45:18 First beginning cut at support for gnu-autoconfig, gnu-automake, gnu-libtool as a way to build OpenBSM, which should facilitate getting it building on systems with incomplete or no support for BSD make and the BSD make file infrastructure. Most things appear to work, although I don't yet have man symlinks working, and none of the source is currently using configured results (such as using the configure test for sys/endian.h to decide whether or not to include compat/endian.h), which will follow. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/autogen.sh#1 add .. //depot/projects/trustedbsd/openbsm/bin/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/configure.ac#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/man/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/tools/Makefile.am#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Feb 26 02:53: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 9409216A423; Sun, 26 Feb 2006 02:53: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 35C1916A420 for ; Sun, 26 Feb 2006 02:53: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 F230843D46 for ; Sun, 26 Feb 2006 02:53: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 k1Q2rEgw057297 for ; Sun, 26 Feb 2006 02:53: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 k1Q2rE89057294 for perforce@freebsd.org; Sun, 26 Feb 2006 02:53:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Feb 2006 02:53:14 GMT Message-Id: <200602260253.k1Q2rE89057294@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 92404 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, 26 Feb 2006 02:53:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92404 Change 92404 by rwatson@rwatson_peppercorn on 2006/02/26 02:52:27 Escape $P4$ in configure.ac to prevent symbols from interfering with shell interpreters. These symbols were only present after the first checkin due to $P4$ expansion. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure.ac#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure.ac#2 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION($P4: //depot/projects/trustedbsd/openbsm/configure.ac#1 $) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#2 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config.h]) From owner-p4-projects@FreeBSD.ORG Sun Feb 26 11:26: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 3E3B716A423; Sun, 26 Feb 2006 11:26: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 1187716A420 for ; Sun, 26 Feb 2006 11:26: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 D062C43D49 for ; Sun, 26 Feb 2006 11:26: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 k1QBQH2H091816 for ; Sun, 26 Feb 2006 11:26: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 k1QBQHan091813 for perforce@freebsd.org; Sun, 26 Feb 2006 11:26:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Feb 2006 11:26:17 GMT Message-Id: <200602261126.k1QBQHan091813@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 92413 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, 26 Feb 2006 11:26:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=92413 Change 92413 by rwatson@rwatson_peppercorn on 2006/02/26 11:25:48 Declare package name and version to automake. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure.ac#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure.ac#3 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#2 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#3 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config.h]) @@ -13,7 +13,7 @@ AC_PROG_INSTALL AC_PROG_LIBTOOL -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) # Checks for libraries. # FIXME: Replace `main' with a function in `-lbsm': From owner-p4-projects@FreeBSD.ORG Sun Feb 26 11:36: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 2D24516A423; Sun, 26 Feb 2006 11:36: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 D887116A420 for ; Sun, 26 Feb 2006 11:36: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 A1F0A43D49 for ; Sun, 26 Feb 2006 11:36: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 k1QBaVSx092291 for ; Sun, 26 Feb 2006 11:36:31 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 k1QBaVfP092288 for perforce@freebsd.org; Sun, 26 Feb 2006 11:36:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Feb 2006 11:36:31 GMT Message-Id: <200602261136.k1QBaVfP092288@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 92414 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, 26 Feb 2006 11:36:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=92414 Change 92414 by rwatson@rwatson_peppercorn on 2006/02/26 11:35:59 Move config.h to config/. Add autoconf/automake generated files. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.guess#1 add .. //depot/projects/trustedbsd/openbsm/config/config.h.in#1 add .. //depot/projects/trustedbsd/openbsm/config/config.sub#1 add .. //depot/projects/trustedbsd/openbsm/config/depcomp#1 add .. //depot/projects/trustedbsd/openbsm/config/install-sh#1 add .. //depot/projects/trustedbsd/openbsm/config/ltmain.sh#1 add .. //depot/projects/trustedbsd/openbsm/config/missing#1 add .. //depot/projects/trustedbsd/openbsm/configure#1 add .. //depot/projects/trustedbsd/openbsm/configure.ac#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure.ac#4 (text+ko) ==== @@ -3,10 +3,10 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#3 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#4 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) -AC_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADER([config/config.h]) # Checks for programs. AC_PROG_CC From owner-p4-projects@FreeBSD.ORG Sun Feb 26 11:37: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 1345016A423; Sun, 26 Feb 2006 11:37: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 ADC6616A420 for ; Sun, 26 Feb 2006 11:37: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 6494B43D46 for ; Sun, 26 Feb 2006 11:37: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 k1QBbXIv092440 for ; Sun, 26 Feb 2006 11:37: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 k1QBbXve092437 for perforce@freebsd.org; Sun, 26 Feb 2006 11:37:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Feb 2006 11:37:33 GMT Message-Id: <200602261137.k1QBbXve092437@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 92415 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, 26 Feb 2006 11:37:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=92415 Change 92415 by rwatson@rwatson_peppercorn on 2006/02/26 11:36:49 One more autoconf/automake-generated file. Affected files ... .. //depot/projects/trustedbsd/openbsm/aclocal.m4#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Feb 27 00:05: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 0DEE416A423; Mon, 27 Feb 2006 00:05: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 C18EE16A420 for ; Mon, 27 Feb 2006 00:05: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 5778F43D73 for ; Mon, 27 Feb 2006 00:05: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 k1R05HqV046663 for ; Mon, 27 Feb 2006 00:05: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 k1R05Hlv046660 for perforce@freebsd.org; Mon, 27 Feb 2006 00:05:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 00:05:17 GMT Message-Id: <200602270005.k1R05Hlv046660@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 92441 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, 27 Feb 2006 00:05:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=92441 Change 92441 by rwatson@rwatson_peppercorn on 2006/02/27 00:04:58 automake-generated makefiles templates. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/man/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Feb 27 00:26: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 5432F16A424; Mon, 27 Feb 2006 00:26: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 2A68716A420 for ; Mon, 27 Feb 2006 00:26:53 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12CAF43D79 for ; Mon, 27 Feb 2006 00:26:43 +0000 (GMT) (envelope-from soc-andrew@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 k1R0QhGR047767 for ; Mon, 27 Feb 2006 00:26:43 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1R0QhiB047764 for perforce@freebsd.org; Mon, 27 Feb 2006 00:26:43 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 27 Feb 2006 00:26:43 GMT Message-Id: <200602270026.k1R0QhiB047764@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 92442 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, 27 Feb 2006 00:26:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=92442 Change 92442 by soc-andrew@soc-andrew_serv on 2006/02/27 00:26:14 Install the lua package to the CD image Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#29 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#29 (text+ko) ==== @@ -795,6 +795,13 @@ mkdir ${RD}/bsdinstaller/root/$$dir; \ done ) + # Install Lua into the package root + # XXX Make the ftp site changeable + ( /usr/bin/fetch -ARr -o ${RD}/bsdinstaller/root/lua.tbz \ + ftp://ftp.freebsd.org/pub/FreeBSD/ports/${MACHIVE_ARCH}/packages-7-current/latest/lua.tbz && \ + pkg_add -C ${RD}/bsdinstaller/root /lua.tbz ) + rm ${RD}/bsdinstaller/root/lua.tbz + @touch ${RD}/bsdinstaller/root/etc/fstab @echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf @echo "cron_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf From owner-p4-projects@FreeBSD.ORG Mon Feb 27 00:51: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 DF1E116A423; Mon, 27 Feb 2006 00:51:46 +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 8972F16A420 for ; Mon, 27 Feb 2006 00:51:46 +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 1BD1A43D55 for ; Mon, 27 Feb 2006 00:51:43 +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 k1R0pgWV056202 for ; Mon, 27 Feb 2006 00:51: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 k1R0pgg9056199 for perforce@freebsd.org; Mon, 27 Feb 2006 00:51:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 00:51:42 GMT Message-Id: <200602270051.k1R0pgg9056199@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 92445 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, 27 Feb 2006 00:51:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92445 Change 92445 by rwatson@rwatson_peppercorn on 2006/02/27 00:51:08 chmod +x. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#2 (xtext/text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Feb 27 01:23: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 645C416A423; Mon, 27 Feb 2006 01:23: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 16BFD16A420 for ; Mon, 27 Feb 2006 01:23: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 B6A7543D48 for ; Mon, 27 Feb 2006 01:23: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 k1R1NMvC058315 for ; Mon, 27 Feb 2006 01:23: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 k1R1NMts058312 for perforce@freebsd.org; Mon, 27 Feb 2006 01:23:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 01:23:22 GMT Message-Id: <200602270123.k1R1NMts058312@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 92448 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, 27 Feb 2006 01:23:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=92448 Change 92448 by rwatson@rwatson_peppercorn on 2006/02/27 01:22:22 Set AM_MAINTAINER_MODE in order to avoid problems with time stamps. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/aclocal.m4#2 edit .. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/configure#3 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#5 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/man/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#2 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -115,6 +115,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -190,7 +193,7 @@ .SUFFIXES: am--refresh: @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -217,9 +220,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config/config.h: config/stamp-h1 @@ -231,7 +234,7 @@ config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status @rm -f config/stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config/config.h -$(top_srcdir)/config/config.h.in: $(am__configure_deps) +$(top_srcdir)/config/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) rm -f config/stamp-h1 touch $@ ==== //depot/projects/trustedbsd/openbsm/aclocal.m4#2 (text+ko) ==== @@ -6653,6 +6653,35 @@ rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#2 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -99,6 +99,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -165,7 +168,7 @@ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -190,9 +193,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#2 $ # srcdir = @srcdir@ @@ -114,6 +114,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -179,7 +182,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -204,9 +207,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#2 $ # srcdir = @srcdir@ @@ -114,6 +114,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -179,7 +182,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -204,9 +207,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#2 $ # srcdir = @srcdir@ @@ -114,6 +114,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -179,7 +182,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -204,9 +207,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) ==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#2 $ # srcdir = @srcdir@ @@ -114,6 +114,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -179,7 +182,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -204,9 +207,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) ==== //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#2 $ # srcdir = @srcdir@ @@ -103,6 +103,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -172,7 +175,7 @@ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -197,9 +200,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: ==== //depot/projects/trustedbsd/openbsm/configure#3 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#3 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#4 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -466,7 +466,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LIBOBJS LTLIBOBJ S' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fast depCXX_TRUE am__fastdepCXX_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1028,6 +1028,8 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] @@ -1539,6 +1541,30 @@ ac_config_headers="$ac_config_headers config/config.h" +echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi; + echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 + + +if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + # Checks for programs. ac_ext=c @@ -3156,7 +3182,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3159 "configure"' > conftest.$ac_ext + echo '#line 3185 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4626,7 +4652,7 @@ # Provide some information about the compiler. -echo "$as_me:4629:" \ +echo "$as_me:4655:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5724,11 +5750,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5727: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5753: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5731: \$? = $ac_status" >&5 + echo "$as_me:5757: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -5986,11 +6012,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5989: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6015: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5993: \$? = $ac_status" >&5 + echo "$as_me:6019: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6048,11 +6074,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6051: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6077: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6055: \$? = $ac_status" >&5 + echo "$as_me:6081: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8296,7 +8322,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10678: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10656: \$? = $ac_status" >&5 + echo "$as_me:10682: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10711,11 +10737,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10714: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10740: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10718: \$? = $ac_status" >&5 + echo "$as_me:10744: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12088,7 +12114,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13100: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13078: \$? = $ac_status" >&5 + echo "$as_me:13104: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13133,11 +13159,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13136: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13162: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13140: \$? = $ac_status" >&5 + echo "$as_me:13166: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15263,11 +15289,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15266: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15292: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15270: \$? = $ac_status" >&5 + echo "$as_me:15296: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15525,11 +15551,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15528: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15554: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15532: \$? = $ac_status" >&5 + echo "$as_me:15558: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15587,11 +15613,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15590: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15616: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15594: \$? = $ac_status" >&5 + echo "$as_me:15620: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17835,7 +17861,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 +echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -23156,6 +23189,9 @@ s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t +s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t +s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t +s,@MAINT@,$MAINT,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t ==== //depot/projects/trustedbsd/openbsm/configure.ac#5 (text+ko) ==== @@ -3,10 +3,11 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#4 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#5 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) +AM_MAINTAINER_MODE # Checks for programs. AC_PROG_CC ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#2 $ # srcdir = @srcdir@ @@ -121,6 +121,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -208,7 +211,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -233,9 +236,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) ==== //depot/projects/trustedbsd/openbsm/man/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#2 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -95,6 +95,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -172,7 +175,7 @@ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -197,9 +200,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: ==== //depot/projects/trustedbsd/openbsm/tools/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#2 $ # srcdir = @srcdir@ @@ -111,6 +111,9 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -175,7 +178,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -200,9 +203,9 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) From owner-p4-projects@FreeBSD.ORG Mon Feb 27 01:41: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 513D916A423; Mon, 27 Feb 2006 01:41:46 +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 ABE6916A420 for ; Mon, 27 Feb 2006 01:41:45 +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 5C52D43D45 for ; Mon, 27 Feb 2006 01:41:45 +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 k1R1fjIC058963 for ; Mon, 27 Feb 2006 01:41:45 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 k1R1fjSb058960 for perforce@freebsd.org; Mon, 27 Feb 2006 01:41:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 01:41:45 GMT Message-Id: <200602270141.k1R1fjSb058960@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 92449 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, 27 Feb 2006 01:41:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92449 Change 92449 by rwatson@rwatson_peppercorn on 2006/02/27 01:41:38 Linux has a queue.h without some of our spiffiness, we need to ship a more recent BSD version in the compat section. Affected files ... .. //depot/projects/trustedbsd/openbsm/compat/queue.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Feb 27 01:43: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 0E13116A423; Mon, 27 Feb 2006 01:43: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 9302D16A420 for ; Mon, 27 Feb 2006 01:43: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 5780643D48 for ; Mon, 27 Feb 2006 01:43: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 k1R1hmEu059096 for ; Mon, 27 Feb 2006 01:43: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 k1R1hm2l059093 for perforce@freebsd.org; Mon, 27 Feb 2006 01:43:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 01:43:48 GMT Message-Id: <200602270143.k1R1hm2l059093@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 92450 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, 27 Feb 2006 01:43:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=92450 Change 92450 by rwatson@rwatson_peppercorn on 2006/02/27 01:43:22 A bit of localization: don't confuse matters by having a literal $FreeBSD$ in the source, or CVS will get upset later when we import it into FreeBSD. Do add a $P4$. Remove stuff specific to the FreeBSD kernel. Affected files ... .. //depot/projects/trustedbsd/openbsm/compat/queue.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/compat/queue.h#2 (text+ko) ==== @@ -27,7 +27,9 @@ * SUCH DAMAGE. * * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD: src/sys/sys/queue.h,v 1.63 2005/11/23 04:02:27 emaste Exp $ + * + * Derived from FreeBSD src/sys/sys/queue.h:1.63. + * $P4: //depot/projects/trustedbsd/openbsm/compat/queue.h#2 $ */ #ifndef _SYS_QUEUE_H_ @@ -537,50 +539,4 @@ QMD_TRACE_ELEM(&(elm)->field); \ } while (0) - -#ifdef _KERNEL - -/* - * XXX insque() and remque() are an old way of handling certain queues. - * They bogusly assumes that all queue heads look alike. - */ - -struct quehead { - struct quehead *qh_link; - struct quehead *qh_rlink; -}; - -#ifdef __CC_SUPPORTS___INLINE - -static __inline void -insque(void *a, void *b) -{ - struct quehead *element = (struct quehead *)a, - *head = (struct quehead *)b; - - element->qh_link = head->qh_link; - element->qh_rlink = head; - head->qh_link = element; - element->qh_link->qh_rlink = element; -} - -static __inline void -remque(void *a) -{ - struct quehead *element = (struct quehead *)a; - - element->qh_link->qh_rlink = element->qh_rlink; - element->qh_rlink->qh_link = element->qh_link; - element->qh_rlink = 0; -} - -#else /* !__CC_SUPPORTS___INLINE */ - -void insque(void *a, void *b); -void remque(void *a); - -#endif /* __CC_SUPPORTS___INLINE */ - -#endif /* _KERNEL */ - #endif /* !_SYS_QUEUE_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Feb 27 01:44: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 5E47616A423; Mon, 27 Feb 2006 01:44: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 062DC16A420 for ; Mon, 27 Feb 2006 01:44: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 2176643D58 for ; Mon, 27 Feb 2006 01:44: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 k1R1ingN059136 for ; Mon, 27 Feb 2006 01:44: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 k1R1ink0059133 for perforce@freebsd.org; Mon, 27 Feb 2006 01:44:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 01:44:49 GMT Message-Id: <200602270144.k1R1ink0059133@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 92451 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, 27 Feb 2006 01:44:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92451 Change 92451 by rwatson@rwatson_peppercorn on 2006/02/27 01:43:52 This is compat/queue.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/compat/queue.h#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/compat/queue.h#3 (text+ko) ==== @@ -29,11 +29,11 @@ * @(#)queue.h 8.5 (Berkeley) 8/20/94 * * Derived from FreeBSD src/sys/sys/queue.h:1.63. - * $P4: //depot/projects/trustedbsd/openbsm/compat/queue.h#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/compat/queue.h#3 $ */ -#ifndef _SYS_QUEUE_H_ -#define _SYS_QUEUE_H_ +#ifndef _COMPAT_QUEUE_H_ +#define _COMPAT_QUEUE_H_ #include @@ -539,4 +539,4 @@ QMD_TRACE_ELEM(&(elm)->field); \ } while (0) -#endif /* !_SYS_QUEUE_H_ */ +#endif /* !_COMPAT_QUEUE_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Feb 27 13:28: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 2EA9416A423; Mon, 27 Feb 2006 13:28: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 E208816A420 for ; Mon, 27 Feb 2006 13:28: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 97F6C43D46 for ; Mon, 27 Feb 2006 13:28: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 k1RDSYlU011637 for ; Mon, 27 Feb 2006 13:28: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 k1RDSYuq011634 for perforce@freebsd.org; Mon, 27 Feb 2006 13:28:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 13:28:34 GMT Message-Id: <200602271328.k1RDSYuq011634@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 92461 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, 27 Feb 2006 13:28:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=92461 Change 92461 by rwatson@rwatson_fledge on 2006/02/27 13:27:59 Rename CHANGELOG to HISTORY, as the change log format isn't quite the standard, and it is perhaps better understood as a version history than a change log. Affected files ... .. //depot/projects/trustedbsd/openbsm/CHANGELOG#13 delete .. //depot/projects/trustedbsd/openbsm/HISTORY#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Feb 27 13:40: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 A925616A423; Mon, 27 Feb 2006 13:40: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 2EFD716A420; Mon, 27 Feb 2006 13:40:06 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD31143D45; Mon, 27 Feb 2006 13:40:05 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 2279246B09; Mon, 27 Feb 2006 08:39:47 -0500 (EST) Date: Mon, 27 Feb 2006 13:44:20 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: "Christian S.J. Peron" In-Reply-To: <43FFF528.7070100@FreeBSD.org> Message-ID: <20060227133628.W52695@fledge.watson.org> References: <200602250012.k1P0CgNJ041723@repoman.freebsd.org> <43FFF528.7070100@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 92365 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, 27 Feb 2006 13:40:07 -0000 On Sat, 25 Feb 2006, Christian S.J. Peron wrote: >> @@ -795,7 +795,11 @@ >> } >> } >> >> +#ifdef LOG_SECURITY >> openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); >> +#else >> + openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); >> +#endif >> syslog(LOG_INFO, "starting...\n"); >> >> if (debug == 0 && daemon(0, 0) == -1) { > > In userspace, we are using LOG_AUTH | LOG_ERR to report audit failures, at > least for login(1) and su(1). Might be a good idea to be consistent, anyway. My general feeling has been that audit-related log material shouldn't go into publically readable logs. LOG_SECURITY works well for this on FreeBSD; however, LOG_AUTHPRIV is probably the better place for the log messages to go so that they don't enter a world-readable log file on other systems? This looks like it will work on Linux and Darwin. On Solaris, there's a LOG_AUDIT, which has the same underlying numeric value as LOG_SECURITY on FreeBSD. Robert N M Watson From owner-p4-projects@FreeBSD.ORG Mon Feb 27 16:47: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 EAF7D16A423; Mon, 27 Feb 2006 16:47: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 947C616A420 for ; Mon, 27 Feb 2006 16:47:22 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: from ems01.seccuris.com (ems01.seccuris.com [204.112.0.35]) by mx1.FreeBSD.org (Postfix) with SMTP id C428B43D45 for ; Mon, 27 Feb 2006 16:47:21 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: (qmail 97360 invoked by uid 0); 27 Feb 2006 16:54:20 -0000 Received: from unknown (HELO ?192.168.11.101?) (unknown) by unknown with SMTP; 27 Feb 2006 16:54:20 -0000 Message-ID: <44032D19.3090201@FreeBSD.org> Date: Mon, 27 Feb 2006 10:47:21 -0600 From: "Christian S.J. Peron" User-Agent: Mozilla Thunderbird 1.0.7 (Macintosh/20050923) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Robert Watson References: <200602250012.k1P0CgNJ041723@repoman.freebsd.org> <43FFF528.7070100@FreeBSD.org> <20060227133628.W52695@fledge.watson.org> In-Reply-To: <20060227133628.W52695@fledge.watson.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 92365 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, 27 Feb 2006 16:47:23 -0000 Robert Watson wrote: > > On Sat, 25 Feb 2006, Christian S.J. Peron wrote: > >>> @@ -795,7 +795,11 @@ >>> } >>> } >>> >>> +#ifdef LOG_SECURITY >>> openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); >>> +#else >>> + openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); >>> +#endif >>> syslog(LOG_INFO, "starting...\n"); >>> >>> if (debug == 0 && daemon(0, 0) == -1) { >> >> >> In userspace, we are using LOG_AUTH | LOG_ERR to report audit >> failures, at least for login(1) and su(1). Might be a good idea to be >> consistent, anyway. > > > My general feeling has been that audit-related log material shouldn't > go into publically readable logs. LOG_SECURITY works well for this on > FreeBSD; however, LOG_AUTHPRIV is probably the better place for the > log messages to go so that they don't enter a world-readable log file > on other systems? This looks like it will work on Linux and Darwin. > On Solaris, there's a LOG_AUDIT, which has the same underlying numeric > value as LOG_SECURITY on FreeBSD. > > Robert N M Watson > > I would agree here. I just consulted RFC 3164 to see if there is anything that they are designating for security related messages and here is what I found: Numerical Facility Code 0 kernel messages 1 user-level messages 2 mail system 3 system daemons 4 security/authorization messages (note 1) 5 messages generated internally by syslogd 6 line printer subsystem 7 network news subsystem 8 UUCP subsystem 9 clock daemon (note 2) 10 security/authorization messages (note 1) 11 FTP daemon 12 NTP subsystem 13 log audit (note 1) 14 log alert (note 1) 15 clock daemon (note 2) 16 local use 0 (local0) 17 local use 1 (local1) 18 local use 2 (local2) 19 local use 3 (local3) 20 local use 4 (local4) 21 local use 5 (local5) 22 local use 6 (local6) 23 local use 7 (local7) Note 1 - Various operating systems have been found to utilize Facilities 4, 10, 13 and 14 for security/authorization, audit, and alert messages which seem to be similar. -- Christian S.J. Peron csjp@FreeBSD.ORG FreeBSD Committer FreeBSD Security Team From owner-p4-projects@FreeBSD.ORG Mon Feb 27 17:33: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 8C6E416A423; Mon, 27 Feb 2006 17:33: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 62B2816A420 for ; Mon, 27 Feb 2006 17:33: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 2CDB243D45 for ; Mon, 27 Feb 2006 17:33: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 k1RHXXMs030104 for ; Mon, 27 Feb 2006 17:33: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 k1RHXWKA030101 for perforce@freebsd.org; Mon, 27 Feb 2006 17:33:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 17:33:32 GMT Message-Id: <200602271733.k1RHXWKA030101@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 92470 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, 27 Feb 2006 17:33:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=92470 Change 92470 by rwatson@rwatson_fledge on 2006/02/27 17:33:13 Remove BSD makefiles, since autoconf/automake now work. We will continue to use FreeBSD BSD make infrastructure in the integrated audit support. Note: The one BSD makefile feature I've been unable to reproduce with automake is man page links. The automake manual doesn't mention anything along these lines, so it may require some automake hackery. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile#3 delete .. //depot/projects/trustedbsd/openbsm/bin/Makefile#5 delete .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile#4 delete .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile#4 delete .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#6 delete .. //depot/projects/trustedbsd/openbsm/bsm/Makefile#8 delete .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile#14 delete .. //depot/projects/trustedbsd/openbsm/man/Makefile#8 delete .. //depot/projects/trustedbsd/openbsm/tools/Makefile#5 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Feb 27 18:49: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 3EF2716A425; Mon, 27 Feb 2006 18:49: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 EE0C416A422 for ; Mon, 27 Feb 2006 18:49: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 A32BB43D55 for ; Mon, 27 Feb 2006 18:49: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 k1RIn5TU032932 for ; Mon, 27 Feb 2006 18:49: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 k1RIn5hb032929 for perforce@freebsd.org; Mon, 27 Feb 2006 18:49:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 18:49:05 GMT Message-Id: <200602271849.k1RIn5hb032929@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 92473 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, 27 Feb 2006 18:49:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=92473 Change 92473 by rwatson@rwatson_fledge on 2006/02/27 18:48:09 Move contents of struct au_token from audit.h to audit_internal.h: this is internal to the libbsm implementation. Leave token_t in the public header since it is a defined part of the interface. Move contents of struct au_record and definition of au_record_t into audit_internal.h for similar reasons. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 $ */ #ifndef _BSM_AUDIT_H @@ -240,25 +240,11 @@ }; 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; -}; +/* + * Contents of token_t are opaque outside of libbsm. + */ typedef struct au_token token_t; -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. */ @@ -310,6 +296,9 @@ }; typedef struct au_evclass_map au_evclass_map_t; +/* + * Audit system calls. + */ #if !defined(_KERNEL) && !defined(KERNEL) int audit(const void *, int); int auditon(int, void *, int); ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 $ */ #ifndef _LIBBSM_INTERNAL_H @@ -47,6 +47,22 @@ * broken with future releases of OpenBSM, which may delete, modify, or * otherwise break these interfaces or the assumptions they rely on. */ +struct au_token { + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; +}; + +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; + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach From owner-p4-projects@FreeBSD.ORG Mon Feb 27 18:52: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 1158F16A423; Mon, 27 Feb 2006 18:52: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 B251F16A420 for ; Mon, 27 Feb 2006 18:52: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 17D5D43D53 for ; Mon, 27 Feb 2006 18:52:10 +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 k1RIq9qi033137 for ; Mon, 27 Feb 2006 18:52:09 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 k1RIq9LT033134 for perforce@freebsd.org; Mon, 27 Feb 2006 18:52:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 18:52:09 GMT Message-Id: <200602271852.k1RIq9LT033134@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 92474 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, 27 Feb 2006 18:52:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=92474 Change 92474 by rwatson@rwatson_fledge on 2006/02/27 18:51:46 Add time.h so that Linux systems can find the definition of clock_t. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#17 (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/bsm/libbsm.h#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#17 $ */ #ifndef _LIBBSM_H_ @@ -45,6 +45,7 @@ #include #include /* Required for audit.h. */ +#include /* Required for clock_t on Linux. */ #include #include From owner-p4-projects@FreeBSD.ORG Mon Feb 27 18:54: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 17B7F16A423; Mon, 27 Feb 2006 18:54: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 B724E16A422 for ; Mon, 27 Feb 2006 18:54: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 1112643D46 for ; Mon, 27 Feb 2006 18:54:13 +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 k1RIsCLb033214 for ; Mon, 27 Feb 2006 18:54: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 k1RIsCSm033211 for perforce@freebsd.org; Mon, 27 Feb 2006 18:54:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 18:54:12 GMT Message-Id: <200602271854.k1RIsCSm033211@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 92475 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, 27 Feb 2006 18:54:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92475 Change 92475 by rwatson@rwatson_fledge on 2006/02/27 18:53:56 Synchronize include guards with include file name. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#9 (text+ko) ==== @@ -34,11 +34,11 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#9 $ */ -#ifndef _LIBBSM_INTERNAL_H -#define _LIBBSM_INTERNAL_H +#ifndef _AUDIT_INTERNAL_H +#define _AUDIT_INTERNAL_H /* * audit_internal.h contains private interfaces that are shared by user space @@ -112,4 +112,4 @@ #define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size) -#endif /* !_LIBBSM_INTERNAL_H_ */ +#endif /* !_AUDIT_INTERNAL_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Feb 27 18:55: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 B9EAC16A423; Mon, 27 Feb 2006 18:55: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 91EED16A420 for ; Mon, 27 Feb 2006 18:55:24 +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 02F9943D49 for ; Mon, 27 Feb 2006 18:55: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 k1RItEOe033285 for ; Mon, 27 Feb 2006 18:55: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 k1RItEpC033282 for perforce@freebsd.org; Mon, 27 Feb 2006 18:55:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 18:55:14 GMT Message-Id: <200602271855.k1RItEpC033282@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 92476 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, 27 Feb 2006 18:55:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=92476 Change 92476 by rwatson@rwatson_fledge on 2006/02/27 18:55:03 queue macros now required only for access to internal audit data structures, rather than public ones. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#10 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#10 (text+ko) ==== @@ -34,12 +34,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#10 $ */ #ifndef _AUDIT_INTERNAL_H #define _AUDIT_INTERNAL_H +#include + /* * audit_internal.h contains private interfaces that are shared by user space * and the kernel for the purposes of assembling audit records. Applications ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#18 (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/bsm/libbsm.h#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#18 $ */ #ifndef _LIBBSM_H_ @@ -42,7 +42,6 @@ #include #include -#include #include /* Required for audit.h. */ #include /* Required for clock_t on Linux. */ From owner-p4-projects@FreeBSD.ORG Mon Feb 27 19:03: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 AF04916A424; Mon, 27 Feb 2006 19:03: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 58F8E16A420 for ; Mon, 27 Feb 2006 19:03: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 1EE8643D4C for ; Mon, 27 Feb 2006 19:03: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 k1RJ3PV6034115 for ; Mon, 27 Feb 2006 19:03: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 k1RJ3OJ3034112 for perforce@freebsd.org; Mon, 27 Feb 2006 19:03:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 19:03:24 GMT Message-Id: <200602271903.k1RJ3OJ3034112@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 92477 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, 27 Feb 2006 19:03:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=92477 Change 92477 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/27 19:02:36 Some tweakage of include file use. This needs to be more autoconf'd as we aren't currently doing feature tests for endian.h vs machine/endian.h use. We do do this for sys/endian.h though. Likewise, we need proper feature tests to decide whether to use the native queue.h or the compat/queue.h in OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#11 edit .. //depot/projects/trustedbsd/openbsm/compat/endian.h#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#19 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#30 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#35 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#11 (text+ko) ==== @@ -34,13 +34,17 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#11 $ */ #ifndef _AUDIT_INTERNAL_H #define _AUDIT_INTERNAL_H +#ifdef __linux__ +#include +#else #include +#endif /* * audit_internal.h contains private interfaces that are shared by user space ==== //depot/projects/trustedbsd/openbsm/compat/endian.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * Derived from FreeBSD src/sys/sys/endian.h:1.6. - * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#6 $ */ #ifndef _COMPAT_ENDIAN_H_ @@ -34,7 +34,11 @@ /* * Pick up value of BYTE_ORDER/_BYTE_ORDER if not yet included. */ +#ifdef __linux__ +#include +#else #include +#endif /* * Some systems will have the uint/int types defined here already, others ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#19 (text+ko) ==== @@ -30,11 +30,10 @@ * 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#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#19 $ */ #include -#include #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#30 (text+ko) ==== @@ -31,15 +31,15 @@ * 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#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#30 $ */ #include -#ifdef __APPLE__ +#ifdef HAVE_SYS_ENDIAN_H +#include +#else #include -#else /* !__APPLE__ */ -#include -#endif /* __APPLE__*/ +#endif #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#35 (text+ko) ==== @@ -30,15 +30,15 @@ * 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#34 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#35 $ */ #include -#ifdef __APPLE__ +#ifdef HAVE_SYS_ENDIAN_H +#include +#else #include -#else /* !__APPLE__ */ -#include -#endif /* __APPLE__*/ +#endif #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Feb 27 19:36: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 6D1B816A423; Mon, 27 Feb 2006 19:36: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 4630D16A420 for ; Mon, 27 Feb 2006 19:36:05 +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 C41B443D49 for ; Mon, 27 Feb 2006 19:36:04 +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 k1RJa40g035419 for ; Mon, 27 Feb 2006 19:36:04 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1RJa4XG035416 for perforce@freebsd.org; Mon, 27 Feb 2006 19:36:04 GMT (envelope-from imp@freebsd.org) Date: Mon, 27 Feb 2006 19:36:04 GMT Message-Id: <200602271936.k1RJa4XG035416@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 92478 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, 27 Feb 2006 19:36:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=92478 Change 92478 by imp@imp_Speedy on 2006/02/27 19:35:08 Duplicate lines Affected files ... .. //depot/projects/arm/src/sys/dev/usb/usb_port.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/dev/usb/usb_port.h#3 (text+ko) ==== @@ -492,7 +492,6 @@ do { \ sc->sc_dev = self; \ device_set_desc_copy(self, devinfo); \ - device_printf(self, "%s\n", devinfo); \ } while (0); #define USB_DETACH(dname) \ From owner-p4-projects@FreeBSD.ORG Mon Feb 27 22:17: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 B720116A423; Mon, 27 Feb 2006 22:17: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 6FFB816A420 for ; Mon, 27 Feb 2006 22:17: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 C8E2F43D49 for ; Mon, 27 Feb 2006 22:17: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 k1RMHgY7052146 for ; Mon, 27 Feb 2006 22:17: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 k1RMHM0l051927 for perforce@freebsd.org; Mon, 27 Feb 2006 22:17:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 22:17:22 GMT Message-Id: <200602272217.k1RMHM0l051927@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 92486 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, 27 Feb 2006 22:17:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92486 Change 92486 by rwatson@rwatson_peppercorn on 2006/02/27 22:16:57 Integrate trustedbsd MAC branch from TrustedBSD base; see change set @92126 for merge details. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#62 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#4 integrate .. //depot/projects/trustedbsd/mac/UPDATING#52 integrate .. //depot/projects/trustedbsd/mac/bin/csh/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/bin/csh/config.h#7 integrate .. //depot/projects/trustedbsd/mac/bin/csh/iconv.h#1 branch .. //depot/projects/trustedbsd/mac/bin/csh/iconv_stub.c#1 branch .. //depot/projects/trustedbsd/mac/bin/ln/ln.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/ps/print.c#25 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/oid-list#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/snmp_mibII.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/export.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/CHANGELOG#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/etc/audit_user#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/man/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/et/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/finnish/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/french/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/german/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/greek/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/italian/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ja/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/spanish/charset#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/charset#1 branch .. //depot/projects/trustedbsd/mac/etc/Makefile#47 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#45 integrate .. //depot/projects/trustedbsd/mac/etc/hosts.allow#5 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/daily/440.status-mailq#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc#30 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#30 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/SERVERS#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/abi#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/archdep#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/localpkg#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/named#13 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/netif#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pccard#7 delete .. //depot/projects/trustedbsd/mac/etc/rc.d/root#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#22 integrate .. //depot/projects/trustedbsd/mac/etc/snmpd.config#3 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#40 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/dialog.1#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/dialog.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#8 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/search.c#7 integrate .. //depot/projects/trustedbsd/mac/include/proc_service.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_cpio.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_pax.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/grantpt.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/recv.2#10 integrate .. //depot/projects/trustedbsd/mac/lib/libipsec/ipsec_set_policy.3#9 integrate .. //depot/projects/trustedbsd/mac/lib/libipsec/ipsec_strerror.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libmemstat/memstat_uma.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kern.c#23 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_init.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_once.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_private.h#14 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_suspend_np.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/libpthread_db.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/libthr_db.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/kld.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libutil/kld.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libutil/libutil.h#8 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#67 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#56 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#83 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/misc/dev.archlist.txt#9 integrate .. //depot/projects/trustedbsd/mac/sbin/gbde/gbde.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/gbde/gbde.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/eli/geli.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/eli/geom_eli.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#32 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifieee80211.c#14 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#36 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#30 integrate .. //depot/projects/trustedbsd/mac/sbin/mca/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mca/mca.8#1 branch .. //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.c#19 integrate .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.8#16 integrate .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.c#17 integrate .. //depot/projects/trustedbsd/mac/secure/usr.sbin/sshd/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#36 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#57 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/agp.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ata.4#17 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ataraid.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/atkbd.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ipmi.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ipsec.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/lp.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_ibm.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.sparc64/eeprom.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/myri10ge.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ng_one2many.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ohci.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/syscons.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/twa.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uart.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vga.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/group.5#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#35 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#44 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/acl.9#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/buf.9#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/memguard.9#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/mtx_pool.9#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/rman.9#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/vm_page_wakeup.9#3 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/ja_JP.SJIS.src#4 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/ja_JP.eucJP.src#3 integrate .. //depot/projects/trustedbsd/mac/share/msgdef/am_ET.UTF-8.src#2 integrate .. //depot/projects/trustedbsd/mac/share/msgdef/ro_RO.ISO8859-2.src#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/mp_machdep.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/identcpu.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/tsc.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/ia32/ia32_syscall.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91st.c#2 delete .. //depot/projects/trustedbsd/mac/sys/arm/at91/files.at91#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/files.at91rm92#2 delete .. //depot/projects/trustedbsd/mac/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/std.at91#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/at91/std.at91rm92#2 delete .. //depot/projects/trustedbsd/mac/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/KB920X#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#124 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.amd64#21 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#51 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#40 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#34 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/README#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/ah.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/ah_desc.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/ah_devid.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/freebsd/ah_if.m#3 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/freebsd/ah_osdep.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/freebsd/ah_osdep.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/ath/version.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_smbat.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_throttle.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/asr/asr.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-chipset.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/amrr/amrr.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_ath.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_athioctl.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/if_athvar.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfe.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cs/if_csvar.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_cbus.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_osdep.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_ioctl.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_library.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_pci.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_sbus.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_target.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_target.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_tpublic.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispmbox.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispreg.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispvar.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/lge/if_lge.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mii/mii.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/fc_log.h#5 delete .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_debug.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_pci.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/if_plip.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ral.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/re/if_re.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/ich.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_axe.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_rue.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_udav.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_ural.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci_pci.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohcivar.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umct.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uplcom.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_quirks.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_subr.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#42 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vge/if_vge.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vfsops.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_slice.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_slice.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/geom/label/g_label.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/label/g_label_ufs.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/geode.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/identcpu.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#53 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#45 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/tsc.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/xbox.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia32/ia32_trap.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/mca.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/mp_machdep.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/trap.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_main.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_acct.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_clock.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_condvar.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_kse.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mbuf.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_resource.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_tc.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thr.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_sleepqueue.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_process.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_domain.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#70 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#85 integrate .. //depot/projects/trustedbsd/mac/sys/modules/arcnet/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/coda5/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/dummynet/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/firewire/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/fwe/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/sbp/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/sbp_targ/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_vlan/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ipmi/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/atm/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/bluetooth/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/bt3c/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/h4/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/ubt/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/modules/nfs4client/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/nfsclient/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/modules/twa/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gre.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_media.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_media.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/net/radix.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_ioctl.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_output.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_var.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/netflow/ng_netflow.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_eiface.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ksocket.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#53 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#61 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_sack.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#56 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_timer.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_timer.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/NOTES#27 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp_intel.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_pcn.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_rl.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sf.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sis.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sk.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ste.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_wb.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_xl.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/trap.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/db_trace.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/eeprom.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.S#18 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/machdep.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_machdep.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/tick.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ipmi.h#1 branch .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#47 integrate .. //depot/projects/trustedbsd/mac/sys/sys/param.h#45 integrate .. //depot/projects/trustedbsd/mac/sys/sys/pcpu.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#67 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sysctl.h#25 integrate .. //depot/projects/trustedbsd/mac/sys/sys/systm.h#33 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_quota.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#33 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom_eli/init-i-P.t#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/column/column.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/netstat/mbuf.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/systat/vmstat.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/vmstat/vmstat.8#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/wall/wall.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/who/who.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#45 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/arp/arp.c#17 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidcontrol/sdp.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/kbd.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcsecd/hcsecd.8#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/config/config.5#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/moused/moused.c#16 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/version/perform.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/powerd/powerd.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/devices.c#19 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/network.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/tcpip.c#11 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#4 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#62 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.534 2006/01/02 17:52:16 dfr Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -1079,11 +1079,14 @@ .for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor # Remove catpages without corresponding manpages. @3<&0; \ @@ -1100,7 +1103,9 @@ check-old-files: @echo ">>> Checking for old files" .for file in ${OLD_FILES} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1116,32 +1121,49 @@ @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor delete-old-dirs: @echo ">>> Removing old directories" .for dir in ${OLD_DIRS} # Don't fail if an old directory isn't empty. - @[ ! -d "${DESTDIR}/${dir}" ] || (rmdir -v "${DESTDIR}/${dir}" || true) + @if [ -d "${DESTDIR}/${dir}" ]; then \ + rmdir -v "${DESTDIR}/${dir}" || true; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor @echo ">>> Old directories removed" check-old-dirs: @echo ">>> Checking for old directories" .for dir in ${OLD_DIRS} - @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}" + @if [ -d "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir}"; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor delete-old: delete-old-files delete-old-dirs ==== //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.27 2006/02/04 08:07:00 avatar Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.28 2006/02/18 16:35:57 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -82,6 +82,10 @@ OLD_FILES+=bin/vinum OLD_FILES+=sbin/vinum OLD_FILES+=usr/share/man/man8/vinum.8.gz +# 200411XX: libxpg4 removal +OLD_FILES+=usr/lib/libxpg4.a +OLD_FILES+=usr/lib/libxpg4.so +OLD_FILES+=usr/lib/libxpg4_p.a # 20041109: replaced by em(4) OLD_FILES+=usr/share/man/man4/gx.4.gz OLD_FILES+=usr/share/man/man4/if_gx.4.gz @@ -89,7 +93,7 @@ OLD_FILES+=usr/bin/dnskeygen OLD_FILES+=usr/bin/dnsquery OLD_FILES+=usr/lib/libisc.a -OLD_FILEs+=usr/lib/libisc.so +OLD_FILES+=usr/lib/libisc.so OLD_FILES+=usr/lib/libisc_p.a OLD_FILES+=usr/libexec/named-xfer OLD_FILES+=usr/sbin/named.restart @@ -563,7 +567,6 @@ # 200201XX OLD_FILES+=usr/sbin/linux # 2001XXXX -OLD_FILES+=etc/security OLD_FILES+=usr/bin/joy OLD_FILES+=usr/sbin/ibcs2 OLD_FILES+=usr/sbin/svr4 @@ -2759,6 +2762,8 @@ OLD_LIBS+=usr/lib/snmp_pf.so.2 # 2005XXXX: not ready for primetime yet OLD_LIBS+=usr/lib/libautofs.so.1 +# 200411XX: libxpg4 removal +OLD_LIBS+=usr/lib/libxpg4.so.3 # 200410XX: libm compatibility fix OLD_LIBS+=lib/libm.so.2 # 20041001: version bump ==== //depot/projects/trustedbsd/mac/UPDATING#52 (text+ko) ==== @@ -94,6 +94,15 @@ Its /etc/rc.conf.d configuration file has been `ppp' from the beginning, and hence there is no need to touch it. +20051014: + Now most modules get their build-time options from the kernel + configuration file. A few modules still have fixed options + due to their non-conformant implementation, but they will be + corrected eventually. You may need to review the options of + the modules in use, explicitly specify the non-default options + in the kernel configuration file, and rebuild the kernel and + modules afterwards. + 20051001: kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8) to turn polling(4) on your interfaces. @@ -501,4 +510,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.438 2006/02/01 13:04:52 yar Exp $ +$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $ ==== //depot/projects/trustedbsd/mac/bin/csh/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.37 2005/08/03 09:22:03 phk Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.38 2006/02/19 06:40:29 ume Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -70,12 +70,30 @@ NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15 NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15 +.if defined(NO_NLS_CATALOGS) || defined(RESCUE) +CFLAGS+= -DNO_NLS_CATALOGS +.else +CFLAGS+= -DHAVE_ICONV +SRCS+= iconv_stub.c +# Folloing links can be installed from ports/shells/tcsh_nls: +# NLSLINKS_de_DE.ISO8859-1 += de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 +# NLSLINKS_el_GR.ISO8859-7 = el_GR.UTF-8 +# NLSLINKS_es_ES.ISO8859-1 += es_ES.UTF-8 +# NLSLINKS_et_EE.ISO8859-15 = et_EE.UTF-8 +# NLSLINKS_fi_FI.ISO8859-1 += fi_FI.UTF-8 +# NLSLINKS_fr_FR.ISO8859-1 += fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 +# NLSLINKS_it_IT.ISO8859-1 += it_CH.UTF-8 it_IT.UTF-8 +# NLSLINKS_ja_JP.eucJP = ja_JP.SJIS ja_JP.UTF-8 +# NLSLINKS_ru_RU.KOI8-R = ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5 ru_RU.UTF-8 +# NLSLINKS_uk_UA.KOI8-U = uk_UA.ISO8859-5 uk_UA.UTF-8 +.endif + NLSNAME= tcsh .for catalog in ${CATALOGS} NLS+= ${catalog:C/.*://} NLSSRCDIR_${catalog:C/.*://}= ${TCSHDIR}/nls/${catalog:C/:.*//} -NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo set[0-9]* +NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo charset set[0-9]* .endfor csh.1: tcsh.man ==== //depot/projects/trustedbsd/mac/bin/csh/config.h#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config.h,v 1.12 2005/05/04 20:21:57 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.13 2006/02/19 06:40:29 ume Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -205,3 +205,7 @@ #include "config_p.h" #include "config_f.h" + +#ifndef NO_NLS_CATALOGS +#define NLS_CATALOGS +#endif ==== //depot/projects/trustedbsd/mac/bin/ln/ln.1#10 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.30 2005/01/16 16:41:57 ru Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.31 2006/02/14 11:08:05 glebius Exp $ .\" -.Dd December 30, 1993 +.Dd February 14, 2006 .Dt LN 1 .Os .Sh NAME @@ -41,11 +41,11 @@ .Nd make links .Sh SYNOPSIS .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file .Op Ar target_file .Nm -.Op Fl fhinsv +.Op Fl Ffhinsv .Ar source_file ... .Ar target_dir .Nm link @@ -76,6 +76,24 @@ option overrides any previous .Fl i options.) +.It Fl F +If the target file already exists and is a directory, then remove it +so that the link may occur. +The +.Fl F +option should be used with either +.Fl f +or +.Fl i +options. +If none is specified, +.Fl f +is implied. +The +.Fl F +option is a no-op unless +.Fl s +option is specified. .It Fl h If the .Ar target_file @@ -179,6 +197,12 @@ They are provided solely for compatibility with other .Nm implementations. +.Pp +The +.Fl F +option is +.Fx +extention and should not be used in portable scripts. .Sh SEE ALSO .Xr link 2 , .Xr lstat 2 , ==== //depot/projects/trustedbsd/mac/bin/ln/ln.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.33 2005/02/09 17:37:37 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.34 2006/02/14 11:08:05 glebius Exp $"); #include #include @@ -53,6 +53,7 @@ #include int fflag; /* Unlink existing files. */ +int Fflag; /* Remove empty directories also. */ int hflag; /* Check new name for symlink first. */ int iflag; /* Interactive mode. */ int sflag; /* Symbolic, not hard, link. */ @@ -91,8 +92,11 @@ exit(linkit(argv[0], argv[1], 0)); } - while ((ch = getopt(argc, argv, "fhinsv")) != -1) + while ((ch = getopt(argc, argv, "Ffhinsv")) != -1) switch (ch) { + case 'F': + Fflag = 1; + break; case 'f': fflag = 1; iflag = 0; @@ -121,6 +125,10 @@ linkf = sflag ? symlink : link; linkch = sflag ? '-' : '='; + if (sflag == 0) + Fflag = 0; + if (Fflag == 1 && iflag == 0) + fflag = 1; switch(argc) { case 0: @@ -200,7 +208,12 @@ * and interactively if -i was specified. */ if (fflag && exists) { - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -216,7 +229,12 @@ return (1); } - if (unlink(source)) { + if (Fflag && S_ISDIR(sb.st_mode)) { + if (rmdir(source)) { + warn("%s", source); + return (1); + } + } else if (unlink(source)) { warn("%s", source); return (1); } @@ -236,8 +254,8 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ln [-fhinsv] source_file [target_file]", - " ln [-fhinsv] source_file ... target_dir", + "usage: ln [-Ffhinsv] source_file [target_file]", + " ln [-Ffhinsv] source_file ... target_dir", " link source_file target_file"); exit(1); } ==== //depot/projects/trustedbsd/mac/bin/ps/print.c#25 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.93 2004/07/20 05:52:00 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $"); #include #include @@ -366,6 +366,8 @@ if (strncmp(ttname, "tty", 3) == 0 || strncmp(ttname, "cua", 3) == 0) ttname += 3; + if (strncmp(ttname, "pts/", 4) == 0) + ttname += 4; (void)printf("%*.*s%c", v->width - 1, v->width - 1, ttname, k->ki_p->ki_kiflag & KI_CTTY ? ' ' : '-'); } ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/oid-list#4 (text+ko) ==== @@ -11,6 +11,7 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module + 3 BEGEMOT-IP snmpd mibII module 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) ==== //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#9 (text+ko) ==== @@ -105,6 +105,18 @@ /* list of all New if registrations */ static struct newifreg_list newifreg_list = TAILQ_HEAD_INITIALIZER(newifreg_list); +/* baud rate of fastest interface */ +uint64_t mibif_maxspeed; + +/* user-forced update interval */ +u_int mibif_force_hc_update_interval; + +/* current update interval */ +u_int mibif_hc_update_interval; + +/* HC update timer handle */ +static void *hc_update_timer; + /*****************************/ static const struct asn_oid oid_ifMIB = OIDX_ifMIB; @@ -280,16 +292,15 @@ (struct snmp_value *)NULL); } -/* - * Fetch new MIB data. +/** + * Fetch the GENERIC IFMIB and update the HC counters */ -int -mib_fetch_ifmib(struct mibif *ifp) +static int +fetch_generic_mib(struct mibif *ifp, const struct ifmibdata *old) { int name[6]; size_t len; - void *newmib; - struct ifmibdata oldmib = ifp->mib; + struct mibif_private *p = ifp->private; name[0] = CTL_NET; name[1] = PF_LINK; @@ -306,26 +317,144 @@ return (-1); } - if (ifp->trap_enable) { - if (!(oldmib.ifmd_flags & IFF_UP)) { - if (ifp->mib.ifmd_flags & IFF_UP) - link_trap(ifp, 1); + /* + * Assume that one of the two following compounds is optimized away + */ + if (ULONG_MAX >= 0xffffffffffffffffULL) { + p->hc_inoctets = ifp->mib.ifmd_data.ifi_ibytes; + p->hc_outoctets = ifp->mib.ifmd_data.ifi_obytes; + p->hc_omcasts = ifp->mib.ifmd_data.ifi_omcasts; + p->hc_opackets = ifp->mib.ifmd_data.ifi_opackets; + p->hc_imcasts = ifp->mib.ifmd_data.ifi_imcasts; + p->hc_ipackets = ifp->mib.ifmd_data.ifi_ipackets; + + } else if (ULONG_MAX >= 0xffffffff) { + +#define UPDATE(HC, MIB) \ + if (old->ifmd_data.MIB > ifp->mib.ifmd_data.MIB) \ + p->HC += (0x100000000ULL + \ + ifp->mib.ifmd_data.MIB) - \ + old->ifmd_data.MIB; \ + else \ + p->HC += ifp->mib.ifmd_data.MIB - \ + old->ifmd_data.MIB; + + UPDATE(hc_inoctets, ifi_ibytes) + UPDATE(hc_outoctets, ifi_obytes) + UPDATE(hc_omcasts, ifi_omcasts) + UPDATE(hc_opackets, ifi_opackets) + UPDATE(hc_imcasts, ifi_imcasts) + UPDATE(hc_ipackets, ifi_ipackets) + +#undef UPDATE + } else + abort(); + return (0); +} + +/** + * Update the 64-bit interface counters + */ +static void +update_hc_counters(void *arg __unused) +{ + struct mibif *ifp; + struct ifmibdata oldmib; + + TAILQ_FOREACH(ifp, &mibif_list, link) { + oldmib = ifp->mib; + (void)fetch_generic_mib(ifp, &oldmib); + } +} + +/** + * Recompute the poll timer for the HC counters + */ +void +mibif_reset_hc_timer(void) +{ + u_int ticks; + + if ((ticks = mibif_force_hc_update_interval) == 0) { + if (mibif_maxspeed <= 10000000) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 27 22:22: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 C1F3E16A423; Mon, 27 Feb 2006 22:22: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 8345D16A420 for ; Mon, 27 Feb 2006 22:22:05 +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 39DB943D46 for ; Mon, 27 Feb 2006 22:22:05 +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 k1RMM5Ab054250 for ; Mon, 27 Feb 2006 22:22:05 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1RMM4b2054244 for perforce@freebsd.org; Mon, 27 Feb 2006 22:22:04 GMT (envelope-from brueffer@freebsd.org) Date: Mon, 27 Feb 2006 22:22:04 GMT Message-Id: <200602272222.k1RMM4b2054244@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 92487 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, 27 Feb 2006 22:22:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=92487 Change 92487 by brueffer@brueffer_serenity on 2006/02/27 22:21:04 Fix a c/p error. Pointy hat to: brueffer Affected files ... .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/trap.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/trap.c#7 (text+ko) ==== @@ -596,7 +596,7 @@ AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, argp); - AUDIT_SYSCALL_EXIT(code, td); + AUDIT_SYSCALL_EXIT(error, td); CTR5(KTR_SYSC, "syscall: p=%p error=%d %s return %#lx %#lx ", p, error, syscallnames[code], td->td_retval[0], From owner-p4-projects@FreeBSD.ORG Mon Feb 27 23:11: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 3280C16A423; Mon, 27 Feb 2006 23:11: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 CB3E516A422 for ; Mon, 27 Feb 2006 23:11: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 6BEDF43D48 for ; Mon, 27 Feb 2006 23:11: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 k1RNB8qo059763 for ; Mon, 27 Feb 2006 23:11: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 k1RNB8sk059760 for perforce@freebsd.org; Mon, 27 Feb 2006 23:11:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 23:11:08 GMT Message-Id: <200602272311.k1RNB8sk059760@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 92490 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, 27 Feb 2006 23:11:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=92490 Change 92490 by rwatson@rwatson_peppercorn on 2006/02/27 23:10:19 Look for the include files we're interested in changing behavior based on, not the ones autoscan finds by default. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#2 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#2 (text+ko) ==== @@ -3,9 +3,6 @@ /* Define to 1 if you have the `alarm' function. */ #undef HAVE_ALARM -/* Define to 1 if you have the header file. */ -#undef HAVE_ARPA_INET_H - /* Define to 1 if you have the `bzero' function. */ #undef HAVE_BZERO @@ -15,8 +12,8 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the header file. */ -#undef HAVE_FCNTL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_ENDIAN_H /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK @@ -36,9 +33,6 @@ /* Define to 1 if you have the `bsm' library (-lbsm). */ #undef HAVE_LIBBSM -/* Define to 1 if you have the header file. */ -#undef HAVE_LIMITS_H - /* Define to 1 if you have the header file. */ #undef HAVE_MACH_MACH_H @@ -52,9 +46,6 @@ /* Define to 1 if you have the `memset' function. */ #undef HAVE_MEMSET -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IN_H - /* Define to 1 if `stat' has the bug that it succeeds when given the zero-length file name argument. */ #undef HAVE_STAT_EMPTY_STRING_BUG @@ -95,18 +86,9 @@ /* Define to 1 if `st_rdev' is member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_RDEV -/* Define to 1 if you have the header file. */ -#undef HAVE_SYSLOG_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_ENDIAN_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SOCKET_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H ==== //depot/projects/trustedbsd/openbsm/configure.ac#6 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#5 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#6 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -23,7 +23,7 @@ # Checks for header files. AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h mach/mach.h netinet/in.h stdint.h stdlib.h string.h sys/param.h sys/socket.h sys/time.h sys/endian.h syslog.h unistd.h]) +AC_CHECK_HEADERS([endian.h mach/mach.h sys/endian.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST From owner-p4-projects@FreeBSD.ORG Mon Feb 27 23:19: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 81A2F16A424; Mon, 27 Feb 2006 23:19: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 416E716A422 for ; Mon, 27 Feb 2006 23:19: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 BF9DB43D46 for ; Mon, 27 Feb 2006 23:19: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 k1RNJIVG060121 for ; Mon, 27 Feb 2006 23:19: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 k1RNJI1h060118 for perforce@freebsd.org; Mon, 27 Feb 2006 23:19:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 23:19:18 GMT Message-Id: <200602272319.k1RNJI1h060118@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 92491 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, 27 Feb 2006 23:19:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=92491 Change 92491 by rwatson@rwatson_peppercorn on 2006/02/27 23:18:20 Check for machine/endian.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#3 edit .. //depot/projects/trustedbsd/openbsm/configure#4 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#3 (text+ko) ==== @@ -33,6 +33,9 @@ /* Define to 1 if you have the `bsm' library (-lbsm). */ #undef HAVE_LIBBSM +/* Define to 1 if you have the header file. */ +#undef HAVE_MACHINE_ENDIAN_H + /* Define to 1 if you have the header file. */ #undef HAVE_MACH_MACH_H ==== //depot/projects/trustedbsd/openbsm/configure#4 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#4 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#6 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -19940,17 +19940,7 @@ - - - - - - - - - - -for ac_header in arpa/inet.h fcntl.h limits.h mach/mach.h netinet/in.h stdint.h stdlib.h string.h sys/param.h sys/socket.h sys/time.h sys/endian.h syslog.h unistd.h +for ac_header in endian.h mach/mach.h machine/endian.h sys/endian.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then ==== //depot/projects/trustedbsd/openbsm/configure.ac#7 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#6 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#7 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -23,7 +23,7 @@ # Checks for header files. AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([endian.h mach/mach.h sys/endian.h]) +AC_CHECK_HEADERS([endian.h mach/mach.h machine/endian.h sys/endian.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST From owner-p4-projects@FreeBSD.ORG Mon Feb 27 23:39: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 9E26F16A423; Mon, 27 Feb 2006 23:39:46 +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 47F5916A420 for ; Mon, 27 Feb 2006 23:39:46 +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 0686E43D46 for ; Mon, 27 Feb 2006 23:39:46 +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 k1RNdji3061990 for ; Mon, 27 Feb 2006 23:39:45 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 k1RNdjXi061987 for perforce@freebsd.org; Mon, 27 Feb 2006 23:39:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 23:39:45 GMT Message-Id: <200602272339.k1RNdjXi061987@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 92494 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, 27 Feb 2006 23:39:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92494 Change 92494 by rwatson@rwatson_peppercorn on 2006/02/27 23:38:56 Use configure to decide what endian includes are available, and how to use them. Prefer the local sys/endian.h if we've got one or building without configure (i.e., BSD make in FreeBSD); otherwise use compat/endian.h. To do that, we need the local endian.h, which on some systems is machine/endian.h (Darwin, *BSD), or in plain old endian.h (Linux). Affected files ... .. //depot/projects/trustedbsd/openbsm/compat/endian.h#7 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#31 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#36 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/compat/endian.h#7 (text+ko) ==== @@ -25,22 +25,13 @@ * SUCH DAMAGE. * * Derived from FreeBSD src/sys/sys/endian.h:1.6. - * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#6 $ + * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#7 $ */ #ifndef _COMPAT_ENDIAN_H_ #define _COMPAT_ENDIAN_H_ /* - * Pick up value of BYTE_ORDER/_BYTE_ORDER if not yet included. - */ -#ifdef __linux__ -#include -#else -#include -#endif - -/* * Some systems will have the uint/int types defined here already, others * will need stdint.h. */ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#31 (text+ko) ==== @@ -31,15 +31,31 @@ * 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#30 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#31 $ */ #include + +#ifdef HAVE_CONFIG_H +#include #ifdef HAVE_SYS_ENDIAN_H #include -#else +#else /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_MACHINE_ENDIAN_H +#include +#else /* !HAVE_MACHINE_ENDIAN_H */ +#ifdef HAVE_ENDIAN_H +#include +#else /* !HAVE_ENDIAN_H */ +#error "No supported endian.h" +#endif /* !HAVE_ENDIAN_H */ +#endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#endif +#endif /* !HAVE_SYS_ENDIANG_H */ +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ + #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#36 (text+ko) ==== @@ -30,15 +30,31 @@ * 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#35 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#36 $ */ #include + +#ifdef HAVE_CONFIG_H +#include #ifdef HAVE_SYS_ENDIAN_H #include -#else +#else /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_MACHINE_ENDIAN_H +#include +#else /* !HAVE_MACHINE_ENDIAN_H */ +#ifdef HAVE_ENDIAN_H +#include +#else /* !HAVE_ENDIAN_H */ +#error "No supported endian.h" +#endif /* !HAVE_ENDIAN_H */ +#endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#endif +#endif /* !HAVE_SYS_ENDIANG_H */ +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ + #include #include #include From owner-p4-projects@FreeBSD.ORG Tue Feb 28 00:13: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 E9BDF16A423; Tue, 28 Feb 2006 00:13: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 8E1CA16A422 for ; Tue, 28 Feb 2006 00:13: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 22D8543D48 for ; Tue, 28 Feb 2006 00:13: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 k1S0DvQS063352 for ; Tue, 28 Feb 2006 00:13: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 k1S0DuTg063349 for perforce@freebsd.org; Tue, 28 Feb 2006 00:13:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 00:13:56 GMT Message-Id: <200602280013.k1S0DuTg063349@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 92496 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, 28 Feb 2006 00:13:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=92496 Change 92496 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 00:13:46 On Linux, define an empty __unused as it's unclear how to get it to work on Linux. On my local RedHat FC3 box, __attribute__used__ is sometimes defined as __attribute__((__unused__)) and other confusing things that are best avoided. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#12 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#12 $ */ #ifndef _AUDIT_INTERNAL_H @@ -42,6 +42,9 @@ #ifdef __linux__ #include +#ifndef __unused +#define __unused +#endif /* !__unused */ #else #include #endif From owner-p4-projects@FreeBSD.ORG Tue Feb 28 00: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 0E5F016A423; Tue, 28 Feb 2006 00:24: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 ACE6D16A420 for ; Tue, 28 Feb 2006 00:24: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 7138843D45 for ; Tue, 28 Feb 2006 00:24:10 +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 k1S0OANv063795 for ; Tue, 28 Feb 2006 00:24:10 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 k1S0OAbG063792 for perforce@freebsd.org; Tue, 28 Feb 2006 00:24:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 00:24:10 GMT Message-Id: <200602280024.k1S0OAbG063792@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 92498 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, 28 Feb 2006 00:24:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=92498 Change 92498 by rwatson@rwatson_peppercorn on 2006/02/28 00:23:33 Avoid unsightly and unportable grubbing around in 32-bit fields of struct in6_addr. Linux and Solaris have the same structure fields, but each with their own subtly different naming conventions. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#32 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#32 (text+ko) ==== @@ -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#31 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#32 $ */ #include @@ -397,10 +397,7 @@ break; case AU_IPv6: - ipv6.__u6_addr.__u6_addr32[0] = ipaddr[0]; - ipv6.__u6_addr.__u6_addr32[1] = ipaddr[1]; - ipv6.__u6_addr.__u6_addr32[2] = ipaddr[2]; - ipv6.__u6_addr.__u6_addr32[3] = ipaddr[3]; + bcopy(ipaddr, &ipv6, sizeof(ipv6)); fprintf(fp, "%s", inet_ntop(AF_INET6, &ipv6, dst, INET6_ADDRSTRLEN)); break; From owner-p4-projects@FreeBSD.ORG Tue Feb 28 00:37: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 D3B8116A426; Tue, 28 Feb 2006 00:37: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 A0FF516A422 for ; Tue, 28 Feb 2006 00:37:28 +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 EE43F43D46 for ; Tue, 28 Feb 2006 00:37:26 +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 k1S0bQPJ064278 for ; Tue, 28 Feb 2006 00:37:26 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1S0bQA5064273 for perforce@freebsd.org; Tue, 28 Feb 2006 00:37:26 GMT (envelope-from imp@freebsd.org) Date: Tue, 28 Feb 2006 00:37:26 GMT Message-Id: <200602280037.k1S0bQA5064273@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 92499 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, 28 Feb 2006 00:37:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=92499 Change 92499 by imp@imp_hammer on 2006/02/28 00:37:10 Make PIO interrupt fast... Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#5 (text+ko) ==== @@ -124,7 +124,8 @@ * Activate the interrupt, but disable all interrupts in the hardware */ WR4(sc, PIO_IDR, 0xffffffff); - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + err = bus_setup_intr(dev, sc->irq_res, + INTR_TYPE_MISC | INTR_MPSAFE | INTR_FAST, at91_pio_intr, sc, &sc->intrhand); if (err) { AT91_PIO_LOCK_DESTROY(sc); From owner-p4-projects@FreeBSD.ORG Tue Feb 28 00:46: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 04C7616A423; Tue, 28 Feb 2006 00:46: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 D01BC16A420 for ; Tue, 28 Feb 2006 00:46:38 +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 83A3943D45 for ; Tue, 28 Feb 2006 00:46: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 k1S0kc9r064650 for ; Tue, 28 Feb 2006 00:46:38 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1S0kctm064647 for perforce@freebsd.org; Tue, 28 Feb 2006 00:46:38 GMT (envelope-from cognet@freebsd.org) Date: Tue, 28 Feb 2006 00:46:38 GMT Message-Id: <200602280046.k1S0kctm064647@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 92500 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, 28 Feb 2006 00:46:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=92500 Change 92500 by cognet@cognet on 2006/02/28 00:46:00 Erm, fix delay. The parameter is ms, not us. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_st.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_st.c#5 (text+ko) ==== @@ -176,7 +176,7 @@ uint32_t start, end, cur; start = st_crtr(); - n = (n * 1000000) / 32768; + n = (n * 1000) / 32768; if (n <= 0) n = 1; end = (start + n) & ST_CRTR_MASK; From owner-p4-projects@FreeBSD.ORG Tue Feb 28 00:46: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 98AD016A45E; Tue, 28 Feb 2006 00:46: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 46A6416A440 for ; Tue, 28 Feb 2006 00:46: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 0060543D45 for ; Tue, 28 Feb 2006 00:46: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 k1S0kcI1064657 for ; Tue, 28 Feb 2006 00:46: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 k1S0kcSt064653 for perforce@freebsd.org; Tue, 28 Feb 2006 00:46:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 00:46:38 GMT Message-Id: <200602280046.k1S0kcSt064653@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 92501 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, 28 Feb 2006 00:46:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=92501 Change 92501 by rwatson@rwatson_peppercorn on 2006/02/28 00:46:14 Test for a fully-featured queue.h, which is not present on all platforms that have queue.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#4 edit .. //depot/projects/trustedbsd/openbsm/configure#5 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#4 (text+ko) ==== @@ -21,6 +21,9 @@ /* Define to 1 if you have the `ftruncate' function. */ #undef HAVE_FTRUNCATE +/* Define if queue.h includes LIST_FIRST */ +#undef HAVE_FULL_QUEUE_H + /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY ==== //depot/projects/trustedbsd/openbsm/configure#5 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#6 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#7 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -22516,6 +22516,70 @@ done +# sys/queue.h exists on most systems, but its capabilities vary a great deal. +# test for LIST_FIRST, which appears to not exist in all of them, and is +# necessary for OpenBSM. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + struct foo { + LIST_ENTRY(foo) foo_entries; + }; + LIST_HEAD(, foo) foo_list; + struct foo *foo; + + foo = LIST_FIRST(&foo_list); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FULL_QUEUE_H +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile tools/Makefile" ==== //depot/projects/trustedbsd/openbsm/configure.ac#8 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#7 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#8 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -44,6 +44,23 @@ AC_FUNC_STRFTIME AC_CHECK_FUNCS([bzero ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) +# sys/queue.h exists on most systems, but its capabilities vary a great deal. +# test for LIST_FIRST, which appears to not exist in all of them, and is +# necessary for OpenBSM. +AC_TRY_COMPILE([ + #include +], [ + struct foo { + LIST_ENTRY(foo) foo_entries; + }; + LIST_HEAD(, foo) foo_list; + struct foo *foo; + + foo = LIST_FIRST(&foo_list); +], [ +AC_DEFINE(HAVE_FULL_QUEUE_H,, Define if queue.h includes LIST_FIRST) +]) + AC_CONFIG_FILES([Makefile bin/Makefile bin/audit/Makefile From owner-p4-projects@FreeBSD.ORG Tue Feb 28 00:51: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 7092516A423; Tue, 28 Feb 2006 00:51:46 +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 2F40116A420 for ; Tue, 28 Feb 2006 00:51:46 +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 CAB6943D46 for ; Tue, 28 Feb 2006 00:51:45 +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 k1S0pjhB072299 for ; Tue, 28 Feb 2006 00:51:45 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 k1S0pj1H072296 for perforce@freebsd.org; Tue, 28 Feb 2006 00:51:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 00:51:45 GMT Message-Id: <200602280051.k1S0pj1H072296@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 92502 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, 28 Feb 2006 00:51:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92502 Change 92502 by rwatson@rwatson_peppercorn on 2006/02/28 00:50:57 Link, not just compile, the LIST_FIRST() test. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#6 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#6 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#7 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#8 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -22544,9 +22544,9 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22560,7 +22560,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22578,7 +22578,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile tools/Makefile" ==== //depot/projects/trustedbsd/openbsm/configure.ac#9 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#8 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#9 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -47,7 +47,7 @@ # sys/queue.h exists on most systems, but its capabilities vary a great deal. # test for LIST_FIRST, which appears to not exist in all of them, and is # necessary for OpenBSM. -AC_TRY_COMPILE([ +AC_TRY_LINK([ #include ], [ struct foo { From owner-p4-projects@FreeBSD.ORG Tue Feb 28 01:25: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 6BFA216A426; Tue, 28 Feb 2006 01:25: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 EF1C816A424 for ; Tue, 28 Feb 2006 01:25: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 AEA6343D4C for ; Tue, 28 Feb 2006 01:25: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 k1S1PfuV074407 for ; Tue, 28 Feb 2006 01:25: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 k1S1Pf7P074404 for perforce@freebsd.org; Tue, 28 Feb 2006 01:25:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:25:41 GMT Message-Id: <200602280125.k1S1Pf7P074404@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 92503 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, 28 Feb 2006 01:25:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=92503 Change 92503 by rwatson@rwatson_peppercorn on 2006/02/28 01:24:41 When constructing tokens with IPv6 addresses, copy the entire structure rather than grubbing around inside. This avoids non-portability. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#37 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#37 (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/openbsm/libbsm/bsm_token.c#36 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#37 $ */ #include @@ -368,10 +368,7 @@ ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, internet_addr, sizeof(*internet_addr)); return (t); } @@ -914,10 +911,7 @@ ADD_U_CHAR(dptr, so->sin6_family); ADD_U_INT16(dptr, so->sin6_port); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, &so->sin6_addr, sizeof(so->sin6_addr)); return (t); From owner-p4-projects@FreeBSD.ORG Tue Feb 28 01:30: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 2731916A423; Tue, 28 Feb 2006 01:30: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 D814916A422 for ; Tue, 28 Feb 2006 01:30: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 6F4E543D8F for ; Tue, 28 Feb 2006 01:30: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 k1S1UmRS074699 for ; Tue, 28 Feb 2006 01:30: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 k1S1Um81074696 for perforce@freebsd.org; Tue, 28 Feb 2006 01:30:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:30:48 GMT Message-Id: <200602280130.k1S1Um81074696@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 92504 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, 28 Feb 2006 01:30:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92504 Change 92504 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 01:29:46 Use configure results to decide which queue.h to use. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#20 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#33 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#12 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#10 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#38 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 (text+ko) ==== @@ -34,19 +34,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 $ */ #ifndef _AUDIT_INTERNAL_H #define _AUDIT_INTERNAL_H -#ifdef __linux__ -#include -#ifndef __unused +#if defined(__linux__) && !defined(__unused) #define __unused -#endif /* !__unused */ -#else -#include #endif /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#20 (text+ko) ==== @@ -30,11 +30,22 @@ * 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#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#20 $ */ #include +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_FULL_QUEUE_H +#include +#else +#include +#endif +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ + #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#33 (text+ko) ==== @@ -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#32 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#33 $ */ #include @@ -51,9 +51,15 @@ #endif /* !HAVE_ENDIAN_H */ #endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#endif /* !HAVE_SYS_ENDIANG_H */ +#endif /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ #else /* !HAVE_CONFIG_H */ #include +#include #endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#12 (text+ko) ==== @@ -27,11 +27,21 @@ * 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#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#12 $ */ #include + +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_FULL_QUEUE_H #include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#10 (text+ko) ==== @@ -26,18 +26,39 @@ * 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#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#10 $ */ /* * Based on sample code from Marc Majka. */ -#include /* strerror() */ -#include /* errno */ +#include + +#ifdef HAVE_CONFIG_H + +#include + +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ + +#else /* !HAVE_CONFIG_H */ + +#include + +#endif /* !HAVE_CONFIG_H */ + +#include #include -#include /* uint32_t */ -#include /* syslog() */ -#include /* syslog() */ + +#include +#include +#include +#include +#include + #ifdef __APPLE__ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#38 (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/openbsm/libbsm/bsm_token.c#37 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#38 $ */ #include @@ -51,8 +51,14 @@ #endif /* !HAVE_MACHINE_ENDIAN_H */ #include #endif /* !HAVE_SYS_ENDIANG_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ #else /* !HAVE_CONFIG_H */ #include +#include #endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 (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#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 $ */ #include From owner-p4-projects@FreeBSD.ORG Tue Feb 28 01:32: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 0EE6816A420; Tue, 28 Feb 2006 01:32: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 BCC7716A422 for ; Tue, 28 Feb 2006 01:32: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 C272343D90 for ; Tue, 28 Feb 2006 01:31: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 k1S1Vodd074736 for ; Tue, 28 Feb 2006 01:31: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 k1S1Vn9k074733 for perforce@freebsd.org; Tue, 28 Feb 2006 01:31:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:31:49 GMT Message-Id: <200602280131.k1S1Vn9k074733@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 92505 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, 28 Feb 2006 01:32:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=92505 Change 92505 by rwatson@rwatson_peppercorn on 2006/02/28 01:31:49 Remove socket token creation, which depends on BSD kernel data structures (and isn't implemented in libbsm anyway). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#39 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#39 (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/openbsm/libbsm/bsm_token.c#38 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#39 $ */ #include @@ -800,50 +800,6 @@ /* * token ID 1 byte - * socket type 2 bytes - * local port 2 bytes - * local Internet address 4 bytes - * remote port 2 bytes - * remote Internet address 4 bytes - */ -token_t * -au_to_socket(struct socket *so) -{ - - errno = ENOTSUP; - return (NULL); -} - -/* - * token ID 1 byte - * socket type 2 bytes - * local port 2 bytes - * address type/length 4 bytes - * local Internet address 4 bytes/16 bytes (IPv4/IPv6 address) - * remote port 4 bytes - * address type/length 4 bytes - * remote Internet address 4 bytes/16 bytes (IPv4/IPv6 address) - */ -token_t * -au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, struct sockaddr *la, - struct sockaddr *ra) -{ - - errno = ENOTSUP; - return (NULL); -} - -token_t * -au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, struct sockaddr *la, - struct sockaddr *ra) -{ - - errno = ENOTSUP; - return (NULL); -} - -/* - * token ID 1 byte * socket family 2 bytes * path 104 bytes */ From owner-p4-projects@FreeBSD.ORG Tue Feb 28 01:33: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 C3CF916A426; Tue, 28 Feb 2006 01:33: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 67DE616A422 for ; Tue, 28 Feb 2006 01:33: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 2D5D443D5D for ; Tue, 28 Feb 2006 01:33: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 k1S1XraV074827 for ; Tue, 28 Feb 2006 01:33: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 k1S1XqMS074824 for perforce@freebsd.org; Tue, 28 Feb 2006 01:33:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:33:52 GMT Message-Id: <200602280133.k1S1XqMS074824@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 92506 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, 28 Feb 2006 01:33:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=92506 Change 92506 by rwatson@rwatson_peppercorn on 2006/02/28 01:33:33 Removed BSD Makefile missed in a previous pass. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#6 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Feb 28 01:43: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 D5CC316A423; Tue, 28 Feb 2006 01:43: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 442F316A420 for ; Tue, 28 Feb 2006 01:43: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 E6BC443D46 for ; Tue, 28 Feb 2006 01:43: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 k1S1h4lS075252 for ; Tue, 28 Feb 2006 01:43: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 k1S1h4fM075248 for perforce@freebsd.org; Tue, 28 Feb 2006 01:43:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:43:04 GMT Message-Id: <200602280143.k1S1h4fM075248@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 92507 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, 28 Feb 2006 01:43:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=92507 Change 92507 by rwatson@rwatson_peppercorn on 2006/02/28 01:42:18 Test for __ variants of struct ipc_perm members, as required on Linux. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#7 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#7 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#8 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#9 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -20478,6 +20478,222 @@ fi +echo "$as_me:$LINENO: checking for struct ipc_perm.__key" >&5 +echo $ECHO_N "checking for struct ipc_perm.__key... $ECHO_C" >&6 +if test "${ac_cv_member_struct_ipc_perm___key+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (ac_aggr.__key) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_ipc_perm___key=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (sizeof ac_aggr.__key) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_ipc_perm___key=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_member_struct_ipc_perm___key=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___key" >&5 +echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___key" >&6 + +echo "$as_me:$LINENO: checking for struct ipc_perm.__seq" >&5 +echo $ECHO_N "checking for struct ipc_perm.__seq... $ECHO_C" >&6 +if test "${ac_cv_member_struct_ipc_perm___seq+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (ac_aggr.__seq) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_ipc_perm___seq=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + + +int +main () +{ +static struct ipc_perm ac_aggr; +if (sizeof ac_aggr.__seq) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_ipc_perm___seq=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_member_struct_ipc_perm___seq=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___seq" >&5 +echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___seq" >&6 + echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then ==== //depot/projects/trustedbsd/openbsm/configure.ac#10 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#9 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#10 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -31,6 +31,12 @@ AC_TYPE_PID_T AC_TYPE_SIZE_T AC_CHECK_MEMBERS([struct stat.st_rdev]) +AC_CHECK_MEMBER([struct ipc_perm.__key],,,[ +#include +]) +AC_CHECK_MEMBER([struct ipc_perm.__seq],,,[ +#include +]) AC_HEADER_TIME AC_STRUCT_TM From owner-p4-projects@FreeBSD.ORG Tue Feb 28 01:48: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 C88D116A424; Tue, 28 Feb 2006 01:48: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 E0EA016A422 for ; Tue, 28 Feb 2006 01:48: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 9386C43D5E for ; Tue, 28 Feb 2006 01:48:11 +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 k1S1mBr5075428 for ; Tue, 28 Feb 2006 01:48: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 k1S1mBwF075425 for perforce@freebsd.org; Tue, 28 Feb 2006 01:48:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:48:11 GMT Message-Id: <200602280148.k1S1mBwF075425@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 92508 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, 28 Feb 2006 01:48:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=92508 Change 92508 by rwatson@rwatson_peppercorn on 2006/02/28 01:47:21 Attempt 2: don't just test for __seq and __key, also create a define that can be tested for. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#5 edit .. //depot/projects/trustedbsd/openbsm/configure#8 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#5 (text+ko) ==== @@ -33,6 +33,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define if ipc_perm.__key instead of key */ +#undef HAVE_IPC_PERM___KEY + +/* Define if ipc_perm.__seq instead of seq */ +#undef HAVE_IPC_PERM___SEQ + /* Define to 1 if you have the `bsm' library (-lbsm). */ #undef HAVE_LIBBSM ==== //depot/projects/trustedbsd/openbsm/configure#8 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#9 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#10 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -20478,6 +20478,7 @@ fi + echo "$as_me:$LINENO: checking for struct ipc_perm.__key" >&5 echo $ECHO_N "checking for struct ipc_perm.__key... $ECHO_C" >&6 if test "${ac_cv_member_struct_ipc_perm___key+set}" = set; then @@ -20586,6 +20587,7 @@ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___key" >&5 echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___key" >&6 + echo "$as_me:$LINENO: checking for struct ipc_perm.__seq" >&5 echo $ECHO_N "checking for struct ipc_perm.__seq... $ECHO_C" >&6 if test "${ac_cv_member_struct_ipc_perm___seq+set}" = set; then @@ -20694,6 +20696,7 @@ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___seq" >&5 echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___seq" >&6 + echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then ==== //depot/projects/trustedbsd/openbsm/configure.ac#11 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#10 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#11 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -31,12 +31,17 @@ AC_TYPE_PID_T AC_TYPE_SIZE_T AC_CHECK_MEMBERS([struct stat.st_rdev]) + AC_CHECK_MEMBER([struct ipc_perm.__key],,,[ #include -]) +], AC_DEFINE(HAVE_IPC_PERM___KEY,, Define if ipc_perm.__key instead of key) +) + AC_CHECK_MEMBER([struct ipc_perm.__seq],,,[ #include -]) +], AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq) +) + AC_HEADER_TIME AC_STRUCT_TM From owner-p4-projects@FreeBSD.ORG Tue Feb 28 01:57: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 C522416A423; Tue, 28 Feb 2006 01:57: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 6AECF16A420 for ; Tue, 28 Feb 2006 01:57:24 +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 4D41C43D72 for ; Tue, 28 Feb 2006 01:57:23 +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 k1S1vNl9075808 for ; Tue, 28 Feb 2006 01:57:23 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 k1S1vMY9075805 for perforce@freebsd.org; Tue, 28 Feb 2006 01:57:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:57:22 GMT Message-Id: <200602280157.k1S1vMY9075805@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 92509 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, 28 Feb 2006 01:57:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=92509 Change 92509 by rwatson@rwatson_peppercorn on 2006/02/28 01:56:58 Third try: the previous attempt resulted in the undef ending up in config.h, but not the #def. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#9 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#9 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#10 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#11 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -20586,6 +20586,13 @@ fi echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___key" >&5 echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___key" >&6 +if test $ac_cv_member_struct_ipc_perm___key = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_IPC_PERM___KEY +_ACEOF + +fi echo "$as_me:$LINENO: checking for struct ipc_perm.__seq" >&5 @@ -20695,6 +20702,13 @@ fi echo "$as_me:$LINENO: result: $ac_cv_member_struct_ipc_perm___seq" >&5 echo "${ECHO_T}$ac_cv_member_struct_ipc_perm___seq" >&6 +if test $ac_cv_member_struct_ipc_perm___seq = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_IPC_PERM___SEQ +_ACEOF + +fi echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 ==== //depot/projects/trustedbsd/openbsm/configure.ac#12 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#11 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#12 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -32,15 +32,17 @@ AC_TYPE_SIZE_T AC_CHECK_MEMBERS([struct stat.st_rdev]) -AC_CHECK_MEMBER([struct ipc_perm.__key],,,[ +AC_CHECK_MEMBER([struct ipc_perm.__key], +[AC_DEFINE(HAVE_IPC_PERM___KEY,, Define if ipc_perm.__key instead of key)], +[],[ #include -], AC_DEFINE(HAVE_IPC_PERM___KEY,, Define if ipc_perm.__key instead of key) -) +]) -AC_CHECK_MEMBER([struct ipc_perm.__seq],,,[ +AC_CHECK_MEMBER([struct ipc_perm.__seq], +[AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq)], +[],[ #include -], AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq) -) +]) AC_HEADER_TIME AC_STRUCT_TM From owner-p4-projects@FreeBSD.ORG Tue Feb 28 01:59: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 054B816A422; Tue, 28 Feb 2006 01:59: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 77B5416A422 for ; Tue, 28 Feb 2006 01:59: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 391A343D46 for ; Tue, 28 Feb 2006 01:59: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 k1S1xQgY075937 for ; Tue, 28 Feb 2006 01:59: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 k1S1xPGR075934 for perforce@freebsd.org; Tue, 28 Feb 2006 01:59:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:59:25 GMT Message-Id: <200602280159.k1S1xPGR075934@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 92510 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, 28 Feb 2006 01:59:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=92510 Change 92510 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 01:58:50 Use __key and __seq if required (Linux). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#40 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#40 (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/openbsm/libbsm/bsm_token.c#39 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#40 $ */ #include @@ -467,9 +467,18 @@ ADD_U_INT16(dptr, perm->mode); ADD_U_INT16(dptr, pad0); + +#ifdef HAVE_IPC_PERM___SEQ + ADD_U_INT16(dptr, perm->__seq); +#else ADD_U_INT16(dptr, perm->seq); +#endif +#ifdef HAVE_IPC_PERM___KEY + ADD_U_INT32(dptr, perm->__key); +#else ADD_U_INT32(dptr, perm->key); +#endif return (t); } From owner-p4-projects@FreeBSD.ORG Tue Feb 28 02: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 CAA2316A423; Tue, 28 Feb 2006 02:10: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 6720D16A420 for ; Tue, 28 Feb 2006 02:10: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 2AF1B43D46 for ; Tue, 28 Feb 2006 02:10: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 k1S2Aebi076422 for ; Tue, 28 Feb 2006 02:10: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 k1S2Ad5v076419 for perforce@freebsd.org; Tue, 28 Feb 2006 02:10:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 02:10:39 GMT Message-Id: <200602280210.k1S2Ad5v076419@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 92511 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, 28 Feb 2006 02:10:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=92511 Change 92511 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 02:09:56 Use KERN_HOSTID and NODEV if they are defined, don't otherwise. (Linux) Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#17 (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_wrappers.c#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#17 $ */ #ifdef __APPLE__ @@ -56,7 +56,11 @@ if (p == NULL) return (kAUBadParamErr); +#ifdef NODEV *p = NODEV; +#else + *p = -1; +#endif /* for /usr/bin/login, try fstat() first */ if (fstat(STDIN_FILENO, &st) != 0) { @@ -78,6 +82,8 @@ int audit_set_terminal_host(uint32_t *m) { + +#ifdef KERN_HOSTID int name[2] = { CTL_KERN, KERN_HOSTID }; size_t len; @@ -90,6 +96,10 @@ return (kAUSysctlErr); } return (kAUNoErr); +#else + *m = -1; + return (kAUNoErr); +#endif } int From owner-p4-projects@FreeBSD.ORG Tue Feb 28 05:56: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 41A9816A420; Tue, 28 Feb 2006 05:56: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 CB29A16A420 for ; Tue, 28 Feb 2006 05:56:17 +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 D9C5343D48 for ; Tue, 28 Feb 2006 05:56:14 +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 k1S5uE4P096770 for ; Tue, 28 Feb 2006 05:56:14 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1S5uEIG096767 for perforce@freebsd.org; Tue, 28 Feb 2006 05:56:14 GMT (envelope-from imp@freebsd.org) Date: Tue, 28 Feb 2006 05:56:14 GMT Message-Id: <200602280556.k1S5uEIG096767@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 92517 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, 28 Feb 2006 05:56:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=92517 Change 92517 by imp@imp_harmony on 2006/02/28 05:56:05 IFC @92515 Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#11 integrate .. //depot/projects/arm/src/sys/coda/coda.h#2 integrate .. //depot/projects/arm/src/sys/conf/files#20 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-queue.c#8 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/arm/src/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/arm/src/sys/dev/de/if_de.c#1 branch .. //depot/projects/arm/src/sys/dev/de/if_devar.h#1 branch .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/arm/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_type.h#6 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#6 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_debug.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/uhci.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/uplcom.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_port.h#4 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/arm/src/sys/dev/vkbd/vkbd.c#4 integrate .. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_mbuf.c#7 integrate .. //depot/projects/arm/src/sys/kern/vfs_aio.c#5 integrate .. //depot/projects/arm/src/sys/modules/Makefile#14 integrate .. //depot/projects/arm/src/sys/modules/coda5/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/crypto/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/de/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/if_ppp/Makefile#3 integrate .. //depot/projects/arm/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/arm/src/sys/net/ppp_deflate.c#2 integrate .. //depot/projects/arm/src/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/arm/src/sys/pci/dc21040reg.h#2 delete .. //depot/projects/arm/src/sys/pci/if_de.c#7 delete .. //depot/projects/arm/src/sys/pci/if_devar.h#6 delete Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_usart_at91rm92.c,v 1.2 2005/01/05 21:58:48 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.2 2006/02/27 23:19:13 cognet Exp $"); #include #include @@ -359,9 +359,9 @@ mtx_lock_spin(&sc->sc_hwmtx); if (csr & USART_CSR_TXRDY && sc->sc_txbusy) - ipend |= UART_IPEND_TXIDLE; + ipend |= SER_INT_TXIDLE; if (csr & USART_CSR_RXRDY) - ipend |= UART_IPEND_RXREADY; + ipend |= SER_INT_RXREADY; mtx_unlock_spin(&sc->sc_hwmtx); return (ipend); } @@ -388,7 +388,7 @@ sig |= SER_DSR; if (csr & USART_CSR_RI) sig |= SER_RI; - new = sig & ~UART_SIGMASK_DELTA; + new = sig & ~SER_MASK_DELTA; sc->sc_hwsig = new; mtx_unlock_spin(&sc->sc_hwmtx); return (sig); ==== //depot/projects/arm/src/sys/coda/coda.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda.h,v 1.13 2005/01/05 23:35:00 imp Exp $ + * $FreeBSD: src/sys/coda/coda.h,v 1.14 2006/02/27 12:04:12 yar Exp $ * */ @@ -41,7 +41,12 @@ #ifndef _CODA_HEADER_ #define _CODA_HEADER_ -#include "opt_coda.h" /* for COMPAT_CODA_5 option */ +#include "opt_coda.h" /* for CODA_COMPAT_5 option */ + +/* Avoid CODA_COMPAT_5 redefinition in coda5 module */ +#if defined (CODA5_MODULE) && !defined(CODA_COMPAT_5) +#define CODA_COMPAT_5 +#endif /* Catch new _KERNEL defn for NetBSD */ #ifdef __NetBSD__ ==== //depot/projects/arm/src/sys/conf/files#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1096 2006/02/07 18:41:56 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1097 2006/02/26 17:54:04 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -507,6 +507,7 @@ dev/dcons/dcons.c optional dcons dev/dcons/dcons_crom.c optional dcons_crom dev/dcons/dcons_os.c optional dcons +dev/de/if_de.c optional de pci dev/digi/CX.c optional digi_CX dev/digi/CX_PCI.c optional digi_CX_PCI dev/digi/EPCX.c optional digi_EPCX @@ -1812,7 +1813,6 @@ pci/alpm.c optional alpm pci pci/amdpm.c optional amdpm pci | nfpm pci pci/amdsmb.c optional amdsmb pci -pci/if_de.c optional de pci pci/if_mn.c optional mn pci pci/if_pcn.c optional pcn pci pci/if_rl.c optional rl pci ==== //depot/projects/arm/src/sys/dev/ata/ata-all.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.264 2006/02/09 20:54:42 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.265 2006/02/25 17:27:32 sos Exp $"); #include "opt_ata.h" #include @@ -160,6 +160,11 @@ if (!ch->r_irq) return ENXIO; + /* grap the channel lock so no new requests gets launched */ + mtx_lock(&ch->state_mtx); + ch->state |= ATA_STALL_QUEUE; + mtx_unlock(&ch->state_mtx); + /* detach & delete all children */ if (!device_get_children(dev, &children, &nchildren)) { for (i = 0; i < nchildren; i++) @@ -196,9 +201,14 @@ while (ATA_LOCKING(dev, ATA_LF_LOCK) != ch->unit) tsleep(&dev, PRIBIO, "atarini", 1); + /* catch eventual request in ch->running */ + mtx_lock(&ch->state_mtx); + if ((request = ch->running)) + callout_stop(&request->callout); + ch->running = NULL; + /* unconditionally grap the channel lock */ - mtx_lock(&ch->state_mtx); - ch->state = ATA_STALL_QUEUE; + ch->state |= ATA_STALL_QUEUE; mtx_unlock(&ch->state_mtx); /* reset the controller HW, the channel and device(s) */ @@ -208,48 +218,32 @@ if (!device_get_children(dev, &children, &nchildren)) { mtx_lock(&Giant); /* newbus suckage it needs Giant */ for (i = 0; i < nchildren; i++) { - if (children[i] && device_is_attached(children[i])) - if (ATA_REINIT(children[i])) { - /* - * if we have a running request and its device matches - * this child we need to inform the request that the - * device is gone and remove it from ch->running - */ - mtx_lock(&ch->state_mtx); - if (ch->running && ch->running->dev == children[i]) { - callout_stop(&ch->running->callout); - request = ch->running; - ch->running = NULL; - } - else - request = NULL; - mtx_unlock(&ch->state_mtx); + /* did any children go missing ? */ + if (children[i] && device_is_attached(children[i]) && + ATA_REINIT(children[i])) { + /* + * if we had a running request and its device matches + * this child we need to inform the request that the + * device is gone. + */ + if (request && request->dev == children[i]) { + request->result = ENXIO; + device_printf(request->dev, "FAILURE - device detached\n"); - if (request) { - request->result = ENXIO; - device_printf(request->dev, - "FAILURE - device detached\n"); - - /* if not timeout finish request here */ - if (!(request->flags & ATA_R_TIMEOUT)) + /* if not timeout finish request here */ + if (!(request->flags & ATA_R_TIMEOUT)) ata_finish(request); - } - device_delete_child(dev, children[i]); + request = NULL; } + device_delete_child(dev, children[i]); + } } free(children, M_TEMP); mtx_unlock(&Giant); /* newbus suckage dealt with, release Giant */ } - /* catch request in ch->running if we havn't already */ - mtx_lock(&ch->state_mtx); - if ((request = ch->running)) - callout_stop(&request->callout); - ch->running = NULL; - mtx_unlock(&ch->state_mtx); - - /* if we got one put it on the queue again */ - if (request) { + /* if we still have a good request put it on the queue again */ + if (request && !(request->flags & ATA_R_TIMEOUT)) { device_printf(request->dev, "WARNING - %s requeued due to channel reset", ata_cmd2str(request)); @@ -335,7 +329,7 @@ ATA_DEBUG_RQ(request, "interrupt"); /* safetycheck for the right state */ - if (ch->state != ATA_ACTIVE && ch->state != ATA_STALL_QUEUE) { + if (ch->state == ATA_IDLE) { device_printf(request->dev, "interrupt on idle channel ignored\n"); break; } ==== //depot/projects/arm/src/sys/dev/ata/ata-queue.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.56 2006/02/23 20:15:22 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.57 2006/02/25 17:27:33 sos Exp $"); #include "opt_ata.h" #include @@ -61,7 +61,7 @@ if (!request->callback && !(request->flags & ATA_R_REQUEUE)) sema_init(&request->done, 0, "ATA request done"); - /* in ATA_STALL_QUEUE state we call HW directly (used only during reinit) */ + /* in ATA_STALL_QUEUE state we call HW directly */ if ((ch->state & ATA_STALL_QUEUE) && (request->flags & ATA_R_CONTROL)) { mtx_lock(&ch->state_mtx); ch->running = request; @@ -505,7 +505,6 @@ if ((request = ch->running) && (!dev || request->dev == dev)) { callout_stop(&request->callout); ch->running = NULL; - ch->state = ATA_IDLE; request->result = ENXIO; TAILQ_INSERT_TAIL(&fail_requests, request, chain); } @@ -527,9 +526,6 @@ TAILQ_REMOVE(&fail_requests, request, chain); ata_finish(request); } - - /* we might have work for the other device on this channel */ - ata_start(ch->dev); } static u_int64_t ==== //depot/projects/arm/src/sys/dev/ath/if_ath.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.136 2006/02/24 23:10:08 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.137 2006/02/27 17:20:23 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -1155,16 +1155,12 @@ */ ATH_TXBUF_LOCK(sc); bf = STAILQ_FIRST(&sc->sc_txbuf); - if (bf != NULL) { - if (bf->bf_flags & ATH_FLAG_BUSY) - bf = NULL; - else - STAILQ_REMOVE_HEAD(&sc->sc_txbuf, bf_list); - } + if (bf != NULL) + STAILQ_REMOVE_HEAD(&sc->sc_txbuf, bf_list); ATH_TXBUF_UNLOCK(sc); if (bf == NULL) { - DPRINTF(sc, ATH_DEBUG_XMIT, - "%s: no available xmit buffers\n", __func__); + DPRINTF(sc, ATH_DEBUG_XMIT, "%s: out of xmit buffers\n", + __func__); sc->sc_stats.ast_tx_qstop++; ifp->if_drv_flags |= IFF_DRV_OACTIVE; break; @@ -1185,14 +1181,14 @@ ieee80211_state_name[ic->ic_state]); sc->sc_stats.ast_tx_discard++; ATH_TXBUF_LOCK(sc); - STAILQ_INSERT_HEAD(&sc->sc_txbuf, bf, bf_list); + STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); break; } IFQ_DRV_DEQUEUE(&ifp->if_snd, m); /* XXX: LOCK */ if (m == NULL) { ATH_TXBUF_LOCK(sc); - STAILQ_INSERT_HEAD(&sc->sc_txbuf, bf, bf_list); + STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); break; } @@ -1279,7 +1275,7 @@ ifp->if_oerrors++; reclaim: ATH_TXBUF_LOCK(sc); - STAILQ_INSERT_HEAD(&sc->sc_txbuf, bf, bf_list); + STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); if (ni != NULL) ieee80211_free_node(ni); @@ -2415,7 +2411,7 @@ __func__, dd->dd_name, ds, (u_long) dd->dd_desc_len, (caddr_t) dd->dd_desc_paddr, /*XXX*/ (u_long) dd->dd_desc_len); - /* allocate buffers */ + /* allocate rx buffers */ bsize = sizeof(struct ath_buf) * nbuf; bf = malloc(bsize, M_ATHDEV, M_NOWAIT | M_ZERO); if (bf == NULL) { @@ -3691,7 +3687,7 @@ , ctsrate /* rts/cts rate */ , ctsduration /* rts/cts duration */ ); - bf->bf_txflags = flags; + bf->bf_flags = flags; /* * Setup the multi-rate retry state only when we're * going to use it. This assumes ath_hal_setuptxdesc @@ -3762,7 +3758,7 @@ { struct ath_hal *ah = sc->sc_ah; struct ieee80211com *ic = &sc->sc_ic; - struct ath_buf *bf, *last; + struct ath_buf *bf; struct ath_desc *ds, *ds0; struct ieee80211_node *ni; struct ath_node *an; @@ -3794,14 +3790,7 @@ break; } ATH_TXQ_REMOVE_HEAD(txq, bf_list); - if (txq->axq_depth > 0) { - /* - * More frames follow. Mark the buffer busy - * so it's not re-used while the hardware may - * still re-read the link field. - */ - bf->bf_flags |= ATH_FLAG_BUSY; - } else + if (txq->axq_depth == 0) txq->axq_link = NULL; ATH_TXQ_UNLOCK(txq); @@ -3838,7 +3827,7 @@ * Hand the descriptor to the rate control algorithm. */ if ((ds->ds_txstat.ts_status & HAL_TXERR_FILT) == 0 && - (bf->bf_txflags & HAL_TXDESC_NOACK) == 0) { + (bf->bf_flags & HAL_TXDESC_NOACK) == 0) { /* * If frame was ack'd update the last rx time * used to workaround phantom bmiss interrupts. @@ -3864,9 +3853,6 @@ bf->bf_node = NULL; ATH_TXBUF_LOCK(sc); - last = STAILQ_LAST(&sc->sc_txbuf, ath_buf, bf_list); - if (last != NULL) - last->bf_flags &= ~ATH_FLAG_BUSY; STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); } @@ -3982,18 +3968,17 @@ /* * NB: this assumes output has been stopped and - * we do not need to block ath_tx_proc + * we do not need to block ath_tx_tasklet */ for (ix = 0;; ix++) { ATH_TXQ_LOCK(txq); bf = STAILQ_FIRST(&txq->axq_q); if (bf == NULL) { + txq->axq_link = NULL; ATH_TXQ_UNLOCK(txq); break; } ATH_TXQ_REMOVE_HEAD(txq, bf_list); - if (txq->axq_depth == 0) - txq->axq_link = NULL; ATH_TXQ_UNLOCK(txq); #ifdef AR_DEBUG if (sc->sc_debug & ATH_DEBUG_RESET) @@ -4011,16 +3996,10 @@ */ ieee80211_free_node(ni); } - bf->bf_flags &= ~ATH_FLAG_BUSY; ATH_TXBUF_LOCK(sc); STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); } - ATH_TXBUF_LOCK(sc); - bf = STAILQ_FIRST(&sc->sc_txbuf); - if (bf != NULL) - bf->bf_flags &= ~ATH_FLAG_BUSY; - ATH_TXBUF_UNLOCK(sc); } static void @@ -4898,10 +4877,10 @@ printf("Q%u[%3u]", qnum, ix); for (i = 0, ds = bf->bf_desc; i < bf->bf_nseg; i++, ds++) { - printf(" (DS.V:%p DS.P:%p) L:%08x D:%08x F:%x TF:%04x%s\n" + printf(" (DS.V:%p DS.P:%p) L:%08x D:%08x F:04%x%s\n" " %08x %08x %08x %08x %08x %08x\n", ds, (struct ath_desc *)bf->bf_daddr + i, - ds->ds_link, ds->ds_data, bf->bf_flags, bf->bf_txflags, + ds->ds_link, ds->ds_data, bf->bf_flags, !done ? "" : (ds->ds_txstat.ts_status == 0) ? " *" : " !", ds->ds_ctl0, ds->ds_ctl1, ds->ds_hw[0], ds->ds_hw[1], ds->ds_hw[2], ds->ds_hw[3]); ==== //depot/projects/arm/src/sys/dev/ath/if_athvar.h#7 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.46 2006/02/24 23:10:08 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.47 2006/02/27 17:20:23 sam Exp $ */ /* @@ -100,8 +100,7 @@ struct ath_buf { STAILQ_ENTRY(ath_buf) bf_list; int bf_nseg; - u_int16_t bf_txflags; /* tx descriptor flags */ - u_int16_t bf_flags; /* see below */ + int bf_flags; /* tx descriptor flags */ struct ath_desc *bf_desc; /* virtual addr of desc */ bus_addr_t bf_daddr; /* physical addr of desc */ bus_dmamap_t bf_dmamap; /* DMA map for mbuf chain */ @@ -113,8 +112,6 @@ }; typedef STAILQ_HEAD(, ath_buf) ath_bufhead; -#define ATH_FLAG_BUSY 0x0001 /* tx descriptor owned by h/w */ - /* * DMA state for tx/rx descriptors. */ @@ -140,7 +137,7 @@ */ struct ath_txq { u_int axq_qnum; /* hardware q number */ - int axq_depth; /* queue depth (stat only) */ + u_int axq_depth; /* queue depth (stat only) */ u_int axq_intrcnt; /* interrupt count */ u_int32_t *axq_link; /* link ptr in last TX desc */ STAILQ_HEAD(, ath_buf) axq_q; /* transmit queue */ ==== //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.110 2006/02/15 00:31:48 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.111 2006/02/26 22:40:56 mjacob Exp $"); #include #include @@ -351,6 +351,7 @@ ISP_LOCK(isp); lp = &FCPARAM(isp)->portdb[ifc->loopid]; if (lp->valid) { + ifc->role = lp->roles; ifc->loopid = lp->loopid; ifc->portid = lp->portid; ifc->node_wwn = lp->node_wwn; ==== //depot/projects/arm/src/sys/dev/kbdmux/kbdmux.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: kbdmux.c,v 1.4 2005/07/14 17:38:35 max Exp $ - * $FreeBSD: src/sys/dev/kbdmux/kbdmux.c,v 1.3 2005/10/18 06:38:14 yar Exp $ + * $FreeBSD: src/sys/dev/kbdmux/kbdmux.c,v 1.6 2006/02/27 21:47:38 emax Exp $ */ #include "opt_kbd.h" @@ -246,11 +246,20 @@ KBDMUX_LOCK(state); - /* read all chars from the keyboard */ + /* + * Read all chars from the keyboard + * + * Turns out that atkbd(4) check_char() method may return + * "true" while read_char() method returns NOKEY. If this + * happens we could stuck in the loop below. Avoid this + * by breaking out of the loop if read_char() method returns + * NOKEY. + */ + while (KBDMUX_CHECK_CHAR(kbd)) { c = KBDMUX_READ_CHAR(kbd, 0); if (c == NOKEY) - continue; + break; if (c == ERRKEY) continue; /* XXX ring bell */ if (!KBD_IS_BUSY(kbd)) @@ -513,6 +522,10 @@ KBDMUX_LOCK_DESTROY(state); bzero(state, sizeof(*state)); free(state, M_KBDMUX); + + free(kbd->kb_keymap, M_KBDMUX); + free(kbd->kb_accentmap, M_KBDMUX); + free(kbd->kb_fkeytab, M_KBDMUX); free(kbd, M_KBDMUX); return (0); @@ -1128,8 +1141,8 @@ break; case PIO_KEYMAP: /* set keyboard translation table */ - case PIO_KEYMAPENT: /* set keyboard translation table entry */ - case PIO_DEADKEYMAP: /* set accent key translation table */ + case PIO_KEYMAPENT: /* set keyboard translation table entry */ + case PIO_DEADKEYMAP: /* set accent key translation table */ KBDMUX_LOCK(state); state->ks_accents = 0; ==== //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_type.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_type.h,v 1.9 2006/02/25 07:45:54 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_type.h,v 1.10 2006/02/26 22:50:14 mjacob Exp $ */ /* * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors. * All rights reserved. @@ -77,7 +77,13 @@ typedef signed short S16; typedef unsigned short U16; +#ifdef __FreeBSD__ +typedef int32_t S32; +typedef uint32_t U32; + +#else + #if defined(unix) || defined(__arm) || defined(ALPHA) || defined(__PPC__) || defined(__ppc) typedef signed int S32; @@ -89,6 +95,7 @@ typedef unsigned long U32; #endif +#endif typedef struct _S64 ==== //depot/projects/arm/src/sys/dev/mpt/mpt.c#5 (text+ko) ==== @@ -92,7 +92,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.16 2006/02/25 07:45:54 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.17 2006/02/26 07:44:31 mjacob Exp $"); #include #include /* XXX For static handler registration */ @@ -1308,9 +1308,6 @@ init.HeaderVersion = htole16(MPI_HEADER_VERSION); init.ReplyFrameSize = htole16(MPT_REPLY_SIZE); init.MsgContext = htole32(MPT_REPLY_HANDLER_HANDSHAKE); - if (mpt->ioc_facts_flags & MPI_IOCFACTS_FLAGS_REPLY_FIFO_HOST_SIGNAL) { - init.Flags |= MPI_IOCINIT_FLAGS_REPLY_FIFO_HOST_SIGNAL; - } if ((error = mpt_send_handshake_cmd(mpt, sizeof init, &init)) != 0) { return(error); @@ -1886,7 +1883,8 @@ mpt_send_cmd(mpt, req); error = mpt_wait_req(mpt, req, REQ_STATE_DONE, REQ_STATE_DONE, - /*sleep_ok*/FALSE, /*time_ms*/mpt->is_sas? 30000 : 3000); + /*sleep_ok*/FALSE, + /*time_ms*/(mpt->is_sas || mpt->is_fc)? 30000 : 3000); if (error != 0) { mpt_prt(mpt, "port enable timed out\n"); return (-1); ==== //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#6 (text+ko) ==== @@ -91,7 +91,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.6 2006/02/25 07:45:54 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.8 2006/02/26 22:50:13 mjacob Exp $"); #include #include @@ -974,7 +974,7 @@ if ((msg->Data[0] & 0xff) == 0xF7) { printf("Device needs AL_PA\n"); } else { - printf("Device %02lx doesn't like " + printf("Device %02x doesn't like " "FC performance\n", msg->Data[0] & 0xFF); } @@ -985,14 +985,14 @@ "receiver prior to acquiring " "AL_PA\n"); } else { - printf("Device %02lx detected loop " + printf("Device %02x detected loop " "failure at its receiver\n", msg->Data[0] & 0xFF); } break; default: - printf("Device %02lx requests that device " - "%02lx reset itself\n", + printf("Device %02x requests that device " + "%02x reset itself\n", msg->Data[0] & 0xFF, (msg->Data[0] >> 8) & 0xFF); break; @@ -2038,10 +2038,17 @@ int error; MPT_LOCK(mpt); + if (TAILQ_EMPTY(&mpt->request_timeout_list) != 0) { + /* + * No work to do- leave. + */ + mpt_prt(mpt, "mpt_recover_commands: no requests.\n"); + MPT_UNLOCK(mpt); + return; + } /* - * Flush any commands whose completion coincides - * with their timeout. + * Flush any commands whose completion coincides with their timeout. */ mpt_intr(mpt); @@ -2088,7 +2095,7 @@ } error = mpt_wait_req(mpt, mpt->tmf_req, REQ_STATE_DONE, - REQ_STATE_DONE, /*sleep_ok*/TRUE, /*time_ms*/5000); + REQ_STATE_DONE, /*sleep_ok*/TRUE, /*time_ms*/500); status = mpt->tmf_req->IOCStatus; if (error != 0) { @@ -2097,7 +2104,7 @@ * If we've errored out and the transaction is still * pending, reset the controller. */ - mpt_prt(mpt, "mpt_recover_commands: Abort timed-out." + mpt_prt(mpt, "mpt_recover_commands: Abort timed-out. " "Resetting controller\n"); mpt_reset(mpt, /*reinit*/TRUE); continue; ==== //depot/projects/arm/src/sys/dev/mpt/mpt_debug.c#6 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_debug.c,v 1.11 2006/02/25 07:45:54 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_debug.c,v 1.12 2006/02/26 22:50:13 mjacob Exp $"); #include @@ -353,10 +353,10 @@ { printf("%s Reply @ %p\n", mpt_ioc_function(msg->Function), msg); printf("\tIOC Status %s\n", mpt_ioc_status(msg->IOCStatus)); - printf("\tIOCLogInfo 0x%08lx\n", msg->IOCLogInfo); + printf("\tIOCLogInfo 0x%08x\n", msg->IOCLogInfo); printf("\tMsgLength 0x%02x\n", msg->MsgLength); printf("\tMsgFlags 0x%02x\n", msg->MsgFlags); - printf("\tMsgContext 0x%08lx\n", msg->MsgContext); + printf("\tMsgContext 0x%08x\n", msg->MsgContext); } static void @@ -379,18 +379,18 @@ printf("\tFlags %d\n", msg->Flags); printf("\tReplyQueueDepth %d\n", msg->ReplyQueueDepth); printf("\tReqFrameSize 0x%04x\n", msg->RequestFrameSize); - printf("\tFW Version 0x%08lx\n", msg->FWVersion.Word); + printf("\tFW Version 0x%08x\n", msg->FWVersion.Word); printf("\tProduct ID 0x%04x\n", msg->ProductID); printf("\tCredits 0x%04x\n", msg->GlobalCredits); printf("\tPorts %d\n", msg->NumberOfPorts); printf("\tEventState 0x%02x\n", msg->EventState); - printf("\tHostMFA_HA 0x%08lx\n", msg->CurrentHostMfaHighAddr); - printf("\tSenseBuf_HA 0x%08lx\n", + printf("\tHostMFA_HA 0x%08x\n", msg->CurrentHostMfaHighAddr); + printf("\tSenseBuf_HA 0x%08x\n", msg->CurrentSenseBufferHighAddr); printf("\tRepFrameSize 0x%04x\n", msg->CurReplyFrameSize); printf("\tMaxDevices 0x%02x\n", msg->MaxDevices); printf("\tMaxBuses 0x%02x\n", msg->MaxBuses); - printf("\tFWImageSize 0x%04lx\n", msg->FWImageSize); + printf("\tFWImageSize 0x%04x\n", msg->FWImageSize); } static void @@ -409,9 +409,9 @@ printf("\tCDBLength %d\n", msg->CDBLength); printf("\tSCSI Status: %s\n", mpt_scsi_status(msg->SCSIStatus)); printf("\tSCSI State: %s\n", mpt_scsi_state(msg->SCSIState)); - printf("\tTransferCnt 0x%04lx\n", msg->TransferCount); - printf("\tSenseCnt 0x%04lx\n", msg->SenseCount); - printf("\tResponseInfo 0x%08lx\n", msg->ResponseInfo); + printf("\tTransferCnt 0x%04x\n", msg->TransferCount); + printf("\tSenseCnt 0x%04x\n", msg->SenseCount); + printf("\tResponseInfo 0x%08x\n", msg->ResponseInfo); } @@ -421,41 +421,51 @@ { mpt_print_reply_hdr((MSG_DEFAULT_REPLY *)msg); printf("\tEvent: %s\n", mpt_ioc_event(msg->Event)); - printf("\tEventContext 0x%04lx\n", msg->EventContext); + printf("\tEventContext 0x%04x\n", msg->EventContext); printf("\tAckRequired %d\n", msg->AckRequired); printf("\tEventDataLength %d\n", msg->EventDataLength); printf("\tContinuation %d\n", msg->MsgFlags & 0x80); switch(msg->Event) { case MPI_EVENT_LOG_DATA: - printf("\tEvtLogData: 0x%04lx\n", msg->Data[0]); + printf("\tEvtLogData: 0x%04x\n", msg->Data[0]); break; case MPI_EVENT_UNIT_ATTENTION: - printf("\tTargetID: 0x%04lx\n", msg->Data[0] & 0xff); - printf("\tBus: 0x%04lx\n", (msg->Data[0] >> 8) & 0xff); + printf("\tTargetID: 0x%04x\n", + msg->Data[0] & 0xff); + printf("\tBus: 0x%04x\n", + (msg->Data[0] >> 8) & 0xff); break; case MPI_EVENT_IOC_BUS_RESET: case MPI_EVENT_EXT_BUS_RESET: case MPI_EVENT_RESCAN: - printf("\tPort: %ld\n", (msg->Data[0] >> 8) & 0xff); + printf("\tPort: %d\n", + (msg->Data[0] >> 8) & 0xff); break; case MPI_EVENT_LINK_STATUS_CHANGE: - printf("\tLinkState: %ld\n", msg->Data[0] & 0xff); - printf("\tPort: %ld\n", (msg->Data[1] >> 8) & 0xff); + printf("\tLinkState: %d\n", + msg->Data[0] & 0xff); + printf("\tPort: %d\n", + (msg->Data[1] >> 8) & 0xff); break; case MPI_EVENT_LOOP_STATE_CHANGE: - printf("\tType: %ld\n", (msg->Data[0] >> 16) & 0xff); - printf("\tChar3: 0x%02lx\n", (msg->Data[0] >> 8) & 0xff); - printf("\tChar4: 0x%02lx\n", (msg->Data[0] ) & 0xff); - printf("\tPort: %ld\n", (msg->Data[1] >> 8) & 0xff); + printf("\tType: %d\n", + (msg->Data[0] >> 16) & 0xff); + printf("\tChar3: 0x%02x\n", + (msg->Data[0] >> 8) & 0xff); + printf("\tChar4: 0x%02x\n", + (msg->Data[0] ) & 0xff); + printf("\tPort: %d\n", + (msg->Data[1] >> 8) & 0xff); break; case MPI_EVENT_LOGOUT: - printf("\tN_PortId: 0x%04lx\n", msg->Data[0]); - printf("\tPort: %ld\n", (msg->Data[1] >> 8) & 0xff); + printf("\tN_PortId: 0x%04x\n", msg->Data[0]); + printf("\tPort: %d\n", + (msg->Data[1] >> 8) & 0xff); break; } @@ -497,7 +507,7 @@ printf("%s @ %p\n", mpt_ioc_function(req->Function), req); printf("\tChain Offset 0x%02x\n", req->ChainOffset); printf("\tMsgFlags 0x%02x\n", req->MsgFlags); - printf("\tMsgContext 0x%08lx\n", req->MsgContext); + printf("\tMsgContext 0x%08x\n", req->MsgContext); } void @@ -512,7 +522,7 @@ printf("\tTargetID %d\n", msg->TargetID); printf("\tSenseBufferLength %d\n", msg->SenseBufferLength); printf("\tLUN: 0x%0x\n", msg->LUN[1]); - printf("\tControl 0x%08lx ", msg->Control); + printf("\tControl 0x%08x ", msg->Control); #define MPI_PRINT_FIELD(x) \ case MPI_SCSIIO_CONTROL_ ## x : \ printf(" " #x " "); \ @@ -541,8 +551,8 @@ printf("\n"); #undef MPI_PRINT_FIELD - printf("\tDataLength\t0x%08lx\n", msg->DataLength); - printf("\tSenseBufAddr\t0x%08lx\n", msg->SenseBufferLowAddr); + printf("\tDataLength\t0x%08x\n", msg->DataLength); + printf("\tSenseBufAddr\t0x%08x\n", msg->SenseBufferLowAddr); printf("\tCDB[0:%d]\t", msg->CDBLength); for (i = 0; i < msg->CDBLength; i++) printf("%02x ", msg->CDB[i]); @@ -561,7 +571,7 @@ mpt_print_request_hdr((MSG_REQUEST_HEADER *)msg); printf("\tLun 0x%02x\n", msg->LUN[1]); printf("\tTaskType %s\n", mpt_scsi_tm_type(msg->TaskType)); - printf("\tTaskMsgContext 0x%08lx\n", msg->TaskMsgContext); + printf("\tTaskMsgContext 0x%08x\n", msg->TaskMsgContext); } void @@ -686,12 +696,12 @@ case MPI_SGE_FLAGS_SIMPLE_ELEMENT: if (flags & MPI_SGE_FLAGS_64_BIT_ADDRESSING) { SGE_SIMPLE64 *se64 = (SGE_SIMPLE64 *)se; - printf("SE64 %p: Addr=0x%08lx%08lx FlagsLength" - "=0x%lx\n", se64, se64->Address.High, + printf("SE64 %p: Addr=0x%08x%08x FlagsLength" + "=0x%0x\n", se64, se64->Address.High, se64->Address.Low, se64->FlagsLength); nxtaddr = se64 + 1; } else { - printf("SE32 %p: Addr=0x%08lx FlagsLength=0x%lx" + printf("SE32 %p: Addr=0x%0x FlagsLength=0x%0x" "\n", se, se->Address, se->FlagsLength); } printf(" "); @@ -699,16 +709,16 @@ case MPI_SGE_FLAGS_CHAIN_ELEMENT: if (flags & MPI_SGE_FLAGS_64_BIT_ADDRESSING) { SGE_CHAIN64 *ce64 = (SGE_CHAIN64 *) se; - printf("CE64 %p: Addr=0x%08lx%08lx NxtChnO=" - "0x%x Flgs=0x%x Len=0x%x\n", ce64, + printf("CE64 %p: Addr=0x%08x%08x NxtChnO=0x%x " + "Flgs=0x%x Len=0x%0x\n", ce64, ce64->Address.High, ce64->Address.Low, ce64->NextChainOffset, ce64->Flags, ce64->Length); nxtaddr = ce64 + 1; } else { SGE_CHAIN32 *ce = (SGE_CHAIN32 *) se; - printf("CE32 %p: Addr=0x%08lx NxtChnO=0x%x " - " Flgs=0x%x Len=0x%x\n", ce, ce->Address, + printf("CE32 %p: Addr=0x%0x NxtChnO=0x%x " + " Flgs=0x%x Len=0x%0x\n", ce, ce->Address, ce->NextChainOffset, ce->Flags, ce->Length); } flags = 0; ==== //depot/projects/arm/src/sys/dev/usb/ehci.c#6 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.40 2006/01/16 19:23:59 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.41 2006/02/26 02:57:57 iedowse Exp $"); #include #include @@ -1390,7 +1390,7 @@ if (sc->sc_dying) return (USBD_IOERROR); - epipe->nexttoggle = 0; + epipe->nexttoggle = pipe->endpoint->savedtoggle; if (addr == sc->sc_addr) { switch (ed->bEndpointAddress) { @@ -2479,6 +2479,8 @@ ehci_rem_qh(sc, sqh, head); splx(s); ehci_free_sqh(sc, epipe->sqh); + + pipe->endpoint->savedtoggle = epipe->nexttoggle; } /* ==== //depot/projects/arm/src/sys/dev/usb/ohci.c#9 (text+ko) ==== @@ -13,7 +13,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ohci.c,v 1.157 2006/02/11 03:29:02 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ohci.c,v 1.159 2006/02/26 02:57:57 iedowse Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -2161,7 +2161,9 @@ (dev->speed == USB_SPEED_LOW ? OHCI_ED_SPEED : 0) | fmt | OHCI_ED_SET_MAXP(UGETW(ed->wMaxPacketSize))); - sed->ed.ed_headp = sed->ed.ed_tailp = htole32(tdphys); + sed->ed.ed_headp = htole32(tdphys | + (pipe->endpoint->savedtoggle ? OHCI_TOGGLECARRY : 0)); + sed->ed.ed_tailp = htole32(tdphys); switch (xfertype) { case UE_CONTROL: @@ -2247,6 +2249,8 @@ /* Make sure the host controller is not touching this ED */ usb_delay_ms(&sc->sc_bus, 1); splx(s); + pipe->endpoint->savedtoggle = + (le32toh(sed->ed.ed_headp) & OHCI_TOGGLECARRY) ? 1 : 0; ohci_free_sed(sc, opipe->sed); } @@ -3049,6 +3053,9 @@ splx(s); + if (sc->sc_bus.use_polling) + ohci_waitintr(sc, xfer); + return (USBD_IN_PROGRESS); } ==== //depot/projects/arm/src/sys/dev/usb/uhci.c#4 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uhci.c,v 1.163 2006/01/15 20:41:04 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uhci.c,v 1.164 2006/02/26 02:57:57 iedowse Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 28 12:42: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 93E9716A424; Tue, 28 Feb 2006 12:41: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 3810316A420 for ; Tue, 28 Feb 2006 12:41: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 EE2DC43D68 for ; Tue, 28 Feb 2006 12:41: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 k1SCftCB019282 for ; Tue, 28 Feb 2006 12:41: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 k1SCftIC019279 for perforce@freebsd.org; Tue, 28 Feb 2006 12:41:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 12:41:55 GMT Message-Id: <200602281241.k1SCftIC019279@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 92523 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, 28 Feb 2006 12:42:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=92523 Change 92523 by rwatson@rwatson_peppercorn on 2006/02/28 12:41:03 Test for auditon() system call and provide a compile-time definition if it is available; this will make it possibly to not compile some run-time audit tools (such as audit, auditd) and components of libbsm on systems without the system calls -- otherwise you may get linking errors due to undefined symbols. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#10 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#10 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#11 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#12 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -22814,6 +22814,68 @@ rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +# Systems may not define key audit system calls, in which case libbsm cannot +# depend on them or it will generate link-time or run-time errors. Test for +# just one. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + +int +main () +{ + + int err; + + err = auditon(0, NULL, 0); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_AUDIT_SYSCALLS +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile tools/Makefile" ==== //depot/projects/trustedbsd/openbsm/configure.ac#13 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#12 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#13 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -74,6 +74,20 @@ AC_DEFINE(HAVE_FULL_QUEUE_H,, Define if queue.h includes LIST_FIRST) ]) +# Systems may not define key audit system calls, in which case libbsm cannot +# depend on them or it will generate link-time or run-time errors. Test for +# just one. +AC_TRY_LINK([ + #include + #include +], [ + int err; + + err = auditon(0, NULL, 0); +], [ +AC_DEFINE(HAVE_AUDIT_SYSCALLS,, Define if audit system calls present) +]) + AC_CONFIG_FILES([Makefile bin/Makefile bin/audit/Makefile From owner-p4-projects@FreeBSD.ORG Tue Feb 28 13:56: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 82A2516A423; Tue, 28 Feb 2006 13:56: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 261A916A420 for ; Tue, 28 Feb 2006 13:56: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 D783843D45 for ; Tue, 28 Feb 2006 13:56: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 k1SDuPtF029222 for ; Tue, 28 Feb 2006 13:56: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 k1SDuPCF029219 for perforce@freebsd.org; Tue, 28 Feb 2006 13:56:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 13:56:25 GMT Message-Id: <200602281356.k1SDuPCF029219@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 92524 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, 28 Feb 2006 13:56:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=92524 Change 92524 by rwatson@rwatson_peppercorn on 2006/02/28 13:56:24 Expose results of audit system call test not just as a config.h entry, but also to Makefiles so that components can be conditionally built. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#6 edit .. //depot/projects/trustedbsd/openbsm/configure#11 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#6 (text+ko) ==== @@ -3,6 +3,9 @@ /* Define to 1 if you have the `alarm' function. */ #undef HAVE_ALARM +/* Define if audit system calls present */ +#undef HAVE_AUDIT_SYSCALLS + /* Define to 1 if you have the `bzero' function. */ #undef HAVE_BZERO ==== //depot/projects/trustedbsd/openbsm/configure#11 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#12 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#13 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -466,7 +466,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fast depCXX_TRUE am__fastdepCXX_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fast depCXX_TRUE am__fastdepCXX_FALSE LIBOBJS HAVE_AUDIT_SYSCALLS_TRUE HAVE_AUDIT_SYSCALLS_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -22867,15 +22867,29 @@ #define HAVE_AUDIT_SYSCALLS _ACEOF +have_audit_syscalls=true else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + +have_audit_syscalls=false + fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + +if $have_audit_syscalls; then + HAVE_AUDIT_SYSCALLS_TRUE= + HAVE_AUDIT_SYSCALLS_FALSE='#' +else + HAVE_AUDIT_SYSCALLS_TRUE='#' + HAVE_AUDIT_SYSCALLS_FALSE= +fi + + ac_config_files="$ac_config_files Makefile bin/Makefile bin/audit/Makefile bin/auditd/Makefile bin/auditreduce/Makefile bin/praudit/Makefile bsm/Makefile libbsm/Makefile man/Makefile tools/Makefile" @@ -22998,6 +23012,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAVE_AUDIT_SYSCALLS_TRUE}" && test -z "${HAVE_AUDIT_SYSCALLS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_AUDIT_SYSCALLS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_AUDIT_SYSCALLS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -23608,6 +23629,8 @@ s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t s,@LIBOBJS@,$LIBOBJS,;t t +s,@HAVE_AUDIT_SYSCALLS_TRUE@,$HAVE_AUDIT_SYSCALLS_TRUE,;t t +s,@HAVE_AUDIT_SYSCALLS_FALSE@,$HAVE_AUDIT_SYSCALLS_FALSE,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF ==== //depot/projects/trustedbsd/openbsm/configure.ac#14 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#13 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#14 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -86,7 +86,11 @@ err = auditon(0, NULL, 0); ], [ AC_DEFINE(HAVE_AUDIT_SYSCALLS,, Define if audit system calls present) +have_audit_syscalls=true +], [ +have_audit_syscalls=false ]) +AM_CONDITIONAL(HAVE_AUDIT_SYSCALLS, $have_audit_syscalls) AC_CONFIG_FILES([Makefile bin/Makefile From owner-p4-projects@FreeBSD.ORG Tue Feb 28 14:00: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 0D20716A426; Tue, 28 Feb 2006 14:00: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 A6F5D16A424 for ; Tue, 28 Feb 2006 14:00: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 6EE1E43D46 for ; Tue, 28 Feb 2006 14:00: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 k1SE0Vae029529 for ; Tue, 28 Feb 2006 14:00:31 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 k1SE0UlA029526 for perforce@freebsd.org; Tue, 28 Feb 2006 14:00:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 14:00:30 GMT Message-Id: <200602281400.k1SE0UlA029526@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 92525 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, 28 Feb 2006 14:00:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=92525 Change 92525 by rwatson@rwatson_peppercorn on 2006/02/28 13:59:39 Regenerate configure with the right $P4$ from configure.ac update. Build audit, auditd based on HAVE_AUDIT_SYSCALLS. Compile and link bsm_wrappers.c and bsm_notify.c into HAVE_AUDIT_SYSCALLS based on HAVE_AUDIT_SYSCALLS. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/Makefile.am#2 edit .. //depot/projects/trustedbsd/openbsm/configure#12 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.am#2 (text+ko) ==== @@ -1,10 +1,13 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.am#2 $ # SUBDIRS = \ - audit \ - auditd \ auditreduce \ - praudit + praudit +if HAVE_AUDIT_SYSCALLS +SUBDIRS += \ + audit \ + auditd +endif ==== //depot/projects/trustedbsd/openbsm/configure#12 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#13 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#14 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#2 $ # INCLUDES = -I$(top_srcdir) @@ -14,10 +14,14 @@ bsm_flags.c \ bsm_io.c \ bsm_mask.c \ + bsm_token.c \ + bsm_user.c + +if HAVE_AUDIT_SYSCALLS +libbsm_la_SOURCES += \ bsm_notify.c \ - bsm_token.c \ - bsm_user.c \ bsm_wrappers.c +endif man3_MANS = \ au_class.3 \ From owner-p4-projects@FreeBSD.ORG Tue Feb 28 14:02: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 2709316A423; Tue, 28 Feb 2006 14:02: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 C78F216A420 for ; Tue, 28 Feb 2006 14:02: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 7CB9343D45 for ; Tue, 28 Feb 2006 14:02: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 k1SE2YFF029754 for ; Tue, 28 Feb 2006 14:02: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 k1SE2YGv029751 for perforce@freebsd.org; Tue, 28 Feb 2006 14:02:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 14:02:34 GMT Message-Id: <200602281402.k1SE2YGv029751@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 92526 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, 28 Feb 2006 14:02:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=92526 Change 92526 by rwatson@rwatson_peppercorn on 2006/02/28 14:02:20 Update for HAVE_AUDIT_SYSCALLS AM_CONDITIONAL() in configure. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/man/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#3 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -105,6 +105,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#3 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -39,6 +39,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@HAVE_AUDIT_SYSCALLS_TRUE@am__append_1 = \ +@HAVE_AUDIT_SYSCALLS_TRUE@ audit \ +@HAVE_AUDIT_SYSCALLS_TRUE@ auditd + subdir = bin DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -58,7 +62,7 @@ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = auditreduce praudit audit auditd DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -89,6 +93,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -159,12 +165,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = \ - audit \ - auditd \ - auditreduce \ - praudit - +SUBDIRS = auditreduce praudit $(am__append_1) all: all-recursive .SUFFIXES: ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#3 $ # srcdir = @srcdir@ @@ -104,6 +104,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#3 $ # srcdir = @srcdir@ @@ -104,6 +104,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#3 $ # srcdir = @srcdir@ @@ -104,6 +104,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#3 $ # srcdir = @srcdir@ @@ -104,6 +104,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#3 $ # srcdir = @srcdir@ @@ -93,6 +93,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#3 $ # srcdir = @srcdir@ @@ -40,6 +40,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@HAVE_AUDIT_SYSCALLS_TRUE@am__append_1 = \ +@HAVE_AUDIT_SYSCALLS_TRUE@ bsm_notify.c \ +@HAVE_AUDIT_SYSCALLS_TRUE@ bsm_wrappers.c + subdir = libbsm DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -59,9 +63,14 @@ libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libbsm_la_LIBADD = +am__libbsm_la_SOURCES_DIST = bsm_audit.c bsm_class.c bsm_control.c \ + bsm_event.c bsm_flags.c bsm_io.c bsm_mask.c bsm_token.c \ + bsm_user.c bsm_notify.c bsm_wrappers.c +@HAVE_AUDIT_SYSCALLS_TRUE@am__objects_1 = bsm_notify.lo \ +@HAVE_AUDIT_SYSCALLS_TRUE@ bsm_wrappers.lo am_libbsm_la_OBJECTS = bsm_audit.lo bsm_class.lo bsm_control.lo \ - bsm_event.lo bsm_flags.lo bsm_io.lo bsm_mask.lo bsm_notify.lo \ - bsm_token.lo bsm_user.lo bsm_wrappers.lo + bsm_event.lo bsm_flags.lo bsm_io.lo bsm_mask.lo bsm_token.lo \ + bsm_user.lo $(am__objects_1) libbsm_la_OBJECTS = $(am_libbsm_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp @@ -75,7 +84,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libbsm_la_SOURCES) -DIST_SOURCES = $(libbsm_la_SOURCES) +DIST_SOURCES = $(am__libbsm_la_SOURCES_DIST) man3dir = $(mandir)/man3 NROFF = nroff MANS = $(man3_MANS) @@ -111,6 +120,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -183,19 +194,9 @@ target_alias = @target_alias@ INCLUDES = -I$(top_srcdir) lib_LTLIBRARIES = libbsm.la -libbsm_la_SOURCES = \ - bsm_audit.c \ - bsm_class.c \ - bsm_control.c \ - bsm_event.c \ - bsm_flags.c \ - bsm_io.c \ - bsm_mask.c \ - bsm_notify.c \ - bsm_token.c \ - bsm_user.c \ - bsm_wrappers.c - +libbsm_la_SOURCES = bsm_audit.c bsm_class.c bsm_control.c bsm_event.c \ + bsm_flags.c bsm_io.c bsm_mask.c bsm_token.c bsm_user.c \ + $(am__append_1) man3_MANS = \ au_class.3 \ au_control.3 \ ==== //depot/projects/trustedbsd/openbsm/man/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/man/Makefile.in#3 $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -85,6 +85,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ==== //depot/projects/trustedbsd/openbsm/tools/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/openbsm/tools/Makefile.in#3 $ # srcdir = @srcdir@ @@ -101,6 +101,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ +HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ From owner-p4-projects@FreeBSD.ORG Tue Feb 28 14:07: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 AF70016A424; Tue, 28 Feb 2006 14:07: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 5446C16A420 for ; Tue, 28 Feb 2006 14:07: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 1DA2D43D48 for ; Tue, 28 Feb 2006 14:07: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 k1SE7fxf029967 for ; Tue, 28 Feb 2006 14:07: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 k1SE7eOC029964 for perforce@freebsd.org; Tue, 28 Feb 2006 14:07:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 14:07:40 GMT Message-Id: <200602281407.k1SE7eOC029964@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 92527 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, 28 Feb 2006 14:07:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=92527 Change 92527 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 14:07:01 Only implement au_close() if audit system calls are available, as otherwise we can't submit it. au_close_buffer() remains available even without audit system calls, so the remainder of the record construction calls remain useful. (Linux) Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#21 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#21 (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/openbsm/libbsm/bsm_audit.c#20 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#21 $ */ #include @@ -266,11 +266,13 @@ pthread_mutex_unlock(&mutex); } +#ifdef HAVE_AUDIT_SYSCALLS /* * Add the header token, identify any missing tokens. Write out the tokens to * the record memory and finally, call audit. */ -int au_close(int d, int keep, short event) +int +au_close(int d, int keep, short event) { au_record_t *rec; size_t tot_rec_size; @@ -318,6 +320,7 @@ au_teardown(rec); return (retval); } +#endif /* HAVE_AUDIT_SYSCALLS */ /* * au_close(), except onto an in-memory buffer. Buffer size as an argument, From owner-p4-projects@FreeBSD.ORG Tue Feb 28 14:07: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 01BB116A443; Tue, 28 Feb 2006 14:07: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 9E68216A422 for ; Tue, 28 Feb 2006 14:07: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 6956743D4C for ; Tue, 28 Feb 2006 14:07: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 k1SE7f4p029973 for ; Tue, 28 Feb 2006 14:07: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 k1SE7fiT029970 for perforce@freebsd.org; Tue, 28 Feb 2006 14:07:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 14:07:41 GMT Message-Id: <200602281407.k1SE7fiT029970@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 92528 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, 28 Feb 2006 14:07:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=92528 Change 92528 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 14:07:32 Don't implement au_to_me() unless audit system calls are available. (Linux) Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#41 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#41 (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/openbsm/libbsm/bsm_token.c#40 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#41 $ */ #include @@ -1012,7 +1012,7 @@ tid)); } -#if !defined(_KERNEL) && !defined(KERNEL) +#if !defined(_KERNEL) && !defined(KERNEL) && defined(HAVE_AUDIT_SYSCALLS) /* * Collects audit information for the current process * and creates a subject token from it From owner-p4-projects@FreeBSD.ORG Tue Feb 28 14:08: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 AED4516A423; Tue, 28 Feb 2006 14:08: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 5B61616A420 for ; Tue, 28 Feb 2006 14:08: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 2757943D46 for ; Tue, 28 Feb 2006 14:08:43 +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 k1SE8ha4030087 for ; Tue, 28 Feb 2006 14:08: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 k1SE8gvG030084 for perforce@freebsd.org; Tue, 28 Feb 2006 14:08:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 14:08:42 GMT Message-Id: <200602281408.k1SE8gvG030084@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 92529 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, 28 Feb 2006 14:08:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92529 Change 92529 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 14:08:35 Include libbsm.h instead of audit.h so as to pick up the nested include of time.h. (Linux) Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#6 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include From owner-p4-projects@FreeBSD.ORG Tue Feb 28 14:28: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 AC01716A424; Tue, 28 Feb 2006 14:28: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 6959216A422 for ; Tue, 28 Feb 2006 14:28:07 +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 2317843D45 for ; Tue, 28 Feb 2006 14:28:07 +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 k1SES61C030802 for ; Tue, 28 Feb 2006 14:28:07 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 k1SES6aR030799 for perforce@freebsd.org; Tue, 28 Feb 2006 14:28:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 14:28:06 GMT Message-Id: <200602281428.k1SES6aR030799@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 92530 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, 28 Feb 2006 14:28:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=92530 Change 92530 by rwatson@rwatson_peppercorn on 2006/02/28 14:27:11 Update history, install notes, credits for upcoming OpenBSM 1.0 alpha 5. Before release, I'll integrate, merge, and test with audit3 to make sure the fairly heavy set of changes to add portability doesn't disrupt FreeBSD support. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#2 edit .. //depot/projects/trustedbsd/openbsm/README#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#2 (text+ko) ==== @@ -1,3 +1,33 @@ +OpenBSM 1.0 alpha 5 + +- Update install notes to indicate /etc files are to be installed manually. +- On systems without LOG_SECURITY, use LOG_AUTH. +- Convert to autoconf/automake in order to move to a more portable (not + BSD-specific) build infrastructure, and more easy conditional building of + components. Currently, the primary feature loss is that automake does + not have native support for manual symlinks. This will be addressed in a + future OpenBSM release. +- Add compat/queue.h, to be used on systems dated BSD queue macro libraries + (as found on Linux). +- Rename CHANGELOG to HISTORY, as our change log doesn't follow some of the + existing conventions for a CHANGELOG. +- Some private data structures moved from audit.h to audit_internal.h to + prevent inappropriate use by applications and name space pollution. +- Improved detection and use of endian macros using autoconf. +- Avoid non-portable use of struct in6_addr, which is largely opaque. +- Avoid leaking BSD kernel socket related token code to user space in + bsm_token.c. +- Teach System V IPC calls to look for Linux naming variations for certain + struct ipc_perm fields. +- Test for audit system calls, and if not present, don't build + bsm_wrappers.c, bsm_notify.c, audit(8), and auditd(8), which rely on + those system calls. +- au_close() is not implemented on systems that don't have audit system + calls, but au_close_buffer() is. +- Work around missing BSDisms in bsm_wrapper.c. +- Fix nested includes so including libbsm.h in an application on Linux + picks up the necessary definitions. + OpenBSM 1.0 alpha 4 - Remove "audit" user example from audit_user, as it's not present on most @@ -94,4 +124,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#1 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#2 $ ==== //depot/projects/trustedbsd/openbsm/README#16 (text+ko) ==== @@ -25,30 +25,34 @@ Building -OpenBSM is currently built using a series of BSD make files which should -work on both FreeBSD and Darwin. One known issue is that versions of -Darwin prior to 10.3.8 have a nested include of "sys/audit.h" from -"sys/proc.h", which can result in type definition conflicts. If running -with include files from an earlier version of Darwin, the nested include -must be manually removed in order that libbsm can be built, due to -potentially conflicting types resulting from an include of "sys/sysctl.h" -by that file. On Darwin, the use of BSD make must be specified explicitly -by using "bsdmake" rather than "make", which on Darwin refers to GNU make. -Typical invocations from the OpenBSM tree root: +OpenBSM is currently built using autoconf and automake, which should allow +for building on a range of operating systems, including FreeBSD, Mac OS X, +and Linux. Depending on the availability of audit facailities in the +underlying operating system, some components that depend on kernel audit +support are built conditionally. Typically, build will be performed using + + ./configure + make -FreeBSD +To install, use: - % make - # make install + make install -Darwin +You may wish to specify that the OpenBSM components not be installed in the +base system, rather in a specific directory. This may be done using the +--prefix argument to configure. If installing to a specific directory, +remember to update your library path so that running tools from that +directory the correct libbsm is used: - % bsdmake - # bsdmake install + ./configure --prefix=/home/rwatson/openbsm + make + make install + LD_LIBRARY_PATH=/home/rwatson/openbsm/libbsm ; export LD_LIBRARY_PATH -In both cases, you will need to manually propagate openbsm/etc/* into /etc -on your system; this is not done automatically so as to avoid disrupting -the current configuration. +You will need to manually propagate openbsm/etc/* into /etc on your system; +this is not done automatically so as to avoid disrupting the current +configuration. Currently, the locations of these files is not +configurable. Credits @@ -69,6 +73,7 @@ Christian Brueffer Olivier Houchard Christian Peron + Martin Fong 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 @@ -90,4 +95,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#15 $ +$P4: //depot/projects/trustedbsd/openbsm/README#16 $ From owner-p4-projects@FreeBSD.ORG Tue Feb 28 17:30: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 2D5DD16A423; Tue, 28 Feb 2006 17:30: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 D30C716A420 for ; Tue, 28 Feb 2006 17:30:24 +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 8AE0D43D48 for ; Tue, 28 Feb 2006 17:30:24 +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 k1SHUNRs044762 for ; Tue, 28 Feb 2006 17:30:24 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1SHUN4t044759 for perforce@freebsd.org; Tue, 28 Feb 2006 17:30:23 GMT (envelope-from imp@freebsd.org) Date: Tue, 28 Feb 2006 17:30:23 GMT Message-Id: <200602281730.k1SHUN4t044759@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 92532 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, 28 Feb 2006 17:30:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=92532 Change 92532 by imp@imp_Speedy on 2006/02/28 17:29:20 panic if we don't have INTR_FAST for IRQ_SYSTEM Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91.c#12 (text+ko) ==== @@ -532,6 +532,8 @@ { struct at91_softc *sc = device_get_softc(dev); + if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && !(flags & INTR_FAST)) + panic("All system interrupt ISRs must be type INTR_FAST"); BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, cookiep); bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IECR, From owner-p4-projects@FreeBSD.ORG Tue Feb 28 19:52: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 496E916A425; Tue, 28 Feb 2006 19:52: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 1C01216A420; Tue, 28 Feb 2006 19:52:39 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1358243D68; Tue, 28 Feb 2006 19:52:36 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k1SJqaKE019213; Tue, 28 Feb 2006 14:52:36 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Warner Losh Date: Tue, 28 Feb 2006 14:51:49 -0500 User-Agent: KMail/1.9.1 References: <200602280037.k1S0bQA5064273@repoman.freebsd.org> In-Reply-To: <200602280037.k1S0bQA5064273@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200602281451.50834.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1306/Tue Feb 28 04:50:04 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 92499 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, 28 Feb 2006 19:52:40 -0000 On Monday 27 February 2006 19:37, Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=92499 > > Change 92499 by imp@imp_hammer on 2006/02/28 00:37:10 > > Make PIO interrupt fast... > > Affected files ... > > .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#5 edit > > Differences ... > > ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#5 (text+ko) ==== > > @@ -124,7 +124,8 @@ > * Activate the interrupt, but disable all interrupts in the hardware > */ > WR4(sc, PIO_IDR, 0xffffffff); > - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, > + err = bus_setup_intr(dev, sc->irq_res, > + INTR_TYPE_MISC | INTR_MPSAFE | INTR_FAST, > at91_pio_intr, sc, &sc->intrhand); > if (err) { > AT91_PIO_LOCK_DESTROY(sc); You don't need the MPSAFE flag then. FAST handlers are required to be MPSAFE and don't ever run under Giant. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Tue Feb 28 20:39: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 1CAB216A423; Tue, 28 Feb 2006 20:39: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 D2CBA16A420 for ; Tue, 28 Feb 2006 20:39: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 C1DE643D7D for ; Tue, 28 Feb 2006 20:39: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 k1SKdF0k053173 for ; Tue, 28 Feb 2006 20:39: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 k1SKdFJJ053170 for perforce@freebsd.org; Tue, 28 Feb 2006 20:39:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 20:39:15 GMT Message-Id: <200602282039.k1SKdFJJ053170@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 92542 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, 28 Feb 2006 20:39:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=92542 Change 92542 by rwatson@rwatson_peppercorn on 2006/02/28 20:38:53 Explicit include of sys/types.h to use sys/ipc.h; this is documented on required on all the platforms I've looked at, but apparently nested includes on most of them mean this didn't turn up intil a build on a recent Darwin. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#13 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#13 (xtext) ==== @@ -20491,6 +20491,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include @@ -20538,6 +20539,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include @@ -20607,6 +20609,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include @@ -20654,6 +20657,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include #include ==== //depot/projects/trustedbsd/openbsm/configure.ac#15 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#14 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#15 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -35,12 +35,14 @@ AC_CHECK_MEMBER([struct ipc_perm.__key], [AC_DEFINE(HAVE_IPC_PERM___KEY,, Define if ipc_perm.__key instead of key)], [],[ +#include #include ]) AC_CHECK_MEMBER([struct ipc_perm.__seq], [AC_DEFINE(HAVE_IPC_PERM___SEQ,, Define if ipc_perm.__seq instead of seq)], [],[ +#include #include ]) From owner-p4-projects@FreeBSD.ORG Tue Feb 28 20:42: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 9C78116A423; Tue, 28 Feb 2006 20:42: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 5D36416A420 for ; Tue, 28 Feb 2006 20:42: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 811ED43D66 for ; Tue, 28 Feb 2006 20:42: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 k1SKgJWj053385 for ; Tue, 28 Feb 2006 20: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 k1SKgJOe053382 for perforce@freebsd.org; Tue, 28 Feb 2006 20:42:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 20:42:19 GMT Message-Id: <200602282042.k1SKgJOe053382@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 92543 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, 28 Feb 2006 20:42:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=92543 Change 92543 by rwatson@rwatson_peppercorn on 2006/02/28 20:41:42 TODO items for man page symlinks, audit system call stubs. Affected files ... .. //depot/projects/trustedbsd/openbsm/TODO#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/TODO#5 (text+ko) ==== @@ -8,5 +8,10 @@ - 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. +- With the move to autoconf/automake, man page symlinks are no longer + installed. This needs to be fixed. +- It might be desirable to be able to provide EOPNOTSUPP system call stubs + on systems that don't have the necessary audit system calls; that would + allow the full libbsm and tool set to build, just not run. -$P4: //depot/projects/trustedbsd/openbsm/TODO#4 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#5 $ From owner-p4-projects@FreeBSD.ORG Tue Feb 28 20:58: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 BD02916A423; Tue, 28 Feb 2006 20:58: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 7F81716A420 for ; Tue, 28 Feb 2006 20:58: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 1FC2143D53 for ; Tue, 28 Feb 2006 20:58: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 k1SKweNM061415 for ; Tue, 28 Feb 2006 20:58: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 k1SKwdSl061412 for perforce@freebsd.org; Tue, 28 Feb 2006 20:58:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 20:58:39 GMT Message-Id: <200602282058.k1SKwdSl061412@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 92544 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, 28 Feb 2006 20:58:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=92544 Change 92544 by rwatson@rwatson_peppercorn on 2006/02/28 20:58:09 In the Darwin world, sysctl.h includes ucred.h, which depends on queue.h. In Darwin's sysctl.h there is also an include of bsm/audit.h, which in the version shipped with Darwin, performs a nested include of queue.h. However, our version of bsm/audit.h does not include queue.h, since we don't expose queue-based data structures in public BSM include files, which means sysctl.h has a missing dependency. On Darwin, therefore, perform an additional include of sys/queue.h. Ideally, Darwin will explicitly include sys/queue.h in sysctl.h to avoid dependence on the nested include, but this is not currently the case. Reported by: Martin Fong Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 (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_wrappers.c#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 $ */ #ifdef __APPLE__ @@ -35,6 +35,11 @@ #include #include + +#ifdef __APPLE__ +#include /* Our bsm/audit.h doesn't include queue.h. */ +#endif + #include #include From owner-p4-projects@FreeBSD.ORG Tue Feb 28 21:01: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 C1F0916A423; Tue, 28 Feb 2006 21:01: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 8310C16A420 for ; Tue, 28 Feb 2006 21:01: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 4BE4D43D45 for ; Tue, 28 Feb 2006 21:01: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 k1SL1iZO061549 for ; Tue, 28 Feb 2006 21:01:44 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 k1SL1h4B061546 for perforce@freebsd.org; Tue, 28 Feb 2006 21:01:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 21:01:43 GMT Message-Id: <200602282101.k1SL1h4B061546@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 92545 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, 28 Feb 2006 21:01:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=92545 Change 92545 by rwatson@rwatson_peppercorn on 2006/02/28 21:00:55 Add stdlib.h include for exit() definition. Sort includes. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#6 (text+ko) ==== @@ -30,12 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#6 $ */ #include + +#include +#include #include -#include #include "auditd.h" From owner-p4-projects@FreeBSD.ORG Tue Feb 28 21:55: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 F3BE416A423; Tue, 28 Feb 2006 21:55: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 9910F16A42C for ; Tue, 28 Feb 2006 21:55:51 +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 0B87943D4C for ; Tue, 28 Feb 2006 21:55:51 +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 k1SLtoTh068199 for ; Tue, 28 Feb 2006 21:55:50 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1SLtohm068196 for perforce@freebsd.org; Tue, 28 Feb 2006 21:55:50 GMT (envelope-from jhb@freebsd.org) Date: Tue, 28 Feb 2006 21:55:50 GMT Message-Id: <200602282155.k1SLtohm068196@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 92548 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, 28 Feb 2006 21:55:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92548 Change 92548 by jhb@jhb_slimer on 2006/02/28 21:55:02 Account for the last time slice of all exiting threads. We were missing the last time slice for all threads but the last in multithreaded processes. We have to defer the ruadd() until after the last update as well, so it is also in thread_exit() now. Submitted by: davidxu (mostly) Affected files ... .. //depot/projects/smpng/sys/kern/kern_exit.c#114 edit .. //depot/projects/smpng/sys/kern/kern_thread.c#86 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exit.c#114 (text+ko) ==== @@ -110,7 +110,6 @@ void exit1(struct thread *td, int rv) { - uint64_t new_switchtime; struct proc *p, *nq, *q; struct tty *tp; struct vnode *ttyvp; @@ -557,19 +556,6 @@ p->p_state = PRS_ZOMBIE; PROC_UNLOCK(p->p_pptr); - /* Do the same timestamp bookkeeping that mi_switch() would do. */ - new_switchtime = cpu_ticks(); - p->p_rux.rux_runtime += (new_switchtime - PCPU_GET(switchtime)); - p->p_rux.rux_uticks += td->td_uticks; - p->p_rux.rux_sticks += td->td_sticks; - p->p_rux.rux_iticks += td->td_iticks; - PCPU_SET(switchtime, new_switchtime); - PCPU_SET(switchticks, ticks); - cnt.v_swtch++; - - /* Add our usage into the usage of all our children. */ - ruadd(p->p_ru, &p->p_rux, &p->p_stats->p_cru, &p->p_crux); - sched_exit(p->p_pptr, td); /* ==== //depot/projects/smpng/sys/kern/kern_thread.c#86 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -457,6 +458,7 @@ struct thread *td; struct proc *p; struct ksegrp *kg; + uint64_t new_switchtime; td = curthread; kg = td->td_ksegrp; @@ -561,7 +563,6 @@ ksegrp_unlink(kg); ksegrp_stash(kg); } - PROC_UNLOCK(p); td->td_ksegrp = NULL; PCPU_SET(deadthread, td); } else { @@ -584,8 +585,26 @@ * This includes an EX threaded process that is coming * here via exit1(). (exit1 dethreads the proc first). */ - PROC_UNLOCK(p); } + + /* Do the same timestamp bookkeeping that mi_switch() would do. */ + new_switchtime = cpu_ticks(); + p->p_rux.rux_runtime += (new_switchtime - PCPU_GET(switchtime)); + p->p_rux.rux_uticks += td->td_uticks; + p->p_rux.rux_sticks += td->td_sticks; + p->p_rux.rux_iticks += td->td_iticks; + PCPU_SET(switchtime, new_switchtime); + PCPU_SET(switchticks, ticks); + cnt.v_swtch++; + + /* + * If we are the last thread, the process is dying, so add our + * usage into the usage of all our children. + */ + if (p->p_numthreads == 1) + ruadd(p->p_ru, &p->p_rux, &p->p_stats->p_cru, &p->p_crux); + + PROC_UNLOCK(p); td->td_state = TDS_INACTIVE; CTR1(KTR_PROC, "thread_exit: cpu_throw() thread %p", td); cpu_throw(td, choosethread()); From owner-p4-projects@FreeBSD.ORG Tue Feb 28 22:59: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 2DD4916A423; Tue, 28 Feb 2006 22:59: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 E120416A420 for ; Tue, 28 Feb 2006 22:59:09 +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 873F443D46 for ; Tue, 28 Feb 2006 22:59:09 +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 k1SMx9tm071600 for ; Tue, 28 Feb 2006 22:59:09 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 k1SMx8Vu071597 for perforce@freebsd.org; Tue, 28 Feb 2006 22:59:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 22:59:08 GMT Message-Id: <200602282259.k1SMx8Vu071597@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 92552 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, 28 Feb 2006 22:59:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=92552 Change 92552 by rwatson@rwatson_peppercorn on 2006/02/28 22:58:58 When checking for auditon(), don't depend on OpenBSM include files for the definition of auditon(). Submitted by: Martin Fong Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#14 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#14 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#14 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#15 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a5. # @@ -22828,8 +22828,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + + extern int auditon(int, void *, int); int main () ==== //depot/projects/trustedbsd/openbsm/configure.ac#16 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#15 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#16 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -80,8 +80,9 @@ # depend on them or it will generate link-time or run-time errors. Test for # just one. AC_TRY_LINK([ - #include - #include + #include + + extern int auditon(int, void *, int); ], [ int err; From owner-p4-projects@FreeBSD.ORG Wed Mar 1 05:13: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 0903316A644; Wed, 1 Mar 2006 05:13: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 7D4D816A63C for ; Wed, 1 Mar 2006 05:13:42 +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 2281143D4C for ; Wed, 1 Mar 2006 05:13:42 +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 k215DgRs000911 for ; Wed, 1 Mar 2006 05:13:42 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k215Df9V000908 for perforce@freebsd.org; Wed, 1 Mar 2006 05:13:41 GMT (envelope-from imp@freebsd.org) Date: Wed, 1 Mar 2006 05:13:41 GMT Message-Id: <200603010513.k215Df9V000908@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 92559 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 Mar 2006 05:13:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92559 Change 92559 by imp@imp_hammer on 2006/03/01 05:13:22 No need for MPSAFE here. FAST interrupts take precident over MPSAFE. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#6 (text+ko) ==== @@ -124,8 +124,7 @@ * Activate the interrupt, but disable all interrupts in the hardware */ WR4(sc, PIO_IDR, 0xffffffff); - err = bus_setup_intr(dev, sc->irq_res, - INTR_TYPE_MISC | INTR_MPSAFE | INTR_FAST, + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_FAST, at91_pio_intr, sc, &sc->intrhand); if (err) { AT91_PIO_LOCK_DESTROY(sc); From owner-p4-projects@FreeBSD.ORG Wed Mar 1 05:19: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 B0E2B16A6C7; Wed, 1 Mar 2006 05:18: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 0A39816A6C7 for ; Wed, 1 Mar 2006 05:18:49 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C587B43D45 for ; Wed, 1 Mar 2006 05:18:48 +0000 (GMT) (envelope-from soc-andrew@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 k215Imua001148 for ; Wed, 1 Mar 2006 05:18:48 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k215Imhj001145 for perforce@freebsd.org; Wed, 1 Mar 2006 05:18:48 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 1 Mar 2006 05:18:48 GMT Message-Id: <200603010518.k215Imhj001145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 92560 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 Mar 2006 05:19:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=92560 Change 92560 by soc-andrew@soc-andrew_serv on 2006/03/01 05:18:15 Make the LOCAL_SCRIPT script independent of where it is located Affected files ... .. //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#10 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#10 (text+ko) ==== @@ -28,13 +28,14 @@ cd ../src echo "#!/bin/sh" > ${PATCH_DIR}/local_script.sh +echo "BASE=\`dirname \$0\`" >> ${PATCH_DIR}/local_script.sh echo "cd \${CHROOTDIR}/usr/src" >> ${PATCH_DIR}/local_script.sh for _dir in ${DIRS}; do dir=`echo ${_dir} | sed "s/:.*$//"` name=`echo ${_dir} | sed "s/^[^:]*://"` tar -cf ${PATCH_DIR}/bsd_installer_$name.tar $dir - echo "tar xf ${PATCH_DIR}/bsd_installer_$name.tar" >> ${PATCH_DIR}/local_script.sh + echo "tar xf \${BASE}/bsd_installer_$name.tar" >> ${PATCH_DIR}/local_script.sh done chmod +x ${PATCH_DIR}/local_script.sh From owner-p4-projects@FreeBSD.ORG Wed Mar 1 05:51: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 145D616A425; Wed, 1 Mar 2006 05:51: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 E2E6316A420 for ; Wed, 1 Mar 2006 05:51:28 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 610A543D53 for ; Wed, 1 Mar 2006 05:51:28 +0000 (GMT) (envelope-from soc-andrew@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 k215pSYk002412 for ; Wed, 1 Mar 2006 05:51:28 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k215pS4t002409 for perforce@freebsd.org; Wed, 1 Mar 2006 05:51:28 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 1 Mar 2006 05:51:28 GMT Message-Id: <200603010551.k215pS4t002409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 92561 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 Mar 2006 05:51:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=92561 Change 92561 by soc-andrew@soc-andrew_serv on 2006/03/01 05:51:27 Catchup to the BSD Installer cvs HEAD Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/conf/DragonFly.lua#2 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/220_format_disk.lua#4 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/conf/DragonFly.lua#2 (text+ko) ==== @@ -1,13 +1,42 @@ -- -- conf/DragonFly.lua --- $Id: DragonFly.lua,v 1.7 2005/08/31 17:12:08 cpressey Exp $ +-- $Id: DragonFly.lua,v 1.8 2005/12/21 22:49:26 cpressey Exp $ -- -- This file contains DragonFly-specific overrides to BSDInstaller.lua. -- os = { name = "DragonFly BSD", - version = "1.3.5-DEVELOPMENT" + version = "2.0-RELEASE" +} + +install_items = { + "COPYRIGHT", + "bin", + "boot", + "dev", + { src = "etc.hdd", dest = "etc" }, -- install media config differs + "lib", + "libexec", + "kernel", + "modules", + "root", + "sbin", + "sys", -- XXX What's the deal with this anyway? + "usr/bin", + "usr/freebsd_pkg", + "usr/pkg", + "usr/games", + "usr/include", + "usr/lib", +-- "usr/local", -- No need to copy these two, since we use mtree to +-- "usr/X11R6", -- make them and pkg_add to populate them with files. + "usr/libdata", + "usr/libexec", + "usr/sbin", + "usr/share", + "usr/src", + "var" } default_packages = default_packages + { ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/220_format_disk.lua#4 (text+ko) ==== @@ -1,4 +1,4 @@ --- $Id: 220_format_disk.lua,v 1.14 2005/10/12 00:50:12 cpressey Exp $ +-- $Id: 220_format_disk.lua,v 1.15 2006/02/03 22:54:13 sullrich Exp $ -- -- Allow the user to format the selected disk, if they so desire. @@ -10,7 +10,7 @@ local select_geometry = function(step, dd) local c_cyl, c_head, c_sec = dd:get_geometry() local geom_msg = _( - "The system is reports that the geometry of %s is\n\n" .. + "The system reports that the geometry of %s is\n\n" .. "%d cylinders, %d heads, %d sectors\n\n", dd:get_name(), dd:get_geometry_cyl(), From owner-p4-projects@FreeBSD.ORG Wed Mar 1 06:04: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 2028F16A428; Wed, 1 Mar 2006 06:04: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 C938C16A426 for ; Wed, 1 Mar 2006 06:04:08 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D760843D8F for ; Wed, 1 Mar 2006 06:03:44 +0000 (GMT) (envelope-from soc-andrew@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 k2163iA2002993 for ; Wed, 1 Mar 2006 06:03:44 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2163hKE002990 for perforce@freebsd.org; Wed, 1 Mar 2006 06:03:43 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 1 Mar 2006 06:03:43 GMT Message-Id: <200603010603.k2163hKE002990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 92564 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 Mar 2006 06:04:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=92564 Change 92564 by soc-andrew@soc-andrew_serv on 2006/03/01 06:03:02 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#10 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#30 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#9 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#13 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.534 2006/01/02 17:52:16 dfr Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.536 2006/02/27 09:17:39 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -506,7 +506,7 @@ # Check for missing UIDs/GIDs. # CHECK_UIDS= -CHECK_GIDS= +CHECK_GIDS= audit .if !defined(NO_SENDMAIL) CHECK_UIDS+= smmsp CHECK_GIDS+= smmsp @@ -1079,11 +1079,14 @@ .for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor # Remove catpages without corresponding manpages. @3<&0; \ @@ -1100,7 +1103,9 @@ check-old-files: @echo ">>> Checking for old files" .for file in ${OLD_FILES} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1116,32 +1121,49 @@ @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ - || ([ -f "${DESTDIR}/${file}" ] \ - && echo "Removing schg flag on ${DESTDIR}/${file}" \ - && chflags noschg "${DESTDIR}/${file}" \ - && rm ${RM_I} "${DESTDIR}/${file}")) + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + rm ${RM_I} "${DESTDIR}/${file}" || true; \ + if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ + echo "Removing schg flag on ${DESTDIR}/${file}"; \ + chflags noschg "${DESTDIR}/${file}"; \ + rm ${RM_I} "${DESTDIR}/${file}"; \ + fi; \ + fi .endfor @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" .for file in ${OLD_LIBS} - @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" + @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ + echo "${DESTDIR}/${file}"; \ + fi .endfor delete-old-dirs: @echo ">>> Removing old directories" .for dir in ${OLD_DIRS} # Don't fail if an old directory isn't empty. - @[ ! -d "${DESTDIR}/${dir}" ] || (rmdir -v "${DESTDIR}/${dir}" || true) + @if [ -d "${DESTDIR}/${dir}" ]; then \ + rmdir -v "${DESTDIR}/${dir}" || true; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor @echo ">>> Old directories removed" check-old-dirs: @echo ">>> Checking for old directories" .for dir in ${OLD_DIRS} - @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}" + @if [ -d "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir}"; \ + else \ + if [ -L "${DESTDIR}/${dir}" ]; then \ + echo "${DESTDIR}/${dir} is a link, please remove everything manually."; \ + fi; \ + fi .endfor delete-old: delete-old-files delete-old-dirs ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.898 2006/01/30 14:24:31 kensmith Exp $ +# $FreeBSD: src/release/Makefile,v 1.899 2006/02/08 11:18:29 hrs Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -667,10 +667,11 @@ -czf ${RD}/dists/ports/ports.tgz -C /usr ports @cp ${.CURDIR}/scripts/ports-install.sh ${RD}/dists/ports/install.sh @(cd ${RD}/dists/ports; \ - rm -f .CHECKSUM.MD5 CHECKSUM.SHA256; \ + rm -f CHECKSUM.MD5 CHECKSUM.SHA256; \ md5 * > .CHECKSUM.MD5; \ - sha256 * > CHECKSUM.SHA256; \ - mv .CHECKSUM.MD5 CHECKSUM.MD5) + sha256 * > .CHECKSUM.SHA256; \ + mv .CHECKSUM.MD5 CHECKSUM.MD5; \ + mv .CHECKSUM.SHA256 CHECKSUM.SHA256) @echo "ports distribution is finished." .endif touch ${.TARGET} @@ -702,10 +703,11 @@ done .endif (cd ${RD}/dists/src; \ - rm -f .CHECKSUM.MD5 CHECKSUM.SHA256; \ + rm -f CHECKSUM.MD5 CHECKSUM.SHA256; \ md5 * > .CHECKSUM.MD5; \ - sha256 * > CHECKSUM.SHA256; \ - mv .CHECKSUM.MD5 CHECKSUM.MD5) + sha256 * > .CHECKSUM.SHA256; \ + mv .CHECKSUM.MD5 CHECKSUM.MD5; \ + mv .CHECKSUM.SHA256 CHECKSUM.SHA256) @echo "src distribution is finished." .endif touch ${.TARGET} @@ -1212,11 +1214,11 @@ ) .endif @( cd ${RD}/dists/${TD}; \ - rm -f .CHECKSUM.MD5 CHECKSUM.SHA256; \ + rm -f CHECKSUM.MD5 CHECKSUM.SHA256; \ md5 * > .CHECKSUM.MD5; \ - sha256 * > CHECKSUM.SHA256; \ - mv .CHECKSUM.MD5 CHECKSUM.MD5 \ - ) + sha256 * > .CHECKSUM.SHA256; \ + mv .CHECKSUM.MD5 CHECKSUM.MD5; \ + mv .CHECKSUM.SHA256 CHECKSUM.SHA256) doRELEASE: release.1 release.2 ${DOCREL} release.3 release.4 \ release.5 release.6 release.7 release.8 release.9 ${EXTRAS} ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#2 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml,v 1.31 2003/05/27 16:11:09 alex Exp $ + $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml,v 1.32 2006/02/26 04:57:16 hrs Exp $ 2000 @@ -123,13 +123,13 @@ Änderungen in &os; seit &release.prev;. Dazu gehören sowohl die Änderungen, die nur &release.prev; betreffen, als auch Änderungen in den anderen Entwicklungszweigen - seit &os; &release.prev.historic;. Letztere sind als &merged; + seit &os; &release.prev;. Letztere sind als &merged; gekennzeichnet. ]]> Die Einträge umfassen alle Sicherheitshinweise, die nach - dem Erscheinen von &release.prev.historic; herausgegeben wurden, + dem Erscheinen von &release.prev; herausgegeben wurden, neue Treiber bzw. Unterstützung für neue Hardware, neue Befehle oder Optionen, die Behebung wichtiger Fehler, und Aktualisierungen von zusätzlicher Software. Sie können ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.295 2006/02/07 03:32:22 marcel Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.296 2006/02/20 21:46:54 brueffer Exp $ Supported Devices @@ -246,6 +246,8 @@ &hwlist.my; + &hwlist.myri10ge; + &hwlist.nge; &hwlist.nve; ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.898 2006/02/05 20:54:53 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.903 2006/02/26 21:48:50 bmah Exp $ 2000 @@ -102,7 +102,7 @@ Typical release note items document recent security advisories issued after - &release.prev.historic;, + &release.prev;, new drivers or hardware support, new commands or options, major bug fixes, or contributed software upgrades. They may also list changes to major ports/packages or release engineering @@ -118,38 +118,38 @@ could allow a local attacker to overwrite files in the context of a user running the &man.texindex.1; utility, has been fixed. For more details see security advisory FreeBSD-SA-06:01.texindex. &merged + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:01.texindex.asc">FreeBSD-SA-06:01.texindex. &merged; A temporary file vulnerability in the &man.ee.1; text editor, which could allow a local attacker to overwrite files in the context of a user running &man.ee.1;, has been fixed. For more details see security advisory FreeBSD-SA-06:02.ee. &merged + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:02.ee.asc">FreeBSD-SA-06:02.ee. &merged; Several vulnerabilities in the &man.cpio.1; utility have been corrected. For more details see security advisory FreeBSD-SA-06:03.cpio. &merged + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:03.cpio.asc">FreeBSD-SA-06:03.cpio. &merged; An error in &man.ipfw.4; IP fragment handling, which could cause a crash, has been fixed. For more details see security advisory FreeBSD-SA-06:04.ipfw. &merged + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:04.ipfw.asc">FreeBSD-SA-06:04.ipfw. &merged; A potential buffer overflow in the IEEE 802.11 scanning code has been corrected. For more details see security advisory FreeBSD-SA-06:05.80211. &merged + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:05.80211.asc">FreeBSD-SA-06:05.80211. &merged; Two instances in which portions of kernel memory could be disclosed to users have been fixed. For more details see security advisory FreeBSD-SA-06:06.kmem. &merged + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:06.kmem.asc">FreeBSD-SA-06:06.kmem. &merged; A logic bug in the IP fragment handling in &man.pf.4;, which could cause a crash under certain circumstances, has been fixed. For more details see security advisory FreeBSD-SA-06:07.pf. &merged + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:07.pf.asc">FreeBSD-SA-06:07.pf. &merged; @@ -525,17 +525,16 @@ Contributed Software - libpcap has been updated - to v0.9.1 (release). + BIND has been updated from 9.3.1 + to 9.3.2. &merged; - OpenSSH has been updated from - version 4.0p1 to version 4.2p1. + IPFilter has been updated from + 4.1.8 to 4.1.10. - sendmail has been updated from - version 8.13.3 to version 8.13.4. + The timezone database has been updated from the + tzdata2005l release to the + tzdata2005r release. &merged; - tcpdump has been updated - to v3.9.1 (release). @@ -618,6 +617,26 @@ changed. + + The supported version of + the GNOME desktop environment + (x11/gnome2) has been + updated from 2.10.2 to 2.12.3. &merged; + + The supported version of + the KDE desktop environment + (x11/kde2) has been + updated from 3.4.2 to 3.5.1. &merged; + + The supported version of + the Perl interpreter + (lang/perl5.8) has been updated + from 5.8.7 to 5.8.8. &merged; + + The supported version of + the &xorg; windowing system + (x11/xorg) has been updated + from 6.8.2 to 6.9.0. &merged; ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@ FreeBSD ¥×¥í¥¸¥§¥¯¥È - $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.97 2004/01/12 15:39:46 hrs Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.98 2006/02/26 04:57:17 hrs Exp $ 2000 @@ -107,14 +107,14 @@ ¥ê¥ê¡¼¥¹¥Î¡¼¥È¤Ë¤Ï¡¢ - &release.prev.historic; °Ê¹ß¤Ë½Ð¤µ¤ì¤¿¥»¥­¥å¥ê¥Æ¥£´«¹ð¡¢ + &release.prev; °Ê¹ß¤Ë½Ð¤µ¤ì¤¿¥»¥­¥å¥ê¥Æ¥£´«¹ð¡¢ ¿·¤·¤¤¥É¥é¥¤¥Ð¤ä¥Ï¡¼¥É¥¦¥§¥¢Âбþ¡¢ ¿·¤·¤¤¥³¥Þ¥ó¥É¤ä¥ª¥×¥·¥ç¥ó¡¢½ÅÍפʥХ°¥Õ¥£¥Ã¥¯¥¹¤ä´ó£¥½¥Õ¥È¥¦¥§¥¢ ¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢ ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#3 (text+ko) ==== @@ -11,7 +11,7 @@ ðÒÏÅËÔ &os; - $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.21 2005/07/08 14:34:10 den Exp $ + $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.22 2006/02/26 04:57:17 hrs Exp $ 2000 @@ -109,7 +109,7 @@ ïÂÙÞÎÏ × ÉÎÆÏÒÍÁÃÉÉ Ï ÒÅÌÉÚÅ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏ ×ËÌÀÞÅÎÙ ÐÏÓÌÅÄÎÉÅ ÓÏÏÂÝÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ, ×ÙÐÕÝÅÎÎÙÅ ÐÏÓÌÅ - &release.prev.historic;, ÉÎÆÏÒÍÁÃÉÑ Ï ÐÏÄÄÅÒÖËÅ ÎÏ×ÙÈ ÄÒÁÊ×ÅÒÏ× ÉÌÉ + &release.prev;, ÉÎÆÏÒÍÁÃÉÑ Ï ÐÏÄÄÅÒÖËÅ ÎÏ×ÙÈ ÄÒÁÊ×ÅÒÏ× ÉÌÉ ÏÂÏÒÕÄÏ×ÁÎÉÑ, ÎÏ×ÙÈ ËÏÍÁÎÄ ÉÌÉ ÐÁÒÁÍÅÔÒÏ×, ÉÎÆÏÒÍÁÃÉÑ Ï ÏÓÎÏ×ÎÙÈ ÉÓÐÒÁ×ÌÅÎÉÑÈ ÏÛÉÂÏË, ÉÌÉ ÏÂÎÏ×ÌÅÎÉÑÈ ÓÔÏÒÏÎÎÅÇÏ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ. ÷ ÎÅÍ ÍÏÇÕÔ ÔÁËÖÅ ÐÅÒÅÞÉÓÌÑÔØÓÑ ÉÚÍÅÎÅÎÉÑ ×ÁÖÎÅÊÛÉÈ ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#9 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.77 2006/02/07 03:25:18 marcel Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.78 2006/02/20 21:46:54 brueffer Exp $ # # @@ -84,6 +84,7 @@ mlx i386,alpha,ia64,amd64 mly i386,ia64,amd64 my i386,pc98 +myri10ge i386,amd64 ncr i386,pc98,alpha,sparc64,amd64 ncv i386,pc98 ng_bt3c i386,pc98,amd64 ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/sgml/release.ent#3 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -11,16 +11,12 @@ - + - - - - + @@ -40,9 +36,9 @@ - - - + + + ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.343 2006/02/02 11:14:35 rwatson Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.346 2006/02/27 16:17:25 harti Exp $ # XXX MISSING: mkproto SUBDIR= ac \ @@ -12,9 +12,9 @@ ${_apmd} \ ${_arlcontrol} \ arp \ - audit \ - auditd \ - auditreduce \ + ${_audit} \ + ${_auditd} \ + ${_auditreduce} \ ${_asf} \ ${_atm} \ ${_authpf} \ @@ -124,7 +124,7 @@ pppd \ pppstats \ ${_praliases} \ - praudit \ + ${_praudit} \ procctl \ pstat \ pw \ @@ -200,6 +200,13 @@ _atm= atm .endif +.if !defined(NO_AUDIT) +_audit= audit +_auditd= auditd +_auditreduce= auditreduce +_praudit= praudit +.endif + .if !defined(NO_BIND) .if !defined(NO_BIND_DNSSEC) && !defined(NO_CRYPT) _dnssec-keygen= dnssec-keygen From owner-p4-projects@FreeBSD.ORG Wed Mar 1 07:36: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 2F67316A424; Wed, 1 Mar 2006 07:36: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 C2BCE16A420 for ; Wed, 1 Mar 2006 07:36: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 81B9143D49 for ; Wed, 1 Mar 2006 07:36: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 k217afmj006923 for ; Wed, 1 Mar 2006 07:36:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k217afkB006920 for perforce@freebsd.org; Wed, 1 Mar 2006 07:36:41 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 07:36:41 GMT Message-Id: <200603010736.k217afkB006920@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 92572 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 Mar 2006 07:36:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=92572 Change 92572 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 07:36:23 add directives to make assembler from solaris mostly just work Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/include/asm.h#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/include/asm.h#4 (text+ko) ==== @@ -95,6 +95,12 @@ #define ENTRY(x) _ENTRY(x) #define END(x) .size x, . - x +#define STACK_ALIGN 16 +#define SET_SIZE(x) END(x) +#define SA(X) (((X)+(STACK_ALIGN-1)) & ~(STACK_ALIGN-1)) +#define WINDOWSIZE64 (16*8) +#define MINFRAME64 (WINDOWSIZE64 + 48) +#define MINFRAME MINFRAME64 /* * Kernel RCS ID tag and copyright macros */ From owner-p4-projects@FreeBSD.ORG Wed Mar 1 07:38: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 F292116A425; Wed, 1 Mar 2006 07:38:46 +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 C584D16A422 for ; Wed, 1 Mar 2006 07:38:46 +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 9379843D4C for ; Wed, 1 Mar 2006 07:38:44 +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 k217ci38007005 for ; Wed, 1 Mar 2006 07:38:44 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k217ciXS007002 for perforce@freebsd.org; Wed, 1 Mar 2006 07:38:44 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 07:38:44 GMT Message-Id: <200603010738.k217ciXS007002@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 92573 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 Mar 2006 07:38:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92573 Change 92573 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 07:38:13 disable symbols not found under sun4v Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#5 (text+ko) ==== @@ -99,7 +99,6 @@ ASSYM(TLB_DEMAP_PRIMARY, TLB_DEMAP_PRIMARY); ASSYM(TLB_DEMAP_CONTEXT, TLB_DEMAP_CONTEXT); ASSYM(TLB_DEMAP_PAGE, TLB_DEMAP_PAGE); -ASSYM(TLB_DIRECT_TO_TTE_MASK, TLB_DIRECT_TO_TTE_MASK); ASSYM(TSB_BUCKET_MASK, TSB_BUCKET_MASK); ASSYM(TSB_BUCKET_SHIFT, TSB_BUCKET_SHIFT); @@ -120,8 +119,9 @@ ASSYM(CSA_STATE, offsetof(struct cpu_start_args, csa_state)); ASSYM(CSA_TICK, offsetof(struct cpu_start_args, csa_tick)); ASSYM(CSA_VER, offsetof(struct cpu_start_args, csa_ver)); +#ifndef SUN4V ASSYM(CSA_TTES, offsetof(struct cpu_start_args, csa_ttes)); - +#endif ASSYM(DC_TAG_SHIFT, DC_TAG_SHIFT); ASSYM(DC_TAG_MASK, DC_TAG_MASK); ASSYM(DC_VALID_SHIFT, DC_VALID_SHIFT); @@ -151,9 +151,10 @@ ASSYM(KTR_PARM5, offsetof(struct ktr_entry, ktr_parms[4])); ASSYM(KTR_PARM6, offsetof(struct ktr_entry, ktr_parms[5])); +ASSYM(TTE_SHIFT, TTE_SHIFT); +#ifndef SUN4V ASSYM(TTE_VPN, offsetof(struct tte, tte_vpn)); ASSYM(TTE_DATA, offsetof(struct tte, tte_data)); -ASSYM(TTE_SHIFT, TTE_SHIFT); ASSYM(TD_EXEC, TD_EXEC); ASSYM(TD_REF, TD_REF); @@ -167,8 +168,9 @@ ASSYM(TS_MIN, TS_MIN); ASSYM(TS_MAX, TS_MAX); - +ASSYM(TLB_DIRECT_TO_TTE_MASK, TLB_DIRECT_TO_TTE_MASK); ASSYM(TV_SIZE_BITS, TV_SIZE_BITS); +#endif ASSYM(V_INTR, offsetof(struct vmmeter, v_intr)); @@ -183,10 +185,26 @@ ASSYM(PC_TLB_CTX, offsetof(struct pcpu, pc_tlb_ctx)); ASSYM(PC_TLB_CTX_MAX, offsetof(struct pcpu, pc_tlb_ctx_max)); ASSYM(PC_TLB_CTX_MIN, offsetof(struct pcpu, pc_tlb_ctx_min)); -ASSYM(PC_PMAP, offsetof(struct pcpu, pc_pmap)); ASSYM(PC_CNT, offsetof(struct pcpu, pc_cnt)); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); +#ifdef SUN4V +ASSYM(PC_CPU_Q_BASE, offsetof(struct pcpu, pc_cpu_q_ra)); +ASSYM(PC_CPU_Q_SIZE, offsetof(struct pcpu, pc_cpu_q_size)); +ASSYM(PC_DEV_Q_BASE, offsetof(struct pcpu, pc_dev_q_ra)); +ASSYM(PC_DEV_Q_SIZE, offsetof(struct pcpu, pc_dev_q_size)); + +ASSYM(PC_RQ_BASE, offsetof(struct pcpu, pc_rq_ra)); +ASSYM(PC_RQ_SIZE, offsetof(struct pcpu, pc_rq_size)); +ASSYM(PC_NRQ_BASE, offsetof(struct pcpu, pc_nrq_ra)); +ASSYM(PC_NRQ_SIZE, offsetof(struct pcpu, pc_nrq_size)); +#else +ASSYM(PC_PMAP, offsetof(struct pcpu, pc_pmap)); +ASSYM(PM_TSB, offsetof(struct pmap, pm_tsb)); +#endif + + + ASSYM(IH_SHIFT, IH_SHIFT); ASSYM(IRSR_BUSY, IRSR_BUSY); @@ -247,7 +265,7 @@ ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap)); ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active)); ASSYM(PM_CONTEXT, offsetof(struct pmap, pm_context)); -ASSYM(PM_TSB, offsetof(struct pmap, pm_tsb)); + ASSYM(SF_UC, offsetof(struct sigframe, sf_uc)); From owner-p4-projects@FreeBSD.ORG Wed Mar 1 07:40: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 0A41216A423; Wed, 1 Mar 2006 07:40: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 C04B816A455 for ; Wed, 1 Mar 2006 07:40: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 8C0B043D48 for ; Wed, 1 Mar 2006 07:40:47 +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 k217elY6007144 for ; Wed, 1 Mar 2006 07:40:47 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k217elqI007141 for perforce@freebsd.org; Wed, 1 Mar 2006 07:40:47 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 07:40:47 GMT Message-Id: <200603010740.k217elqI007141@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 92574 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 Mar 2006 07:40:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=92574 Change 92574 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 07:39:50 ata not needed - null devclass causes null ptr deref - disable for now Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#3 (text+ko) ==== @@ -75,9 +75,9 @@ #device fdc # ATA and ATAPI devices -device ata -device atadisk # ATA disk drives -device atapicd # ATAPI CDROM drives +#device ata +#device atadisk # ATA disk drives +#device atapicd # ATAPI CDROM drives #device atapifd # ATAPI floppy drives #device atapist # ATAPI tape drives # Do NOT enable ATA_STATIC_ID -- cmd646 controller will be !ata2!, From owner-p4-projects@FreeBSD.ORG Wed Mar 1 07:42: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 0AB2716A423; Wed, 1 Mar 2006 07:42: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 D25DB16A420 for ; Wed, 1 Mar 2006 07:42:50 +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 9F0C643D48 for ; Wed, 1 Mar 2006 07:42:50 +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 k217go63007243 for ; Wed, 1 Mar 2006 07:42:50 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k217gooT007240 for perforce@freebsd.org; Wed, 1 Mar 2006 07:42:50 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 07:42:50 GMT Message-Id: <200603010742.k217gooT007240@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 92575 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 Mar 2006 07:42:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92575 Change 92575 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 07:42:21 it suffices to set the trap through OF Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/trap.c#6 (text+ko) ==== @@ -233,17 +233,15 @@ &debugger_on_signal, 0, ""); #endif - void trap_init(void) { vm_paddr_t mmfsa; - mmfsa = mmu_fault_status_area + (MMFSA_SIZE*PCPU_GET(cpuid)); set_wstate(WSTATE_KERN); set_mmfsa_scratchpad(mmfsa); - OF_set_mmfsa_traptable(tl0_base, mmfsa); - set_tba(tl0_base); + + OF_set_mmfsa_traptable(&tl0_base, mmfsa); pmap_set_tsbs(); } From owner-p4-projects@FreeBSD.ORG Wed Mar 1 07:43: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 DAAFA16A424; Wed, 1 Mar 2006 07:43: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 B2FA316A422 for ; Wed, 1 Mar 2006 07:43: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 65BDA43D49 for ; Wed, 1 Mar 2006 07:43: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 k217hqqc007302 for ; Wed, 1 Mar 2006 07:43:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k217hqAQ007295 for perforce@freebsd.org; Wed, 1 Mar 2006 07:43:52 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 07:43:52 GMT Message-Id: <200603010743.k217hqAQ007295@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 92576 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 Mar 2006 07:43:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92576 Change 92576 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 07:43:21 remove duplicated malloc arena declaration Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/dev/ofw/openfirm.h#5 (text+ko) ==== @@ -74,8 +74,6 @@ #include #include -MALLOC_DECLARE(M_OFWPROP); - #define p1275_ptr2cell(p) ((cell_t)((uintptr_t)((void *)(p)))) #define p1275_int2cell(i) ((cell_t)((int)(i))) #define p1275_uint2cell(u) ((cell_t)((unsigned int)(u))) From owner-p4-projects@FreeBSD.ORG Wed Mar 1 07:44: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 89A3216A423; Wed, 1 Mar 2006 07:44: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 62E0116A420 for ; Wed, 1 Mar 2006 07:44: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 22B7D43D49 for ; Wed, 1 Mar 2006 07:44: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 k217is2d007368 for ; Wed, 1 Mar 2006 07:44:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k217irNY007365 for perforce@freebsd.org; Wed, 1 Mar 2006 07:44:53 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 07:44:53 GMT Message-Id: <200603010744.k217irNY007365@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 92577 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 Mar 2006 07:44:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=92577 Change 92577 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 07:44:16 add magic trap on / off functions Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hcall.S#4 (text+ko) ==== @@ -1383,7 +1383,21 @@ or %o0, %lo(bad_hcall_error), %o0 mov %o7, %o3 call panic - mov %o3, %o7 + mov %o3, %o7 SET_SIZE(panic_bad_hcall) + + ENTRY(hv_magic_trap_on) + ta 0x77 + retl + nop + END(hv_magic_trap_on) + + ENTRY(hv_magic_trap_off) + ta 0x78 + retl + nop + END(hv_magic_trap_off) + + #endif /* lint || __lint */ From owner-p4-projects@FreeBSD.ORG Wed Mar 1 07:48: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 01C0316A423; Wed, 1 Mar 2006 07:48: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 BFBFC16A420 for ; Wed, 1 Mar 2006 07:47:59 +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 8BC8E43D46 for ; Wed, 1 Mar 2006 07:47:59 +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 k217lx3h007488 for ; Wed, 1 Mar 2006 07:47:59 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k217lxvJ007484 for perforce@freebsd.org; Wed, 1 Mar 2006 07:47:59 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 07:47:59 GMT Message-Id: <200603010747.k217lxvJ007484@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 92578 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 Mar 2006 07:48:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=92578 Change 92578 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 07:47:54 add temporary workaround for clock being set too slow Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tick.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tick.c#4 (text+ko) ==== @@ -150,8 +150,14 @@ * Avoid stopping of hardclock in terms of a lost tick interrupt * by ensuring that the tick period is at least TICK_GRACE ticks. */ + printf("tick_freq=%ld hz=%d tick_increment=%ld\n", + tick_freq, hz, tick_increment); +#ifndef notyet + /* XXX SUN4V_FIXME the simulator sets the clock to 5Mhz */ + tick_increment = TICK_GRACE; +#endif if (tick_increment < TICK_GRACE) - panic("%s: HZ to high, decrease to at least %ld", __func__, + panic("%s: HZ too high, decrease to at least %ld", __func__, clock / TICK_GRACE); /* @@ -163,7 +169,6 @@ * handled. */ tick_stop(); - set_cputicker(tick_cputicks, tick_freq, 0); } From owner-p4-projects@FreeBSD.ORG Wed Mar 1 07: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 9D25C16A423; Wed, 1 Mar 2006 07:54:46 +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 5CA6816A420 for ; Wed, 1 Mar 2006 07:54:46 +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 1CD1743D53 for ; Wed, 1 Mar 2006 07:54:44 +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 k217sh4b007805 for ; Wed, 1 Mar 2006 07:54:43 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k217shN1007802 for perforce@freebsd.org; Wed, 1 Mar 2006 07:54:43 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 07:54:43 GMT Message-Id: <200603010754.k217shN1007802@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 92581 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 Mar 2006 07:54:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=92581 Change 92581 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 07:53:42 disable UMA_SMALL_ALLOC for now as it makes assumptions I don't want to adhere to Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/vmparam.h#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/vmparam.h#2 (text+ko) ==== @@ -176,9 +176,10 @@ #ifndef VM_INITIAL_PAGEIN #define VM_INITIAL_PAGEIN 16 #endif - +#if 0 +/* does silly things */ #define UMA_MD_SMALL_ALLOC - +#endif extern vm_offset_t vm_max_kernel_address; #endif /* !_MACHINE_VMPARAM_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Mar 1 07:58: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 8259C16A424; Wed, 1 Mar 2006 07:58: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 570B516A420 for ; Wed, 1 Mar 2006 07:58:50 +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 E815D43D46 for ; Wed, 1 Mar 2006 07:58:49 +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 k217wnJt008062 for ; Wed, 1 Mar 2006 07:58:49 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k217wnnq008059 for perforce@freebsd.org; Wed, 1 Mar 2006 07:58:49 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 07:58:49 GMT Message-Id: <200603010758.k217wnnq008059@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 92583 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 Mar 2006 07:58:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=92583 Change 92583 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 07:58:29 fix TTE index calculation add function to check that entries are not already set add generalized lookup function for TSBs Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#5 (text+ko) ==== @@ -52,20 +52,40 @@ #include CTASSERT(sizeof(tte_t) == sizeof(uint64_t)); -#define TSB_MASK(tsb) (((tsb->hvtsb_ntte) << (PAGE_SHIFT - TTE_SHIFT)) - 1) +#define TSB_MASK(tsb) ((tsb->hvtsb_ntte) - 1) + #ifdef DEBUG_TSB #define DPRINTF printf #else #define DPRINTF(...) #endif +void +tsb_assert_invalid(hv_tsb_info_t *tsb, vm_offset_t va) +{ + vm_paddr_t tsb_load_pa; + uint64_t tsb_index, tsb_shift, tte_tag, tte_data; + tsb_shift = TTE_PAGE_SHIFT(tsb->hvtsb_idxpgsz); + tsb_index = (va >> tsb_shift) & TSB_MASK(tsb); + tsb_load_pa = tsb->hvtsb_pa + 2*tsb_index*sizeof(uint64_t); + load_real_dw(tsb_load_pa, &tte_tag, &tte_data); + if (tte_tag == 0 && tte_data == 0) + return; + printf("tsb_shift=0x%lx tsb_index=0x%lx\n", tsb_shift, tsb_index); + printf("tte_tag=0x%lx tte_data=0x%lx TSB_MASK=%lx\n", tte_tag, tte_data, (uint64_t)TSB_MASK(tsb)); + panic("non-zero entry found where not expected"); + +} + void tsb_set_tte(hv_tsb_info_t *tsb, vm_offset_t va, vm_paddr_t pa, uint64_t flags, uint64_t ctx) { vm_paddr_t tsb_store_pa; uint64_t tsb_index, tsb_shift, tte_tag, tte_data; DPRINTF("tsb_set_tte va: 0x%lx idxpgsz: %x\n", va, tsb->hvtsb_idxpgsz); - tsb_shift = TTE_GET_PAGE_SHIFT(tsb->hvtsb_idxpgsz); + + tsb_shift = TTE_PAGE_SHIFT(tsb->hvtsb_idxpgsz); + DPRINTF("tsb_shift: 0x%lx\n", tsb_shift); tsb_index = (va >> tsb_shift) & TSB_MASK(tsb); DPRINTF("tsb_index_absolute: 0x%lx tsb_index: 0x%lx\n", (va >> tsb_shift), tsb_index); @@ -85,7 +105,12 @@ store_real_sync(tsb_store_pa + sizeof(uint64_t), tte_data); } -uint64_t + + + + + +tte_t tsb_get_tte(hv_tsb_info_t *tsb, vm_offset_t va, uint64_t ctx) { vm_paddr_t tsb_load_pa; @@ -97,7 +122,6 @@ tsb_index = (va >> tsb_shift) & TSB_MASK(tsb); DPRINTF("tsb_index_absolute: %lx tsb_index: %lx\n", (va >> tsb_shift), tsb_index); tsb_load_pa = tsb->hvtsb_pa + 2*tsb_index*sizeof(uint64_t); - DPRINTF("load_real_dw - ra: %lx &tte_tag: %p &tte_data: %p \n", tsb_load_pa, &tte_tag, &tte_data); load_real_dw(tsb_load_pa, &tte_tag, &tte_data); DPRINTF("tte_data: %lx ctx: %lx va: %lx\n", tte_data, tte_tag >> TTARGET_CTX_SHIFT, @@ -107,3 +131,23 @@ return (0UL); } + +tte_t +tsb_lookup_tte(vm_offset_t va, uint64_t ctx) +{ + tte_t tte_data; + + tte_data = 0; + if (ctx == 0) { + if ((tte_data = tsb_get_tte(&kernel_td[TSB4M_INDEX], va, 0)) != 0) + goto done; + if ((tte_data = tsb_get_tte(&kernel_td[TSB8K_INDEX], va, 0)) != 0) + goto done; + } + /* + * handle user data + */ +done: + return tte_data; +} + From owner-p4-projects@FreeBSD.ORG Wed Mar 1 08:00: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 A898F16A423; Wed, 1 Mar 2006 08:00: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 7581016A420 for ; Wed, 1 Mar 2006 08:00:53 +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 2C56043D45 for ; Wed, 1 Mar 2006 08:00:53 +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 k2180rOM008253 for ; Wed, 1 Mar 2006 08:00:53 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2180qhQ008250 for perforce@freebsd.org; Wed, 1 Mar 2006 08:00:52 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 08:00:52 GMT Message-Id: <200603010800.k2180qhQ008250@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 92584 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 Mar 2006 08:00:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=92584 Change 92584 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 07:59:57 only use retl in leaf functions Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#6 (text+ko) ==== @@ -769,7 +769,7 @@ brnz,pt %i1, 1b add %i0, 64, %i0 membar #Sync - retl + ret restore END(bzerophyspage) From owner-p4-projects@FreeBSD.ORG Wed Mar 1 08:02: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 9DB7C16A46B; Wed, 1 Mar 2006 08:02: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 44F7916A469 for ; Wed, 1 Mar 2006 08:02:57 +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 C3A0643D49 for ; Wed, 1 Mar 2006 08:02:56 +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 k2182ugA008357 for ; Wed, 1 Mar 2006 08:02:56 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2182uVL008354 for perforce@freebsd.org; Wed, 1 Mar 2006 08:02:56 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 08:02:56 GMT Message-Id: <200603010802.k2182uVL008354@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 92585 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 Mar 2006 08:02:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=92585 Change 92585 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 08:02:53 fix spill / fill handlers fix trap table so that handlers are all at the right offsets add magic trap on to all unimplement trap handlers add magic trap on at beginning of spill /fill - off at the end Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#11 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#11 (text+ko) ==== @@ -69,7 +69,15 @@ #include "assym.s" - +#if 1 +#define MAGIC_TRAP_ON ta 0x77 +#define MAGIC_TRAP_OFF ta 0x78 +/*#define MAGIC_TRAP_OFF nop */ +#else +#define MAGIC_TRAP_ON nop +#define MAGIC_TRAP_OFF nop +#endif + #define TSB_KERNEL_MASK 0x0 #define TSB_KERNEL 0x0 @@ -112,6 +120,7 @@ */ #define SPILL(storer, bias, size, asi) \ + MAGIC_TRAP_ON ;\ mov 0 + bias, %g1 ;\ storer %l0, [%sp + %g1]asi ;\ mov size + bias, %g2 ;\ @@ -125,18 +134,19 @@ storer %l5, [%g5 + %g2]asi ;\ storer %l6, [%g5 + %g3]asi ;\ storer %l7, [%g5 + %g4]asi ;\ - add %sp, (4 * size), %g5 ;\ + add %g5, (4 * size), %g5 ;\ storer %i0, [%g5 + %g1]asi ;\ storer %i1, [%g5 + %g2]asi ;\ storer %i2, [%g5 + %g3]asi ;\ storer %i3, [%g5 + %g4]asi ;\ - add %sp, (4 * size), %g5 ;\ + add %g5, (4 * size), %g5 ;\ storer %i4, [%g5 + %g1]asi ;\ storer %i5, [%g5 + %g2]asi ;\ storer %i6, [%g5 + %g3]asi ;\ storer %i7, [%g5 + %g4]asi #define FILL(loader, bias, size, asi) \ + MAGIC_TRAP_ON ;\ mov 0 + bias, %g1 ;\ loader [%sp + %g1]asi, %l0 ;\ mov size + bias, %g2 ;\ @@ -150,12 +160,12 @@ loader [%g5 + %g2]asi, %l5 ;\ loader [%g5 + %g3]asi, %l6 ;\ loader [%g5 + %g4]asi, %l7 ;\ - add %sp, (4 * size), %g5 ;\ + add %g5, (4 * size), %g5 ;\ loader [%g5 + %g1]asi, %i0 ;\ loader [%g5 + %g2]asi, %i1 ;\ loader [%g5 + %g3]asi, %i2 ;\ loader [%g5 + %g4]asi, %i3 ;\ - add %sp, (4 * size), %g5 ;\ + add %g5, (4 * size), %g5 ;\ loader [%g5 + %g1]asi, %i4 ;\ loader [%g5 + %g2]asi, %i5 ;\ loader [%g5 + %g3]asi, %i6 ;\ @@ -169,10 +179,10 @@ add %sp, 32, %g3 ;\ ldda [%g3 + %g1]asi, %l4 ;\ ldda [%g3 + %g2]asi, %l6 ;\ - add %sp, 32, %g3 ;\ + add %g3, 32, %g3 ;\ ldda [%g3 + %g1]asi, %i0 ;\ ldda [%g3 + %g2]asi, %i2 ;\ - add %sp, 32, %g3 ;\ + add %g3, 32, %g3 ;\ ldda [%g3 + %g1]asi, %i4 ;\ ldda [%g3 + %g2]asi, %i6 @@ -446,6 +456,7 @@ * Generic trap type. Call trap() with the specified type. */ .macro tl0_gen type + MAGIC_TRAP_ON tl0_setup \type .align 32 .endm @@ -454,12 +465,14 @@ * This is used to suck up the massive swaths of reserved trap types. * Generates count "reserved" trap vectors. */ + .macro tl0_reserved count .rept \count tl0_gen T_RESERVED .endr .endm + .macro tl1_split #if 0 rdpr %wstate, %g1 @@ -489,62 +502,56 @@ .endm .macro insn_excptn - nop + MAGIC_TRAP_ON .align 32 .endm .macro insn_miss - nop - mov %o0, %g6 - mov 0x23, %o0 - call hv_cnputchar - mov 0x24, %o0 - call hv_cnputchar + MAGIC_TRAP_ON .align 32 .endm .macro data_excptn - nop + MAGIC_TRAP_ON .align 32 .endm .macro data_miss - nop - mov %o0, %g6 - mov 0x23, %o0 - call hv_cnputchar - mov 0x24, %o0 - call hv_cnputchar + MAGIC_TRAP_ON + MAGIC_TRAP_ON + MAGIC_TRAP_ON + MAGIC_TRAP_ON + MAGIC_TRAP_ON .align 32 .endm .macro data_prot - nop + MAGIC_TRAP_ON .align 32 .endm .macro tl0_align - nop + MAGIC_TRAP_ON .align 32 .endm .macro cpu_mondo - nop + MAGIC_TRAP_ON .align 32 .endm .macro dev_mondo - nop + MAGIC_TRAP_ON .align 32 .endm .macro resumable_error - nop + MAGIC_TRAP_ON .align 32 .endm .macro nonresumable_error - nop + MAGIC_TRAP_ON .align 32 .endm @@ -555,16 +562,18 @@ srl %sp, 0, %sp ; \ SPILL(sta, 0, 4, asi) ; \ saved ; \ + MAGIC_TRAP_OFF ; \ retry ; \ - .skip (31-26)*4 ; \ + .skip (31-28)*4 ; \ ba,a,pt %xcc, fault_32bit_##target ; \ ALIGN_128 #define spill_64bit_asi(asi, target) \ SPILL(stxa, SPOFF, 8, asi) ; \ saved ; \ + MAGIC_TRAP_OFF ; \ retry ; \ - .skip (31-25)*4 ; \ + .skip (31-27)*4 ; \ ba,a,pt %xcc, fault_64bit_##target ; \ ALIGN_128 @@ -573,7 +582,7 @@ SPILL(sta, 0, 4, asi) ; \ b spill_clean ; \ mov WSTATE_USER32, %g7 ; \ - .skip (31-26)*4 ; \ + .skip (31-27)*4 ; \ ba,a,pt %xcc, fault_32bit_##target ; \ ALIGN_128 @@ -581,24 +590,25 @@ SPILL(stxa, SPOFF, 8, asi) ; \ b spill_clean ; \ mov WSTATE_USER64, %g7 ; \ - .skip (31-25)*4 ; \ + .skip (31-26)*4 ; \ ba,a,pt %xcc, fault_64bit_##target ; \ ALIGN_128 #define fill_32bit_asi(asi, target) \ srl %sp, 0, %sp ; \ FILL(lda, 0, 4, asi) ; \ - saved ; \ + restored ; \ retry ; \ - .skip (31-26)*4 ; \ + .skip (31-27)*4 ; \ ba,a,pt %xcc, fault_32bit_##target ; \ ALIGN_128 #define fill_64bit_asi(asi, target) \ - FILL(ldxa, SPOFF, 8, asi) ; \ - saved ; \ + FILL(ldxa, SPOFF, 8, asi) ; \ + restored ; \ + MAGIC_TRAP_OFF ; \ retry ; \ - .skip (31-25)*4 ; \ + .skip (31-27)*4 ; \ ba,a,pt %xcc, fault_64bit_##target ; \ .align 128 @@ -623,11 +633,6 @@ .endm .macro spill_64bit_nucleus_not - mov %o0, %g6 - mov 0x23, %o0 - call hv_cnputchar - mov 0x24, %o0 - call hv_cnputchar spill_64bit_asi(ASI_N,not) .endm @@ -652,11 +657,6 @@ .endm .macro fill_64bit_nucleus_not - mov %o0, %g6 - mov 0x23, %o0 - call hv_cnputchar - mov 0x24, %o0 - call hv_cnputchar fill_64bit_asi(ASI_N, not) .endm @@ -694,6 +694,7 @@ .endm .macro spill_64bit_tt1_secondary_so1 + MAGIC_TRAP_ON ba,a,pt %xcc, fault_64bit_so1 nop .align 128 @@ -701,16 +702,17 @@ .endm .macro spill_mixed - nop + MAGIC_TRAP_ON .align 128 .endm .macro fill_mixed - nop + MAGIC_TRAP_ON .align 128 .endm .macro tl1_align + MAGIC_TRAP_ON .align 32 .endm @@ -1701,7 +1703,7 @@ .sect .trap .align 0x8000 - .globl tl0_base,tl0_insn_miss, tl0_insn_excptn, tl0_spill_n_normal + .globl tl0_base tl0_base: tl0_reserved 8 ! 0x0-0x7 tl0_insn_excptn: @@ -1741,44 +1743,52 @@ tl0_priv_action: tl0_gen T_PRIVILEGED_ACTION ! 0x37 tl0_reserved 9 ! 0x38-0x40 -tl0_intr_level: +tl0_intr_level_41: tl0_intr_level ! 0x41-0x4f tl0_reserved 18 ! 0x50-0x61 -tl0_watch_virt: +tl0_watch_virt_62: tl0_gen T_VA_WATCHPOINT ! 0x62 tl0_reserved 10 ! 0x63-0x6c -tl0_data_prot: +tl0_data_prot_6c: data_prot ! 0x6c tl0_reserved 8 ! 0x6d-0x75 -tl0_breakpoint: +tl0_breakpoint_76: tl0_gen T_BREAKPOINT ! 0x76 tl0_reserved 5 ! 0x77-0x7b -tl0_cpu_mondo: +tl0_cpu_mondo_7c: cpu_mondo ! 0x7c -tl0_dev_mondo: +tl0_dev_mondo_7d: dev_mondo ! 0x7d -tl0_resumable_error: +tl0_resumable_error_7e: resumable_error ! 0x7e -tl0_nonresumable_error: +tl0_nonresumable_error_7f: nonresumable_error ! 0x7f -tl0_spill_n_normal: +tl0_spill_n_normal_80: +tl0_spill_0_normal: tl0_reserved 4 ! 0x80 +tl0_spill_1_normal: spill_32bit_primary_sn0 ! 0x84 +tl0_spill_2_normal: spill_64bit_primary_sn0 ! 0x88 +tl0_spill_3_normal: spill_32clean_primary_sn0 ! 0x8c +tl0_spill_4_normal: spill_64clean_primary_sn0 ! 0x90 +tl0_spill_5_normal: spill_32bit_nucleus_not ! 0x94 +tl0_spill_6_normal: spill_64bit_nucleus_not ! 0x98 +tl0_spill_7_normal: spill_mixed ! 0x9c -tl0_spill_n_other: +tl0_spill_n_other_a0: tl0_reserved 4 ! 0xa0 spill_32bit_secondary_so0 ! 0xa4 spill_64bit_secondary_so0 ! 0xa8 spill_32bit_secondary_so0 ! 0xac spill_64bit_secondary_so0 ! 0xb0 tl0_reserved 12 ! 0xb4-0xbf -tl0_fill_n_normal: - tl0_reserved 4 ! 0xa0 +tl0_fill_n_normal_c0: + tl0_reserved 4 ! 0xc0 fill_32bit_primary_fn0 ! 0xc4 fill_64bit_primary_fn0 ! 0xc8 fill_32bit_primary_fn0 ! 0xcc @@ -1786,9 +1796,9 @@ fill_32bit_nucleus_not ! 0xd4 fill_64bit_nucleus_not ! 0xd8 fill_mixed ! 0xdc -tl0_fill_n_other: +tl0_fill_n_other_e0: tl0_reserved 32 ! 0xe0-0xff -tl0_soft: +tl0_soft_100: tl0_gen T_SYSCALL ! 0x100 tl0_gen T_BREAKPOINT ! 0x101 tl0_gen T_DIVISION_BY_ZERO ! 0x102 @@ -1823,16 +1833,16 @@ tl0_gen T_SYSCALL ! 0x142 tl0_gen T_SYSCALL ! 0x143 tl0_reserved 188 ! 0x144-0x1ff -tll_base: +tl1_base: tl1_reserved 9 ! 0x200-0x208 -tll_insn_miss: +tl1_insn_miss_209: insn_miss ! 0x209 tl1_reserved 27 ! 0x20a-0x224 -tl1_clean_window: +tl1_clean_window_224: clean_window ! 0x224 -tl1_divide: +tl1_divide_228: tl1_reserved 8 ! 0x228-0x22f -tl1_data_excptn: +tl1_data_excptn_230: data_excptn ! 0x230 data_miss ! 0x231 tl1_reserved 2 ! 0x232-0x233 @@ -1845,25 +1855,45 @@ tl1_nonresumable_error: nonresumable_error ! 0x27f tl1_spill_n_normal: +tl1_spill_0_normal: tl1_reserved 4 ! 0x280 +tl1_spill_1_normal: spill_32bit_tt1_primary_sn1 ! 0x284 +tl1_spill_2_normal: spill_64bit_tt1_primary_sn1 ! 0x288 +tl1_spill_3_normal: spill_32bit_tt1_primary_sn1 ! 0x28c +tl1_spill_4_normal: spill_64bit_tt1_primary_sn1 ! 0x290 - tl1_reserved ! 0x294 +tl1_spill_5_normal: + tl1_reserved 4 ! 0x294 +tl1_spill_6_normal: spill_64bit_ktt1_sk ! 0x298 +tl1_spill_7_normal: spill_mixed_ktt1_sk ! 0x29c tl1_spill_n_other: +tl1_spill_0_other: tl1_reserved 4 ! 0x2a0 +tl1_spill_1_other: spill_32bit_tt1_secondary_so1 ! 0x2a4 +tl1_spill_2_other: spill_64bit_tt1_secondary_so1 ! 0x2a8 +tl1_spill_3_other: spill_32bit_tt1_secondary_so1 ! 0x2ac +tl1_spill_4_other: spill_64bit_tt1_secondary_so1 ! 0x2b0 - tl1_reserved 12 ! 0x2b4-0x2bf +tl1_spill_5_other: + tl1_reserved 4 ! 0x2b4 +tl1_spill_6_other: + tl1_reserved 4 ! 0x2b8 +tl1_spill_7_other: + tl1_reserved 4 ! 0x2bc tl1_fill_n_normal: tl1_reserved 32 ! 0x2c0-0x2df tl1_fill_n_other: tl1_reserved 32 ! 0x2e0-0x2ff +tl1_soft_traps: + tl1_reserved 256 .globl tl0_end tl0_end: /* From owner-p4-projects@FreeBSD.ORG Wed Mar 1 08:06: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 0F2F316A423; Wed, 1 Mar 2006 08:06: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 A579416A420 for ; Wed, 1 Mar 2006 08:06:02 +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 7044243D48 for ; Wed, 1 Mar 2006 08:06:02 +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 k21862Mg008501 for ; Wed, 1 Mar 2006 08:06:02 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k21862MR008495 for perforce@freebsd.org; Wed, 1 Mar 2006 08:06:02 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 08:06:02 GMT Message-Id: <200603010806.k21862MR008495@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 92586 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 Mar 2006 08:06:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=92586 Change 92586 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 08:05:52 move tick_init to after console initialization Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#8 (text+ko) ==== @@ -108,6 +108,7 @@ #include #include #include +#include typedef int ofw_vec_t(void *); @@ -215,7 +216,11 @@ if (bootverbose) printf("machine: %s\n", sparc64_model); +#ifdef notyet cpu_identify(rdpr(ver), tick_freq, PCPU_GET(cpuid)); +#else + printf("\tUltraSparc T1\n"); +#endif } void @@ -285,7 +290,6 @@ * Initialize Open Firmware (needed for console). */ OF_init(vec); - /* * Parse metadata if present and fetch parameters. Must be before the * console is inited so cninit gets the right value of boothowto. @@ -314,13 +318,16 @@ } OF_getprop(child, "clock-frequency", &clock, sizeof(clock)); - tick_init(clock); + + + /* * Initialize the console before printing anything. */ cninit(); + tick_init(clock); /* * Panic is there is no metadata. Most likely the kernel was booted * directly, instead of through loader(8). @@ -409,15 +416,13 @@ /* * Initialize the message buffer (after setting trap table). */ +#if 0 + printf("msgbuf_init\n"); msgbufinit(msgbufp, MSGBUF_SIZE); +#endif mutex_init(); - /* - * Finish pmap initialization now that we're ready for mutexes. - */ - PMAP_LOCK_INIT(kernel_pmap); - OF_getprop(root, "name", sparc64_model, sizeof(sparc64_model) - 1); kdb_init(); From owner-p4-projects@FreeBSD.ORG Wed Mar 1 08:07: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 E1B5516A425; Wed, 1 Mar 2006 08:07: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 B7B6716A423 for ; Wed, 1 Mar 2006 08:07:05 +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 3026843D49 for ; Wed, 1 Mar 2006 08:07:04 +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 k21874nx008563 for ; Wed, 1 Mar 2006 08:07:04 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k21873hq008560 for perforce@freebsd.org; Wed, 1 Mar 2006 08:07:03 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 08:07:03 GMT Message-Id: <200603010807.k21873hq008560@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 92587 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 Mar 2006 08:07:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=92587 Change 92587 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 08:06:57 implement pmap_enter as well as all of the functions that it depends on simplify pmap_kextract with help of the new tsb_lookup_tte Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#12 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#12 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -68,7 +69,6 @@ struct msgbuf *msgbufp; vm_paddr_t msgbuf_phys; - /* * Map of physical memory reagions. */ @@ -95,18 +95,22 @@ +#ifndef PMAP_SHPGPERPROC +#define PMAP_SHPGPERPROC 200 +#endif /* - * Kernel pmap. + * Data for the pv entry allocation mechanism */ -struct pmap kernel_pmap_store; +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; /* - * Kernel TSBs + * Kernel pmap. */ -#define TSB8K_INDEX 0 -#define TSB4M_INDEX 1 +struct pmap kernel_pmap_store; -static hv_tsb_info_t kernel_td[MAX_TSB_INFO]; +hv_tsb_info_t kernel_td[MAX_TSB_INFO]; /* @@ -136,7 +140,14 @@ #define UNIMPLEMENTED panic("%s not implemented", __FUNCTION__) +static void free_pv_entry(pv_entry_t pv); +static pv_entry_t get_pv_entry(pmap_t locked_pmap); + static void pmap_scrub_pages(vm_paddr_t pa, int64_t size); +static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); +static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); + + /* * Quick sort callout for comparing memory regions. */ @@ -173,6 +184,109 @@ return (0); } + +static __inline void +free_pv_entry(pv_entry_t pv) +{ + pv_entry_count--; + uma_zfree(pvzone, pv); +} + +/* + * get a new pv_entry, allocating a block from the system + * when needed. + */ +static pv_entry_t +get_pv_entry(pmap_t locked_pmap) +{ + static const struct timeval printinterval = { 60, 0 }; + static struct timeval lastprint; + struct vpgqueues *vpq; + pmap_t pmap; + pv_entry_t allocated_pv, next_pv, pv; + vm_offset_t va; + vm_page_t m; + + PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + allocated_pv = uma_zalloc(pvzone, M_NOWAIT); + if (allocated_pv != NULL) { + pv_entry_count++; + if (pv_entry_count > pv_entry_high_water) + pagedaemon_wakeup(); + else + return (allocated_pv); + } + + /* + * Reclaim pv entries: At first, destroy mappings to inactive + * pages. After that, if a pv entry is still needed, destroy + * mappings to active pages. + */ + if (ratecheck(&lastprint, &printinterval)) + printf("Approaching the limit on PV entries, " + "increase the vm.pmap.shpgperproc tunable.\n"); + + vpq = &vm_page_queues[PQ_INACTIVE]; +retry: + sched_pin(); + TAILQ_FOREACH(m, &vpq->pl, pageq) { + if (m->hold_count || m->busy || (m->flags & PG_BUSY)) + continue; + TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { + UNIMPLEMENTED; + va = pv->pv_va; + pmap = pv->pv_pmap; + /* Avoid deadlock and lock recursion. */ + if (pmap > locked_pmap) + PMAP_LOCK(pmap); + else if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap)) + continue; + pmap->pm_stats.resident_count--; +#ifdef notyet + pte = pmap_pte_quick(pmap, va); + tpte = pte_load_clear(pte); + KASSERT((tpte & PG_W) == 0, + ("get_pv_entry: wired pte %#jx", (uintmax_t)tpte)); + if (tpte & PG_A) + vm_page_flag_set(m, PG_REFERENCED); + if (tpte & PG_M) { + KASSERT((tpte & PG_RW), + ("get_pv_entry: modified page not writable: va: %#x, pte: %#jx", + va, (uintmax_t)tpte)); + if (pmap_track_modified(va)) + vm_page_dirty(m); + } +#endif + pmap_invalidate_page(pmap, va); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); + TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); + if (TAILQ_EMPTY(&m->md.pv_list)) + vm_page_flag_clear(m, PG_WRITEABLE); + m->md.pv_list_count--; +#ifdef notyet + pmap_unuse_pt(pmap, va); +#endif + + if (pmap != locked_pmap) + PMAP_UNLOCK(pmap); + if (allocated_pv == NULL) + allocated_pv = pv; + else + free_pv_entry(pv); + } + } + sched_unpin(); + if (allocated_pv == NULL) { + if (vpq == &vm_page_queues[PQ_INACTIVE]) { + vpq = &vm_page_queues[PQ_ACTIVE]; + goto retry; + } + panic("get_pv_entry: increase the vm.pmap.shpgperproc tunable"); + } + return (allocated_pv); +} + /* * Allocate a physical page of memory directly from the phys_avail map. * Can only be called from pmap_bootstrap before avail start and end are @@ -184,7 +298,6 @@ vm_paddr_t pa; int i; - printf("looking for size %lx\n", size); size = round_page(size); for (i = 0; phys_avail[i + 1] != 0; i += 2) { @@ -306,6 +419,7 @@ kernel_td[TSB8K_INDEX].hvtsb_pa = pa; tsb_4m_size = virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT); + pa = pmap_bootstrap_alloc(tsb_4m_size); kernel_td[TSB4M_INDEX].hvtsb_idxpgsz = TTE4M; @@ -320,7 +434,6 @@ pmap_scrub_pages(kernel_td[TSB4M_INDEX].hvtsb_pa, tsb_4m_size); - /* * Set up TSB descriptors for the hypervisor * @@ -332,7 +445,6 @@ /* * allocate MMU fault status areas for all CPUS */ - printf("allocate fault status area\n"); mmu_fault_status_area = pmap_bootstrap_alloc(MMFSA_SIZE*MAXCPU); /* @@ -365,7 +477,6 @@ virtual_avail += KSTACK_GUARD_PAGES * PAGE_SIZE; kstack0 = virtual_avail; virtual_avail += KSTACK_PAGES * PAGE_SIZE; - printf("setting ttes\n"); for (i = 0; i < KSTACK_PAGES; i++) { pa = kstack0_phys + i * PAGE_SIZE; va = kstack0 + i * PAGE_SIZE; @@ -405,18 +516,21 @@ translations[i].om_start > VM_MAX_PROM_ADDRESS) continue; #endif - printf("om_size: %ld om_start: %lx om_tte: %lx\n", translations[i].om_size, + printf("om_size=%ld om_start=%lx om_tte=%lx\n", translations[i].om_size, translations[i].om_start, translations[i].om_tte); - if (translations[i].om_size == PAGE_SIZE_4M) + if (translations[i].om_size == PAGE_SIZE_4M) { + tsb_assert_invalid(&kernel_td[TSB4M_INDEX], translations[i].om_start); tsb_set_tte(&kernel_td[TSB4M_INDEX], translations[i].om_start, TTE_GET_PA(translations[i].om_tte), TTE_KERNEL | VTD_4M, 0); - else + } else { for (off = 0; off < translations[i].om_size; off += PAGE_SIZE) { va = translations[i].om_start + off; pa = TTE_GET_PA(translations[i].om_tte) + off; + tsb_assert_invalid(&kernel_td[TSB8K_INDEX], va); tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa, TTE_KERNEL | VTD_8K, 0); } + } } /* @@ -437,11 +551,9 @@ PMAP_LOCK_INIT(kernel_pmap); TAILQ_INIT(&kernel_pmap->pm_pvlist); - - printf("physical address of kernel_td: 0x%lx\n", vtophys((vm_offset_t)&kernel_td)); - printf("set ctx0\n"); - error = hv_set_ctx0(2, vtophys((vm_offset_t)&kernel_td)); - printf("ctx0 set\n"); + printf("physical address of kernel_td: 0x%lx\n", vtophys((vm_offset_t)&kernel_td)); + + error = hv_set_ctx0(MAX_TSB_INFO, vtophys((vm_offset_t)&kernel_td)); if (error != H_EOK) panic("failed to set ctx0 TSBs error: %ld", error); @@ -477,12 +589,14 @@ pmap_clear_modify(vm_page_t m) { /* XXX Need to also clear this in the TSB if possible :-( */ + UNIMPLEMENTED; tte_clear_phys_bit(m, VTD_W); } void pmap_clear_reference(vm_page_t m) { + UNIMPLEMENTED; tte_clear_phys_bit(m, VTD_REF); } @@ -508,7 +622,119 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, boolean_t wired) { - UNIMPLEMENTED; + vm_paddr_t pa, opa; + uint64_t tte_data, otte_data; + vm_page_t om; + int invlva; +#if 0 + printf("ctx=%d va=%lx prot=%x wired=%x\n", pmap->pm_context, + va, prot, wired); +#endif + + vm_page_lock_queues(); + om = NULL; + PMAP_LOCK(pmap); + sched_pin(); + + tte_data = pa = VM_PAGE_TO_PHYS(m); + otte_data = tsb_lookup_tte(va, pmap->pm_context); + opa = TTE_GET_PA(otte_data); + /* + * Mapping has not changed, must be protection or wiring change. + */ + if (pa == opa) { + /* + * Wiring change, just update stats. We don't worry about + * wiring PT pages as they remain resident as long as there + * are valid mappings in them. Hence, if a user page is wired, + * the PT page will be also. + */ + if (wired && ((otte_data & VTD_WIRED) == 0)) + pmap->pm_stats.wired_count++; + else if (!wired && (otte_data & VTD_WIRED)) + pmap->pm_stats.wired_count--; + + /* + * We might be turning off write access to the page, + * so we go ahead and sense modify status. + */ + if (otte_data & VTD_MANAGED) { + om = m; + pa |= VTD_MANAGED; + } + goto validate; + + } + /* + * Mapping has changed, invalidate old range and fall through to + * handle validating new mapping. + */ + if (opa) { + if (otte_data & VTD_W) + pmap->pm_stats.wired_count--; + if (otte_data & VTD_MANAGED) { + om = PHYS_TO_VM_PAGE(opa); + pmap_remove_entry(pmap, om, va); + } + } else + pmap->pm_stats.resident_count++; + + /* + * Enter on the PV list if part of our managed memory. + */ + if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) { + pmap_insert_entry(pmap, va, m); + tte_data |= VTD_MANAGED; + } + /* + * Increment counters + */ + if (wired) + pmap->pm_stats.wired_count++; + +validate: + /* + * Now validate mapping with desired protection/wiring. + */ + if ((prot & VM_PROT_WRITE) != 0) + tte_data |= (VTD_W|VTD_WR_PERM); /* XXX need to handle modify */ + if ((prot & VM_PROT_EXECUTE) != 0) + tte_data |= VTD_X; + if (wired) + tte_data |= VTD_WIRED; + if (pmap == kernel_pmap) + tte_data |= TTE_KERNEL_MINFLAGS; + + if ((otte_data & ~(VTD_W|VTD_REF)) != tte_data) { + if (otte_data & VTD_V) { + invlva = FALSE; + tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa, tte_data, + pmap->pm_context); + if (otte_data & VTD_REF) { + if (otte_data & VTD_MANAGED) + vm_page_flag_set(om, PG_REFERENCED); + if (opa != pa) + invlva = TRUE; + } + if (otte_data & VTD_W) { + if ((otte_data & VTD_MANAGED) && + pmap_track_modified(pmap, va)) + vm_page_dirty(om); + if ((prot & VM_PROT_WRITE) == 0) + invlva = TRUE; + } + if (invlva) + pmap_invalidate_page(pmap, va); + } else + tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa, tte_data, + pmap->pm_context); + } + + + sched_unpin(); + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); + } vm_page_t @@ -556,9 +782,42 @@ pmap_init(void) { /* allocate pv_entry zones */ - return; + int shpgperproc = PMAP_SHPGPERPROC; + + /* + * Initialize the address space (zone) for the pv entries. Set a + * high water mark so that the system can recover from excessive + * 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); + 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); + } +/* + * Create a pv entry for page at pa for + * (pmap, va). + */ +static void +pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m) +{ + pv_entry_t pv; + + pv = get_pv_entry(pmap); + pv->pv_va = va; + pv->pv_pmap = pmap; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist); + TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); + m->md.pv_list_count++; +} void pmap_invalidate_page(pmap_t pmap, vm_offset_t va) @@ -578,8 +837,14 @@ void pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { - - printf("%s unimplemented\n", __FUNCTION__); + vm_offset_t tva; + printf("pmap_invalidate_range(sva=%lx, eva=%lx)\n", sva, eva); + /* XXX SUN4V_FIXME - oversimplified logic */ + if (((sva & PAGE_MASK_4M) != 0) || ((eva & PAGE_MASK_4M) != 0)) { + for (tva = sva; tva < eva; tva += PAGE_SIZE_8K) + invlpg(tva, pmap->pm_context); + } else + UNIMPLEMENTED; } @@ -596,6 +861,8 @@ boolean_t pmap_is_modified(vm_page_t m) { + UNIMPLEMENTED; + /* Not properly handled yet */ return tte_get_phys_bit(m, VTD_W); } @@ -612,9 +879,7 @@ void pmap_kenter(vm_offset_t va, vm_paddr_t pa) { - printf("pmap_kentering\n"); tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa, TTE_KERNEL | VTD_8K, 0); - printf("pmap_kentered\n"); } /* @@ -627,20 +892,15 @@ { uint64_t tte_data; vm_paddr_t pa; - /* - * check 4M TSB - */ - tte_data = tsb_get_tte(&kernel_td[TSB4M_INDEX], va, 0); - pa = TTE_GET_PA(tte_data) | (va & PAGE_MASK_4M); - if (TTE_GET_PA(tte_data) != 0) - goto done; - /* - * check 8k TSB - */ - tte_data = tsb_get_tte(&kernel_td[TSB8K_INDEX], va, 0); - pa = TTE_GET_PA(tte_data)| (va & PAGE_MASK); - -done: + + pa = 0; +#if 0 + printf("tte_data=%lx TTE_GET_PA(tte_data)=%lx (va & TTE_GET_PAGE_MASK(tte_data))=%lx\n", + tsb_lookup_tte(va, 0), TTE_GET_PA(tte_data), (va & TTE_GET_PAGE_MASK(tte_data))); +#endif + if ((tte_data = tsb_lookup_tte(va, 0)) != 0) + pa = TTE_GET_PA(tte_data) | (va & TTE_GET_PAGE_MASK(tte_data)); + return pa; } @@ -748,7 +1008,7 @@ { if ((prot & VM_PROT_WRITE) == 0) { if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - tte_clear_phys_bit(m, VTD_SW|VTD_W); + tte_clear_phys_bit(m, VTD_WR_PERM|VTD_W); } else { pmap_remove_all(m); } @@ -821,6 +1081,7 @@ void pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) { + UNIMPLEMENTED; #ifdef notyet vm_offset_t pdnxt; pd_entry_t ptpaddr; @@ -1048,6 +1309,33 @@ UNIMPLEMENTED; } +static void +pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) +{ + pv_entry_t pv; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + if (m->md.pv_list_count < pmap->pm_stats.resident_count) { + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + if (pmap == pv->pv_pmap && va == pv->pv_va) + break; + } + } else { + TAILQ_FOREACH(pv, &pmap->pm_pvlist, pv_plist) { + if (va == pv->pv_va) + break; + } + } + KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); + TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); + m->md.pv_list_count--; + if (TAILQ_EMPTY(&m->md.pv_list)) + vm_page_flag_clear(m, PG_WRITEABLE); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); + free_pv_entry(pv); +} + void pmap_remove_pages(pmap_t pmap, vm_offset_t start, vm_offset_t end) From owner-p4-projects@FreeBSD.ORG Wed Mar 1 08:27: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 ACF4116A423; Wed, 1 Mar 2006 08:27: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 7A3B316A420 for ; Wed, 1 Mar 2006 08:27:48 +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 452B943D46 for ; Wed, 1 Mar 2006 08:27:48 +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 k218RmPw009376 for ; Wed, 1 Mar 2006 08:27:48 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k218RlPb009373 for perforce@freebsd.org; Wed, 1 Mar 2006 08:27:47 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 08:27:47 GMT Message-Id: <200603010827.k218RlPb009373@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 92589 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 Mar 2006 08:27:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=92589 Change 92589 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 08:26:46 add missing TTE flags Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#5 (text+ko) ==== @@ -110,9 +110,11 @@ #define VTD_X (1UL << 7) #define VTD_W (1UL << 6) -#define VTD_REF ((1UL << 3) << VTD_SOFT_SHIFT) /* XXX WRONG */ -#define VTD_SW ((1UL << 1) << VTD_SOFT_SHIFT) /* XXX WRONG */ -#define VTD_WIRED ((1UL << 0) << VTD_SOFT_SHIFT) +#define VTD_REF (1UL << 5) +#define VTD_WR_PERM (1UL << 4) +#define VTD_MANAGED (1UL << 58) +#define VTD_WIRED (1UL << 57) +#define VTD_LOCK (1UL << 56) @@ -126,7 +128,8 @@ /* * default flags for kernel pages */ -#define TTE_KERNEL VTD_V | VTD_CP | VTD_CV | VTD_P | VTD_X | VTD_W +#define TTE_KERNEL VTD_V | VTD_CP | VTD_CV | VTD_P | VTD_X | VTD_W | VTD_WR_PERM | VTD_REF | VTD_WIRED +#define TTE_KERNEL_MINFLAGS VTD_V | VTD_CP | VTD_CV | VTD_P #define VTD_SIZE_BITS (4) #define VTD_SIZE_MASK ((1 << VTD_SIZE_BITS) - 1) @@ -140,12 +143,13 @@ #define TTE_GET_PAGE_SHIFT(tte_data) \ TTE_PAGE_SHIFT(TTE_GET_SIZE(tte_data)) - +#ifdef notyet typedef union { struct tte { unsigned int v:1; /* <63> valid */ unsigned int nfo:1; /* <62> non-fault only */ - unsigned int sw:4; /* <61:58> sw */ + unsigned int sw:3; /* <61:59> sw */ + unsigned int managed:1; /* <58> managed */ unsigned int wired:1; /* <57> wired */ unsigned int lock:1; /* <56> sw - locked */ unsigned long pa:43; /* <55:13> pa */ @@ -163,6 +167,7 @@ } tte_bit; uint64_t ll; } tte_t; +#endif #define tte_val tte_bit.v /* use < 0 check in asm */ #define tte_size tte_bit.sz From owner-p4-projects@FreeBSD.ORG Wed Mar 1 08:29: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 A478616A423; Wed, 1 Mar 2006 08:29: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 7B26F16A420 for ; Wed, 1 Mar 2006 08:29: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 69E4243D4C for ; Wed, 1 Mar 2006 08:29:51 +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 k218TpbW009464 for ; Wed, 1 Mar 2006 08:29:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k218TpBR009461 for perforce@freebsd.org; Wed, 1 Mar 2006 08:29:51 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 08:29:51 GMT Message-Id: <200603010829.k218TpBR009461@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 92590 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 Mar 2006 08:29:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=92590 Change 92590 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 08:29:07 add general lookup function move kernel TSB indexes in return tte_t's Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#6 (text+ko) ==== @@ -64,11 +64,25 @@ #define TSB32M (1 << TTE32M) #define TSB256M (1 << TTE256M) +/* + * Kernel TSBs + */ +#define TSB8K_INDEX 0 +#define TSB4M_INDEX 1 + +extern hv_tsb_info_t kernel_td[MAX_TSB_INFO]; + struct hv_tsb_info; +typedef uint64_t tte_t; + +void tsb_assert_invalid(hv_tsb_info_t *tsb, vm_offset_t va); + void tsb_set_tte(struct hv_tsb_info *tsb, vm_offset_t va, vm_paddr_t pa, uint64_t flags, uint64_t ctx); -uint64_t tsb_get_tte(struct hv_tsb_info *tsb, vm_offset_t va, uint64_t ctx); +tte_t tsb_get_tte(struct hv_tsb_info *tsb, vm_offset_t va, uint64_t ctx); + +tte_t tsb_lookup_tte(vm_offset_t va, uint64_t ctx); void tsb_clear_tte(struct hv_tsb_info *tsb, vm_offset_t, uint64_t ctx); From owner-p4-projects@FreeBSD.ORG Wed Mar 1 08:29: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 300F016A445; Wed, 1 Mar 2006 08:29: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 D312916A433 for ; Wed, 1 Mar 2006 08:29: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 9F0D843D53 for ; Wed, 1 Mar 2006 08:29:51 +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 k218Tphf009470 for ; Wed, 1 Mar 2006 08:29:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k218TpG3009467 for perforce@freebsd.org; Wed, 1 Mar 2006 08:29:51 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 08:29:51 GMT Message-Id: <200603010829.k218TpG3009467@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 92591 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 Mar 2006 08:29:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=92591 Change 92591 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 08:29:45 ifdef out invalid structure Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/smp.h#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/smp.h#2 (text+ko) ==== @@ -54,7 +54,9 @@ vm_offset_t csa_pcpu; u_long csa_tick; u_long csa_ver; +#ifdef notyet struct tte csa_ttes[PCPU_PAGES]; +#endif }; struct ipi_cache_args { From owner-p4-projects@FreeBSD.ORG Wed Mar 1 18:35: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 1935316A4F7; Wed, 1 Mar 2006 18:35: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 CB1FE16A4F4 for ; Wed, 1 Mar 2006 18:35:22 +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 E6AE643D5A for ; Wed, 1 Mar 2006 18:35: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 k21IZJhx057149 for ; Wed, 1 Mar 2006 18:35:19 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k21IZJgC057146 for perforce@freebsd.org; Wed, 1 Mar 2006 18:35:19 GMT (envelope-from imp@freebsd.org) Date: Wed, 1 Mar 2006 18:35:19 GMT Message-Id: <200603011835.k21IZJgC057146@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 92610 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 Mar 2006 18:35:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=92610 Change 92610 by imp@imp_Speedy on 2006/03/01 18:34:24 More debug. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#13 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#13 (text+ko) ==== @@ -186,7 +186,7 @@ else while ((RD4(sc, PMC_SCSR) & clk->pmc_mask) == clk->pmc_mask) continue; - printf("Done!\n"); + printf("Done SCSR is now: %#x!\n", RD4(sc, PMC_SCSR)); } static void @@ -202,7 +202,7 @@ else while ((RD4(sc, PMC_PCSR) & clk->pmc_mask) == clk->pmc_mask) continue; - printf("Done!\n"); + printf("Done PCSR is now: %#x!\n", RD4(sc, PMC_PCSR)); } struct at91_pmc_clock * From owner-p4-projects@FreeBSD.ORG Wed Mar 1 18:58: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 DF24E16A423; Wed, 1 Mar 2006 18:58: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 A8CAC16A420 for ; Wed, 1 Mar 2006 18:58:52 +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 2C28343D58 for ; Wed, 1 Mar 2006 18:58:52 +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 k21Iwpxp058226 for ; Wed, 1 Mar 2006 18:58:52 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k21Iwpi3058223 for perforce@freebsd.org; Wed, 1 Mar 2006 18:58:51 GMT (envelope-from jhb@freebsd.org) Date: Wed, 1 Mar 2006 18:58:51 GMT Message-Id: <200603011858.k21Iwpi3058223@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 92614 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 Mar 2006 18:58:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=92614 Change 92614 by jhb@jhb_slimer on 2006/03/01 18:58:13 Use the previous longer time when time goes backwards. Affected files ... .. //depot/projects/smpng/sys/kern/kern_resource.c#59 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_resource.c#59 (text+ko) ==== @@ -761,14 +761,19 @@ ut = ruxp->rux_uticks; st = ruxp->rux_sticks; it = ruxp->rux_iticks; - tu = ruxp->rux_runtime; - tu = cputick2usec(tu); tt = ut + st + it; if (tt == 0) { st = 1; tt = 1; } + tu = cputick2usec(ruxp->rux_runtime); ptu = ruxp->rux_uu + ruxp->rux_su + ruxp->rux_iu; + if (tu < ptu) { + printf( +"calcru: runtime went backwards from %ju usec to %ju usec for pid %d (%s)\n", + (uintmax_t)ptu, (uintmax_t)tu, p->p_pid, p->p_comm); + tu = ptu; + } if ((int64_t)tu < 0) { printf("calcru: negative runtime of %jd usec for pid %d (%s)\n", (intmax_t)tu, p->p_pid, p->p_comm); @@ -779,16 +784,6 @@ uu = (tu * ut) / tt; su = (tu * st) / tt; iu = tu - uu - su; - if (tu < ptu) { - printf( -"calcru: runtime went backwards from %ju usec to %ju usec for pid %d (%s)\n", - (uintmax_t)ptu, (uintmax_t)tu, p->p_pid, p->p_comm); - printf("u %ju:%ju/%ju s %ju:%ju/%ju i %ju:%ju/%ju\n", - (uintmax_t)ut, (uintmax_t)ruxp->rux_uu, uu, - (uintmax_t)st, (uintmax_t)ruxp->rux_su, su, - (uintmax_t)it, (uintmax_t)ruxp->rux_iu, iu); - tu = ptu; - } #if 0 /* Enforce monotonicity. */ if (uu < ruxp->rux_uu || su < ruxp->rux_su || iu < ruxp->rux_iu) { From owner-p4-projects@FreeBSD.ORG Thu Mar 2 01:33: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 1471A16A423; Thu, 2 Mar 2006 01:33: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 891F516A420 for ; Thu, 2 Mar 2006 01:33:15 +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 51CCB43D45 for ; Thu, 2 Mar 2006 01:33:15 +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 k221XFFd089825 for ; Thu, 2 Mar 2006 01:33:15 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k221XE2B089822 for perforce@freebsd.org; Thu, 2 Mar 2006 01:33:14 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 2 Mar 2006 01:33:14 GMT Message-Id: <200603020133.k221XE2B089822@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 92632 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 Mar 2006 01:33:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92632 Change 92632 by kmacy@kmacy_storage:sun4v_work on 2006/03/02 01:32:47 disable magic traps in spill / fill handlers fix alignment of cleanwin at tl1 change tl0_end to more sensible tl1_end change size of pcb_pc to fix alignment trap Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcb.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#12 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcb.h#4 (text+ko) ==== @@ -42,8 +42,8 @@ uint32_t pcb_ufp[64]; /* used for regs in handling user floating point exc */ uint64_t pcb_rwsp[MAXWIN]; /* spbuf sp's for each wbuf */ uint64_t pcb_flags; - uint32_t pcb_nsaved; /* number of windows saved in pcb_rw */ - uint32_t pcb_pc; + uint64_t pcb_nsaved; /* number of windows saved in pcb_rw */ + uint64_t pcb_pc; uint64_t pcb_sp; uint64_t pcb_pa; /* physical address of pcb */ uint64_t pcb_pad[4]; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#12 (text+ko) ==== @@ -70,10 +70,14 @@ #include "assym.s" #if 1 +#define SPILL_FILL_MAGIC_TRAP_ON nop +#define SPILL_FILL_MAGIC_TRAP_OFF nop #define MAGIC_TRAP_ON ta 0x77 #define MAGIC_TRAP_OFF ta 0x78 /*#define MAGIC_TRAP_OFF nop */ #else +#define SPILL_FILL_MAGIC_TRAP_ON nop +#define SPILL_FILL_MAGIC_TRAP_OFF nop #define MAGIC_TRAP_ON nop #define MAGIC_TRAP_OFF nop #endif @@ -120,7 +124,7 @@ */ #define SPILL(storer, bias, size, asi) \ - MAGIC_TRAP_ON ;\ + SPILL_FILL_MAGIC_TRAP_ON ;\ mov 0 + bias, %g1 ;\ storer %l0, [%sp + %g1]asi ;\ mov size + bias, %g2 ;\ @@ -146,7 +150,7 @@ storer %i7, [%g5 + %g4]asi #define FILL(loader, bias, size, asi) \ - MAGIC_TRAP_ON ;\ + SPILL_FILL_MAGIC_TRAP_ON ;\ mov 0 + bias, %g1 ;\ loader [%sp + %g1]asi, %l0 ;\ mov size + bias, %g2 ;\ @@ -571,7 +575,7 @@ #define spill_64bit_asi(asi, target) \ SPILL(stxa, SPOFF, 8, asi) ; \ saved ; \ - MAGIC_TRAP_OFF ; \ + SPILL_FILL_MAGIC_TRAP_OFF ; \ retry ; \ .skip (31-27)*4 ; \ ba,a,pt %xcc, fault_64bit_##target ; \ @@ -606,7 +610,7 @@ #define fill_64bit_asi(asi, target) \ FILL(ldxa, SPOFF, 8, asi) ; \ restored ; \ - MAGIC_TRAP_OFF ; \ + SPILL_FILL_MAGIC_TRAP_OFF ; \ retry ; \ .skip (31-27)*4 ; \ ba,a,pt %xcc, fault_64bit_##target ; \ @@ -1837,7 +1841,7 @@ tl1_reserved 9 ! 0x200-0x208 tl1_insn_miss_209: insn_miss ! 0x209 - tl1_reserved 27 ! 0x20a-0x224 + tl1_reserved 26 ! 0x20a-0x223 tl1_clean_window_224: clean_window ! 0x224 tl1_divide_228: @@ -1894,8 +1898,8 @@ tl1_reserved 32 ! 0x2e0-0x2ff tl1_soft_traps: tl1_reserved 256 -.globl tl0_end -tl0_end: +.globl tl1_end +tl1_end: /* * no discretionary traps at TL 1 - leaving us with a 24k trap table */ From owner-p4-projects@FreeBSD.ORG Thu Mar 2 08:00: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 ACCE316A424; Thu, 2 Mar 2006 08:00: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 4467D16A420 for ; Thu, 2 Mar 2006 08:00:18 +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 DC05743D46 for ; Thu, 2 Mar 2006 08:00:17 +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 k2280Hin012952 for ; Thu, 2 Mar 2006 08:00:17 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2280GM5012949 for perforce@freebsd.org; Thu, 2 Mar 2006 08:00:16 GMT (envelope-from imp@freebsd.org) Date: Thu, 2 Mar 2006 08:00:16 GMT Message-Id: <200603020800.k2280GM5012949@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 92639 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 Mar 2006 08:00:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=92639 Change 92639 by imp@imp_harmony on 2006/03/02 07:59:25 IFC @92637 Affected files ... .. //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#8 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/arm/src/sys/amd64/include/apicvar.h#6 integrate .. //depot/projects/arm/src/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/arm/src/sys/amd64/include/mptable.h#2 integrate .. //depot/projects/arm/src/sys/amd64/isa/atpic.c#4 integrate .. //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/arm/src/sys/arm/arm/trap.c#8 integrate .. //depot/projects/arm/src/sys/arm/arm/undefined.c#7 integrate .. //depot/projects/arm/src/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/arm/src/sys/arm/include/pmap.h#5 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/arm/src/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.h#10 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/arm/src/sys/dev/ce/tau32-ddk.c#2 integrate .. //depot/projects/arm/src/sys/dev/ce/tau32-ddk.h#2 integrate .. //depot/projects/arm/src/sys/dev/iir/iir.c#3 integrate .. //depot/projects/arm/src/sys/dev/iir/iir.h#4 integrate .. //depot/projects/arm/src/sys/dev/iir/iir_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/arm/src/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#6 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/arm/src/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_port.h#5 integrate .. //depot/projects/arm/src/sys/geom/geom_io.c#3 integrate .. //depot/projects/arm/src/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/arm/src/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/io_apic.c#4 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/arm/src/sys/i386/include/apicvar.h#5 integrate .. //depot/projects/arm/src/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/arm/src/sys/i386/isa/atpic.c#4 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_time.c#6 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#9 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#10 integrate .. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/arm/src/sys/modules/kbdmux/Makefile#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvsock.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/trap.c#5 integrate .. //depot/projects/arm/src/sys/sys/_types.h#4 integrate .. //depot/projects/arm/src/sys/sys/bio.h#4 integrate .. //depot/projects/arm/src/sys/sys/mount.h#8 integrate .. //depot/projects/arm/src/sys/sys/proc.h#11 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#9 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#9 integrate .. //depot/projects/arm/src/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#9 integrate .. //depot/projects/arm/src/sys/sys/timers.h#4 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#9 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_extern.h#3 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#8 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/arm/src/sys/ufs/ffs/softdep.h#3 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufsmount.h#2 integrate Differences ... ==== //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.18 2005/12/08 18:33:29 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.19 2006/02/28 22:24:54 jhb Exp $ */ /* @@ -63,6 +63,12 @@ static struct intsrc *interrupt_sources[NUM_IO_INTS]; static struct mtx intr_table_lock; +#ifdef SMP +static int assign_cpu; + +static void intr_assign_next_cpu(struct intsrc *isrc); +#endif + static void intr_init(void *__dummy); static void intrcnt_setname(const char *name, int index); static void intrcnt_updatename(struct intsrc *is); @@ -93,6 +99,7 @@ } intrcnt_register(isrc); interrupt_sources[vector] = isrc; + isrc->is_enabled = 0; mtx_unlock_spin(&intr_table_lock); return (0); } @@ -118,7 +125,17 @@ intr_priority(flags), flags, cookiep); if (error == 0) { intrcnt_updatename(isrc); - isrc->is_pic->pic_enable_intr(isrc); + mtx_lock_spin(&intr_table_lock); + if (!isrc->is_enabled) { + isrc->is_enabled = 1; +#ifdef SMP + if (assign_cpu) + intr_assign_next_cpu(isrc); +#endif + mtx_unlock_spin(&intr_table_lock); + isrc->is_pic->pic_enable_intr(isrc); + } else + mtx_unlock_spin(&intr_table_lock); isrc->is_pic->pic_enable_source(isrc); } return (error); @@ -335,3 +352,76 @@ db_dump_intr_event((*isrc)->is_event, verbose); } #endif + +#ifdef SMP +/* + * Support for balancing interrupt sources across CPUs. For now we just + * allocate CPUs round-robin. + */ + +static u_int cpu_apic_ids[MAXCPU]; +static int current_cpu, num_cpus; + +static void +intr_assign_next_cpu(struct intsrc *isrc) +{ + struct pic *pic; + u_int apic_id; + + /* + * Assign this source to a local APIC in a round-robin fashion. + */ + pic = isrc->is_pic; + apic_id = cpu_apic_ids[current_cpu]; + current_cpu++; + if (current_cpu >= num_cpus) + current_cpu = 0; + if (bootverbose) { + printf("INTR: Assigning IRQ %d", pic->pic_vector(isrc)); + printf(" to local APIC %u\n", apic_id); + } + pic->pic_assign_cpu(isrc, apic_id); +} + +/* + * Add a local APIC ID to our list of valid local APIC IDs that can + * be destinations of interrupts. + */ +void +intr_add_cpu(u_int apic_id) +{ + + if (bootverbose) + printf("INTR: Adding local APIC %d as a target\n", apic_id); + if (num_cpus >= MAXCPU) + panic("WARNING: Local APIC IDs exhausted!"); + cpu_apic_ids[num_cpus] = apic_id; + num_cpus++; +} + +/* + * Distribute all the interrupt sources among the available CPUs once the + * AP's have been launched. + */ +static void +intr_shuffle_irqs(void *arg __unused) +{ + struct intsrc *isrc; + int i; + + /* Don't bother on UP. */ + if (num_cpus <= 1) + return; + + /* Round-robin assign each enabled source a CPU. */ + mtx_lock_spin(&intr_table_lock); + assign_cpu = 1; + for (i = 0; i < NUM_IO_INTS; i++) { + isrc = interrupt_sources[i]; + if (isrc != NULL && isrc->is_enabled) + intr_assign_next_cpu(isrc); + } + mtx_unlock_spin(&intr_table_lock); +} +SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL) +#endif ==== //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.20 2005/11/16 20:29:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.21 2006/02/28 22:24:54 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -61,8 +61,6 @@ #define IRQ_SMI (NUM_IO_INTS + 3) #define IRQ_DISABLED (NUM_IO_INTS + 4) -#define DEST_NONE -1 - #define TODO printf("%s: not implemented!\n", __func__) static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures"); @@ -82,10 +80,10 @@ u_int io_irq; u_int io_intpin:8; u_int io_vector:8; + u_int io_cpu:8; u_int io_activehi:1; u_int io_edgetrigger:1; u_int io_masked:1; - int io_dest:5; int io_bus:4; }; @@ -114,7 +112,7 @@ enum intr_polarity pol); static void ioapic_suspend(struct intsrc *isrc); static void ioapic_resume(struct intsrc *isrc); -static void ioapic_program_destination(struct ioapic_intsrc *intpin); +static void ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void ioapic_program_intpin(struct ioapic_intsrc *intpin); static STAILQ_HEAD(,ioapic) ioapic_list = STAILQ_HEAD_INITIALIZER(ioapic_list); @@ -122,10 +120,10 @@ ioapic_eoi_source, ioapic_enable_intr, ioapic_vector, ioapic_source_pending, ioapic_suspend, ioapic_resume, - ioapic_config_intr }; - -static int bsp_id, current_cluster, logical_clusters, next_ioapic_base; -static u_int next_id, program_logical_dest; + ioapic_config_intr, ioapic_assign_cpu }; + +static int next_ioapic_base; +static u_int next_id; SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD, 0, "APIC options"); static int enable_extint; @@ -273,14 +271,8 @@ } /* Set the destination. */ - if (intpin->io_dest == DEST_NONE) { - low = IOART_DESTPHY; - high = bsp_id << APIC_ID_SHIFT; - } else { - low = IOART_DESTLOG; - high = (intpin->io_dest << APIC_ID_CLUSTER_SHIFT | - APIC_ID_CLUSTER_ID) << APIC_ID_SHIFT; - } + low = IOART_DESTPHY; + high = intpin->io_cpu << APIC_ID_SHIFT; /* Program the rest of the low word. */ if (intpin->io_edgetrigger) @@ -312,7 +304,7 @@ default: KASSERT(intpin->io_vector != 0, ("No vector for IRQ %u", intpin->io_irq)); - low |= IOART_DELLOPRI | intpin->io_vector; + low |= IOART_DELFIXED | intpin->io_vector; } /* Write the values to the APIC. */ @@ -325,60 +317,31 @@ mtx_unlock_spin(&icu_lock); } -/* - * Program an individual intpin's logical destination. - */ static void -ioapic_program_destination(struct ioapic_intsrc *intpin) +ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id) { - struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic; + struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; + struct ioapic *io = (struct ioapic *)isrc->is_pic; - KASSERT(intpin->io_dest != DEST_NONE, - ("intpin not assigned to a cluster")); + intpin->io_cpu = apic_id; if (bootverbose) { - printf("ioapic%u: routing intpin %u (", io->io_id, - intpin->io_intpin); + printf("ioapic%u: Assigning ", io->io_id); ioapic_print_irq(intpin); - printf(") to cluster %u\n", intpin->io_dest); + printf(" to local APIC %u\n", intpin->io_cpu); } ioapic_program_intpin(intpin); } static void -ioapic_assign_cluster(struct ioapic_intsrc *intpin) -{ - - /* - * Assign this intpin to a logical APIC cluster in a - * round-robin fashion. We don't actually use the logical - * destination for this intpin until after all the CPU's - * have been started so that we don't end up with interrupts - * that don't go anywhere. Another alternative might be to - * start up the CPU's earlier so that they can handle interrupts - * sooner. - */ - intpin->io_dest = current_cluster; - current_cluster++; - if (current_cluster >= logical_clusters) - current_cluster = 0; - if (program_logical_dest) - ioapic_program_destination(intpin); -} - -static void ioapic_enable_intr(struct intsrc *isrc) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; struct ioapic *io = (struct ioapic *)isrc->is_pic; - if (intpin->io_dest == DEST_NONE) { + if (intpin->io_vector == 0) { /* * Allocate an APIC vector for this interrupt pin. Once - * we have a vector we program the interrupt pin. Note - * that after we have booted ioapic_assign_cluster() - * will program the interrupt pin again, but it doesn't - * hurt to do that and trying to avoid that adds needless - * complication. + * we have a vector we program the interrupt pin. */ intpin->io_vector = apic_alloc_vector(intpin->io_irq); if (bootverbose) { @@ -388,7 +351,6 @@ printf(") to vector %u\n", intpin->io_vector); } ioapic_program_intpin(intpin); - ioapic_assign_cluster(intpin); apic_enable_vector(intpin->io_vector); } } @@ -469,22 +431,6 @@ } /* - * Allocate and return a logical cluster ID. Note that the first time - * this is called, it returns cluster 0. ioapic_enable_intr() treats - * the two cases of logical_clusters == 0 and logical_clusters == 1 the - * same: one cluster of ID 0 exists. The logical_clusters == 0 case is - * for UP kernels, which should never call this function. - */ -int -ioapic_next_logical_cluster(void) -{ - - if (logical_clusters >= APIC_MAX_CLUSTER) - panic("WARNING: Local APIC cluster IDs exhausted!"); - return (logical_clusters++); -} - -/* * Create a plain I/O APIC object. */ void * @@ -568,11 +514,10 @@ } /* - * Route interrupts to the BSP by default using physical - * addressing. Vectored interrupts get readdressed using - * logical IDs to CPU clusters when they are enabled. + * Route interrupts to the BSP by default. Interrupts may + * be routed to other CPUs later after they are enabled. */ - intpin->io_dest = DEST_NONE; + intpin->io_cpu = PCPU_GET(apic_id); if (bootverbose && intpin->io_irq != IRQ_DISABLED) { printf("ioapic%u: intpin %d -> ", io->io_id, i); ioapic_print_irq(intpin); @@ -778,29 +723,9 @@ printf("ioapic%u irqs %u-%u on motherboard\n", io->io_id, flags >> 4, flags & 0xf, io->io_intbase, io->io_intbase + io->io_numintr - 1); - bsp_id = PCPU_GET(apic_id); /* Register valid pins as interrupt sources. */ for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) if (pin->io_irq < NUM_IO_INTS) intr_register_source(&pin->io_intsrc); } - -/* - * Program all the intpins to use logical destinations once the AP's - * have been launched. - */ -static void -ioapic_set_logical_destinations(void *arg __unused) -{ - struct ioapic *io; - int i; - - program_logical_dest = 1; - STAILQ_FOREACH(io, &ioapic_list, io_next) - for (i = 0; i < io->io_numintr; i++) - if (io->io_pins[i].io_dest != DEST_NONE) - ioapic_program_destination(&io->io_pins[i]); -} -SYSINIT(ioapic_destinations, SI_SUB_SMP, SI_ORDER_SECOND, - ioapic_set_logical_destinations, NULL) ==== //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.23 2005/12/22 22:16:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.24 2006/02/28 22:24:54 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -217,6 +217,7 @@ /* Set BSP's per-CPU local APIC ID. */ PCPU_SET(apic_id, lapic_id()); + intr_add_cpu(PCPU_GET(apic_id)); /* Local APIC timer interrupt. */ setidt(APIC_TIMER_INT, IDTVEC(timerint), SDT_SYSIGT, SEL_KPL, 0); @@ -279,7 +280,7 @@ lapic_setup(void) { struct lapic *la; - u_int32_t value, maxlvt; + u_int32_t maxlvt; register_t eflags; char buf[MAXCOMLEN + 1]; @@ -291,19 +292,6 @@ /* Initialize the TPR to allow all interrupts. */ lapic_set_tpr(0); - /* Use the cluster model for logical IDs. */ - value = lapic->dfr; - value &= ~APIC_DFR_MODEL_MASK; - value |= APIC_DFR_MODEL_CLUSTER; - lapic->dfr = value; - - /* Set this APIC's logical ID. */ - value = lapic->ldr; - value &= ~APIC_ID_MASK; - value |= (la->la_cluster << APIC_ID_CLUSTER_SHIFT | - 1 << la->la_cluster_id) << APIC_ID_SHIFT; - lapic->ldr = value; - /* Setup spurious vector and enable the local APIC. */ lapic_enable(); ==== //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.268 2006/02/07 21:22:01 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.269 2006/02/28 22:24:54 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -160,7 +160,7 @@ static u_int boot_address; -static void set_logical_apic_ids(void); +static void set_interrupt_apic_ids(void); static int start_all_aps(void); static int start_ap(int apic_id); static void release_aps(void *dummy); @@ -405,7 +405,7 @@ hyperthreading_cpus = logical_cpus; } - set_logical_apic_ids(); + set_interrupt_apic_ids(); } @@ -596,33 +596,29 @@ */ /* - * Set the APIC logical IDs. - * - * We want to cluster logical CPU's within the same APIC ID cluster. - * Since logical CPU's are aligned simply filling in the clusters in - * APIC ID order works fine. Note that this does not try to balance - * the number of CPU's in each cluster. (XXX?) + * We tell the I/O APIC code about all the CPUs we want to receive + * interrupts. If we don't want certain CPUs to receive IRQs we + * can simply not tell the I/O APIC code about them in this function. + * We also do not tell it about the BSP since it tells itself about + * the BSP internally to work with UP kernels and on UP machines. */ static void -set_logical_apic_ids(void) +set_interrupt_apic_ids(void) { - u_int apic_id, cluster, cluster_id; + u_int apic_id; - /* Force us to allocate cluster 0 at the start. */ - cluster = -1; - cluster_id = APIC_MAX_INTRACLUSTER_ID; for (apic_id = 0; apic_id < MAXCPU; apic_id++) { if (!cpu_info[apic_id].cpu_present) continue; - if (cluster_id == APIC_MAX_INTRACLUSTER_ID) { - cluster = ioapic_next_logical_cluster(); - cluster_id = 0; - } else - cluster_id++; - if (bootverbose) - printf("APIC ID: physical %u, logical %u:%u\n", - apic_id, cluster, cluster_id); - lapic_set_logical_id(apic_id, cluster, cluster_id); + if (cpu_info[apic_id].cpu_bsp) + continue; +#if 0 + /* Don't let hyperthreads service interrupts. */ + if (hyperthreading_cpus > 1 && + apic_id % hyperthreading_cpus != 0) + continue; +#endif + intr_add_cpu(apic_id); } } ==== //depot/projects/arm/src/sys/amd64/include/apicvar.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.16 2005/12/22 22:16:05 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.17 2006/02/28 22:24:54 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -181,7 +181,6 @@ void *ioapic_create(uintptr_t addr, int32_t id, int intbase); int ioapic_disable_pin(void *cookie, u_int pin); int ioapic_get_vector(void *cookie, u_int pin); -int ioapic_next_logical_cluster(void); void ioapic_register(void *cookie); int ioapic_remap_vector(void *cookie, u_int pin, int vector); int ioapic_set_bus(void *cookie, u_int pin, int bus_type); ==== //depot/projects/arm/src/sys/amd64/include/intr_machdep.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.8 2005/12/08 18:33:30 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.9 2006/02/28 22:24:54 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -85,6 +85,7 @@ void (*pic_resume)(struct intsrc *); int (*pic_config_intr)(struct intsrc *, enum intr_trigger, enum intr_polarity); + void (*pic_assign_cpu)(struct intsrc *, u_int apic_id); }; /* Flags for pic_disable_source() */ @@ -105,6 +106,7 @@ u_long *is_count; u_long *is_straycount; u_int is_index; + u_int is_enabled:1; }; struct trapframe; @@ -117,6 +119,11 @@ enum intr_trigger elcr_read_trigger(u_int irq); void elcr_resume(void); void elcr_write_trigger(u_int irq, enum intr_trigger trigger); +#ifdef SMP +void intr_add_cpu(u_int apic_id); +#else +#define intr_add_cpu(apic_id) +#endif int intr_add_handler(const char *name, int vector, driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep); int intr_config_intr(int vector, enum intr_trigger trig, ==== //depot/projects/arm/src/sys/amd64/include/mptable.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.222 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/mptable.h,v 1.223 2006/03/01 05:59:56 sam Exp $ */ #ifndef __MACHINE_MPTABLE_H__ @@ -139,7 +139,8 @@ char name[16]; } basetable_entry; +#ifdef _KERNEL int mptable_pci_probe_table(int bus); int mptable_pci_route_interrupt(device_t pcib, device_t dev, int pin); - +#endif #endif /* !__MACHINE_MPTABLE_H__ */ ==== //depot/projects/arm/src/sys/amd64/isa/atpic.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.18 2005/12/08 18:33:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.19 2006/02/28 22:24:54 jhb Exp $"); #include "opt_auto_eoi.h" #include "opt_isa.h" @@ -108,8 +108,8 @@ #define ATPIC(io, base, eoi, imenptr) \ { { atpic_enable_source, atpic_disable_source, (eoi), \ atpic_enable_intr, atpic_vector, atpic_source_pending, NULL, \ - atpic_resume, atpic_config_intr }, (io), (base), \ - IDT_IO_INTS + (base), (imenptr) } + atpic_resume, atpic_config_intr, atpic_assign_cpu }, (io), \ + (base), IDT_IO_INTS + (base), (imenptr) } #define INTSRC(irq) \ { { &atpics[(irq) / 8].at_pic }, IDTVEC(atpic_intr ## irq ), \ @@ -142,6 +142,7 @@ static int atpic_source_pending(struct intsrc *isrc); static int atpic_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); +static void atpic_assign_cpu(struct intsrc *isrc, u_int apic_id); static void i8259_init(struct atpic *pic, int slave); static struct atpic atpics[] = { @@ -353,6 +354,17 @@ } static void +atpic_assign_cpu(struct intsrc *isrc, u_int apic_id) +{ + + /* + * 8259A's are only used in UP in which case all interrupts always + * go to the sole CPU and this function shouldn't even be called. + */ + panic("%s: bad cookie", __func__); +} + +static void i8259_init(struct atpic *pic, int slave) { int imr_addr; ==== //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.24 2005/10/03 22:44:54 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.25 2006/03/01 23:04:25 cognet Exp $"); /* * MacPPC bus dma support routines @@ -93,6 +93,8 @@ bus_dma_tag_t dmat; int flags; void *buffer; + void *origbuffer; + void *allocbuffer; TAILQ_ENTRY(bus_dmamap) freelist; int len; }; @@ -416,6 +418,23 @@ *mapp = NULL; return (ENOMEM); } + if (flags & BUS_DMA_COHERENT) { + void *tmpaddr = arm_remap_nocache( + (void *)((vm_offset_t)*vaddr &~ PAGE_MASK), + dmat->maxsize + ((vm_offset_t)*vaddr & PAGE_MASK)); + + if (tmpaddr) { + tmpaddr = (void *)((vm_offset_t)(tmpaddr) + + ((vm_offset_t)*vaddr & PAGE_MASK)); + newmap->origbuffer = *vaddr; + newmap->allocbuffer = tmpaddr; + cpu_idcache_wbinv_range((vm_offset_t)*vaddr, + dmat->maxsize); + *vaddr = tmpaddr; + } else + newmap->origbuffer = newmap->allocbuffer = NULL; + } else + newmap->origbuffer = newmap->allocbuffer = NULL; return (0); } @@ -426,6 +445,12 @@ void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) { + if (map->allocbuffer) { + KASSERT(map->allocbuffer == vaddr, + ("Trying to freeing the wrong DMA buffer")); + vaddr = map->origbuffer; + arm_unmap_nocache(map->allocbuffer, dmat->maxsize); + } if (dmat->maxsize <= PAGE_SIZE) free(vaddr, M_DEVBUF); else { ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#9 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.41 2005/11/20 06:09:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.42 2006/03/01 23:04:25 cognet Exp $"); #include #include #include @@ -2553,9 +2553,12 @@ virtual_avail = round_page(virtual_avail); virtual_end = lastaddr; kernel_vm_end = pmap_curmaxkvaddr; + arm_nocache_startaddr = lastaddr; + #ifdef ARM_USE_SMALL_ALLOC mtx_init(&smallalloc_mtx, "Small alloc page list", NULL, MTX_DEF); - alloc_firstaddr = alloc_curaddr = lastaddr; + alloc_firstaddr = alloc_curaddr = arm_nocache_startaddr + + ARM_NOCACHE_KVA_SIZE; #endif } @@ -2916,6 +2919,13 @@ } void +pmap_kenter_nocache(vm_offset_t va, vm_paddr_t pa) +{ + + pmap_kenter_internal(va, pa, 0); +} + +void pmap_kenter_user(vm_offset_t va, vm_paddr_t pa) { ==== //depot/projects/arm/src/sys/arm/arm/trap.c#8 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.21 2006/02/08 08:09:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.23 2006/03/01 20:43:51 cognet Exp $"); #include @@ -428,15 +428,14 @@ error = vm_fault(map, va, ftype, (ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY : VM_FAULT_NORMAL); pcb->pcb_onfault = onfault; - if (__predict_true(error == 0)) { - goto out; - } if (map != kernel_map) { PROC_LOCK(p); p->p_lock--; PROC_UNLOCK(p); } + if (__predict_true(error == 0)) + goto out; if (user == 0) { if (pcb->pcb_onfault) { tf->tf_r0 = error; @@ -930,6 +929,8 @@ AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args); AUDIT_SYSCALL_EXIT(error, td); + KASSERT(td->td_ar == NULL, + ("returning from syscall with td_ar set!")); } switch (error) { case 0: ==== //depot/projects/arm/src/sys/arm/arm/undefined.c#7 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.11 2006/02/22 18:57:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.12 2006/03/01 18:33:45 cognet Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/arm/vm_machdep.c#5 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.21 2006/01/27 21:07:04 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.23 2006/03/02 00:37:40 cognet Exp $"); #include #include @@ -368,6 +368,69 @@ { } +#define BITS_PER_INT (8 * sizeof(int)) +vm_offset_t arm_nocache_startaddr; +static int arm_nocache_allocated[ARM_NOCACHE_KVA_SIZE / (PAGE_SIZE * + BITS_PER_INT)]; + +/* + * Functions to map and unmap memory non-cached into KVA the kernel won't try + * to allocate. The goal is to provide uncached memory to busdma, to honor + * BUS_DMA_COHERENT. + * We can allocate at most ARM_NOCACHE_KVA_SIZE bytes. + * The allocator is rather dummy, each page is represented by a bit in + * a bitfield, 0 meaning the page is not allocated, 1 meaning it is. + * As soon as it finds enough contiguous pages to satisfy the request, + * it returns the address. + */ +void * +arm_remap_nocache(void *addr, vm_size_t size) +{ + int i, j; + + size = round_page(size); + for (i = 0; i < MIN(ARM_NOCACHE_KVA_SIZE / (PAGE_SIZE * BITS_PER_INT), + ARM_TP_ADDRESS); i++) { + if (!(arm_nocache_allocated[i / BITS_PER_INT] & (1 << (i % + BITS_PER_INT)))) { + for (j = i; j < i + (size / (PAGE_SIZE)); j++) + if (arm_nocache_allocated[j / BITS_PER_INT] & + (1 << (j % BITS_PER_INT))) + break; + if (j == i + (size / (PAGE_SIZE))) + break; + } + } + if (i < MIN(ARM_NOCACHE_KVA_SIZE / (PAGE_SIZE * BITS_PER_INT), + ARM_TP_ADDRESS)) { + vm_offset_t tomap = arm_nocache_startaddr + i * PAGE_SIZE; + void *ret = (void *)tomap; + vm_paddr_t physaddr = vtophys((vm_offset_t)addr); + + for (; tomap < (vm_offset_t)ret + size; tomap += PAGE_SIZE, + physaddr += PAGE_SIZE, i++) { + pmap_kenter_nocache(tomap, physaddr); + arm_nocache_allocated[i / BITS_PER_INT] |= 1 << (i % + BITS_PER_INT); + } + return (ret); + } + return (NULL); +} + +void +arm_unmap_nocache(void *addr, vm_size_t size) +{ + vm_offset_t raddr = (vm_offset_t)addr; + int i; + + size = round_page(size); + i = (raddr - arm_nocache_startaddr) / (PAGE_SIZE); + for (; size > 0; size -= PAGE_SIZE, i++) + arm_nocache_allocated[i / BITS_PER_INT] &= ~(1 << (i % + BITS_PER_INT)); +} + #ifdef ARM_USE_SMALL_ALLOC static TAILQ_HEAD(,arm_small_page) pages_normal = @@ -393,7 +456,7 @@ { struct arm_small_page *pg; - bytes &= ~PAGE_SIZE; + bytes &= ~PAGE_MASK; while (bytes > 0) { pg = (struct arm_small_page *)list; pg->addr = mem; ==== //depot/projects/arm/src/sys/arm/include/pmap.h#5 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.14 2005/11/21 19:10:44 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.15 2006/03/01 23:04:25 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -210,6 +210,7 @@ void pmap_bootstrap(vm_offset_t, vm_offset_t, struct pv_addr *); void pmap_kenter(vm_offset_t va, vm_paddr_t pa); +void pmap_kenter_nocache(vm_offset_t va, vm_paddr_t pa); void pmap_kenter_user(vm_offset_t va, vm_paddr_t pa); void pmap_kremove(vm_offset_t); void *pmap_mapdev(vm_offset_t, vm_size_t); @@ -525,6 +526,12 @@ }; #endif + +#define ARM_NOCACHE_KVA_SIZE 0x600000 +extern vm_offset_t arm_nocache_startaddr; +void *arm_remap_nocache(void *, vm_size_t); +void arm_unmap_nocache(void *, vm_size_t); + extern vm_paddr_t dump_avail[]; #endif /* _KERNEL */ ==== //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.50 2006/02/06 22:06:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.51 2006/02/28 19:39:17 ps Exp $"); #include "opt_compat.h" @@ -1427,37 +1427,83 @@ return (ftruncate(td, &ap)); } -#ifdef COMPAT_FREEBSD4 -int -freebsd4_freebsd32_sendfile(struct thread *td, - struct freebsd4_freebsd32_sendfile_args *uap) +struct sf_hdtr32 { + uint32_t headers; + int hdr_cnt; + uint32_t trailers; + int trl_cnt; +}; + +static int +freebsd32_do_sendfile(struct thread *td, + struct freebsd32_sendfile_args *uap, int compat) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 3 05:28: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 ABD4E16A423; Fri, 3 Mar 2006 05:28: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 814C516A420 for ; Fri, 3 Mar 2006 05:28:32 +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 31F5243D45 for ; Fri, 3 Mar 2006 05:28:32 +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 k235SWI9008973 for ; Fri, 3 Mar 2006 05:28:32 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k235SVWP008970 for perforce@freebsd.org; Fri, 3 Mar 2006 05:28:31 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 3 Mar 2006 05:28:31 GMT Message-Id: <200603030528.k235SVWP008970@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 92669 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 Mar 2006 05:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=92669 Change 92669 by kmacy@kmacy_storage:sun4v_work on 2006/03/03 05:27:39 C code should not be executed at tl > 0, fix kernel trap / interrupt handling so that handlers are executed at tl0 Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asm.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tstate.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#13 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asm.h#2 (text+ko) ==== @@ -101,6 +101,7 @@ #define WINDOWSIZE64 (16*8) #define MINFRAME64 (WINDOWSIZE64 + 48) #define MINFRAME MINFRAME64 +#define REGOFF SA(MINFRAME) /* * Kernel RCS ID tag and copyright macros ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#3 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2001 Jake Burkholder. + * Copyright (c) 2006 Kip Macy * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -146,9 +147,43 @@ GET_PCPU_SCRATCH; \ ldx [PCPU_REG + PC_CURPCB], reg; -#define SAVE_V8_WINDOW(reg) +#define SAVE_GLOBALS(TF) \ + stx %g1, [TF + TF_G1]; \ + stx %g2, [TF + TF_G2]; \ + stx %g3, [TF + TF_G3]; \ + stx %g4, [TF + TF_G4]; \ + stx %g5, [TF + TF_G5]; \ + stx %g6, [TF + TF_G6]; \ + stx %g7, [TF + TF_G7]; +#define RESTORE_GLOBALS(TF) \ + ldx [TF + TF_G1], %g1; \ + ldx [TF + TF_G2], %g2; \ + ldx [TF + TF_G3], %g3; \ + ldx [TF + TF_G4], %g4; \ + ldx [TF + TF_G5], %g5; \ + ldx [TF + TF_G6], %g6; \ + ldx [TF + TF_G7], %g7; +#define SAVE_OUTS(TF) \ + stx %i0, [TF + TF_O0]; \ + stx %i1, [TF + TF_O1]; \ + stx %i2, [TF + TF_O2]; \ + stx %i3, [TF + TF_O3]; \ + stx %i4, [TF + TF_O4]; \ + stx %i5, [TF + TF_O5]; \ + stx %i6, [TF + TF_O6]; \ + stx %i7, [TF + TF_O7]; + +#define RESTORE_OUTS(TF) \ + ldx [TF + TF_O0], %i0; \ + ldx [TF + TF_O1], %i1; \ + ldx [TF + TF_O2], %i2; \ + ldx [TF + TF_O3], %i3; \ + ldx [TF + TF_O4], %i4; \ + ldx [TF + TF_O5], %i5; \ + ldx [TF + TF_O6], %i6; \ + ldx [TF + TF_O7], %i7; #endif /* LOCORE */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#3 (text+ko) ==== @@ -91,6 +91,9 @@ extern uint64_t hvio_intr_setstate(uint64_t sysino, int intr_state); extern uint64_t hvio_intr_gettarget(uint64_t sysino, uint32_t *cpuid); extern uint64_t hvio_intr_settarget(uint64_t sysino, uint32_t cpuid); +extern void hv_magic_trap_on(void); +extern void hv_magic_trap_off(void); + #endif ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#5 (text+ko) ==== @@ -71,6 +71,9 @@ u_long pc_tickref; \ u_long pc_tickadj; \ u_int pc_mid; \ + struct rwindow pc_kwbuf; \ + u_long pc_kwbuf_sp; \ + u_int pc_kwbuf_full; \ u_int pc_node; \ u_int pc_tlb_ctx; \ u_int pc_tlb_ctx_max; \ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tstate.h#2 (text+ko) ==== @@ -54,6 +54,8 @@ #define TSTATE_CLE TSTATE_PSTATE(PSTATE_CLE) #define TSTATE_MG TSTATE_PSTATE(PSTATE_MG) #define TSTATE_IG TSTATE_PSTATE(PSTATE_IG) +#define TSTATE_KERNEL TSTATE_PSTATE(PSTATE_KERNEL) + #define TSTATE_ASI_SHIFT 24 #define TSTATE_ASI_BITS 8 ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#13 (text+ko) ==== @@ -81,7 +81,8 @@ #define MAGIC_TRAP_ON nop #define MAGIC_TRAP_OFF nop #endif - + +#define REGSIZE 8 #define TSB_KERNEL_MASK 0x0 #define TSB_KERNEL 0x0 @@ -124,7 +125,6 @@ */ #define SPILL(storer, bias, size, asi) \ - SPILL_FILL_MAGIC_TRAP_ON ;\ mov 0 + bias, %g1 ;\ storer %l0, [%sp + %g1]asi ;\ mov size + bias, %g2 ;\ @@ -150,7 +150,6 @@ storer %i7, [%g5 + %g4]asi #define FILL(loader, bias, size, asi) \ - SPILL_FILL_MAGIC_TRAP_ON ;\ mov 0 + bias, %g1 ;\ loader [%sp + %g1]asi, %l0 ;\ mov size + bias, %g2 ;\ @@ -428,32 +427,14 @@ .align 128 .endm - /* - * Stack fixups for entry from user mode. We are still running on the - * user stack, and with its live registers, so we must save soon. We - * are on alternate globals so we do have some registers. Set the - * transitional window state, and do the save. If this traps we - * we attempt to spill a window to the user stack. If this fails, - * we spill the window to the pcb and continue. Spilling to the pcb - * must not fail. - * - * NOTE: Must be called with alternate globals and clobbers %g1. - */ - .macro tl0_split -#if 0 - rdpr %wstate, %g1 - wrpr %g1, WSTATE_TRANSITION, %wstate - save -#endif + GET_PCB(PCB_REG); /* load PCPU and PCB pointers */ .endm .macro tl0_setup type tl0_split - clr %o1 - set trap, %o2 ba %xcc, tl0_utrap - mov \type, %o0 + mov \type, %g1 .endm /* @@ -564,15 +545,17 @@ #define spill_32bit_asi(asi, target) \ srl %sp, 0, %sp ; \ + SPILL_FILL_MAGIC_TRAP_ON; \ SPILL(sta, 0, 4, asi) ; \ saved ; \ - MAGIC_TRAP_OFF ; \ + SPILL_FILL_MAGIC_TRAP_OFF; \ retry ; \ .skip (31-28)*4 ; \ ba,a,pt %xcc, fault_32bit_##target ; \ ALIGN_128 #define spill_64bit_asi(asi, target) \ + SPILL_FILL_MAGIC_TRAP_ON ; \ SPILL(stxa, SPOFF, 8, asi) ; \ saved ; \ SPILL_FILL_MAGIC_TRAP_OFF ; \ @@ -583,6 +566,7 @@ #define spill_32clean(asi, target) \ srl %sp, 0, %sp ; \ + SPILL_FILL_MAGIC_TRAP_ON; \ SPILL(sta, 0, 4, asi) ; \ b spill_clean ; \ mov WSTATE_USER32, %g7 ; \ @@ -591,6 +575,7 @@ ALIGN_128 #define spill_64clean(asi, target) \ + SPILL_FILL_MAGIC_TRAP_ON; \ SPILL(stxa, SPOFF, 8, asi) ; \ b spill_clean ; \ mov WSTATE_USER64, %g7 ; \ @@ -600,6 +585,7 @@ #define fill_32bit_asi(asi, target) \ srl %sp, 0, %sp ; \ + SPILL_FILL_MAGIC_TRAP_ON; \ FILL(lda, 0, 4, asi) ; \ restored ; \ retry ; \ @@ -608,6 +594,7 @@ ALIGN_128 #define fill_64bit_asi(asi, target) \ + SPILL_FILL_MAGIC_TRAP_ON; \ FILL(ldxa, SPOFF, 8, asi) ; \ restored ; \ SPILL_FILL_MAGIC_TRAP_OFF ; \ @@ -730,19 +717,27 @@ mov %g2, %o0 END(tl0_sfsr_trap) - .macro tl0_intr level, mask + .macro tl0_pil_entry level, mask + tl0_split + set \mask, %g2 + ba %xcc, tl0_intr + mov \level, %g1 + .align 32 + .endm + + .macro tl1_pil_entry level, mask tl0_split - set \mask, %o1 + set \mask, %g2 ba %xcc, tl0_intr - mov \level, %o0 + mov \level, %g1 .align 32 .endm #define INTR(level, traplvl) \ - tl ## traplvl ## _intr level, 1 << level + tl ## traplvl ## _pil_entry level, 1 << level #define TICK(traplvl) \ - tl ## traplvl ## _intr PIL_TICK, 1 + tl ## traplvl ## _pil_entry PIL_TICK, 1 #define INTR_LEVEL(tl) \ INTR(1, tl) ; \ @@ -758,10 +753,11 @@ INTR(11, tl) ; \ INTR(12, tl) ; \ INTR(13, tl) ; \ +tick_ ## tl ## _entry: \ TICK(tl) ; \ INTR(15, tl) ; - .macro tl0_intr_level + .macro tl0_pil INTR_LEVEL(0) .endm @@ -1748,7 +1744,7 @@ tl0_gen T_PRIVILEGED_ACTION ! 0x37 tl0_reserved 9 ! 0x38-0x40 tl0_intr_level_41: - tl0_intr_level ! 0x41-0x4f + tl0_pil ! 0x41-0x4f tl0_reserved 18 ! 0x50-0x61 tl0_watch_virt_62: tl0_gen T_VA_WATCHPOINT ! 0x62 @@ -1943,6 +1939,7 @@ * If the trap type allows user traps, setup state to execute the user trap * handler and bounce back to usermode, otherwise branch to tl0_trap. */ +#if 0 ENTRY(tl0_utrap) /* * Check if the trap type allows user traps. @@ -2034,7 +2031,7 @@ */ done END(tl0_utrap) - +#endif /* * (Real) User trap entry point. * @@ -2054,209 +2051,212 @@ * the normal %g7 *before* enabling interrupts. This avoids any possibility * of cpu migration and using the wrong pcpup. */ -ENTRY(tl0_trap) - GET_PCB(PCB_REG) - - rdpr %tstate, %l0 - rdpr %tpc, %l1 - rdpr %tnpc, %l2 - rd %y, %l3 - rd %fprs, %l4 - rdpr %wstate, %l5 -#if KTR_COMPILE & KTR_TRAP - CATR(KTR_TRAP, - "tl0_trap: td=%p type=%#x pil=%#lx pc=%#lx npc=%#lx sp=%#lx" - , %g1, %g2, %g3, 7, 8, 9) - ldx [PCPU(CURTHREAD)], %g2 - stx %g2, [%g1 + KTR_PARM1] - stx %o0, [%g1 + KTR_PARM2] - rdpr %pil, %g2 - stx %g2, [%g1 + KTR_PARM3] - stx %l1, [%g1 + KTR_PARM4] - stx %l2, [%g1 + KTR_PARM5] - stx %i6, [%g1 + KTR_PARM6] -9: -#endif -#if 0 -1: and %l5, WSTATE_NORMAL_MASK, %l5 - sllx %l5, WSTATE_OTHER_SHIFT, %l5 - wrpr %l5, WSTATE_KERNEL, %wstate -#endif - rdpr %canrestore, %l6 - wrpr %l6, 0, %otherwin - wrpr %g0, 0, %canrestore - sub PCB_REG, SPOFF + CCFSZ + TF_SIZEOF, %sp + +#define KWBUF64_TO_STACK(SBP,SPP,TMP) \ + ldx [SBP + (0*8)], TMP; \ + stx TMP, [SPP + SPOFF + 0]; \ + ldx [SBP + (1*8)], TMP; \ + stx TMP, [SPP + SPOFF + 8]; \ + ldx [SBP + (2*8)], TMP; \ + stx TMP, [SPP + SPOFF + 16]; \ + ldx [SBP + (3*8)], TMP; \ + stx TMP, [SPP + SPOFF + 24]; \ + ldx [SBP + (4*8)], TMP; \ + stx TMP, [SPP + SPOFF + 32]; \ + ldx [SBP + (5*8)], TMP; \ + stx TMP, [SPP + SPOFF + 40]; \ + ldx [SBP + (6*8)], TMP; \ + stx TMP, [SPP + SPOFF + 48]; \ + ldx [SBP + (7*8)], TMP; \ + stx TMP, [SPP + SPOFF + 56]; \ + ldx [SBP + (8*8)], TMP; \ + stx TMP, [SPP + SPOFF + 64]; \ + ldx [SBP + (9*8)], TMP; \ + stx TMP, [SPP + SPOFF + 72]; \ + ldx [SBP + (10*8)], TMP; \ + stx TMP, [SPP + SPOFF + 80]; \ + ldx [SBP + (11*8)], TMP; \ + stx TMP, [SPP + SPOFF + 88]; \ + ldx [SBP + (12*8)], TMP; \ + stx TMP, [SPP + SPOFF + 96]; \ + ldx [SBP + (13*8)], TMP; \ + stx TMP, [SPP + SPOFF + 104]; \ + ldx [SBP + (14*8)], TMP; \ + stx TMP, [SPP + SPOFF + 112]; \ + ldx [SBP + (15*8)], TMP; \ + stx TMP, [SPP + SPOFF + 120]; - stx %o0, [%sp + SPOFF + CCFSZ + TF_TYPE] - stx %o1, [%sp + SPOFF + CCFSZ + TF_LEVEL] - stx %o3, [%sp + SPOFF + CCFSZ + TF_TAR] - stx %o4, [%sp + SPOFF + CCFSZ + TF_SFAR] - stx %o5, [%sp + SPOFF + CCFSZ + TF_SFSR] - stx %l0, [%sp + SPOFF + CCFSZ + TF_TSTATE] - stx %l1, [%sp + SPOFF + CCFSZ + TF_TPC] - stx %l2, [%sp + SPOFF + CCFSZ + TF_TNPC] - stx %l3, [%sp + SPOFF + CCFSZ + TF_Y] - stx %l4, [%sp + SPOFF + CCFSZ + TF_FPRS] - stx %l5, [%sp + SPOFF + CCFSZ + TF_WSTATE] +#define fill_64bit_rtt(asi_num) \ + wr %g0, asi_num, %asi ;\ + rdpr %cwp, %g1 ;\ + sub %g1, 1, %g1 ;\ + wrpr %g1, %cwp ;\ + ldxa [%sp + SPOFF + 0]%asi, %l0 ;\ + ldxa [%sp + SPOFF + 8]%asi, %l1 ;\ + ldxa [%sp + SPOFF + 16]%asi, %l2 ;\ + ldxa [%sp + SPOFF + 24]%asi, %l3 ;\ + ldxa [%sp + SPOFF + 32]%asi, %l4 ;\ + ldxa [%sp + SPOFF + 40]%asi, %l5 ;\ + ldxa [%sp + SPOFF + 48]%asi, %l6 ;\ + ldxa [%sp + SPOFF + 56]%asi, %l7 ;\ + ldxa [%sp + SPOFF + 64]%asi, %i0 ;\ + ldxa [%sp + SPOFF + 72]%asi, %i1 ;\ + ldxa [%sp + SPOFF + 80]%asi, %i2 ;\ + ldxa [%sp + SPOFF + 88]%asi, %i3 ;\ + ldxa [%sp + SPOFF + 96]%asi, %i4 ;\ + ldxa [%sp + SPOFF + 104]%asi, %i5 ;\ + ldxa [%sp + SPOFF + 112]%asi, %i6 ;\ + ldxa [%sp + SPOFF + 120]%asi, %i7 ;\ + restored ;\ + add %g1, 1, %g1 ;\ + wrpr %g1, %cwp - wr %g0, FPRS_FEF, %fprs - stx %fsr, [%sp + SPOFF + CCFSZ + TF_FSR] - rd %gsr, %l6 - stx %l6, [%sp + SPOFF + CCFSZ + TF_GSR] - wr %g0, 0, %fprs + - mov PCB_REG, %l0 - mov PCPU_REG, %l1 - wrpr %g0, PSTATE_NORMAL, %pstate +ENTRY(ktl0) + SAVE_GLOBALS(%l7) + SAVE_OUTS(%l7) ! for the call bug workaround + wrpr %g0, PSTATE_KERNEL, %pstate ! enable ints +! MAGIC_TRAP_OFF + call critical_enter + nop + jmpl %l3, %o7 ! call trap handler + mov %l7, %o0 + call critical_exit + nop +! MAGIC_TRAP_ON +ENTRY(krtt) + GET_PCPU_SCRATCH +common_rtt: + ! + ! restore globals and outs + ! + rdpr %pstate, %l1 + wrpr %l1, PSTATE_IE, %pstate + RESTORE_GLOBALS(%l7) + ! switch to global set 1 + wrpr %g0, 1, %gl + RESTORE_OUTS(%l7) +#ifdef notyet + ! + ! set %pil from max(old pil, cur_thread_spl) + ! + ldn [%l0 + T_CPU], %l0 + ld [%l0 + CPU_BASE_SPL], %l0 + cmp %l6, %l0 + movg %xcc, %l6, %l0 + wrpr %g0, %l0, %pil +#endif + ! + ! raise tl + ! setup trap regs + ! restore to window we originally trapped in + ! + wrpr %g0, 1, %tl + ldx [%l7 + TF_TPC], %g1 + ldx [%l7 + TF_TNPC], %g2 + ldx [%l7 + TF_TSTATE], %l0 + andn %l0, TSTATE_CWP_MASK, %g4 + wrpr %g1, %tpc + wrpr %g2, %tnpc + rdpr %canrestore, %g1 + brnz %g1, 3f + nop ! can use restore directly + rdpr %cwp, %g1 + wrpr %g1, %g4, %tstate ! needed by wbuf recovery code - stx PCB_REG, [%sp + SPOFF + CCFSZ + TF_G6] - stx %g7, [%sp + SPOFF + CCFSZ + TF_G7] + ! avoid going above TL2 + fill_64bit_rtt(ASI_N) - mov %l0, PCB_REG - mov %l1, PCPU_REG - wrpr %g0, PSTATE_KERNEL, %pstate +3: + restore + ! + ! set %tstate to the correct %cwp + ! + rdpr %cwp, %g1 + wrpr %g1, %g4, %tstate + retry +END(krtt) +END(ktl0) + + ! temporaries: %g3-%g5 + ! + ! +ENTRY(tl0_ktrap) + set ktl0, %g4 + save %sp, -(CCFSZ + TF_SIZEOF), %sp - stx %i0, [%sp + SPOFF + CCFSZ + TF_O0] - stx %i1, [%sp + SPOFF + CCFSZ + TF_O1] - stx %i2, [%sp + SPOFF + CCFSZ + TF_O2] - stx %i3, [%sp + SPOFF + CCFSZ + TF_O3] - stx %i4, [%sp + SPOFF + CCFSZ + TF_O4] - stx %i5, [%sp + SPOFF + CCFSZ + TF_O5] - stx %i6, [%sp + SPOFF + CCFSZ + TF_O6] - stx %i7, [%sp + SPOFF + CCFSZ + TF_O7] + mov %g2, %l3 ! set trap/interrupt for tl0 + + ! if the kwbuf is full we need to save to the stack now + ld [PCPU_REG + PC_KWBUF_FULL], %o0 + brz,pt %o0, 1f + nop + st %g0, [PCPU_REG + PC_KWBUF_FULL] + ldx [PCPU_REG + PC_KWBUF_SP], %o1 + add PCPU_REG, PC_KWBUF, %o0 + KWBUF64_TO_STACK(%o0, %o1, %o2) +1: + ba,a,pt %xcc, win_saved +END(tl0_ktrap) + - stx %g1, [%sp + SPOFF + CCFSZ + TF_G1] - stx %g2, [%sp + SPOFF + CCFSZ + TF_G2] - stx %g3, [%sp + SPOFF + CCFSZ + TF_G3] - stx %g4, [%sp + SPOFF + CCFSZ + TF_G4] - stx %g5, [%sp + SPOFF + CCFSZ + TF_G5] - - set tl0_ret - 8, %o7 - jmpl %o2, %g0 - add %sp, CCFSZ + SPOFF, %o0 -END(tl0_trap) - -/* - * void tl0_intr(u_int level, u_int mask) - */ + ! register convention: + ! %g1=level %g2=mask + ENTRY(tl0_intr) - GET_PCB(PCB_REG) + wrpr %g1, 0, %pil + wr %g2, 0, %clear_softint + SET(intr_handlers, %g5, %g4) + sllx %g1, IH_SHIFT, %g5 + ldx [%g4 + %g5], %g2 ! pointer to interrupt handler - rdpr %tstate, %l0 - rdpr %tpc, %l1 - rdpr %tnpc, %l2 - rd %y, %l3 - rd %fprs, %l4 - rdpr %wstate, %l5 + + + ! assumes %g3 - %g5 are free + ! %g1 == pil that we came in on + ! %g2 == interrupt handler + ! %g6 == PCB + ! %g7 == PCPU + ! %g3-%g5 temporaries +ENTRY(tl0_trap) + rdpr %tstate, %g3 + btst TSTATE_PRIV, %g3 + and %g3, TSTATE_CWP_MASK, %g4 + bnz,pn %xcc, tl0_ktrap + wrpr %g0, %g4, %cwp +ENTRY(tl0_utrap) + illtrap -#if KTR_COMPILE & KTR_INTR - CATR(KTR_INTR, - "tl0_intr: td=%p level=%#x pil=%#lx pc=%#lx npc=%#lx sp=%#lx" - , %g1, %g2, %g3, 7, 8, 9) - ldx [PCPU(CURTHREAD)], %g2 - stx %g2, [%g1 + KTR_PARM1] - stx %o0, [%g1 + KTR_PARM2] - rdpr %pil, %g2 - stx %g2, [%g1 + KTR_PARM3] - stx %l1, [%g1 + KTR_PARM4] - stx %l2, [%g1 + KTR_PARM5] - stx %i6, [%g1 + KTR_PARM6] -9: -#endif - - wrpr %o0, 0, %pil - wr %o1, 0, %clear_softint - -#if 0 - and %l5, WSTATE_NORMAL_MASK, %l5 - sllx %l5, WSTATE_OTHER_SHIFT, %l5 - wrpr %l5, WSTATE_KERNEL, %wstate -#endif - rdpr %canrestore, %l6 - wrpr %l6, 0, %otherwin - wrpr %g0, 0, %canrestore - - sub PCB_REG, SPOFF + CCFSZ + TF_SIZEOF, %sp - - stx %l0, [%sp + SPOFF + CCFSZ + TF_TSTATE] - stx %l1, [%sp + SPOFF + CCFSZ + TF_TPC] - stx %l2, [%sp + SPOFF + CCFSZ + TF_TNPC] - stx %l3, [%sp + SPOFF + CCFSZ + TF_Y] - stx %l4, [%sp + SPOFF + CCFSZ + TF_FPRS] - stx %l5, [%sp + SPOFF + CCFSZ + TF_WSTATE] - - wr %g0, FPRS_FEF, %fprs - stx %fsr, [%sp + SPOFF + CCFSZ + TF_FSR] - rd %gsr, %l6 - stx %l6, [%sp + SPOFF + CCFSZ + TF_GSR] - wr %g0, 0, %fprs - - mov %o0, %l3 - mov T_INTERRUPT, %o1 - - stx %o0, [%sp + SPOFF + CCFSZ + TF_LEVEL] - stx %o1, [%sp + SPOFF + CCFSZ + TF_TYPE] - - mov PCB_REG, %l0 - mov PCPU_REG, %l1 - wrpr %g0, PSTATE_NORMAL, %pstate - - stx %g1, [%sp + SPOFF + CCFSZ + TF_G1] - stx %g2, [%sp + SPOFF + CCFSZ + TF_G2] - stx %g3, [%sp + SPOFF + CCFSZ + TF_G3] - stx %g4, [%sp + SPOFF + CCFSZ + TF_G4] - stx %g5, [%sp + SPOFF + CCFSZ + TF_G5] - stx %g6, [%sp + SPOFF + CCFSZ + TF_G6] - stx %g7, [%sp + SPOFF + CCFSZ + TF_G7] - - mov %l0, PCB_REG - mov %l1, PCPU_REG - wrpr %g0, PSTATE_KERNEL, %pstate - - stx %i0, [%sp + SPOFF + CCFSZ + TF_O0] - stx %i1, [%sp + SPOFF + CCFSZ + TF_O1] - stx %i2, [%sp + SPOFF + CCFSZ + TF_O2] - stx %i3, [%sp + SPOFF + CCFSZ + TF_O3] - stx %i4, [%sp + SPOFF + CCFSZ + TF_O4] - stx %i5, [%sp + SPOFF + CCFSZ + TF_O5] - stx %i6, [%sp + SPOFF + CCFSZ + TF_O6] - stx %i7, [%sp + SPOFF + CCFSZ + TF_O7] - - /* %l3 contains PIL */ - SET(intrcnt, %l1, %l2) - prefetcha [%l2] ASI_N, 1 - SET(pil_countp, %l1, %l0) - sllx %l3, 1, %l1 - lduh [%l0 + %l1], %l0 - sllx %l0, 3, %l0 - add %l0, %l2, %l0 - ldx [%l0], %l1 - inc %l1 - stx %l1, [%l0] - - call critical_enter - nop - - lduw [PCPU(CNT) + V_INTR], %l0 - inc %l0 - stw %l0, [PCPU(CNT) + V_INTR] - - SET(intr_handlers, %l1, %l0) - sllx %l3, IH_SHIFT, %l1 - ldx [%l0 + %l1], %l1 - KASSERT(%l1, "tl0_intr: ih null") - call %l1 - add %sp, CCFSZ + SPOFF, %o0 - - call critical_exit - nop - - ba,a %xcc, tl0_ret - nop +win_saved: + ! + ! save trap state on stack + ! + add %sp, REGOFF + SPOFF, %l7 + rdpr %tpc, %l0 + rdpr %tnpc, %l1 + rdpr %tstate, %l2 + stx %l0, [%l7 + TF_TPC] + stx %l1, [%l7 + TF_TNPC] + stx %l2, [%l7 + TF_TSTATE] + ! + ! setup pil + ! + brlz,pt %g1, 1f + nop + wrpr %g0, %g1, %pil + + wrpr %g0, %g4, %tnpc + rdpr %cwp, %l0 + set TSTATE_KERNEL, %l1 + wrpr %l1, %l0, %tstate + done +END(tl0_utrap) +END(tl0_trap) END(tl0_intr) /* From owner-p4-projects@FreeBSD.ORG Fri Mar 3 12:19: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 047B616A423; Fri, 3 Mar 2006 12: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 ADFFA16A420 for ; Fri, 3 Mar 2006 12:19:50 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5458143D45 for ; Fri, 3 Mar 2006 12:19:50 +0000 (GMT) (envelope-from soc-bushman@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 k23CJn94029659 for ; Fri, 3 Mar 2006 12:19:50 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k23CJi5r029656 for perforce@freebsd.org; Fri, 3 Mar 2006 12:19:44 GMT (envelope-from soc-bushman@freebsd.org) Date: Fri, 3 Mar 2006 12:19:44 GMT Message-Id: <200603031219.k23CJi5r029656@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 92677 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 Mar 2006 12:19:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92677 Change 92677 by soc-bushman@soc-bushman_stinger on 2006/03/03 12:18:47 branches integrated to be up-to-date, bug in getaddrinfo.c is going to be fixed Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/include/Makefile#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/dlfcn.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/gssapi.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/include/gssapi/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/include/gssapi/gssapi.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/include/nl_types.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/printf.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/include/proc_service.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/resolv.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/rpc/auth.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/stdio.h#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/include/stdlib.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/Makefile#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/dlfcn.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getttyent.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/nlist.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/valloc.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/valloc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gmon/gmon.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#7 edit .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_net.3#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_net_ntop.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_net_pton.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_comp.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_debug.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_query.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/res_send.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/auth_des.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/auth_none.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/auth_unix.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/clnt_dg.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/clnt_raw.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/clnt_simple.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/clnt_vc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/getpublickey.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/key_call.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/mt_misc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/mt_misc.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/netconfig.5#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/rpc_com.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/rpc_generic.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/rpc_soc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/rpcb_clnt.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_auth.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_dg.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_generic.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_raw.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_run.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_simple.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/svc_vc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/Makefile.inc#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/fread.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/local.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/vfprintf.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/vfscanf.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_errno.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_float.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_hexdump.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_int.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_quote.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_str.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_time.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdio/xprintf_vis.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/Makefile.inc#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/a64l.3#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/a64l.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/calloc.c#3 delete .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/grantpt.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/l64a.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/stdlib/posix_memalign.3#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/Makefile.inc#6 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/abort2.2#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/aio_read.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/aio_write.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/kldnext.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/lio_listio.2#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_close.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_getattr.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_open.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_receive.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_send.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/mq_setattr.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/open.2#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/pipe.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/recv.2#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/rename.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/rmdir.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/sigaction.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/sigqueue.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/sigwaitinfo.2#2 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/stat.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/statfs.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/timer_create.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/timer_settime.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/undelete.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/utimes.2#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/sys/wait.2#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/Makefile#7 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/adduser/adduser.sh#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/arp/arp.4#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/arp/arp.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/audit/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/auditd/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/auditreduce/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/bthidcontrol/sdp.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/bthidd/kbd.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/hccontrol/hccontrol.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/hccontrol/info.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/hccontrol/link_control.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/hccontrol/util.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/hcsecd/hcsecd.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/sdpd/scr.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/sdpd/sdpd.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/sdpd/server.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/sdpd/server.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/sdpd/srr.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bluetooth/sdpd/sur.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/btxld/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/btxld/btxld.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/Makefile#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/Makefile#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agent.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/Makefile.inc#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/group.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/hosts.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/passwd.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/agents/services.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.8#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cached.conf.5#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cachelib.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/cacheplcs.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/config.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/debug.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/hashtable.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/log.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_rs_query.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/mp_ws_query.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/parser.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/protocol.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/query.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/cached/singletons.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/startup/cached#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/config.5#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/config.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/config.y#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/configvers.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/lang.l#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/main.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/mkmakefile.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/config/mkoptions.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cron/crontab/crontab.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/crunch/crunchgen/crunchgen.1#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/crunch/crunchgen/crunchgen.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/crunch/crunchide/exec_elf32.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/inetd/Makefile#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/inetd/inetd.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/inetd/inetd.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/inetd/inetd.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/jail/jail.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kbdcontrol/kbdcontrol.1#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kbdmap/kbdmap.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef_amd64.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef_i386.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef_obj.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef_powerpc.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/kldxref/ef_sparc64.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/lmcconfig/lmcconfig.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/mergemaster/mergemaster.sh#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/mixer/mixer.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/mountd/exports.5#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/moused/moused.8#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/moused/moused.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/newsyslog/newsyslog.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/nfsd/nfsd.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/add.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/extract.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/perform.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/create/perform.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/create/pkg_create.1#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/create/pl.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/info.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/main.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/perform.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/pkg_info.1#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/info/show.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/lib/lib.h#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/lib/plist.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/lib/url.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pkg_install/version/perform.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmccontrol/pmccontrol.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat.c#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/pmcstat/pmcstat_log.c#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/phttpget/phttpget.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/portsnap/portsnap.8#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/portsnap/portsnap/portsnap.sh#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/powerd/Makefile#5 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/powerd/powerd.c#7 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/praudit/Makefile#1 branch .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/quot/quot.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/Makefile#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/anonFTP.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/config.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/devices.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/disks.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dispatch.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dist.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/dmenu.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/ftp.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/anonftp.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/distributions.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/fixit.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/html.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/options.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/partition.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/securelevel.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/shortcuts.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/slice.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/tcp.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/help/usermgmt.hlp#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/http.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/index.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/install.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/installUpgrade.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/keymap.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/label.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/main.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/media.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/menus.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/network.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/options.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/package.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/sysinstall.h#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/system.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/tcpip.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/user.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/sysinstall/wizard.c#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/syslogd/syslog.conf.5#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/traceroute6/traceroute6.8#3 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/Makefile#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#4 integrate .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/include/Makefile#5 (text+ko) ==== @@ -1,20 +1,20 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.252 2005/12/01 21:46:01 ru Exp $ +# $FreeBSD: src/include/Makefile,v 1.254 2005/12/29 14:40:19 dfr Exp $ # # Doing a "make install" builds /usr/include. CLEANFILES= osreldate.h version vers.c -SUBDIR= arpa protocols rpcsvc rpc +SUBDIR= arpa gssapi protocols rpcsvc rpc INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \ db.h \ dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ - fts.h ftw.h getopt.h glob.h grp.h \ + fts.h ftw.h getopt.h glob.h grp.h gssapi.h \ histedit.h ieeefp.h ifaddrs.h \ inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ locale.h malloc.h memory.h monetary.h mpool.h mqueue.h \ ndbm.h netconfig.h \ netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \ - proc_service.h pthread.h \ + printf.h proc_service.h pthread.h \ pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \ resolv.h runetype.h search.h setjmp.h sgtty.h \ signal.h stab.h \ ==== //depot/projects/soc2005/nsswitch_cached/src/include/dlfcn.h#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/include/dlfcn.h,v 1.19 2003/02/13 17:47:43 kan Exp $ + * $FreeBSD: src/include/dlfcn.h,v 1.20 2005/12/18 19:43:31 kan Exp $ */ #ifndef _DLFCN_H_ @@ -131,6 +131,8 @@ void (*_lock_release)(void *_lock), void (*_lock_destroy)(void *_lock), void (*_context_destroy)(void *_context)); +void *dlvsym(void * __restrict, const char * __restrict, + const char * __restrict); #endif /* __BSD_VISIBLE */ __END_DECLS ==== //depot/projects/soc2005/nsswitch_cached/src/include/nl_types.h#2 (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/soc2005/nsswitch_cached/src/include/proc_service.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/proc_service.h,v 1.3 2005/05/31 09:43:03 dfr Exp $ + * $FreeBSD: src/include/proc_service.h,v 1.4 2006/02/07 02:29:54 davidxu Exp $ */ #ifndef _PROC_SERVICE_H_ @@ -56,6 +56,7 @@ ps_err_e ps_lsetxmmregs (struct ps_prochandle *, lwpid_t, const char *); #endif ps_err_e ps_lstop(struct ps_prochandle *, lwpid_t); +ps_err_e ps_linfo(struct ps_prochandle *, lwpid_t, void *); ps_err_e ps_pcontinue(struct ps_prochandle *); ps_err_e ps_pdmodel(struct ps_prochandle *, int *); ps_err_e ps_pglobal_lookup(struct ps_prochandle *, const char *, const char *, ==== //depot/projects/soc2005/nsswitch_cached/src/include/resolv.h#3 (text+ko) ==== @@ -51,7 +51,7 @@ /* * @(#)resolv.h 8.1 (Berkeley) 6/2/93 * From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $ - * $FreeBSD: src/include/resolv.h,v 1.27 2005/09/12 15:53:28 stefanf Exp $ + * $FreeBSD: src/include/resolv.h,v 1.28 2006/02/24 17:00:50 ume Exp $ */ #ifndef _RESOLV_H_ @@ -92,7 +92,7 @@ #define LOCALDOMAINPARTS 2 /* min levels in name that is "local" */ #define RES_TIMEOUT 5 /* min. seconds between retries */ -#define RES_DFLRETRY 4 /* retries per each name server */ +#define RES_DFLRETRY 2 /* retries per each name server */ #define MAXRESOLVSORT 10 /* number of net to sort on */ #define RES_MAXNDOTS 15 /* should reflect bit field size */ #define RES_MAXRETRANS 30 /* only for resolv.conf/RES_OPTIONS */ ==== //depot/projects/soc2005/nsswitch_cached/src/include/rpc/auth.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * from: @(#)auth.h 1.17 88/02/08 SMI * from: @(#)auth.h 2.3 88/08/07 4.0 RPCSRC * from: @(#)auth.h 1.43 98/02/02 SMI - * $FreeBSD: src/include/rpc/auth.h,v 1.20 2003/01/01 18:48:42 schweikh Exp $ + * $FreeBSD: src/include/rpc/auth.h,v 1.21 2006/02/28 16:02:26 deischen Exp $ */ /* @@ -299,7 +299,7 @@ */ __BEGIN_DECLS extern int getpublickey (const char *, char *); -extern int getpublicandprivatekey (char *, char *); +extern int getpublicandprivatekey (const char *, char *); extern int getsecretkey (char *, char *, char *); __END_DECLS ==== //depot/projects/soc2005/nsswitch_cached/src/include/stdio.h#2 (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/soc2005/nsswitch_cached/src/include/stdlib.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.58 2005/09/12 15:58:15 stefanf Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.61 2006/01/12 07:58:59 jasone Exp $ */ #ifndef _STDLIB_H_ @@ -80,6 +80,7 @@ __BEGIN_DECLS void abort(void) __dead2; +void abort2(const char *, int, void **) __dead2; int abs(int) __pure2; int atexit(void (*)(void)); double atof(const char *); @@ -157,7 +158,7 @@ * research can be done. */ #if __POSIX_VISIBLE /* >= ??? */ -/* int posix_memalign(void **, size_t, size_t); (ADV) */ +int posix_memalign(void **, size_t, size_t); /* (ADV) */ int rand_r(unsigned *); /* (TSF) */ int setenv(const char *, const char *, int); void unsetenv(const char *); @@ -171,7 +172,7 @@ */ #if __XSI_VISIBLE /* XXX XSI requires pollution from here. We'd rather not. */ -/* long a64l(const char *); */ +long a64l(const char *); double drand48(void); /* char *ecvt(double, int, int * __restrict, int * __restrict); */ double erand48(unsigned short[3]); @@ -181,7 +182,7 @@ int grantpt(int); char *initstate(unsigned long /* XSI requires u_int */, char *, long); long jrand48(unsigned short[3]); -/* char *l64a(long); */ +char *l64a(long); void lcong48(unsigned short[7]); long lrand48(void); #ifndef _MKSTEMP_DECLARED @@ -257,6 +258,7 @@ getprogname(void); int heapsort(void *, size_t, size_t, int (*)(const void *, const void *)); +int l64a_r(long, char *, int); int mergesort(void *, size_t, size_t, int (*)(const void *, const void *)); void qsort_r(void *, size_t, size_t, void *, int (*)(void *, const void *, const void *)); ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.57 2005/08/06 16:53:54 phk Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.58 2005/12/29 04:10:52 grehan Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -32,9 +32,7 @@ .include "${.CURDIR}/compat-43/Makefile.inc" .include "${.CURDIR}/gdtoa/Makefile.inc" .include "${.CURDIR}/gen/Makefile.inc" -.if ${MACHINE_ARCH} != "powerpc" .include "${.CURDIR}/gmon/Makefile.inc" -.endif .include "${.CURDIR}/locale/Makefile.inc" .include "${.CURDIR}/net/Makefile.inc" .include "${.CURDIR}/nls/Makefile.inc" ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/dlfcn.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.12 2004/03/05 08:10:17 markm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.13 2005/12/18 19:43:32 kan Exp $"); /* * Linkage to services provided by the dynamic linker. @@ -104,6 +104,15 @@ return NULL; } +#pragma weak dlvsym +void * +dlvsym(void * __restrict handle, const char * __restrict name, + const char * __restrict version) +{ + _rtld_error(sorry); + return NULL; +} + #pragma weak dlinfo int dlinfo(void * __restrict handle, int request, void * __restrict p) ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/getttyent.c#4 (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/soc2005/nsswitch_cached/src/lib/libc/gen/nlist.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/nlist.c,v 1.18 2003/02/27 13:40:00 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/nlist.c,v 1.19 2005/12/18 04:52:33 marcel Exp $"); #include "namespace.h" #include @@ -243,8 +243,8 @@ { struct nlist *p; Elf_Off symoff = 0, symstroff = 0; - Elf_Word symsize = 0, symstrsize = 0; - Elf_Sword cc, i; + Elf_Size symsize = 0, symstrsize = 0; + Elf_Ssize cc, i; int nent = -1; int errsave; Elf_Sym sbuf[1024]; @@ -252,7 +252,7 @@ Elf_Ehdr ehdr; char *strtab = NULL; Elf_Shdr *shdr = NULL; - Elf_Word shdr_size; + Elf_Size shdr_size; void *base; struct stat st; ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/valloc.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)valloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/valloc.3,v 1.10 2002/12/18 13:33:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/valloc.3,v 1.11 2006/01/12 09:29:38 jasone Exp $ .\" -.Dd June 4, 1993 +.Dd September 13, 2005 .Dt VALLOC 3 .Os .Sh NAME @@ -48,9 +48,9 @@ .Bf -symbolic The .Fn valloc -function is obsoleted by the current version of -.Xr malloc 3 , -which aligns page-sized and larger allocations. +function is obsoleted by +.Xr posix_memalign 3 , +which can be used to request page-aligned allocations. .Ef .Pp The @@ -59,23 +59,23 @@ allocates .Fa size bytes aligned on a page boundary. -It is implemented by calling -.Xr malloc 3 -with a slightly larger request, saving the true beginning of the block -allocated, and returning a properly aligned pointer. .Sh RETURN VALUES The .Fn valloc function returns a pointer to the allocated space if successful; otherwise -a null pointer is returned +a null pointer is returned. +.Sh SEE ALSO +.Xr posix_memalign 3 .Sh HISTORY The .Fn valloc function appeared in .Bx 3.0 . -.Sh BUGS -A -.Fn vfree -function -has not been implemented. +.Pp +The +.Fn valloc +function correctly allocated memory that could be deallocated via +.Fn free +in +.Bx 7.0 . ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gen/valloc.c#3 (text+ko) ==== @@ -35,18 +35,18 @@ static char sccsid[] = "@(#)valloc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/valloc.c,v 1.3 2002/03/22 21:52:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/valloc.c,v 1.4 2006/01/12 09:29:38 jasone Exp $"); #include #include void * -valloc(i) - size_t i; +valloc(size_t i) { - long valsiz = getpagesize(), j; - void *cp = malloc(i + (valsiz-1)); + void *ret; + + if (posix_memalign(&ret, getpagesize(), i) != 0) + ret = NULL; - j = ((long)cp + (valsiz-1)) &~ (valsiz-1); - return ((void *)j); + return ret; } ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/gmon/gmon.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)gmon.c 8.1 (Berkeley) 6/4/93"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.20 2004/10/16 06:32:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.21 2005/12/29 04:09:38 grehan Exp $"); #include "namespace.h" #include @@ -53,7 +53,7 @@ #include "libc_private.h" -#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) || defined(__powerpc__) extern char *minbrk __asm (".minbrk"); #else extern char *minbrk __asm ("minbrk"); ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/include/libc_private.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.13 2005/09/12 13:46:31 stefanf Exp $ + * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.14 2006/01/12 07:28:20 jasone Exp $ * * Private definitions for libc, libc_r and libpthread. * @@ -130,10 +130,11 @@ extern const char *__progname; /* - * This is the lock to make malloc() thread-safe. It is externalized - * so that thread libraries can protect malloc across fork(). + * These functions are used by the threading libraries in order to protect + * malloc across fork(). */ -extern struct _spinlock *__malloc_lock; +void _malloc_prefork(void); +void _malloc_postfork(void); /* * Function to clean up streams, called from abort() and exit(). ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getaddrinfo.c#7 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.70 2005/07/22 18:21:28 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.72 2006/03/01 15:53:49 ume Exp $"); #include "namespace.h" #include @@ -1569,6 +1569,7 @@ } #endif + #ifdef NS_CACHING static int addrinfo_id_func(char *buffer, size_t *buffer_size, va_list ap, @@ -1585,8 +1586,12 @@ hostname = va_arg(ap, char *); hints = va_arg(ap, struct addrinfo *); - size = strlen(hostname); - desired_size = sizeof(int) + sizeof(int) * 4 + size + 1; + desired_size = sizeof(int) + sizeof(int) * 4; + if (hostname != NULL) { + size = strlen(hostname); + desired_soze += size + 1; + } else + size = 0; if (desired_size > *buffer_size) { *buffer_size = desired_size; @@ -1618,7 +1623,8 @@ memcpy(p, &ai_protocol, sizeof(int)); p += sizeof(int); - memcpy(p, hostname, size + 1); + if (hostname != NULL) + memcpy(p, hostname, size); *buffer_size = desired_size; return (NS_SUCCESS); @@ -2582,7 +2588,9 @@ HEADER *hp = (HEADER *)(void *)target->answer; /*XXX*/ u_int dots; int trailing_dot, ret, saved_herrno; - int got_nodata = 0, got_servfail = 0, tried_as_is = 0; + int got_nodata = 0, got_servfail = 0, root_on_list = 0; + int tried_as_is = 0; + int searched = 0; char abuf[MAXDNAME]; if ((_res.options & RES_INIT) == 0 && res_init() == -1) { @@ -2606,14 +2614,26 @@ return (res_queryN(cp, target)); /* - * If there are dots in the name already, let's just give it a try - * 'as is'. The threshold can be set with the "ndots" option. + * If there are enough dots in the name, let's just give it a + * try 'as is'. The threshold can be set with the "ndots" option. + * Also, query 'as is', if there is a trailing dot in the name. */ saved_herrno = -1; - if (dots >= _res.ndots) { + if (dots >= _res.ndots || trailing_dot) { ret = res_querydomainN(name, NULL, target); - if (ret > 0) + if (ret > 0 || trailing_dot) return (ret); + if (errno == ECONNREFUSED) { + h_errno = TRY_AGAIN; + return (-1); + } + switch (h_errno) { + case NO_DATA: + case HOST_NOT_FOUND: + break; + default: + return (-1); + } saved_herrno = h_errno; tried_as_is++; } @@ -2631,6 +2651,14 @@ for (domain = (const char * const *)_res.dnsrch; *domain && !done; domain++) { + searched = 1; + + if (domain[0][0] == '\0' || + (domain[0][0] == '.' && domain[0][1] == '\0')) + root_on_list++; + + if (root_on_list && tried_as_is) + continue; ret = res_querydomainN(name, *domain, target); if (ret > 0) @@ -2681,12 +2709,20 @@ } } + switch (h_errno) { + case NO_DATA: + case HOST_NOT_FOUND: + break; + default: + goto giveup; + } + /* - * if we have not already tried the name "as is", do that now. - * note that we do this regardless of how many dots were in the - * name or whether it ends with a dot. + * If the query has not already been tried as is then try it + * unless RES_NOTLDQUERY is set and there were no dots. */ - if (!tried_as_is && (dots || !(_res.options & RES_NOTLDQUERY))) { + if ((dots || !searched || !(_res.options & RES_NOTLDQUERY)) && + !(tried_as_is || root_on_list)) { ret = res_querydomainN(name, NULL, target); if (ret > 0) return (ret); @@ -2700,6 +2736,7 @@ * else send back meaningless h_errno, that being the one from * the last DNSRCH we did. */ +giveup: if (saved_herrno != -1) h_errno = saved_herrno; else if (got_nodata) ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/inet_net.3#3 (text+ko) ==== @@ -34,9 +34,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/inet_net.3,v 1.2 2002/12/19 09:40:22 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/inet_net.3,v 1.3 2006/02/26 05:44:21 ume Exp $ .\" -.Dd June 18, 1997 +.Dd February 26, 2006 .Dt INET_NET 3 .Os .Sh NAME @@ -88,10 +88,12 @@ .Er ENOENT if the Internet network number was not valid). .Pp -The only value for +The currently supported values for .Fa af -currently supported is -.Dv AF_INET . +are +.Dv AF_INET +and +.Dv AF_INET6 . The .Fa size argument @@ -149,6 +151,10 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 3 20:28: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 1426B16A424; Fri, 3 Mar 2006 20:28: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 C3DE316A420 for ; Fri, 3 Mar 2006 20:28: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 58BC743D48 for ; Fri, 3 Mar 2006 20:28: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 k23KS6MS066002 for ; Fri, 3 Mar 2006 20:28: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 k23KS6Uk065999 for perforce@freebsd.org; Fri, 3 Mar 2006 20:28:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Mar 2006 20:28:06 GMT Message-Id: <200603032028.k23KS6Uk065999@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 92688 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 Mar 2006 20:28:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=92688 Change 92688 by rwatson@rwatson_zoo on 2006/03/03 20:27:35 Integrate OpenBSM 1.0a5 parts into TrustedBSD audit3 branch: - autoconf/automake. - Support for systems without LOG_SECURITY. - Push more private data structures into audit_internal.h. - Build on Linux, Darwin. - Don't expose internals of in6_addr. - Don't expose au_to_socket() (et al) in user space. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#10 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile#4 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/aclocal.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/autogen.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#5 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile#3 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile#3 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile#4 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile#4 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile#6 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/queue.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.guess#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.sub#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/depcomp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/install-sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/missing#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile#7 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#7 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile#5 delete .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#1 branch Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#10 (text+ko) ==== @@ -25,26 +25,34 @@ Building -OpenBSM is currently built using a series of BSD make files which should -work on both FreeBSD and Darwin. One known issue is that versions of -Darwin prior to 10.3.8 have a nested include of "sys/audit.h" from -"sys/proc.h", which can result in type definition conflicts. If running -with include files from an earlier version of Darwin, the nested include -must be manually removed in order that libbsm can be built, due to -potentially conflicting types resulting from an include of "sys/sysctl.h" -by that file. On Darwin, the use of BSD make must be specified explicitly -by using "bsdmake" rather than "make", which on Darwin refers to GNU make. -Typical invocations from the OpenBSM tree root: +OpenBSM is currently built using autoconf and automake, which should allow +for building on a range of operating systems, including FreeBSD, Mac OS X, +and Linux. Depending on the availability of audit facailities in the +underlying operating system, some components that depend on kernel audit +support are built conditionally. Typically, build will be performed using + + ./configure + make + +To install, use: -FreeBSD + make install - % make - # make install +You may wish to specify that the OpenBSM components not be installed in the +base system, rather in a specific directory. This may be done using the +--prefix argument to configure. If installing to a specific directory, +remember to update your library path so that running tools from that +directory the correct libbsm is used: -Darwin + ./configure --prefix=/home/rwatson/openbsm + make + make install + LD_LIBRARY_PATH=/home/rwatson/openbsm/libbsm ; export LD_LIBRARY_PATH - % bsdmake - # bsdmake install +You will need to manually propagate openbsm/etc/* into /etc on your system; +this is not done automatically so as to avoid disrupting the current +configuration. Currently, the locations of these files is not +configurable. Credits @@ -65,6 +73,7 @@ Christian Brueffer Olivier Houchard Christian Peron + Martin Fong 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 @@ -86,4 +95,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#9 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#10 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#6 (text+ko) ==== @@ -8,5 +8,10 @@ - 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. +- With the move to autoconf/automake, man page symlinks are no longer + installed. This needs to be fixed. +- It might be desirable to be able to provide EOPNOTSUPP system call stubs + on systems that don't have the necessary audit system calls; that would + allow the full libbsm and tool set to build, just not run. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#5 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#6 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#5 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/audit.c#6 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#3 (text+ko) ==== @@ -30,12 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#2 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/audit_warn.c#3 $ */ #include + +#include +#include #include -#include #include "auditd.h" ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/auditd.c#7 $ */ #include @@ -795,7 +795,11 @@ } } +#ifdef LOG_SECURITY openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); +#else + openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); +#endif syslog(LOG_INFO, "starting...\n"); if (debug == 0 && daemon(0, 0) == -1) { ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#9 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#9 $ */ #ifndef _BSM_AUDIT_H @@ -240,25 +240,11 @@ }; 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; -}; +/* + * Contents of token_t are opaque outside of libbsm. + */ typedef struct au_token token_t; -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. */ @@ -310,6 +296,9 @@ }; typedef struct au_evclass_map au_evclass_map_t; +/* + * Audit system calls. + */ #if !defined(_KERNEL) && !defined(KERNEL) int audit(const void *, int); int auditon(int, void *, int); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#7 (text+ko) ==== @@ -34,11 +34,15 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#7 $ */ -#ifndef _LIBBSM_INTERNAL_H -#define _LIBBSM_INTERNAL_H +#ifndef _AUDIT_INTERNAL_H +#define _AUDIT_INTERNAL_H + +#if defined(__linux__) && !defined(__unused) +#define __unused +#endif /* * audit_internal.h contains private interfaces that are shared by user space @@ -47,7 +51,23 @@ * broken with future releases of OpenBSM, which may delete, modify, or * otherwise break these interfaces or the assumptions they rely on. */ +struct au_token { + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; +}; + +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; + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. @@ -96,4 +116,4 @@ #define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size) -#endif /* !_LIBBSM_INTERNAL_H_ */ +#endif /* !_AUDIT_INTERNAL_H_ */ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#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/audit3/contrib/openbsm/bsm/libbsm.h#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#8 $ */ #ifndef _LIBBSM_H_ @@ -42,9 +42,9 @@ #include #include -#include #include /* Required for audit.h. */ +#include /* Required for clock_t on Linux. */ #include #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#4 (text+ko) ==== @@ -25,18 +25,13 @@ * SUCH DAMAGE. * * Derived from FreeBSD src/sys/sys/endian.h:1.6. - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#3 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#4 $ */ #ifndef _COMPAT_ENDIAN_H_ #define _COMPAT_ENDIAN_H_ /* - * Pick up value of BYTE_ORDER/_BYTE_ORDER if not yet included. - */ -#include - -/* * Some systems will have the uint/int types defined here already, others * will need stdint.h. */ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#8 (text+ko) ==== @@ -30,11 +30,21 @@ * 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_audit.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#8 $ */ #include + +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_FULL_QUEUE_H #include +#else +#include +#endif +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ #include #include @@ -256,11 +266,13 @@ pthread_mutex_unlock(&mutex); } +#ifdef HAVE_AUDIT_SYSCALLS /* * Add the header token, identify any missing tokens. Write out the tokens to * the record memory and finally, call audit. */ -int au_close(int d, int keep, short event) +int +au_close(int d, int keep, short event) { au_record_t *rec; size_t tot_rec_size; @@ -308,6 +320,7 @@ au_teardown(rec); return (retval); } +#endif /* HAVE_AUDIT_SYSCALLS */ /* * au_close(), except onto an in-memory buffer. Buffer size as an argument, ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#10 (text+ko) ==== @@ -31,15 +31,37 @@ * 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_io.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#10 $ */ #include -#ifdef __APPLE__ + +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_SYS_ENDIAN_H +#include +#else /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_MACHINE_ENDIAN_H +#include +#else /* !HAVE_MACHINE_ENDIAN_H */ +#ifdef HAVE_ENDIAN_H +#include +#else /* !HAVE_ENDIAN_H */ +#error "No supported endian.h" +#endif /* !HAVE_ENDIAN_H */ +#endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#else /* !__APPLE__ */ +#endif /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ +#else /* !HAVE_CONFIG_H */ #include -#endif /* __APPLE__*/ +#include +#endif /* !HAVE_CONFIG_H */ + #include #include @@ -381,10 +403,7 @@ break; case AU_IPv6: - ipv6.__u6_addr.__u6_addr32[0] = ipaddr[0]; - ipv6.__u6_addr.__u6_addr32[1] = ipaddr[1]; - ipv6.__u6_addr.__u6_addr32[2] = ipaddr[2]; - ipv6.__u6_addr.__u6_addr32[3] = ipaddr[3]; + bcopy(ipaddr, &ipv6, sizeof(ipv6)); fprintf(fp, "%s", inet_ntop(AF_INET6, &ipv6, dst, INET6_ADDRSTRLEN)); break; ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#8 (text+ko) ==== @@ -27,11 +27,21 @@ * 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_mask.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#8 $ */ #include + +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_FULL_QUEUE_H #include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#7 (text+ko) ==== @@ -26,18 +26,39 @@ * 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_notify.c#6 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#7 $ */ /* * Based on sample code from Marc Majka. */ -#include /* strerror() */ -#include /* errno */ +#include + +#ifdef HAVE_CONFIG_H + +#include + +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ + +#else /* !HAVE_CONFIG_H */ + +#include + +#endif /* !HAVE_CONFIG_H */ + +#include #include -#include /* uint32_t */ -#include /* syslog() */ -#include /* syslog() */ + +#include +#include +#include +#include +#include + #ifdef __APPLE__ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#10 (text+ko) ==== @@ -30,15 +30,37 @@ * 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_token.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#10 $ */ #include -#ifdef __APPLE__ + +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_SYS_ENDIAN_H +#include +#else /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_MACHINE_ENDIAN_H +#include +#else /* !HAVE_MACHINE_ENDIAN_H */ +#ifdef HAVE_ENDIAN_H +#include +#else /* !HAVE_ENDIAN_H */ +#error "No supported endian.h" +#endif /* !HAVE_ENDIAN_H */ +#endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#else /* !__APPLE__ */ +#endif /* !HAVE_SYS_ENDIANG_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ +#else /* !HAVE_CONFIG_H */ #include -#endif /* __APPLE__*/ +#include +#endif /* !HAVE_CONFIG_H */ + #include #include #include @@ -352,10 +374,7 @@ ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, internet_addr, sizeof(*internet_addr)); return (t); } @@ -448,9 +467,18 @@ ADD_U_INT16(dptr, perm->mode); ADD_U_INT16(dptr, pad0); + +#ifdef HAVE_IPC_PERM___SEQ + ADD_U_INT16(dptr, perm->__seq); +#else ADD_U_INT16(dptr, perm->seq); +#endif +#ifdef HAVE_IPC_PERM___KEY + ADD_U_INT32(dptr, perm->__key); +#else ADD_U_INT32(dptr, perm->key); +#endif return (t); } @@ -781,50 +809,6 @@ /* * token ID 1 byte - * socket type 2 bytes - * local port 2 bytes - * local Internet address 4 bytes - * remote port 2 bytes - * remote Internet address 4 bytes - */ -token_t * -au_to_socket(struct socket *so) -{ - - errno = ENOTSUP; - return (NULL); -} - -/* - * token ID 1 byte - * socket type 2 bytes - * local port 2 bytes - * address type/length 4 bytes - * local Internet address 4 bytes/16 bytes (IPv4/IPv6 address) - * remote port 4 bytes - * address type/length 4 bytes - * remote Internet address 4 bytes/16 bytes (IPv4/IPv6 address) - */ -token_t * -au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, struct sockaddr *la, - struct sockaddr *ra) -{ - - errno = ENOTSUP; - return (NULL); -} - -token_t * -au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, struct sockaddr *la, - struct sockaddr *ra) -{ - - errno = ENOTSUP; - return (NULL); -} - -/* - * token ID 1 byte * socket family 2 bytes * path 104 bytes */ @@ -898,10 +882,7 @@ ADD_U_CHAR(dptr, so->sin6_family); ADD_U_INT16(dptr, so->sin6_port); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, &so->sin6_addr, sizeof(so->sin6_addr)); return (t); @@ -1031,7 +1012,7 @@ tid)); } -#if !defined(_KERNEL) && !defined(KERNEL) +#if !defined(_KERNEL) && !defined(KERNEL) && defined(HAVE_AUDIT_SYSCALLS) /* * Collects audit information for the current process * and creates a subject token from it ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.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_user.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#8 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.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/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#9 $ */ #ifdef __APPLE__ @@ -35,6 +35,11 @@ #include #include + +#ifdef __APPLE__ +#include /* Our bsm/audit.h doesn't include queue.h. */ +#endif + #include #include @@ -56,7 +61,11 @@ if (p == NULL) return (kAUBadParamErr); +#ifdef NODEV *p = NODEV; +#else + *p = -1; +#endif /* for /usr/bin/login, try fstat() first */ if (fstat(STDIN_FILENO, &st) != 0) { @@ -78,6 +87,8 @@ int audit_set_terminal_host(uint32_t *m) { + +#ifdef KERN_HOSTID int name[2] = { CTL_KERN, KERN_HOSTID }; size_t len; @@ -90,6 +101,10 @@ return (kAUSysctlErr); } return (kAUNoErr); +#else + *m = -1; + return (kAUNoErr); +#endif } int From owner-p4-projects@FreeBSD.ORG Fri Mar 3 21:51: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 6100116A423; Fri, 3 Mar 2006 21:51: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 1DD6516A420 for ; Fri, 3 Mar 2006 21:51: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 CCF3043D46 for ; Fri, 3 Mar 2006 21:51: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 k23LpodG077491 for ; Fri, 3 Mar 2006 21:51: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 k23LpnOm077486 for perforce@freebsd.org; Fri, 3 Mar 2006 21:51:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Mar 2006 21:51:49 GMT Message-Id: <200603032151.k23LpnOm077486@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 92694 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 Mar 2006 21:51:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92694 Change 92694 by rwatson@rwatson_zoo on 2006/03/03 21:51:17 Assume that config.h will be present; don't attempt to provide FreeBSD default includes when HAVE_CONFIG_H isn't defined. While we can do the includes without config.h, the conditionally compiled system call code works best with a config.h, so we'll want to provide a configured config.h in the FreeBSD vendor import, similar to the approach taken in OpenSSH. This mildly de-obfuscates the includes here also. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#13 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#42 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 (text+ko) ==== @@ -30,21 +30,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/libbsm/bsm_audit.c#21 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_FULL_QUEUE_H #include #else #include #endif -#else /* !HAVE_CONFIG_H */ -#include -#endif /* !HAVE_CONFIG_H */ #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 (text+ko) ==== @@ -31,12 +31,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/libbsm/bsm_io.c#33 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_SYS_ENDIAN_H #include @@ -57,10 +56,6 @@ #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#include -#endif /* !HAVE_CONFIG_H */ #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#13 (text+ko) ==== @@ -27,21 +27,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/libbsm/bsm_mask.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#13 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 (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_notify.c#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 $ */ /* @@ -34,22 +34,13 @@ */ #include -#ifdef HAVE_CONFIG_H - #include - #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ - -#include - -#endif /* !HAVE_CONFIG_H */ - #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#42 (text+ko) ==== @@ -30,12 +30,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/libbsm/bsm_token.c#41 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#42 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_SYS_ENDIAN_H #include @@ -56,10 +55,6 @@ #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#include -#endif /* !HAVE_CONFIG_H */ #include #include From owner-p4-projects@FreeBSD.ORG Fri Mar 3 21:55: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 E513516A423; Fri, 3 Mar 2006 21:55: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 B02EC16A420 for ; Fri, 3 Mar 2006 21:55: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 6ABE243D46 for ; Fri, 3 Mar 2006 21:55:56 +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 k23LtuIM077681 for ; Fri, 3 Mar 2006 21:55:56 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 k23LtuIK077677 for perforce@freebsd.org; Fri, 3 Mar 2006 21:55:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Mar 2006 21:55:56 GMT Message-Id: <200603032155.k23LtuIK077677@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 92695 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 Mar 2006 21:55:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=92695 Change 92695 by rwatson@rwatson_zoo on 2006/03/03 21:55:14 Integrate OpenBSM change: do rely on presence of config.h. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#11 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#9 (text+ko) ==== @@ -30,21 +30,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/libbsm/bsm_audit.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#9 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_FULL_QUEUE_H #include #else #include #endif -#else /* !HAVE_CONFIG_H */ -#include -#endif /* !HAVE_CONFIG_H */ #include #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#11 (text+ko) ==== @@ -31,12 +31,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/libbsm/bsm_io.c#10 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#11 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_SYS_ENDIAN_H #include @@ -57,10 +56,6 @@ #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#include -#endif /* !HAVE_CONFIG_H */ #include #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#9 (text+ko) ==== @@ -27,21 +27,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/libbsm/bsm_mask.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#9 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.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/audit3/contrib/openbsm/libbsm/bsm_notify.c#7 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#8 $ */ /* @@ -34,22 +34,13 @@ */ #include -#ifdef HAVE_CONFIG_H - #include - #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ - -#include - -#endif /* !HAVE_CONFIG_H */ - #include #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#11 (text+ko) ==== @@ -30,12 +30,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/libbsm/bsm_token.c#10 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#11 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_SYS_ENDIAN_H #include @@ -56,10 +55,6 @@ #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#include -#endif /* !HAVE_CONFIG_H */ #include #include From owner-p4-projects@FreeBSD.ORG Fri Mar 3 21:55: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 343E116A46F; Fri, 3 Mar 2006 21:55: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 7363316A44A for ; Fri, 3 Mar 2006 21:55: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 B8A7B43D46 for ; Fri, 3 Mar 2006 21:55:56 +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 k23Ltuws077687 for ; Fri, 3 Mar 2006 21:55:56 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 k23Ltufb077684 for perforce@freebsd.org; Fri, 3 Mar 2006 21:55:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Mar 2006 21:55:56 GMT Message-Id: <200603032155.k23Ltufb077684@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 92696 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 Mar 2006 21:55:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=92696 Change 92696 by rwatson@rwatson_zoo on 2006/03/03 21:55:51 Provide a config.h for FreeBSD. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Mar 3 22:04: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 56E3016A423; Fri, 3 Mar 2006 22:04: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 165FB16A420 for ; Fri, 3 Mar 2006 22:04: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 4D20043D62 for ; Fri, 3 Mar 2006 22:04:07 +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 k23M47CE078138 for ; Fri, 3 Mar 2006 22:04:07 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 k23M46Ui078135 for perforce@freebsd.org; Fri, 3 Mar 2006 22:04:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Mar 2006 22:04:06 GMT Message-Id: <200603032204.k23M46Ui078135@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 92697 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 Mar 2006 22:04:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=92697 Change 92697 by rwatson@rwatson_zoo on 2006/03/03 22:03:23 Update FreeBSD integration notes for post-autoconf world. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#2 (text) ==== @@ -1,7 +1,33 @@ Upgrade Instructions for OpenBSM -------------------------------- -Currently this is very straight forward: +OpenBSM integrates into the FreeBSD source tree in several places: + +src/contrib/openbsm The OpenBSM distribution itself +src/sys/bsm Modified versions of some bsm/ include files +src/sys/security/audit Kernel audit framework, some OpenBSM-based files +src/usr.sbin/*audit* Makefiles for various OpenBSM tools +src/etc/Makefile Installation of /etc OpenBSM files +src/lib/libbsm/* Build for OpenBSM library + +OpenBSM is normally built using an integrated autoconf/automake build +system. For the purposes of tight integration with FreeBSD, we use an +adapted BSD make (bmake) build system loosely based on the autmake +setup. We also rely on a static config.h generated when OpenBSM is +imported, rather than re-configuring every build. This leads to a +more reproduceable build environment, and avoids dependence on things +not in the base tree (i.e., autoconf, automake, GNU make, etc). An +upgrade of OpenBSM generally involves the following steps: + +- Vendor import of OpenBSM into src/contrib. +- Run configure, commit src/contrib/openbsm/config/config.h. +- Replication of src/contrib/openbsm/bsm changes into src/sys/bsm. +- Possible updates to src/sys/security/audit, especially relating to + bsm_token.c. +- Update any library, tool, or etc BSD Makefiles to add new files, + defines, or other generally useful or necessary things. + +Normally, the CVS vendor import goes along the following lines: cd ~/p4/projects/trustedbsd/openbsm cvs -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import src/contrib/openbsm \ @@ -10,10 +36,9 @@ Replacing the version string as required. Use the "-n" argument to CVS to do a test run. -Right now, no local FreeBSD modification or configuration is required. In -future OpenBSM versions, this is likely to change. - -After importing OpenBSM, make sure to propagate any changes to files that -appear in both contrib/openbsm/bsm and sys/bsm. +Propagation of changes to src/sys/{bsm,security/audit} is something that +requires careful coordination and attention to detail. These files are +not on CVS vendor branches, but do have the same local vs. vendor merge +issues. $FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.2 2006/02/06 00:03:39 rwatson Exp $ From owner-p4-projects@FreeBSD.ORG Fri Mar 3 22:07: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 CE96F16A441; Fri, 3 Mar 2006 22:07: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 A816216A43D for ; Fri, 3 Mar 2006 22:07:11 +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 698D543D46 for ; Fri, 3 Mar 2006 22:07:11 +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 k23M7BNn078345 for ; Fri, 3 Mar 2006 22:07:11 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k23M7Bt1078342 for perforce@freebsd.org; Fri, 3 Mar 2006 22:07:11 GMT (envelope-from jhb@freebsd.org) Date: Fri, 3 Mar 2006 22:07:11 GMT Message-Id: <200603032207.k23M7Bt1078342@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 92698 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 Mar 2006 22:07:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=92698 Change 92698 by jhb@jhb_twclab on 2006/03/03 22:06:31 Use the simple i8254 timecoutner method just like the lapic timer case on i386 since we don't get i8254 interrupts. G/C a lot of unused cruft. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/clock.c#19 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#19 (text+ko) ==== @@ -89,8 +89,6 @@ device_t clockdev; int clockinitted; -int tickfix; -int tickfixinterval; int adjkerntz; /* local offset from GMT in seconds */ int disable_rtc_set; /* disable resettodr() if != 0 */ int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ @@ -103,12 +101,6 @@ #define TIMER_FREQ 1193182 #endif u_int32_t timer_freq = TIMER_FREQ; -int timer0_max_count; - -static u_int32_t i8254_lastcount; -static u_int32_t i8254_offset; -static int i8254_ticked; -static int clkintr_pending = 0; extern int cycles_per_sec; extern int ncpus; @@ -128,7 +120,7 @@ static struct timecounter i8254_timecounter = { i8254_get_timecount, /* get_timecount */ 0, /* no poll_pps */ - ~0u, /* counter_mask */ + 0xffff, /* counter_mask */ 0, /* frequency */ "i8254" /* name */ }; @@ -142,22 +134,6 @@ /* static u_char timer0_state; */ static u_char timer2_state; -/* - * Algorithm for missed clock ticks from Linux/alpha. - */ - -/* - * Shift amount by which scaled_ticks_per_cycle is scaled. Shifting - * by 48 gives us 16 bits for HZ while keeping the accuracy good even - * for large CPU clock rates. - */ -#define FIX_SHIFT 48 - -static u_int64_t scaled_ticks_per_cycle; -static u_int32_t max_cycles_per_tick; -static u_int32_t last_time; - -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); @@ -206,7 +182,6 @@ freq, timer_freq); } set_timer_freq(timer_freq, hz); - i8254_timecounter.tc_frequency = timer_freq; out: #ifdef EVCNT_COUNTERS @@ -235,21 +210,12 @@ void cpu_initclocks() { - u_int32_t freq; if (clockdev == NULL) panic("cpu_initclocks: no clock attached"); tick = 1000000 / hz; /* number of microseconds between interrupts */ - tickfix = 1000000 - (hz * tick); - if (tickfix) { - int ftp; - ftp = min(ffs(tickfix), ffs(hz)); - tickfix >>= (ftp - 1); - tickfixinterval = hz >> (ftp - 1); - } - /* * Establish the clock interrupt; it's a special case. * @@ -262,24 +228,18 @@ * hardclock, which would then fall over because p->p_stats * isn't set at that time. */ - freq = cycles_per_sec; - last_time = alpha_rpcc(); - scaled_ticks_per_cycle = ((u_int64_t)hz << FIX_SHIFT) / freq; - max_cycles_per_tick = 2*freq / hz; /* * 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 (hwrpb->rpb_type != ST_DEC_21000) tc_init(&i8254_timecounter); - platform.clockintr = handleclock; - } else - platform.clockintr = hardclock; + platform.clockintr = hardclock; if (ncpus == 1) { - alpha_timecounter.tc_frequency = freq; + alpha_timecounter.tc_frequency = cycles_per_sec; tc_init(&alpha_timecounter); } @@ -375,7 +335,7 @@ if (count == 0) goto fail; if (count > prev_count) - tot_count += prev_count - (count - timer0_max_count); + tot_count += prev_count - (count - 0xffff); else tot_count += prev_count - count; prev_count = count; @@ -410,40 +370,16 @@ static void set_timer_freq(u_int freq, int intr_freq) { - int new_timer0_max_count; mtx_lock_spin(&clock_lock); timer_freq = freq; - new_timer0_max_count = TIMER_DIV(intr_freq); - if (new_timer0_max_count != timer0_max_count) { - timer0_max_count = new_timer0_max_count; - outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT); - outb(TIMER_CNTR0, timer0_max_count & 0xff); - outb(TIMER_CNTR0, timer0_max_count >> 8); - } + i8254_timecounter.tc_frequency = timer_freq; + outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT); + outb(TIMER_CNTR0, 0); + outb(TIMER_CNTR0, 0); mtx_unlock_spin(&clock_lock); } -static void -handleclock(int usermode, uintfptr_t pc) -{ - - 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(usermode, pc); -} - void cpu_startprofclock(void) { @@ -609,29 +545,8 @@ static unsigned i8254_get_timecount(struct timecounter *tc) { - u_int count; - u_int high, low; - mtx_lock_spin(&clock_lock); - - /* Select timer0 and latch counter value. */ - outb(TIMER_MODE, TIMER_SEL0 | TIMER_LATCH); - - low = inb(TIMER_CNTR0); - high = inb(TIMER_CNTR0); - count = timer0_max_count - ((high << 8) | low); - if (count < i8254_lastcount || - (!i8254_ticked && (clkintr_pending || - ((count < 20) && (inb(IO_ICU1) & 1))) - )) { - i8254_ticked = 1; - i8254_offset += timer0_max_count; - } - i8254_lastcount = count; - count += i8254_offset; - - mtx_unlock_spin(&clock_lock); - return (count); + return (0xffff - get_8254_ctr()); } static unsigned From owner-p4-projects@FreeBSD.ORG Fri Mar 3 22:39: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 C98C116A423; Fri, 3 Mar 2006 22:39: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 A2F4C16A420 for ; Fri, 3 Mar 2006 22:39: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 5984043D4C for ; Fri, 3 Mar 2006 22:39: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 k23MdqsP079645 for ; Fri, 3 Mar 2006 22:39: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 k23MdpZC079627 for perforce@freebsd.org; Fri, 3 Mar 2006 22:39:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Mar 2006 22:39:51 GMT Message-Id: <200603032239.k23MdpZC079627@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 92701 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 Mar 2006 22:39:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92701 Change 92701 by rwatson@rwatson_zoo on 2006/03/03 22:39:36 Integrate recent OpenBSM changes into src/sys/bsm and src/sys/security/audit. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#24 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#22 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#9 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#24 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#23 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#24 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.2 2006/02/01 19:54:22 rwatson Exp $ */ @@ -258,25 +258,11 @@ }; 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; -}; +/* + * Contents of token_t are opaque outside of libbsm. + */ typedef struct au_token token_t; -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. */ @@ -328,6 +314,9 @@ }; typedef struct au_evclass_map au_evclass_map_t; +/* + * Audit system calls. + */ #if !defined(_KERNEL) && !defined(KERNEL) int audit(const void *, int); int auditon(int, void *, int); ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#7 (text+ko) ==== @@ -34,11 +34,15 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#6 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#7 $ */ -#ifndef _LIBBSM_INTERNAL_H -#define _LIBBSM_INTERNAL_H +#ifndef _AUDIT_INTERNAL_H +#define _AUDIT_INTERNAL_H + +#if defined(__linux__) && !defined(__unused) +#define __unused +#endif /* * audit_internal.h contains private interfaces that are shared by user space @@ -47,7 +51,23 @@ * broken with future releases of OpenBSM, which may delete, modify, or * otherwise break these interfaces or the assumptions they rely on. */ +struct au_token { + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; +}; + +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; + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. @@ -96,4 +116,4 @@ #define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size) -#endif /* !_LIBBSM_INTERNAL_H_ */ +#endif /* !_AUDIT_INTERNAL_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#22 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#21 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#22 $ * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.5 2006/02/06 01:12:46 rwatson Exp $ */ ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#10 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#9 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#10 $ */ #ifndef _BSM_AUDIT_RECORD_H_ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#9 (text+ko) ==== @@ -30,15 +30,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/sys/security/audit/audit_bsm_token.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#9 $ */ #include -#ifdef __APPLE__ -#include -#else /* !__APPLE__ */ #include -#endif /* __APPLE__*/ #include #include @@ -326,10 +322,7 @@ ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, internet_addr, sizeof(*internet_addr)); return (t); } @@ -416,9 +409,18 @@ ADD_U_INT16(dptr, perm->mode); ADD_U_INT16(dptr, pad0); + +#ifdef HAVE_IPC_PERM___SEQ + ADD_U_INT16(dptr, perm->__seq); +#else ADD_U_INT16(dptr, perm->seq); +#endif +#ifdef HAVE_IPC_PERM___KEY + ADD_U_INT32(dptr, perm->__key); +#else ADD_U_INT32(dptr, perm->key); +#endif return (t); } @@ -864,10 +866,7 @@ ADD_U_CHAR(dptr, so->sin6_family); ADD_U_INT16(dptr, so->sin6_port); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, &so->sin6_addr, sizeof(so->sin6_addr)); return (t); @@ -991,7 +990,7 @@ tid)); } -#if !defined(_KERNEL) && !defined(KERNEL) +#if !defined(_KERNEL) && !defined(KERNEL) && defined(HAVE_AUDIT_SYSCALLS) /* * Collects audit information for the current process * and creates a subject token from it From owner-p4-projects@FreeBSD.ORG Sat Mar 4 02:21: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 362D116A423; Sat, 4 Mar 2006 02:21: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 4369716A420 for ; Sat, 4 Mar 2006 02:21:21 +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 DC87D43D45 for ; Sat, 4 Mar 2006 02:21:20 +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 k242LKf5097944 for ; Sat, 4 Mar 2006 02:21:20 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k242LKPB097941 for perforce@freebsd.org; Sat, 4 Mar 2006 02:21:20 GMT (envelope-from jhb@freebsd.org) Date: Sat, 4 Mar 2006 02:21:20 GMT Message-Id: <200603040221.k242LKPB097941@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 92707 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 Mar 2006 02:21:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=92707 Change 92707 by jhb@jhb_zion on 2006/03/04 02:20:50 Try to use the alpha cycle counter for a cpu ticker. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/clock.c#20 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#20 (text+ko) ==== @@ -152,6 +152,7 @@ calibrate_clocks(cycles_per_sec, &pcc, &freq); cycles_per_sec = pcc; + set_cputicker(alpha_rpcc, cycles_per_sec, 0); /* * XXX: TurboLaser doesn't have an i8254 counter. From owner-p4-projects@FreeBSD.ORG Sat Mar 4 03:02: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 BD2E816A423; Sat, 4 Mar 2006 03:02: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 6A56816A420 for ; Sat, 4 Mar 2006 03:02:12 +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 A0AD743D49 for ; Sat, 4 Mar 2006 03:02:10 +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 k2432Aq0099452 for ; Sat, 4 Mar 2006 03:02:10 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k24329EU099449 for perforce@freebsd.org; Sat, 4 Mar 2006 03:02:10 GMT (envelope-from jhb@freebsd.org) Date: Sat, 4 Mar 2006 03:02:10 GMT Message-Id: <200603040302.k24329EU099449@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 92708 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 Mar 2006 03:02:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=92708 Change 92708 by jhb@jhb_zion on 2006/03/04 03:01:26 Enable rpcc timecounter on SMP systems with only 1 CPU enabled. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/clock.c#21 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#21 (text+ko) ==== @@ -103,7 +103,6 @@ u_int32_t timer_freq = TIMER_FREQ; extern int cycles_per_sec; -extern int ncpus; static timecounter_get_t i8254_get_timecount; static timecounter_get_t alpha_get_timecount; @@ -239,7 +238,7 @@ tc_init(&i8254_timecounter); platform.clockintr = hardclock; - if (ncpus == 1) { + if (mp_ncpus == 1) { alpha_timecounter.tc_frequency = cycles_per_sec; tc_init(&alpha_timecounter); } From owner-p4-projects@FreeBSD.ORG Sat Mar 4 03:06: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 939F716A423; Sat, 4 Mar 2006 03:06: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 6AB0216A420 for ; Sat, 4 Mar 2006 03:06: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 2218C43D45 for ; Sat, 4 Mar 2006 03:06: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 k2436GrU099619 for ; Sat, 4 Mar 2006 03:06:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2436FwR099616 for perforce@freebsd.org; Sat, 4 Mar 2006 03:06:15 GMT (envelope-from jhb@freebsd.org) Date: Sat, 4 Mar 2006 03:06:15 GMT Message-Id: <200603040306.k2436FwR099616@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 92709 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 Mar 2006 03:06:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=92709 Change 92709 by jhb@jhb_zion on 2006/03/04 03:05:55 Compile. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/clock.c#22 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#22 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Mar 4 04:26: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 9B59616A423; Sat, 4 Mar 2006 04:26: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 3527516A420 for ; Sat, 4 Mar 2006 04:26:54 +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 EC58443D48 for ; Sat, 4 Mar 2006 04:26:53 +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 k244QrKD002634 for ; Sat, 4 Mar 2006 04:26:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k244Qrxh002631 for perforce@freebsd.org; Sat, 4 Mar 2006 04:26:53 GMT (envelope-from jhb@freebsd.org) Date: Sat, 4 Mar 2006 04:26:53 GMT Message-Id: <200603040426.k244Qrxh002631@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 92711 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 Mar 2006 04:26:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=92711 Change 92711 by jhb@jhb_twclab on 2006/03/04 04:26:09 Make my alpha happy with still using the timecounter (either i8254 or rpcc) for cpu_ticks. - Call tc_cpu_ticks() every tc_ticktock() to handle rollover in the timecounter if calcru() isn't called often enough. - Cast tc_counter_mask to uint64_t when updating base to handle the case where tc_counter_mask == ~0u (in which case the unsigned value of ~0u + 1 == 0, and thus base was not being changed on timecounter roll overs). With help from: phk Affected files ... .. //depot/projects/smpng/sys/kern/kern_tc.c#35 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_tc.c#35 (text+ko) ==== @@ -115,6 +115,7 @@ #undef TC_STATS +static uint64_t tc_cpu_ticks(void); static void tc_windup(void); static void cpu_tick_calibrate(int); @@ -759,6 +760,7 @@ return; count = 0; tc_windup(); + (void)tc_cpu_ticks(); if (time_uptime != last_calib && !(time_uptime & 0xf)) { cpu_tick_calibrate(0); last_calib = time_uptime; @@ -797,8 +799,7 @@ static int cpu_tick_variable; static uint64_t cpu_tick_frequency; -static -uint64_t +static uint64_t tc_cpu_ticks(void) { static uint64_t base; @@ -809,7 +810,7 @@ tc = timehands->th_counter; u = tc->tc_get_timecount(tc) & tc->tc_counter_mask; if (u < last) - base += tc->tc_counter_mask + 1; + base += (uint64_t)tc->tc_counter_mask + 1; last = u; return (u + base); } From owner-p4-projects@FreeBSD.ORG Sat Mar 4 08:44: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 1F90616A423; Sat, 4 Mar 2006 08:44: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 E212716A420 for ; Sat, 4 Mar 2006 08:44: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 9632543D45 for ; Sat, 4 Mar 2006 08:44: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 k248iPqd019250 for ; Sat, 4 Mar 2006 08:44:25 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k248iPiv019247 for perforce@freebsd.org; Sat, 4 Mar 2006 08:44:25 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 4 Mar 2006 08:44:25 GMT Message-Id: <200603040844.k248iPiv019247@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 92714 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 Mar 2006 08:44:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=92714 Change 92714 by kmacy@kmacy_storage:sun4v_work on 2006/03/04 08:43:25 re-define pmap to be hashtable backed for user-processes and TSBs to be per process. Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#9 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcb.h#5 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#13 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#6 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#1 add Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#7 (text+ko) ==== @@ -74,6 +74,7 @@ sun4v/sun4v/swtch.S standard sun4v/sun4v/tsb.c standard sun4v/sun4v/tte.c standard +sun4v/sun4v/tte_hash.c standard sun4v/sun4v/tick.c standard sun4v/sun4v/trap.c standard sun4v/sun4v/uio_machdep.c standard ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asi.h#9 (text+ko) ==== @@ -124,10 +124,10 @@ #define ASI_SCRATCHPAD_6_REG 0x30 #define ASI_SCRATCHPAD_7_REG 0x38 -/* MMFSA == 0 */ + +#define SCRATCH_REG_MMFSA ASI_SCRATCHPAD_0_REG #define SCRATCH_REG_PCPU ASI_SCRATCHPAD_1_REG -#define SCRATCH_REG_PCB ASI_SCRATCHPAD_2_REG -#define SCRATCH_REG_PTD ASI_SCRATCHPAD_3_REG +#define SCRATCH_REG_HASH ASI_SCRATCHPAD_2_REG #define MMU_CID_P 0x08 #define MMU_CID_S 0x10 ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#4 (text+ko) ==== @@ -135,13 +135,11 @@ mov SCRATCH_REG_PCPU, PCPU_REG; \ ldxa [%g0 + PCPU_REG]ASI_SCRATCHPAD, PCPU_REG; -#define GET_PTD_SCRATCH(reg) \ - mov SCRATCH_REG_PTD, reg; \ +#define GET_HASH_SCRATCH(reg) \ + mov SCRATCH_REG_HASH, reg; \ ldxa [%g0 + reg]ASI_SCRATCHPAD, reg; -#define SET_MMFSA_SCRATCH(reg) stxa reg, [%g0]ASI_SCRATCHPAD -#define SET_PCPU_SCRATCH stxa PCPU_REG, [%g0 + SCRATCH_REG_PCPU]ASI_SCRATCHPAD -#define SET_PTD_SCRATCH(reg) stxa reg, [%g0 + SCRATCH_REG_PTD]ASI_SCRATCHPAD +#define SET_HASH_SCRATCH(reg) stxa reg, [%g0 + SCRATCH_REG_HASH]ASI_SCRATCHPAD #define GET_PCB(reg) \ GET_PCPU_SCRATCH; \ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcb.h#5 (text+ko) ==== ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#6 (text+ko) ==== @@ -50,6 +50,7 @@ typedef struct pmap *pmap_t; struct pv_entry; +struct tte_hash; struct md_page { int pv_list_count; @@ -58,12 +59,12 @@ struct pmap { - struct mtx pm_mtx; - vm_paddr_t *pm_pdir; + struct mtx pm_mtx; + struct tte_hash *pm_hash; TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ - vm_object_t pm_tsb_obj; - cpumask_t pm_active; - uint16_t pm_context; + struct hv_tsb_info pm_tsb; + cpumask_t pm_active; + uint16_t pm_context; struct pmap_statistics pm_stats; }; @@ -106,6 +107,10 @@ void pmap_invalidate_page(pmap_t pmap, vm_offset_t va); void pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva); void pmap_invalidate_all(pmap_t pmap); +void pmap_scrub_pages(vm_paddr_t pa, int64_t size); + + + #define vtophys(va) pmap_kextract((vm_offset_t)(va)) extern struct pmap kernel_pmap_store; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tsb.h#7 (text+ko) ==== @@ -1,59 +1,8 @@ -/*- - * Copyright (c) 1997 Berkeley Software Design, Inc. 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. Berkeley Software Design Inc's name may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``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 BERKELEY SOFTWARE DESIGN INC 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. - * - * from: BSDI: pmap.v9.h,v 1.10.2.6 1999/08/23 22:18:44 cp Exp - * $FreeBSD: src/sys/sparc64/include/tsb.h,v 1.18 2003/04/08 06:35:08 jake Exp $ - */ - #ifndef _MACHINE_TSB_H_ #define _MACHINE_TSB_H_ #define MAX_TSB_INFO 2 -#define TSB_PAGES_SHIFT (4) -#define TSB_PAGES (1 << TSB_PAGES_SHIFT) -#define TSB_BSHIFT (TSB_PAGES_SHIFT + PAGE_SHIFT) -#define TSB_BSIZE (1UL << TSB_BSHIFT) -#define TSB_SIZE (TSB_BSIZE / sizeof(struct tte)) -#define TSB_BUCKET_SHIFT (2) -#define TSB_BUCKET_SIZE (1 << TSB_BUCKET_SHIFT) -#define TSB_BUCKET_ADDRESS_BITS \ - (TSB_BSHIFT - TSB_BUCKET_SHIFT - TTE_SHIFT) -#define TSB_BUCKET_MASK ((1 << TSB_BUCKET_ADDRESS_BITS) - 1) - - -#define TSB_ENTRY_SHIFT 4 /* each entry = 128 bits = 16 bytes */ -#define TSB_ENTRY_SIZE (1 << 4) -#define TSB_START_SIZE 9 -#define TSB_ENTRIES(tsbsz) (1 << (TSB_START_SIZE + tsbsz)) -#define TSB_BYTES(tsbsz) (TSB_ENTRIES(tsbsz) << TSB_ENTRY_SHIFT) -#define TSB_OFFSET_MASK(tsbsz) (TSB_ENTRIES(tsbsz) - 1) - - /* * Values for "tsb_ttesz_mask" bitmask. */ @@ -74,17 +23,19 @@ struct hv_tsb_info; -typedef uint64_t tte_t; + +void tsb_assert_invalid(struct hv_tsb_info *tsb, vm_offset_t va); -void tsb_assert_invalid(hv_tsb_info_t *tsb, vm_offset_t va); +void tsb_set_tte(struct hv_tsb_info *tsb, vm_offset_t va, tte_t tte_data, uint64_t ctx); -void tsb_set_tte(struct hv_tsb_info *tsb, vm_offset_t va, vm_paddr_t pa, uint64_t flags, uint64_t ctx); +tte_t tsb_get_tte(struct hv_tsb_info *tsb, vm_offset_t va); -tte_t tsb_get_tte(struct hv_tsb_info *tsb, vm_offset_t va, uint64_t ctx); +tte_t tsb_lookup_tte(vm_offset_t va, uint64_t context); -tte_t tsb_lookup_tte(vm_offset_t va, uint64_t ctx); +void tsb_clear(struct hv_tsb_info *tsb); -void tsb_clear_tte(struct hv_tsb_info *tsb, vm_offset_t, uint64_t ctx); +void tsb_clear_tte(struct hv_tsb_info *tsb, vm_offset_t va); +void tsb_clear_range(struct hv_tsb_info *tsb, vm_offset_t sva, vm_offset_t eva); #endif /* !_MACHINE_TSB_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#6 (text+ko) ==== @@ -111,7 +111,7 @@ #define VTD_W (1UL << 6) #define VTD_REF (1UL << 5) -#define VTD_WR_PERM (1UL << 4) +#define VTD_SW_W (1UL << 4) #define VTD_MANAGED (1UL << 58) #define VTD_WIRED (1UL << 57) #define VTD_LOCK (1UL << 56) @@ -128,8 +128,9 @@ /* * default flags for kernel pages */ -#define TTE_KERNEL VTD_V | VTD_CP | VTD_CV | VTD_P | VTD_X | VTD_W | VTD_WR_PERM | VTD_REF | VTD_WIRED +#define TTE_KERNEL VTD_V | VTD_CP | VTD_CV | VTD_P | VTD_X | VTD_W | VTD_SW_W | VTD_REF | VTD_WIRED #define TTE_KERNEL_MINFLAGS VTD_V | VTD_CP | VTD_CV | VTD_P +#define TTE_MINFLAGS VTD_V | VTD_CP | VTD_CV #define VTD_SIZE_BITS (4) #define VTD_SIZE_MASK ((1 << VTD_SIZE_BITS) - 1) @@ -227,12 +228,18 @@ struct pmap; +typedef uint64_t tte_t; + void tte_clear_phys_bit(vm_page_t m, uint64_t flags); + void tte_set_phys_bit(vm_page_t m, uint64_t flags); + boolean_t tte_get_phys_bit(vm_page_t m, uint64_t flags); void tte_clear_virt_bit(struct pmap *pmap, vm_offset_t va, uint64_t flags); + void tte_set_virt_bit(struct pmap *pmap, vm_offset_t va, uint64_t flags); + boolean_t tte_get_virt_bit(struct pmap *pmap, vm_offset_t va, uint64_t flags); #endif /* !_MACHINE_TTE_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/locore.S#6 (text+ko) ==== @@ -115,8 +115,6 @@ */ mov SCRATCH_REG_PCPU, %g1 stxa PCPU_REG, [%g1]ASI_SCRATCHPAD - mov SCRATCH_REG_PCB, %g1 - stxa %g6, [%g1]ASI_SCRATCHPAD retl nop ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#13 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -143,7 +144,6 @@ static void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t locked_pmap); -static void pmap_scrub_pages(vm_paddr_t pa, int64_t size); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); @@ -202,11 +202,16 @@ static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; struct vpgqueues *vpq; + uint64_t *tte, tte_data; pmap_t pmap; pv_entry_t allocated_pv, next_pv, pv; vm_offset_t va; vm_page_t m; + + KASSERT(locked_pmap->pm_context != 0, + ("context 0 not backed by pv_entry management")); + PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); allocated_pv = uma_zalloc(pvzone, M_NOWAIT); @@ -234,7 +239,6 @@ if (m->hold_count || m->busy || (m->flags & PG_BUSY)) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { - UNIMPLEMENTED; va = pv->pv_va; pmap = pv->pv_pmap; /* Avoid deadlock and lock recursion. */ @@ -243,30 +247,29 @@ else if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap)) continue; pmap->pm_stats.resident_count--; -#ifdef notyet - pte = pmap_pte_quick(pmap, va); - tpte = pte_load_clear(pte); - KASSERT((tpte & PG_W) == 0, - ("get_pv_entry: wired pte %#jx", (uintmax_t)tpte)); - if (tpte & PG_A) + + tte = tte_hash_lookup(pmap->pm_hash, va); + tte_data = *tte; + tte_hash_delete(pmap->pm_hash, va); + + KASSERT((tte_data & VTD_WIRED) == 0, + ("get_pv_entry: wired pte %#jx", (uintmax_t)tte_data)); + if (tte_data & VTD_REF) vm_page_flag_set(m, PG_REFERENCED); - if (tpte & PG_M) { - KASSERT((tpte & PG_RW), - ("get_pv_entry: modified page not writable: va: %#x, pte: %#jx", - va, (uintmax_t)tpte)); - if (pmap_track_modified(va)) + if (tte_data & VTD_W) { + KASSERT((tte_data & VTD_SW_W), + ("get_pv_entry: modified page not writable: va: %lx, tte: %lx", + va, tte_data)); + if (pmap_track_modified(locked_pmap, va)) vm_page_dirty(m); } -#endif + pmap_invalidate_page(pmap, va); TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); m->md.pv_list_count--; -#ifdef notyet - pmap_unuse_pt(pmap, va); -#endif if (pmap != locked_pmap) PMAP_UNLOCK(pmap); @@ -320,6 +323,7 @@ { pmap_t pmap, oldpmap; + critical_enter(); pmap = vmspace_pmap(td->td_proc->p_vmspace); oldpmap = PCPU_GET(curpmap); @@ -330,8 +334,7 @@ oldpmap->pm_active &= ~1; pmap->pm_active |= 1; #endif - - set_pdir_scratchpad(pmap->pm_pdir); + tte_hash_set_scratchpad(pmap->pm_hash); PCPU_SET(curpmap, pmap); critical_exit(); } @@ -456,8 +459,8 @@ #ifdef notyet /* XXX this tries to map at a wacky address */ for (i = 0; i < (MSGBUF_SIZE / PAGE_SIZE); i++) - tsb_set_tte(&kernel_td[TSB8K_INDEX], ((vm_offset_t)msgbufp) + i*PAGE_SIZE , msgbuf_phys + i*PAGE_SIZE, - TTE_KERNEL | VTD_8K, 0); + tsb_set_tte(&kernel_td[TSB8K_INDEX], ((vm_offset_t)msgbufp) + i*PAGE_SIZE , + msgbuf_phys + i*PAGE_SIZE | TTE_KERNEL | VTD_8K, 0); #endif /* @@ -480,7 +483,7 @@ for (i = 0; i < KSTACK_PAGES; i++) { pa = kstack0_phys + i * PAGE_SIZE; va = kstack0 + i * PAGE_SIZE; - tsb_set_tte(&kernel_td[TSB8K_INDEX], va , pa, TTE_KERNEL | VTD_8K, 0); + tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa | TTE_KERNEL | VTD_8K, 0); } /* @@ -521,14 +524,14 @@ if (translations[i].om_size == PAGE_SIZE_4M) { tsb_assert_invalid(&kernel_td[TSB4M_INDEX], translations[i].om_start); tsb_set_tte(&kernel_td[TSB4M_INDEX], translations[i].om_start, - TTE_GET_PA(translations[i].om_tte), TTE_KERNEL | VTD_4M, 0); + TTE_GET_PA(translations[i].om_tte) | TTE_KERNEL | VTD_4M, 0); } else { for (off = 0; off < translations[i].om_size; off += PAGE_SIZE) { va = translations[i].om_start + off; pa = TTE_GET_PA(translations[i].om_tte) + off; tsb_assert_invalid(&kernel_td[TSB8K_INDEX], va); - tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa, TTE_KERNEL | VTD_8K, 0); + tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa | TTE_KERNEL | VTD_8K, 0); } } } @@ -623,21 +626,25 @@ boolean_t wired) { vm_paddr_t pa, opa; - uint64_t tte_data, otte_data; + uint64_t tte_data, otte_data, *otte; vm_page_t om; int invlva; #if 0 printf("ctx=%d va=%lx prot=%x wired=%x\n", pmap->pm_context, va, prot, wired); #endif + KASSERT(pmap->pm_context != 0, + ("inserting faultable entries into context 0 without backing hash")); + + om = NULL; vm_page_lock_queues(); - om = NULL; PMAP_LOCK(pmap); sched_pin(); tte_data = pa = VM_PAGE_TO_PHYS(m); - otte_data = tsb_lookup_tte(va, pmap->pm_context); + otte = tte_hash_lookup(pmap->pm_hash, va); + otte_data = *otte; opa = TTE_GET_PA(otte_data); /* * Mapping has not changed, must be protection or wiring change. @@ -660,7 +667,7 @@ */ if (otte_data & VTD_MANAGED) { om = m; - pa |= VTD_MANAGED; + tte_data |= VTD_MANAGED; } goto validate; @@ -670,7 +677,7 @@ * handle validating new mapping. */ if (opa) { - if (otte_data & VTD_W) + if (otte_data & VTD_WIRED) pmap->pm_stats.wired_count--; if (otte_data & VTD_MANAGED) { om = PHYS_TO_VM_PAGE(opa); @@ -697,19 +704,20 @@ * Now validate mapping with desired protection/wiring. */ if ((prot & VM_PROT_WRITE) != 0) - tte_data |= (VTD_W|VTD_WR_PERM); /* XXX need to handle modify */ + tte_data |= VTD_SW_W; if ((prot & VM_PROT_EXECUTE) != 0) tte_data |= VTD_X; if (wired) tte_data |= VTD_WIRED; if (pmap == kernel_pmap) tte_data |= TTE_KERNEL_MINFLAGS; - + else + tte_data |= TTE_MINFLAGS; + if ((otte_data & ~(VTD_W|VTD_REF)) != tte_data) { if (otte_data & VTD_V) { invlva = FALSE; - tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa, tte_data, - pmap->pm_context); + *otte = tte_data; if (otte_data & VTD_REF) { if (otte_data & VTD_MANAGED) vm_page_flag_set(om, PG_REFERENCED); @@ -726,14 +734,14 @@ if (invlva) pmap_invalidate_page(pmap, va); } else - tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa, tte_data, - pmap->pm_context); + tte_hash_insert(pmap->pm_hash, va, tte_data); } sched_unpin(); + PMAP_UNLOCK(pmap); vm_page_unlock_queues(); - PMAP_UNLOCK(pmap); + } @@ -741,7 +749,30 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte) { - UNIMPLEMENTED; + uint64_t pa; + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); + PMAP_LOCK(pmap); + /* + * Enter on the PV list if part of our managed memory. Note that we + * raise IPL while manipulating pv_table since pmap_enter can be + * called at interrupt time. + */ + if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) + pmap_insert_entry(pmap, va, m); + + pmap->pm_stats.resident_count++; + + pa = VM_PAGE_TO_PHYS(m); + + if (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) + pa |= VTD_MANAGED; + + tte_hash_insert(pmap->pm_hash, va, pa | TTE_MINFLAGS); + + PMAP_UNLOCK(pmap); + return (0); } @@ -752,13 +783,15 @@ vm_paddr_t pmap_extract(pmap_t pmap, vm_offset_t va) { - vm_paddr_t rtval; - UNIMPLEMENTED; + vm_paddr_t pa; + tte_t *tte; PMAP_LOCK(pmap); - + + tte = tte_hash_lookup(pmap->pm_hash, va); + pa = TTE_GET_PA(*tte) | (va & TTE_GET_PAGE_MASK(*tte)); PMAP_UNLOCK(pmap); - return (rtval); + return (pa); } /* @@ -769,7 +802,24 @@ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { - UNIMPLEMENTED; + tte_t *tte_data; + vm_page_t m; + + m = NULL; + vm_page_lock_queues(); + PMAP_LOCK(pmap); + + tte_data = tte_hash_lookup(pmap->pm_hash, va); + if (tte_data != 0 && + ((*tte_data & VTD_SW_W) || (prot & VM_PROT_WRITE) == 0)) { + m = PHYS_TO_VM_PAGE(TTE_GET_PA(*tte_data)); + vm_page_hold(m); + } + + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); + + return (m); } void @@ -797,6 +847,8 @@ pv_entry_high_water = 9 * (pv_entry_max / 10); uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); + tte_hash_init(); + } /* @@ -838,8 +890,15 @@ pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { vm_offset_t tva; +#if 0 printf("pmap_invalidate_range(sva=%lx, eva=%lx)\n", sva, eva); +#endif /* XXX SUN4V_FIXME - oversimplified logic */ + + if (pmap->pm_context != 0) { + tsb_clear_range(&pmap->pm_tsb, sva, eva); + } + if (((sva & PAGE_MASK_4M) != 0) || ((eva & PAGE_MASK_4M) != 0)) { for (tva = sva; tva < eva; tva += PAGE_SIZE_8K) invlpg(tva, pmap->pm_context); @@ -854,6 +913,10 @@ #ifdef SMP #error __FUNCTION_ not implemented #else + if (pmap->pm_context != 0) { + tsb_clear(&pmap->pm_tsb); + } + invlctx(pmap->pm_context); #endif } @@ -870,7 +933,7 @@ boolean_t pmap_is_prefaultable(pmap_t pmap, vm_offset_t va) { - return (pmap->pm_pdir[va >> (PT_SHIFT + PAGE_SHIFT)] ? TRUE : FALSE); + return (TRUE); } /* @@ -879,7 +942,7 @@ void pmap_kenter(vm_offset_t va, vm_paddr_t pa) { - tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa, TTE_KERNEL | VTD_8K, 0); + tsb_set_tte(&kernel_td[TSB8K_INDEX], va, pa | TTE_KERNEL | VTD_8K, 0); } /* @@ -909,10 +972,10 @@ { if ((va & PAGE_MASK_4M) == 0 && - tsb_get_tte(&kernel_td[TSB4M_INDEX], va, 0) != 0) - tsb_set_tte(&kernel_td[TSB4M_INDEX], va, 0, 0, 0); + tsb_get_tte(&kernel_td[TSB4M_INDEX], va) != 0) + tsb_clear_tte(&kernel_td[TSB4M_INDEX], va); else - tsb_set_tte(&kernel_td[TSB8K_INDEX], va, 0, 0, 0); + tsb_clear_tte(&kernel_td[TSB8K_INDEX], va); } static void @@ -1008,7 +1071,7 @@ { if ((prot & VM_PROT_WRITE) == 0) { if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - tte_clear_phys_bit(m, VTD_WR_PERM|VTD_W); + tte_clear_phys_bit(m, VTD_SW_W | VTD_W); } else { pmap_remove_all(m); } @@ -1022,11 +1085,9 @@ pmap_pinit0(pmap_t pmap) { PMAP_LOCK_INIT(pmap); - /* - * The kernel does not use page tables - */ - pmap->pm_pdir = NULL; + pmap->pm_hash = NULL; pmap->pm_active = 0; + pmap->pm_context = 0; PCPU_SET(curpmap, pmap); TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); @@ -1039,36 +1100,14 @@ void pmap_pinit(pmap_t pmap) { - vm_page_t m, ptdpg[NPGPTD]; - static int color; - int i; - - PMAP_LOCK_INIT(pmap); - if (pmap->pm_pdir == NULL) - pmap->pm_pdir = (vm_offset_t *)kmem_alloc_nofault(kernel_map, NBPTD); + static int context = 1; /* XXX */ - /* - * allocate the page directory page(s) - */ - for (i = 0; i < NPGPTD;) { - m = vm_page_alloc(NULL, color++, - VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | - VM_ALLOC_ZERO); - if (m == NULL) - VM_WAIT; - else { - ptdpg[i++] = m; - } - } + pmap->pm_context = context++; - pmap_qenter((vm_offset_t)pmap->pm_pdir, ptdpg, NPGPTD); + KASSERT(context < PMAP_CONTEXT_MAX, + ("max context limit hit - need to implement context recycling")); - for (i = 0; i < NPGPTD; i++) { - if ((ptdpg[i]->flags & PG_ZERO) == 0) - bzero(pmap->pm_pdir + (i * NPDEPG), PAGE_SIZE); - } - - + pmap->pm_hash = tte_hash_create(pmap->pm_context); pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); @@ -1081,12 +1120,13 @@ void pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) { - UNIMPLEMENTED; -#ifdef notyet - vm_offset_t pdnxt; - pd_entry_t ptpaddr; - pt_entry_t *pte; + int anychanged; + uint64_t *tte; + + + KASSERT(pmap->pm_context != 0, + ("protection downgrades not handled correctly without backing hash")); if ((prot & VM_PROT_READ) == VM_PROT_NONE) { pmap_remove(pmap, sva, eva); @@ -1099,28 +1139,43 @@ anychanged = 0; vm_page_lock_queues(); + PMAP_LOCK(pmap); sched_pin(); - PMAP_LOCK(pmap); - for (; sva < eva; sva = va_next) { - unsigned obits, pbits, pdirindex; - /* - * Weed out invalid mappings. Note: we assume that the page - * directory table is always allocated, and in kernel virtual. - */ - if (ptpaddr == 0) - continue; + for (; sva < eva; sva += PAGE_SIZE) { + uint64_t otte_data, tte_data; + vm_page_t m; + retry: + tte = tte_hash_lookup(pmap->pm_hash, sva); + otte_data = tte_data = tte ? *tte : 0; + if (tte_data & VTD_MANAGED) { + m = NULL; + if (tte_data & VTD_REF) { + m = PHYS_TO_VM_PAGE(TTE_GET_PA(tte_data)); + vm_page_flag_set(m, PG_REFERENCED); + tte_data &= ~VTD_REF; + } + if ((tte_data & VTD_W) && pmap_track_modified(pmap, sva)) { + m = PHYS_TO_VM_PAGE(TTE_GET_PA(tte_data)); + vm_page_dirty(m); + } + } + + tte_data &= ~(VTD_SW_W | VTD_W); - if (pdnxt > eva) - pdnxt = eva; + if (tte_data != otte_data) { + if (!atomic_cmpset_long(tte, otte_data, tte_data)) + goto retry; + anychanged = 1; + } } + sched_unpin(); - vm_page_unlock_queues(); if (anychanged) pmap_invalidate_all(pmap); + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); -#endif } /* @@ -1169,29 +1224,12 @@ void pmap_release(pmap_t pmap) { - vm_page_t m, ptdpg[NPGPTD]; - int i; - KASSERT(pmap->pm_stats.resident_count == 0, ("pmap_release: pmap resident count %ld != 0", pmap->pm_stats.resident_count)); pmap_lazyfix(pmap); - - for (i = 0; i < NPGPTD; i++) - ptdpg[i] = PHYS_TO_VM_PAGE(vtophys(((vm_offset_t)pmap->pm_pdir) + PAGE_SIZE)); - - pmap_qremove((vm_offset_t)pmap->pm_pdir, NPGPTD); - - vm_page_lock_queues(); - for (i = 0; i < NPGPTD; i++) { - m = ptdpg[i]; - - m->wire_count--; - atomic_subtract_int(&cnt.v_wire_count, 1); - vm_page_free_zero(m); - } - vm_page_unlock_queues(); + tte_hash_destroy(pmap->pm_hash); PMAP_LOCK_DESTROY(pmap); } @@ -1201,93 +1239,33 @@ void pmap_remove(pmap_t pmap, vm_offset_t start, vm_offset_t end) { - UNIMPLEMENTED; -#ifdef notyet - vm_offset_t pdnxt; - pd_entry_t ptpaddr; - pt_entry_t *pte; - int anyvalid; - + int invlva, tinvlva; + vm_offset_t tva; /* * Perform an unsynchronized read. This is, however, safe. */ if (pmap->pm_stats.resident_count == 0) return; - anyvalid = 0; - vm_page_lock_queues(); sched_pin(); PMAP_LOCK(pmap); - if (pmap == kernel_pmap) { - /* only need to clear page from the appropriate TSB */ - - } - - /* - * special handling of removing one page. a very - * common operation and easy to short circuit some - * code. - */ - if (sva + PAGE_SIZE == eva) { - pmap_remove_page(pmap, sva); - goto out; - } - - for (; sva < eva; sva = pdnxt) { - unsigned pdirindex; - - /* - * Calculate index for next page table. - */ - pdnxt = (sva + NBPDR) & ~PDRMASK; - if (pmap->pm_stats.resident_count == 0) - break; - - pdirindex = sva >> PDRSHIFT; - ptpaddr = pmap->pm_pdir[pdirindex]; - - /* - * Weed out invalid mappings. Note: we assume that the page - * directory table is always allocated, and in kernel virtual. - */ - if (ptpaddr == 0) - continue; - - /* - * Limit our scan to either the end of the va represented - * by the current page table page, or to the end of the - * range being removed. - */ - if (pdnxt > eva) - pdnxt = eva; - - /* XXX SUN4V_FIXME - * Have not yet decided whether or not to use mapped pages for - * page table pages - * In any event pmap_pte_quick needs to go - */ - for (pte = pmap_pte_quick(pmap, sva); sva != pdnxt; pte++, - sva += PAGE_SIZE) { - if (*pte == 0) - continue; - anyvalid = 1; - if (pmap_remove_pte(pmap, pte, sva)) - break; + if (pmap->pm_context != 0) { + invlva = 0; + for (tva = start; tva < end; tva += PAGE_SIZE) { + tinvlva = tte_hash_delete(pmap->pm_hash, tva); + invlva = tinvlva ? tinvlva : invlva; } - - - - - + } else { + tsb_clear_range(&pmap->pm_tsb, start, end); + invlva = 1; } -out: sched_unpin(); vm_page_unlock_queues(); - if (anyvalid) + if (invlva) pmap_invalidate_all(pmap); PMAP_UNLOCK(pmap); -#endif + } /* @@ -1306,7 +1284,44 @@ void pmap_remove_all(vm_page_t m) { - UNIMPLEMENTED; + pv_entry_t pv; + uint64_t *tte, tte_data; + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + sched_pin(); + while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { + PMAP_LOCK(pv->pv_pmap); + pv->pv_pmap->pm_stats.resident_count--; + KASSERT(pv->pv_pmap->pm_context != 0, + ("cannot special case absence of backing hash")); + tte = tte_hash_lookup(pv->pv_pmap->pm_hash, pv->pv_va); + tte_data = *tte; + tte_hash_delete(pv->pv_pmap->pm_hash, pv->pv_va); + if (tte_data & VTD_WIRED) + pv->pv_pmap->pm_stats.wired_count--; + if (tte_data & VTD_REF) + vm_page_flag_set(m, PG_REFERENCED); + + /* + * Update the vm_page_t clean and reference bits. + */ + if (tte_data & VTD_W) { + KASSERT((tte_data & VTD_SW_W), + ("pmap_remove_all: modified page not writable: va: %lx, tte: %lx", + pv->pv_va, tte_data)); + if (pmap_track_modified(pv->pv_pmap, pv->pv_va)) + vm_page_dirty(m); + } + + pmap_invalidate_page(pv->pv_pmap, pv->pv_va); + TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); + TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); + m->md.pv_list_count--; + PMAP_UNLOCK(pv->pv_pmap); + free_pv_entry(pv); + } + vm_page_flag_clear(m, PG_WRITEABLE); + sched_unpin(); } static void @@ -1338,12 +1353,70 @@ void -pmap_remove_pages(pmap_t pmap, vm_offset_t start, vm_offset_t end) +pmap_remove_pages(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { - UNIMPLEMENTED; + + vm_page_t m; + pv_entry_t pv, npv; + tte_t *tte, tte_data; + + KASSERT(pmap->pm_context != 0, + ("cannot special case absence of backing hash")); + + vm_page_lock_queues(); + PMAP_LOCK(pmap); + sched_pin(); + for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { + + if (pv->pv_va >= eva || pv->pv_va < sva) { + npv = TAILQ_NEXT(pv, pv_plist); + continue; + } + tte = tte_hash_lookup(pmap->pm_hash, pv->pv_va); + tte_data = tte ? *tte : 0; + + if (tte_data == 0) { + printf("TTE at %p IS ZERO @ VA %016lx\n", + tte, pv->pv_va); + panic("bad tte"); + } + + /* + * We cannot remove wired pages from a + * process' mapping at this time + */ + + if (tte_data & VTD_WIRED) { + npv = TAILQ_NEXT(pv, pv_plist); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 4 08:45: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 B8DF016A423; Sat, 4 Mar 2006 08: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 9338C16A420 for ; Sat, 4 Mar 2006 08:45: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 4ADE043D45 for ; Sat, 4 Mar 2006 08:45:27 +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 k248jRwY019322 for ; Sat, 4 Mar 2006 08:45:27 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k248jQrB019319 for perforce@freebsd.org; Sat, 4 Mar 2006 08:45:26 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 4 Mar 2006 08:45:26 GMT Message-Id: <200603040845.k248jQrB019319@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 92715 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 Mar 2006 08:45:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=92715 Change 92715 by kmacy@kmacy_storage:sun4v_work on 2006/03/04 08:44:37 perforce missed an add Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Mar 4 13:47: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 9D0E916A423; Sat, 4 Mar 2006 13:47: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 74D6F16A420 for ; Sat, 4 Mar 2006 13:47: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 EE2AD43D53 for ; Sat, 4 Mar 2006 13:47: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 k24Dl2MI045543 for ; Sat, 4 Mar 2006 13:47: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 k24Dl2iq045540 for perforce@freebsd.org; Sat, 4 Mar 2006 13:47:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 13:47:02 GMT Message-Id: <200603041347.k24Dl2iq045540@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 92721 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 Mar 2006 13:47:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=92721 Change 92721 by rwatson@rwatson_zoo on 2006/03/04 13:46:13 Forward declare struct au_record so that having it as a function argument for functions declared in audit_private.h does not require all consumers of the include file to include bsm/audit_internal.h. Remove nested include of audit.h, since all consumers include it already. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#18 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#18 (text+ko) ==== @@ -240,6 +240,7 @@ * Functions relating to the conversion of internal kernel audit records to * the BSM file format. */ +struct au_record; int kaudit_to_bsm(struct kaudit_record *kar, struct au_record **pau); int bsm_rec_verify(void *rec); @@ -266,7 +267,6 @@ #include #include #include -#include /* * Some of the BSM tokenizer functions take different parameters in the From owner-p4-projects@FreeBSD.ORG Sat Mar 4 14:01: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 EAA0216A423; Sat, 4 Mar 2006 14:01: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 B7B6616A420 for ; Sat, 4 Mar 2006 14:01: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 8150943D45 for ; Sat, 4 Mar 2006 14:01: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 k24E1MIh046254 for ; Sat, 4 Mar 2006 14:01: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 k24E1Lb5046251 for perforce@freebsd.org; Sat, 4 Mar 2006 14:01:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 14:01:21 GMT Message-Id: <200603041401.k24E1Lb5046251@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 92722 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 Mar 2006 14:01:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=92722 Change 92722 by rwatson@rwatson_peppercorn on 2006/03/04 14:00:45 Avoid wildcards in the upgrade instructions, as it may lead to problems in the future if other files matching the wildcards are not OpenBSM-derived (especially in usr.sbin). Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#3 (text) ==== @@ -6,9 +6,12 @@ src/contrib/openbsm The OpenBSM distribution itself src/sys/bsm Modified versions of some bsm/ include files src/sys/security/audit Kernel audit framework, some OpenBSM-based files -src/usr.sbin/*audit* Makefiles for various OpenBSM tools +src/usr.sbin/audit Makefiles for OpenBSM-derived command +src/usr.sbin/auditd "" +src/usr.sbin/auditreduce "" +src/usr.sbin/praudit "" src/etc/Makefile Installation of /etc OpenBSM files -src/lib/libbsm/* Build for OpenBSM library +src/lib/libbsm Build for OpenBSM library OpenBSM is normally built using an integrated autoconf/automake build system. For the purposes of tight integration with FreeBSD, we use an From owner-p4-projects@FreeBSD.ORG Sat Mar 4 14:12: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 37D1E16A424; Sat, 4 Mar 2006 14:12: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 EE33E16A420 for ; Sat, 4 Mar 2006 14:12: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 A39F943D62 for ; Sat, 4 Mar 2006 14:12: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 k24ECaH4046622 for ; Sat, 4 Mar 2006 14:12: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 k24ECake046619 for perforce@freebsd.org; Sat, 4 Mar 2006 14:12:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 14:12:36 GMT Message-Id: <200603041412.k24ECake046619@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 92723 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 Mar 2006 14:12:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=92723 Change 92723 by rwatson@rwatson_zoo on 2006/03/04 14:11:47 audit.c requires audit_internal for the definition of au_record. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#15 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#15 (text+ko) ==== @@ -58,6 +58,7 @@ #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sat Mar 4 15:42: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 F3C1A16A423; Sat, 4 Mar 2006 15:42: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 C687E16A420 for ; Sat, 4 Mar 2006 15:42: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 654D743D46 for ; Sat, 4 Mar 2006 15:42: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 k24FgTvB049973 for ; Sat, 4 Mar 2006 15:42: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 k24FgPro049970 for perforce@freebsd.org; Sat, 4 Mar 2006 15:42:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 15:42:25 GMT Message-Id: <200603041542.k24FgPro049970@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 92726 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 Mar 2006 15:42:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=92726 Change 92726 by rwatson@rwatson_zoo on 2006/03/04 15:42:03 Integrate TrustedBSD base branch from FreeBSD CVS: - bsnmp upgrade - resolver update - lots of proc lock fixes - more explicit interrupt routing on smp - freebsd32_sendfile fixes - alpha tsc - tdfx_linux module/option - ata locking fixes - kbdmux now default + fixes - fdescfs fixes - further calcru fixes - lots of sundry vfs locking fixes - loop back auditing of vfs system call paths - bridge monitor mode and bpf - softupdates queues made per-mount rather than global - netrate http/httpd learn about multi-process operation Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#35 integrate .. //depot/projects/trustedbsd/base/Makefile#42 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#69 integrate .. //depot/projects/trustedbsd/base/README#5 integrate .. //depot/projects/trustedbsd/base/UPDATING#63 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#10 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#10 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/TODO#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/VERSION#10 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.1#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpclient.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/support.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/oid-list#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_route.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_tree.def#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_ntp/snmp_ntp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/bsnmpd.1#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/config.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/export.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpd.config#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.3#9 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/csup/GNUmakefile#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/README#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/TODO#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/attrstack.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/attrstack.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/config.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/config.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/csup.1#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/detailer.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/detailer.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/diff.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/diff.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fattr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fattr.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fattr_bsd.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fattr_posix.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fixups.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fixups.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fnmatch.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/fnmatch.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/globtree.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/globtree.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/keyword.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/keyword.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/lister.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/lister.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/main.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/main.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/misc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/misc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/mux.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/mux.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/parse.y#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/pathcomp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/pathcomp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/proto.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/proto.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/queue.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/status.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/status.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/stream.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/stream.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/threads.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/threads.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/token.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/token.l#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/updater.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/updater.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/Makefile#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/mkfilters.1#3 integrate .. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#18 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.x11-4.dist#11 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/407.status-graid3#1 branch .. //depot/projects/trustedbsd/base/etc/periodic/daily/408.status-gstripe#1 branch .. //depot/projects/trustedbsd/base/etc/periodic/daily/409.status-gconcat#1 branch .. //depot/projects/trustedbsd/base/etc/periodic/daily/Makefile#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfw#12 integrate .. //depot/projects/trustedbsd/base/etc/snmpd.config#4 integrate .. //depot/projects/trustedbsd/base/include/printf.h#3 integrate .. //depot/projects/trustedbsd/base/include/resolv.h#8 integrate .. //depot/projects/trustedbsd/base/include/rpc/auth.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#22 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet_net.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet_net_ntop.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet_net_pton.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_comp.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_debug.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_query.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_send.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_des.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_none.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_unix.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_dg.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_raw.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_simple.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_vc.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getpublickey.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/key_call.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/mt_misc.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/mt_misc.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_com.h#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_generic.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_soc.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpcb_clnt.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_auth.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_dg.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_generic.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_raw.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_run.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_simple.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_vc.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf_quote.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/a64l.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/Makefile.inc#19 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/gettimeofday.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kldnext.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmc.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/context.S#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_nanosleep.c#7 integrate .. //depot/projects/trustedbsd/base/lib/librt/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/librt/aio.c#1 branch .. //depot/projects/trustedbsd/base/lib/librt/mq.c#1 branch .. //depot/projects/trustedbsd/base/lib/librt/sigev_thread.c#1 branch .. //depot/projects/trustedbsd/base/lib/librt/sigev_thread.h#1 branch .. //depot/projects/trustedbsd/base/lib/librt/timer.c#1 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#15 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#32 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#18 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#98 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#28 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.ent#17 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/dmesg/dmesg.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/dump/dump.8#26 integrate .. //depot/projects/trustedbsd/base/sbin/dumpon/dumpon.8#15 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk_pc98/fdisk.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk_pc98/fdisk.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/shsec/geom_shsec.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#37 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#18 integrate .. //depot/projects/trustedbsd/base/sbin/init/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sbin/kldunload/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/kldunload/kldunload.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/kldunload/kldunload.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.8#21 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#20 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#41 integrate .. //depot/projects/trustedbsd/base/share/examples/ipfilter/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#64 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#24 integrate .. //depot/projects/trustedbsd/base/share/man/man4/altq.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cpufreq.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ddb.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/hwpmc.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/if_bridge.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/kbdmux.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_netflow.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/tdfx.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#39 integrate .. //depot/projects/trustedbsd/base/share/man/man5/periodic.conf.5#18 integrate .. //depot/projects/trustedbsd/base/share/man/man8/rc.subr.8#7 integrate .. //depot/projects/trustedbsd/base/share/man/man9/bus_dma.9#13 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sleep.9#13 integrate .. //depot/projects/trustedbsd/base/share/man/man9/time.9#7 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#27 integrate .. //depot/projects/trustedbsd/base/share/mklocale/ko_KR.eucKR.src#3 integrate .. //depot/projects/trustedbsd/base/share/mklocale/zh_CN.GBK.src#2 integrate .. //depot/projects/trustedbsd/base/share/mklocale/zh_CN.eucCN.src#3 integrate .. //depot/projects/trustedbsd/base/share/mklocale/zh_TW.Big5.src#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#43 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#31 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/intr_machdep.c#11 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/io_apic.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/local_apic.c#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#17 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/apicvar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/intr_machdep.h#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/mptable.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/atpic.c#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/busdma_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/machdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#12 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/trap.c#12 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/undefined.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#13 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321_aau.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321_dma.c#3 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda.h#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#18 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#17 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#68 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#97 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#41 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#68 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#33 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#34 integrate .. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ar/if_ar.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#50 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-queue.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ce/tau32-ddk.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ce/tau32-ddk.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/de/if_de.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/de/if_devar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#50 integrate .. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir_pci.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/kbd/kbd.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/am7990.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/am79900.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_cnfg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_ioc.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_type.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_debug.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mse/mse.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/pcf/envctrl.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/pcf/pcf_ebus.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/pcf/pcf_isa.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/if_plip.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/lpt.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/ppi.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppc/ppc.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_ebus.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_sbus.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sr/if_sr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_pci.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus_ebus.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_core.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_ns8250.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_sab82532.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_z8530.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_kbd_sun.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_tty.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_port.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_quirks.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#49 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdivar.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/vkbd/vkbd.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/deadfs/dead_vnops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_devs.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vnops.c#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_subr.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ctl.c#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#28 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#29 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#64 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/PAE#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/XBOX#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#36 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/intr_machdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/io_apic.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/local_apic.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#47 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/apicvar.h#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/intr_machdep.h#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/mptable.h#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/xbox.h#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/atpic.c#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_ptrace.c#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/xbox/xboxfb.c#4 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#59 integrate .. //depot/projects/trustedbsd/base/sys/isa/syscons_isa.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_cpu.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#50 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_kse.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_kthread.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#60 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#46 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_timeout.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#35 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_sleepqueue.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#52 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#51 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#43 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#72 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#67 integrate .. //depot/projects/trustedbsd/base/sys/modules/3dfx/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/3dfx_linux/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/Makefile#73 integrate .. //depot/projects/trustedbsd/base/sys/modules/ce/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/coda5/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/crypto/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/de/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_ef/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_ppp/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sys/modules/kbdmux/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/uart/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/net/bridgestp.c#5 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#9 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#48 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#33 integrate .. //depot/projects/trustedbsd/base/sys/net/ppp_deflate.c#7 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#19 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#45 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#60 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#31 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#38 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#30 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/mld6.c#16 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsock.c#18 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.c#19 integrate .. //depot/projects/trustedbsd/base/sys/pc98/cbus/fdc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/trustedbsd/base/sys/pc98/cbus/ppc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/pc98/cbus/sio.c#5 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#33 integrate .. //depot/projects/trustedbsd/base/sys/pci/dc21040reg.h#3 delete .. //depot/projects/trustedbsd/base/sys/pci/if_de.c#24 delete .. //depot/projects/trustedbsd/base/sys/pci/if_devar.h#11 delete .. //depot/projects/trustedbsd/base/sys/security/mac/mac_process.c#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#34 integrate .. //depot/projects/trustedbsd/base/sys/sys/_types.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/bio.h#21 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#36 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#73 integrate .. //depot/projects/trustedbsd/base/sys/sys/queue.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/serial.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/signalvar.h#24 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#53 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#53 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#54 integrate .. //depot/projects/trustedbsd/base/sys/sys/timers.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#61 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_alloc.c#32 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_extern.h#17 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_rawread.c#16 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#37 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#38 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/softdep.h#7 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#25 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufsmount.h#12 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#29 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#59 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#46 integrate .. //depot/projects/trustedbsd/base/tools/tools/README#23 integrate .. //depot/projects/trustedbsd/base/tools/tools/ministat/ministat.c#6 integrate .. //depot/projects/trustedbsd/base/tools/tools/ncpus/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ncpus/acpi.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ncpus/acpidump.h#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ncpus/biosmptable.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ncpus/ncpus.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/netrate/http/http.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/netrate/httpd/httpd.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.1#13 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.pl#22 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tinderbox.1#9 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tinderbox.pl#16 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/index.cgi#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#46 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#46 integrate .. //depot/projects/trustedbsd/base/usr.bin/csup/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.bin/tar/tree.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#48 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/hccontrol.h#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/info.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/link_control.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/util.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pmccontrol/pmccontrol.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/portsnap/portsnap/portsnap.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/quot/quot.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/Makefile#17 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/anonFTP.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/config.c#26 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/devices.c#21 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/disks.c#21 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dist.c#31 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dmenu.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/http.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/index.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/installUpgrade.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/keymap.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/label.c#25 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/main.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/media.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/menus.c#47 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/options.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/package.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/sysinstall.h#30 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/system.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/tcpip.c#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/user.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/wizard.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/syslogd/syslog.conf.5#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#35 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.128 2005/12/12 01:28:19 rodrigc Exp $ +$FreeBSD: src/MAINTAINERS,v 1.129 2006/03/04 14:24:32 rwatson Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -26,6 +26,8 @@ UFS EAs rwatson Pre-commit review requested. MAC Framework rwatson Pre-commit review requested. MAC Modules rwatson Pre-commit review requested. +contrib/openbsm rwatson Pre-commit review requested. +sys/security/audit rwatson Pre-commit review requested. ATA/IDE sos Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. ==== //depot/projects/trustedbsd/base/Makefile#42 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.325 2005/11/28 11:14:36 ru Exp $ +# $FreeBSD: src/Makefile,v 1.326 2006/03/01 13:07:17 yar Exp $ # # The user-driven targets are: # @@ -93,11 +93,11 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \ - ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \ + ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \ -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ - (in /etc/make.conf) or command-line variable. + (in make.conf(5)) or command-line variable. .endif MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} BINMAKE= \ ==== //depot/projects/trustedbsd/base/Makefile.inc1#69 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.536 2006/02/27 09:17:39 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -506,7 +506,7 @@ # Check for missing UIDs/GIDs. # CHECK_UIDS= -CHECK_GIDS= +CHECK_GIDS= audit .if !defined(NO_SENDMAIL) CHECK_UIDS+= smmsp CHECK_GIDS+= smmsp ==== //depot/projects/trustedbsd/base/README#5 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: src/README,v 1.22 2003/03/08 10:01:26 markm Exp $ +$FreeBSD: src/README,v 1.23 2006/03/01 20:14:55 ceri Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -59,6 +59,8 @@ release Release building Makefile & associated tools. +rescue Build system for statically linked /rescue utilities. + sbin System commands. secure Cryptographic libraries and commands. ==== //depot/projects/trustedbsd/base/UPDATING#63 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20060303: + The TDFX_LINUX kernel option was retired and replaced by the + tdfx_linux device. The latter can be loaded as a kernel module. + Loading it alone should suffice to get 3dfx support for Linux + apps because it will pull in tdfx.ko and linux.ko through its + dependencies. + 20060201: The kernel ABI to file system modules was changed on i386. Please make sure that your kernel and modules are in sync. @@ -510,4 +517,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $ +$FreeBSD: src/UPDATING,v 1.440 2006/03/03 21:37:38 yar Exp $ ==== //depot/projects/trustedbsd/base/bin/chflags/chflags.1#10 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.25 2005/06/14 08:25:54 ru Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.26 2006/03/04 02:38:40 trhodes Exp $ .\" -.Dd May 14, 2005 +.Dd March 3, 2006 .Dt CHFLAGS 1 .Os .Sh NAME @@ -120,6 +120,39 @@ clear the nodump flag (owner or super-user only) .El .Pp +A few of the octal values include: +.Bl -tag -offset indent -width ".Ar 10" +.It Li 0 +Clear all file flags. +.It Li 1 +Translates to the +.Ar nodump +keyword. +.It Li 2 +Translates to the +.Ar uchg +keyword. +.It Li 3 +Translates to the +.Ar uchg , nodump +keywords. +.It Li 4 +Translates to the +.Ar uappnd +keyword. +.It Li 10 +Translates to the +.Ar opaque +keyword. +.It Li 20 +translates to the +uunlnk +keyword. +.El +.Pp +Other combinations of keywords may be placed by using +the octets assigned; however, these are the most notable. +.Pp Unless the .Fl H , .Fl L , @@ -140,6 +173,14 @@ command's actions are determined by the last one specified. .Pp You can use "ls -lo" to see the flags of existing files. +.Pp +Note that the ability to change certain flags is dependent +on the current kernel +.Em securelevel +setting. +See +.Xr security 7 +for more information on this setting. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO @@ -147,6 +188,7 @@ .Xr chflags 2 , .Xr stat 2 , .Xr fts 3 , +.Xr security 7 , .Xr symlink 7 .Sh HISTORY The ==== //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#10 (text+ko) ==== @@ -1,3 +1,29 @@ +1.12 + A couple of man page fixes from various submitters. + + Make default communities NULL for security. + + Fix a core dump when -d tracing suboption has no argument (thanks + to Shteryana Shopova). + + Fix bug in parsing the include path in the daemon. + + Fix an uninitialize structure field in gensnmptree (thanks to + jasone@freebsdorg) + + 64bit HC counters in the IF-MIB by polling the OS periodically. + + Fix link traps to be more RFC conform (thanks to glebius@freebsd.org) + + Add fallback definition for SA_SIZE() to support.h. + + Move the porting definitions for U?INT32_{MIN,MAX} into support.h. + + Include a sys/tree.h from FreeBSD-current and add autoconf + check for it. + +1.11a Fix build of modules when stdint.h is included after asn1.h + 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 ==== //depot/projects/trustedbsd/base/contrib/bsnmp/TODO#3 (text+ko) ==== @@ -1,6 +1,3 @@ -snmpd_mibII: - - handle HC counters by periodically polling the kernel counters. - snmpd: - rethink transports a little bit: make them loadable and make a private subtree for transports: ==== //depot/projects/trustedbsd/base/contrib/bsnmp/VERSION#10 (text+ko) ==== @@ -1,1 +1,1 @@ -1.11 +1.12 ==== //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.1#6 (text+ko) ==== @@ -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.5 2005/06/15 11:31:25 brandt_h Exp $ +.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.7 2006/02/27 09:52:08 brandt_h Exp $ .\" -.Dd June 14, 2005 +.Dd February 27, 2006 .Dt GENSNMPTREE 1 .Os .Sh NAME @@ -45,7 +45,7 @@ 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 -.Xr snmpd 1 +.Xr bsnmpd 1 daemon or for module writers. The second form may be used by SNMP client program writers. .Pp @@ -57,7 +57,7 @@ C-file .Ar prefix Ns tree.c containing a table used by -.Xr snmpd 1 +.Xr bsnmpd 1 during PDU processing and a header file .Ar prefix Ns tree.h @@ -70,14 +70,19 @@ .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 -.Va OID_ Ns Ar name -can be used as an array initialized to initialize a -.Va struct asn_oid . -The other define -.Va OIDLEN_ Ns Ar name -contains the length of the OID. +name emits three C preprocessor defines on its standard output: +.Bl -tag -width ".Va OIDLEN_ Ns Ar Name" +.It Va OIDX_ Ns Ar name +This define can be used to initialize a +.Va struct asn_oid +in the following way: +.Pp +.Dl const struct asn_oid oid_sysDescr = OIDX_sysDescr; +.It Va OIDLEN_ Ns Ar name +is the length of the OID. +.It Va OID_ Ns Ar name +is the last component of the OID. +.El .Pp The options are as follows: .Bl -tag -width ".Fl d Ar argument" @@ -88,7 +93,7 @@ .It Fl l Generate local preprocessor includes. This is used for bootstrapping -.Xr snmpd 1 . +.Xr bsnmpd 1 . .It Fl t Instead of normal output print the resulting tree. .It Fl p Ar prefix @@ -187,6 +192,6 @@ ) .Ed .Sh SEE ALSO -.Xr snmpd 1 +.Xr bsnmpd 1 .Sh AUTHORS .An Hartmut Brandt Aq harti@freebsd.org ==== //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#10 (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.43 2005/10/04 11:21:29 brandt_h Exp $ + * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.44 2006/02/14 09:04:17 brandt_h Exp $ * * Generate OID table from table description. * ==== //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.c#5 (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.29 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.c,v 1.31 2005/10/06 07:14:58 brandt_h Exp $ * * ASN.1 for SNMP. */ @@ -41,18 +41,10 @@ #include #endif #include + +#include "support.h" #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/trustedbsd/base/contrib/bsnmp/lib/asn1.h#5 (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.19 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.h,v 1.20 2005/10/05 16:43:11 brandt_h Exp $ * * ASN.1 for SNMP */ ==== //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpclient.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/snmpclient.c,v 1.34 2005/10/04 14:32:42 brandt_h Exp $ + * $Begemot: bsnmp/lib/snmpclient.c,v 1.36 2005/10/06 07:14:58 brandt_h Exp $ * * Support functions for SNMP clients. */ @@ -64,14 +64,6 @@ #include "snmpclient.h" #include "snmppriv.h" -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - - /* global context */ struct snmp_client snmp_client; ==== //depot/projects/trustedbsd/base/contrib/bsnmp/lib/support.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 + * Copyright (C) 2004-2005 * Hartmut Brandt. * All rights reserved. * @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/support.h,v 1.1 2004/08/06 08:47:59 brandt Exp $ + * $Begemot: bsnmp/lib/support.h,v 1.2 2005/10/06 07:14:59 brandt_h Exp $ * * Functions that are missing on certain systems. This header file is not * to be installed. @@ -68,4 +68,29 @@ #endif +/* + * For systems with missing stdint.h or inttypes.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 + +/* + * Systems missing SA_SIZE(). Taken from FreeBSD net/route.h:1.63 + */ +#ifndef SA_SIZE + +#define SA_SIZE(sa) \ + ( (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ? \ + sizeof(long) : \ + 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) ) + +#endif + #endif ==== //depot/projects/trustedbsd/base/contrib/bsnmp/oid-list#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$Begemot: bsnmp/oid-list,v 1.3 2005/05/23 09:03:22 brandt_h Exp $ +$Begemot: bsnmp/oid-list,v 1.5 2006/02/27 09:55:45 brandt_h Exp $ This file documents the OID assignments under BSNMP's private OID. @@ -11,11 +11,12 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module - 3 BEGEMOT-IP snmpd mibII module + 3 BEGEMOT-IP snmpd IP related stuff. 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) 201 BEGEMOT-NTP snmpd NTP module + 202 BEGEMOT-HOSTRES snmpd HOSTRES module private stuff 300 BEGEMOT-ACM DLR ACM project If you need an OID and don't know where to stuck it in, I can assign you one - ==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.23 2005/06/09 12:36:52 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.24 2006/02/14 09:04:18 brandt_h Exp $ * * Implementation of the standard interfaces and ip MIB. */ ==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.h#7 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.15 2005/06/09 12:36:53 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.16 2006/02/14 09:04:19 brandt_h Exp $ * * Implementation of the interfaces and IP groups of MIB-II. */ ==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.16 2005/11/02 12:07:40 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.17 2006/02/14 09:04:19 brandt_h Exp $ * * Interfaces group. */ ==== //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_route.c#6 (text+ko) ==== @@ -26,11 +26,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.7 2005/06/09 12:36:53 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.9 2005/10/06 07:15:00 brandt_h Exp $ * * Routing table >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 4 16:17: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 2061016A423; Sat, 4 Mar 2006 16:17: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 B713A16A420 for ; Sat, 4 Mar 2006 16:17: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 38D6543D49 for ; Sat, 4 Mar 2006 16:17: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 k24GHEOt055348 for ; Sat, 4 Mar 2006 16:17: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 k24GHBBF055318 for perforce@freebsd.org; Sat, 4 Mar 2006 16:17:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 16:17:11 GMT Message-Id: <200603041617.k24GHBBF055318@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 92728 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 Mar 2006 16:17:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92728 Change 92728 by rwatson@rwatson_zoo on 2006/03/04 16:16:37 Integrate TrustedBSD audit3 branch from TrustedBSD base branch. See @92726 for a list of changes. Among them is the loop back of pathname auditing for many VFS system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/MAINTAINERS#6 integrate .. //depot/projects/trustedbsd/audit3/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/Makefile.inc1#8 integrate .. //depot/projects/trustedbsd/audit3/README#2 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#9 integrate .. //depot/projects/trustedbsd/audit3/bin/chflags/chflags.1#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/NEWS#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/TODO#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/VERSION#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.1#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/asn1.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/asn1.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/snmpclient.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/support.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/oid-list#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_route.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_ntp/snmp_ntp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/bsnmpd.1#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/config.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/export.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/main.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/snmpd.config#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/snmpmod.3#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/snmpmod.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/GNUmakefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/TODO#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/attrstack.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/attrstack.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/config.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/config.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/csup.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/detailer.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/detailer.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/diff.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/diff.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fattr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fattr.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fattr_bsd.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fattr_posix.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fixups.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fixups.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fnmatch.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/fnmatch.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/globtree.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/globtree.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/keyword.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/keyword.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/lister.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/lister.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/main.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/main.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/misc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/misc.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/mux.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/mux.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/parse.y#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/pathcomp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/pathcomp.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/proto.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/proto.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/queue.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/status.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/status.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/stream.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/stream.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/threads.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/threads.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/token.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/token.l#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/updater.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/updater.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/man/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/man/mkfilters.1#3 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/periodic.conf#6 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.x11-4.dist#6 integrate .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/407.status-graid3#1 branch .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/408.status-gstripe#1 branch .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/409.status-gconcat#1 branch .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ipfw#5 integrate .. //depot/projects/trustedbsd/audit3/etc/snmpd.config#4 integrate .. //depot/projects/trustedbsd/audit3/include/printf.h#3 integrate .. //depot/projects/trustedbsd/audit3/include/resolv.h#4 integrate .. //depot/projects/trustedbsd/audit3/include/rpc/auth.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getaddrinfo.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_net.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_net_ntop.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_net_pton.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_comp.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_debug.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_query.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_send.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/auth_des.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/auth_none.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/auth_unix.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/clnt_dg.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/clnt_raw.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/clnt_simple.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/clnt_vc.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/getpublickey.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/key_call.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/mt_misc.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/mt_misc.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/rpc_com.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/rpc_generic.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/rpc_soc.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/rpcb_clnt.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_auth.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_dg.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_generic.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_raw.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_run.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_simple.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/svc_vc.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/xprintf_quote.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/a64l.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/gettimeofday.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/kldnext.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/pmc.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/amd64/amd64/context.S#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_cond.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_mutex.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_nanosleep.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/librt/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/lib/librt/aio.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/librt/mq.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/librt/sigev_thread.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/librt/sigev_thread.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/librt/timer.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_mutex.c#6 integrate .. //depot/projects/trustedbsd/audit3/libexec/ftpd/ftpd.c#6 integrate .. //depot/projects/trustedbsd/audit3/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#2 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#4 integrate .. //depot/projects/trustedbsd/audit3/release/doc/share/sgml/release.ent#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/bsdlabel/bsdlabel.8#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/dmesg/dmesg.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/dump/dump.8#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/dumpon/dumpon.8#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/fdisk_pc98/fdisk.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/fdisk_pc98/fdisk.c#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/shsec/geom_shsec.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifieee80211.c#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/init/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/kldunload/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/kldunload/kldunload.8#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/kldunload/kldunload.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount/mount.8#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/mount/mount.c#4 integrate .. //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#11 integrate .. //depot/projects/trustedbsd/audit3/share/examples/ipfilter/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/acpi.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/altq.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/cpufreq.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ddb.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/hwpmc.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/if_bridge.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/kbdmux.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_netflow.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/tdfx.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#10 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/periodic.conf.5#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man8/rc.subr.8#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/bus_dma.9#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/sleep.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/time.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/misc/bsd-family-tree#7 integrate .. //depot/projects/trustedbsd/audit3/share/mklocale/ko_KR.eucKR.src#2 integrate .. //depot/projects/trustedbsd/audit3/share/mklocale/zh_CN.GBK.src#2 integrate .. //depot/projects/trustedbsd/audit3/share/mklocale/zh_CN.eucCN.src#2 integrate .. //depot/projects/trustedbsd/audit3/share/mklocale/zh_TW.Big5.src#2 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/trap.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/apicvar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/mptable.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/isa/atpic.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/trap.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/undefined.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/pmap.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/i80321_aau.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#16 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#10 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#18 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kmod.mk#9 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options#10 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.i386#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.pc98#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-queue.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ce/tau32-ddk.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ce/tau32-ddk.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/de/if_de.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/de/if_devar.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fdc/fdc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iir/iir.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iir/iir.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/kbd/kbd.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/le/am7990.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/le/am79900.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_cnfg.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_ioc.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_type.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_debug.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mse/mse.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/lpt.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/ppi.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppc/ppc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/puc.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/puc_ebus.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/puc_sbus.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/re/if_re.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sio/sio.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sr/if_sr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/tdfx/tdfx_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_bus_ebus.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_core.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_dev_sab82532.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_dev_z8530.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_kbd_sun.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uhci.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uplcom.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_port.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usb_subr.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdivar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/vkbd/vkbd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/deadfs/dead_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nullfs/null_subr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/procfs/procfs_ctl.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_io.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/NOTES#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/PAE#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/XBOX#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/io_apic.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/local_apic.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/intr_machdep.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/mptable.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/xbox.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/isa/atpic.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_ptrace.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/isa/syscons_isa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#28 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_cpu.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_kse.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_kthread.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_malloc.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mbuf.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_resource.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_synch.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_tc.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_time.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_prf.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#32 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_aio.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#29 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/3dfx/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/3dfx_linux/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#9 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/ce/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/coda5/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/crypto/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/de/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/if_ef/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/if_ppp/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/kbdmux/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/uart/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bridgestp.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_bridge.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_vlan.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net/ppp_deflate.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_output.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/mld6.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/cbus/fdc.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/cbus/ppc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/cbus/sio.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/NOTES#9 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/dc21040reg.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/pci/if_de.c#6 delete .. //depot/projects/trustedbsd/audit3/sys/pci/if_devar.h#5 delete .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/trap.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/_types.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/bio.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mount.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/queue.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/serial.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/signalvar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#18 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#19 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#22 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/timers.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/vnode.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_alloc.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_extern.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_rawread.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/softdep.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_quota.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufsmount.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_contig.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_object.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vnode_pager.c#8 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/README#6 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ministat/ministat.c#4 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ncpus/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ncpus/acpi.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ncpus/acpidump.h#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ncpus/biosmptable.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ncpus/ncpus.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/netrate/http/http.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/netrate/httpd/httpd.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/.cvsignore#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/tbmaster.1#6 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/tbmaster.pl#6 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/tinderbox.1#5 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/tinderbox.pl#6 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/www/.cvsignore#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/tinderbox/www/index.cgi#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.freebsd#9 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/csup/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/tar/tree.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#15 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/hccontrol/info.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/hccontrol/link_control.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/hccontrol/util.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pmccontrol/pmccontrol.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/portsnap/portsnap/portsnap.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/quot/quot.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/anonFTP.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/config.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/devices.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/disks.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/dist.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/dmenu.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/http.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/index.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/installUpgrade.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/keymap.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/label.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/media.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/menus.c#8 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/options.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/package.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/sysinstall.h#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/system.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/tcpip.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/user.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/wizard.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/syslogd/syslog.conf.5#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/MAINTAINERS#6 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.128 2005/12/12 01:28:19 rodrigc Exp $ +$FreeBSD: src/MAINTAINERS,v 1.129 2006/03/04 14:24:32 rwatson Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -26,6 +26,8 @@ UFS EAs rwatson Pre-commit review requested. MAC Framework rwatson Pre-commit review requested. MAC Modules rwatson Pre-commit review requested. +contrib/openbsm rwatson Pre-commit review requested. +sys/security/audit rwatson Pre-commit review requested. ATA/IDE sos Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. ==== //depot/projects/trustedbsd/audit3/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.325 2005/11/28 11:14:36 ru Exp $ +# $FreeBSD: src/Makefile,v 1.326 2006/03/01 13:07:17 yar Exp $ # # The user-driven targets are: # @@ -93,11 +93,11 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \ - ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \ + ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \ -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ - (in /etc/make.conf) or command-line variable. + (in make.conf(5)) or command-line variable. .endif MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} BINMAKE= \ ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.535 2006/02/18 16:58:21 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.536 2006/02/27 09:17:39 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -506,7 +506,7 @@ # Check for missing UIDs/GIDs. # CHECK_UIDS= -CHECK_GIDS= +CHECK_GIDS= audit .if !defined(NO_SENDMAIL) CHECK_UIDS+= smmsp CHECK_GIDS+= smmsp ==== //depot/projects/trustedbsd/audit3/README#2 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: src/README,v 1.22 2003/03/08 10:01:26 markm Exp $ +$FreeBSD: src/README,v 1.23 2006/03/01 20:14:55 ceri Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -59,6 +59,8 @@ release Release building Makefile & associated tools. +rescue Build system for statically linked /rescue utilities. + sbin System commands. secure Cryptographic libraries and commands. ==== //depot/projects/trustedbsd/audit3/UPDATING#9 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20060303: + The TDFX_LINUX kernel option was retired and replaced by the + tdfx_linux device. The latter can be loaded as a kernel module. + Loading it alone should suffice to get 3dfx support for Linux + apps because it will pull in tdfx.ko and linux.ko through its + dependencies. + 20060201: The kernel ABI to file system modules was changed on i386. Please make sure that your kernel and modules are in sync. @@ -510,4 +517,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.439 2006/02/19 01:05:57 yar Exp $ +$FreeBSD: src/UPDATING,v 1.440 2006/03/03 21:37:38 yar Exp $ ==== //depot/projects/trustedbsd/audit3/bin/chflags/chflags.1#5 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.25 2005/06/14 08:25:54 ru Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.26 2006/03/04 02:38:40 trhodes Exp $ .\" -.Dd May 14, 2005 +.Dd March 3, 2006 .Dt CHFLAGS 1 .Os .Sh NAME @@ -120,6 +120,39 @@ clear the nodump flag (owner or super-user only) .El .Pp +A few of the octal values include: +.Bl -tag -offset indent -width ".Ar 10" +.It Li 0 +Clear all file flags. +.It Li 1 +Translates to the +.Ar nodump +keyword. +.It Li 2 +Translates to the +.Ar uchg +keyword. +.It Li 3 +Translates to the +.Ar uchg , nodump +keywords. +.It Li 4 +Translates to the +.Ar uappnd +keyword. +.It Li 10 +Translates to the +.Ar opaque +keyword. +.It Li 20 +translates to the +uunlnk +keyword. +.El +.Pp +Other combinations of keywords may be placed by using +the octets assigned; however, these are the most notable. +.Pp Unless the .Fl H , .Fl L , @@ -140,6 +173,14 @@ command's actions are determined by the last one specified. .Pp You can use "ls -lo" to see the flags of existing files. +.Pp +Note that the ability to change certain flags is dependent +on the current kernel +.Em securelevel +setting. +See +.Xr security 7 +for more information on this setting. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO @@ -147,6 +188,7 @@ .Xr chflags 2 , .Xr stat 2 , .Xr fts 3 , +.Xr security 7 , .Xr symlink 7 .Sh HISTORY The ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/NEWS#5 (text+ko) ==== @@ -1,3 +1,29 @@ +1.12 + A couple of man page fixes from various submitters. + + Make default communities NULL for security. + + Fix a core dump when -d tracing suboption has no argument (thanks + to Shteryana Shopova). + + Fix bug in parsing the include path in the daemon. + + Fix an uninitialize structure field in gensnmptree (thanks to + jasone@freebsdorg) + + 64bit HC counters in the IF-MIB by polling the OS periodically. + + Fix link traps to be more RFC conform (thanks to glebius@freebsd.org) + + Add fallback definition for SA_SIZE() to support.h. + + Move the porting definitions for U?INT32_{MIN,MAX} into support.h. + + Include a sys/tree.h from FreeBSD-current and add autoconf + check for it. + +1.11a Fix build of modules when stdint.h is included after asn1.h + 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 ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/TODO#2 (text+ko) ==== @@ -1,6 +1,3 @@ -snmpd_mibII: - - handle HC counters by periodically polling the kernel counters. - snmpd: - rethink transports a little bit: make them loadable and make a private subtree for transports: ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/VERSION#5 (text+ko) ==== @@ -1,1 +1,1 @@ -1.11 +1.12 ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.1#5 (text+ko) ==== @@ -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.5 2005/06/15 11:31:25 brandt_h Exp $ +.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.7 2006/02/27 09:52:08 brandt_h Exp $ .\" -.Dd June 14, 2005 +.Dd February 27, 2006 .Dt GENSNMPTREE 1 .Os .Sh NAME @@ -45,7 +45,7 @@ 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 -.Xr snmpd 1 +.Xr bsnmpd 1 daemon or for module writers. The second form may be used by SNMP client program writers. .Pp @@ -57,7 +57,7 @@ C-file .Ar prefix Ns tree.c containing a table used by -.Xr snmpd 1 +.Xr bsnmpd 1 during PDU processing and a header file .Ar prefix Ns tree.h @@ -70,14 +70,19 @@ .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 -.Va OID_ Ns Ar name -can be used as an array initialized to initialize a -.Va struct asn_oid . -The other define -.Va OIDLEN_ Ns Ar name -contains the length of the OID. +name emits three C preprocessor defines on its standard output: +.Bl -tag -width ".Va OIDLEN_ Ns Ar Name" +.It Va OIDX_ Ns Ar name +This define can be used to initialize a +.Va struct asn_oid +in the following way: +.Pp +.Dl const struct asn_oid oid_sysDescr = OIDX_sysDescr; +.It Va OIDLEN_ Ns Ar name +is the length of the OID. +.It Va OID_ Ns Ar name +is the last component of the OID. +.El .Pp The options are as follows: .Bl -tag -width ".Fl d Ar argument" @@ -88,7 +93,7 @@ .It Fl l Generate local preprocessor includes. This is used for bootstrapping -.Xr snmpd 1 . +.Xr bsnmpd 1 . .It Fl t Instead of normal output print the resulting tree. .It Fl p Ar prefix @@ -187,6 +192,6 @@ ) .Ed .Sh SEE ALSO -.Xr snmpd 1 +.Xr bsnmpd 1 .Sh AUTHORS .An Hartmut Brandt Aq harti@freebsd.org ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.c#5 (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.43 2005/10/04 11:21:29 brandt_h Exp $ + * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.44 2006/02/14 09:04:17 brandt_h Exp $ * * Generate OID table from table description. * ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/asn1.c#4 (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.29 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.c,v 1.31 2005/10/06 07:14:58 brandt_h Exp $ * * ASN.1 for SNMP. */ @@ -41,18 +41,10 @@ #include #endif #include + +#include "support.h" #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/trustedbsd/audit3/contrib/bsnmp/lib/asn1.h#4 (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.19 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.h,v 1.20 2005/10/05 16:43:11 brandt_h Exp $ * * ASN.1 for SNMP */ ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/snmpclient.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/snmpclient.c,v 1.34 2005/10/04 14:32:42 brandt_h Exp $ + * $Begemot: bsnmp/lib/snmpclient.c,v 1.36 2005/10/06 07:14:58 brandt_h Exp $ * * Support functions for SNMP clients. */ @@ -64,14 +64,6 @@ #include "snmpclient.h" #include "snmppriv.h" -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - - /* global context */ struct snmp_client snmp_client; ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/support.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 + * Copyright (C) 2004-2005 * Hartmut Brandt. * All rights reserved. * @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/support.h,v 1.1 2004/08/06 08:47:59 brandt Exp $ + * $Begemot: bsnmp/lib/support.h,v 1.2 2005/10/06 07:14:59 brandt_h Exp $ * * Functions that are missing on certain systems. This header file is not * to be installed. @@ -68,4 +68,29 @@ #endif +/* + * For systems with missing stdint.h or inttypes.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 + +/* + * Systems missing SA_SIZE(). Taken from FreeBSD net/route.h:1.63 + */ +#ifndef SA_SIZE + +#define SA_SIZE(sa) \ + ( (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ? \ + sizeof(long) : \ + 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) ) + +#endif + #endif ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/oid-list#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$Begemot: bsnmp/oid-list,v 1.3 2005/05/23 09:03:22 brandt_h Exp $ +$Begemot: bsnmp/oid-list,v 1.5 2006/02/27 09:55:45 brandt_h Exp $ This file documents the OID assignments under BSNMP's private OID. @@ -11,11 +11,12 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module - 3 BEGEMOT-IP snmpd mibII module + 3 BEGEMOT-IP snmpd IP related stuff. 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) 201 BEGEMOT-NTP snmpd NTP module + 202 BEGEMOT-HOSTRES snmpd HOSTRES module private stuff 300 BEGEMOT-ACM DLR ACM project If you need an OID and don't know where to stuck it in, I can assign you one - ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.23 2005/06/09 12:36:52 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.24 2006/02/14 09:04:18 brandt_h Exp $ * * Implementation of the standard interfaces and ip MIB. */ ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.15 2005/06/09 12:36:53 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.16 2006/02/14 09:04:19 brandt_h Exp $ * * Implementation of the interfaces and IP groups of MIB-II. */ ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.16 2005/11/02 12:07:40 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.17 2006/02/14 09:04:19 brandt_h Exp $ * * Interfaces group. */ ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_route.c#5 (text+ko) ==== @@ -26,11 +26,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.7 2005/06/09 12:36:53 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.9 2005/10/06 07:15:00 brandt_h Exp $ * * Routing table */ +#include "support.h" + +#ifdef HAVE_SYS_TREE_H #include +#else +#include "tree.h" +#endif + #include "mibII.h" #include "mibII_oid.h" ==== //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_tree.def#4 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 4 16:33: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 1482C16A424; Sat, 4 Mar 2006 16:33: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 BA2C416A420 for ; Sat, 4 Mar 2006 16:33: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 84B9643D46 for ; Sat, 4 Mar 2006 16:33: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 k24GXYjH059791 for ; Sat, 4 Mar 2006 16:33: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 k24GXYFK059788 for perforce@freebsd.org; Sat, 4 Mar 2006 16:33:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 16:33:34 GMT Message-Id: <200603041633.k24GXYFK059788@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 92729 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 Mar 2006 16:33:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=92729 Change 92729 by rwatson@rwatson_zoo on 2006/03/04 16:33:13 Remove dup audit_pipe.c in conf files -- a result of a mismerge. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/conf/files#19 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/conf/files#19 (text+ko) ==== @@ -1836,7 +1836,6 @@ rpc/rpcclnt.c optional nfsclient security/audit/audit.c optional audit security/audit/audit_arg.c optional audit -security/audit/audit_pipe.c optional audit security/audit/audit_bsm.c optional audit security/audit/audit_bsm_klib.c optional audit security/audit/audit_bsm_token.c optional audit From owner-p4-projects@FreeBSD.ORG Sat Mar 4 16:35: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 C538116A425; Sat, 4 Mar 2006 16:35: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 9D55516A420 for ; Sat, 4 Mar 2006 16:35: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 67CA943D49 for ; Sat, 4 Mar 2006 16:35: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 k24GZbGM059934 for ; Sat, 4 Mar 2006 16:35: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 k24GZbtZ059931 for perforce@freebsd.org; Sat, 4 Mar 2006 16:35:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 16:35:37 GMT Message-Id: <200603041635.k24GZbtZ059931@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 92730 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 Mar 2006 16:35:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=92730 Change 92730 by rwatson@rwatson_zoo on 2006/03/04 16:35:27 Remove XXX comment -- jhb has now fixed this :-). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.c#6 (text+ko) ==== @@ -215,9 +215,6 @@ if (uap->flags & IBCS2_X_OK) bsd_flags |= X_OK; - /* - * XXXRW: This should probably be kern_eaccess()? - */ CHECKALTEXIST(td, uap->path, &path); error = kern_eaccess(td, path, UIO_SYSSPACE, bsd_flags); free(path, M_TEMP); From owner-p4-projects@FreeBSD.ORG Sat Mar 4 16:37: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 BA4F416A423; Sat, 4 Mar 2006 16:37: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 92EF116A420 for ; Sat, 4 Mar 2006 16:37: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 5CE7943D53 for ; Sat, 4 Mar 2006 16:37: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 k24Gbekx060022 for ; Sat, 4 Mar 2006 16:37: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 k24GbeYr060019 for perforce@freebsd.org; Sat, 4 Mar 2006 16:37:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 16:37:40 GMT Message-Id: <200603041637.k24GbeYr060019@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 92731 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 Mar 2006 16:37:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=92731 Change 92731 by rwatson@rwatson_peppercorn on 2006/03/04 16:37:05 Correct typo in comment. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#43 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#43 (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/openbsm/libbsm/bsm_token.c#42 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#43 $ */ #include @@ -49,7 +49,7 @@ #endif /* !HAVE_ENDIAN_H */ #endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#endif /* !HAVE_SYS_ENDIANG_H */ +#endif /* !HAVE_SYS_ENDIAN_H */ #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ From owner-p4-projects@FreeBSD.ORG Sat Mar 4 16:38: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 8976116A423; Sat, 4 Mar 2006 16:38: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 639D316A420 for ; Sat, 4 Mar 2006 16:38: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 1AD8C43D46 for ; Sat, 4 Mar 2006 16:38: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 k24GcfXe060117 for ; Sat, 4 Mar 2006 16:38: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 k24Gcf3d060114 for perforce@freebsd.org; Sat, 4 Mar 2006 16:38:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 16:38:41 GMT Message-Id: <200603041638.k24Gcf3d060114@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 92732 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 Mar 2006 16:38:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=92732 Change 92732 by rwatson@rwatson_zoo on 2006/03/04 16:38:37 Integrate OpenBSM 1.0a5 comment spelling tweak. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#12 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#12 (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/contrib/openbsm/libbsm/bsm_token.c#11 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#12 $ */ #include @@ -49,7 +49,7 @@ #endif /* !HAVE_ENDIAN_H */ #endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#endif /* !HAVE_SYS_ENDIANG_H */ +#endif /* !HAVE_SYS_ENDIAN_H */ #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ From owner-p4-projects@FreeBSD.ORG Sat Mar 4 17:08: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 E4C3D16A423; Sat, 4 Mar 2006 17:08: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 BD6D416A420 for ; Sat, 4 Mar 2006 17:08: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 8800E43D45 for ; Sat, 4 Mar 2006 17:08: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 k24H8JmN069274 for ; Sat, 4 Mar 2006 17:08: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 k24H8JVL069271 for perforce@freebsd.org; Sat, 4 Mar 2006 17:08:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 17:08:19 GMT Message-Id: <200603041708.k24H8JVL069271@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 92736 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 Mar 2006 17:08:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=92736 Change 92736 by rwatson@rwatson_zoo on 2006/03/04 17:08:13 Trim Linux ifdefs from kernel version of bsm_token code. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#10 (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#9 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#10 $ */ #include @@ -410,17 +410,9 @@ ADD_U_INT16(dptr, pad0); -#ifdef HAVE_IPC_PERM___SEQ - ADD_U_INT16(dptr, perm->__seq); -#else ADD_U_INT16(dptr, perm->seq); -#endif -#ifdef HAVE_IPC_PERM___KEY - ADD_U_INT32(dptr, perm->__key); -#else ADD_U_INT32(dptr, perm->key); -#endif return (t); } From owner-p4-projects@FreeBSD.ORG Sat Mar 4 17:10: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 B4F4316A424; Sat, 4 Mar 2006 17:10: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 8829216A422 for ; Sat, 4 Mar 2006 17:10: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 4B04643D48 for ; Sat, 4 Mar 2006 17:10: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 k24HApd0069484 for ; Sat, 4 Mar 2006 17:10: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 k24HApQU069475 for perforce@freebsd.org; Sat, 4 Mar 2006 17:10:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 17:10:51 GMT Message-Id: <200603041710.k24HApQU069475@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 92737 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 Mar 2006 17:10:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92737 Change 92737 by rwatson@rwatson_zoo on 2006/03/04 17:10:50 Sync white space to FreeBSD CVS. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#11 (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#10 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#11 $ */ #include @@ -409,7 +409,6 @@ ADD_U_INT16(dptr, perm->mode); ADD_U_INT16(dptr, pad0); - ADD_U_INT16(dptr, perm->seq); ADD_U_INT32(dptr, perm->key); From owner-p4-projects@FreeBSD.ORG Sat Mar 4 17:26: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 A177916A423; Sat, 4 Mar 2006 17:26: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 7936F16A420 for ; Sat, 4 Mar 2006 17:26: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 40FE943D45 for ; Sat, 4 Mar 2006 17:26:11 +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 k24HQBpp070474 for ; Sat, 4 Mar 2006 17:26: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 k24HQAGc070471 for perforce@freebsd.org; Sat, 4 Mar 2006 17:26:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 17:26:10 GMT Message-Id: <200603041726.k24HQAGc070471@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 92740 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 Mar 2006 17:26:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=92740 Change 92740 by rwatson@rwatson_fledge on 2006/03/04 17:26:10 Add OpenBSM 1.0 alpha 5 to the TrustedBSD web site. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#6 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#6 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#5 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#6 $ @@ -81,6 +81,13 @@ created by McAfee Research under contract to Apple Computer, and has since been extended by the volunteer TrustedBSD team.

+

2006-03-04 - OpenBSM 1.0 alpha 5 release is a test release of the + OpenBSM code base, and matches what is present in FreeBSD CVS at + this date. The primary change from alpha 4 is the introduction of + autoconf/automake support, which allows it to build on Darwin and + Linux. Download. +

+

2006-02-23 - OpenBSM 1.0 alpha 4 release is an initial test release of the OpenBSM code base, and matches what is present in FreeBSD CVS at this date. Download. From owner-p4-projects@FreeBSD.ORG Sat Mar 4 22:54: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 8DC7C16A424; Sat, 4 Mar 2006 22:54: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 5C05816A420 for ; Sat, 4 Mar 2006 22:54: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 7F1BE43D46 for ; Sat, 4 Mar 2006 22:54: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 k24MsQEg091576 for ; Sat, 4 Mar 2006 22:54: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 k24MsPFi091573 for perforce@freebsd.org; Sat, 4 Mar 2006 22:54:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Mar 2006 22:54:25 GMT Message-Id: <200603042254.k24MsPFi091573@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 92749 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 Mar 2006 22:54:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=92749 Change 92749 by rwatson@rwatson_zoo on 2006/03/04 22:54:15 Integrate TrustedBSD base branch from FreeBSD CVS: - OpenBSM 1.0 alpha 5 loop back. - dwmalone's structural improvements to mac_bsdextended. Affected files ... .. //depot/projects/trustedbsd/base/contrib/openbsm/CHANGELOG#3 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/HISTORY#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/TODO#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/aclocal.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/autogen.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_internal.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/compat/endian.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/compat/queue.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.guess#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.h.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.sub#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/depcomp#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/install-sh#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/ltmain.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/missing#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/configure#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/configure.ac#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_mask.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_notify.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_user.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_wrappers.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/Makefile#3 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/man/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/man/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/Makefile.am#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/lib/libutil/pidfile.3#4 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit.h#3 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#13 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label_ufs.c#7 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/crypto.c#13 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#21 integrate .. //depot/projects/trustedbsd/base/usr.bin/finger/sprint.c#8 integrate Differences ... ==== //depot/projects/trustedbsd/base/contrib/openbsm/FREEBSD-upgrade#2 (text) ==== @@ -1,7 +1,33 @@ Upgrade Instructions for OpenBSM -------------------------------- -Currently this is very straight forward: +OpenBSM integrates into the FreeBSD source tree in several places: + +src/contrib/openbsm The OpenBSM distribution itself +src/sys/bsm Modified versions of some bsm/ include files +src/sys/security/audit Kernel audit framework, some OpenBSM-based files +src/usr.sbin/*audit* Makefiles for various OpenBSM tools +src/etc/Makefile Installation of /etc OpenBSM files +src/lib/libbsm/* Build for OpenBSM library + +OpenBSM is normally built using an integrated autoconf/automake build +system. For the purposes of tight integration with FreeBSD, we use an +adapted BSD make (bmake) build system loosely based on the autmake +setup. We also rely on a static config.h generated when OpenBSM is +imported, rather than re-configuring every build. This leads to a +more reproduceable build environment, and avoids dependence on things +not in the base tree (i.e., autoconf, automake, GNU make, etc). An +upgrade of OpenBSM generally involves the following steps: + +- Vendor import of OpenBSM into src/contrib. +- Run configure, commit src/contrib/openbsm/config/config.h. +- Replication of src/contrib/openbsm/bsm changes into src/sys/bsm. +- Possible updates to src/sys/security/audit, especially relating to + bsm_token.c. +- Update any library, tool, or etc BSD Makefiles to add new files, + defines, or other generally useful or necessary things. + +Normally, the CVS vendor import goes along the following lines: cd ~/p4/projects/trustedbsd/openbsm cvs -d rwatson@repoman.FreeBSD.org:/home/ncvs -q import src/contrib/openbsm \ @@ -10,10 +36,9 @@ Replacing the version string as required. Use the "-n" argument to CVS to do a test run. -Right now, no local FreeBSD modification or configuration is required. In -future OpenBSM versions, this is likely to change. +Propagation of changes to src/sys/{bsm,security/audit} is something that +requires careful coordination and attention to detail. These files are +not on CVS vendor branches, but do have the same local vs. vendor merge +issues. -After importing OpenBSM, make sure to propagate any changes to files that -appear in both contrib/openbsm/bsm and sys/bsm. - -$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.2 2006/02/06 00:03:39 rwatson Exp $ +$FreeBSD: src/contrib/openbsm/FREEBSD-upgrade,v 1.3 2006/03/04 16:50:04 rwatson Exp $ ==== //depot/projects/trustedbsd/base/contrib/openbsm/README#3 (text) ==== @@ -25,26 +25,34 @@ Building -OpenBSM is currently built using a series of BSD make files which should -work on both FreeBSD and Darwin. One known issue is that versions of -Darwin prior to 10.3.8 have a nested include of "sys/audit.h" from -"sys/proc.h", which can result in type definition conflicts. If running -with include files from an earlier version of Darwin, the nested include -must be manually removed in order that libbsm can be built, due to -potentially conflicting types resulting from an include of "sys/sysctl.h" -by that file. On Darwin, the use of BSD make must be specified explicitly -by using "bsdmake" rather than "make", which on Darwin refers to GNU make. -Typical invocations from the OpenBSM tree root: +OpenBSM is currently built using autoconf and automake, which should allow +for building on a range of operating systems, including FreeBSD, Mac OS X, +and Linux. Depending on the availability of audit facailities in the +underlying operating system, some components that depend on kernel audit +support are built conditionally. Typically, build will be performed using + + ./configure + make + +To install, use: -FreeBSD + make install - % make - # make install +You may wish to specify that the OpenBSM components not be installed in the +base system, rather in a specific directory. This may be done using the +--prefix argument to configure. If installing to a specific directory, +remember to update your library path so that running tools from that +directory the correct libbsm is used: -Darwin + ./configure --prefix=/home/rwatson/openbsm + make + make install + LD_LIBRARY_PATH=/home/rwatson/openbsm/libbsm ; export LD_LIBRARY_PATH - % bsdmake - # bsdmake install +You will need to manually propagate openbsm/etc/* into /etc on your system; +this is not done automatically so as to avoid disrupting the current +configuration. Currently, the locations of these files is not +configurable. Credits @@ -65,6 +73,7 @@ Christian Brueffer Olivier Houchard Christian Peron + Martin Fong 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 @@ -86,4 +95,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#14 $ +$P4: //depot/projects/trustedbsd/openbsm/README#16 $ ==== //depot/projects/trustedbsd/base/contrib/openbsm/TODO#2 (text) ==== @@ -8,5 +8,10 @@ - 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. +- With the move to autoconf/automake, man page symlinks are no longer + installed. This needs to be fixed. +- It might be desirable to be able to provide EOPNOTSUPP system call stubs + on systems that don't have the necessary audit system calls; that would + allow the full libbsm and tool set to build, just not run. -$P4: //depot/projects/trustedbsd/openbsm/TODO#4 $ +$P4: //depot/projects/trustedbsd/openbsm/TODO#5 $ ==== //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/audit.c#3 (text) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#6 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include ==== //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/audit_warn.c#2 (text) ==== @@ -30,12 +30,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#6 $ */ #include + +#include +#include #include -#include #include "auditd.h" ==== //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.c#3 (text) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 $ */ #include @@ -795,7 +795,11 @@ } } +#ifdef LOG_SECURITY openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); +#else + openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); +#endif syslog(LOG_INFO, "starting...\n"); if (debug == 0 && daemon(0, 0) == -1) { ==== //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit.h#2 (text) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 $ */ #ifndef _BSM_AUDIT_H @@ -240,25 +240,11 @@ }; 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; -}; +/* + * Contents of token_t are opaque outside of libbsm. + */ typedef struct au_token token_t; -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. */ @@ -310,6 +296,9 @@ }; typedef struct au_evclass_map au_evclass_map_t; +/* + * Audit system calls. + */ #if !defined(_KERNEL) && !defined(KERNEL) int audit(const void *, int); int auditon(int, void *, int); ==== //depot/projects/trustedbsd/base/contrib/openbsm/bsm/audit_internal.h#2 (text) ==== @@ -34,11 +34,15 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 $ */ -#ifndef _LIBBSM_INTERNAL_H -#define _LIBBSM_INTERNAL_H +#ifndef _AUDIT_INTERNAL_H +#define _AUDIT_INTERNAL_H + +#if defined(__linux__) && !defined(__unused) +#define __unused +#endif /* * audit_internal.h contains private interfaces that are shared by user space @@ -47,7 +51,23 @@ * broken with future releases of OpenBSM, which may delete, modify, or * otherwise break these interfaces or the assumptions they rely on. */ +struct au_token { + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; +}; + +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; + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. @@ -96,4 +116,4 @@ #define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size) -#endif /* !_LIBBSM_INTERNAL_H_ */ +#endif /* !_AUDIT_INTERNAL_H_ */ ==== //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#3 (text) ==== @@ -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#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#18 $ */ #ifndef _LIBBSM_H_ @@ -42,9 +42,9 @@ #include #include -#include #include /* Required for audit.h. */ +#include /* Required for clock_t on Linux. */ #include #include ==== //depot/projects/trustedbsd/base/contrib/openbsm/compat/endian.h#2 (text) ==== @@ -25,18 +25,13 @@ * SUCH DAMAGE. * * Derived from FreeBSD src/sys/sys/endian.h:1.6. - * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#7 $ */ #ifndef _COMPAT_ENDIAN_H_ #define _COMPAT_ENDIAN_H_ /* - * Pick up value of BYTE_ORDER/_BYTE_ORDER if not yet included. - */ -#include - -/* * Some systems will have the uint/int types defined here already, others * will need stdint.h. */ ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_audit.c#2 (text) ==== @@ -30,11 +30,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/libbsm/bsm_audit.c#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 $ */ #include + +#include +#ifdef HAVE_FULL_QUEUE_H #include +#else +#include +#endif #include #include @@ -256,11 +262,13 @@ pthread_mutex_unlock(&mutex); } +#ifdef HAVE_AUDIT_SYSCALLS /* * Add the header token, identify any missing tokens. Write out the tokens to * the record memory and finally, call audit. */ -int au_close(int d, int keep, short event) +int +au_close(int d, int keep, short event) { au_record_t *rec; size_t tot_rec_size; @@ -308,6 +316,7 @@ au_teardown(rec); return (retval); } +#endif /* HAVE_AUDIT_SYSCALLS */ /* * au_close(), except onto an in-memory buffer. Buffer size as an argument, ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_io.c#2 (text) ==== @@ -31,15 +31,32 @@ * 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#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 $ */ #include -#ifdef __APPLE__ + +#include +#ifdef HAVE_SYS_ENDIAN_H +#include +#else /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_MACHINE_ENDIAN_H +#include +#else /* !HAVE_MACHINE_ENDIAN_H */ +#ifdef HAVE_ENDIAN_H +#include +#else /* !HAVE_ENDIAN_H */ +#error "No supported endian.h" +#endif /* !HAVE_ENDIAN_H */ +#endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#else /* !__APPLE__ */ -#include -#endif /* __APPLE__*/ +#endif /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ + #include #include @@ -381,10 +398,7 @@ break; case AU_IPv6: - ipv6.__u6_addr.__u6_addr32[0] = ipaddr[0]; - ipv6.__u6_addr.__u6_addr32[1] = ipaddr[1]; - ipv6.__u6_addr.__u6_addr32[2] = ipaddr[2]; - ipv6.__u6_addr.__u6_addr32[3] = ipaddr[3]; + bcopy(ipaddr, &ipv6, sizeof(ipv6)); fprintf(fp, "%s", inet_ntop(AF_INET6, &ipv6, dst, INET6_ADDRSTRLEN)); break; ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_mask.c#2 (text) ==== @@ -27,11 +27,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/libbsm/bsm_mask.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#13 $ */ #include + +#include +#ifdef HAVE_FULL_QUEUE_H #include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ #include ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_notify.c#3 (text) ==== @@ -26,18 +26,30 @@ * 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#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 $ */ /* * Based on sample code from Marc Majka. */ -#include /* strerror() */ -#include /* errno */ +#include + +#include +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ + +#include #include -#include /* uint32_t */ -#include /* syslog() */ -#include /* syslog() */ + +#include +#include +#include +#include +#include + #ifdef __APPLE__ #include ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_token.c#2 (text) ==== @@ -30,15 +30,32 @@ * 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#34 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#43 $ */ #include -#ifdef __APPLE__ + +#include +#ifdef HAVE_SYS_ENDIAN_H +#include +#else /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_MACHINE_ENDIAN_H +#include +#else /* !HAVE_MACHINE_ENDIAN_H */ +#ifdef HAVE_ENDIAN_H +#include +#else /* !HAVE_ENDIAN_H */ +#error "No supported endian.h" +#endif /* !HAVE_ENDIAN_H */ +#endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#else /* !__APPLE__ */ -#include -#endif /* __APPLE__*/ +#endif /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ + #include #include #include @@ -352,10 +369,7 @@ ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, internet_addr, sizeof(*internet_addr)); return (t); } @@ -448,9 +462,18 @@ ADD_U_INT16(dptr, perm->mode); ADD_U_INT16(dptr, pad0); + +#ifdef HAVE_IPC_PERM___SEQ + ADD_U_INT16(dptr, perm->__seq); +#else ADD_U_INT16(dptr, perm->seq); +#endif +#ifdef HAVE_IPC_PERM___KEY + ADD_U_INT32(dptr, perm->__key); +#else ADD_U_INT32(dptr, perm->key); +#endif return (t); } @@ -781,50 +804,6 @@ /* * token ID 1 byte - * socket type 2 bytes - * local port 2 bytes - * local Internet address 4 bytes - * remote port 2 bytes - * remote Internet address 4 bytes - */ -token_t * -au_to_socket(struct socket *so) -{ - - errno = ENOTSUP; - return (NULL); -} - -/* - * token ID 1 byte - * socket type 2 bytes - * local port 2 bytes - * address type/length 4 bytes - * local Internet address 4 bytes/16 bytes (IPv4/IPv6 address) - * remote port 4 bytes - * address type/length 4 bytes - * remote Internet address 4 bytes/16 bytes (IPv4/IPv6 address) - */ -token_t * -au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, struct sockaddr *la, - struct sockaddr *ra) -{ - - errno = ENOTSUP; - return (NULL); -} - -token_t * -au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, struct sockaddr *la, - struct sockaddr *ra) -{ - - errno = ENOTSUP; - return (NULL); -} - -/* - * token ID 1 byte * socket family 2 bytes * path 104 bytes */ @@ -898,10 +877,7 @@ ADD_U_CHAR(dptr, so->sin6_family); ADD_U_INT16(dptr, so->sin6_port); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[0]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[1]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[2]); - ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[3]); + ADD_MEM(dptr, &so->sin6_addr, sizeof(so->sin6_addr)); return (t); @@ -1031,7 +1007,7 @@ tid)); } -#if !defined(_KERNEL) && !defined(KERNEL) +#if !defined(_KERNEL) && !defined(KERNEL) && defined(HAVE_AUDIT_SYSCALLS) /* * Collects audit information for the current process * and creates a subject token from it ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_user.c#2 (text) ==== @@ -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#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_wrappers.c#3 (text) ==== @@ -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#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 $ */ #ifdef __APPLE__ @@ -35,6 +35,11 @@ #include #include + +#ifdef __APPLE__ +#include /* Our bsm/audit.h doesn't include queue.h. */ +#endif + #include #include @@ -56,7 +61,11 @@ if (p == NULL) return (kAUBadParamErr); +#ifdef NODEV *p = NODEV; +#else + *p = -1; +#endif /* for /usr/bin/login, try fstat() first */ if (fstat(STDIN_FILENO, &st) != 0) { @@ -78,6 +87,8 @@ int audit_set_terminal_host(uint32_t *m) { + +#ifdef KERN_HOSTID int name[2] = { CTL_KERN, KERN_HOSTID }; size_t len; @@ -90,6 +101,10 @@ return (kAUSysctlErr); } return (kAUNoErr); +#else + *m = -1; + return (kAUNoErr); +#endif } int ==== //depot/projects/trustedbsd/base/lib/libutil/pidfile.3#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libutil/pidfile.3,v 1.4 2006/01/28 14:13:15 pjd Exp $ +.\" $FreeBSD: src/lib/libutil/pidfile.3,v 1.5 2006/03/04 15:20:28 keramida Exp $ .\" .Dd August 22, 2005 .Dt PIDFILE 3 @@ -120,8 +120,8 @@ pfh = pidfile_open("/var/run/daemon.pid", 0600, &otherpid); if (pfh == NULL) { if (errno == EEXIST) { - errx(EXIT_FAILURE, "Daemon already running, pid: %d.", - (int)otherpid); + errx(EXIT_FAILURE, "Daemon already running, pid: %jd.", + (intmax_t)otherpid); } /* If we cannot create pidfile from other reasons, only warn. */ warn("Cannot open or create pidfile"); @@ -147,7 +147,7 @@ /* Do child work. */ break; default: - syslog(LOG_INFO, "Child %d started.", (int)childpid); + syslog(LOG_INFO, "Child %jd started.", (intmax_t)childpid); break; } } ==== //depot/projects/trustedbsd/base/sys/bsm/audit.h#3 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/base/sys/bsm/audit.h#2 $ - * $FreeBSD: src/sys/bsm/audit.h,v 1.2 2006/02/01 19:54:22 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/base/sys/bsm/audit.h#3 $ + * $FreeBSD: src/sys/bsm/audit.h,v 1.3 2006/03/04 16:54:21 rwatson Exp $ */ #ifndef _BSM_AUDIT_H @@ -258,25 +258,11 @@ }; 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; -}; +/* + * Contents of token_t are opaque outside of libbsm. + */ typedef struct au_token token_t; -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. */ @@ -328,6 +314,9 @@ }; typedef struct au_evclass_map au_evclass_map_t; +/* + * Audit system calls. + */ #if !defined(_KERNEL) && !defined(KERNEL) int audit(const void *, int); int auditon(int, void *, int); ==== //depot/projects/trustedbsd/base/sys/bsm/audit_internal.h#2 (text) ==== @@ -34,12 +34,16 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#5 $ - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.1 2006/02/01 19:54:22 rwatson Exp $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#7 $ + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.2 2006/03/04 16:54:21 rwatson Exp $ */ -#ifndef _LIBBSM_INTERNAL_H -#define _LIBBSM_INTERNAL_H +#ifndef _AUDIT_INTERNAL_H +#define _AUDIT_INTERNAL_H + +#if defined(__linux__) && !defined(__unused) +#define __unused +#endif /* * audit_internal.h contains private interfaces that are shared by user space @@ -48,7 +52,23 @@ * broken with future releases of OpenBSM, which may delete, modify, or * otherwise break these interfaces or the assumptions they rely on. */ +struct au_token { + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; +}; +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; + + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. @@ -97,4 +117,4 @@ #define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size) -#endif /* !_LIBBSM_INTERNAL_H_ */ +#endif /* !_AUDIT_INTERNAL_H_ */ ==== //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#13 (text+ko) ==== @@ -92,7 +92,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.18 2006/02/28 07:44:50 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.19 2006/03/04 21:46:34 mjacob Exp $"); #include #include /* XXX For static handler registration */ @@ -502,12 +502,12 @@ handled += pers->event(mpt, req, msg); if (handled == 0 && mpt->mpt_pers_mask == 0) { - mpt_lprt(mpt, MPT_PRT_WARN, + mpt_lprt(mpt, MPT_PRT_INFO, "No Handlers For Any Event Notify Frames. " "Event %#x (ACK %sequired).\n", msg->Event, msg->AckRequired? "r" : "not r"); } else if (handled == 0) { - mpt_prt(mpt, + mpt_lprt(mpt, MPT_PRT_WARN, "Unhandled Event Notify Frame. Event %#x " "(ACK %sequired).\n", msg->Event, msg->AckRequired? "r" : "not r"); ==== //depot/projects/trustedbsd/base/sys/geom/label/g_label_ufs.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ufs.c,v 1.9 2006/02/18 10:59:47 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/label/g_label_ufs.c,v 1.10 2006/03/04 19:41:54 pjd Exp $"); #include #include @@ -78,8 +78,13 @@ if (fs == NULL) continue; /* Check for magic and make sure things are the right size */ - if (fs->fs_magic != FS_UFS1_MAGIC && - fs->fs_magic != FS_UFS2_MAGIC) { + if (fs->fs_magic == FS_UFS1_MAGIC && + fs->fs_old_size * fs->fs_fsize == (int32_t)pp->mediasize) { + /* Valid UFS1. */ + } else if (fs->fs_magic == FS_UFS2_MAGIC && fs->fs_fsize > 0 && + pp->mediasize / fs->fs_fsize == fs->fs_size) { + /* Valid UFS2. */ + } else { g_free(fs); >>> TRUNCATED FOR MAIL (1000 lines) <<<