From owner-p4-projects@FreeBSD.ORG Sun Oct 1 00:19: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 4356016A416; Sun, 1 Oct 2006 00:19:08 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE68416A412 for ; Sun, 1 Oct 2006 00:19:07 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 473E143D66 for ; Sun, 1 Oct 2006 00:19:03 +0000 (GMT) (envelope-from attilio@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k910J3Yf029603 for ; Sun, 1 Oct 2006 00:19:03 GMT (envelope-from attilio@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k910J2vt029600 for perforce@freebsd.org; Sun, 1 Oct 2006 00:19:02 GMT (envelope-from attilio@FreeBSD.org) Date: Sun, 1 Oct 2006 00:19:02 GMT Message-Id: <200610010019.k910J2vt029600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to attilio@FreeBSD.org using -f From: Attilio Rao To: Perforce Change Reviews Cc: Subject: PERFORCE change 107024 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 00:19:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=107024 Change 107024 by attilio@attilio_laptop on 2006/10/01 00:18:32 restyle them. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/rio500_usb.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/udbp.h#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/rio500_usb.h#4 (text+ko) ==== @@ -29,16 +29,16 @@ struct RioCommand { #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - u_int16_t length; + uint16_t length; #else - short length; + short length; #endif - int request; - int requesttype; - int value; - int index; - void *buffer; - int timeout; + int request; + int requesttype; + int value; + int index; + void *buffer; + int timeout; }; #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ==== //depot/projects/usb/src/sys/dev/usb/udbp.h#4 (text+ko) ==== @@ -37,20 +37,20 @@ * $FreeBSD: src/sys/dev/usb/udbp.h,v 1.4 2005/01/06 01:43:28 imp Exp $ */ -#ifndef _NETGRAPH_UDBP_H_ -#define _NETGRAPH_UDBP_H_ +#ifndef _NETGRAPH_UDBP_H_ +#define _NETGRAPH_UDBP_H_ /* Node type name. This should be unique among all netgraph node types */ -#define NG_UDBP_NODE_TYPE "udbp" +#define NG_UDBP_NODE_TYPE "udbp" /* Node type cookie. Should also be unique. This value MUST change whenever an incompatible change is made to this header file, to insure consistency. The de facto method for generating cookies is to take the output of the date command: date -u +'%s' */ -#define NGM_UDBP_COOKIE 944609300 +#define NGM_UDBP_COOKIE 944609300 -#define NG_UDBP_HOOK_NAME "data" +#define NG_UDBP_HOOK_NAME "data" /* Netgraph commands understood by this node type */ enum { @@ -60,8 +60,8 @@ /* This structure is returned by the NGM_UDBP_GET_STATUS command */ struct ngudbpstat { - u_int packets_in; /* packets in from downstream */ - u_int packets_out; /* packets out towards downstream */ + uint packets_in; /* packets in from downstream */ + uint packets_out; /* packets out towards downstream */ }; /* @@ -71,10 +71,10 @@ * * This needs to be kept in sync with the above structure definition */ -#define NG_UDBP_STATS_TYPE_INFO { \ - { "packets_in", &ng_parse_int32_type }, \ - { "packets_out", &ng_parse_int32_type }, \ - { NULL }, \ +#define NG_UDBP_STATS_TYPE_INFO { \ + { "packets_in", &ng_parse_int32_type }, \ + { "packets_out", &ng_parse_int32_type }, \ + { NULL }, \ } #endif /* _NETGRAPH_UDBP_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Oct 1 05:27: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 239E816BDF9; Sun, 1 Oct 2006 05:25:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E911316A8AE for ; Sun, 1 Oct 2006 05:25:10 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B162B43D55 for ; Sun, 1 Oct 2006 05:25:03 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k915P3fX068663 for ; Sun, 1 Oct 2006 05:25:03 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k915P2RF068648 for perforce@freebsd.org; Sun, 1 Oct 2006 05:25:02 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 1 Oct 2006 05:25:02 GMT Message-Id: <200610010525.k915P2RF068648@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 107028 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 05:27:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=107028 Change 107028 by mjacob@mjexp on 2006/10/01 05:13:15 IFC Affected files ... .. //depot/projects/mjexp/COPYRIGHT#1 branch .. //depot/projects/mjexp/LOCKS#1 branch .. //depot/projects/mjexp/MAINTAINERS#1 branch .. //depot/projects/mjexp/Makefile#1 branch .. //depot/projects/mjexp/Makefile.inc1#1 branch .. //depot/projects/mjexp/ObsoleteFiles.inc#1 branch .. //depot/projects/mjexp/README#1 branch .. //depot/projects/mjexp/UPDATING#1 branch .. //depot/projects/mjexp/bin/Makefile#1 branch .. //depot/projects/mjexp/bin/Makefile.inc#1 branch .. //depot/projects/mjexp/bin/cat/Makefile#1 branch .. //depot/projects/mjexp/bin/cat/cat.1#1 branch .. //depot/projects/mjexp/bin/cat/cat.c#1 branch .. //depot/projects/mjexp/bin/chflags/Makefile#1 branch .. //depot/projects/mjexp/bin/chflags/chflags.1#1 branch .. //depot/projects/mjexp/bin/chflags/chflags.c#1 branch .. //depot/projects/mjexp/bin/chio/Makefile#1 branch .. //depot/projects/mjexp/bin/chio/chio.1#1 branch .. //depot/projects/mjexp/bin/chio/chio.c#1 branch .. //depot/projects/mjexp/bin/chio/defs.h#1 branch .. //depot/projects/mjexp/bin/chio/pathnames.h#1 branch .. //depot/projects/mjexp/bin/chmod/Makefile#1 branch .. //depot/projects/mjexp/bin/chmod/chmod.1#1 branch .. //depot/projects/mjexp/bin/chmod/chmod.c#1 branch .. //depot/projects/mjexp/bin/cp/Makefile#1 branch .. //depot/projects/mjexp/bin/cp/cp.1#1 branch .. //depot/projects/mjexp/bin/cp/cp.c#1 branch .. //depot/projects/mjexp/bin/cp/extern.h#1 branch .. //depot/projects/mjexp/bin/cp/utils.c#1 branch .. //depot/projects/mjexp/bin/csh/Makefile#1 branch .. //depot/projects/mjexp/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/mjexp/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/mjexp/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/mjexp/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/mjexp/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/mjexp/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/mjexp/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/mjexp/bin/csh/config.h#1 branch .. //depot/projects/mjexp/bin/csh/config_p.h#1 branch .. //depot/projects/mjexp/bin/csh/host.defs#1 branch .. //depot/projects/mjexp/bin/csh/iconv.h#1 branch .. //depot/projects/mjexp/bin/csh/iconv_stub.c#1 branch .. //depot/projects/mjexp/bin/date/Makefile#1 branch .. //depot/projects/mjexp/bin/date/date.1#1 branch .. //depot/projects/mjexp/bin/date/date.c#1 branch .. //depot/projects/mjexp/bin/date/extern.h#1 branch .. //depot/projects/mjexp/bin/date/netdate.c#1 branch .. //depot/projects/mjexp/bin/date/vary.c#1 branch .. //depot/projects/mjexp/bin/date/vary.h#1 branch .. //depot/projects/mjexp/bin/dd/Makefile#1 branch .. //depot/projects/mjexp/bin/dd/args.c#1 branch .. //depot/projects/mjexp/bin/dd/conv.c#1 branch .. //depot/projects/mjexp/bin/dd/conv_tab.c#1 branch .. //depot/projects/mjexp/bin/dd/dd.1#1 branch .. //depot/projects/mjexp/bin/dd/dd.c#1 branch .. //depot/projects/mjexp/bin/dd/dd.h#1 branch .. //depot/projects/mjexp/bin/dd/extern.h#1 branch .. //depot/projects/mjexp/bin/dd/gen.c#1 branch .. //depot/projects/mjexp/bin/dd/misc.c#1 branch .. //depot/projects/mjexp/bin/dd/position.c#1 branch .. //depot/projects/mjexp/bin/dd/ref.ascii#1 branch .. //depot/projects/mjexp/bin/dd/ref.ebcdic#1 branch .. //depot/projects/mjexp/bin/dd/ref.ibm#1 branch .. //depot/projects/mjexp/bin/dd/ref.lcase#1 branch .. //depot/projects/mjexp/bin/dd/ref.oldascii#1 branch .. //depot/projects/mjexp/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/mjexp/bin/dd/ref.oldibm#1 branch .. //depot/projects/mjexp/bin/dd/ref.pareven#1 branch .. //depot/projects/mjexp/bin/dd/ref.parnone#1 branch .. //depot/projects/mjexp/bin/dd/ref.parodd#1 branch .. //depot/projects/mjexp/bin/dd/ref.parset#1 branch .. //depot/projects/mjexp/bin/dd/ref.swab#1 branch .. //depot/projects/mjexp/bin/dd/ref.ucase#1 branch .. //depot/projects/mjexp/bin/df/Makefile#1 branch .. //depot/projects/mjexp/bin/df/df.1#1 branch .. //depot/projects/mjexp/bin/df/df.c#1 branch .. //depot/projects/mjexp/bin/domainname/Makefile#1 branch .. //depot/projects/mjexp/bin/domainname/domainname.1#1 branch .. //depot/projects/mjexp/bin/domainname/domainname.c#1 branch .. //depot/projects/mjexp/bin/echo/Makefile#1 branch .. //depot/projects/mjexp/bin/echo/echo.1#1 branch .. //depot/projects/mjexp/bin/echo/echo.c#1 branch .. //depot/projects/mjexp/bin/ed/Makefile#1 branch .. //depot/projects/mjexp/bin/ed/POSIX#1 branch .. //depot/projects/mjexp/bin/ed/README#1 branch .. //depot/projects/mjexp/bin/ed/buf.c#1 branch .. //depot/projects/mjexp/bin/ed/cbc.c#1 branch .. //depot/projects/mjexp/bin/ed/ed.1#1 branch .. //depot/projects/mjexp/bin/ed/ed.h#1 branch .. //depot/projects/mjexp/bin/ed/glbl.c#1 branch .. //depot/projects/mjexp/bin/ed/io.c#1 branch .. //depot/projects/mjexp/bin/ed/main.c#1 branch .. //depot/projects/mjexp/bin/ed/re.c#1 branch .. //depot/projects/mjexp/bin/ed/sub.c#1 branch .. //depot/projects/mjexp/bin/ed/test/=.err#1 branch .. //depot/projects/mjexp/bin/ed/test/Makefile#1 branch .. //depot/projects/mjexp/bin/ed/test/README#1 branch .. //depot/projects/mjexp/bin/ed/test/TODO#1 branch .. //depot/projects/mjexp/bin/ed/test/a.d#1 branch .. //depot/projects/mjexp/bin/ed/test/a.r#1 branch .. //depot/projects/mjexp/bin/ed/test/a.t#1 branch .. //depot/projects/mjexp/bin/ed/test/a1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/a2.err#1 branch .. //depot/projects/mjexp/bin/ed/test/addr.d#1 branch .. //depot/projects/mjexp/bin/ed/test/addr.r#1 branch .. //depot/projects/mjexp/bin/ed/test/addr.t#1 branch .. //depot/projects/mjexp/bin/ed/test/addr1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/addr2.err#1 branch .. //depot/projects/mjexp/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/mjexp/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/mjexp/bin/ed/test/ascii.t#1 branch .. //depot/projects/mjexp/bin/ed/test/bang1.d#1 branch .. //depot/projects/mjexp/bin/ed/test/bang1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/bang1.r#1 branch .. //depot/projects/mjexp/bin/ed/test/bang1.t#1 branch .. //depot/projects/mjexp/bin/ed/test/bang2.err#1 branch .. //depot/projects/mjexp/bin/ed/test/c.d#1 branch .. //depot/projects/mjexp/bin/ed/test/c.r#1 branch .. //depot/projects/mjexp/bin/ed/test/c.t#1 branch .. //depot/projects/mjexp/bin/ed/test/c1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/c2.err#1 branch .. //depot/projects/mjexp/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/mjexp/bin/ed/test/d.d#1 branch .. //depot/projects/mjexp/bin/ed/test/d.err#1 branch .. //depot/projects/mjexp/bin/ed/test/d.r#1 branch .. //depot/projects/mjexp/bin/ed/test/d.t#1 branch .. //depot/projects/mjexp/bin/ed/test/e1.d#1 branch .. //depot/projects/mjexp/bin/ed/test/e1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/e1.r#1 branch .. //depot/projects/mjexp/bin/ed/test/e1.t#1 branch .. //depot/projects/mjexp/bin/ed/test/e2.d#1 branch .. //depot/projects/mjexp/bin/ed/test/e2.err#1 branch .. //depot/projects/mjexp/bin/ed/test/e2.r#1 branch .. //depot/projects/mjexp/bin/ed/test/e2.t#1 branch .. //depot/projects/mjexp/bin/ed/test/e3.d#1 branch .. //depot/projects/mjexp/bin/ed/test/e3.err#1 branch .. //depot/projects/mjexp/bin/ed/test/e3.r#1 branch .. //depot/projects/mjexp/bin/ed/test/e3.t#1 branch .. //depot/projects/mjexp/bin/ed/test/e4.d#1 branch .. //depot/projects/mjexp/bin/ed/test/e4.r#1 branch .. //depot/projects/mjexp/bin/ed/test/e4.t#1 branch .. //depot/projects/mjexp/bin/ed/test/f1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/f2.err#1 branch .. //depot/projects/mjexp/bin/ed/test/g1.d#1 branch .. //depot/projects/mjexp/bin/ed/test/g1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/g1.r#1 branch .. //depot/projects/mjexp/bin/ed/test/g1.t#1 branch .. //depot/projects/mjexp/bin/ed/test/g2.d#1 branch .. //depot/projects/mjexp/bin/ed/test/g2.err#1 branch .. //depot/projects/mjexp/bin/ed/test/g2.r#1 branch .. //depot/projects/mjexp/bin/ed/test/g2.t#1 branch .. //depot/projects/mjexp/bin/ed/test/g3.d#1 branch .. //depot/projects/mjexp/bin/ed/test/g3.err#1 branch .. //depot/projects/mjexp/bin/ed/test/g3.r#1 branch .. //depot/projects/mjexp/bin/ed/test/g3.t#1 branch .. //depot/projects/mjexp/bin/ed/test/g4.d#1 branch .. //depot/projects/mjexp/bin/ed/test/g4.r#1 branch .. //depot/projects/mjexp/bin/ed/test/g4.t#1 branch .. //depot/projects/mjexp/bin/ed/test/g5.d#1 branch .. //depot/projects/mjexp/bin/ed/test/g5.r#1 branch .. //depot/projects/mjexp/bin/ed/test/g5.t#1 branch .. //depot/projects/mjexp/bin/ed/test/h.err#1 branch .. //depot/projects/mjexp/bin/ed/test/i.d#1 branch .. //depot/projects/mjexp/bin/ed/test/i.r#1 branch .. //depot/projects/mjexp/bin/ed/test/i.t#1 branch .. //depot/projects/mjexp/bin/ed/test/i1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/i2.err#1 branch .. //depot/projects/mjexp/bin/ed/test/i3.err#1 branch .. //depot/projects/mjexp/bin/ed/test/j.d#1 branch .. //depot/projects/mjexp/bin/ed/test/j.r#1 branch .. //depot/projects/mjexp/bin/ed/test/j.t#1 branch .. //depot/projects/mjexp/bin/ed/test/k.d#1 branch .. //depot/projects/mjexp/bin/ed/test/k.r#1 branch .. //depot/projects/mjexp/bin/ed/test/k.t#1 branch .. //depot/projects/mjexp/bin/ed/test/k1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/k2.err#1 branch .. //depot/projects/mjexp/bin/ed/test/k3.err#1 branch .. //depot/projects/mjexp/bin/ed/test/k4.err#1 branch .. //depot/projects/mjexp/bin/ed/test/l.d#1 branch .. //depot/projects/mjexp/bin/ed/test/l.r#1 branch .. //depot/projects/mjexp/bin/ed/test/l.t#1 branch .. //depot/projects/mjexp/bin/ed/test/m.d#1 branch .. //depot/projects/mjexp/bin/ed/test/m.err#1 branch .. //depot/projects/mjexp/bin/ed/test/m.r#1 branch .. //depot/projects/mjexp/bin/ed/test/m.t#1 branch .. //depot/projects/mjexp/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/mjexp/bin/ed/test/n.d#1 branch .. //depot/projects/mjexp/bin/ed/test/n.r#1 branch .. //depot/projects/mjexp/bin/ed/test/n.t#1 branch .. //depot/projects/mjexp/bin/ed/test/nl.err#1 branch .. //depot/projects/mjexp/bin/ed/test/nl1.d#1 branch .. //depot/projects/mjexp/bin/ed/test/nl1.r#1 branch .. //depot/projects/mjexp/bin/ed/test/nl1.t#1 branch .. //depot/projects/mjexp/bin/ed/test/nl2.d#1 branch .. //depot/projects/mjexp/bin/ed/test/nl2.r#1 branch .. //depot/projects/mjexp/bin/ed/test/nl2.t#1 branch .. //depot/projects/mjexp/bin/ed/test/p.d#1 branch .. //depot/projects/mjexp/bin/ed/test/p.r#1 branch .. //depot/projects/mjexp/bin/ed/test/p.t#1 branch .. //depot/projects/mjexp/bin/ed/test/q.d#1 branch .. //depot/projects/mjexp/bin/ed/test/q.r#1 branch .. //depot/projects/mjexp/bin/ed/test/q.t#1 branch .. //depot/projects/mjexp/bin/ed/test/q1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/r1.d#1 branch .. //depot/projects/mjexp/bin/ed/test/r1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/r1.r#1 branch .. //depot/projects/mjexp/bin/ed/test/r1.t#1 branch .. //depot/projects/mjexp/bin/ed/test/r2.d#1 branch .. //depot/projects/mjexp/bin/ed/test/r2.err#1 branch .. //depot/projects/mjexp/bin/ed/test/r2.r#1 branch .. //depot/projects/mjexp/bin/ed/test/r2.t#1 branch .. //depot/projects/mjexp/bin/ed/test/r3.d#1 branch .. //depot/projects/mjexp/bin/ed/test/r3.r#1 branch .. //depot/projects/mjexp/bin/ed/test/r3.t#1 branch .. //depot/projects/mjexp/bin/ed/test/s1.d#1 branch .. //depot/projects/mjexp/bin/ed/test/s1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/s1.r#1 branch .. //depot/projects/mjexp/bin/ed/test/s1.t#1 branch .. //depot/projects/mjexp/bin/ed/test/s10.err#1 branch .. //depot/projects/mjexp/bin/ed/test/s2.d#1 branch .. //depot/projects/mjexp/bin/ed/test/s2.err#1 branch .. //depot/projects/mjexp/bin/ed/test/s2.r#1 branch .. //depot/projects/mjexp/bin/ed/test/s2.t#1 branch .. //depot/projects/mjexp/bin/ed/test/s3.d#1 branch .. //depot/projects/mjexp/bin/ed/test/s3.err#1 branch .. //depot/projects/mjexp/bin/ed/test/s3.r#1 branch .. //depot/projects/mjexp/bin/ed/test/s3.t#1 branch .. //depot/projects/mjexp/bin/ed/test/s4.err#1 branch .. //depot/projects/mjexp/bin/ed/test/s5.err#1 branch .. //depot/projects/mjexp/bin/ed/test/s6.err#1 branch .. //depot/projects/mjexp/bin/ed/test/s7.err#1 branch .. //depot/projects/mjexp/bin/ed/test/s8.err#1 branch .. //depot/projects/mjexp/bin/ed/test/s9.err#1 branch .. //depot/projects/mjexp/bin/ed/test/t.d#1 branch .. //depot/projects/mjexp/bin/ed/test/t.r#1 branch .. //depot/projects/mjexp/bin/ed/test/t1.d#1 branch .. //depot/projects/mjexp/bin/ed/test/t1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/t1.r#1 branch .. //depot/projects/mjexp/bin/ed/test/t1.t#1 branch .. //depot/projects/mjexp/bin/ed/test/t2.d#1 branch .. //depot/projects/mjexp/bin/ed/test/t2.err#1 branch .. //depot/projects/mjexp/bin/ed/test/t2.r#1 branch .. //depot/projects/mjexp/bin/ed/test/t2.t#1 branch .. //depot/projects/mjexp/bin/ed/test/u.d#1 branch .. //depot/projects/mjexp/bin/ed/test/u.err#1 branch .. //depot/projects/mjexp/bin/ed/test/u.r#1 branch .. //depot/projects/mjexp/bin/ed/test/u.t#1 branch .. //depot/projects/mjexp/bin/ed/test/v.d#1 branch .. //depot/projects/mjexp/bin/ed/test/v.r#1 branch .. //depot/projects/mjexp/bin/ed/test/v.t#1 branch .. //depot/projects/mjexp/bin/ed/test/w.d#1 branch .. //depot/projects/mjexp/bin/ed/test/w.r#1 branch .. //depot/projects/mjexp/bin/ed/test/w.t#1 branch .. //depot/projects/mjexp/bin/ed/test/w1.err#1 branch .. //depot/projects/mjexp/bin/ed/test/w2.err#1 branch .. //depot/projects/mjexp/bin/ed/test/w3.err#1 branch .. //depot/projects/mjexp/bin/ed/test/x.err#1 branch .. //depot/projects/mjexp/bin/ed/test/z.err#1 branch .. //depot/projects/mjexp/bin/ed/undo.c#1 branch .. //depot/projects/mjexp/bin/expr/Makefile#1 branch .. //depot/projects/mjexp/bin/expr/expr.1#1 branch .. //depot/projects/mjexp/bin/expr/expr.y#1 branch .. //depot/projects/mjexp/bin/getfacl/Makefile#1 branch .. //depot/projects/mjexp/bin/getfacl/getfacl.1#1 branch .. //depot/projects/mjexp/bin/getfacl/getfacl.c#1 branch .. //depot/projects/mjexp/bin/hostname/Makefile#1 branch .. //depot/projects/mjexp/bin/hostname/hostname.1#1 branch .. //depot/projects/mjexp/bin/hostname/hostname.c#1 branch .. //depot/projects/mjexp/bin/kenv/Makefile#1 branch .. //depot/projects/mjexp/bin/kenv/kenv.1#1 branch .. //depot/projects/mjexp/bin/kenv/kenv.c#1 branch .. //depot/projects/mjexp/bin/kill/Makefile#1 branch .. //depot/projects/mjexp/bin/kill/kill.1#1 branch .. //depot/projects/mjexp/bin/kill/kill.c#1 branch .. //depot/projects/mjexp/bin/ln/Makefile#1 branch .. //depot/projects/mjexp/bin/ln/ln.1#1 branch .. //depot/projects/mjexp/bin/ln/ln.c#1 branch .. //depot/projects/mjexp/bin/ln/symlink.7#1 branch .. //depot/projects/mjexp/bin/ls/Makefile#1 branch .. //depot/projects/mjexp/bin/ls/cmp.c#1 branch .. //depot/projects/mjexp/bin/ls/extern.h#1 branch .. //depot/projects/mjexp/bin/ls/ls.1#1 branch .. //depot/projects/mjexp/bin/ls/ls.c#1 branch .. //depot/projects/mjexp/bin/ls/ls.h#1 branch .. //depot/projects/mjexp/bin/ls/print.c#1 branch .. //depot/projects/mjexp/bin/ls/util.c#1 branch .. //depot/projects/mjexp/bin/mkdir/Makefile#1 branch .. //depot/projects/mjexp/bin/mkdir/mkdir.1#1 branch .. //depot/projects/mjexp/bin/mkdir/mkdir.c#1 branch .. //depot/projects/mjexp/bin/mv/Makefile#1 branch .. //depot/projects/mjexp/bin/mv/mv.1#1 branch .. //depot/projects/mjexp/bin/mv/mv.c#1 branch .. //depot/projects/mjexp/bin/pax/Makefile#1 branch .. //depot/projects/mjexp/bin/pax/ar_io.c#1 branch .. //depot/projects/mjexp/bin/pax/ar_subs.c#1 branch .. //depot/projects/mjexp/bin/pax/buf_subs.c#1 branch .. //depot/projects/mjexp/bin/pax/cache.c#1 branch .. //depot/projects/mjexp/bin/pax/cache.h#1 branch .. //depot/projects/mjexp/bin/pax/cpio.1#1 branch .. //depot/projects/mjexp/bin/pax/cpio.c#1 branch .. //depot/projects/mjexp/bin/pax/cpio.h#1 branch .. //depot/projects/mjexp/bin/pax/extern.h#1 branch .. //depot/projects/mjexp/bin/pax/file_subs.c#1 branch .. //depot/projects/mjexp/bin/pax/ftree.c#1 branch .. //depot/projects/mjexp/bin/pax/ftree.h#1 branch .. //depot/projects/mjexp/bin/pax/gen_subs.c#1 branch .. //depot/projects/mjexp/bin/pax/getoldopt.c#1 branch .. //depot/projects/mjexp/bin/pax/options.c#1 branch .. //depot/projects/mjexp/bin/pax/options.h#1 branch .. //depot/projects/mjexp/bin/pax/pat_rep.c#1 branch .. //depot/projects/mjexp/bin/pax/pat_rep.h#1 branch .. //depot/projects/mjexp/bin/pax/pax.1#1 branch .. //depot/projects/mjexp/bin/pax/pax.c#1 branch .. //depot/projects/mjexp/bin/pax/pax.h#1 branch .. //depot/projects/mjexp/bin/pax/sel_subs.c#1 branch .. //depot/projects/mjexp/bin/pax/sel_subs.h#1 branch .. //depot/projects/mjexp/bin/pax/tables.c#1 branch .. //depot/projects/mjexp/bin/pax/tables.h#1 branch .. //depot/projects/mjexp/bin/pax/tar.1#1 branch .. //depot/projects/mjexp/bin/pax/tar.c#1 branch .. //depot/projects/mjexp/bin/pax/tar.h#1 branch .. //depot/projects/mjexp/bin/pax/tty_subs.c#1 branch .. //depot/projects/mjexp/bin/ps/Makefile#1 branch .. //depot/projects/mjexp/bin/ps/extern.h#1 branch .. //depot/projects/mjexp/bin/ps/fmt.c#1 branch .. //depot/projects/mjexp/bin/ps/keyword.c#1 branch .. //depot/projects/mjexp/bin/ps/nlist.c#1 branch .. //depot/projects/mjexp/bin/ps/print.c#1 branch .. //depot/projects/mjexp/bin/ps/ps.1#1 branch .. //depot/projects/mjexp/bin/ps/ps.c#1 branch .. //depot/projects/mjexp/bin/ps/ps.h#1 branch .. //depot/projects/mjexp/bin/pwd/Makefile#1 branch .. //depot/projects/mjexp/bin/pwd/pwd.1#1 branch .. //depot/projects/mjexp/bin/pwd/pwd.c#1 branch .. //depot/projects/mjexp/bin/rcp/Makefile#1 branch .. //depot/projects/mjexp/bin/rcp/extern.h#1 branch .. //depot/projects/mjexp/bin/rcp/rcp.1#1 branch .. //depot/projects/mjexp/bin/rcp/rcp.c#1 branch .. //depot/projects/mjexp/bin/rcp/util.c#1 branch .. //depot/projects/mjexp/bin/realpath/Makefile#1 branch .. //depot/projects/mjexp/bin/realpath/realpath.1#1 branch .. //depot/projects/mjexp/bin/realpath/realpath.c#1 branch .. //depot/projects/mjexp/bin/rm/Makefile#1 branch .. //depot/projects/mjexp/bin/rm/rm.1#1 branch .. //depot/projects/mjexp/bin/rm/rm.c#1 branch .. //depot/projects/mjexp/bin/rmail/Makefile#1 branch .. //depot/projects/mjexp/bin/rmdir/Makefile#1 branch .. //depot/projects/mjexp/bin/rmdir/rmdir.1#1 branch .. //depot/projects/mjexp/bin/rmdir/rmdir.c#1 branch .. //depot/projects/mjexp/bin/setfacl/Makefile#1 branch .. //depot/projects/mjexp/bin/setfacl/file.c#1 branch .. //depot/projects/mjexp/bin/setfacl/mask.c#1 branch .. //depot/projects/mjexp/bin/setfacl/merge.c#1 branch .. //depot/projects/mjexp/bin/setfacl/remove.c#1 branch .. //depot/projects/mjexp/bin/setfacl/setfacl.1#1 branch .. //depot/projects/mjexp/bin/setfacl/setfacl.c#1 branch .. //depot/projects/mjexp/bin/setfacl/setfacl.h#1 branch .. //depot/projects/mjexp/bin/setfacl/util.c#1 branch .. //depot/projects/mjexp/bin/sh/Makefile#1 branch .. //depot/projects/mjexp/bin/sh/TOUR#1 branch .. //depot/projects/mjexp/bin/sh/alias.c#1 branch .. //depot/projects/mjexp/bin/sh/alias.h#1 branch .. //depot/projects/mjexp/bin/sh/arith.h#1 branch .. //depot/projects/mjexp/bin/sh/arith.y#1 branch .. //depot/projects/mjexp/bin/sh/arith_lex.l#1 branch .. //depot/projects/mjexp/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/mjexp/bin/sh/bltin/echo.1#1 branch .. //depot/projects/mjexp/bin/sh/bltin/echo.c#1 branch .. //depot/projects/mjexp/bin/sh/builtins.def#1 branch .. //depot/projects/mjexp/bin/sh/cd.c#1 branch .. //depot/projects/mjexp/bin/sh/cd.h#1 branch .. //depot/projects/mjexp/bin/sh/error.c#1 branch .. //depot/projects/mjexp/bin/sh/error.h#1 branch .. //depot/projects/mjexp/bin/sh/eval.c#1 branch .. //depot/projects/mjexp/bin/sh/eval.h#1 branch .. //depot/projects/mjexp/bin/sh/exec.c#1 branch .. //depot/projects/mjexp/bin/sh/exec.h#1 branch .. //depot/projects/mjexp/bin/sh/expand.c#1 branch .. //depot/projects/mjexp/bin/sh/expand.h#1 branch .. //depot/projects/mjexp/bin/sh/funcs/cmv#1 branch .. //depot/projects/mjexp/bin/sh/funcs/dirs#1 branch .. //depot/projects/mjexp/bin/sh/funcs/kill#1 branch .. //depot/projects/mjexp/bin/sh/funcs/login#1 branch .. //depot/projects/mjexp/bin/sh/funcs/newgrp#1 branch .. //depot/projects/mjexp/bin/sh/funcs/popd#1 branch .. //depot/projects/mjexp/bin/sh/funcs/pushd#1 branch .. //depot/projects/mjexp/bin/sh/funcs/suspend#1 branch .. //depot/projects/mjexp/bin/sh/histedit.c#1 branch .. //depot/projects/mjexp/bin/sh/init.h#1 branch .. //depot/projects/mjexp/bin/sh/input.c#1 branch .. //depot/projects/mjexp/bin/sh/input.h#1 branch .. //depot/projects/mjexp/bin/sh/jobs.c#1 branch .. //depot/projects/mjexp/bin/sh/jobs.h#1 branch .. //depot/projects/mjexp/bin/sh/mail.c#1 branch .. //depot/projects/mjexp/bin/sh/mail.h#1 branch .. //depot/projects/mjexp/bin/sh/main.c#1 branch .. //depot/projects/mjexp/bin/sh/main.h#1 branch .. //depot/projects/mjexp/bin/sh/memalloc.c#1 branch .. //depot/projects/mjexp/bin/sh/memalloc.h#1 branch .. //depot/projects/mjexp/bin/sh/miscbltin.c#1 branch .. //depot/projects/mjexp/bin/sh/mkbuiltins#1 branch .. //depot/projects/mjexp/bin/sh/mkinit.c#1 branch .. //depot/projects/mjexp/bin/sh/mknodes.c#1 branch .. //depot/projects/mjexp/bin/sh/mksyntax.c#1 branch .. //depot/projects/mjexp/bin/sh/mktokens#1 branch .. //depot/projects/mjexp/bin/sh/myhistedit.h#1 branch .. //depot/projects/mjexp/bin/sh/mystring.c#1 branch .. //depot/projects/mjexp/bin/sh/mystring.h#1 branch .. //depot/projects/mjexp/bin/sh/nodes.c.pat#1 branch .. //depot/projects/mjexp/bin/sh/nodetypes#1 branch .. //depot/projects/mjexp/bin/sh/options.c#1 branch .. //depot/projects/mjexp/bin/sh/options.h#1 branch .. //depot/projects/mjexp/bin/sh/output.c#1 branch .. //depot/projects/mjexp/bin/sh/output.h#1 branch .. //depot/projects/mjexp/bin/sh/parser.c#1 branch .. //depot/projects/mjexp/bin/sh/parser.h#1 branch .. //depot/projects/mjexp/bin/sh/redir.c#1 branch .. //depot/projects/mjexp/bin/sh/redir.h#1 branch .. //depot/projects/mjexp/bin/sh/sh.1#1 branch .. //depot/projects/mjexp/bin/sh/shell.h#1 branch .. //depot/projects/mjexp/bin/sh/show.c#1 branch .. //depot/projects/mjexp/bin/sh/show.h#1 branch .. //depot/projects/mjexp/bin/sh/trap.c#1 branch .. //depot/projects/mjexp/bin/sh/trap.h#1 branch .. //depot/projects/mjexp/bin/sh/var.c#1 branch .. //depot/projects/mjexp/bin/sh/var.h#1 branch .. //depot/projects/mjexp/bin/sleep/Makefile#1 branch .. //depot/projects/mjexp/bin/sleep/sleep.1#1 branch .. //depot/projects/mjexp/bin/sleep/sleep.c#1 branch .. //depot/projects/mjexp/bin/stty/Makefile#1 branch .. //depot/projects/mjexp/bin/stty/cchar.c#1 branch .. //depot/projects/mjexp/bin/stty/extern.h#1 branch .. //depot/projects/mjexp/bin/stty/gfmt.c#1 branch .. //depot/projects/mjexp/bin/stty/key.c#1 branch .. //depot/projects/mjexp/bin/stty/modes.c#1 branch .. //depot/projects/mjexp/bin/stty/print.c#1 branch .. //depot/projects/mjexp/bin/stty/stty.1#1 branch .. //depot/projects/mjexp/bin/stty/stty.c#1 branch .. //depot/projects/mjexp/bin/stty/stty.h#1 branch .. //depot/projects/mjexp/bin/stty/util.c#1 branch .. //depot/projects/mjexp/bin/sync/Makefile#1 branch .. //depot/projects/mjexp/bin/sync/sync.8#1 branch .. //depot/projects/mjexp/bin/sync/sync.c#1 branch .. //depot/projects/mjexp/bin/test/Makefile#1 branch .. //depot/projects/mjexp/bin/test/TEST.README#1 branch .. //depot/projects/mjexp/bin/test/TEST.csh#1 branch .. //depot/projects/mjexp/bin/test/TEST.sh#1 branch .. //depot/projects/mjexp/bin/test/test.1#1 branch .. //depot/projects/mjexp/bin/test/test.c#1 branch .. //depot/projects/mjexp/contrib/amd/AUTHORS#1 branch .. //depot/projects/mjexp/contrib/amd/BUGS#1 branch .. //depot/projects/mjexp/contrib/amd/COPYING#1 branch .. //depot/projects/mjexp/contrib/amd/ChangeLog#1 branch .. //depot/projects/mjexp/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/mjexp/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/mjexp/contrib/amd/INSTALL#1 branch .. //depot/projects/mjexp/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/mjexp/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/mjexp/contrib/amd/NEWS#1 branch .. //depot/projects/mjexp/contrib/amd/README#1 branch .. //depot/projects/mjexp/contrib/amd/README.ldap#1 branch .. //depot/projects/mjexp/contrib/amd/README.y2k#1 branch .. //depot/projects/mjexp/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amd.8#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amd.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amd.h#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/autil.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/clock.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/conf.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/mjexp/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/mjexp/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/map.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/opts.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/restart.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/sched.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/mjexp/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/mjexp/contrib/amd/amq/amq.8#1 branch .. //depot/projects/mjexp/contrib/amd/amq/amq.c#1 branch .. //depot/projects/mjexp/contrib/amd/amq/amq.h#1 branch .. //depot/projects/mjexp/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/mjexp/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/mjexp/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/mjexp/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/mjexp/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/mjexp/contrib/amd/bootstrap#1 branch .. //depot/projects/mjexp/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/mjexp/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/mjexp/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/mjexp/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/mjexp/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/mjexp/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/mjexp/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/mjexp/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/mjexp/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/mjexp/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/mjexp/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/mjexp/contrib/amd/doc/version.texi#1 branch .. //depot/projects/mjexp/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/mjexp/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/mjexp/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/mjexp/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/mjexp/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/mjexp/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/mjexp/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/mjexp/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/mjexp/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/mjexp/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/mjexp/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/mjexp/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/mjexp/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/mjexp/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/mjexp/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/mjexp/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/mjexp/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/mjexp/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/mjexp/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/mjexp/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/mjexp/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/mjexp/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/mjexp/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/mjexp/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/mjexp/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/mjexp/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/mjexp/contrib/amd/libamu/util.c#1 branch .. //depot/projects/mjexp/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/mjexp/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/mjexp/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/mjexp/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/mjexp/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/mjexp/contrib/amd/m4/amindent#1 branch .. //depot/projects/mjexp/contrib/amd/m4/autopat#1 branch .. //depot/projects/mjexp/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/mjexp/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/mjexp/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/mjexp/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/mjexp/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/mjexp/contrib/amd/m4/mkconf#1 branch .. //depot/projects/mjexp/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/mjexp/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/mjexp/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/mjexp/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/mjexp/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/mjexp/contrib/amd/tasks#1 branch .. //depot/projects/mjexp/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/mjexp/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/mjexp/contrib/bc/AUTHORS#1 branch .. //depot/projects/mjexp/contrib/bc/ChangeLog#1 branch .. //depot/projects/mjexp/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/mjexp/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/mjexp/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/mjexp/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/mjexp/contrib/bc/FAQ#1 branch .. //depot/projects/mjexp/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/mjexp/contrib/bc/INSTALL#1 branch .. //depot/projects/mjexp/contrib/bc/Makefile.am#1 branch .. //depot/projects/mjexp/contrib/bc/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bc/NEWS#1 branch .. //depot/projects/mjexp/contrib/bc/README#1 branch .. //depot/projects/mjexp/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/mjexp/contrib/bc/Test/array.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/atan.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/div.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/exp.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/fact.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/jn.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/ln.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/mul.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/raise.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/signum#1 branch .. //depot/projects/mjexp/contrib/bc/Test/sine.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/mjexp/contrib/bc/Test/timetest#1 branch .. //depot/projects/mjexp/contrib/bc/acconfig.h#1 branch .. //depot/projects/mjexp/contrib/bc/aclocal.m4#1 branch .. //depot/projects/mjexp/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/mjexp/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bc/bc/bc.y#1 branch .. //depot/projects/mjexp/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/mjexp/contrib/bc/bc/const.h#1 branch .. //depot/projects/mjexp/contrib/bc/bc/execute.c#1 branch .. //depot/projects/mjexp/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/mjexp/contrib/bc/bc/global.c#1 branch .. //depot/projects/mjexp/contrib/bc/bc/global.h#1 branch .. //depot/projects/mjexp/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/mjexp/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/mjexp/contrib/bc/bc/load.c#1 branch .. //depot/projects/mjexp/contrib/bc/bc/main.c#1 branch .. //depot/projects/mjexp/contrib/bc/bc/proto.h#1 branch .. //depot/projects/mjexp/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/mjexp/contrib/bc/bc/scan.l#1 branch .. //depot/projects/mjexp/contrib/bc/bc/storage.c#1 branch .. //depot/projects/mjexp/contrib/bc/bc/util.c#1 branch .. //depot/projects/mjexp/contrib/bc/config.h.in#1 branch .. //depot/projects/mjexp/contrib/bc/configure#1 branch .. //depot/projects/mjexp/contrib/bc/configure.in#1 branch .. //depot/projects/mjexp/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/mjexp/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bc/dc/array.c#1 branch .. //depot/projects/mjexp/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/mjexp/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/mjexp/contrib/bc/dc/dc.c#1 branch .. //depot/projects/mjexp/contrib/bc/dc/dc.h#1 branch .. //depot/projects/mjexp/contrib/bc/dc/eval.c#1 branch .. //depot/projects/mjexp/contrib/bc/dc/misc.c#1 branch .. //depot/projects/mjexp/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/mjexp/contrib/bc/dc/stack.c#1 branch .. //depot/projects/mjexp/contrib/bc/dc/string.c#1 branch .. //depot/projects/mjexp/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/mjexp/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bc/doc/bc.1#1 branch .. //depot/projects/mjexp/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/mjexp/contrib/bc/doc/dc.1#1 branch .. //depot/projects/mjexp/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/mjexp/contrib/bc/h/number.h#1 branch .. //depot/projects/mjexp/contrib/bc/install-sh#1 branch .. //depot/projects/mjexp/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/mjexp/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bc/lib/number.c#1 branch .. //depot/projects/mjexp/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/mjexp/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/mjexp/contrib/bc/missing#1 branch .. //depot/projects/mjexp/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/mjexp/contrib/bc/stamp-h.in#1 branch .. //depot/projects/mjexp/contrib/bind9/CHANGES#1 branch .. //depot/projects/mjexp/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/mjexp/contrib/bind9/FAQ#1 branch .. //depot/projects/mjexp/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/mjexp/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/mjexp/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/mjexp/contrib/bind9/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bind9/README#1 branch .. //depot/projects/mjexp/contrib/bind9/acconfig.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/mjexp/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/mjexp/contrib/bind9/config.guess#1 branch .. //depot/projects/mjexp/contrib/bind9/config.sub#1 branch .. //depot/projects/mjexp/contrib/bind9/config.threads.in#1 branch .. //depot/projects/mjexp/contrib/bind9/configure.in#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc3445.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 1 05:35: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 CAB5C16CD6E; Sun, 1 Oct 2006 05:33:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F15F216CD0F for ; Sun, 1 Oct 2006 05:33:15 +0000 (UTC) (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 9247443D49 for ; Sun, 1 Oct 2006 05:33:14 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k915XEaq069235 for ; Sun, 1 Oct 2006 05:33:14 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k915XE3Q069232 for perforce@freebsd.org; Sun, 1 Oct 2006 05:33:14 GMT (envelope-from imp@freebsd.org) Date: Sun, 1 Oct 2006 05:33:14 GMT Message-Id: <200610010533.k915XE3Q069232@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 107029 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 05:35:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=107029 Change 107029 by imp@imp_lighthouse on 2006/10/01 05:32:57 Tweaks Affected files ... .. //depot/projects/arm/src/sys/arm/conf/TSC4370#11 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/TSC4370#11 (text+ko) ==== @@ -16,10 +16,11 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # +# From: # $FreeBSD: src/sys/arm/conf/KB920X,v 1.7 2006/06/17 23:34:59 imp Exp $ machine arm -ident KB920X +ident TSC4370 options AT91_TSC include "../at91/std.kb920x" @@ -46,8 +47,8 @@ #options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server #options NFS_ROOT #NFS usable as /, requires NFSCLIENT -#options BOOTP_NFSROOT -#options BOOTP +#options BOOTP_NFSROOT +#options BOOTP #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem (requires PSEUDOFS) From owner-p4-projects@FreeBSD.ORG Sun Oct 1 05:45:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E28616A4D2; Sun, 1 Oct 2006 05:45:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D55C016A4E0 for ; Sun, 1 Oct 2006 05:45:30 +0000 (UTC) (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 940A643D45 for ; Sun, 1 Oct 2006 05:45:30 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k915jUZm069835 for ; Sun, 1 Oct 2006 05:45:30 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k915jUho069832 for perforce@freebsd.org; Sun, 1 Oct 2006 05:45:30 GMT (envelope-from imp@freebsd.org) Date: Sun, 1 Oct 2006 05:45:30 GMT Message-Id: <200610010545.k915jUho069832@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 107030 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 05:45:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=107030 Change 107030 by imp@imp_lighthouse on 2006/10/01 05:45:06 For each SD card we find, add it to the device tree. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmc.c#12 (text+ko) ==== @@ -452,6 +452,7 @@ struct mmc_ivars *ivar; int err; uint32_t resp; + device_t child; while (1) { ivar = malloc(sizeof(struct mmc_ivars), M_DEVBUF, M_WAITOK); @@ -471,6 +472,8 @@ mmc_send_csd(sc, ivar->rca, ivar->raw_csd); mmc_decode_csd(1, ivar->raw_csd, &ivar->csd); printf("SD CARD: %lld bytes\n", ivar->csd.capacity); + child = device_add_child(sc->dev, NULL, -1); + device_set_ivars(child, ivar); break; } panic("Write MMC card code here"); @@ -523,13 +526,15 @@ mmcbr_set_bus_mode(dev, pushpull); mmcbr_update_ios(dev); + bus_generic_attach(dev); +// mmc_update_children_sysctl(dev); } static int mmc_calculate_clock(struct mmc_softc *sc) { - // XXX write me - return 0; + // xxx + return 0; } static void From owner-p4-projects@FreeBSD.ORG Sun Oct 1 06:58: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 6303F16A40F; Sun, 1 Oct 2006 06:58:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2787916A403 for ; Sun, 1 Oct 2006 06:58:03 +0000 (UTC) (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 DA87443D46 for ; Sun, 1 Oct 2006 06:58:02 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k916w2oU075407 for ; Sun, 1 Oct 2006 06:58:02 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k916w2ZQ075404 for perforce@freebsd.org; Sun, 1 Oct 2006 06:58:02 GMT (envelope-from imp@freebsd.org) Date: Sun, 1 Oct 2006 06:58:02 GMT Message-Id: <200610010658.k916w2ZQ075404@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 107033 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 06:58:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=107033 Change 107033 by imp@imp_lighthouse on 2006/10/01 06:57:08 Raid the at91_qdmmc driver and snag the best stuff from there to write the mmcsd driver. Still need to add data support to the at91_mci driver, which is going to be the linchpin in this whole shebang. But this is a good stopping point for new. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmcbus_if.m#4 edit .. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmcbus_if.m#4 (text+ko) ==== @@ -37,20 +37,20 @@ INTERFACE mmcbus; # -# Called by the mmcbr devices when a mmc_request has completed +# Queue and wait for a request. # -METHOD int xfer_done { +METHOD int wait_for_request { device_t brdev; device_t reqdev; struct mmc_request *req; - int status; + int *status; }; # # Claim the current bridge, blocking the current thread until the host # is no longer busy. # -METHOD int aquire_bus { +METHOD int acquire_bus { device_t brdev; device_t reqdev; } ==== //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#3 (text+ko) ==== @@ -28,18 +28,28 @@ #include #include +#include +#include +#include #include +#include +#include #include -#include #include #include -#include +#include +#include #include +#include "mmcbus_if.h" + struct mmcsd_softc { device_t dev; struct mtx sc_mtx; + struct disk *disk; + struct proc *p; + struct bio_queue_head bio_queue; }; /* bus entry points */ @@ -47,6 +57,12 @@ static int mmcsd_attach(device_t dev); static int mmcsd_detach(device_t dev); +/* disk routines */ +static int mmcsd_open(struct disk *dp); +static int mmcsd_close(struct disk *dp); +static void mmcsd_strategy(struct bio *bp); +static void mmcsd_task(void *arg); + #define MMCSD_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) #define MMCSD_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) #define MMCSD_LOCK_INIT(_sc) \ @@ -60,7 +76,7 @@ mmcsd_probe(device_t dev) { - device_set_desc(dev, "mmc/sd bus"); + device_set_desc(dev, "mmc or sd flash card"); return (0); } @@ -73,6 +89,21 @@ sc->dev = dev; MMCSD_LOCK_INIT(sc); + MMCSD_LOCK(sc); + sc->disk = disk_alloc(); + sc->disk->d_open = mmcsd_open; + sc->disk->d_close = mmcsd_close; + sc->disk->d_strategy = mmcsd_strategy; + // sc->disk->d_dump = mmcsd_dump; Need polling mmc layer + sc->disk->d_name = "flash/card"; + sc->disk->d_drv1 = sc; + sc->disk->d_maxsize = DFLTPHYS; + sc->disk->d_unit = device_get_unit(dev); + disk_create(sc->disk, DISK_VERSION); + bioq_init(&sc->bio_queue); + MMCSD_UNLOCK(sc); + kthread_create(&mmcsd_task, sc, &sc->p, 0, 0, "task: mmc/sd card"); + return (0); } @@ -82,6 +113,111 @@ return (EBUSY); /* XXX */ } +static int +mmcsd_open(struct disk *dp) +{ + struct mmcsd_softc *sc; + + sc = (struct mmcsd_softc *)dp->d_drv1; + + MMCSD_LOCK(sc); + sc->disk->d_sectorsize = mmc_get_sector_size(sc->dev); + sc->disk->d_mediasize = mmc_get_media_size(sc->dev); + MMCSD_UNLOCK(sc); + + return 0; +} + +static int +mmcsd_close(struct disk *dp) +{ + struct mmcsd_softc *sc; + + sc = (struct mmcsd_softc *)dp->d_drv1; + + MMCSD_LOCK(sc); + MMCSD_UNLOCK(sc); + + // XXX do nothing since we don't lock for now + return 0; +} + +static void +mmcsd_strategy(struct bio *bp) +{ + struct mmcsd_softc *sc; + + sc = (struct mmcsd_softc *)bp->bio_disk->d_drv1; + MMCSD_LOCK(sc); + bioq_disksort(&sc->bio_queue, bp); + wakeup(sc); + MMCSD_UNLOCK(sc); +} + +static void +mmcsd_task(void *arg) +{ + struct mmcsd_softc *sc = (struct mmcsd_softc*)arg; + struct bio *bp; + int sz, err; + daddr_t end; + struct mmc_command cmd; + struct mmc_command stop; + struct mmc_request req; + struct mmc_data data; + uint32_t block; + device_t dev; + + MMCSD_LOCK(sc); + printf("mmcsd_task: start\n"); + dev = sc->dev; + for (;;) { + do { + bp = bioq_first(&sc->bio_queue); + if (bp == NULL) + msleep(sc, &sc->sc_mtx, PRIBIO, "jobqueue", 0); + } while (bp == NULL); + MMCBUS_ACQUIRE_BUS(device_get_parent(dev), dev); + bioq_remove(&sc->bio_queue, bp); + printf("at91_qdmmc_task: request %p\n", bp); + sz = sc->disk->d_sectorsize; + end = bp->bio_pblkno + (bp->bio_bcount / sz); + // XXX should use read/write_mulit + for (block = bp->bio_pblkno; block < end; block++) { + char *vaddr = bp->bio_data + (block - bp->bio_pblkno) * sz; + req.cmd = &cmd; + cmd.data = &data; + req.stop = &stop; + if (bp->bio_cmd == BIO_READ) + cmd.opcode = MMC_READ_SINGLE_BLOCK; + else + cmd.opcode = MMC_WRITE_BLOCK; + cmd.arg = block << 9; + cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC; + // data.timeout_ns = ; + // data.timeout_clks = ; + data.len = 512; + data.data = vaddr; + data.mrq = &req; + if (bp->bio_cmd == BIO_READ) + data.flags = MMC_DATA_READ; + else + data.flags = MMC_DATA_WRITE; + stop.opcode = MMC_STOP_TRANSMISSION; + stop.arg = 0; + stop.flags = MMC_RSP_R1B | MMC_CMD_AC; + MMCBUS_WAIT_FOR_REQUEST(device_get_parent(dev), dev, + &req, &err); + // XXX error handling +//XXX while (!(mmc_send_status(dev) & R1_READY_FOR_DATA)) +// continue; + // XXX decode mmc status + } + MMCBUS_RELEASE_BUS(device_get_parent(dev), dev); + biodone(bp); + } +} + static device_method_t mmcsd_methods[] = { DEVMETHOD(device_probe, mmcsd_probe), DEVMETHOD(device_attach, mmcsd_attach), From owner-p4-projects@FreeBSD.ORG Sun Oct 1 11:23:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7830716A415; Sun, 1 Oct 2006 11:23:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4EFAC16A407 for ; Sun, 1 Oct 2006 11:23:48 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07EB243D46 for ; Sun, 1 Oct 2006 11:23:48 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k91BNl9b007474 for ; Sun, 1 Oct 2006 11:23:47 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k91BNlnm007471 for perforce@freebsd.org; Sun, 1 Oct 2006 11:23:47 GMT (envelope-from piso@freebsd.org) Date: Sun, 1 Oct 2006 11:23:47 GMT Message-Id: <200610011123.k91BNlnm007471@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 107041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 11:23:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=107041 Change 107041 by piso@piso_newluxor on 2006/10/01 11:23:24 Disable versioning on libalias modules. Affected files ... .. //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#5 edit Differences ... ==== //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#5 (text+ko) ==== @@ -3,5 +3,4 @@ .PATH: ${.CURDIR}/../../../../sys/netinet/libalias SHLIBDIR?= /lib -SHLIB_MAJOR= 4 WARNS?= 1 From owner-p4-projects@FreeBSD.ORG Sun Oct 1 12:16: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 E227C16A40F; Sun, 1 Oct 2006 12:16:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B28F16A407 for ; Sun, 1 Oct 2006 12:16:56 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E5AE43D45 for ; Sun, 1 Oct 2006 12:16:56 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k91CGuqx011328 for ; Sun, 1 Oct 2006 12:16:56 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k91CGtLi011325 for perforce@freebsd.org; Sun, 1 Oct 2006 12:16:55 GMT (envelope-from piso@freebsd.org) Date: Sun, 1 Oct 2006 12:16:55 GMT Message-Id: <200610011216.k91CGtLi011325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 107044 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 12:16:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=107044 Change 107044 by piso@piso_newluxor on 2006/10/01 12:16:28 Use SHLIBNAME and install libalias modules in /lib as libalias_${NAME}.so: this way natd can correctly load modules before /usr is mounted. Affected files ... .. //depot/projects/soc2005/libalias/etc/libalias.conf#3 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#6 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/cuseeme/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/dummy/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/ftp/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/irc/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/nbt/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/pptp/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/skinny/Makefile#5 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/smedia/Makefile#5 edit Differences ... ==== //depot/projects/soc2005/libalias/etc/libalias.conf#3 (text+ko) ==== @@ -1,8 +1,8 @@ # $FreeBSD: src/etc/libalias.conf,v 1.1 2006/09/26 23:26:48 piso Exp $ -/usr/lib/libalias_cuseeme.so -/usr/lib/libalias_ftp.so -/usr/lib/libalias_irc.so -/usr/lib/libalias_nbt.so -/usr/lib/libalias_pptp.so -/usr/lib/libalias_skinny.so -/usr/lib/libalias_smedia.so +/lib/libalias_cuseeme.so +/lib/libalias_ftp.so +/lib/libalias_irc.so +/lib/libalias_nbt.so +/lib/libalias_pptp.so +/lib/libalias_skinny.so +/lib/libalias_smedia.so ==== //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#6 (text+ko) ==== @@ -3,4 +3,5 @@ .PATH: ${.CURDIR}/../../../../sys/netinet/libalias SHLIBDIR?= /lib +SHLIB_NAME=libalias_${NAME}.so WARNS?= 1 ==== //depot/projects/soc2005/libalias/lib/libalias/modules/cuseeme/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/cuseeme/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +NAME= cuseeme LIB= alias_cuseeme SRCS= alias_cuseeme.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/dummy/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/dummy/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +NAME= dummy LIB= alias_dummy SRCS= alias_dummy.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/ftp/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/ftp/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +NAME= ftp LIB= alias_ftp SRCS= alias_ftp.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/irc/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/irc/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +NAME= irc LIB= alias_irc SRCS= alias_irc.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/nbt/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/nbt/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +NAME= nbt LIB= alias_nbt SRCS= alias_nbt.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/pptp/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/pptp/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +NAME= pptp LIB= alias_pptp SRCS= alias_pptp.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/skinny/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/skinny/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $ +NAME= skinny LIB= alias_skinny SRCS= alias_skinny.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/smedia/Makefile#5 (text+ko) ==== @@ -1,5 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/smedia/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $ +NAME= smedia LIB= alias_smedia SRCS= alias_smedia.c From owner-p4-projects@FreeBSD.ORG Sun Oct 1 12:50: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 C887316A416; Sun, 1 Oct 2006 12:50:47 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8093716A492 for ; Sun, 1 Oct 2006 12:50:47 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B945A43D72 for ; Sun, 1 Oct 2006 12:50:38 +0000 (GMT) (envelope-from attilio@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k91Coc2B021024 for ; Sun, 1 Oct 2006 12:50:38 GMT (envelope-from attilio@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k91CocGq021021 for perforce@freebsd.org; Sun, 1 Oct 2006 12:50:38 GMT (envelope-from attilio@FreeBSD.org) Date: Sun, 1 Oct 2006 12:50:38 GMT Message-Id: <200610011250.k91CocGq021021@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to attilio@FreeBSD.org using -f From: Attilio Rao To: Perforce Change Reviews Cc: Subject: PERFORCE change 107046 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 12:50:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=107046 Change 107046 by attilio@attilio_laptop on 2006/10/01 12:50:14 restyle uhci.h. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhci.h#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhci.h#5 (text+ko) ==== @@ -38,92 +38,83 @@ #ifndef _UHCI_H_ #define _UHCI_H_ -/*** PCI config registers ***/ +/* PCI config registers */ +#define PCI_USBREV 0x60 /* USB protocol revision */ +#define PCI_USBREV_MASK 0xff +#define PCI_USBREV_PRE_1_0 0x00 +#define PCI_USBREV_1_0 0x10 +#define PCI_USBREV_1_1 0x11 +#define PCI_LEGSUP 0xc0 /* Legacy Support register */ +#define PCI_LEGSUP_USBPIRQDEN 0x2000 /* USB PIRQ D Enable */ +#define PCI_CBIO 0x20 /* configuration base IO */ +#define PCI_INTERFACE_UHCI 0x00 -#define PCI_USBREV 0x60 /* USB protocol revision */ -#define PCI_USBREV_MASK 0xff -#define PCI_USBREV_PRE_1_0 0x00 -#define PCI_USBREV_1_0 0x10 -#define PCI_USBREV_1_1 0x11 +/* UHCI registers */ +#define UHCI_CMD 0x00 +#define UHCI_CMD_RS 0x0001 +#define UHCI_CMD_HCRESET 0x0002 +#define UHCI_CMD_GRESET 0x0004 +#define UHCI_CMD_EGSM 0x0008 +#define UHCI_CMD_FGR 0x0010 +#define UHCI_CMD_SWDBG 0x0020 +#define UHCI_CMD_CF 0x0040 +#define UHCI_CMD_MAXP 0x0080 +#define UHCI_STS 0x02 +#define UHCI_STS_USBINT 0x0001 +#define UHCI_STS_USBEI 0x0002 +#define UHCI_STS_RD 0x0004 +#define UHCI_STS_HSE 0x0008 +#define UHCI_STS_HCPE 0x0010 +#define UHCI_STS_HCH 0x0020 +#define UHCI_STS_ALLINTRS 0x003f +#define UHCI_INTR 0x04 +#define UHCI_INTR_TOCRCIE 0x0001 +#define UHCI_INTR_RIE 0x0002 +#define UHCI_INTR_IOCE 0x0004 +#define UHCI_INTR_SPIE 0x0008 +#define UHCI_FRNUM 0x06 +#define UHCI_FRNUM_MASK 0x03ff +#define UHCI_FLBASEADDR 0x08 +#define UHCI_SOF 0x0c +#define UHCI_SOF_MASK 0x7f +#define UHCI_PORTSC1 0x010 +#define UHCI_PORTSC2 0x012 +#define UHCI_PORTSC_CCS 0x0001 +#define UHCI_PORTSC_CSC 0x0002 +#define UHCI_PORTSC_PE 0x0004 +#define UHCI_PORTSC_POEDC 0x0008 +#define UHCI_PORTSC_LS 0x0030 +#define UHCI_PORTSC_LS_SHIFT 4 +#define UHCI_PORTSC_RD 0x0040 +#define UHCI_PORTSC_LSDA 0x0100 +#define UHCI_PORTSC_PR 0x0200 +#define UHCI_PORTSC_OCI 0x0400 +#define UHCI_PORTSC_OCIC 0x0800 +#define UHCI_PORTSC_SUSP 0x1000 -#define PCI_LEGSUP 0xc0 /* Legacy Support register */ -#define PCI_LEGSUP_USBPIRQDEN 0x2000 /* USB PIRQ D Enable */ +#define URWMASK(x) ((x) & (UHCI_PORTSC_SUSP | \ + UHCI_PORTSC_PR | UHCI_PORTSC_RD | \ + UHCI_PORTSC_PE)) -#define PCI_CBIO 0x20 /* configuration base IO */ +#define UHCI_FRAMELIST_COUNT 1024 /* units */ +#define UHCI_FRAMELIST_ALIGN 4096 /* bytes */ -#define PCI_INTERFACE_UHCI 0x00 +/* Structures alignment (bytes) */ +#define UHCI_TD_ALIGN 16 +#define UHCI_QH_ALIGN 16 -/*** UHCI registers ***/ - -#define UHCI_CMD 0x00 -#define UHCI_CMD_RS 0x0001 -#define UHCI_CMD_HCRESET 0x0002 -#define UHCI_CMD_GRESET 0x0004 -#define UHCI_CMD_EGSM 0x0008 -#define UHCI_CMD_FGR 0x0010 -#define UHCI_CMD_SWDBG 0x0020 -#define UHCI_CMD_CF 0x0040 -#define UHCI_CMD_MAXP 0x0080 - -#define UHCI_STS 0x02 -#define UHCI_STS_USBINT 0x0001 -#define UHCI_STS_USBEI 0x0002 -#define UHCI_STS_RD 0x0004 -#define UHCI_STS_HSE 0x0008 -#define UHCI_STS_HCPE 0x0010 -#define UHCI_STS_HCH 0x0020 -#define UHCI_STS_ALLINTRS 0x003f - -#define UHCI_INTR 0x04 -#define UHCI_INTR_TOCRCIE 0x0001 -#define UHCI_INTR_RIE 0x0002 -#define UHCI_INTR_IOCE 0x0004 -#define UHCI_INTR_SPIE 0x0008 - -#define UHCI_FRNUM 0x06 -#define UHCI_FRNUM_MASK 0x03ff - -#define UHCI_FLBASEADDR 0x08 - -#define UHCI_SOF 0x0c -#define UHCI_SOF_MASK 0x7f - -#define UHCI_PORTSC1 0x010 -#define UHCI_PORTSC2 0x012 -#define UHCI_PORTSC_CCS 0x0001 -#define UHCI_PORTSC_CSC 0x0002 -#define UHCI_PORTSC_PE 0x0004 -#define UHCI_PORTSC_POEDC 0x0008 -#define UHCI_PORTSC_LS 0x0030 -#define UHCI_PORTSC_LS_SHIFT 4 -#define UHCI_PORTSC_RD 0x0040 -#define UHCI_PORTSC_LSDA 0x0100 -#define UHCI_PORTSC_PR 0x0200 -#define UHCI_PORTSC_OCI 0x0400 -#define UHCI_PORTSC_OCIC 0x0800 -#define UHCI_PORTSC_SUSP 0x1000 - -#define URWMASK(x) \ - ((x) & (UHCI_PORTSC_SUSP | UHCI_PORTSC_PR | UHCI_PORTSC_RD | UHCI_PORTSC_PE)) - -#define UHCI_FRAMELIST_COUNT 1024 /* units */ -#define UHCI_FRAMELIST_ALIGN 4096 /* bytes */ - -#define UHCI_TD_ALIGN 16 /* bytes */ -#define UHCI_QH_ALIGN 16 /* bytes */ - -#if ((USB_PAGE_SIZE < UHCI_TD_ALIGN) || (UHCI_TD_ALIGN == 0) || \ - (USB_PAGE_SIZE < UHCI_QH_ALIGN) || (UHCI_QH_ALIGN == 0)) -#error "Invalid USB page size!" +#if ((USB_PAGE_SIZE < UHCI_TD_ALIGN) || (UHCI_TD_ALIGN == 0) || \ + (USB_PAGE_SIZE < UHCI_QH_ALIGN) || (UHCI_QH_ALIGN == 0)) +#error "Invalid USB page size!" #endif typedef u_int32_t uhci_physaddr_t; -#define UHCI_PTR_T 0x00000001 -#define UHCI_PTR_TD 0x00000000 -#define UHCI_PTR_QH 0x00000002 -#define UHCI_PTR_VF 0x00000004 +#define UHCI_PTR_T 0x00000001 +#define UHCI_PTR_TD 0x00000000 +#define UHCI_PTR_QH 0x00000002 +#define UHCI_PTR_VF 0x00000004 -#define UHCI_QH_REMOVE_DELAY 5 /* us - QH remove delay */ +#define UHCI_QH_REMOVE_DELAY 5 /* us - QH remove delay */ /* * The Queue Heads (QH) and Transfer Descriptors (TD) are accessed by @@ -137,175 +128,153 @@ typedef struct uhci_td { /* - * data used by the UHCI controller - * - * volatile is used so that the compiler - * does not change the order in which - * the variables are accessed + * Data used by the UHCI controller. + * volatile is used in order to mantain struct members ordering. */ - __volatile__ u_int32_t td_next; - __volatile__ u_int32_t td_status; -#define UHCI_TD_GET_ACTLEN(s) (((s) + 1) & 0x3ff) -#define UHCI_TD_ZERO_ACTLEN(t) ((t) | 0x3ff) -#define UHCI_TD_BITSTUFF 0x00020000 -#define UHCI_TD_CRCTO 0x00040000 -#define UHCI_TD_NAK 0x00080000 -#define UHCI_TD_BABBLE 0x00100000 -#define UHCI_TD_DBUFFER 0x00200000 -#define UHCI_TD_STALLED 0x00400000 -#define UHCI_TD_ACTIVE 0x00800000 -#define UHCI_TD_IOC 0x01000000 -#define UHCI_TD_IOS 0x02000000 -#define UHCI_TD_LS 0x04000000 -#define UHCI_TD_GET_ERRCNT(s) (((s) >> 27) & 3) -#define UHCI_TD_SET_ERRCNT(n) ((n) << 27) -#define UHCI_TD_SPD 0x20000000 - __volatile__ u_int32_t td_token; -#define UHCI_TD_PID 0x000000ff -#define UHCI_TD_PID_IN 0x00000069 -#define UHCI_TD_PID_OUT 0x000000e1 -#define UHCI_TD_PID_SETUP 0x0000002d -#define UHCI_TD_GET_PID(s) ((s) & 0xff) -#define UHCI_TD_SET_DEVADDR(a) ((a) << 8) -#define UHCI_TD_GET_DEVADDR(s) (((s) >> 8) & 0x7f) -#define UHCI_TD_SET_ENDPT(e) (((e) & 0xf) << 15) -#define UHCI_TD_GET_ENDPT(s) (((s) >> 15) & 0xf) -#define UHCI_TD_SET_DT(t) ((t) << 19) -#define UHCI_TD_GET_DT(s) (((s) >> 19) & 1) -#define UHCI_TD_SET_MAXLEN(l) (((l)-1) << 21) -#define UHCI_TD_GET_MAXLEN(s) ((((s) >> 21) + 1) & 0x7ff) -#define UHCI_TD_MAXLEN_MASK 0xffe00000 - __volatile__ u_int32_t td_buffer; - + volatile uint32_t td_next; + volatile uint32_t td_status; +#define UHCI_TD_GET_ACTLEN(s) (((s) + 1) & 0x3ff) +#define UHCI_TD_ZERO_ACTLEN(t) ((t) | 0x3ff) +#define UHCI_TD_BITSTUFF 0x00020000 +#define UHCI_TD_CRCTO 0x00040000 +#define UHCI_TD_NAK 0x00080000 +#define UHCI_TD_BABBLE 0x00100000 +#define UHCI_TD_DBUFFER 0x00200000 +#define UHCI_TD_STALLED 0x00400000 +#define UHCI_TD_ACTIVE 0x00800000 +#define UHCI_TD_IOC 0x01000000 +#define UHCI_TD_IOS 0x02000000 +#define UHCI_TD_LS 0x04000000 +#define UHCI_TD_GET_ERRCNT(s) (((s) >> 27) & 3) +#define UHCI_TD_SET_ERRCNT(n) ((n) << 27) +#define UHCI_TD_SPD 0x20000000 + volatile uint32_t td_token; +#define UHCI_TD_PID 0x000000ff +#define UHCI_TD_PID_IN 0x00000069 +#define UHCI_TD_PID_OUT 0x000000e1 +#define UHCI_TD_PID_SETUP 0x0000002d +#define UHCI_TD_GET_PID(s) ((s) & 0xff) +#define UHCI_TD_SET_DEVADDR(a) ((a) << 8) +#define UHCI_TD_GET_DEVADDR(s) (((s) >> 8) & 0x7f) +#define UHCI_TD_SET_ENDPT(e) (((e) & 0xf) << 15) +#define UHCI_TD_GET_ENDPT(s) (((s) >> 15) & 0xf) +#define UHCI_TD_SET_DT(t) ((t) << 19) +#define UHCI_TD_GET_DT(s) (((s) >> 19) & 1) +#define UHCI_TD_SET_MAXLEN(l) (((l)-1) << 21) +#define UHCI_TD_GET_MAXLEN(s) ((((s) >> 21) + 1) & 0x7ff) +#define UHCI_TD_MAXLEN_MASK 0xffe00000 + volatile uint32_t td_buffer; /* - * extra information needed: + * Extra information needed: */ - struct uhci_td *next; - struct uhci_td *prev; - struct uhci_td *obj_next; - void *fixup_ptr; + struct uhci_td *next; + struct uhci_td *prev; + struct uhci_td *obj_next; + void *fixup_ptr; + uint32_t td_self; + uint32_t fixup_offset; +} __aligned(UHCI_TD_ALIGN) uhci_td_t; - u_int32_t td_self; - u_int32_t fixup_offset; +#define UHCI_TD_ERROR (UHCI_TD_BITSTUFF | UHCI_TD_CRCTO | \ + UHCI_TD_BABBLE | UHCI_TD_DBUFFER | UHCI_TD_STALLED) -} __attribute__((__aligned__(UHCI_TD_ALIGN))) uhci_td_t; +#define UHCI_TD_SETUP(len, endp, dev) (UHCI_TD_SET_MAXLEN(len) | \ + UHCI_TD_SET_ENDPT(endp) | \ + UHCI_TD_SET_DEVADDR(dev) | \ + UHCI_TD_PID_SETUP) -#define UHCI_TD_ERROR (UHCI_TD_BITSTUFF|UHCI_TD_CRCTO|UHCI_TD_BABBLE|UHCI_TD_DBUFFER|UHCI_TD_STALLED) +#define UHCI_TD_OUT(len, endp, dev, dt) (UHCI_TD_SET_MAXLEN(len) | \ + UHCI_TD_SET_ENDPT(endp) | \ + UHCI_TD_SET_DEVADDR(dev) | \ + UHCI_TD_PID_OUT | UHCI_TD_SET_DT(dt)) -#define UHCI_TD_SETUP(len, endp, dev) (UHCI_TD_SET_MAXLEN(len) | \ - UHCI_TD_SET_ENDPT(endp) | UHCI_TD_SET_DEVADDR(dev) | \ - UHCI_TD_PID_SETUP) - -#define UHCI_TD_OUT(len, endp, dev, dt) (UHCI_TD_SET_MAXLEN(len) | \ - UHCI_TD_SET_ENDPT(endp) | UHCI_TD_SET_DEVADDR(dev) | \ - UHCI_TD_PID_OUT | UHCI_TD_SET_DT(dt)) +#define UHCI_TD_IN(len, endp, dev, dt) (UHCI_TD_SET_MAXLEN(len) | \ + UHCI_TD_SET_ENDPT(endp) | \ + UHCI_TD_SET_DEVADDR(dev) | \ + UHCI_TD_PID_IN | UHCI_TD_SET_DT(dt)) -#define UHCI_TD_IN(len, endp, dev, dt) (UHCI_TD_SET_MAXLEN(len) | \ - UHCI_TD_SET_ENDPT(endp) | UHCI_TD_SET_DEVADDR(dev) | \ - UHCI_TD_PID_IN | UHCI_TD_SET_DT(dt)) - typedef struct uhci_qh { /* - * data used by the UHCI controller + * Data used by the UHCI controller. */ - __volatile__ u_int32_t qh_h_next; - __volatile__ u_int32_t qh_e_next; - + volatile uint32_t qh_h_next; + volatile uint32_t qh_e_next; /* - * extra information needed: + * Extra information needed: */ - struct uhci_qh *h_next; - struct uhci_qh *h_prev; - struct uhci_qh *obj_next; + struct uhci_qh *h_next; + struct uhci_qh *h_prev; + struct uhci_qh *obj_next; + struct uhci_td *e_next; + uint32_t qh_self; + uint16_t intr_pos; +} __aligned(UHCI_QH_ALIGN) uhci_qh_t; - struct uhci_td *e_next; +/* Maximum number of isochronous TD's and QH's interrupt */ +#define UHCI_VFRAMELIST_COUNT 128 +#define UHCI_IFRAMELIST_COUNT (2 * UHCI_VFRAMELIST_COUNT) - u_int32_t qh_self; - - u_int16_t intr_pos; - -} __attribute__((__aligned__(UHCI_QH_ALIGN))) uhci_qh_t; - -#define UHCI_VFRAMELIST_COUNT 128 /* maximum number of isochronous TD's */ -#define UHCI_IFRAMELIST_COUNT (2*UHCI_VFRAMELIST_COUNT) /* maximum number of interrupt QH's */ - -#if (((UHCI_VFRAMELIST_COUNT & (UHCI_VFRAMELIST_COUNT-1)) != 0) || \ - (UHCI_VFRAMELIST_COUNT > UHCI_FRAMELIST_COUNT)) - -#error "UHCI_VFRAMELIST_COUNT is not power of two" -#error "or UHCI_VFRAMELIST_COUNT > UHCI_FRAMELIST_COUNT" +#if (((UHCI_VFRAMELIST_COUNT & (UHCI_VFRAMELIST_COUNT-1)) != 0) || \ + (UHCI_VFRAMELIST_COUNT > UHCI_FRAMELIST_COUNT)) +#error "UHCI_VFRAMELIST_COUNT is not power of two" +#error "or UHCI_VFRAMELIST_COUNT > UHCI_FRAMELIST_COUNT" #endif struct uhci_hw_softc { - u_int32_t pframes[UHCI_FRAMELIST_COUNT]; /* start TD pointer */ - - struct uhci_td isoc_start[UHCI_VFRAMELIST_COUNT]; /* start TD for isochronous */ - struct uhci_qh intr_start[UHCI_IFRAMELIST_COUNT]; /* start QH for interrupt */ - - struct uhci_qh ls_ctl_start; /* start QH for low speed control */ - struct uhci_qh hs_ctl_start; /* start QH for high speed control */ - struct uhci_qh bulk_start; /* start QH for bulk */ + uint32_t pframes[UHCI_FRAMELIST_COUNT]; /* start TD pointer */ + struct uhci_td isoc_start[UHCI_VFRAMELIST_COUNT]; /* start TD for isochronous */ + struct uhci_qh intr_start[UHCI_IFRAMELIST_COUNT]; /* start QH for interrupt */ + struct uhci_qh ls_ctl_start; /* start QH for low speed control */ + struct uhci_qh hs_ctl_start; /* start QH for high speed control */ + struct uhci_qh bulk_start; /* start QH for bulk */ + struct uhci_qh last_qh; /* last QH */ + struct uhci_td last_td; /* last TD */ - struct uhci_qh last_qh; /* last QH */ - struct uhci_td last_td; /* last TD */ - }; typedef struct uhci_softc { - struct uhci_hw_softc sc_hw; /* hardware structures first */ - - u_int32_t sc_physaddr; /* physical address of this structure */ + struct uhci_hw_softc sc_hw; /* hardware structures first */ + uint32_t sc_physaddr; /* physical address of this structure */ - struct uhci_td *sc_isoc_p_last[UHCI_VFRAMELIST_COUNT]; /* pointer to last TD for isochronous */ - struct uhci_qh *sc_intr_p_last[UHCI_IFRAMELIST_COUNT]; /* pointer to last QH for interrupt */ + struct uhci_td *sc_isoc_p_last[UHCI_VFRAMELIST_COUNT]; /* pointer to last TD for isochronous */ + struct uhci_qh *sc_intr_p_last[UHCI_IFRAMELIST_COUNT]; /* pointer to last QH for interrupt */ - u_int16_t sc_intr_stat[UHCI_IFRAMELIST_COUNT]; + uint16_t sc_intr_stat[UHCI_IFRAMELIST_COUNT]; - struct uhci_qh *sc_ls_ctl_p_last; /* pointer to last QH for low speed control */ - struct uhci_qh *sc_hs_ctl_p_last; /* pointer to last QH for high speed control */ - struct uhci_qh *sc_bulk_p_last; /* pointer to last QH for bulk */ + struct uhci_qh *sc_ls_ctl_p_last; /* pointer to last QH for low speed control */ + struct uhci_qh *sc_hs_ctl_p_last; /* pointer to last QH for high speed control */ + struct uhci_qh *sc_bulk_p_last; /* pointer to last QH for bulk */ - struct usbd_bus sc_bus; /* base device */ + struct usbd_bus sc_bus; /* base device */ - bus_space_tag_t iot; - bus_space_handle_t ioh; - bus_size_t ios; + bus_space_tag_t iot; + bus_space_handle_t ioh; + bus_size_t ios; - void *ih; + void *ih; - struct resource *io_res; - struct resource *irq_res; + struct resource *io_res; + struct resource *irq_res; - device_t sc_dev; + device_t sc_dev; - u_int32_t sc_loops; /* number of QHs that wants looping */ + uint32_t sc_loops; /* number of QHs that wants looping */ + uint8_t sc_addr; /* device address */ + uint8_t sc_conf; /* device configuration */ + uint8_t sc_isreset; - u_int8_t sc_addr; /* device address */ - u_int8_t sc_conf; /* device configuration */ - u_int8_t sc_isreset; + uint8_t sc_saved_sof; + uint16_t sc_saved_frnum; - u_int8_t sc_saved_sof; - u_int16_t sc_saved_frnum; + LIST_HEAD(, usbd_xfer) sc_interrupt_list_head; - LIST_HEAD(, usbd_xfer) sc_interrupt_list_head; - - char sc_vendor[16]; /* vendor string for root hub */ - + char sc_vendor[16]; /* vendor string for root hub */ } uhci_softc_t; -usbd_status -uhci_init(uhci_softc_t *sc); - -void -uhci_suspend(uhci_softc_t *sc); - -void -uhci_resume(uhci_softc_t *sc); - -void -uhci_reset(uhci_softc_t *sc); - -void -uhci_interrupt(uhci_softc_t *sc); +usbd_status uhci_init(uhci_softc_t *sc); +void uhci_suspend(uhci_softc_t *sc); +void uhci_resume(uhci_softc_t *sc); +void uhci_reset(uhci_softc_t *sc); +void uhci_interrupt(uhci_softc_t *sc); #endif /* _UHCI_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Oct 1 16:17: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 4E81716A416; Sun, 1 Oct 2006 16:17:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1086716A403 for ; Sun, 1 Oct 2006 16:17:59 +0000 (UTC) (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 AA71643D70 for ; Sun, 1 Oct 2006 16:17:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k91GHwtK040911 for ; Sun, 1 Oct 2006 16:17:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k91GHwqC040908 for perforce@freebsd.org; Sun, 1 Oct 2006 16:17:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 1 Oct 2006 16:17:58 GMT Message-Id: <200610011617.k91GHwqC040908@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 107051 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 16:17:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=107051 Change 107051 by rwatson@rwatson_peppercorn on 2006/10/01 16:17:07 Integrate recent changes from HEAD version of priv list to 6-STABLE. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/sys/priv.h#2 integrate Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/sys/priv.h#2 (text+ko) ==== @@ -160,7 +160,7 @@ PRIV_VFS_CHROOT, /* chroot(). */ PRIV_VFS_CLEARSUGID, /* Don't clear sugid on change. */ PRIV_VFS_EXTATTR_SYSTEM, /* Operate on system EA namespace. */ - PRIV_VFS_FCHROOT, /* fchrot(). */ + PRIV_VFS_FCHROOT, /* fchroot(). */ PRIV_VFS_FHOPEN, /* Can fhopen(). */ PRIV_VFS_FHSTAT, /* Can fhstat(). */ PRIV_VFS_FHSTATFS, /* Can fhstatfs(). */ @@ -213,6 +213,7 @@ PRIV_NETATM_ADD, PRIV_NETATM_DEL, PRIV_NETATM_SET, + PRIV_NETBLUETOOTH_RAW, /* Open raw bluetooth socket. */ PRIV_NETGRAPH_CONTROL, /* Open netgraph control socket. */ PRIV_NETGRAPH_TTY, /* Configure tty for netgraph. */ PRIV_NETINET_RESERVEDPORT, /* Bind low port number. */ From owner-p4-projects@FreeBSD.ORG Sun Oct 1 17:12:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 455CA16A416; Sun, 1 Oct 2006 17:12:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F87016A407 for ; Sun, 1 Oct 2006 17:12:10 +0000 (UTC) (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 9BD8843D46 for ; Sun, 1 Oct 2006 17:12: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.6/8.13.6) with ESMTP id k91HC9De052684 for ; Sun, 1 Oct 2006 17:12:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k91HC6lv052681 for perforce@freebsd.org; Sun, 1 Oct 2006 17:12:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 1 Oct 2006 17:12:06 GMT Message-Id: <200610011712.k91HC6lv052681@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 107052 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 17:12:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=107052 Change 107052 by rwatson@rwatson_peppercorn on 2006/10/01 17:11:30 Integrate TrustedBSD priv branch. Affected files ... .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_emul.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/crypto/via/padlock_cipher.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/de/if_de.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/en/midway.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/my/if_my.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/my/if_myreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/re/if_re.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/smbus/smb.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/smbus/smbconf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/smbus/smbconf.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/smbus/smbus_if.m#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/udf/osta.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_event.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_subr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/bus_if.m#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/init_sysent.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_acct.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_exit.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_jail.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_mbuf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_prot.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_bus.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_prf.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_rman.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_witness.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/syscalls.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/syscalls.master#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/systrace_args.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/tty.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/modules/Makefile#5 integrate .. //depot/projects/trustedbsd/priv/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/pf/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_bridge.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_vlan.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_output.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/nd6.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/alpm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/amdpm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/amdsmb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_rl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_sf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_sfreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_sis.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_sisreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_ste.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_tl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_tlreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_vr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_wb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_wbreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_xl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/if_xlreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/intpm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/intpmreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/nfsmb.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/pci/viapm.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac/mac_internal.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/bus.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mac.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mac_policy.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mbuf.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mount.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscall.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscall.mk#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sysctl.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sysproto.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_quota.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/local_apic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.28 2006/09/06 22:05:34 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.29 2006/09/11 20:12:42 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -794,6 +794,76 @@ } } } + +static void +dump_mask(const char *prefix, uint32_t v, int base) +{ + int i, first; + + first = 1; + for (i = 0; i < 32; i++) + if (v & (1 << i)) { + if (first) { + db_printf("%s:", prefix); + first = 0; + } + db_printf(" %02x", base + i); + } + if (!first) + db_printf("\n"); +} + +/* Show info from the lapic regs for this CPU. */ +DB_SHOW_COMMAND(lapic, db_show_lapic) +{ + uint32_t v; + + db_printf("lapic ID = %d\n", lapic_id()); + v = lapic->version; + db_printf("version = %d.%d\n", (v & APIC_VER_VERSION) >> 4, + v & 0xf); + db_printf("max LVT = %d\n", (v & APIC_VER_MAXLVT) >> MAXLVTSHIFT); + v = lapic->svr; + db_printf("SVR = %02x (%s)\n", v & APIC_SVR_VECTOR, + v & APIC_SVR_ENABLE ? "enabled" : "disabled"); + db_printf("TPR = %02x\n", lapic->tpr); + +#define dump_field(prefix, index) \ + dump_mask(__XSTRING(prefix ## index), lapic->prefix ## index, \ + index * 32) + + db_printf("In-service Interrupts:\n"); + dump_field(isr, 0); + dump_field(isr, 1); + dump_field(isr, 2); + dump_field(isr, 3); + dump_field(isr, 4); + dump_field(isr, 5); + dump_field(isr, 6); + dump_field(isr, 7); + + db_printf("TMR Interrupts:\n"); + dump_field(tmr, 0); + dump_field(tmr, 1); + dump_field(tmr, 2); + dump_field(tmr, 3); + dump_field(tmr, 4); + dump_field(tmr, 5); + dump_field(tmr, 6); + dump_field(tmr, 7); + + db_printf("IRR Interrupts:\n"); + dump_field(irr, 0); + dump_field(irr, 1); + dump_field(irr, 2); + dump_field(irr, 3); + dump_field(irr, 4); + dump_field(irr, 5); + dump_field(irr, 6); + dump_field(irr, 7); + +#undef dump_field +} #endif /* ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.276 2006/05/16 14:32:16 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.277 2006/09/11 20:10:42 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -342,7 +342,10 @@ setidt(IPI_INVLTLB, IDTVEC(invltlb), SDT_SYSIGT, SEL_KPL, 0); setidt(IPI_INVLPG, IDTVEC(invlpg), SDT_SYSIGT, SEL_KPL, 0); setidt(IPI_INVLRNG, IDTVEC(invlrng), SDT_SYSIGT, SEL_KPL, 0); - + + /* Install an inter-CPU IPI for cache invalidation. */ + setidt(IPI_INVLCACHE, IDTVEC(invlcache), SDT_SYSIGT, SEL_KPL, 0); + /* Install an inter-CPU IPI for all-CPU rendezvous */ setidt(IPI_RENDEZVOUS, IDTVEC(rendezvous), SDT_SYSIGT, SEL_KPL, 0); ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/nexus.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.68 2006/04/20 04:16:34 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.69 2006/09/11 19:31:51 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -140,7 +140,7 @@ static int nexus_probe(device_t dev) { - int irq, last; + int irq; device_quiet(dev); /* suppress attach message for neatness */ @@ -173,18 +173,10 @@ * We search for regions of existing IRQs and add those to the IRQ * resource manager. */ - last = -1; for (irq = 0; irq < NUM_IO_INTS; irq++) - if (intr_lookup_source(irq) != NULL) { - if (last == -1) - last = irq; - } else if (last != -1) { - if (rman_manage_region(&irq_rman, last, irq - 1) != 0) + if (intr_lookup_source(irq) != NULL) + if (rman_manage_region(&irq_rman, irq, irq) != 0) panic("nexus_probe irq_rman add"); - last = -1; - } - if (last != -1 && rman_manage_region(&irq_rman, last, irq - 1) != 0) - panic("nexus_probe irq_rman add"); /* * ISA DMA on PCI systems is implemented in the ISA part of each ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/vm_machdep.c#2 (text+ko) ==== @@ -41,10 +41,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.251 2006/07/24 12:24:56 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.252 2006/09/17 14:54:14 davidxu Exp $"); #include "opt_isa.h" #include "opt_cpu.h" +#include "opt_compat.h" #include #include @@ -69,6 +70,7 @@ #include #include #include +#include #include #include @@ -79,6 +81,12 @@ #include +#ifdef COMPAT_IA32 + +extern struct sysentvec ia32_freebsd_sysvec; + +#endif + static void cpu_reset_real(void); #ifdef SMP static void cpu_reset_proxy(void); @@ -320,6 +328,28 @@ */ cpu_thread_clean(td); +#ifdef COMPAT_IA32 + if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + /* + * Set the trap frame to point at the beginning of the uts + * function. + */ + td->td_frame->tf_rbp = 0; + td->td_frame->tf_rsp = + (((uintptr_t)stack->ss_sp + stack->ss_size - 4) & ~0x0f) - 4; + td->td_frame->tf_rip = (uintptr_t)entry; + + /* + * Pass the address of the mailbox for this kse to the uts + * function as a parameter on the stack. + */ + suword32((void *)(td->td_frame->tf_rsp + sizeof(int32_t)), + (uint32_t)(uintptr_t)arg); + + return; + } +#endif + /* * Set the trap frame to point at the beginning of the uts * function. @@ -344,6 +374,19 @@ if ((u_int64_t)tls_base >= VM_MAXUSER_ADDRESS) return (EINVAL); +#ifdef COMPAT_IA32 + if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td == curthread) { + critical_enter(); + td->td_pcb->pcb_gsbase = (register_t)tls_base; + wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase); + critical_exit(); + } else { + td->td_pcb->pcb_gsbase = (register_t)tls_base; + } + return (0); + } +#endif if (td == curthread) { critical_enter(); td->td_pcb->pcb_fsbase = (register_t)tls_base; ==== //depot/projects/trustedbsd/priv/sys/cam/cam_xpt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.162 2006/06/26 05:41:11 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.165 2006/09/16 17:35:47 mjacob Exp $"); #include #include @@ -387,9 +387,9 @@ /*quirks*/0, /*mintags*/0, /*maxtags*/0 }, { - /* Does not support other than LUN 0 */ + /* This does not support other than LUN 0 */ { T_DIRECT, SIP_MEDIA_FIXED, "VMware*", "*", "*" }, - CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 + CAM_QUIRK_NOLUNS, /*mintags*/2, /*maxtags*/255 }, { /* @@ -592,6 +592,10 @@ CAM_QUIRK_NOHILUNS, /*mintags*/2, /*maxtags*/255 }, { + { T_ENCLOSURE, SIP_MEDIA_FIXED, "DP", "BACKPLANE", "*" }, + CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 + }, + { /* Default tagged queuing parameters for all devices */ { T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED, ==== //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_da.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.191 2006/07/14 13:58:32 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.192 2006/09/16 21:21:07 mjacob Exp $"); #include @@ -1519,15 +1519,30 @@ block_size = scsi_4btoul(rcaplong->length); maxsector = scsi_8btou64(rcaplong->addr); } - dasetgeom(periph, block_size, maxsector); - dp = &softc->params; - snprintf(announce_buf, sizeof(announce_buf), - "%juMB (%ju %u byte sectors: %dH %dS/T %dC)", - (uintmax_t) (((uintmax_t)dp->secsize * - dp->sectors) / (1024*1024)), - (uintmax_t)dp->sectors, - dp->secsize, dp->heads, dp->secs_per_track, - dp->cylinders); + + /* + * Because GEOM code just will panic us if we + * give them an 'illegal' value we'll avoid that + * here. + */ + if (block_size >= MAXPHYS || block_size == 0) { + xpt_print_path(periph->path); + printf("unsupportable block size %ju\n", + (uintmax_t) block_size); + announce_buf[0] = '\0'; + cam_periph_invalidate(periph); + } else { + dasetgeom(periph, block_size, maxsector); + dp = &softc->params; + snprintf(announce_buf, sizeof(announce_buf), + "%juMB (%ju %u byte sectors: %dH %dS/T " + "%dC)", (uintmax_t) + (((uintmax_t)dp->secsize * + dp->sectors) / (1024*1024)), + (uintmax_t)dp->sectors, + dp->secsize, dp->heads, + dp->secs_per_track, dp->cylinders); + } } else { int error; ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.61 2006/09/09 01:22:13 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.62 2006/09/17 13:29:35 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -419,7 +419,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_recvmsg AUE_RECVMSG #define FREEBSD32_SYS_AUE_freebsd32_sendmsg AUE_SENDMSG #define FREEBSD32_SYS_AUE_freebsd32_recvfrom AUE_RECVFROM -#define FREEBSD32_SYS_AUE_freebsd32_sigaltstack AUE_SIGPENDING +#define FREEBSD32_SYS_AUE_freebsd32_sigaltstack AUE_SIGALTSTACK #define FREEBSD32_SYS_AUE_freebsd32_execve AUE_EXECVE #define FREEBSD32_SYS_AUE_freebsd32_setitimer AUE_SETITIMER #define FREEBSD32_SYS_AUE_freebsd32_getitimer AUE_GETITIMER ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.59 2006/09/09 01:22:13 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.60 2006/09/17 13:29:35 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.50 2006/09/09 01:22:13 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.51 2006/09/17 13:29:35 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.60 2006/09/09 01:22:13 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.61 2006/09/17 13:29:35 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp */ #include "opt_compat.h" @@ -85,7 +85,7 @@ { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN, NULL, 0, 0 }, /* 50 = setlogin */ { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ { compat(0,freebsd32_sigpending), AUE_SIGPENDING, NULL, 0, 0 }, /* 52 = old freebsd32_sigpending */ - { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGPENDING, NULL, 0, 0 }, /* 53 = freebsd32_sigaltstack */ + { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0 }, /* 53 = freebsd32_sigaltstack */ { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = ioctl */ { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0 }, /* 55 = reboot */ { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0 }, /* 56 = revoke */ ==== //depot/projects/trustedbsd/priv/sys/compat/freebsd32/syscalls.master#4 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.74 2006/09/09 01:22:13 davidxu Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.75 2006/09/17 13:28:11 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -124,7 +124,7 @@ 50 AUE_SETLOGIN NOPROTO { int setlogin(char *namebuf); } 51 AUE_ACCT NOPROTO { int acct(char *path); } 52 AUE_SIGPENDING COMPAT { int freebsd32_sigpending(void); } -53 AUE_SIGPENDING STD { int freebsd32_sigaltstack( \ +53 AUE_SIGALTSTACK STD { int freebsd32_sigaltstack( \ struct sigaltstack32 *ss, \ struct sigaltstack32 *oss); } 54 AUE_IOCTL NOPROTO { int ioctl(int fd, u_long com, \ ==== //depot/projects/trustedbsd/priv/sys/compat/linux/linux_emul.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.5 2006/08/28 13:52:27 ssouhlal Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.6 2006/09/09 16:55:55 netchild Exp $"); #include "opt_compat.h" @@ -101,6 +101,7 @@ panic("process not found in proc_init\n"); p->p_emuldata = em; PROC_UNLOCK(p); + EMUL_LOCK(&emul_lock); } else { /* lookup the old one */ em = em_find(td->td_proc, EMUL_UNLOCKED); @@ -129,14 +130,15 @@ if (child != 0) { + EMUL_UNLOCK(&emul_lock); EMUL_SHARED_WLOCK(&emul_shared_lock); LIST_INSERT_HEAD(&em->shared->threads, em, threads); EMUL_SHARED_WUNLOCK(&emul_shared_lock); p = pfind(child); - PROC_UNLOCK(p); /* we might have a sleeping linux_schedtail */ wakeup(&p->p_emuldata); + PROC_UNLOCK(p); } else EMUL_UNLOCK(&emul_lock); ==== //depot/projects/trustedbsd/priv/sys/compat/linux/linux_file.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.96 2006/07/11 20:52:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.97 2006/09/10 13:47:56 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -495,6 +496,7 @@ { char *path; int error; + struct stat st; LCONVPATHEXIST(td, args->path, &path); @@ -504,6 +506,11 @@ #endif error = kern_unlink(td, path, UIO_SYSSPACE); + if (error == EPERM) + /* Introduce POSIX noncompliant behaviour of Linux */ + if (kern_stat(td, path, UIO_SYSSPACE, &st) == 0) + if (S_ISDIR(st.st_mode)) + error = EISDIR; LFREEPATH(path); return (error); } ==== //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.186 2006/08/25 11:02:42 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.187 2006/09/16 14:12:04 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1301,6 +1301,13 @@ #define REBOOT_CAD_ON 0x89abcdef #define REBOOT_CAD_OFF 0 #define REBOOT_HALT 0xcdef0123 +#define REBOOT_RESTART 0x01234567 +#define REBOOT_RESTART2 0xA1B2C3D4 +#define REBOOT_POWEROFF 0x4321FEDC +#define REBOOT_MAGIC1 0xfee1dead +#define REBOOT_MAGIC2 0x28121969 +#define REBOOT_MAGIC2A 0x05121996 +#define REBOOT_MAGIC2B 0x16041998 int linux_reboot(struct thread *td, struct linux_reboot_args *args) @@ -1311,10 +1318,37 @@ if (ldebug(reboot)) printf(ARGS(reboot, "0x%x"), args->cmd); #endif - if (args->cmd == REBOOT_CAD_ON || args->cmd == REBOOT_CAD_OFF) - return (0); - bsd_args.opt = (args->cmd == REBOOT_HALT) ? RB_HALT : 0; - return (reboot(td, &bsd_args)); + + if (args->magic1 != REBOOT_MAGIC1) + return EINVAL; + + switch (args->magic2) { + case REBOOT_MAGIC2: + case REBOOT_MAGIC2A: + case REBOOT_MAGIC2B: + break; + default: + return EINVAL; + } + + switch (args->cmd) { + case REBOOT_CAD_ON: + case REBOOT_CAD_OFF: + return suser(td); + case REBOOT_HALT: + bsd_args.opt = RB_HALT; + break; + case REBOOT_RESTART: + case REBOOT_RESTART2: + bsd_args.opt = 0; + break; + case REBOOT_POWEROFF: + bsd_args.opt = RB_POWEROFF; + break; + default: + return EINVAL; + } + return reboot(td, &bsd_args); } ==== //depot/projects/trustedbsd/priv/sys/contrib/pf/net/pf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.40 2005/12/25 23:52:00 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.41 2006/09/12 04:25:11 csjp Exp $ */ /* $OpenBSD: pf.c,v 1.483 2005/03/15 17:38:43 dhartmei Exp $ */ /* @@ -42,6 +42,7 @@ #endif #ifdef __FreeBSD__ +#include "opt_mac.h" #include "opt_bpf.h" #include "opt_pf.h" @@ -78,6 +79,7 @@ #include #include #ifdef __FreeBSD__ +#include #include #include #else @@ -192,7 +194,12 @@ struct pf_addr *, struct pf_addr *, u_int16_t, u_int16_t *, u_int16_t *, u_int16_t *, u_int16_t *, u_int8_t, sa_family_t); +#ifdef __FreeBSD__ +void pf_send_tcp(struct mbuf *, + const struct pf_rule *, sa_family_t, +#else void pf_send_tcp(const struct pf_rule *, sa_family_t, +#endif const struct pf_addr *, const struct pf_addr *, u_int16_t, u_int16_t, u_int32_t, u_int32_t, u_int8_t, u_int16_t, u_int16_t, u_int8_t, int, @@ -1114,7 +1121,11 @@ cur->local_flags |= PFSTATE_EXPIRING; #endif if (cur->src.state == PF_TCPS_PROXY_DST) +#ifdef __FreeBSD__ + pf_send_tcp(NULL, cur->rule.ptr, cur->af, +#else pf_send_tcp(cur->rule.ptr, cur->af, +#endif &cur->ext.addr, &cur->lan.addr, cur->ext.port, cur->lan.port, cur->src.seqhi, cur->src.seqlo + 1, @@ -1574,7 +1585,11 @@ } void +#ifdef __FreeBSD__ +pf_send_tcp(struct mbuf *replyto, const struct pf_rule *r, sa_family_t af, +#else pf_send_tcp(const struct pf_rule *r, sa_family_t af, +#endif const struct pf_addr *saddr, const struct pf_addr *daddr, u_int16_t sport, u_int16_t dport, u_int32_t seq, u_int32_t ack, u_int8_t flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, int tag, @@ -1613,6 +1628,16 @@ m = m_gethdr(M_DONTWAIT, MT_HEADER); if (m == NULL) return; +#ifdef __FreeBSD__ +#ifdef MAC + if (replyto) + mac_create_mbuf_netlayer(replyto, m); + else + mac_create_mbuf_from_firewall(m); +#else + (void)replyto; +#endif +#endif if (tag) { #ifdef __FreeBSD__ m->m_flags |= M_SKIP_FIREWALL; @@ -3146,7 +3171,11 @@ ack++; if (th->th_flags & TH_FIN) ack++; +#ifdef __FreeBSD__ + pf_send_tcp(m, r, af, pd->dst, +#else pf_send_tcp(r, af, pd->dst, +#endif pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), ack, TH_RST|TH_ACK, 0, 0, r->return_ttl, 1, pd->eh, kif->pfik_ifp); @@ -3347,7 +3376,11 @@ mss = pf_calc_mss(saddr, af, mss); mss = pf_calc_mss(daddr, af, mss); s->src.mss = mss; +#ifdef __FreeBSD__ + pf_send_tcp(NULL, r, af, daddr, saddr, th->th_dport, +#else pf_send_tcp(r, af, daddr, saddr, th->th_dport, +#endif th->th_sport, s->src.seqhi, ntohl(th->th_seq) + 1, TH_SYN|TH_ACK, 0, s->src.mss, 0, 1, NULL, NULL); REASON_SET(&reason, PFRES_SYNPROXY); @@ -4348,7 +4381,11 @@ REASON_SET(reason, PFRES_SYNPROXY); return (PF_DROP); } +#ifdef __FreeBSD__ + pf_send_tcp(NULL, (*state)->rule.ptr, pd->af, pd->dst, +#else pf_send_tcp((*state)->rule.ptr, pd->af, pd->dst, +#endif pd->src, th->th_dport, th->th_sport, (*state)->src.seqhi, ntohl(th->th_seq) + 1, TH_SYN|TH_ACK, 0, (*state)->src.mss, 0, 1, @@ -4387,7 +4424,12 @@ (*state)->src.max_win = MAX(ntohs(th->th_win), 1); if ((*state)->dst.seqhi == 1) (*state)->dst.seqhi = htonl(arc4random()); +#ifdef __FreeBSD__ + pf_send_tcp(NULL, (*state)->rule.ptr, pd->af, + &src->addr, +#else pf_send_tcp((*state)->rule.ptr, pd->af, &src->addr, +#endif &dst->addr, src->port, dst->port, (*state)->dst.seqhi, 0, TH_SYN, 0, (*state)->src.mss, 0, 0, NULL, NULL); @@ -4401,12 +4443,21 @@ } else { (*state)->dst.max_win = MAX(ntohs(th->th_win), 1); (*state)->dst.seqlo = ntohl(th->th_seq); +#ifdef __FreeBSD__ + pf_send_tcp(NULL, (*state)->rule.ptr, pd->af, pd->dst, +#else pf_send_tcp((*state)->rule.ptr, pd->af, pd->dst, +#endif pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), ntohl(th->th_seq) + 1, TH_ACK, (*state)->src.max_win, 0, 0, 0, NULL, NULL); +#ifdef __FreeBSD__ + pf_send_tcp(NULL, (*state)->rule.ptr, pd->af, + &src->addr, +#else pf_send_tcp((*state)->rule.ptr, pd->af, &src->addr, +#endif &dst->addr, src->port, dst->port, (*state)->src.seqhi + 1, (*state)->src.seqlo + 1, TH_ACK, (*state)->dst.max_win, 0, 0, 1, @@ -4685,7 +4736,11 @@ (*state)->src.state == TCPS_SYN_SENT) { /* Send RST for state mismatches during handshake */ if (!(th->th_flags & TH_RST)) +#ifdef __FreeBSD__ + pf_send_tcp(m, (*state)->rule.ptr, pd->af, +#else pf_send_tcp((*state)->rule.ptr, pd->af, +#endif pd->dst, pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), 0, TH_RST, 0, 0, ==== //depot/projects/trustedbsd/priv/sys/crypto/via/padlock_cipher.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/crypto/via/padlock_cipher.c,v 1.4 2006/07/25 20:00:55 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/crypto/via/padlock_cipher.c,v 1.5 2006/09/15 10:44:55 pjd Exp $"); #include #include @@ -225,7 +225,7 @@ cw->cw_direction = PADLOCK_DIRECTION_ENCRYPT; key = ses->ses_ekey; if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0) - bcopy(enccrd->crd_iv, ses->ses_iv, 16); + bcopy(enccrd->crd_iv, ses->ses_iv, AES_BLOCK_LEN); if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0) { crypto_copyback(crp->crp_flags, crp->crp_buf, @@ -247,7 +247,8 @@ enccrd->crd_len, abuf); } - padlock_cbc(abuf, abuf, enccrd->crd_len / 16, key, cw, ses->ses_iv); + padlock_cbc(abuf, abuf, enccrd->crd_len / AES_BLOCK_LEN, key, cw, + ses->ses_iv); if (allocated) { crypto_copyback(crp->crp_flags, crp->crp_buf, enccrd->crd_skip, ==== //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.227 2006/07/29 21:46:16 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.228 2006/09/11 19:32:54 jhb Exp $"); #include "opt_acpi.h" #include @@ -415,13 +415,13 @@ acpi_rman_io.rm_type = RMAN_ARRAY; acpi_rman_io.rm_start = 0; acpi_rman_io.rm_end = 0xffff; - acpi_rman_io.rm_descr = "I/O ports"; + acpi_rman_io.rm_descr = "ACPI I/O ports"; if (rman_init(&acpi_rman_io) != 0) panic("acpi rman_init IO ports failed"); acpi_rman_mem.rm_type = RMAN_ARRAY; acpi_rman_mem.rm_start = 0; acpi_rman_mem.rm_end = ~0ul; - acpi_rman_mem.rm_descr = "I/O memory addresses"; + acpi_rman_mem.rm_descr = "ACPI I/O memory addresses"; if (rman_init(&acpi_rman_mem) != 0) panic("acpi rman_init memory failed"); ==== //depot/projects/trustedbsd/priv/sys/dev/ata/ata-all.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.273 2006/05/12 05:04:40 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.274 2006/09/11 18:33:59 sos Exp $"); #include "opt_ata.h" #include @@ -636,7 +636,9 @@ if (init) { sprintf(buffer, "%.40s/%.8s", atacap->model, atacap->revision); device_set_desc_copy(atadev->dev, buffer); - if (atadev->param.config & ATA_PROTO_ATAPI) { + if ((atadev->param.config & ATA_PROTO_ATAPI) && + (atadev->param.config != ATA_CFA_MAGIC1) && + (atadev->param.config != ATA_CFA_MAGIC2)) { if (atapi_dma && ch->dma && (atadev->param.config & ATA_DRQ_MASK) != ATA_DRQ_INTR && ata_umode(&atadev->param) >= ATA_UDMA2) ==== //depot/projects/trustedbsd/priv/sys/dev/ata/ata-chipset.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.173 2006/09/02 12:55:42 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.175 2006/09/12 22:06:39 sos Exp $"); #include "opt_ata.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 1 17:26:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 131BC16A412; Sun, 1 Oct 2006 17:26:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C93F016A40F for ; Sun, 1 Oct 2006 17:26:30 +0000 (UTC) (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 5CC9943D46 for ; Sun, 1 Oct 2006 17:26:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k91HQUjX055605 for ; Sun, 1 Oct 2006 17:26:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k91HQSGk055580 for perforce@freebsd.org; Sun, 1 Oct 2006 17:26:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 1 Oct 2006 17:26:28 GMT Message-Id: <200610011726.k91HQSGk055580@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 107054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 17:26:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=107054 Change 107054 by rwatson@rwatson_peppercorn on 2006/10/01 17:25:38 Mindlessly apply priv changes to RELENG_6, with some adaptations (no subr_acl_posix1e.c, etc), and some omissions (no mqueues, and so on). More work needed, including dealing with the alpha tree (not present in HEAD), compiling it, etc. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/amd64/amd64/io.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/compat/linux/linux_misc.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/compat/linux/linux_uid16.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/compat/svr4/svr4_fcntl.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/compat/svr4/svr4_misc.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/conf/NOTES#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/conf/files#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/conf/options#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_cbq.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_cdnr.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_hfsc.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_priq.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_red.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_rio.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/pf/net/if_pfsync.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/an/if_an.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/arl/if_arl.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/asr/asr.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/ata/atapi-cd.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/ce/if_ce.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/cp/if_cp.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/ctau/if_ct.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/cx/if_cx.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/dcons/dcons_os.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/drm/drmP.h#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/fdc/fdc.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/hwpmc/hwpmc_mod.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/if_ndis/if_ndis.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/kbd/kbd.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/nmdm/nmdm.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/null/null.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/ofw/ofw_console.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/random/randomdev.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/sbni/if_sbni.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/sbsh/if_sbsh.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/si/si.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/syscons/syscons.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/syscons/sysmouse.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/wi/if_wi.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/wl/if_wl.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/dev/zs/zs.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/fs/devfs/devfs_rule.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/fs/devfs/devfs_vnops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/fs/hpfs/hpfs_vnops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/fs/msdosfs/msdosfs_vnops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/fs/procfs/procfs_ioctl.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/fs/smbfs/smbfs_vnops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/fs/udf/udf_vfsops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/fs/umapfs/umap_vfsops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/i386/i386/io.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/i386/i386/sys_machdep.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/i386/i386/vm86.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/i386/ibcs2/ibcs2_misc.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/i386/ibcs2/ibcs2_socksys.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/i386/ibcs2/ibcs2_sysi86.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/i386/linux/linux_machdep.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/i4b/driver/i4b_ipr.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/ia64/ia64/ssc.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/isofs/cd9660/cd9660_vfsops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_acct.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_acl.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_descrip.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_environment.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_exec.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_fork.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_jail.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_ktrace.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_linker.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_ntptime.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_prot.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_resource.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_shutdown.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_sysctl.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_thr.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_time.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_xxx.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/subr_firmware.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/subr_prf.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/subr_witness.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/sysv_ipc.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/sysv_msg.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/tty.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/tty_cons.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/tty_pty.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/uipc_sem.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_mount.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_subr.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_syscalls.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_vnops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/modules/Makefile#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/net/bpf.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/net/if.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/net/if_bridge.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/net/if_gre.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/net/if_ppp.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/net/if_sl.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/net/if_tap.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/net/if_tun.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/net/ppp_tty.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/net/raw_usrreq.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/net/rtsock.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/net80211/ieee80211_ioctl.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netatalk/at_control.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netatalk/ddp_pcb.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netatm/atm_usrreq.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netgraph/ng_socket.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netgraph/ng_tty.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet/in_pcb.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_carp.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_divert.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_fw2.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_mroute.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_output.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet/raw_ip.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet/tcp_subr.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet/udp_usrreq.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/in6.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/in6_pcb.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/in6_src.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/ipsec.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/udp6_usrreq.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netipx/ipx_pcb.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netipx/ipx_usrreq.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netncp/ncp_conn.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netncp/ncp_mod.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netncp/ncp_subr.h#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netsmb/smb_conn.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/netsmb/smb_subr.h#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/nfsserver/nfs_syscalls.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/pc98/cbus/fdc.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/posix4/p1003_1b.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/security/audit/audit.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/security/audit/audit_pipe.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/security/audit/audit_syscalls.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/security/mac/mac_internal.h#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/security/mac/mac_net.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/security/mac/mac_system.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/security/mac_lomac/mac_lomac.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/security/mac_partition/mac_partition.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/security/mac_portacl/mac_portacl.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/sys/jail.h#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/sys/mac.h#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/sys/systm.h#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ffs/ffs_alloc.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ffs/ffs_vfsops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ffs/ffs_vnops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ufs/ufs_extattr.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ufs/ufs_quota.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ufs/ufs_vnops.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/vm/swap_pager.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/vm/vm_mmap.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/amd64/amd64/io.c#2 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -54,7 +55,7 @@ { int error; - error = suser(td); + error = priv_check(td, PRIV_IO); if (error != 0) return (error); error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/trustedbsd/priv6/src/sys/compat/linux/linux_misc.c#2 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -1031,7 +1032,8 @@ * Keep cr_groups[0] unchanged to prevent that. */ - if ((error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) { + if ((error = priv_check_cred(oldcred, PRIV_CRED_SETGROUPS, + SUSER_ALLOWJAIL)) != 0) { PROC_UNLOCK(p); crfree(newcred); return (error); ==== //depot/projects/trustedbsd/priv6/src/sys/compat/linux/linux_uid16.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -123,7 +124,8 @@ * Keep cr_groups[0] unchanged to prevent that. */ - if ((error = suser_cred(oldcred, SUSER_ALLOWJAIL)) != 0) { + if ((error = priv_check_cred(oldcred, PRIV_CRED_SETGROUPS, + SUSER_ALLOWJAIL)) != 0) { PROC_UNLOCK(p); crfree(newcred); return (error); ==== //depot/projects/trustedbsd/priv6/src/sys/compat/svr4/svr4_fcntl.c#2 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -279,7 +280,8 @@ goto out; if (td->td_ucred->cr_uid != vattr.va_uid && - (error = suser(td)) != 0) + (error = priv_check_cred(td->td_ucred, PRIV_VFS_ADMIN, + SUSER_ALLOWJAIL)) != 0) goto out; if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) ==== //depot/projects/trustedbsd/priv6/src/sys/compat/svr4/svr4_misc.c#2 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -607,7 +608,8 @@ struct file *fp; int error; - if ((error = suser(td)) != 0) + if ((error = priv_check_cred(td->td_ucred, PRIV_VFS_FCHROOT, + SUSER_ALLOWJAIL)) != 0) return error; if ((error = getvnode(fdp, uap->fd, &fp)) != 0) return error; ==== //depot/projects/trustedbsd/priv6/src/sys/conf/NOTES#2 (text+ko) ==== @@ -987,6 +987,7 @@ options MAC_NONE options MAC_PARTITION options MAC_PORTACL +options MAC_PRIVS options MAC_SEEOTHERUIDS options MAC_STUB options MAC_TEST ==== //depot/projects/trustedbsd/priv6/src/sys/conf/files#2 (text+ko) ==== @@ -1268,6 +1268,7 @@ kern/kern_physio.c standard kern/kern_pmc.c standard kern/kern_poll.c optional device_polling +kern/kern_priv.c standard kern/kern_proc.c standard kern/kern_prot.c standard kern/kern_resource.c standard @@ -1839,6 +1840,7 @@ security/mac/mac_net.c optional mac security/mac/mac_pipe.c optional mac security/mac/mac_posix_sem.c optional mac +security/mac/mac_priv.c optional mac security/mac/mac_process.c optional mac security/mac/mac_socket.c optional mac security/mac/mac_system.c optional mac @@ -1854,6 +1856,7 @@ security/mac_none/mac_none.c optional mac_none security/mac_partition/mac_partition.c optional mac_partition security/mac_portacl/mac_portacl.c optional mac_portacl +security/mac_privs/mac_privs.c optional mac_privs security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids security/mac_stub/mac_stub.c optional mac_stub security/mac_test/mac_test.c optional mac_test ==== //depot/projects/trustedbsd/priv6/src/sys/conf/options#2 (text+ko) ==== @@ -110,6 +110,7 @@ MAC_NONE opt_dontuse.h MAC_PARTITION opt_dontuse.h MAC_PORTACL opt_dontuse.h +MAC_PRIVS opt_dontuse.h MAC_SEEOTHERUIDS opt_dontuse.h MAC_STATIC opt_mac.h MAC_STUB opt_dontuse.h ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_cbq.c#2 (text+ko) ==== @@ -1062,7 +1062,9 @@ /* currently only command that an ordinary user can call */ break; default: -#if (__FreeBSD_version > 400000) +#if (__FreeBSD_version > 700000) + error = priv_check(p, PRIV_ALTQ_MANAGE); +#elsif (__FreeBSD_version > 400000) error = suser(p); #else error = suser(p->p_ucred, &p->p_acflag); ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_cdnr.c#2 (text+ko) ==== @@ -1262,7 +1262,9 @@ case CDNR_GETSTATS: break; default: -#if (__FreeBSD_version > 400000) +#if (__FreeBSD_versoin > 700000) + if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) +#elsif (__FreeBSD_version > 400000) if ((error = suser(p)) != 0) #else if ((error = suser(p->p_ucred, &p->p_acflag)) != 0) ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_hfsc.c#2 (text+ko) ==== @@ -1975,7 +1975,10 @@ case HFSC_GETSTATS: break; default: -#if (__FreeBSD_version > 400000) +#if (__FreeBSD_version > 700000) + if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) + return (error); +#elsif (__FreeBSD_version > 400000) if ((error = suser(p)) != 0) return (error); #else ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_priq.c#2 (text+ko) ==== @@ -772,7 +772,10 @@ case PRIQ_GETSTATS: break; default: -#if (__FreeBSD_version > 400000) +#if (__FreeBSD_version > 700000) + if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) + return (error); +#elsif (__FreeBSD_version > 400000) if ((error = suser(p)) != 0) return (error); #else ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_red.c#2 (text+ko) ==== @@ -781,7 +781,9 @@ case RED_GETSTATS: break; default: -#if (__FreeBSD_version > 400000) +#if (__FreeBSD_version > 700000) + if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) +#elsif (__FreeBSD_version > 400000) if ((error = suser(p)) != 0) #else if ((error = suser(p->p_ucred, &p->p_acflag)) != 0) ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_rio.c#2 (text+ko) ==== @@ -531,7 +531,10 @@ case RIO_GETSTATS: break; default: -#if (__FreeBSD_version > 400000) +#if (__FreeBSD_versoin > 700000) + if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) + return (error); +#elsif (__FreeBSD_version > 400000) if ((error = suser(p)) != 0) return (error); #else ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/pf/net/if_pfsync.c#2 (text+ko) ==== @@ -43,6 +43,9 @@ #endif #include +#ifdef __FreeBSD__ +#include +#endif #include #include #include @@ -1028,7 +1031,7 @@ break; case SIOCSETPFSYNC: #ifdef __FreeBSD__ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NETINET_PF)) != 0) #else if ((error = suser(p, p->p_acflag)) != 0) #endif ==== //depot/projects/trustedbsd/priv6/src/sys/dev/an/if_an.c#2 (text+ko) ==== @@ -91,6 +91,7 @@ #include #include #include +#include #include #include #include @@ -1983,7 +1984,7 @@ break; #ifdef ANCACHE if (sc->areq.an_type == AN_RID_ZERO_CACHE) { - error = suser(td); + error = priv_check(td, PRIV_DRIVER); if (error) break; sc->an_sigitems = sc->an_nextitem = 0; @@ -2007,7 +2008,7 @@ error = copyout(&sc->areq, ifr->ifr_data, sizeof(sc->areq)); break; case SIOCSAIRONET: - if ((error = suser(td))) + if ((error = priv_check(td, PRIV_DRIVER))) goto out; error = copyin(ifr->ifr_data, &sc->areq, sizeof(sc->areq)); if (error != 0) @@ -2015,7 +2016,7 @@ an_setdef(sc, &sc->areq); break; case SIOCGPRIVATE_0: /* used by Cisco client utility */ - if ((error = suser(td))) + if ((error = priv_check(td, PRIV_DRIVER))) goto out; error = copyin(ifr->ifr_data, &l_ioctl, sizeof(l_ioctl)); if (error) @@ -2037,7 +2038,7 @@ } break; case SIOCGPRIVATE_1: /* used by Cisco client utility */ - if ((error = suser(td))) + if ((error = priv_check(td, PRIV_DRIVER))) goto out; error = copyin(ifr->ifr_data, &l_ioctl, sizeof(l_ioctl)); if (error) @@ -2289,7 +2290,7 @@ } break; case SIOCS80211: - if ((error = suser(td))) + if ((error = priv_check(td, PRIV_NET80211_MANAGE))) goto out; sc->areq.an_len = sizeof(sc->areq); /* ==== //depot/projects/trustedbsd/priv6/src/sys/dev/arl/if_arl.c#2 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -505,7 +506,7 @@ break; case SIOCS80211: - if ((error = suser(td))) + if ((error = priv_check(td, PRIV_NET80211_MANAGE))) break; switch (ireq->i_type) { case IEEE80211_IOC_SSID: @@ -578,7 +579,7 @@ } case SIOCGARLALL: bzero(&arlan_io, sizeof(arlan_io)); - if (!suser(td)) { + if (!priv_check(td, PRIV_DRIVER)) { bcopy(ar->systemId, arlan_io.cfg.sid, 4); } @@ -617,7 +618,7 @@ } while (0) case SIOCSARLALL: - if (suser(td)) + if (priv_check(td, PRIV_DRIVER)) break; user = (void *)ifr->ifr_data; ==== //depot/projects/trustedbsd/priv6/src/sys/dev/asr/asr.c#2 (text+ko) ==== @@ -117,6 +117,7 @@ #include #include #include +#include #include #include #include @@ -3021,7 +3022,7 @@ s = splcam (); if (ASR_ctlr_held) { error = EBUSY; - } else if ((error = suser(td)) == 0) { + } else if ((error = priv_check(td, PRIV_DRIVER)) == 0) { ++ASR_ctlr_held; } splx(s); ==== //depot/projects/trustedbsd/priv6/src/sys/dev/ata/atapi-cd.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -257,8 +258,11 @@ cdp->flags |= F_LOCKED; break; + /* + * XXXRW: Why does this require privilege? + */ case CDIOCRESET: - error = suser(td); + error = priv_check(td, PRIV_DRIVER); if (error) break; error = acd_test_ready(dev); ==== //depot/projects/trustedbsd/priv6/src/sys/dev/ce/if_ce.c#2 (text) ==== @@ -29,6 +29,7 @@ #if NPCI > 0 #include +#include #include #include #include @@ -1341,9 +1342,11 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#else /* __FreeBSD_version >= 500000 */ +#elsif __FreeBSD_version < 700000 error = suser (td); -#endif /* __FreeBSD_version >= 500000 */ +#else + error = priv_check (td, PRIV_DRIVER); +#endif if (error) return error; #if __FreeBSD_version >= 600034 @@ -1380,8 +1383,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1408,8 +1413,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1426,8 +1433,10 @@ CE_DEBUG2 (d, ("ioctl: setcfg\n")); #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1526,8 +1535,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1560,8 +1571,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1586,8 +1599,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1608,8 +1623,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1634,8 +1651,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1658,8 +1677,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1686,8 +1707,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1708,8 +1731,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1734,8 +1759,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1758,8 +1785,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1784,8 +1813,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1810,8 +1841,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1836,8 +1869,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1867,8 +1902,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1892,8 +1929,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1909,8 +1948,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; @@ -1945,8 +1986,10 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); +#elsif __FreeBSD_version < 700000 + error = suser (td); #else - error = suser (td); + error = priv_check (td, PRIV_DRIVER); #endif if (error) return error; ==== //depot/projects/trustedbsd/priv6/src/sys/dev/cp/if_cp.c#2 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -1060,7 +1061,7 @@ case SERIAL_SETPROTO: CP_DEBUG2 (d, ("ioctl: setproto\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; if (d->ifp->if_drv_flags & IFF_DRV_RUNNING) @@ -1091,7 +1092,7 @@ case SERIAL_SETKEEPALIVE: CP_DEBUG2 (d, ("ioctl: setkeepalive\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; if ((IFP2SP(d->ifp)->pp_flags & PP_FR) || @@ -1115,7 +1116,7 @@ case SERIAL_SETMODE: /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; if (*(int*)data != SERIAL_HDLC) @@ -1131,7 +1132,7 @@ case SERIAL_SETCFG: CP_DEBUG2 (d, ("ioctl: setcfg\n")); - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; if (c->type != T_E1) @@ -1228,7 +1229,7 @@ case SERIAL_CLRSTAT: CP_DEBUG2 (d, ("ioctl: clrstat\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; c->rintr = 0; @@ -1257,7 +1258,7 @@ case SERIAL_SETBAUD: CP_DEBUG2 (d, ("ioctl: setbaud\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; s = splimp (); @@ -1275,7 +1276,7 @@ case SERIAL_SETLOOP: CP_DEBUG2 (d, ("ioctl: setloop\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; s = splimp (); @@ -1295,7 +1296,7 @@ case SERIAL_SETDPLL: CP_DEBUG2 (d, ("ioctl: setdpll\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; if (c->type != T_SERIAL) @@ -1317,7 +1318,7 @@ case SERIAL_SETNRZI: CP_DEBUG2 (d, ("ioctl: setnrzi\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; if (c->type != T_SERIAL) @@ -1337,7 +1338,7 @@ case SERIAL_SETDEBUG: CP_DEBUG2 (d, ("ioctl: setdebug\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; d->chan->debug = *(int*)data; @@ -1359,7 +1360,7 @@ case SERIAL_SETHIGAIN: CP_DEBUG2 (d, ("ioctl: sethigain\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; if (c->type != T_E1) @@ -1381,7 +1382,7 @@ case SERIAL_SETPHONY: CP_DEBUG2 (d, ("ioctl: setphony\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; if (c->type != T_E1) @@ -1403,7 +1404,7 @@ case SERIAL_SETUNFRAM: CP_DEBUG2 (d, ("ioctl: setunfram\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; if (c->type != T_E1) @@ -1425,7 +1426,7 @@ case SERIAL_SETSCRAMBLER: CP_DEBUG2 (d, ("ioctl: setscrambler\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; if (c->type != T_G703 && !c->unfram) @@ -1450,7 +1451,7 @@ case SERIAL_SETMONITOR: CP_DEBUG2 (d, ("ioctl: setmonitor\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; if (c->type != T_E1) @@ -1472,7 +1473,7 @@ case SERIAL_SETUSE16: CP_DEBUG2 (d, ("ioctl: setuse16\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; if (c->type != T_E1) @@ -1494,7 +1495,7 @@ case SERIAL_SETCRC4: CP_DEBUG2 (d, ("ioctl: setcrc4\n")); /* Only for superuser! */ - error = suser (td); + error = priv_check (td, PRIV_DRIVER); if (error) return error; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 1 18:15: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 AD90516A417; Sun, 1 Oct 2006 18:15:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 70E3916A403 for ; Sun, 1 Oct 2006 18:15:35 +0000 (UTC) (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 0644F43D53 for ; Sun, 1 Oct 2006 18:15:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k91IFYbn059789 for ; Sun, 1 Oct 2006 18:15:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k91IFVRp059733 for perforce@freebsd.org; Sun, 1 Oct 2006 18:15:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 1 Oct 2006 18:15:31 GMT Message-Id: <200610011815.k91IFVRp059733@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 107055 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 18:15:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=107055 Change 107055 by rwatson@rwatson_peppercorn on 2006/10/01 18:14:43 Integrate trustedbsd_priv6 from FreeBSD CVS. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/gatea20.c#2 delete .. //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/boot/pc98/libpc98/gatea20.c#2 delete .. //depot/projects/trustedbsd/priv6/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/bsm/audit.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/conf/NOTES#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/conf/files#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/conf/files.amd64#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/conf/files.i386#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/conf/newvers.sh#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/conf/options#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/crypto/sha2/sha2.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/crypto/via/padlock.h#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/bktr/bktr_i2c.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ipmi/ipmi_acpi.c#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/dev/ipmi/ipmi_isa.c#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/dev/ipmi/ipmi_kcs.c#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/dev/ipmi/ipmi_pci.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ipmi/ipmi_smbios.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ipmi/ipmi_smbus.c#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/dev/ipmi/ipmi_smic.c#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/dev/ipmi/ipmi_ssif.c#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/safe/safevar.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/smbus/smb.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/smbus/smbconf.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/smbus/smbconf.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/smbus/smbus_if.m#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/ubsec/ubsecvar.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/usb/if_cdce.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/gate/g_gate.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/geom.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/geom_event.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/geom_io.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/init_main.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_acct.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_event.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_prot.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/subr_trap.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/sys_process.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/tty.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/tty_tty.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/libkern/strstr.c#1 branch .. //depot/projects/trustedbsd/priv6/src/sys/modules/Makefile#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/geom/geom_bde/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/if_ppp/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/ipmi/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/netgraph/mppc/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/net/if_bridge.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/net/if_loop.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/in_var.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_output.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/in6.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/nd6.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netipsec/ipsec_osdep.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netipsec/key.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netipsec/xform_ah.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/opencrypto/criov.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/opencrypto/cryptodev.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/opencrypto/cryptosoft.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/opencrypto/xform.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/opencrypto/xform.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/pci/alpm.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/pci/amdpm.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/pci/amdsmb.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/pci/intpm.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/pci/nfsmb.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/pci/viapm.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/audit/audit.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/bus.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/copyright.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/ipmi.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/ktrace.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/libkern.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/mac.h#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/mac_policy.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/mount.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/msgbuf.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/namei.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/param.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/proc.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/sx.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/syscall.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/syscall.mk#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/sys/sysproto.h#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/vm/vm_contig.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/trustedbsd/priv6/src/sys/vm/vm_page.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.17.2.8 2006/09/20 00:10:29 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.17.2.9 2006/09/26 19:12:11 sobomax Exp $"); #include "opt_hwpmc_hooks.h" @@ -611,18 +611,6 @@ { struct lapic *la; -#ifdef SMP - /* - * Don't do any accounting for the disabled HTT cores, since it - * will provide misleading numbers for the userland. - * - * No locking is necessary here, since even if we loose the race - * when hlt_cpus_mask changes it is not a big deal, really. - */ - if ((hlt_cpus_mask & (1 << PCPU_GET(cpuid))) != 0) - return; -#endif - la = &lapics[PCPU_GET(apic_id)]; (*la->la_timer_count)++; critical_enter(); ==== //depot/projects/trustedbsd/priv6/src/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.516.2.7 2006/07/24 23:28:08 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.516.2.8 2006/09/27 18:10:15 alc Exp $"); /* * Manages physical address maps. @@ -2364,7 +2364,7 @@ PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpde)); pde = &pde[pmap_pde_index(addr)]; if (*pde == 0) { - *pde = srcptepaddr; + *pde = srcptepaddr & ~PG_W; dst_pmap->pm_stats.resident_count += NBPDR / PAGE_SIZE; } else @@ -2401,12 +2401,13 @@ dst_pte = &dst_pte[pmap_pte_index(addr)]; if (*dst_pte == 0) { /* - * Clear the modified and + * Clear the wired, modified, and * accessed (referenced) bits * during the copy. */ m = PHYS_TO_VM_PAGE(ptetemp & PG_FRAME); - *dst_pte = ptetemp & ~(PG_M | PG_A); + *dst_pte = ptetemp & ~(PG_W | PG_M | + PG_A); dst_pmap->pm_stats.resident_count++; pmap_insert_entry(dst_pmap, addr, m); } else ==== //depot/projects/trustedbsd/priv6/src/sys/amd64/conf/NOTES#2 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.36.2.10 2006/04/30 17:39:43 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.36.2.11 2006/09/29 21:21:52 jhb Exp $ # # @@ -311,6 +311,7 @@ # # cy: Cyclades serial driver # digi: Digiboard driver +# ipmi: Intelligent Platform Management Interface # smbios: DMI/SMBIOS entry point # Notes on the Specialix SI/XIO driver: @@ -330,6 +331,7 @@ device digi_Xe device digi_Xem device digi_Xr +device ipmi # Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724) device pbio hint.pbio.0.at="isa" ==== //depot/projects/trustedbsd/priv6/src/sys/boot/common/loader.8#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/boot/common/loader.8,v 1.82.2.3 2006/08/27 07:58:19 marck Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.82.2.4 2006/10/01 12:07:06 ru Exp $ .\" .Dd August 18, 2006 .Dt LOADER 8 @@ -428,7 +428,7 @@ process. The first matching binary is used. The default list is -.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall . +.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init:/stand/sysinstall . .It Va interpret Has the value .Dq Li OK ==== //depot/projects/trustedbsd/priv6/src/sys/boot/i386/boot2/boot1.S#2 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.30 2004/08/28 08:32:23 yar Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.30.2.1 2006/10/01 12:07:07 ru Exp $ */ /* Memory Locations */ @@ -212,8 +212,7 @@ jnz seta20.2 # Yes movb $0xdf,%al # Enable outb %al,$0x60 # A20 -seta20.3: - sti # Enable interrupts +seta20.3: sti # Enable interrupts jmp start+MEM_JMP-MEM_ORG # Start BTX ==== //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.37.2.1 2006/05/22 23:31:30 jkim Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.37.2.2 2006/10/01 12:07:07 ru Exp $ # LIB= i386 INTERNALLIB= @@ -6,7 +6,7 @@ SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \ biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \ comconsole.c devicename.c elf32_freebsd.c \ - elf64_freebsd.c gatea20.c \ + elf64_freebsd.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ smbios.c time.c vidconsole.c amd64_tramp.S @@ -29,6 +29,9 @@ # Include simple terminal emulation (cons25-compatible) CFLAGS+= -DTERM_EMU +# XXX: make alloca() useable +CFLAGS+= -Dalloca=__builtin_alloca + CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ -I${.CURDIR}/../../../contrib/dev/acpica \ -I${.CURDIR}/../../.. -I. ==== //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/biosacpi.c#2 (text+ko) ==== @@ -25,11 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.10 2005/04/16 17:38:24 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.10.2.1 2006/10/01 12:07:07 ru Exp $"); #include #include #include +#include +#include "libi386.h" #include "acfreebsd.h" #include "acconfig.h" @@ -93,7 +95,7 @@ uint16_t *addr; /* EBDA is the 1 KB addressed by the 16 bit pointer at 0x40E. */ - addr = (uint16_t *)0x40E; + addr = (uint16_t *)PTOV(0x40E); if ((rsdp = biosacpi_search_rsdp((char *)(*addr << 4), 0x400)) != NULL) return (rsdp); @@ -113,7 +115,7 @@ /* search on 16-byte boundaries */ for (ofs = 0; ofs < length; ofs += 16) { - rsdp = (RSDP_DESCRIPTOR *)(base + ofs); + rsdp = (RSDP_DESCRIPTOR *)PTOV(base + ofs); /* compare signature, validate checksum */ if (!strncmp(rsdp->Signature, RSDP_SIG, strlen(RSDP_SIG))) { ==== //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/biosdisk.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.45.2.1 2006/06/26 01:44:41 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.45.2.2 2006/10/01 12:07:07 ru Exp $"); /* * BIOS disk device handling. @@ -861,17 +861,18 @@ p = dest; /* Decide whether we have to bounce */ - if ((od->od_unit < 0x80) && - ((VTOP(dest) >> 16) != (VTOP(dest + blks * BIOSDISK_SECSIZE) >> 16))) { + if (VTOP(dest) >> 20 != 0 || ((od->od_unit < 0x80) && + ((VTOP(dest) >> 16) != (VTOP(dest + blks * BIOSDISK_SECSIZE) >> 16)))) { /* - * There is a 64k physical boundary somewhere in the destination buffer, so we have + * There is a 64k physical boundary somewhere in the destination buffer, or the + * destination buffer is above first 1MB of physical memory so we have * to arrange a suitable bounce buffer. Allocate a buffer twice as large as we * need to. Use the bottom half unless there is a break there, in which case we * use the top half. */ x = min(FLOPPY_BOUNCEBUF, (unsigned)blks); - bbuf = malloc(x * 2 * BIOSDISK_SECSIZE); + bbuf = alloca(x * 2 * BIOSDISK_SECSIZE); if (((u_int32_t)VTOP(bbuf) & 0xffff0000) == ((u_int32_t)VTOP(bbuf + x * BIOSDISK_SECSIZE) & 0xffff0000)) { breg = bbuf; } else { @@ -960,8 +961,6 @@ DEBUG("ax = 0x%04x cx = 0x%04x dx = 0x%04x status 0x%x", 0x200 | x, ((cyl & 0xff) << 8) | ((cyl & 0x300) >> 2) | sec, (hd << 8) | od->od_unit, (v86.eax >> 8) & 0xff); if (result) { - if (bbuf != NULL) - free(bbuf); return(-1); } if (bbuf != NULL) @@ -972,8 +971,6 @@ } /* hexdump(dest, (blks * BIOSDISK_SECSIZE)); */ - if (bbuf != NULL) - free(bbuf); return(0); } @@ -993,18 +990,18 @@ p = dest; /* Decide whether we have to bounce */ - if ((od->od_unit < 0x80) && - ((VTOP(dest) >> 16) != (VTOP(dest + blks * BIOSDISK_SECSIZE) >> 16))) { + if (VTOP(dest) >> 20 != 0 || ((od->od_unit < 0x80) && + ((VTOP(dest) >> 16) != (VTOP(dest + blks * BIOSDISK_SECSIZE) >> 16)))) { /* - * There is a 64k physical boundary somewhere in the destination buffer, so we have + * There is a 64k physical boundary somewhere in the destination buffer, or the + * destination buffer is above first 1MB of physical memory so we have * to arrange a suitable bounce buffer. Allocate a buffer twice as large as we * need to. Use the bottom half unless there is a break there, in which case we * use the top half. */ - x = min(FLOPPY_BOUNCEBUF, (unsigned)blks); - bbuf = malloc(x * 2 * BIOSDISK_SECSIZE); + bbuf = alloca(x * 2 * BIOSDISK_SECSIZE); if (((u_int32_t)VTOP(bbuf) & 0xffff0000) == ((u_int32_t)VTOP(bbuf + x * BIOSDISK_SECSIZE) & 0xffff0000)) { breg = bbuf; } else { @@ -1101,8 +1098,6 @@ DEBUG("ax = 0x%04x cx = 0x%04x dx = 0x%04x status 0x%x", 0x200 | x, ((cyl & 0xff) << 8) | ((cyl & 0x300) >> 2) | sec, (hd << 8) | od->od_unit, (v86.eax >> 8) & 0xff); if (result) { - if (bbuf != NULL) - free(bbuf); return(-1); } p += (x * BIOSDISK_SECSIZE); @@ -1111,8 +1106,6 @@ } /* hexdump(dest, (blks * BIOSDISK_SECSIZE)); */ - if (bbuf != NULL) - free(bbuf); return(0); } static int ==== //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/biosmem.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosmem.c,v 1.7 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosmem.c,v 1.7.10.1 2006/10/01 12:07:07 ru Exp $"); /* * Obtain memory configuration information from the BIOS @@ -34,7 +34,7 @@ #include "libi386.h" #include "btxv86.h" -vm_offset_t memtop; +vm_offset_t memtop, memtop_copyin; u_int32_t bios_basemem, bios_extmem; #define SMAPSIG 0x534D4150 @@ -101,7 +101,7 @@ } /* Set memtop to actual top of memory */ - memtop = 0x100000 + bios_extmem; + memtop = memtop_copyin = 0x100000 + bios_extmem; } ==== //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/biospnp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.9 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.9.10.1 2006/10/01 12:07:07 ru Exp $"); /* * PnP BIOS enumerator. @@ -165,7 +165,7 @@ if (biospnp_init()) return; - devNodeBuffer = (struct pnp_devNode *)malloc(pnp_NodeSize); + devNodeBuffer = (struct pnp_devNode *)alloca(pnp_NodeSize); Node = 0; count = 1000; while((Node != 0xff) && (count-- > 0)) { ==== //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/biossmap.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.3 2004/11/08 23:59:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.3.2.1 2006/10/01 12:07:07 ru Exp $"); /* * Obtain memory configuration information from the BIOS @@ -86,9 +86,10 @@ v86.eax = 0xe820; v86.ecx = sizeof(struct smap); v86.edx = SMAPSIG; - v86.es = VTOPSEG(&smapbase[smaplen]); - v86.edi = VTOPOFF(&smapbase[smaplen]); + v86.es = VTOPSEG(&smap); + v86.edi = VTOPOFF(&smap); v86int(); + bcopy(&smap, &smapbase[smaplen], sizeof(struct smap)); smaplen++; if ((v86.efl & 1) || (v86.eax != SMAPSIG)) break; ==== //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/i386_copy.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/i386_copy.c,v 1.10 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/i386_copy.c,v 1.10.10.1 2006/10/01 12:07:07 ru Exp $"); /* * MD primitives supporting placement of module data @@ -37,8 +37,6 @@ #include "libi386.h" #include "btxv86.h" -#define READIN_BUF (16 * 1024) - ssize_t i386_copyin(const void *src, vm_offset_t dest, const size_t len) { @@ -67,25 +65,11 @@ ssize_t i386_readin(const int fd, vm_offset_t dest, const size_t len) { - void *buf; - size_t resid, chunk, get; - ssize_t got; - if (dest + len >= memtop) - return(0); + if (dest + len >= memtop_copyin) { + errno = EFBIG; + return(-1); + } - chunk = min(READIN_BUF, len); - buf = malloc(chunk); - if (buf == NULL) - return(0); - - for (resid = len; resid > 0; resid -= got, dest += got) { - get = min(chunk, resid); - got = read(fd, buf, get); - if (got <= 0) - break; - bcopy(buf, PTOV(dest), (size_t)got); - } - free(buf); - return(len - resid); + return (read(fd, PTOV(dest), len)); } ==== //depot/projects/trustedbsd/priv6/src/sys/boot/i386/libi386/libi386.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.20.2.2 2006/05/22 23:31:30 jkim Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.20.2.3 2006/10/01 12:07:07 ru Exp $ */ @@ -91,7 +91,10 @@ void bios_getmem(void); extern u_int32_t bios_basemem; /* base memory in bytes */ extern u_int32_t bios_extmem; /* extended memory in bytes */ -extern vm_offset_t memtop; +extern vm_offset_t memtop; /* last address of physical memory + 1 */ +extern vm_offset_t memtop_copyin; /* memtop less heap size for the cases */ + /* when heap is at the top of extended memory */ + /* for other cases - just the same as memtop */ int biospci_find_devclass(uint32_t class, int index); int biospci_write_config(uint32_t locator, int offset, int width, int val); @@ -101,8 +104,6 @@ void smbios_detect(void); -void gateA20(void); - int i386_autoload(void); int bi_getboothowto(char *kargs); ==== //depot/projects/trustedbsd/priv6/src/sys/boot/i386/loader/main.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.31.2.2 2006/05/22 23:31:30 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.31.2.3 2006/10/01 12:07:07 ru Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -72,6 +72,9 @@ /* XXX debugging */ extern char end[]; +static void *heap_top; +static void *heap_bottom; + int main(void) { @@ -88,7 +91,15 @@ */ bios_getmem(); - setheap((void *)end, (void *)bios_basemem); +#ifdef LOADER_BZIP2_SUPPORT + heap_top = PTOV(memtop_copyin); + memtop_copyin -= 0x300000; + heap_bottom = PTOV(memtop_copyin); +#else + heap_top = (void *)bios_basemem; + heap_bottom = (void *)end; +#endif + setheap(heap_bottom, heap_top); /* * XXX Chicken-and-egg problem; we want to have console output early, but some @@ -215,7 +226,7 @@ /* * If we are booted by an old bootstrap, we have to guess at the BIOS - * unit number. We will loose if there is more than one disk type + * unit number. We will lose if there is more than one disk type * and we are not booting from the lowest-numbered disk type * (ie. SCSI when IDE also exists). */ @@ -269,7 +280,8 @@ command_heap(int argc, char *argv[]) { mallocstats(); - printf("heap base at %p, top at %p\n", end, sbrk(0)); + printf("heap base at %p, top at %p, upper limit at %p\n", heap_bottom, + sbrk(0), heap_top); return(CMD_OK); } ==== //depot/projects/trustedbsd/priv6/src/sys/boot/pc98/libpc98/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.22 2005/05/08 14:17:28 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.22.2.1 2006/10/01 12:07:07 ru Exp $ # LIB= pc98 INTERNALLIB= @@ -7,7 +7,7 @@ SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c biossmap.c \ bootinfo.c bootinfo32.c comconsole.c devicename.c elf32_freebsd.c \ - gatea20.c i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ + i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c BOOT_COMCONSOLE_PORT?= 0x238 @@ -24,6 +24,9 @@ # Include simple terminal emulation (cons25-compatible) CFLAGS+= -DTERM_EMU +# XXX: make alloca() useable +CFLAGS+= -Dalloca=__builtin_alloca + CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ -I${.CURDIR}/../../i386/libi386 \ -I${.CURDIR}/../../.. -I. ==== //depot/projects/trustedbsd/priv6/src/sys/boot/pc98/libpc98/biosdisk.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.32 2005/05/08 14:17:28 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.32.2.1 2006/10/01 12:07:07 ru Exp $"); /* * BIOS disk device handling. @@ -754,16 +754,18 @@ p = dest; /* Decide whether we have to bounce */ - if (((VTOP(dest) >> 16) != (VTOP(dest + blks * BIOSDISK_SECSIZE) >> 16))) { + if (VTOP(dest) >> 20 != 0 || + ((VTOP(dest) >> 16) != (VTOP(dest + blks * BIOSDISK_SECSIZE) >> 16))) { /* - * There is a 64k physical boundary somewhere in the destination buffer, so we have + * There is a 64k physical boundary somewhere in the destination buffer, or the + * destination buffer is above first 1MB of physical memory so we have * to arrange a suitable bounce buffer. Allocate a buffer twice as large as we * need to. Use the bottom half unless there is a break there, in which case we * use the top half. */ x = min(od->od_sec, (unsigned)blks); - bbuf = malloc(x * 2 * BIOSDISK_SECSIZE); + bbuf = alloca(x * 2 * BIOSDISK_SECSIZE); if (((u_int32_t)VTOP(bbuf) & 0xffff0000) == ((u_int32_t)VTOP(bbuf + x * BIOSDISK_SECSIZE) & 0xffff0000)) { breg = bbuf; } else { @@ -837,8 +839,6 @@ od->od_flags & BD_FLOPPY ? 0x0200 | cyl : cyl, (hd << 8) | sec, (v86.eax >> 8) & 0xff); if (result) { - if (bbuf != NULL) - free(bbuf); return(-1); } if (bbuf != NULL) @@ -849,8 +849,6 @@ } /* hexdump(dest, (blks * BIOSDISK_SECSIZE)); */ - if (bbuf != NULL) - free(bbuf); return(0); } @@ -870,17 +868,18 @@ p = dest; /* Decide whether we have to bounce */ - if (((VTOP(dest) >> 16) != (VTOP(dest + blks * BIOSDISK_SECSIZE) >> 16))) { + if (VTOP(dest) >> 20 != 0 || + ((VTOP(dest) >> 16) != (VTOP(dest + blks * BIOSDISK_SECSIZE) >> 16))) { /* - * There is a 64k physical boundary somewhere in the destination buffer, so we have + * There is a 64k physical boundary somewhere in the destination buffer, or the + * destination buffer is above first 1MB of physical memory so we have * to arrange a suitable bounce buffer. Allocate a buffer twice as large as we * need to. Use the bottom half unless there is a break there, in which case we * use the top half. */ - x = min(od->od_sec, (unsigned)blks); - bbuf = malloc(x * 2 * BIOSDISK_SECSIZE); + bbuf = alloca(x * 2 * BIOSDISK_SECSIZE); if (((u_int32_t)VTOP(bbuf) & 0xffff0000) == ((u_int32_t)VTOP(bbuf + x * BIOSDISK_SECSIZE) & 0xffff0000)) { breg = bbuf; } else { @@ -959,15 +958,11 @@ (v86.eax >> 8) & 0xff); if (result) { - if (bbuf != NULL) - free(bbuf); return(-1); } } /* hexdump(dest, (blks * BIOSDISK_SECSIZE)); */ - if (bbuf != NULL) - free(bbuf); return(0); } static int ==== //depot/projects/trustedbsd/priv6/src/sys/boot/pc98/libpc98/biosmem.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosmem.c,v 1.7 2005/05/08 14:17:28 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosmem.c,v 1.7.2.1 2006/10/01 12:07:07 ru Exp $"); /* * Obtain memory configuration information from the BIOS @@ -34,7 +34,7 @@ #include "libi386.h" #include "btxv86.h" -vm_offset_t memtop; +vm_offset_t memtop, memtop_copyin; u_int32_t bios_basemem, bios_extmem; void @@ -46,7 +46,7 @@ *(u_int16_t *)PTOV(0xA1594) * 1024 * 1024; /* Set memtop to actual top of memory */ - memtop = 0x100000 + bios_extmem; + memtop = memtop_copyin = 0x100000 + bios_extmem; } ==== //depot/projects/trustedbsd/priv6/src/sys/boot/pc98/loader/main.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.20.2.1 2006/02/15 13:55:13 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.20.2.2 2006/10/01 12:07:08 ru Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -72,6 +72,9 @@ /* XXX debugging */ extern char end[]; +static void *heap_top; +static void *heap_bottom; + int main(void) { @@ -88,7 +91,15 @@ */ bios_getmem(); - setheap((void *)end, (void *)bios_basemem); +#ifdef LOADER_BZIP2_SUPPORT + heap_top = PTOV(memtop_copyin); + memtop_copyin -= 0x300000; + heap_bottom = PTOV(memtop_copyin); +#else + heap_top = (void *)bios_basemem; + heap_bottom = (void *)end; +#endif + setheap(heap_bottom, heap_top); /* * XXX Chicken-and-egg problem; we want to have console output early, but some @@ -207,7 +218,7 @@ /* * If we are booted by an old bootstrap, we have to guess at the BIOS - * unit number. We will loose if there is more than one disk type + * unit number. We will lose if there is more than one disk type >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 1 21:35: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 E0B6516A47B; Sun, 1 Oct 2006 21:35:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A88016A407 for ; Sun, 1 Oct 2006 21:35:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F75443D46 for ; Sun, 1 Oct 2006 21:35:54 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k91LZsov089920 for ; Sun, 1 Oct 2006 21:35:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k91LZr6B089917 for perforce@freebsd.org; Sun, 1 Oct 2006 21:35:53 GMT (envelope-from jb@freebsd.org) Date: Sun, 1 Oct 2006 21:35:53 GMT Message-Id: <200610012135.k91LZr6B089917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 21:35:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=107059 Change 107059 by jb@jb_freebsd7 on 2006/10/01 21:35:23 IFlibbsdelf Affected files ... .. //depot/projects/dtrace/src/lib/libelf/Makefile#12 integrate .. //depot/projects/dtrace/src/lib/libelf/_libelf.h#8 integrate .. //depot/projects/dtrace/src/lib/libelf/elf.3#4 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_begin.3#3 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_begin.c#5 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_data.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_end.c#3 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#9 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_flag.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_flagdata.3#3 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_getdata.3#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_memory.3#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_memory.c#6 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_scn.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_strptr.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_types.m4#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_update.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf.3#2 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_checksum.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_checksum.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_dyn.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_fsize.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_getdyn.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_getrel.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_getrela.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_getsym.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_newphdr.3#2 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_sym.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_update.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_xlate.c#4 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf.h#8 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf_allocate.c#4 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf_checksum.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/libelf_data.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/libelf_fsize.m4#3 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf_xlate.c#1 branch Differences ... ==== //depot/projects/dtrace/src/lib/libelf/Makefile#12 (text+ko) ==== @@ -7,6 +7,7 @@ elf_dump.c \ elf_dump_argv.c \ elf_end.c elf_errmsg.c elf_errno.c \ + elf_data.c \ elf_fill.c \ elf_flag.c \ elf_getbase.c \ @@ -25,26 +26,36 @@ elf_rawdata.c \ elf_rawfile.c \ elf_scn.c \ + elf_strptr.c \ + elf_update.c \ elf_version.c \ + gelf_checksum.c \ gelf_fsize.c \ gelf_getclass.c \ gelf_getshdr.c \ + gelf_dyn.c \ gelf_ehdr.c \ gelf_phdr.c \ + gelf_rel.c \ + gelf_rela.c \ + gelf_sym.c \ gelf_update.c \ gelf_xlate.c \ libelf.c \ libelf_allocate.c \ libelf_ar.c \ + libelf_checksum.c \ + libelf_data.c \ libelf_ehdr.c \ - libelf_phdr.c + libelf_phdr.c \ + libelf_xlate.c INCS= libelf.h gelf.h DPSRCS+= libelf_fsize.c libelf_msize.c libelf_convert.c CLEANFILES+= libelf_fsize.c libelf_msize.c libelf_convert.c CFLAGS+= -I${.OBJDIR} -I${.CURDIR} -OBJS+= libelf_convert.o libelf_msize.o +OBJS+= libelf_convert.o libelf_fsize.o libelf_msize.o OSRELDATE!= sysctl -n kern.osreldate @@ -68,33 +79,30 @@ elf_next.3 \ elf_rawfile.3 \ elf_rand.3 \ + elf_strptr.3 \ + elf_update.3 \ elf_version.3 \ gelf.3 \ + gelf_checksum.3 \ gelf_fsize.3 \ gelf_getclass.3 \ + gelf_getdyn.3 \ gelf_getehdr.3 \ gelf_getphdr.3 \ + gelf_getrel.3 \ + gelf_getrela.3 \ gelf_getshdr.3 \ + gelf_getsym.3 \ gelf_newehdr.3 \ gelf_newphdr.3 \ gelf_update_ehdr.3 \ gelf_xlatetof.3 MLINKS+= \ - gelf.3 gelf_checksum.3 \ - gelf.3 gelf_getdyn.3 \ gelf.3 gelf_getmove.3 \ - gelf.3 gelf_getrel.3 \ - gelf.3 gelf_getrela.3 \ - gelf.3 gelf_getsym.3 \ gelf.3 gelf_getsyminfo.3 \ - gelf_update_ehdr.3 gelf_update_phdr.3 \ - gelf_update_ehdr.3 gelf_update_shdr.3 \ gelf.3 gelf_update_move.3 \ - gelf.3 gelf_update_rela.3 \ - gelf.3 gelf_update_sym.3 \ - gelf.3 gelf_update_syminfo.3 \ - gelf_xlatetof.3 gelf_xlatetom.3 + gelf.3 gelf_update_syminfo.3 MLINKS+= \ elf_errmsg.3 elf_errno.3 \ @@ -108,12 +116,17 @@ elf_getscn.3 elf_ndxscn.3 \ elf_getscn.3 elf_newscn.3 \ elf_getscn.3 elf_nextscn.3 \ - elf.3 elf_strptr.3 \ - elf.3 elf_update.3 + gelf_getdyn.3 gelf_update_dyn.3 \ + gelf_getrel.3 gelf_update_rel.3 \ + gelf_getrela.3 gelf_update_rela.3 \ + gelf_getsym.3 gelf_update_sym.3 \ + gelf_update_ehdr.3 gelf_update_phdr.3 \ + gelf_update_ehdr.3 gelf_update_shdr.3 \ + gelf_xlatetof.3 gelf_xlatetom.3 .for E in 32 64 MLINKS+= \ - elf.3 elf${E}_checksum.3 \ + gelf_checksum.3 elf${E}_checksum.3 \ gelf_fsize.3 elf${E}_fsize.3 \ gelf_getehdr.3 elf${E}_getehdr.3 \ gelf_getphdr.3 elf${E}_getphdr.3 \ ==== //depot/projects/dtrace/src/lib/libelf/_libelf.h#8 (text+ko) ==== @@ -69,11 +69,8 @@ * Flags for library internal use. These use the upper 16 bits of a * flags field. */ -#define LIBELF_F_ALLOCED 0x010000 /* whether e_rawfile is malloc'ed */ +#define LIBELF_F_MALLOCED 0x010000 /* whether data was malloc'ed */ #define LIBELF_F_MMAP 0x020000 /* whether e_rawfile was mmap'ed */ -#define LIBELF_F_EHDR_DIRTY 0x040000 /* TODO: check if these 3 can be */ -#define LIBELF_F_PHDR_DIRTY 0x080000 /* folded into one flag. */ -#define LIBELF_F_SHDR_DIRTY 0x100000 struct _Elf { int e_activations; /* activation count */ @@ -114,15 +111,19 @@ }; struct _Elf_Scn { - STAILQ_HEAD(, _Elf_Scn) s_data; /* list of Elf_Data descriptors */ - struct _Elf *s_elf; /* parent ELF descriptor */ - unsigned int s_flags; /* flags for the section as a whole */ - size_t s_ndx; /* index# for this section */ - STAILQ_ENTRY(_Elf_Scn) s_next; union { Elf32_Shdr s_shdr32; Elf64_Shdr s_shdr64; } s_shdr; + STAILQ_HEAD(, _Elf_Data) s_data; /* list of Elf_Data descriptors */ + STAILQ_HEAD(, _Elf_Data) s_rawdata; /* raw data for this section */ + STAILQ_ENTRY(_Elf_Scn) s_next; + struct _Elf *s_elf; /* parent ELF descriptor */ + unsigned int s_flags; /* flags for the section as a whole */ + size_t s_ndx; /* index# for this section */ + uint64_t s_offset; /* managed by elf_update() */ + uint64_t s_rawoff; /* original offset in the file */ + uint64_t s_size; /* managed by elf_update() */ }; @@ -135,13 +136,18 @@ * Prototypes */ +Elf_Data *_libelf_allocate_data(Elf_Scn *_s); Elf *_libelf_allocate_elf(void); +Elf_Scn *_libelf_allocate_scn(Elf *_e, size_t _ndx); Elf *_libelf_ar_open(Elf *_e); +unsigned long _libelf_checksum(Elf *_e, int _elfclass); int _libelf_dump32(Elf *_elf, const char *_name, const char *_outfile, unsigned int _flags); int _libelf_dump64(Elf *_elf, const char *_name, const char *_outfile, unsigned int _flags); void *_libelf_ehdr(Elf *_e, int _elfclass, int _allocate); +size_t _libelf_fsize(Elf_Type _t, int _elfclass, unsigned int _version, + size_t count); void (*_libelf_get_translator(Elf_Type _t, int _direction, int _elfclass)) (char *_dst, char *_src, int _cnt, int _byteswap); void *_libelf_getphdr(Elf *_e, int _elfclass); @@ -149,6 +155,11 @@ int _libelf_malign(Elf_Type _t, int _elfclass); size_t _libelf_msize(Elf_Type _t, int _elfclass, unsigned int _version); void *_libelf_newphdr(Elf *_e, int _elfclass, size_t _count); -void _libelf_release_elf(Elf *_e); +Elf_Data *_libelf_release_data(Elf_Data *_d); +Elf *_libelf_release_elf(Elf *_e); +Elf_Scn *_libelf_release_scn(Elf_Scn *_s); +Elf_Data *_libelf_xlate(Elf_Data *_d, const Elf_Data *_s, + unsigned int _encoding, int _elfclass, int _direction); +int _libelf_xlate_shtype(size_t _sht); #endif /* __LIBELF_H_ */ ==== //depot/projects/dtrace/src/lib/libelf/elf.3#4 (text+ko) ==== @@ -23,30 +23,447 @@ .\" .\" $FreeBSD$ .\" -.Dd June 1, 2006 +.Dd September 1, 2006 .Os .Dt ELF 3 .Sh NAME +.Nm elf +.Nd API for manipulating ELF objects .Sh LIBRARY .Lb libelf .Sh SYNOPSIS .In libelf.h +.Sh DESCRIPTION +The +.Lb libelf +library provides functions that allow an application to read and +manipulate ELF object files, and to read +.Xr ar 1 +archives. +The library allows the manipulation of ELF objects in a byte ordering +and word-size independent way, allowing an application to read and +create ELF objects for 32 and 64 bit architectures and for little- +and big-endian machines. +.Pp +This manual page serves to provide an overview of the functionality in +the ELF library. +Further information may found in the manual pages for individual +.Xr ELF 3 +functions that comprise the library. +.Ss ELF Concepts +As described in +.Xr elf 5 , +ELF files contain several data structures that are laid out in a +specific way. +ELF files begin with an +.Dq Executable Header , +and may contain an optional +.Dq Program Header Table , +and optional data in the form of ELF +.Dq sections . +A +.Dq Section Header Table +describes the content of the data in these sections. +.Pp +ELF objects have an associated +.Dq "ELF class" +which denotes the natural machine word size for the architecture +the object is associated with. +Objects for 32 bit architectures have an ELF class of +.Dv ELFCLASS32 . +Objects for 64 bit architectures have an ELF class of +.Dv ELFCLASS64 . +.Pp +ELF objects also have an associated +.Dq endianness +which denotes the endianness of the machine architecture associated +with the object. +This may be +.Dv ELFDATA2LSB +for little-endian architectures and +.Dv ELFDATA2MSB +for big-endian architectures. +.Pp +ELF objects are also associated with an API version number. +This version number determines the layout of the individual components +of an ELF file and the semantics associated with these. +.Ss Data Representation And Translation +The +.Xr ELF 3 +library distinguishes between +.Dq native +representations of ELF data structures and their +.Dq file +representations. +.Pp +An application would work with ELF data in its +.Dq native +representation, i.e., using the native byteorder and alignment mandated +by the processor the application is running on. +The +.Dq file +representation of the same data could use a different byte ordering +and follow different constraints on object alignment than these native +constraints. +.Pp +Accordingly, the +.Xr ELF 3 +library offers translation facilities +.Xr ( elf32_xlatetof 3 , +.Xr elf32_xlatetom 3 , +.Xr elf64_xlatetof 3 +and +.Xr elf64_xlatetom 3 ) +to and from these +representations and also provides higher-level APIs that retrieve and store +data from the ELF object in a transparent manner. +.Ss Library Working Version +Conceptually, there are three version numbers associated with an +application using the ELF library to manipulate ELF objects: +.Bl -bullet -compact -offset indent +.It +The ELF version that the application was compiled against. +This version determines the ABI expected by the application. +.It +The ELF version of the ELF object being manipulated by the +application through the ELF library. +.It +The ELF version (or set of versions) supported by the ELF library itself. +.El +.Pp +In order to facilitate working with ELF objects of differing versions, +the ELF library requires the application to call the +.Fn elf_version +function before invoking many of its operations, in order to inform +the library of the application's desired working version. +.Pp +In the current implementation, all three versions have to be +.Dv EV_CURRENT . +.Ss Namespace use +The ELF library uses the following prefixes: +.Bl -tag -width "ELF_F_*" +.It elf_* +Used for class-independent functions. +.It elf32_* +Used for functions working with 32 bit ELF objects. +.It elf64_* +Used for functions working with 64 bit ELF objects. +.It Elf_* +Used for class-independent data types. +.It ELF_C_* +Used for command values used in a few functions. +These symbols are defined as members of the +.Vt Elf_Cmd +enumeration. +.It ELF_E_* +Used for error numbers. +.It ELF_F_* +Used for flags. +.It ELF_K_* +These constants define the kind of file associated with an ELF +descriptor. +See +.Xr elf_kind 3 . +The symbols are defined by the +.Vt Elf_Kind +enumeration. +.It ELF_T_* +These values are defined by the +.Vt Elf_Type +enumeration, and denote the types of ELF data structures +that can be present in an ELF object. +.El +.Ss Descriptors +Applications communicate with the library using descriptors. +These are: +.Bl -tag -width ".Vt Elf_Data" +.It Vt Elf +An +.Vt Elf +descriptor represents an ELF object or an +.Xr ar 1 +archive. +It is allocated using one of the +.Fn elf_begin +or +.Fn elf_memory +functions. +An +.Vt Elf +descriptor can be used to read and write data to an ELF file. +An +.Vt Elf +descriptor can be associated with zero or more +.Vt Elf_Scn +section descriptors. +.Pp +Given an ELF descriptor, the application may retrieve the ELF +object's class-dependent +.Dq "Executable Header" +structures using the +.Fn elf32_getehdr +or +.Fn elf64_getehdr +functions. +A new Ehdr structure may be allocated using the +.Fn elf64_newehdr +or +.Fn elf64_newehdr +functions. +.Pp +The +.Dq "Program Header Table" +associated with an ELF descriptor may be allocated using the +.Fn elf32_getphdr +or +.Fn elf64_getphdr +functions. +A new program header table may be allocated or an existing table +resized using the +.Fn elf32_newphdr +or +.Fn elf64_newphdr +functions. +.Pp +The +.Vt Elf +structure is opaque and has no members visible to the +application. +.\" TODO describe the Elf_Arhdr and Elf_Arsym structures. +.It Vt Elf_Data +An +.Vt Elf_Data +data structure describes an individual chunk of a ELF file as +represented in memory. +It has the following application visible members: +.Bl -tag -width ".Vt unsigned int d_version" +.It Vt "uint64_t d_align" +The alignment of the data buffer within its containing ELF section. +.It Vt "uint64_t d_off" +The offset with the containing section where this descriptors data +would be placed. +.It Vt "uint64_t d_size" +The number of bytes of data in this descriptor. +.It Vt "void *d_buf" +A pointer to data in memory. +.It Vt "Elf_Type d_type" +The ELF type (see below) of the data in this descriptor. +.It Vt "unsigned int d_version" +The operating version for the data in this buffer. +.El +.Pp +.Vt Elf_Data +descriptors are usually associated with +.Vt Elf_Scn +descriptors. +Existing data descriptors associated with an ELF section may be +structures are retrieved using the +.Fn elf_getdata +function. +The +.Fn elf_newdata +function may be used to attach new data descriptors to an ELF section. +.It Vt Elf_Scn +.Vt Elf_Scn +descriptors represent a section in an ELF object. +.Pp +They are retrieved using the +.Fn elf_getscn +function. +An application may iterate through the existing sections of an ELF +object using the +.Fn elf_nextscn +function. +New sections may be allocated using the +.Fn elf_newscn +function. +.Pp +The +.Vt Elf_Scn +descriptor is opaque and contains no application modifiable fields. +.El +.Ss Functional Grouping +This section contains a brief overview of the available functionality +in the ELF library. +Each function listed here is described further in its own manual page. +.Bl -tag -width indent +.It "Archive Access" +.Bl -tag -compact +.It Fn elf_getarsym +Retrieve the archive symbol table. +.It Fn elf_getarhdr +Retrieve the archive header for an object. +.It Fn elf_getbase +Retrieve the offset of a member inside an archive. +.It Fn elf_next +Iterate through an +.Xr ar 1 +archive. +.It Fn elf_rand +Random access inside an +.Xr ar 1 +archive. +.El +.It "Data Structures" +.Bl -tag -compact +.It Fn elf_getdata +Retrieve translated data for an ELF section. +.It Fn elf_getscn +Retrieve the section descriptor for a named section. +.It Fn elf_ndxscn +Retrieve the index for a section. +.It Fn elf_newdata +Add a new +.Vt Elf_Data +descriptor to an ELF section. +.It Fn elf_newscn +Add a new section descriptor to an ELF descriptor. +.It Fn elf_nextscn +Iterate through the sections in an ELF object. +.It Fn elf_rawdata +Retrieve untranslated data for an ELF sectino. +.It Fn elf_rawfile +Return a pointer to the untranslated file contents for an ELF object. +.It Fn elf32_getehdr , Fn elf64_getehdr +Retrieve the Executable Header in an ELF object. +.It Fn elf32_getphdr , Fn elf64_getphdr +Retrieve the Program Header Table in an ELF object. +.It Fn elf32_getshdr , Fn elf64_getshdr +Retrieve the ELF section header associated with an +.Vt Elf_Scn +descriptor. +.It Fn elf32_newehdr , Fn elf64_newehdr +Allocate an Executable Header in an ELF object. +.It Fn elf32_newphdr , Fn elf64_newphdr +Allocate or resize the Program Header Table in an ELF object. +.El +.It "Data Translation" +.Bl -tag -compact +.It Fn elf32_xlatetof , Fn elf64_xlatetof +Translate an ELF data structure from its native representation to its +file representation. +.It Fn elf32_xlatetom , Fn elf64_xlatetom +Translate an ELF data structure from its file representation to a +native representation. +.El +.It "Error Reporting" +.Bl -tag -compact +.It Fn elf_errno +Retrieve the current error. +.It Fn elf_errmsg +Retrieve a human readable description of the current error. +.El +.It "Initialization" +.Bl -tag -compact +.It Fn elf_begin +Opens an +.Xr ar 1 +archive or ELF object given a file descriptor. +.It Fn elf_end +Close an ELF descriptor and release all its resources. +.It Fn elf_memory +Opens an +.Xr ar 1 +archive or ELF object present in a memory arena. +.It Fn elf_version +Sets the operating version. +.El +.It "IO Control" +.Bl -tag -compact +.It Fn elf_cntl +Manage the association between and ELF descriptor and its underlying file. +.It Fn elf_flagdata +Mark an +.Vt Elf_Data +descriptor as dirty. +.It Fn elf_flagehdr +Mark the ELF Executable Header in an ELF descriptor as dirty. +.It Fn elf_flagphdr +Mark the ELF Program Header Table in an ELF descriptor as dirty. +.It Fn elf_flagscn +Mark an +.Vt Elf_Scn +descriptor as dirty. +.It Fn elf_flagshdr +Mark an ELF Section Header as dirty. +.It Fn elf_update +Recompute ELF object layout and optionally write the modified object +back to the underlying file. +.El +.It "Queries" +.Bl -tag -compact +.It Fn elf32_checksum , Fn elf64_checkum +Compute checksum of an ELF object. +.It Fn elf_getident +Retrieve the identification bytes for an ELF object. +.It Fn elf_hash +Compute the ELF hash value of a string. +.It Fn elf_kind +Query the kind of object associated with an ELF descriptor. +.It Fn elf32_fsize , Fn elf64_fsize +Return the size of the file representation of an ELF type. +.El +.El +.Ss Controlling ELF Object Layout +In the usual mode of operation, library will compute section +offsets and alignments based on the contents of an ELF descriptor's +sections without need for further intervention by the +application. +.Pp +However, if the application wishes to take complete charge of the +layout of the ELF file, it may set the +.Dv ELF_F_LAYOUT +flag on an ELF descriptor, following which the library will use the +section offsets and alignments specified by the application when +laying out the file. +.Pp +Gaps in between sections will be filled with the fill character +set by function +.Fn elf_fill . +.Ss Error Handling +In case an error is encountered, these library functions set an +internal error number and signal the presence of the error by +returning an special return value. The application can check the +current error number by calling +.Xr elf_errno 3 . +A human readable description of the recorded error is available by +calling +.Xr elf_errmsg 3 . +.Ss Memory Management Rules +The library keeps track of all +.Vt Elf_Scn +and +.Vt Elf_Data +descriptors associated with an ELF descriptor and recovers them +when the descriptor is closed using +.Xr elf_end 3 . +Thus the application must not call +.Xr free 3 +on data structures allocated by the ELF library. +.Pp +Conversely the library will not +free data that it has not allocated. +As an example, an application may call +.Xr elf_newdata 3 +to allocate a new +.Vt Elf_Data +descriptor and can set the +.Va d_off +member of the descriptor to point to a region of memory allocated +using +.Xr malloc 3 . +It is the applications responsibility to free this arena, though the +library will reclaim the space used by the +.Vt Elf_Data +descriptor itself. .Sh SEE ALSO -.Xr elf_errno 3 , -.Xr elf_errmsg 3 , -.Xr elf_fill 3 , -.Xr elf_version 3 , -.Xr gelf 3 -. \" TODO describe the concept of translation, data structure -. \" alignments and byte ordering, and the programming model -. \" (natively ordered data structures getting translated to -. \" file representation at update() time. Describe the ELF_F_DIRTY -. \" bit. -. \" Describe the ELF_F_LAYOUT bit. -. \" Memory management discipline: Note that no ELF data structure should -. \" be explicitly free()'ed by the application. All free'ing happens when -. \" an elf_end() is done, after which pointers go stale. -. \" Describe all prefixes used by the library and namespace use by -. \" and (in gelf.3). -. \" Describe the members of the Elf_Data and the rules governing their -. \" use. +.Xr gelf 3 , +.Xr elf 5 +.Sh HISTORY +The original ELF(3) API was developed for Unix System V. +The current implementation of the ELF(3) API appeared in +.Fx 7.0 . +.Sh AUTHORS +The ELF library was written by +.An "Joseph Koshy" +.Aq jkoshy@FreeBSD.org . ==== //depot/projects/dtrace/src/lib/libelf/elf_begin.3#3 (text+ko) ==== @@ -250,13 +250,18 @@ was not a descriptor for an .Xr ar 1 archive. -.It Bq Er ELF_E_MODE +.It Bq Er ELF_E_ARGUMENT An .Xr ar 1 archive was opened with with .Ar cmd set to .Dv ELF_C_RDWR . +.It Bq Er ELF_E_IO +Function +.Fn elf_begin +was unable to truncate a file opened for writing using +.Dv ELF_C_WRITE . .It Bq Er ELF_E_RESOURCE An out of memory condition was encountered. .It Bq Er ELF_E_SEQUENCE @@ -264,11 +269,6 @@ .Fn elf_begin was called before a working version was established with .Xr elf_version 3 . -.It Bq Er ELF_E_TRUNCATE -Function -.Fn elf_begin -was unable to truncate a file opened for writing using -.Dv ELF_C_WRITE . .El .Sh SEE ALSO .Xr elf 3 , ==== //depot/projects/dtrace/src/lib/libelf/elf_begin.c#5 (text+ko) ==== @@ -53,14 +53,14 @@ * and then the raw data is immediately mapped back in. */ if (fstat(fd, &sb) < 0) { - LIBELF_SET_ERROR(STAT, errno); + LIBELF_SET_ERROR(IO, errno); return (NULL); } m = NULL; if ((m = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, (off_t) 0)) == MAP_FAILED) { - LIBELF_SET_ERROR(MMAP, errno); + LIBELF_SET_ERROR(IO, errno); return (NULL); } @@ -75,7 +75,7 @@ if (c == ELF_C_RDWR && e->e_kind == ELF_K_AR) { (void) elf_end(e); - LIBELF_SET_ERROR(MODE, 0); + LIBELF_SET_ERROR(ARGUMENT, 0); return (NULL); } @@ -148,7 +148,7 @@ * not writeable. */ if (ftruncate(fd, (off_t) 0) < 0) { - LIBELF_SET_ERROR(TRUNCATE, errno); + LIBELF_SET_ERROR(IO, errno); return (NULL); } ==== //depot/projects/dtrace/src/lib/libelf/elf_end.c#3 (text+ko) ==== @@ -39,6 +39,7 @@ elf_end(Elf *e) { Elf *sv; + Elf_Scn *scn, *tscn; if (e == NULL || e->e_activations == 0) return (0); @@ -61,6 +62,11 @@ return (0); break; case ELF_K_ELF: + /* + * Reclaim all section descriptors. + */ + STAILQ_FOREACH_SAFE(scn, &e->e_u.e_elf.e_scn, s_next, tscn) + scn = _libelf_release_scn(scn); break; case ELF_K_NUM: assert(0); @@ -74,7 +80,7 @@ sv = e; if ((e = e->e_parent) != NULL) e->e_u.e_ar.e_nchildren--; - _libelf_release_elf(sv); + sv = _libelf_release_elf(sv); } return (0); ==== //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#9 (text+ko) ==== @@ -44,15 +44,14 @@ DEFINE_ERROR(CLASS, "ELF class mismatch"), DEFINE_ERROR(DATA, "Invalid data buffer descriptor"), DEFINE_ERROR(HEADER, "Missing or malformed ELF header"), - DEFINE_ERROR(MMAP, "File mapping failed"), + DEFINE_ERROR(IO, "I/O error"), + DEFINE_ERROR(LAYOUT, "Layout constraint violation"), DEFINE_ERROR(MODE, "Incorrect ELF descriptor mode"), DEFINE_ERROR(RANGE, "Value out of range of target"), DEFINE_ERROR(RESOURCE, "Resource exhaustion"), - DEFINE_ERROR(SECTION, "Section descriptor was invalid"), + DEFINE_ERROR(SECTION, "Invalid section descriptor"), DEFINE_ERROR(SEQUENCE, "API calls out of sequence"), - DEFINE_ERROR(STAT, "Cannot determine file parameters"), - DEFINE_ERROR(TRUNCATE, "File truncation failed"), - DEFINE_ERROR(UNIMPL, "Feature is unimplemented"), + DEFINE_ERROR(UNIMPL, "Unimplemented feature"), DEFINE_ERROR(VERSION, "Unknown ELF API version"), DEFINE_ERROR(NUM, "Unknown error") #undef DEFINE_ERROR ==== //depot/projects/dtrace/src/lib/libelf/elf_flag.c#2 (text+ko) ==== @@ -44,16 +44,11 @@ if ((c != ELF_C_SET && c != ELF_C_CLR) || (scn = d->d_scn) == NULL || (e = scn->s_elf) == NULL || e->e_kind != ELF_K_ELF || - flags == 0 || (flags & ~ELF_F_DIRTY) != 0) { + (flags & ~ELF_F_DIRTY) != 0) { LIBELF_SET_ERROR(ARGUMENT, 0); return (0); } - if (e->e_cmd == ELF_C_READ) { - LIBELF_SET_ERROR(MODE, 0); - return (0); - } - if (c == ELF_C_SET) r = scn->s_flags |= flags; else @@ -65,25 +60,30 @@ unsigned int elf_flagehdr(Elf *e, Elf_Cmd c, unsigned int flags) { - int r; + int ec; + void *ehdr; if (e == NULL) return (0); if ((c != ELF_C_SET && c != ELF_C_CLR) || - (e->e_cmd == ELF_C_READ) || (e->e_kind != ELF_K_ELF) || - flags == 0 || (flags & ~ELF_F_DIRTY) != 0) { + (e->e_kind != ELF_K_ELF) || (flags & ~ELF_F_DIRTY) != 0 || + ((ec = e->e_class) != ELFCLASS32 && ec != ELFCLASS64)) { LIBELF_SET_ERROR(ARGUMENT, 0); return (0); } - r = 0; - if (c == ELF_C_SET) { - e->e_flags |= LIBELF_F_EHDR_DIRTY; - r = flags; - } else - e->e_flags &= LIBELF_F_EHDR_DIRTY; - return (r); + if (ec == ELFCLASS32) + ehdr = e->e_u.e_elf.e_ehdr.e_ehdr32; + else + ehdr = e->e_u.e_elf.e_ehdr.e_ehdr64; + + if (ehdr == NULL) { + LIBELF_SET_ERROR(SEQUENCE, 0); + return (0); + } + + return (elf_flagelf(e, c, flags)); } unsigned int @@ -95,8 +95,8 @@ return (0); if ((c != ELF_C_SET && c != ELF_C_CLR) || - (e->e_cmd == ELF_C_READ) || (e->e_kind != ELF_K_ELF) || - flags == 0 || (flags & ~(ELF_F_DIRTY|ELF_F_LAYOUT)) != 0) { + (e->e_kind != ELF_K_ELF) || + (flags & ~(ELF_F_DIRTY|ELF_F_LAYOUT)) != 0) { LIBELF_SET_ERROR(ARGUMENT, 0); return (0); } @@ -111,43 +111,41 @@ unsigned int elf_flagphdr(Elf *e, Elf_Cmd c, unsigned int flags) { - int r; + int ec; + void *phdr; if (e == NULL) return (0); if ((c != ELF_C_SET && c != ELF_C_CLR) || - (e->e_cmd == ELF_C_READ) || (e->e_kind != ELF_K_ELF) || - flags == 0 || (flags & ~ELF_F_DIRTY) != 0) { + (e->e_kind != ELF_K_ELF) || (flags & ~ELF_F_DIRTY) != 0 || + ((ec = e->e_class) != ELFCLASS32 && ec != ELFCLASS64)) { LIBELF_SET_ERROR(ARGUMENT, 0); return (0); } - r = 0; - if (c == ELF_C_SET) { - e->e_flags |= LIBELF_F_PHDR_DIRTY; - r = flags; - } else - e->e_flags &= ~LIBELF_F_PHDR_DIRTY; - return (r); + if (ec == ELFCLASS32) + phdr = e->e_u.e_elf.e_phdr.e_phdr32; + else + phdr = e->e_u.e_elf.e_phdr.e_phdr64; + + if (phdr == NULL) { + LIBELF_SET_ERROR(SEQUENCE, 0); + return (0); + } + + return (elf_flagelf(e, c, flags)); } unsigned int elf_flagscn(Elf_Scn *s, Elf_Cmd c, unsigned int flags) { - Elf *e; int r; if (s == NULL) return (0); - e = s->s_elf; - - assert(e != NULL); - assert(e->e_kind == ELF_K_ELF); - if ((c != ELF_C_SET && c != ELF_C_CLR) || - e->e_cmd == ELF_C_READ || flags == 0 || (flags & ~ELF_F_DIRTY) != 0) { LIBELF_SET_ERROR(ARGUMENT, 0); return (0); @@ -163,31 +161,5 @@ unsigned int elf_flagshdr(Elf_Scn *s, Elf_Cmd c, unsigned int flags) { - Elf *e; - int r; - - if (s == NULL) - return (0); - - e = s->s_elf; - - assert(e != NULL); - assert(e->e_kind == ELF_K_ELF); - - if ((c != ELF_C_SET && c != ELF_C_CLR) || - e->e_cmd == ELF_C_READ || flags == 0 || - (flags & ~ELF_F_DIRTY) != 0) { - LIBELF_SET_ERROR(ARGUMENT, 0); - return (0); - } - - r = 0; - if (c == ELF_C_SET) { - s->s_flags |= LIBELF_F_SHDR_DIRTY; - r = flags; - } else - s->s_flags &= ~LIBELF_F_SHDR_DIRTY; - - return (r); + return (elf_flagscn(s, c, flags)); } - ==== //depot/projects/dtrace/src/lib/libelf/elf_flagdata.3#3 (text+ko) ==== @@ -51,8 +51,8 @@ .Ft "unsigned int" .Fn elf_flagshdr "Elf_Scn *scn" "Elf_Cmd cmd" "unsigned int flags" .Sh DESCRIPTION >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 1 23:21: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 AB1B116A412; Sun, 1 Oct 2006 23:21:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2552216A403 for ; Sun, 1 Oct 2006 23:21:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FC7043D46 for ; Sun, 1 Oct 2006 23:21:43 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k91NLheU097249 for ; Sun, 1 Oct 2006 23:21:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k91NKSFi096988 for perforce@freebsd.org; Sun, 1 Oct 2006 23:20:28 GMT (envelope-from jb@freebsd.org) Date: Sun, 1 Oct 2006 23:20:28 GMT Message-Id: <200610012320.k91NKSFi096988@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Oct 2006 23:21:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=107060 Change 107060 by jb@jb_freebsd7 on 2006/10/01 23:19:54 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/console-server/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#23 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#18 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#13 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/hats/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/laptop/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/new-users/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pxe/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vinum/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#22 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#12 integrate .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/articles/new-users/article.sgml#2 integrate .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/Makefile.inc#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/appendix.decl#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/audit/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/basics/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/book.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/boot/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/chapter.decl#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/chapters.ent#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/colophon.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/config/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/desktop/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/disks/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/eresources/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/geom/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/install/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/introduction/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/l10n/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/mac/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/mail/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/ports/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/printing/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/security/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/txtfiles.ent#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/users/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/vinum/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/x11/Makefile#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/ru_RU.KOI8-R/books/porters-handbook/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/share/mk/doc.xml.mk#4 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/alexbl.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/matteo.key#2 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#13 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#12 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/rrs.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/stas.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/xride.key#1 branch .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#12 integrate .. //depot/projects/dtrace/doc/share/sgml/mirrors.xml#5 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/book.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/jail/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/mac/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/arch-handbook/newbus/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/audit/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/bibliography/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/desktop/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/security/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#9 integrate .. //depot/projects/dtrace/ports/CHANGES#6 integrate .. //depot/projects/dtrace/ports/GIDs#4 integrate .. //depot/projects/dtrace/ports/KNOBS#4 integrate .. //depot/projects/dtrace/ports/LEGAL#5 integrate .. //depot/projects/dtrace/ports/MOVED#15 integrate .. //depot/projects/dtrace/ports/Mk/bsd.database.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gcc.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.java.mk#2 integrate .. //depot/projects/dtrace/ports/Mk/bsd.kde.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.lua.mk#1 branch .. //depot/projects/dtrace/ports/Mk/bsd.php.mk#4 integrate .. //depot/projects/dtrace/ports/Mk/bsd.port.mk#7 integrate .. //depot/projects/dtrace/ports/Mk/bsd.port.options.mk#1 branch .. //depot/projects/dtrace/ports/Mk/bsd.python.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.scons.mk#6 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sdl.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#7 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/buildscript#2 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/claim-chroot#2 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/clean-chroot#2 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackages#2 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackagestats#4 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/makeworld#2 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/mkbindist#2 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/pdispatch#2 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/portbuild#2 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/processlogs#2 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/processonelog#6 integrate .. //depot/projects/dtrace/ports/Tools/scripts/rmport#3 integrate .. //depot/projects/dtrace/ports/UIDs#4 integrate .. //depot/projects/dtrace/ports/UPDATING#13 integrate .. //depot/projects/dtrace/src/MAINTAINERS#10 integrate .. //depot/projects/dtrace/src/Makefile#8 integrate .. //depot/projects/dtrace/src/Makefile.inc1#18 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#11 integrate .. //depot/projects/dtrace/src/UPDATING#7 integrate .. //depot/projects/dtrace/src/bin/cp/cp.c#5 integrate .. //depot/projects/dtrace/src/bin/df/df.c#4 integrate .. //depot/projects/dtrace/src/bin/getfacl/getfacl.1#3 integrate .. //depot/projects/dtrace/src/bin/ls/ls.1#3 integrate .. //depot/projects/dtrace/src/bin/pax/pax.1#4 integrate .. //depot/projects/dtrace/src/bin/ps/ps.1#4 integrate .. //depot/projects/dtrace/src/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/dtrace/src/bin/sh/sh.1#5 integrate .. //depot/projects/dtrace/src/contrib/bind9/CHANGES#3 integrate .. //depot/projects/dtrace/src/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/dtrace/src/contrib/bind9/version#3 integrate .. //depot/projects/dtrace/src/contrib/com_err/compile_et.1#3 integrate .. //depot/projects/dtrace/src/contrib/gcc/cccp.1#3 delete .. //depot/projects/dtrace/src/contrib/gcc/cpp.1#3 delete .. //depot/projects/dtrace/src/contrib/gcc/doc/cpp.1#3 integrate .. //depot/projects/dtrace/src/contrib/gcc/doc/gcc.1#3 integrate .. //depot/projects/dtrace/src/contrib/gcc/doc/gcov.1#3 integrate .. //depot/projects/dtrace/src/contrib/gcc/gcc.1#3 delete .. //depot/projects/dtrace/src/contrib/libpcap/CHANGES#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/CREDITS#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/FREEBSD-upgrade#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/README.dag#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/VERSION#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/config.h.in#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/configure#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/configure.in#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/dtrace/src/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/dtrace/src/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/dtrace/src/contrib/libpcap/ethertype.h#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/fad-win32.c#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/gencode.c#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/gencode.h#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/grammar.y#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-bpf.c#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-bpf.h#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-dag.c#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-dag.h#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-dlpi.c#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-int.h#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-linux.c#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-stdinc.h#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-win32.c#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap.3#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap.c#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap.h#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/savefile.c#3 integrate .. //depot/projects/dtrace/src/contrib/libpcap/scanner.l#3 integrate .. //depot/projects/dtrace/src/contrib/libstdc++/include/ext/demangle.h#3 delete .. //depot/projects/dtrace/src/contrib/lukemftpd/src/Makefile#3 integrate .. //depot/projects/dtrace/src/contrib/lukemftpd/src/cmds.c#3 integrate .. //depot/projects/dtrace/src/contrib/lukemftpd/src/conf.c#3 integrate .. //depot/projects/dtrace/src/contrib/lukemftpd/src/extern.h#3 integrate .. //depot/projects/dtrace/src/contrib/lukemftpd/src/ftpcmd.y#3 integrate .. //depot/projects/dtrace/src/contrib/lukemftpd/src/ftpd.8#3 integrate .. //depot/projects/dtrace/src/contrib/lukemftpd/src/ftpd.c#3 integrate .. //depot/projects/dtrace/src/contrib/lukemftpd/src/ftpd.conf.5#3 integrate .. //depot/projects/dtrace/src/contrib/lukemftpd/src/logutmp.c#3 integrate .. //depot/projects/dtrace/src/contrib/lukemftpd/src/logwtmp.c#3 integrate .. //depot/projects/dtrace/src/contrib/lukemftpd/src/pathnames.h#3 integrate .. //depot/projects/dtrace/src/contrib/lukemftpd/src/popen.c#3 integrate .. //depot/projects/dtrace/src/contrib/lukemftpd/src/version.h#3 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntp_stdlib.h#3 integrate .. //depot/projects/dtrace/src/contrib/ntp/include/ntpd.h#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/FREEBSD-upgrade#4 integrate .. //depot/projects/dtrace/src/contrib/openbsm/HISTORY#5 integrate .. //depot/projects/dtrace/src/contrib/openbsm/TODO#4 integrate .. //depot/projects/dtrace/src/contrib/openbsm/VERSION#5 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/audit/audit.c#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditd/audit_warn.c#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditd/auditd.c#4 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditd/auditd.h#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditreduce/auditreduce.1#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bin/auditreduce/auditreduce.h#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/bsm/audit.h#4 delete .. //depot/projects/dtrace/src/contrib/openbsm/bsm/audit_internal.h#4 delete .. //depot/projects/dtrace/src/contrib/openbsm/bsm/audit_kevents.h#4 delete .. //depot/projects/dtrace/src/contrib/openbsm/bsm/audit_record.h#5 delete .. //depot/projects/dtrace/src/contrib/openbsm/bsm/libbsm.h#5 integrate .. //depot/projects/dtrace/src/contrib/openbsm/compat/strlcat.h#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/config/config.h#4 integrate .. //depot/projects/dtrace/src/contrib/openbsm/config/config.h.in#4 integrate .. //depot/projects/dtrace/src/contrib/openbsm/configure#5 integrate .. //depot/projects/dtrace/src/contrib/openbsm/configure.ac#5 integrate .. //depot/projects/dtrace/src/contrib/openbsm/etc/audit_control#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/etc/audit_event#4 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/au_control.3#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_control.c#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_io.c#4 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/bsm_token.c#5 integrate .. //depot/projects/dtrace/src/contrib/openbsm/libbsm/libbsm.3#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/arg32_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/arg32_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/data_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/data_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/file_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/file_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/header32_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/in_addr_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/in_addr_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/ip_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/ip_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/ipc_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/ipc_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/iport_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/iport_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/opaque_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/opaque_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/path_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/path_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/process32_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/process32_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/process32ex_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/process32ex_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/return32_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/return32_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/seq_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/seq_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/subject32_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/subject32_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/subject32ex_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/subject32ex_token-IPv4#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/subject32ex_token-IPv6#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/text_record#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/text_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/reference/trailer_token#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/test/samples/execve-long-args.trail#1 branch .. //depot/projects/dtrace/src/contrib/openbsm/tools/audump.c#3 integrate .. //depot/projects/dtrace/src/contrib/pnpinfo/pnpinfo.8#3 integrate .. //depot/projects/dtrace/src/contrib/tar/ABOUT-NLS#3 delete .. //depot/projects/dtrace/src/contrib/tar/AUTHORS#3 delete .. //depot/projects/dtrace/src/contrib/tar/COPYING#3 delete .. //depot/projects/dtrace/src/contrib/tar/ChangeLog#3 delete .. //depot/projects/dtrace/src/contrib/tar/ChangeLog.1#3 delete .. //depot/projects/dtrace/src/contrib/tar/FREEBSD-Xlist#3 delete .. //depot/projects/dtrace/src/contrib/tar/FREEBSD-upgrade#3 delete .. //depot/projects/dtrace/src/contrib/tar/INSTALL#3 delete .. //depot/projects/dtrace/src/contrib/tar/NEWS#3 delete .. //depot/projects/dtrace/src/contrib/tar/PORTS#3 delete .. //depot/projects/dtrace/src/contrib/tar/README#3 delete .. //depot/projects/dtrace/src/contrib/tar/README-alpha#3 delete .. //depot/projects/dtrace/src/contrib/tar/THANKS#3 delete .. //depot/projects/dtrace/src/contrib/tar/TODO#3 delete .. //depot/projects/dtrace/src/contrib/tar/doc/fdl.texi#3 delete .. //depot/projects/dtrace/src/contrib/tar/doc/freemanuals.texi#3 delete .. //depot/projects/dtrace/src/contrib/tar/doc/getdate.texi#3 delete .. //depot/projects/dtrace/src/contrib/tar/doc/header.texi#3 delete .. //depot/projects/dtrace/src/contrib/tar/doc/tar.texi#3 delete .. //depot/projects/dtrace/src/contrib/tar/doc/version.texi#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/addext.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/alloca.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/argmatch.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/argmatch.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/backupfile.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/backupfile.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/basename.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/dirname.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/dirname.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/error.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/error.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/exclude.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/exclude.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/fileblocks.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/fnmatch.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/fnmatch.hin#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/ftruncate.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/full-write.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/full-write.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/getdate.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/getdate.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/getline.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/getline.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/getstr.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/getstr.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/hash.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/hash.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/human.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/human.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/lchown.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/lchown.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/malloc.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/memset.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/mktime.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/modechange.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/modechange.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/msleep.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/prepargs.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/prepargs.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/print-copyr.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/print-copyr.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/quote.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/quote.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/quotearg.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/quotearg.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/readutmp.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/realloc.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/rename.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/rmdir.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/safe-read.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/safe-read.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/save-cwd.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/save-cwd.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/savedir.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/savedir.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/stpcpy.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/strcasecmp.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/strncasecmp.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/strstr.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/strtoimax.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/strtol.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/strtoll.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/strtoul.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/strtoull.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/strtoumax.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/unicodeio.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/unicodeio.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/utime.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/waitpid.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/xalloc.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/xgetcwd.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/xmalloc.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/xstrdup.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/xstrtoimax.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/xstrtol.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/xstrtol.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/xstrtoul.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/lib/xstrtoumax.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/arith.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/buffer.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/common.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/compare.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/create.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/delete.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/extract.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/incremen.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/list.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/mangle.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/misc.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/names.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/rmt.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/rmt.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/rtapelib.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/system.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/tar.c#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/tar.h#3 delete .. //depot/projects/dtrace/src/contrib/tar/src/update.c#3 delete .. //depot/projects/dtrace/src/contrib/tcpdump/CHANGES#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/CREDITS#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/FILES#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/INSTALL#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/Makefile.in#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/VERSION#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/addrtoname.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/configure#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/configure.in#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/dccp.h#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/ethertype.h#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/icmp6.h#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/interface.h#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/ipproto.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/ipproto.h#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/llc.h#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/netdissect.h#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/ospf.h#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/ppp.h#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-802_11.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ap1394.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ascii.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-atm.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-chdlc.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-cip.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-dccp.c#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/print-ether.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-fddi.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-fr.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-icmp6.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ip.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ip6.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ipfc.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ipx.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-isoclns.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-juniper.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-lane.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ldp.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-llc.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-null.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ospf.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-pflog.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-pim.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-radius.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-rsvp.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-sctp.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-sll.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-slow.c#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/print-symantec.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-tcp.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-token.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/tcpdump-stdinc.h#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/tcpdump.1#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/tests/.cvsignore#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/alltests.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/bgp_vpn_attrset.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/bgp_vpn_attrset.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/eapon1.gdbinit#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/eapon1.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/eapon1.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/eapon1.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/eapon2.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp-secrets.txt#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp0.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp0.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp1.gdbinit#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp1.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp1.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp2.gdbinit#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp2.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp2.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp3.gdbinit#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp3.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp4.gdbinit#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp4.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp5.gdbinit#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp5.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/esp5.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/espudp1.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/espudp1.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/espudp1.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/isakmp-delete-segfault.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/isakmp-identification-segfault.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/isakmp-pointer-loop.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/isakmp1.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/isakmp1.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/isakmp2.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/isakmp2.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/isakmp3.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/isakmp3.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/isakmp4.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/isakmp4.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/isakmp4500.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/lmp.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/lmp.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/lmp.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/mpls-ldp-hello.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/mpls-ldp-hello.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/mpls-ldp-hello.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/ospf-gmpls.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/ospf-gmpls.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/ospf-gmpls.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/print-A.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/print-AA.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/print-X.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/print-XX.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/print-capX.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/print-capXX.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/print-flags.puu#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/print-flags.sh#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/print-x.out#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/tests/print-xx.out#1 branch .. //depot/projects/dtrace/src/contrib/telnet/telnet/telnet.1#3 integrate .. //depot/projects/dtrace/src/contrib/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/CREDITS#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ChangeLog#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/INSTALL#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/LICENCE#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/Makefile.in#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/OVERVIEW#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/README#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/README.platform#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/README.tun#2 integrate .. //depot/projects/dtrace/src/crypto/openssh/acss.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/atomicio.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/atomicio.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/audit-bsm.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/audit.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/audit.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth-bsdauth.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth-chall.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth-krb5.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth-options.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth-options.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth-pam.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth-passwd.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth-rh-rsa.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth-rhosts.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth-rsa.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth-shadow.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth-sia.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth-skey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth1.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth2-chall.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth2-gss.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth2-hostbased.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth2-kbdint.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth2-none.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth2-passwd.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/auth2.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/authfd.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/authfd.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/authfile.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/authfile.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/bufaux.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/bufaux.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/bufbn.c#1 branch .. //depot/projects/dtrace/src/crypto/openssh/buffer.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/buffer.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/buildpkg.sh.in#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/canohost.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/canohost.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/channels.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/channels.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/cipher-3des1.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/cipher-acss.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/cipher-aes.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/cipher-bf1.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/cipher-ctr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/cipher.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/cipher.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/cleanup.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/clientloop.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/clientloop.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/compat.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/compat.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/compress.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/compress.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/config.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/configure.ac#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/crc32.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/crc32.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/deattack.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/deattack.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/defines.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/dh.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/dh.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/dispatch.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/dispatch.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/dns.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/dns.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/entropy.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/fatal.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/getput.h#3 delete .. //depot/projects/dtrace/src/crypto/openssh/groupaccess.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/groupaccess.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/gss-genr.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/gss-serv-krb5.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/gss-serv.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/hostfile.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/hostfile.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/includes.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/kex.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/kex.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/kexdh.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/kexdhc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/kexdhs.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/kexgex.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/kexgexc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/kexgexs.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/key.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/key.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/log.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/log.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/loginrec.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssh/loginrec.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/logintest.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/mac.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/mac.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/match.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/match.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/md-sha256.c#1 branch .. //depot/projects/dtrace/src/crypto/openssh/md5crypt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/misc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/misc.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/moduli.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/monitor.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/monitor.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/monitor_fdpass.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/monitor_fdpass.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/monitor_mm.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/monitor_mm.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/monitor_wrap.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/monitor_wrap.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/msg.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/msg.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/myproposal.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/nchan.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/Makefile.in#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/basename.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/bindresvport.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/bsd-arc4random.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/bsd-asprintf.c#2 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/bsd-closefrom.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/bsd-cray.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/bsd-getpeereid.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/bsd-misc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/bsd-nextstep.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/bsd-openpty.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/bsd-snprintf.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/bsd-waitpid.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/daemon.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/fake-rfc2553.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/fake-rfc2553.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/glob.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/glob.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/mktemp.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/openbsd-compat.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/openssl-compat.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/port-aix.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/port-aix.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/port-irix.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/port-linux.c#1 branch .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/port-linux.h#1 branch .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/port-solaris.c#1 branch .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/port-solaris.h#1 branch .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/port-tun.c#2 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/port-tun.h#2 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/port-uw.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/readpassphrase.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/regress/Makefile.in#1 branch .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/regress/closefromtest.c#1 branch .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/regress/snprintftest.c#1 branch .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/regress/strduptest.c#1 branch .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/regress/strtonumtest.c#1 branch .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/rresvport.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/setproctitle.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/sha2.c#1 branch .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/sha2.h#1 branch .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/strtonum.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/xcrypt.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/xmmap.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/openssh.xml.in#1 branch .. //depot/projects/dtrace/src/crypto/openssh/packet.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/packet.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/pathnames.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/platform.c#1 branch .. //depot/projects/dtrace/src/crypto/openssh/platform.h#1 branch .. //depot/projects/dtrace/src/crypto/openssh/progressmeter.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/progressmeter.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/readconf.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/readconf.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/readpass.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/regress/Makefile#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/regress/agent-getpeereid.sh#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/regress/cfgmatch.sh#1 branch .. //depot/projects/dtrace/src/crypto/openssh/regress/cipher-speed.sh#1 branch .. //depot/projects/dtrace/src/crypto/openssh/regress/forcecommand.sh#1 branch .. //depot/projects/dtrace/src/crypto/openssh/regress/forwarding.sh#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/rsa.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/rsa.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/scard-opensc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/scard.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/scard.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/scp.1#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/scp.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/servconf.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/servconf.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/serverloop.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/serverloop.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/session.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/session.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sftp-client.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sftp-common.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sftp-common.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sftp-glob.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sftp-server.8#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sftp-server.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sftp.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sftp.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh-add.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh-agent.1#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh-agent.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh-dss.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh-gss.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh-keygen.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh-keyscan.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh-keysign.8#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh-keysign.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh-rand-helper.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh-rsa.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh.1#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh1.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh2.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh_config#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ssh_namespace.h#2 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshconnect.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshconnect.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshconnect1.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshconnect2.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshd.8#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshd.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshd_config#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshlogin.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshlogin.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshpty.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshpty.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshtty.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ttymodes.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/ttymodes.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/uidswap.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/uidswap.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/uuencode.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/uuencode.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/version.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/xmalloc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/xmalloc.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/CHANGES#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/Configure#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/FAQ#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/LICENSE#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/Makefile#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/Makefile.org#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/Makefile.shared#2 integrate .. //depot/projects/dtrace/src/crypto/openssl/NEWS#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/README#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/CA.pl#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/dsa.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/enc.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/gendsa.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/genrsa.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/openssl.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/pkcs12.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/progs.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/progs.pl#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/rsa.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/smime.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/apps/speed.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/config#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/aes/Makefile#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/aes/aes.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/aes/aes_core.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/aes/aes_ige.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/aes/asm/aes-586.pl#2 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/tasn_dec.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/asn1/x_req.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_mont.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/bn/bn_prime.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/camellia/Makefile#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/camellia/camellia.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/camellia/camellia.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/camellia/cmll_cbc.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/camellia/cmll_cfb.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/camellia/cmll_ctr.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/camellia/cmll_ecb.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/camellia/cmll_locl.h#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/camellia/cmll_misc.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/camellia/cmll_ofb.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/dh/dh.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dh/dh_err.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dh/dh_key.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/dsa.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/dsa_err.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/dsa/dsa_ossl.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec_asn1.c#2 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/ec/ec_err.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/err/err.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/Makefile#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/c_allc.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/e_camellia.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/evp.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/evp_err.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/evp_test.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/evp/evptests.txt#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/obj_dat.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/obj_mac.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/obj_mac.num#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/objects/objects.txt#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/opensslconf.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/opensslv.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs12/p12_mutl.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/pkcs7/pk7_smime.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rand/rand_unix.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_eay.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_err.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/crypto/rsa/rsa_sign.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/ciphers.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/apps/smime.pod#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/doc/standards.txt#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/openssl.spec#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/d1_pkt.c#2 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s2_clnt.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s2_lib.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s3_lib.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/s3_srvr.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/ssl.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/ssl_algs.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/ssl_cert.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/ssl_ciph.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/ssl_lib.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/ssl_locl.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/t1_enc.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/tls1.h#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/test/Makefile#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/test/evptests.txt#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/test/igetest.c#1 branch .. //depot/projects/dtrace/src/crypto/openssl/tools/c_rehash#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/util/libeay.num#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/util/mk1mf.pl#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/util/mkdef.pl#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/util/mkfiles.pl#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/util/pl/Mingw32.pl#4 integrate .. //depot/projects/dtrace/src/etc/Makefile#5 integrate .. //depot/projects/dtrace/src/etc/defaults/periodic.conf#5 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#15 integrate .. //depot/projects/dtrace/src/etc/freebsd-update.conf#1 branch .. //depot/projects/dtrace/src/etc/hosts.allow#3 integrate .. //depot/projects/dtrace/src/etc/inetd.conf#3 integrate .. //depot/projects/dtrace/src/etc/libalias.conf#1 branch .. //depot/projects/dtrace/src/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#9 integrate .. //depot/projects/dtrace/src/etc/mtree/BSD.var.dist#3 integrate .. //depot/projects/dtrace/src/etc/network.subr#5 integrate .. //depot/projects/dtrace/src/etc/pccard_ether#4 integrate .. //depot/projects/dtrace/src/etc/periodic/weekly/120.clean-kvmdb#3 delete .. //depot/projects/dtrace/src/etc/periodic/weekly/Makefile#3 integrate .. //depot/projects/dtrace/src/etc/phones#3 integrate .. //depot/projects/dtrace/src/etc/rc.d/Makefile#7 integrate .. //depot/projects/dtrace/src/etc/rc.d/auditd#3 integrate .. //depot/projects/dtrace/src/etc/rc.d/bthidd#1 branch .. //depot/projects/dtrace/src/etc/rc.d/devd#3 integrate .. //depot/projects/dtrace/src/etc/rc.d/mrouted#3 integrate .. //depot/projects/dtrace/src/etc/rc.initdiskless#4 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#11 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/limerick#3 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/startrek#3 integrate .. //depot/projects/dtrace/src/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/dtrace/src/gnu/lib/libstdc++/config.h#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/Makefile.inc#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/as/Makefile#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/ld/Makefile.arm#2 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/ld/armelf_fbsd.sh#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/ld/genscripts.sh#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/libbfd/Makefile.arm#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/libiberty/config.h#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/Makefile.tgt#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc/Makefile#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_int/Makefile#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_int/amd64.patch#3 delete .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/Makefile#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/arm.md.diff#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cpp/Makefile#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/Makefile#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/config.h#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/init.c#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h#1 branch .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gzip/gzip.h#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gzip/inflate.c#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gzip/unlzh.c#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gzip/unpack.c#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/tar/Makefile#3 delete .. //depot/projects/dtrace/src/gnu/usr.bin/tar/config.h#3 delete .. //depot/projects/dtrace/src/gnu/usr.bin/tar/doc/Makefile#3 delete .. //depot/projects/dtrace/src/gnu/usr.bin/tar/localedir.h#3 delete .. //depot/projects/dtrace/src/gnu/usr.bin/tar/tar.1#3 delete .. //depot/projects/dtrace/src/include/Makefile#4 integrate .. //depot/projects/dtrace/src/lib/Makefile#8 integrate .. //depot/projects/dtrace/src/lib/libalias/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libalias/libalias/Makefile#1 branch .. //depot/projects/dtrace/src/lib/libalias/modules/Makefile#1 branch .. //depot/projects/dtrace/src/lib/libalias/modules/Makefile.inc#1 branch .. //depot/projects/dtrace/src/lib/libalias/modules/cuseeme/Makefile#1 branch .. //depot/projects/dtrace/src/lib/libalias/modules/dummy/Makefile#1 branch .. //depot/projects/dtrace/src/lib/libalias/modules/ftp/Makefile#1 branch .. //depot/projects/dtrace/src/lib/libalias/modules/irc/Makefile#1 branch .. //depot/projects/dtrace/src/lib/libalias/modules/nbt/Makefile#1 branch .. //depot/projects/dtrace/src/lib/libalias/modules/pptp/Makefile#1 branch .. //depot/projects/dtrace/src/lib/libalias/modules/skinny/Makefile#1 branch .. //depot/projects/dtrace/src/lib/libalias/modules/smedia/Makefile#1 branch .. //depot/projects/dtrace/src/lib/libarchive/Makefile#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive.h.in#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_extract.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_open_file.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_compression_none.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/tar.5#4 integrate .. //depot/projects/dtrace/src/lib/libbsm/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libc/gen/err.3#3 integrate .. //depot/projects/dtrace/src/lib/libc/gen/getgrent.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/gen/pwcache.3#3 integrate .. //depot/projects/dtrace/src/lib/libc/gen/tls.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/gen/vis.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/i386/gen/Makefile.inc#3 integrate .. //depot/projects/dtrace/src/lib/libc/i386/gen/alloca.S#3 delete .. //depot/projects/dtrace/src/lib/libc/i386/sys/i386_set_watch.3#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 2 00:36: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 8731916A412; Mon, 2 Oct 2006 00:36:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C4D116A407 for ; Mon, 2 Oct 2006 00:36:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA1D243D53 for ; Mon, 2 Oct 2006 00:36:12 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k920aCQn016628 for ; Mon, 2 Oct 2006 00:36:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k920aBnf016625 for perforce@freebsd.org; Mon, 2 Oct 2006 00:36:11 GMT (envelope-from jb@freebsd.org) Date: Mon, 2 Oct 2006 00:36:11 GMT Message-Id: <200610020036.k920aBnf016625@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 00:36:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=107065 Change 107065 by jb@jb_freebsd7 on 2006/10/02 00:35:39 IFopensolaris This integration includes the DTrace test suite which I've been using privately for the last 5 months, but was not allowed to commit until Sun had decided on the licensing. The test suite is now distributed as part of OpenSolaris and licensed under the CDDL. This is good news for FreeBSD because it is the test suite which detemines if the DTrace port is actually working. Not all the tests are portable to FreeBSD, though - some are Solaris-specific. (Thanks to Sun's DTrace team for following through on the licensing.) Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#8 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/32/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/64/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/Makefile.pkg#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/SUNWdtrt/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/SUNWdtrt/pkginfo.tmpl#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/SUNWdtrt/prototype_com#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/SUNWdtrt/prototype_i386#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/SUNWdtrt/prototype_sparc#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/common/README#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/common/bld_awk_pkginfo.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/common/copyright#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/common/depend#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.aggrate.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.aggrate.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.statusrate.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.switchrate.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.switchrate.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.basename.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.caller.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.cleanpath.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.ddi_pathname.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.dirname.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.errno.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.gid.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.hton.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.index.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.msgdsize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.msgsize.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.null.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.ppid.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.progenyof.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.random.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.rw.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.shortstr.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.stack.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.stackdepth.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.strchr.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.strjoin.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.strstr.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.strtok.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.substr.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.uid.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.unalign.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.uregs.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.ustack.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.ustackdepth.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.vahole.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.violentdeath.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_ARR_LOCAL.thisarray.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_DECL_CLASS.selfthis.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_DECL_CLASS.thisself.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_DECL_IDRED.errval.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_OP_INCOMPAT.dec.err.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.D_SYNTAX.declare.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.basicvar.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.basicvar.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.localvar.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.misc.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.self.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfthis.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.this.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.thisself.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sched/tst.enqueue.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sched/tst.oncpu.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sched/tst.stackdepth.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/err.D_MACRO_UNDEF.invalidargs.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/err.D_OP_LVAL.rdonly.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/err.D_OP_WRITE.usepidmacro.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/err.D_SYNTAX.concat.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/err.D_SYNTAX.desc.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/err.D_SYNTAX.inval.d#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 2 03:25: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 5F79D16A47B; Mon, 2 Oct 2006 03:25:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32CD216A415 for ; Mon, 2 Oct 2006 03:25:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2A6043D72 for ; Mon, 2 Oct 2006 03:25:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k923Pnme054185 for ; Mon, 2 Oct 2006 03:25:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k923PnFt054182 for perforce@freebsd.org; Mon, 2 Oct 2006 03:25:49 GMT (envelope-from jb@freebsd.org) Date: Mon, 2 Oct 2006 03:25:49 GMT Message-Id: <200610020325.k923PnFt054182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 03:25:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=107069 Change 107069 by jb@jb_freebsd7 on 2006/10/02 03:25:44 Remove my stubs for functions that are now implemented in libbsdelf. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/Makefile#13 edit .. //depot/projects/dtrace/src/lib/libelf/elf_getdata.c#2 delete .. //depot/projects/dtrace/src/lib/libelf/elf_getscn.c#2 delete .. //depot/projects/dtrace/src/lib/libelf/elf_ndxscn.c#2 delete .. //depot/projects/dtrace/src/lib/libelf/elf_newdata.c#2 delete .. //depot/projects/dtrace/src/lib/libelf/elf_newscn.c#2 delete .. //depot/projects/dtrace/src/lib/libelf/elf_nextscn.c#2 delete .. //depot/projects/dtrace/src/lib/libelf/elf_rawdata.c#2 delete Differences ... ==== //depot/projects/dtrace/src/lib/libelf/Makefile#13 (text+ko) ==== @@ -11,19 +11,12 @@ elf_fill.c \ elf_flag.c \ elf_getbase.c \ - elf_getdata.c \ elf_getident.c \ - elf_getscn.c \ elf_hash.c \ elf_kind.c \ elf_memory.c \ - elf_ndxscn.c \ - elf_newdata.c \ - elf_newscn.c \ elf_next.c \ - elf_nextscn.c \ elf_rand.c \ - elf_rawdata.c \ elf_rawfile.c \ elf_scn.c \ elf_strptr.c \ From owner-p4-projects@FreeBSD.ORG Mon Oct 2 04:58: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 A462516A412; Mon, 2 Oct 2006 04:58:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51EA316A403 for ; Mon, 2 Oct 2006 04:58:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 036F343D45 for ; Mon, 2 Oct 2006 04:58:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k924wmPJ078020 for ; Mon, 2 Oct 2006 04:58:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k924wm4n078017 for perforce@freebsd.org; Mon, 2 Oct 2006 04:58:48 GMT (envelope-from jb@freebsd.org) Date: Mon, 2 Oct 2006 04:58:48 GMT Message-Id: <200610020458.k924wm4n078017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 04:58:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=107070 Change 107070 by jb@jb_freebsd7 on 2006/10/02 04:57:57 Catch up with davidxu's libthr changes. This file is a copy of thr_create.c. The name change is required to avoid a clash with the syscall of the same name when libthr code is built into libc. Affected files ... .. //depot/projects/dtrace/src/lib/libthr/thread/pthread_create.c#2 edit Differences ... ==== //depot/projects/dtrace/src/lib/libthr/thread/pthread_create.c#2 (text+ko) ==== @@ -24,11 +24,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.32 2006/07/13 22:45:19 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.34 2006/09/21 04:21:30 davidxu Exp $ */ #include "namespace.h" #include +#include #include #include #include @@ -50,7 +51,8 @@ { struct pthread *curthread, *new_thread; struct thr_param param; - struct thr_sched_param sched_param; + struct sched_param sched_param; + struct rtprio rtp; int ret = 0, locked, create_suspended; sigset_t set, oset; @@ -107,6 +109,7 @@ PTHREAD_CANCEL_DEFERRED; /* Initialize the mutex queue: */ TAILQ_INIT(&new_thread->mutexq); + TAILQ_INIT(&new_thread->pp_mutexq); /* Initialise hooks in the thread structure: */ if (new_thread->attr.suspend == THR_CREATE_SUSPENDED) { @@ -143,12 +146,12 @@ if (new_thread->attr.flags & PTHREAD_SCOPE_SYSTEM) param.flags |= THR_SYSTEM_SCOPE; if (new_thread->attr.sched_inherit == PTHREAD_INHERIT_SCHED) - param.sched_param = NULL; + param.rtp = NULL; else { - param.sched_param = &sched_param; - param.sched_param_size = sizeof(sched_param); - sched_param.policy = new_thread->attr.sched_policy; - sched_param.param.sched_priority = new_thread->attr.prio; + sched_param.sched_priority = new_thread->attr.prio; + _schedparam_to_rtp(new_thread->attr.sched_policy, + &sched_param, &rtp); + param.rtp = &rtp; } /* Schedule the new thread. */ From owner-p4-projects@FreeBSD.ORG Mon Oct 2 06:16: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 AD33516A416; Mon, 2 Oct 2006 06:16:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 73CAF16A407 for ; Mon, 2 Oct 2006 06:16:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CB5E43D49 for ; Mon, 2 Oct 2006 06:16:53 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k926GrI3096070 for ; Mon, 2 Oct 2006 06:16:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k926GrJY096067 for perforce@freebsd.org; Mon, 2 Oct 2006 06:16:53 GMT (envelope-from jb@freebsd.org) Date: Mon, 2 Oct 2006 06:16:53 GMT Message-Id: <200610020616.k926GrJY096067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 06:16:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=107074 Change 107074 by jb@jb_freebsd7 on 2006/10/02 06:16:49 Merge a new file from the lastest OpenSolaris import. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/fixup_tdescs.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Oct 2 06:54:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C493A16A415; Mon, 2 Oct 2006 06:54:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F9BC16A403 for ; Mon, 2 Oct 2006 06:54:02 +0000 (UTC) (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 48DB943D46 for ; Mon, 2 Oct 2006 06:54: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.6/8.13.6) with ESMTP id k926s2Dp002185 for ; Mon, 2 Oct 2006 06:54:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k926s1ZQ002173 for perforce@freebsd.org; Mon, 2 Oct 2006 06:54:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Oct 2006 06:54:01 GMT Message-Id: <200610020654.k926s1ZQ002173@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 107076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 06:54:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=107076 Change 107076 by rwatson@rwatson_peppercorn on 2006/10/02 06:54:00 Modify to deal with lack of centralized security.bsd in 6.x. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_priv.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/kern/kern_priv.c#2 (text+ko) ==== @@ -52,6 +52,8 @@ * * XXXRW: Update this comment as needed. */ +SYSCTL_DECL(_security); +SYSCTL_DECL(_security_bsd); int suser_enabled = 1; SYSCTL_INT(_security_bsd, OID_AUTO, suser_enabled, CTLFLAG_RW, &suser_enabled, 0, "processes with uid 0 have privilege"); From owner-p4-projects@FreeBSD.ORG Mon Oct 2 06:55:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB9B516A412; Mon, 2 Oct 2006 06:55:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6690B16A407 for ; Mon, 2 Oct 2006 06:55:04 +0000 (UTC) (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 19EEA43D46 for ; Mon, 2 Oct 2006 06:55: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.6/8.13.6) with ESMTP id k926t3Et002266 for ; Mon, 2 Oct 2006 06:55:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k926t3V3002263 for perforce@freebsd.org; Mon, 2 Oct 2006 06:55:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Oct 2006 06:55:03 GMT Message-Id: <200610020655.k926t3V3002263@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 107077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 06:55:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=107077 Change 107077 by rwatson@rwatson_peppercorn on 2006/10/02 06:54:21 Merge 7.x subr_acl_posix1e.c changes to 6.x kern_acl.c. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_acl.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/kern/kern_acl.c#3 (text+ko) ==== @@ -76,54 +76,50 @@ { struct acl_entry *acl_other, *acl_mask; mode_t dac_granted; - mode_t cap_granted; + mode_t priv_granted; mode_t acl_mask_granted; int group_matched, i; /* * Look for a normal, non-privileged way to access the file/directory - * as requested. If it exists, go with that. Otherwise, attempt - * to use privileges granted via cap_granted. In some cases, - * which privileges to use may be ambiguous due to "best match", - * in which case fall back on first match for the time being. + * as requested. If it exists, go with that. Otherwise, attempt to + * use privileges granted via priv_granted. In some cases, which + * privileges to use may be ambiguous due to "best match", in which + * case fall back on first match for the time being. */ if (privused != NULL) *privused = 0; /* - * Determine privileges now, but don't apply until we've found - * a DAC entry that matches but has failed to allow access. + * Determine privileges now, but don't apply until we've found a DAC + * entry that matches but has failed to allow access. + * + * XXXRW: Ideally, we'd determine the privileges required before + * asking for them. */ -#ifndef CAPABILITIES - if (suser_cred(cred, SUSER_ALLOWJAIL) == 0) - cap_granted = VALLPERM; - else - cap_granted = 0; -#else - cap_granted = 0; + priv_granted = 0; if (type == VDIR) { - if ((acc_mode & VEXEC) && !cap_check(cred, NULL, - CAP_DAC_READ_SEARCH, SUSER_ALLOWJAIL)) - cap_granted |= VEXEC; + if ((acc_mode & VEXEC) && !priv_check_cred(cred, + PRIV_VFS_LOOKUP, SUSER_ALLOWJAIL)) + priv_granted |= VEXEC; } else { - if ((acc_mode & VEXEC) && !cap_check(cred, NULL, - CAP_DAC_EXECUTE, SUSER_ALLOWJAIL)) - cap_granted |= VEXEC; + if ((acc_mode & VEXEC) && !priv_check_cred(cred, + PRIV_VFS_EXEC, SUSER_ALLOWJAIL)) + priv_granted |= VEXEC; } - if ((acc_mode & VREAD) && !cap_check(cred, NULL, CAP_DAC_READ_SEARCH, + if ((acc_mode & VREAD) && !priv_check_cred(cred, PRIV_VFS_READ, SUSER_ALLOWJAIL)) - cap_granted |= VREAD; + priv_granted |= VREAD; if (((acc_mode & VWRITE) || (acc_mode & VAPPEND)) && - !cap_check(cred, NULL, CAP_DAC_WRITE, SUSER_ALLOWJAIL)) - cap_granted |= (VWRITE | VAPPEND); + !priv_check_cred(cred, PRIV_VFS_WRITE, SUSER_ALLOWJAIL)) + priv_granted |= (VWRITE | VAPPEND); - if ((acc_mode & VADMIN) && !cap_check(cred, NULL, CAP_FOWNER, + if ((acc_mode & VADMIN) && !priv_check_cred(cred, PRIV_VFS_ADMIN, SUSER_ALLOWJAIL)) - cap_granted |= VADMIN; -#endif /* CAPABILITIES */ + priv_granted |= VADMIN; /* * The owner matches if the effective uid associated with the From owner-p4-projects@FreeBSD.ORG Mon Oct 2 09:17:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D015316A47C; Mon, 2 Oct 2006 09:17:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 76CFF16A403 for ; Mon, 2 Oct 2006 09:17:04 +0000 (UTC) (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 267AA43D49 for ; Mon, 2 Oct 2006 09:17: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.6/8.13.6) with ESMTP id k929H4rJ037702 for ; Mon, 2 Oct 2006 09:17:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k929H35w037699 for perforce@freebsd.org; Mon, 2 Oct 2006 09:17:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Oct 2006 09:17:03 GMT Message-Id: <200610020917.k929H35w037699@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 107082 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 09:17:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=107082 Change 107082 by rwatson@rwatson_peppercorn on 2006/10/02 09:16:11 Resolve more conflicts merging priv changes from 7.x to 6.x. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/dev/dcons/dcons_os.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/i386/linux/linux_machdep.c#4 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_descrip.c#4 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_fork.c#4 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_ktrace.c#4 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/kern_linker.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_subr.c#4 edit .. //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_syscalls.c#4 edit .. //depot/projects/trustedbsd/priv6/src/sys/net/if.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/net/raw_usrreq.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/dev/dcons/dcons_os.c#3 (text+ko) ==== @@ -297,7 +297,8 @@ tp->t_state |= TS_CARR_ON; ttyconsolemode(tp, 0); ttsetwater(tp); - } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { + } else if ((tp->t_state & TS_XCLUDE) && + priv_check(td, PRIV_TTY_EXCLUSIVE)) { splx(s); return (EBUSY); } ==== //depot/projects/trustedbsd/priv6/src/sys/i386/linux/linux_machdep.c#4 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/priv6/src/sys/kern/kern_descrip.c#4 (text+ko) ==== @@ -1338,8 +1338,8 @@ sx_xlock(&filelist_lock); if ((openfiles >= maxuserfiles && - suser_cred(td->td_ucred, SUSER_RUID) != 0) || - openfiles >= maxfiles) { + priv_check_cred(td->td_ucred, PRIV_MAXFILES, SUSER_RUID) != 0) + || openfiles >= maxfiles) { if (ppsratecheck(&lastfail, &curfail, 1)) { printf("kern.maxfiles limit exceeded by uid %i, please see tuning(7).\n", td->td_ucred->cr_ruid); ==== //depot/projects/trustedbsd/priv6/src/sys/kern/kern_fork.c#4 (text+ko) ==== @@ -317,8 +317,11 @@ /* * Increment the count of procs running with this uid. Don't allow * a nonprivileged user to exceed their current limit. + * + * XXXRW: Can we avoid privilege here if it's not needed? */ - error = suser_cred(td->td_ucred, SUSER_RUID | SUSER_ALLOWJAIL); + error = priv_check_cred(td->td_ucred, PRIV_PROC_LIMIT, SUSER_RUID | + SUSER_ALLOWJAIL); if (error == 0) ok = chgproccnt(td->td_ucred->cr_ruidinfo, 1, 0); else { ==== //depot/projects/trustedbsd/priv6/src/sys/kern/kern_ktrace.c#4 (text+ko) ==== @@ -807,7 +807,8 @@ p->p_tracecred = crhold(td->td_ucred); } p->p_traceflag |= facs; - if (suser_cred(td->td_ucred, SUSER_ALLOWJAIL) == 0) + if (priv_check_cred(td->td_ucred, PRIV_KTRACE, + SUSER_ALLOWJAIL) == 0) p->p_traceflag |= KTRFAC_ROOT; } else { /* KTROP_CLEAR */ ==== //depot/projects/trustedbsd/priv6/src/sys/kern/kern_linker.c#3 (text+ko) ==== @@ -764,7 +764,7 @@ if ((error = securelevel_gt(td->td_ucred, 0)) != 0) goto out; - if ((error = suser(td)) != 0) + if ((error = priv_check(td, PRIV_KLD_LOAD)) != 0) goto out; pathname = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); @@ -810,7 +810,7 @@ if ((error = securelevel_gt(td->td_ucred, 0)) != 0) goto out; - if ((error = suser(td)) != 0) + if ((error = priv_check(td, PRIV_KLD_UNLOAD)) != 0) goto out; lf = linker_find_file_by_id(fileid); ==== //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_subr.c#4 (text+ko) ==== @@ -3250,56 +3250,46 @@ return (0); privcheck: - if (!suser_cred(cred, SUSER_ALLOWJAIL)) { - /* XXX audit: privilege used */ - if (privused != NULL) - *privused = 1; - return (0); - } - -#ifdef CAPABILITIES /* - * Build a capability mask to determine if the set of capabilities + * Build a privilege mask to determine if the set of privileges * satisfies the requirements when combined with the granted mask - * from above. - * For each capability, if the capability is required, bitwise - * or the request type onto the cap_granted mask. + * from above. For each privilege, if the privilege is required, + * bitwise or the request type onto the priv_granted mask. */ - cap_granted = 0; + priv_granted = 0; if (type == VDIR) { /* - * For directories, use CAP_DAC_READ_SEARCH to satisfy - * VEXEC requests, instead of CAP_DAC_EXECUTE. + * For directories, use PRIV_VFS_LOOKUP to satisfy VEXEC + * requests, instead of PRIV_VFS_EXEC. */ if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && - !cap_check(cred, NULL, CAP_DAC_READ_SEARCH, SUSER_ALLOWJAIL)) - cap_granted |= VEXEC; + !priv_check_cred(cred, PRIV_VFS_LOOKUP, SUSER_ALLOWJAIL)) + priv_granted |= VEXEC; } else { if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && - !cap_check(cred, NULL, CAP_DAC_EXECUTE, SUSER_ALLOWJAIL)) - cap_granted |= VEXEC; + !priv_check_cred(cred, PRIV_VFS_EXEC, SUSER_ALLOWJAIL)) + priv_granted |= VEXEC; } if ((acc_mode & VREAD) && ((dac_granted & VREAD) == 0) && - !cap_check(cred, NULL, CAP_DAC_READ_SEARCH, SUSER_ALLOWJAIL)) - cap_granted |= VREAD; + !priv_check_cred(cred, PRIV_VFS_READ, SUSER_ALLOWJAIL)) + priv_granted |= VREAD; if ((acc_mode & VWRITE) && ((dac_granted & VWRITE) == 0) && - !cap_check(cred, NULL, CAP_DAC_WRITE, SUSER_ALLOWJAIL)) - cap_granted |= (VWRITE | VAPPEND); + !priv_check_cred(cred, PRIV_VFS_WRITE, SUSER_ALLOWJAIL)) + priv_granted |= (VWRITE | VAPPEND); if ((acc_mode & VADMIN) && ((dac_granted & VADMIN) == 0) && - !cap_check(cred, NULL, CAP_FOWNER, SUSER_ALLOWJAIL)) - cap_granted |= VADMIN; + !priv_check_cred(cred, PRIV_VFS_ADMIN, SUSER_ALLOWJAIL)) + priv_granted |= VADMIN; - if ((acc_mode & (cap_granted | dac_granted)) == acc_mode) { + if ((acc_mode & (priv_granted | dac_granted)) == acc_mode) { /* XXX audit: privilege used */ if (privused != NULL) *privused = 1; return (0); } -#endif return ((acc_mode & VADMIN) ? EPERM : EACCES); } ==== //depot/projects/trustedbsd/priv6/src/sys/kern/vfs_syscalls.c#4 (text+ko) ==== @@ -278,7 +278,7 @@ error = VFS_STATFS(mp, sp, td); if (error) goto out; - if (suser(td)) { + if (priv_check(td, PRIV_VFS_GENERATION)) { bcopy(sp, &sb, sizeof(sb)); sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0; prison_enforce_statfs(td->td_ucred, mp, &sb); @@ -362,7 +362,7 @@ error = VFS_STATFS(mp, sp, td); if (error) goto out; - if (suser(td)) { + if (priv_check(td, PRIV_VFS_GENERATION)) { bcopy(sp, &sb, sizeof(sb)); sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0; prison_enforce_statfs(td->td_ucred, mp, &sb); ==== //depot/projects/trustedbsd/priv6/src/sys/net/if.c#3 (text+ko) ==== @@ -1504,12 +1504,16 @@ switch (cmd) { case SIOCIFCREATE: + error = priv_check(td, PRIV_NET_IFCREATE); + if (error) + return (error); + return (if_clone_create(ifr->ifr_name, sizeof(ifr->ifr_name)); + case SIOCIFDESTROY: - if ((error = suser(td)) != 0) + error = priv_check(td, PRIV_NET_IFDESTROY); + if (error) return (error); - return ((cmd == SIOCIFCREATE) ? - if_clone_create(ifr->ifr_name, sizeof(ifr->ifr_name)) : - if_clone_destroy(ifr->ifr_name)); + return (if_clone_destroy(ifr->ifr_name)); case SIOCIFGCLONERS: return (if_clone_list((struct if_clonereq *)data)); ==== //depot/projects/trustedbsd/priv6/src/sys/net/raw_usrreq.c#3 (text+ko) ==== @@ -164,8 +164,11 @@ if (rp == 0) return EINVAL; - if (td && (error = suser(td)) != 0) - return error; + if (td != NULL) { + error = priv_check(td, PRIV_NET_RAW); + if (error) + return error; + } return raw_attach(so, proto); } From owner-p4-projects@FreeBSD.ORG Mon Oct 2 09:32: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 6242516A416; Mon, 2 Oct 2006 09:32:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 040E616A40F for ; Mon, 2 Oct 2006 09:32:25 +0000 (UTC) (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 AE5C543D45 for ; Mon, 2 Oct 2006 09:32: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.6/8.13.6) with ESMTP id k929WNWC040080 for ; Mon, 2 Oct 2006 09:32:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k929WNlD040077 for perforce@freebsd.org; Mon, 2 Oct 2006 09:32:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Oct 2006 09:32:23 GMT Message-Id: <200610020932.k929WNlD040077@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 107083 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 09:32:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=107083 Change 107083 by rwatson@rwatson_peppercorn on 2006/10/02 09:32:02 Resolve remaining merge conflicts for priv(9) API to 6.x kernel. Still need to catch a few more differing suser(9) calls. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/net/if.c#4 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_divert.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet/raw_ip.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/in6_pcb.c#4 edit .. //depot/projects/trustedbsd/priv6/src/sys/netinet6/ipsec.c#4 edit .. //depot/projects/trustedbsd/priv6/src/sys/netipsec/ipsec_osdep.h#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/sys/mac.h#4 edit .. //depot/projects/trustedbsd/priv6/src/sys/sys/mac_policy.h#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/ufs/ufs/ufs_vnops.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/net/if.c#4 (text+ko) ==== @@ -1507,7 +1507,7 @@ error = priv_check(td, PRIV_NET_IFCREATE); if (error) return (error); - return (if_clone_create(ifr->ifr_name, sizeof(ifr->ifr_name)); + return (if_clone_create(ifr->ifr_name, sizeof(ifr->ifr_name))); case SIOCIFDESTROY: error = priv_check(td, PRIV_NET_IFDESTROY); ==== //depot/projects/trustedbsd/priv6/src/sys/netinet/ip_divert.c#3 (text+ko) ==== @@ -410,9 +410,12 @@ INP_INFO_WUNLOCK(&divcbinfo); return EINVAL; } - if (td && (error = suser(td)) != 0) { - INP_INFO_WUNLOCK(&divcbinfo); - return error; + if (td != NULL) { + error = priv_check(td, PRIV_NETINET_DIVERT); + if (error) { + INP_INFO_WUNLOCK(&divcbinfo); + return (error); + } } error = soreserve(so, div_sendspace, div_recvspace); if (error) { ==== //depot/projects/trustedbsd/priv6/src/sys/netinet/raw_ip.c#3 (text+ko) ==== @@ -603,11 +603,16 @@ INP_INFO_WUNLOCK(&ripcbinfo); return EINVAL; } + /* + * XXXRW: Centralize privilege decision in kern_jail.c. + */ if (jailed(td->td_ucred) && !jail_allow_raw_sockets) { INP_INFO_WUNLOCK(&ripcbinfo); return (EPERM); } - if ((error = suser_cred(td->td_ucred, SUSER_ALLOWJAIL)) != 0) { + error = priv_check_cred(td->td_ucred, PRIV_NETINET_RAW, + SUSER_ALLOWJAIL); + if (error) { INP_INFO_WUNLOCK(&ripcbinfo); return error; } ==== //depot/projects/trustedbsd/priv6/src/sys/netinet6/in6_pcb.c#4 (text+ko) ==== @@ -191,8 +191,12 @@ /* GROSS */ if (ntohs(lport) <= ipport_reservedhigh && ntohs(lport) >= ipport_reservedlow && - suser_cred(cred, SUSER_ALLOWJAIL)) + priv_check_cred(cred, PRIV_NETINET_RESERVEDPORT, + SUSER_ALLOWJAIL)) return (EACCES); + /* + * XXXRW: What priv to use here? + */ if (!IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr) && suser_cred(so->so_cred, SUSER_ALLOWJAIL) != 0) { t = in6_pcblookup_local(pcbinfo, ==== //depot/projects/trustedbsd/priv6/src/sys/netinet6/ipsec.c#4 (text+ko) ==== @@ -1223,8 +1223,14 @@ } bzero(new, sizeof(*new)); - if (so->so_cred != NULL && - suser_cred(so->so_cred, SUSER_ALLOWJAIL) == 0) + /* + * XXXRW: Can we avoid caching the privilege decision here, and + * instead cache the credential? + * + * XXXRW: Why is suser_allowjail set here? + */ + if (so->so_cred != NULL && priv_check_cred(so->so_cred, + PRIV_NETINET_IPSEC, 0) == 0) new->priv = 1; else new->priv = 0; ==== //depot/projects/trustedbsd/priv6/src/sys/netipsec/ipsec_osdep.h#3 (text+ko) ==== @@ -215,11 +215,13 @@ * NetBSD (1.6N) tests (so)->so_uid == 0). * This difference is wrapped inside the IPSEC_PRIVILEGED_SO() macro. * + * XXXRW: Why was this suser_allowjail? */ #ifdef __FreeBSD__ #define IPSEC_IS_PRIVILEGED_SO(_so) \ ((_so)->so_cred != NULL && \ - suser_cred((_so)->so_cred, SUSER_ALLOWJAIL) == 0) + priv_check_cred((_so)->so_cred, PRIV_NETINET_IPSEC, 0) \ + == 0) #endif /* __FreeBSD__ */ #ifdef __NetBSD__ ==== //depot/projects/trustedbsd/priv6/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 (text+ko) ==== @@ -118,7 +118,7 @@ if (u1->cr_ruid == u2->cr_ruid) return (0); - if (suser_cred(u1, 0) == 0) + if (priv_check_cred(u1, PRIV_SEEOTHERUIDS, 0) == 0) return (0); return (ESRCH); ==== //depot/projects/trustedbsd/priv6/src/sys/sys/mac.h#4 (text+ko) ==== @@ -466,6 +466,8 @@ struct label *label); void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred); void mac_associate_nfsd_label(struct ucred *cred); +int mac_priv_check(struct ucred *cred, enum priv priv); +int mac_priv_grant(struct ucred *cred, enum priv priv); /* * Calls to help various file systems implement labeling functionality ==== //depot/projects/trustedbsd/priv6/src/sys/sys/mac_policy.h#3 (text+ko) ==== @@ -600,6 +600,8 @@ int (*mpo_check_vnode_write)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); + int (*mpo_priv_check)(struct ucred *cred, enum priv priv); + int (*mpo_priv_grant)(struct ucred *cred, enum priv priv); }; /* ==== //depot/projects/trustedbsd/priv6/src/sys/ufs/ufs/ufs_vnops.c#3 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Oct 2 13:06: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 076C916A417; Mon, 2 Oct 2006 13:06:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C94016A412 for ; Mon, 2 Oct 2006 13:06:05 +0000 (UTC) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9636B43D90 for ; Mon, 2 Oct 2006 13:05:54 +0000 (GMT) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k92D5sBW087411 for ; Mon, 2 Oct 2006 13:05:54 GMT (envelope-from ru@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k92D5s94087408 for perforce@freebsd.org; Mon, 2 Oct 2006 13:05:54 GMT (envelope-from ru@freebsd.org) Date: Mon, 2 Oct 2006 13:05:54 GMT Message-Id: <200610021305.k92D5s94087408@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ru@freebsd.org using -f From: Ruslan Ermilov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107089 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 13:06:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=107089 Change 107089 by ru@ru_edoofus on 2006/10/02 13:05:13 All the rest of manpages say that OpenBSM was created in 2004. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/auditon.2#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/auditon.2#9 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#9 $ .\" .Dd April 19, 2005 .Dt AUDITON 2 @@ -286,6 +286,6 @@ .An Wayne Salamon Aq wsalamon@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 2003. +division of McAfee Inc., under contract to Apple Computer Inc. in 2004. It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. From owner-p4-projects@FreeBSD.ORG Mon Oct 2 14:01: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 CB19716A536; Mon, 2 Oct 2006 14:01:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 93DDE16A562 for ; Mon, 2 Oct 2006 14:01:52 +0000 (UTC) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2043843D60 for ; Mon, 2 Oct 2006 14:01:07 +0000 (GMT) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k92E14xo096654 for ; Mon, 2 Oct 2006 14:01:04 GMT (envelope-from ru@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k92E130Y096651 for perforce@freebsd.org; Mon, 2 Oct 2006 14:01:03 GMT (envelope-from ru@freebsd.org) Date: Mon, 2 Oct 2006 14:01:03 GMT Message-Id: <200610021401.k92E130Y096651@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ru@freebsd.org using -f From: Ruslan Ermilov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 14:01:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=107091 Change 107091 by ru@ru_edoofus on 2006/10/02 14:00:24 Manpage cleanup (automatic step). Deal with things that are automatically detected by mdoc and my rudimentary manpage checker scripts: - Remove trailing whitespace. - Break sentences. - Sort sections. - Sort SEE ALSO xrefs. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#7 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#10 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#3 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#13 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#9 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_class.3#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#5 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_free_token.3#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#9 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#5 edit .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#9 edit .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#9 edit .. //depot/projects/trustedbsd/openbsm/man/audit.2#7 edit .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#11 edit .. //depot/projects/trustedbsd/openbsm/man/audit_class.5#8 edit .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#14 edit .. //depot/projects/trustedbsd/openbsm/man/audit_event.5#9 edit .. //depot/projects/trustedbsd/openbsm/man/audit_user.5#8 edit .. //depot/projects/trustedbsd/openbsm/man/audit_warn.5#7 edit .. //depot/projects/trustedbsd/openbsm/man/auditctl.2#6 edit .. //depot/projects/trustedbsd/openbsm/man/auditon.2#10 edit .. //depot/projects/trustedbsd/openbsm/man/getaudit.2#6 edit .. //depot/projects/trustedbsd/openbsm/man/getauid.2#6 edit .. //depot/projects/trustedbsd/openbsm/man/setaudit.2#6 edit .. //depot/projects/trustedbsd/openbsm/man/setauid.2#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#7 (text+ko) ==== @@ -2,20 +2,20 @@ .\" All rights reserved. .\" .\" @APPLE_BSD_LICENSE_HEADER_START@ -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: -.\" +.\" .\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. +.\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. +.\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of .\" its contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" +.\" from this software without specific prior written permission. +.\" .\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY .\" EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED .\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -26,10 +26,10 @@ .\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" +.\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#7 $ .\" .Dd January 24, 2004 .Dt AUDIT 8 @@ -43,7 +43,7 @@ .Op Ar file .Sh DESCRIPTION The -.Nm +.Nm utility controls the state of the audit system. The optional .Ar file @@ -76,6 +76,11 @@ .Sh SEE ALSO .Xr audit_control 5 , .Xr auditd 8 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. @@ -83,8 +88,3 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#10 (text+ko) ==== @@ -29,7 +29,7 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#9 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#10 $ .\" .Dd January 24, 2004 .Dt AUDITD 8 @@ -44,7 +44,8 @@ The .Nm daemon responds to requests from the audit(1) utility and notifications -from the kernel. It manages the resulting audit log files and specified +from the kernel. +It manages the resulting audit log files and specified log file locations. .Pp The options are as follows: @@ -91,6 +92,11 @@ .El .Sh SEE ALSO .Xr audit 8 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. @@ -98,8 +104,3 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#2 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#3 $ .\" .Dd March 27, 2006 .Dt AUDITFILTERD 8 @@ -66,12 +66,12 @@ .Sh SEE ALSO .Xr audit 8 , .Xr auditd 8 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS The .Nm daemon and audit filter APIs were created by Robert Watson. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#13 (text+ko) ==== @@ -1,18 +1,18 @@ .\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. +.\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. +.\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of .\" its contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" +.\" from this software without specific prior written permission. +.\" .\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#12 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#13 $ .\" .Dd January 24, 2004 .Dt AUDITREDUCE 1 @@ -51,14 +51,14 @@ .Op Ar file ... .Sh DESCRIPTION The -.Nm +.Nm utility selects records from the audit trail files based on the specified criteria. Matching audit records are printed to the standard output in their raw binary form. If no filename is specified, the standard input is used by default. -Use the +Use the .Nm praudit utility to print the selected audit records in human-readable form. See @@ -169,6 +169,11 @@ .Xr praudit 1 , .Xr audit_control 5 , .Xr audit_event 5 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. @@ -176,8 +181,3 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#9 (text+ko) ==== @@ -1,18 +1,18 @@ .\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. +.\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. +.\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of .\" its contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" +.\" from this software without specific prior written permission. +.\" .\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#9 $ .\" .Dd January 24, 2004 .Dt PRAUDIT 1 @@ -40,7 +40,7 @@ .Op Ar file ... .Sh DESCRIPTION The -.Nm +.Nm utility prints the contents of the audit trail files to the standard output in human-readable form. If no filename is specified, the standard input is used @@ -54,14 +54,14 @@ every token is displayed on a different line. .It Fl r Prints the records in their raw, numeric form. -This option is exclusive from +This option is exclusive from .Fl s .It Fl s Prints the tokens in their short form. Short text representations for record and event type are displayed. This option is exclusive from -.Fl r +.Fl r .It Fl d Ar del Specifies the delimiter. The default delimiter is the comma. @@ -83,6 +83,11 @@ .Sh SEE ALSO .Xr audit_class 5 , .Xr audit_event 5 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. @@ -90,8 +95,3 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. ==== //depot/projects/trustedbsd/openbsm/libbsm/au_class.3#4 (text+ko) ==== @@ -10,7 +10,7 @@ .\" 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. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_class.3#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_class.3#4 $ .\" .Dd April 19, 2005 .Dt AU_CLASS 3 @@ -86,6 +86,11 @@ .Sh SEE ALSO .Xr libbsm 3 , .Xr audit_class 5 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by Robert Watson, Wayne Salamon, and Suresh Krishnaswamy for McAfee Research, the security research division of McAfee, @@ -93,11 +98,6 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. .Sh BUGS These routines cannot currently distinguish between an entry not being found and an error accessing the database. ==== //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#6 (text+ko) ==== @@ -10,7 +10,7 @@ .\" 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. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#6 $ .\" .Dd April 19, 2005 .Dt AU_CONTROL 3 @@ -37,7 +37,7 @@ .Nm getacflg , .Nm getacna , .Nm getacpol , -.Nm au_poltostr +.Nm au_poltostr , .Nm au_strtopol .Nd "Look up information from the audit_control database" .Sh LIBRARY @@ -147,6 +147,11 @@ .Sh SEE ALSO .Xr libbsm 3 , .Xr audit_control 5 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by Robert Watson, Wayne Salamon, and Suresh Krishnaswamy for McAfee Research, the security research division of McAfee, @@ -154,11 +159,6 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. .Sh BUGS These routines cannot currently distinguish between an entry not being found and an error accessing the database. ==== //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#5 (text+ko) ==== @@ -10,7 +10,7 @@ .\" 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. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#5 $ .\" .Dd April 19, 2005 .Dt AU_EVENT 3 @@ -39,7 +39,7 @@ .Nm getauevnum , .Nm getauevnum_r , .Nm getauevnonam , -.Nm getauevnonam_r , +.Nm getauevnonam_r .Nd "Look up information from the audit_event database" .Sh LIBRARY .Lb libbsm @@ -133,6 +133,11 @@ .Sh SEE ALSO .Xr libbsm 3 , .Xr audit_event 5 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by Robert Watson, Wayne Salamon, and Suresh Krishnaswamy for McAfee Research, the security research division of McAfee, @@ -140,11 +145,6 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. .Sh BUGS .Va errno is not always properly set following a failure. ==== //depot/projects/trustedbsd/openbsm/libbsm/au_free_token.3#4 (text+ko) ==== @@ -13,7 +13,7 @@ .\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of .\" its contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. +.\" from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -27,7 +27,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_free_token.3#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_free_token.3#4 $ .\" .Dd April 19, 2005 .Dt AU_FREE_TOKEN 3 @@ -73,9 +73,14 @@ .Xr audit_write 3 does, in keeping with the existing memory management model of the BSM API. .Sh SEE ALSO +.Xr audit_write 3 , .Xr au_write 3 , -.Xr audit_write 3 , .Xr libbsm 3 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by Robert Watson, Wayne Salamon, and Suresh Krishnaswamy for McAfee Research, the security research division of McAfee, @@ -83,9 +88,3 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. - ==== //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#3 (text+ko) ==== @@ -10,7 +10,7 @@ .\" 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. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#2 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#3 $ .\" .Dd April 19, 2005 .Dt AU_IO 3 @@ -102,6 +102,11 @@ .Sh SEE ALSO .Xr free 3 , .Xr libbsm 3 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by Robert Watson, Wayne Salamon, and Suresh Krishnaswamy for McAfee Research, the security research division of McAfee, @@ -109,11 +114,6 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. .Sh BUGS .Va errno may not always be properly set in the event of an error. ==== //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#4 (text+ko) ==== @@ -10,7 +10,7 @@ .\" 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. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#4 $ .\" .Dd April 19, 2005 .Dt AU_MASK 3 @@ -92,6 +92,11 @@ flag is set, the class description string retrieved from .Xr audit_class 5 will be used; otherwise, the two-character class name. +.Sh IMPLEMENTATION NOTES +.Fn au_preselect +makes implicit use of various audit database routines, and may influence +the behavior of simultaneous or interleaved processing of those databases by +other code. .Sh RETURN VALUES .Fn au_preselect returns 0 on success, or returns -1 if there is a failure looking up the @@ -106,14 +111,14 @@ returns 0 on success, or -1 if there is a failure, in which case .Va errno will be set to indicate the error. -.Sh IMPLEMENTATION NOTES -.Fn au_preselect -makes implicit use of various audit database routines, and may influence -the behavior of simultaneous or interleaved processing of those databases by -other code. .Sh SEE ALSO .Xr libbsm 3 , .Xr audit_class 5 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by Robert Watson, Wayne Salamon, and Suresh Krishnaswamy for McAfee Research, the security research division of McAfee, @@ -121,11 +126,6 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. .Sh BUGS .Va errno may not always be properly set in the event of an error. ==== //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#6 (text+ko) ==== @@ -10,7 +10,7 @@ .\" 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. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#5 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_open.3#6 $ .\" .Dd March 4, 2006 .Dt AU_OPEN 3 @@ -123,6 +123,11 @@ .Sh SEE ALSO .Xr audit_submit 3 , .Xr libbsm 3 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by Robert Watson, Wayne Salamon, and Suresh Krishnaswamy for McAfee Research, the security research division of McAfee, @@ -130,11 +135,6 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. .Sh BUGS Currently, .Fn au_open ==== //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#9 (text+ko) ==== @@ -10,7 +10,7 @@ .\" 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. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#9 $ .\" .Dd April 19, 2005 .Dt AU_TOKEN 3 @@ -38,7 +38,7 @@ .Nm au_to_groups , .Nm au_to_newgroups , .Nm au_to_in_addr , -.Nm au_to_in_addr_ex , +.Nm au_to_in_addr_ex , .Nm au_to_ip , .Nm au_to_ipc , .Nm au_to_ipc_perm , @@ -183,6 +183,11 @@ .Va errno . .Sh SEE ALSO .Xr libbsm 3 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by Robert Watson, Wayne Salamon, and Suresh Krishnaswamy for McAfee Research, the security research division of McAfee, @@ -190,9 +195,4 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. .Sh BUGS ==== //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#5 (text+ko) ==== @@ -10,7 +10,7 @@ .\" 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. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#4 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#5 $ .\" .Dd April 19, 2005 .Dt AU_USER 3 @@ -110,10 +110,15 @@ .Nm getfauditflags XXXXXXXXXXXXXXXXX .Sh SEE ALSO +.Xr getacflg 3 , .Xr libbsm 3 , -.Xr getacflg 3 , .Xr setaudit 3 , .Xr audit_user 5 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by Robert Watson, Wayne Salamon, and Suresh Krishnaswamy for McAfee Research, the security research division of McAfee, @@ -121,11 +126,6 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. .Sh BUGS These routines cannot currently distinguish between an entry not being found and an error accessing the database. ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#9 (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/audit_submit.3#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#9 $ .\" .Dd May 29, 2006 .Dt audit_submit 3 @@ -73,7 +73,7 @@ assumes that .Xr setaudit 2 , or -.Xr setaudit_addr 2 +.Xr setaudit_addr 2 has already been called. As a direct result, the terminal ID for the subject will be retrieved from the kernel via ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#9 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#9 $ .\" .Dd April 19, 2005 .Dt LIBBSM 3 @@ -190,14 +190,19 @@ .Xr getfauditflags 3 . .Sh SEE ALSO .Xr au_class 3 , +.Xr audit_submit 3 , .Xr au_mask 3 , .Xr au_notify 3 , .Xr au_stream 3 , .Xr au_token 3 , .Xr au_user 3 , -.Xr audit_submit 3 , .Xr audit_class 5 , .Xr audit_control 5 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by Robert Watson, Wayne Salamon, and Suresh Krishnaswamy for McAfee Research, the security research division of McAfee, @@ -205,11 +210,6 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer, Inc., in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. .Sh BUGS Bugs would not be unlikely. .Pp ==== //depot/projects/trustedbsd/openbsm/man/audit.2#7 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.2#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.2#7 $ .\" .Dd April 19, 2005 .Dt AUDIT 2 @@ -66,13 +66,18 @@ .El .Sh SEE ALSO .Xr auditon 2 , +.Xr getaudit 2 , +.Xr getaudit_addr 2 , .Xr getauid 2 , -.Xr setauid 2 , -.Xr getaudit 2 , .Xr setaudit 2 , -.Xr getaudit_addr 2 , .Xr setaudit_addr 2 , +.Xr setauid 2 , .Xr libbsm 3 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. @@ -83,11 +88,6 @@ .Pp This manual page was written by .An Tom Rhodes Aq trhodes@FreeBSD.org . -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. .Sh BUGS The .Fx ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#11 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#10 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#11 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 @@ -342,7 +342,7 @@ token contains a system call or library function return condition, including return value and error number associated with the global variable .Er errno . -A +A .Dv return token can be created using .Xr au_to_return32 3 @@ -601,17 +601,17 @@ .Sh SEE ALSO .Xr libbsm 3 , .Xr audit 8 +.Sh HISTORY +The OpenBSM implementation was created by McAfee Research, the security +division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. +It was subsequently adopted by the TrustedBSD Project as the foundation for +the OpenBSM distribution. .Sh AUTHORS The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. .Pp This manual page was written by .An Robert Watson Aq rwatson@FreeBSD.org . -.Sh HISTORY -The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 2004. -It was subsequently adopted by the TrustedBSD Project as the foundation for -the OpenBSM distribution. .Sh BUGS The .Dv How to print ==== //depot/projects/trustedbsd/openbsm/man/audit_class.5#8 (text+ko) ==== @@ -1,18 +1,18 @@ .\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. +.\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. +.\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of .\" its contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" +.\" from this software without specific prior written permission. +.\" .\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#8 $ .\" .Dd January 24, 2004 .Dt AUDIT_CLASS 5 @@ -35,10 +35,10 @@ .Nd "contains audit event class descriptions" .Sh DESCRIPTION >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 2 19:13: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 25BC416A4CE; Mon, 2 Oct 2006 19:13:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DAF5216A4C9 for ; Mon, 2 Oct 2006 19:13:20 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 830A943D62 for ; Mon, 2 Oct 2006 19:13:19 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k92JDJOK067549 for ; Mon, 2 Oct 2006 19:13:19 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k92JDJrT067543 for perforce@freebsd.org; Mon, 2 Oct 2006 19:13:19 GMT (envelope-from piso@freebsd.org) Date: Mon, 2 Oct 2006 19:13:19 GMT Message-Id: <200610021913.k92JDJrT067543@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 107116 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 19:13:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=107116 Change 107116 by piso@piso_newluxor on 2006/10/02 19:12:34 Retire LIB from module's Makefiles and move it into Makefile.inc. Affected files ... .. //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#7 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/cuseeme/Makefile#6 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/dummy/Makefile#6 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/ftp/Makefile#6 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/irc/Makefile#6 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/nbt/Makefile#6 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/pptp/Makefile#6 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/skinny/Makefile#6 edit .. //depot/projects/soc2005/libalias/lib/libalias/modules/smedia/Makefile#6 edit Differences ... ==== //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#7 (text+ko) ==== @@ -3,5 +3,6 @@ .PATH: ${.CURDIR}/../../../../sys/netinet/libalias SHLIBDIR?= /lib -SHLIB_NAME=libalias_${NAME}.so +LIB?= alias_${NAME} +SHLIB_NAME?=libalias_${NAME}.so WARNS?= 1 ==== //depot/projects/soc2005/libalias/lib/libalias/modules/cuseeme/Makefile#6 (text+ko) ==== @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/cuseeme/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ NAME= cuseeme -LIB= alias_cuseeme SRCS= alias_cuseeme.c .include ==== //depot/projects/soc2005/libalias/lib/libalias/modules/dummy/Makefile#6 (text+ko) ==== @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/dummy/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ NAME= dummy -LIB= alias_dummy SRCS= alias_dummy.c .include ==== //depot/projects/soc2005/libalias/lib/libalias/modules/ftp/Makefile#6 (text+ko) ==== @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/ftp/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ NAME= ftp -LIB= alias_ftp SRCS= alias_ftp.c .include ==== //depot/projects/soc2005/libalias/lib/libalias/modules/irc/Makefile#6 (text+ko) ==== @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/irc/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ NAME= irc -LIB= alias_irc SRCS= alias_irc.c .include ==== //depot/projects/soc2005/libalias/lib/libalias/modules/nbt/Makefile#6 (text+ko) ==== @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/nbt/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ NAME= nbt -LIB= alias_nbt SRCS= alias_nbt.c .include ==== //depot/projects/soc2005/libalias/lib/libalias/modules/pptp/Makefile#6 (text+ko) ==== @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/pptp/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ NAME= pptp -LIB= alias_pptp SRCS= alias_pptp.c .include ==== //depot/projects/soc2005/libalias/lib/libalias/modules/skinny/Makefile#6 (text+ko) ==== @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/skinny/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $ NAME= skinny -LIB= alias_skinny SRCS= alias_skinny.c .include ==== //depot/projects/soc2005/libalias/lib/libalias/modules/smedia/Makefile#6 (text+ko) ==== @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/libalias/modules/smedia/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $ NAME= smedia -LIB= alias_smedia SRCS= alias_smedia.c .include From owner-p4-projects@FreeBSD.ORG Mon Oct 2 20:04: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 7651216A4A7; Mon, 2 Oct 2006 20:04:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A4EE16A407 for ; Mon, 2 Oct 2006 20:04:28 +0000 (UTC) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF88243D5C for ; Mon, 2 Oct 2006 20:04:24 +0000 (GMT) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k92K4OWp077045 for ; Mon, 2 Oct 2006 20:04:24 GMT (envelope-from ru@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k92K4O1x077042 for perforce@freebsd.org; Mon, 2 Oct 2006 20:04:24 GMT (envelope-from ru@freebsd.org) Date: Mon, 2 Oct 2006 20:04:24 GMT Message-Id: <200610022004.k92K4O1x077042@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ru@freebsd.org using -f From: Ruslan Ermilov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 20:04:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=107118 Change 107118 by ru@ru_edoofus on 2006/10/02 20:03:55 - Removed obsolete -h and -s from getopt() and SYNOPSIS. - Fixed manpage markup. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#11 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#24 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#11 (text+ko) ==== @@ -29,47 +29,35 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#10 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#11 $ .\" -.Dd January 24, 2004 +.Dd October 2, 2006 .Dt AUDITD 8 .Os .Sh NAME .Nm auditd .Nd audit log management daemon .Sh SYNOPSIS -.Nm auditd -.Op Fl dhs +.Nm +.Op Fl d .Sh DESCRIPTION The .Nm -daemon responds to requests from the audit(1) utility and notifications +daemon responds to requests from the +.Xr audit 8 +utility and notifications from the kernel. It manages the resulting audit log files and specified log file locations. .Pp The options are as follows: -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl d -Starts the daemon in debug mode - it will not daemonize. +Starts the daemon in debug mode \[em] it will not daemonize. .El -.Pp -The historical -.Fl h -and -.Fl s -flags are now configured using -.Xr audit_control 5 -policy flags -.Dv ahlt -and -.Dv cnt , -and are no longer available as arguments to -.Xr auditd 8 . .Sh NOTE -.Pp To assure uninterrupted audit support, the -.Nm auditd +.Nm daemon should not be started and stopped manually. Instead, the .Xr audit 8 @@ -79,17 +67,34 @@ .Pa audit_control file. .Pp -.\" Sending a SIGHUP to a running -.\" .Nm auditd +.\" Sending a +.\" .Dv SIGHUP +.\" to a running +.\" .Nm .\" daemon will force it to exit. -Sending a SIGTERM to a running -.Nm auditd +Sending a +.Dv SIGTERM +to a running +.Nm daemon will force it to exit. .Sh FILES -.Bl -tag -width "/var/audit" -compact +.Bl -tag -width ".Pa /var/audit" -compact .It Pa /var/audit Default directory for storing audit log files. .El +.Sh COMPATIBILITY +The historical +.Fl h +and +.Fl s +flags are now configured using +.Xr audit_control 5 +policy flags +.Cm ahlt +and +.Cm cnt , +and are no longer available as arguments to +.Nm . .Sh SEE ALSO .Xr audit 8 .Sh HISTORY @@ -98,9 +103,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#24 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#23 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#24 $ */ #include @@ -896,7 +896,7 @@ int debug = 0; int rc; - while ((ch = getopt(argc, argv, "dhs")) != -1) { + while ((ch = getopt(argc, argv, "d")) != -1) { switch(ch) { case 'd': /* Debug option. */ From owner-p4-projects@FreeBSD.ORG Mon Oct 2 20:22: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 088AB16A4C9; Mon, 2 Oct 2006 20:22:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C84C116A4C2 for ; Mon, 2 Oct 2006 20:22:58 +0000 (UTC) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55D8E43D7C for ; Mon, 2 Oct 2006 20:22:48 +0000 (GMT) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k92KMmRA079803 for ; Mon, 2 Oct 2006 20:22:48 GMT (envelope-from ru@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k92KMmwQ079798 for perforce@freebsd.org; Mon, 2 Oct 2006 20:22:48 GMT (envelope-from ru@freebsd.org) Date: Mon, 2 Oct 2006 20:22:48 GMT Message-Id: <200610022022.k92KMmwQ079798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ru@freebsd.org using -f From: Ruslan Ermilov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 20:22:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=107119 Change 107119 by ru@ru_edoofus on 2006/10/02 20:22:30 - One of the -n, -s or -t flags is required as an argument. - There's no optional "file" argument. - Fix markup. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#8 (text+ko) ==== @@ -29,29 +29,24 @@ .\" .\" @APPLE_BSD_LICENSE_HEADER_END@ .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#8 $ .\" -.Dd January 24, 2004 +.Dd October 2, 2006 .Dt AUDIT 8 .Os .Sh NAME .Nm audit .Nd audit management utility .Sh SYNOPSIS -.Nm audit -.Op Fl nst -.Op Ar file +.Nm +.Fl n | s | t .Sh DESCRIPTION The .Nm utility controls the state of the audit system. -The optional -.Ar file -operand specifies the location of the audit control input file (default -.Pa /etc/security/audit_control ) . -.Pp -The options are as follows: -.Bl -tag -width Ds +One of the following flags is required as an argument to +.Nm : +.Bl -tag -width indent .It Fl n Forces the audit system to close the existing audit log file and rotate to a new log file in a location specified in the audit control file. @@ -69,9 +64,9 @@ .Xr auditd 8 daemon must already be running. .Sh FILES -.Bl -tag -width "/etc/security/audit_control" -compact +.Bl -tag -width ".Pa /etc/security/audit_control" -compact .It Pa /etc/security/audit_control -Default audit policy file used to configure the auditing system. +Audit policy file used to configure the auditing system. .El .Sh SEE ALSO .Xr audit_control 5 , @@ -82,9 +77,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. From owner-p4-projects@FreeBSD.ORG Mon Oct 2 21:03: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 7498816A416; Mon, 2 Oct 2006 21:03:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3431A16A403 for ; Mon, 2 Oct 2006 21:03:42 +0000 (UTC) (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 F11F543D49 for ; Mon, 2 Oct 2006 21:03:41 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k92L3f6O098252 for ; Mon, 2 Oct 2006 21:03:41 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k92L3f43098249 for perforce@freebsd.org; Mon, 2 Oct 2006 21:03:41 GMT (envelope-from imp@freebsd.org) Date: Mon, 2 Oct 2006 21:03:41 GMT Message-Id: <200610022103.k92L3f43098249@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 107121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 21:03:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=107121 Change 107121 by imp@imp_lighthouse on 2006/10/02 21:03:08 Typos and fix interface botch Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#4 (text+ko) ==== @@ -98,6 +98,8 @@ sc->disk->d_name = "flash/card"; sc->disk->d_drv1 = sc; sc->disk->d_maxsize = DFLTPHYS; + sc->disk->d_sectorsize = mmc_get_sector_size(dev); + sc->disk->d_mediasize = mmc_get_media_size(dev); sc->disk->d_unit = device_get_unit(dev); disk_create(sc->disk, DISK_VERSION); bioq_init(&sc->bio_queue); @@ -121,8 +123,6 @@ sc = (struct mmcsd_softc *)dp->d_drv1; MMCSD_LOCK(sc); - sc->disk->d_sectorsize = mmc_get_sector_size(sc->dev); - sc->disk->d_mediasize = mmc_get_media_size(sc->dev); MMCSD_UNLOCK(sc); return 0; @@ -159,7 +159,7 @@ { struct mmcsd_softc *sc = (struct mmcsd_softc*)arg; struct bio *bp; - int sz, err; + int sz; daddr_t end; struct mmc_command cmd; struct mmc_command stop; @@ -179,12 +179,13 @@ } while (bp == NULL); MMCBUS_ACQUIRE_BUS(device_get_parent(dev), dev); bioq_remove(&sc->bio_queue, bp); - printf("at91_qdmmc_task: request %p\n", bp); + printf("mmc_task: request %p\n", bp); sz = sc->disk->d_sectorsize; end = bp->bio_pblkno + (bp->bio_bcount / sz); // XXX should use read/write_mulit for (block = bp->bio_pblkno; block < end; block++) { char *vaddr = bp->bio_data + (block - bp->bio_pblkno) * sz; + memset(&req, 0, sizeof(req)); req.cmd = &cmd; cmd.data = &data; req.stop = &stop; @@ -207,7 +208,7 @@ stop.arg = 0; stop.flags = MMC_RSP_R1B | MMC_CMD_AC; MMCBUS_WAIT_FOR_REQUEST(device_get_parent(dev), dev, - &req, &err); + &req); // XXX error handling //XXX while (!(mmc_send_status(dev) & R1_READY_FOR_DATA)) // continue; @@ -226,7 +227,7 @@ }; static driver_t mmcsd_driver = { - "mmc", + "mmcsd", mmcsd_methods, sizeof(struct mmcsd_softc), }; From owner-p4-projects@FreeBSD.ORG Mon Oct 2 21:04: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 5F05816A47B; Mon, 2 Oct 2006 21:04:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22AC016A403 for ; Mon, 2 Oct 2006 21:04:44 +0000 (UTC) (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 CBB9043D4C for ; Mon, 2 Oct 2006 21:04:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k92L4hHW098330 for ; Mon, 2 Oct 2006 21:04:43 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k92L4h5Y098327 for perforce@freebsd.org; Mon, 2 Oct 2006 21:04:43 GMT (envelope-from imp@freebsd.org) Date: Mon, 2 Oct 2006 21:04:43 GMT Message-Id: <200610022104.k92L4h5Y098327@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 107122 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 21:04:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=107122 Change 107122 by imp@imp_lighthouse on 2006/10/02 21:03:43 Fix botched done call. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#15 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#15 (text+ko) ==== @@ -348,7 +348,7 @@ WR4(sc, MCI_IER, MCI_SR_ERROR | MCI_SR_CMDRDY); return; } -// panic(); + panic("WRITE THE DATA HANDLER"); } static void @@ -371,7 +371,7 @@ /* We must be done -- bad idea to do this while locked? */ sc->req = NULL; sc->curcmd = NULL; - req->done(req->done_data); + req->done(req); } static int From owner-p4-projects@FreeBSD.ORG Mon Oct 2 21:04: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 DF45E16A559; Mon, 2 Oct 2006 21:04:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A580416A557 for ; Mon, 2 Oct 2006 21:04:44 +0000 (UTC) (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 4BAAD43D53 for ; Mon, 2 Oct 2006 21:04:44 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k92L4iBA098337 for ; Mon, 2 Oct 2006 21:04:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k92L4hTe098333 for perforce@freebsd.org; Mon, 2 Oct 2006 21:04:43 GMT (envelope-from imp@freebsd.org) Date: Mon, 2 Oct 2006 21:04:43 GMT Message-Id: <200610022104.k92L4hTe098333@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 107123 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 21:04:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=107123 Change 107123 by imp@imp_lighthouse on 2006/10/02 21:04:16 implement ivars and passing requests fix locking on done, I think... Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#13 edit .. //depot/projects/arm/src/sys/dev/mmc/mmcbus_if.m#5 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmc.c#13 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include +#include #include "mmcbr_if.h" #include "mmcbus_if.h" @@ -102,6 +103,7 @@ /* We'll probe and attach our children later, but before / mount */ sc->config_intrhook.ich_func = mmc_delayed_attach; sc->config_intrhook.ich_arg = sc; + printf("arg is %p\n", sc); if (config_intrhook_establish(&sc->config_intrhook) != 0) device_printf(dev, "config_intrhook_establish failed\n"); return (0); @@ -156,7 +158,14 @@ static void mmc_wakeup(struct mmc_request *req) { + struct mmc_softc *sc; + + printf("Wakeup for req %p done_data %p\n", req, req->done_data); + sc = (struct mmc_softc *)req->done_data; + MMC_LOCK(sc); + req->flags |= MMC_REQ_DONE; wakeup(req); + MMC_UNLOCK(sc); } static int @@ -165,17 +174,30 @@ int err; req->done = mmc_wakeup; + req->done_data = sc; + printf("Submitting request %p sc %p\n", req, sc); MMCBR_REQUEST(device_get_parent(sc->dev), sc->dev, req); MMC_LOCK(sc); do { err = msleep(req, &sc->sc_mtx, PZERO | PCATCH, "mmcreq", hz / 10); - } while (!(req->flags & MMC_REQ_DONE) && err == 0); + printf("err is %d flags %x\n", err, req->flags); + } while (!(req->flags & MMC_REQ_DONE) && err == EAGAIN); + printf("Request %p done with error %d\n", req, err); MMC_UNLOCK(sc); return (err); } static int +mmc_wait_for_request(device_t brdev, device_t reqdev, struct mmc_request *req) +{ + struct mmc_softc *sc = device_get_softc(brdev); + + printf("passing along request %p\n", req); + return mmc_wait_for_req(sc, req); +} + +static int mmc_wait_for_cmd(struct mmc_softc *sc, struct mmc_command *cmd, int retries) { struct mmc_request mreq; @@ -555,6 +577,42 @@ // XXX probe/attach/detach children? } +static int +mmc_read_ivar(device_t bus, device_t child, int which, u_char *result) +{ +// struct at91_mci_softc *sc = device_get_softc(bus); + struct mmc_ivars *ivar = device_get_ivars(child); + + switch (which) { + default: + return (EINVAL); + case MMC_IVAR_MEDIA_SIZE: + *(int *)result = ivar->csd.capacity; + break; + case MMC_IVAR_MODE: + *(int *)result = ivar->mode; + break; + case MMC_IVAR_SECTOR_SIZE: + *(int *)result = 512; + break; + } + return (0); +} + +static int +mmc_write_ivar(device_t bus, device_t child, int which, uintptr_t value) +{ +// struct at91_mci_softc *sc = device_get_softc(bus); +// struct mmc_ivars *ivar = device_get_ivars(child); + + switch (which) { + default: + return (EINVAL); + } + return (0); +} + + static void mmc_delayed_attach(void *xsc) { @@ -566,9 +624,18 @@ } static device_method_t mmc_methods[] = { + /* device_if */ DEVMETHOD(device_probe, mmc_probe), DEVMETHOD(device_attach, mmc_attach), DEVMETHOD(device_detach, mmc_detach), + + /* Bus interface */ + DEVMETHOD(bus_read_ivar, mmc_read_ivar), + DEVMETHOD(bus_write_ivar, mmc_write_ivar), + + /* MMC Bus interface */ + DEVMETHOD(mmcbus_wait_for_request, mmc_wait_for_request), + {0, 0}, }; ==== //depot/projects/arm/src/sys/dev/mmc/mmcbus_if.m#5 (text+ko) ==== @@ -43,7 +43,6 @@ device_t brdev; device_t reqdev; struct mmc_request *req; - int *status; }; # From owner-p4-projects@FreeBSD.ORG Mon Oct 2 21:13: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 2851B16A47B; Mon, 2 Oct 2006 21:13:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC61716A403 for ; Mon, 2 Oct 2006 21:13:56 +0000 (UTC) (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 876AD43D46 for ; Mon, 2 Oct 2006 21:13: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.6/8.13.6) with ESMTP id k92LDuAb099914 for ; Mon, 2 Oct 2006 21:13:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k92LDubi099911 for perforce@freebsd.org; Mon, 2 Oct 2006 21:13:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Oct 2006 21:13:56 GMT Message-Id: <200610022113.k92LDubi099911@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 107124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 21:13:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=107124 Change 107124 by rwatson@rwatson_peppercorn on 2006/10/02 21:13:05 Audit event numbers for MAC system calls on FreeBSD. Some additional events are likely required for Darwin. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#44 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#44 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#43 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#44 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -474,6 +474,17 @@ #define AUE_READDIR 43118 /* Linux. */ #define AUE_IOPL 43119 /* Linux. */ #define AUE_VM86 43120 /* Linux. */ +#define AUE_MAC_GET_PROC 43121 /* FreeBSD. */ +#define AUE_MAC_SET_PROC 43122 /* FreeBSD. */ +#define AUE_MAC_GET_FD 43123 /* FreeBSD. */ +#define AUE_MAC_GET_FILE 43124 /* FreeBSD. */ +#define AUE_MAC_SET_FD 43125 /* FreeBSD. */ +#define AUE_MAC_SET_FILE 43126 /* FreeBSD. */ +#define AUE_MAC_SYSCALL 43127 /* FreeBSD. */ +#define AUE_MAC_GET_PID 43128 /* FreeBSD. */ +#define AUE_MAC_GET_LINK 43129 /* FreeBSD. */ +#define AUE_MAC_SET_LINK 43130 /* FreeBSD. */ +#define AUE_MAC_EXECVE 43131 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#16 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#17 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -422,6 +422,17 @@ 43118:AUE_READDIR:readdir(3):no 43119:AUE_IOPL:linux iopl:ad 43120:AUE_VM86:linux vm86:pc +43121:AUE_MAC_GET_PROC:mac_get_proc(2):pc +43122:AUE_MAC_SET_PROC:mac_set_proc(2):pc +43123:AUE_MAC_GET_FD:mac_get_fd(2):fa +43124:AUE_MAC_GET_FILE:mac_get_file(2):fa +43125:AUE_MAC_SET_FD:mac_set_fd(2):fm +43126:AUE_MAC_SET_FILE:mac_set_file(2):fm +43127:AUE_MAC_SYSCALL:mac_syscall(2):ad +43128:AUE_MAC_GET_PID:mac_get_pid(2):pc +43129:AUE_MAC_GET_LINK:mac_get_link(2):fa +43130:AUE_MAC_SET_LINK:mac_set_link(2):fm +43131:AUE_MAC_EXECVE:mac_exeve(2):ex,pc # # User space system events. # From owner-p4-projects@FreeBSD.ORG Mon Oct 2 21:20:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7658316A47B; Mon, 2 Oct 2006 21:20:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51E1B16A416 for ; Mon, 2 Oct 2006 21:20:05 +0000 (UTC) (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 BC3B543D49 for ; Mon, 2 Oct 2006 21:20: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.6/8.13.6) with ESMTP id k92LK4NY000246 for ; Mon, 2 Oct 2006 21:20:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k92LK4cA000243 for perforce@freebsd.org; Mon, 2 Oct 2006 21:20:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Oct 2006 21:20:04 GMT Message-Id: <200610022120.k92LK4cA000243@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 107125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 21:20:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=107125 Change 107125 by rwatson@rwatson_peppercorn on 2006/10/02 21:19:13 Audit events for getpath system calls, POSIX message kqueues. (Query: FreeBSD system calls are kmq*, but library interfaces are mq_* -- should the audit identifiers be MQ_*?). Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#45 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#45 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#44 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#45 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -485,6 +485,14 @@ #define AUE_MAC_GET_LINK 43129 /* FreeBSD. */ #define AUE_MAC_SET_LINK 43130 /* FreeBSD. */ #define AUE_MAC_EXECVE 43131 /* FreeBSD. */ +#define AUE_GETPATH_FROMFD 43132 /* FreeBSD. */ +#define AUE_GETPATH_FROMADDR 43133 /* FreeBSD. */ +#define AUE_KMQ_OPEN 43134 /* FreeBSD. */ +#define AUE_KMQ_SETATTR 43135 /* FreeBSD. */ +#define AUE_KMQ_TIMEDRECEIVE 43136 /* FreeBSD. */ +#define AUE_KMQ_TIMEDSEND 43137 /* FreeBSD. */ +#define AUE_KMQ_NOTIFY 43138 /* FreeBSD. */ +#define AUE_KMQ_UNLINK 43139 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#17 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#18 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -433,6 +433,14 @@ 43129:AUE_MAC_GET_LINK:mac_get_link(2):fa 43130:AUE_MAC_SET_LINK:mac_set_link(2):fm 43131:AUE_MAC_EXECVE:mac_exeve(2):ex,pc +43132:AUE_GETPATH_FROMFD:getpath_fromfd(2):fa +43133:AUE_GETPATH_FROMADDR:getpath_fromaddr(2):fa +43134:AUE_KMQ_OPEN:mq_open(2):ip +43135:AUE_KMQ_SETATTR:mq_setattr(2):ip +43136:AUE_KMQ_TIMEDRECEIVE:mq_timedreceive(2):ip +43137:AUE_KMQ_TIMEDSEND:mq_timedsend(2):ip +43138:AUE_KMQ_NOTIFY:mq_notify(2):ip +43139:AUE_KMQ_UNLINK:mq_unlink(2):ip # # User space system events. # From owner-p4-projects@FreeBSD.ORG Mon Oct 2 21:31: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 BC8CB16A416; Mon, 2 Oct 2006 21:31:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 95DEE16A403; Mon, 2 Oct 2006 21:31:49 +0000 (UTC) (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 4990743D55; Mon, 2 Oct 2006 21:31:46 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k92LVir1019997; Mon, 2 Oct 2006 17:31:44 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Robert Watson Date: Mon, 2 Oct 2006 17:31:43 -0400 User-Agent: KMail/1.9.1 References: <200610022120.k92LK4cA000243@repoman.freebsd.org> In-Reply-To: <200610022120.k92LK4cA000243@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200610021731.43477.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Mon, 02 Oct 2006 17:31:44 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/1976/Mon Oct 2 16:33:20 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 107125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 21:31:50 -0000 On Monday 02 October 2006 17:20, Robert Watson wrote: > http://perforce.freebsd.org/chv.cgi?CH=107125 > > Change 107125 by rwatson@rwatson_peppercorn on 2006/10/02 21:19:13 > > Audit events for getpath system calls, POSIX message kqueues. > (Query: FreeBSD system calls are kmq*, but library interfaces are > mq_* -- should the audit identifiers be MQ_*?). I would use MQ_* to stick with the userland API. Don't the audit events typically reflect the userland API? -- John Baldwin From owner-p4-projects@FreeBSD.ORG Mon Oct 2 21:42: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 F04DF16A415; Mon, 2 Oct 2006 21:42:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7BA016A403; Mon, 2 Oct 2006 21:42:33 +0000 (UTC) (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 98F8943D55; Mon, 2 Oct 2006 21:42:32 +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 257CF46C67; Mon, 2 Oct 2006 17:42:31 -0400 (EDT) Date: Mon, 2 Oct 2006 22:42:31 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: John Baldwin In-Reply-To: <200610021731.43477.jhb@freebsd.org> Message-ID: <20061002224138.W32616@fledge.watson.org> References: <200610022120.k92LK4cA000243@repoman.freebsd.org> <200610021731.43477.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 107125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Oct 2006 21:42:34 -0000 On Mon, 2 Oct 2006, John Baldwin wrote: > On Monday 02 October 2006 17:20, Robert Watson wrote: >> http://perforce.freebsd.org/chv.cgi?CH=107125 >> >> Change 107125 by rwatson@rwatson_peppercorn on 2006/10/02 21:19:13 >> >> Audit events for getpath system calls, POSIX message kqueues. >> (Query: FreeBSD system calls are kmq*, but library interfaces are >> mq_* -- should the audit identifiers be MQ_*?). > > I would use MQ_* to stick with the userland API. Don't the audit events > typically reflect the userland API? Yes. The tricky distinction is that we're auditing the kernel events (as they are on the right side of the trust boundary), but we're typically interested in them as seen in user space, and with respect to documented APIs. I think you're right, they probably should be with respect to the published mq*(2) APIs. Robert N M Watson Computer Laboratory University of Cambridge From owner-p4-projects@FreeBSD.ORG Tue Oct 3 00:02: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 ED2D416A417; Tue, 3 Oct 2006 00:02:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C8B0216A415 for ; Tue, 3 Oct 2006 00:02:42 +0000 (UTC) (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 9882043D49 for ; Tue, 3 Oct 2006 00:02:40 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9302VXE027826 for ; Tue, 3 Oct 2006 00:02:31 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9302VIH027818 for perforce@freebsd.org; Tue, 3 Oct 2006 00:02:31 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 00:02:31 GMT Message-Id: <200610030002.k9302VIH027818@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 107130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 00:02:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=107130 Change 107130 by imp@imp_lighthouse on 2006/10/03 00:02:27 Spelling names right is considered polite. Correct my rudeness. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#14 edit .. //depot/projects/arm/src/sys/dev/mmc/mmcbrvar.h#2 edit .. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmc.c#14 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 Berndt Walter. All rights reserved. + * Copyright (c) 2006 Bernd Walter. All rights reserved. * Copyright (c) 2006 M. Warner Losh. All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/arm/src/sys/dev/mmc/mmcbrvar.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 Berndt Walter. All rights reserved. + * Copyright (c) 2006 Bernd Walter. All rights reserved. * Copyright (c) 2006 M. Warner Losh. All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 Berndt Walter. All rights reserved. + * Copyright (c) 2006 Bernd Walter. All rights reserved. * Copyright (c) 2006 M. Warner Losh. All rights reserved. * * Redistribution and use in source and binary forms, with or without From owner-p4-projects@FreeBSD.ORG Tue Oct 3 00:12: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 CFC4016A4A0; Tue, 3 Oct 2006 00:12:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D74216A403 for ; Tue, 3 Oct 2006 00:12:45 +0000 (UTC) (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 4B28143D49 for ; Tue, 3 Oct 2006 00:12:45 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k930Cjwe030643 for ; Tue, 3 Oct 2006 00:12:45 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k930Cjiq030640 for perforce@freebsd.org; Tue, 3 Oct 2006 00:12:45 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 00:12:45 GMT Message-Id: <200610030012.k930Cjiq030640@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 107131 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 00:12:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=107131 Change 107131 by imp@imp_lighthouse on 2006/10/03 00:12:29 Implement mmc acquire and release bus. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#15 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmc.c#15 (text+ko) ==== @@ -45,6 +45,7 @@ device_t dev; struct mtx sc_mtx; struct intr_config_hook config_intrhook; + device_t owner; }; /* @@ -115,14 +116,44 @@ return (EBUSY); /* XXX */ } -static void -mmc_acquire_bus(struct mmc_softc *sc) +static int +mmc_acquire_bus(device_t busdev, device_t dev) { + struct mmc_softc *sc; + int err; + + err = MMCBR_ACQUIRE_HOST(device_get_parent(busdev), dev); + if (err) + return (err); + sc = device_get_softc(busdev); + MMC_LOCK(sc); + if (sc->owner) + panic("How did I get here?"); + sc->owner = dev; + MMC_UNLOCK(sc); + return (0); } -static void -mmc_release_bus(struct mmc_softc *sc) +static int +mmc_release_bus(device_t busdev, device_t dev) { + struct mmc_softc *sc; + int err; + + sc = device_get_softc(busdev); + MMC_LOCK(sc); + if (!sc->owner) + panic("No owner?"); + if (sc->owner != dev) + panic("Wrong owner releasing?"); + MMC_UNLOCK(sc); + err = MMCBR_RELEASE_HOST(device_get_parent(busdev), dev); + if (err) + return (err); + MMC_LOCK(sc); + sc->owner = NULL; + MMC_UNLOCK(sc); + return (0); } static int @@ -565,7 +596,7 @@ device_t dev; dev = sc->dev; - mmc_acquire_bus(sc); + mmc_acquire_bus(dev, dev); if (mmcbr_get_power_mode(dev) == power_on) mmc_rescan_cards(sc); @@ -573,7 +604,7 @@ mmcbr_set_clock(dev, mmc_calculate_clock(sc)); mmcbr_update_ios(dev); - mmc_release_bus(sc); + mmc_release_bus(dev, dev); // XXX probe/attach/detach children? } @@ -635,6 +666,8 @@ /* MMC Bus interface */ DEVMETHOD(mmcbus_wait_for_request, mmc_wait_for_request), + DEVMETHOD(mmcbus_acquire_bus, mmc_acquire_bus), + DEVMETHOD(mmcbus_release_bus, mmc_release_bus), {0, 0}, }; From owner-p4-projects@FreeBSD.ORG Tue Oct 3 00:17: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 3575F16A47C; Tue, 3 Oct 2006 00:17:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED0EA16A416 for ; Tue, 3 Oct 2006 00:17:52 +0000 (UTC) (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 BCBE343D46 for ; Tue, 3 Oct 2006 00:17:52 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k930Hqpe031039 for ; Tue, 3 Oct 2006 00:17:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k930HqU8031036 for perforce@freebsd.org; Tue, 3 Oct 2006 00:17:52 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 00:17:52 GMT Message-Id: <200610030017.k930HqU8031036@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 107132 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 00:17:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=107132 Change 107132 by imp@imp_lighthouse on 2006/10/03 00:17:49 move function to more appropriate place. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#16 edit .. //depot/projects/arm/src/sys/dev/mmc/mmcbrvar.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmc.c#16 (text+ko) ==== @@ -156,12 +156,6 @@ return (0); } -static int -mmcbr_update_ios(device_t dev) -{ - return (MMCBR_UPDATE_IOS(device_get_parent(dev), dev)); -} - static void mmc_rescan_cards(struct mmc_softc *sc) { ==== //depot/projects/arm/src/sys/dev/mmc/mmcbrvar.h#3 (text+ko) ==== @@ -29,6 +29,7 @@ #define DEV_MMC_MMCBRVAR_H #include +#include "mmcbr_if.h" enum mmcbr_device_ivars { MMCBR_IVAR_BUS_MODE, @@ -63,4 +64,10 @@ MMCBR_ACCESSOR(power_mode, POWER_MODE, int) MMCBR_ACCESSOR(vdd, VDD, int) +static int __inline +mmcbr_update_ios(device_t dev) +{ + return (MMCBR_UPDATE_IOS(device_get_parent(dev), dev)); +} + #endif /* DEV_MMC_MMCBRVAR_H */ From owner-p4-projects@FreeBSD.ORG Tue Oct 3 00:35:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 521DC16A417; Tue, 3 Oct 2006 00:35:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D0A116A415 for ; Tue, 3 Oct 2006 00:35:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C01F43D4C for ; Tue, 3 Oct 2006 00:35:16 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k930ZGC8033981 for ; Tue, 3 Oct 2006 00:35:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k930ZFqU033978 for perforce@freebsd.org; Tue, 3 Oct 2006 00:35:15 GMT (envelope-from jb@freebsd.org) Date: Tue, 3 Oct 2006 00:35:15 GMT Message-Id: <200610030035.k930ZFqU033978@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107133 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 00:35:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=107133 Change 107133 by jb@jb_freebsd7 on 2006/10/03 00:34:35 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#24 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#23 integrate .. //depot/projects/dtrace/ports/LEGAL#6 integrate .. //depot/projects/dtrace/ports/MOVED#16 integrate .. //depot/projects/dtrace/ports/Mk/bsd.linux-rpm.mk#4 integrate .. //depot/projects/dtrace/src/crypto/openssh/FREEBSD-upgrade#3 integrate .. //depot/projects/dtrace/src/crypto/openssh/config.h#4 integrate .. //depot/projects/dtrace/src/etc/mtree/BSD.local.dist#4 integrate .. //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#10 integrate .. //depot/projects/dtrace/src/etc/network.subr#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/dhclient#5 integrate .. //depot/projects/dtrace/src/etc/rc.subr#9 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/dtrace/src/share/colldef/Makefile#3 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#7 integrate .. //depot/projects/dtrace/src/share/man/man9/zone.9#3 integrate .. //depot/projects/dtrace/src/share/mklocale/Makefile#3 integrate .. //depot/projects/dtrace/src/share/monetdef/Makefile#3 integrate .. //depot/projects/dtrace/src/share/monetdef/mn_MN.UTF-8.src#1 branch .. //depot/projects/dtrace/src/share/msgdef/Makefile#3 integrate .. //depot/projects/dtrace/src/share/msgdef/mn_MN.UTF-8.src#1 branch .. //depot/projects/dtrace/src/share/numericdef/Makefile#3 integrate .. //depot/projects/dtrace/src/share/numericdef/mn_MN.UTF-8.src#1 branch .. //depot/projects/dtrace/src/share/timedef/Makefile#3 integrate .. //depot/projects/dtrace/src/share/timedef/mn_MN.UTF-8.src#1 branch .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/amd64/include/clock.h#4 integrate .. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/arm/include/clock.h#3 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/dtrace/src/sys/conf/files#30 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/ac97_patch.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_includes.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_inline.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/ubsec/ubsec.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_subr.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/bios/apm.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_xenix.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/include/clock.h#4 integrate .. //depot/projects/dtrace/src/sys/i386/isa/clock.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/isa/pmtimer.c#3 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/clock.c#4 integrate .. //depot/projects/dtrace/src/sys/ia64/include/clock.h#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_lock.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_time.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/subr_clock.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/subr_rtc.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6.c#5 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/powerpc/include/clock.h#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/clock.c#6 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit.c#5 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/clock.h#3 integrate .. //depot/projects/dtrace/src/sys/sys/buf.h#3 integrate .. //depot/projects/dtrace/src/sys/sys/clock.h#3 integrate .. //depot/projects/dtrace/src/sys/sys/kernel.h#9 integrate .. //depot/projects/dtrace/src/sys/sys/lockmgr.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/proc.h#13 integrate .. //depot/projects/dtrace/src/sys/sys/systm.h#8 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/dtrace/www/en/releases/6.2R/schedule.sgml#2 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#24 (text+ko) ==== @@ -1,4 +1,4 @@ - + Create an empty pkg-plist file: - &prompt.root; touch pkg-plist + &prompt.root; :>pkg-plist If your port honors PREFIX (which it should) you can then install the port and create the package list. ==== //depot/projects/dtrace/ports/LEGAL#6 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.497 2006/09/17 10:00:57 rafan Exp $ +# $FreeBSD: ports/LEGAL,v 1.499 2006/10/02 12:38:31 vd Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -268,6 +268,7 @@ graphviz/* graphics/graphviz Needs license before fetching GTL-* misc/gtl Non-commercial use only, license forbids redistribution +hcfpcimodem*lnxtbeta*.tar.gz comms/hcfmdm No redistribution allowed himeno/* benchmarks/himenobench Uncertain to distribute sources and binaries hjb3_0-linux.sfx www/hotjava Licensed for individual non-commercial use only @@ -500,9 +501,6 @@ rkive3.1.tar.Z news/rkive Restrictive copyright rman-3.* textproc/rman Do not sell for profit linux-realplayer-*.rpm multimedia/linux-realplayer Redistribution not allowed -rpm/i386/8.0/* emulators/linux_base-8 Binaries under GNU GPL - without accompanying source -rtplib-* devel/rtplib Limited use license ruby/ruby_cast_256.zip security/ruby-cast_256 Crypto; export-controlled runrev/linux.tgz devel/linux-runrev Do not sell for profit savage/savage* games/linux-savage Savage is freeware, but i am ==== //depot/projects/dtrace/ports/MOVED#16 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1141 2006/09/30 14:08:35 skv Exp $ +# $FreeBSD: ports/MOVED,v 1.1145 2006/10/02 17:37:20 alepulver Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2471,3 +2471,13 @@ japanese/dvi2ps|japanese/dvipsk|2006-09-23|Removed because no longer supported and dvipsk has enough compatibility sysutils/xsearch|sysutils/searchmonkey|2006-09-30|The project has been renamed textproc/p5-XML-LibXML-XPathContext|textproc/p5-XML-LibXML|2006-09-30|merged +devel/rtplib||2006-10-02|Has expired: Upstream codebase appears to be unmaintained +emulators/linux_base||2006-10-02|Has expired: unsupported by upstream, no security support anymore +emulators/linux_base-debian||2006-10-02|Has expired: unmaintained and does not comply to the linux_base invariants +emulators/linux_base-8||2006-10-02|Has expired: unsupported by upstream, no security support anymore +emulators/linux_base-rh-9||2006-10-02|Has expired: unsupported by upstream, no security support anymore +misc/pointless||2006-10-02|Has expired: No longer actively maintained +www/mediawiki14||2006-10-02|Has expired: No longer supported, please upgrade your wiki installation +comms/pstngw||2006-10-02|Has expired +net/openh323-112||2006-10-02|Has expired +devel/pwlib152||2006-10-02|Has expired ==== //depot/projects/dtrace/ports/Mk/bsd.linux-rpm.mk#4 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.9 2006/07/30 22:34:30 sat Exp $ +# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.10 2006/10/02 14:00:45 vd Exp $ # # Variables: @@ -109,15 +109,9 @@ . if ${USE_LINUX} == "fc4" || ${USE_LINUX:L} == "yes" _LINUX_BASE_SUFFIX= fc4 -. elif ${USE_LINUX} == "debian" -_LINUX_BASE_SUFFIX= debian -. elif ${USE_LINUX} == "fc3" -_LINUX_BASE_SUFFIX= fc3 -. elif ${USE_LINUX} == "8" -_LINUX_BASE_SUFFIX= 8 . else # other linux_base ports do not provide a pkg-plist file -IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"8\", \"debian\", \"fc3\" and \"fc4\" +IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\" and \"fc4\" . endif PLIST?= ${WRKDIR}/.PLIST.linux-rpm ==== //depot/projects/dtrace/src/crypto/openssh/FREEBSD-upgrade#3 (text+ko) ==== @@ -42,20 +42,28 @@ 7) Run configure with the appropriate arguments: $ ./configure --prefix=/usr --sysconfdir=/etc/ssh \ - --with-pam --with-tcp-wrappers --with-libedit + --with-pam --with-tcp-wrappers --with-libedit \ + --with-ssl-engine + + This will regenerate config.h, which must be committed along with + the rest. Note that we don't want to configure OpenSSH for Kerberos using configure since we have to be able to turn it on or off depending on the value of MK_KERBEROS. Our Makefiles take care of this. -8) Commit the resulting config.h. Make sure you don't accidentally - commit any other files created by autoconf, autoheader or - configure; they'll just clutter up the repo and cause trouble at - the next upgrade. +8) If source files have been added or removed, update the appropriate + makefiles to reflect changes in the vendor's Makefile.in. + +9) Build libssh. Follow the instructions in ssh_namespace.h to get a + list of new symbols. Update ssh_namespace.h, build everything, + install and test. -9) Build and test. +A) Build and test the pam_ssh PAM module. It gropes around libssh's + internals and will break if something significant changes or if + ssh_namespace.h is out of whack. -A) Re-commit everything on freefall (you *did* use a test repo for +B) Re-commit everything on repoman (you *did* use a test repo for this, didn't you?) @@ -126,4 +134,4 @@ -- des@FreeBSD.org -$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.11 2006/03/17 18:54:20 ru Exp $ +$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.12 2006/10/02 12:39:28 des Exp $ ==== //depot/projects/dtrace/src/crypto/openssh/config.h#4 (text+ko) ==== @@ -458,7 +458,7 @@ #define HAVE_INT64_T 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_INTTYPES_H */ +#define HAVE_INTTYPES_H 1 /* define if you have intxx_t data type */ #define HAVE_INTXX_T 1 @@ -548,7 +548,7 @@ #define HAVE_MEMMOVE 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_MEMORY_H */ +#define HAVE_MEMORY_H 1 /* Define to 1 if you have the `mkdtemp' function. */ #define HAVE_MKDTEMP 1 @@ -780,7 +780,7 @@ #define HAVE_STDINT_H 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_STDLIB_H */ +#define HAVE_STDLIB_H 1 /* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 @@ -915,7 +915,7 @@ #define HAVE_SYS_TIME_H 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TYPES_H */ +#define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_UN_H 1 @@ -1243,7 +1243,7 @@ /* #undef SSH_TUN_PREPEND_AF */ /* Define to 1 if you have the ANSI C header files. */ -/* #undef STDC_HEADERS */ +#define STDC_HEADERS 1 /* Define if you want a different $PATH for the superuser */ /* #undef SUPERUSER_PATH */ ==== //depot/projects/dtrace/src/etc/mtree/BSD.local.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.119 2006/08/02 17:22:30 marcel Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.120 2006/10/02 00:23:13 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -725,6 +725,8 @@ .. lt_LT.UTF-8 .. + mn_MN.UTF-8 + .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 ==== //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.321 2006/09/30 09:02:38 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.322 2006/10/02 00:23:14 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -549,6 +549,8 @@ .. lt_LT.UTF-8 .. + mn_MN.UTF-8 + .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 @@ -1013,6 +1015,8 @@ .. lt_LT.UTF-8 .. + mn_MN.UTF-8 + .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 ==== //depot/projects/dtrace/src/etc/network.subr#6 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.173 2006/09/21 01:44:52 brooks Exp $ +# $FreeBSD: src/etc/network.subr,v 1.174 2006/10/02 10:13:29 gnn Exp $ # # @@ -41,6 +41,10 @@ { _cfg=1 + if checkyesno ipv6_enable; then + ${SYSCTL_W} net.inet6.ip6.auto_linklocal=1 + fi + ifconfig_args=`ifconfig_getargs $1` if [ -n "${ifconfig_args}" ]; then ifconfig $1 up ==== //depot/projects/dtrace/src/etc/rc.d/dhclient#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.24 2006/08/17 19:57:10 brian Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.25 2006/10/02 18:50:58 brooks Exp $ # # PROVIDE: dhclient @@ -53,6 +53,7 @@ ifn="$2" load_rc_config $name +load_rc_config network if ! dhcpif $ifn; then return 1 ==== //depot/projects/dtrace/src/etc/rc.subr#9 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.66 2006/04/01 10:05:50 he Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.68 2006/08/22 11:17:28 flz Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.69 2006/10/02 08:20:37 yar Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -1008,7 +1008,7 @@ case ${rc_debug} in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) if [ -x /usr/bin/logger ]; then - logger "$0: INFO: $*" + logger "$0: DEBUG: $*" fi echo 1>&2 "$0: DEBUG: $*" ;; ==== //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#5 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.121 2006/09/18 11:55:10 ru Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.122 2006/10/02 08:55:54 schweikh Exp $ .\" .Dd September 6, 2006 .Dt IFCONFIG 8 @@ -427,7 +427,7 @@ The routing metric is used by the routing protocol .Pq Xr routed 8 . Higher metrics have the effect of making a route -less favorable; metrics are counted as addition hops +less favorable; metrics are counted as additional hops to the destination network or host. .It Cm mtu Ar n Set the maximum transmission unit of the interface to @@ -615,7 +615,7 @@ or .Cm - for the address. -This option is useful when more than one access points have the same SSID. +This option is useful when more than one access point uses the same SSID. Another name for the .Cm bssid parameter is @@ -1525,5 +1525,5 @@ .Pp If you delete such an address using .Nm , -the kernel may act very oddly. +the kernel may act very odd. Do this at your own risk. ==== //depot/projects/dtrace/src/share/colldef/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/colldef/Makefile,v 1.69 2005/03/04 14:24:29 ru Exp $ +# $FreeBSD: src/share/colldef/Makefile,v 1.70 2006/10/02 00:23:14 ache Exp $ LOCALES= bg_BG.CP1251 \ be_BY.CP1131 \ @@ -89,7 +89,8 @@ de_DE el_GR en_AU en_CA en_GB en_IE en_NZ en_US es_ES \ et_EE eu_ES fi_FI fr_BE \ fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \ - ja_JP kk_KZ ko_KR lt_LT nl_BE nl_NL no_NO pl_PL pt_BR pt_PT \ + ja_JP kk_KZ ko_KR lt_LT mn_MN \ + nl_BE nl_NL no_NO pl_PL pt_BR pt_PT \ ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \ zh_TW US-ASCII_UTF-8= ${UTF8LINKS:C/^/la_LN:/} ==== //depot/projects/dtrace/src/share/man/man9/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.278 2006/09/25 20:12:13 imp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.279 2006/10/02 11:51:25 andre Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -110,6 +110,7 @@ g_provider_by_name.9 \ groupmember.9 \ g_wither_geom.9 \ + hash.9 \ hashinit.9 \ hexdump.9 \ ieee80211.9 \ @@ -587,6 +588,12 @@ MLINKS+=g_provider.9 g_destroy_provider.9 \ g_provider.9 g_error_provider.9 \ g_provider.9 g_new_providerf.9 +MLINKS+=hash.9 hash32.9 \ + hash.9 hash32_buf.9 \ + hash.9 hash32_str.9 \ + hash.9 hash32_strn.9 \ + hash.9 hash32_stre.9 \ + hash.9 hash32_strne.9 MLINKS+=hashinit.9 hashdestroy.9 \ hashinit.9 phashinit.9 MLINKS+=ieee80211.9 ieee80211_attach.9 \ ==== //depot/projects/dtrace/src/share/man/man9/zone.9#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/zone.9,v 1.26 2004/01/25 11:39:41 des Exp $ +.\" $FreeBSD: src/share/man/man9/zone.9,v 1.27 2006/10/02 07:27:00 kib Exp $ .\" .Dd July 21, 2003 .Dt ZONE 9 @@ -65,27 +65,9 @@ are not, and provides functions for allocating items from the zone and for releasing them back (which makes them available for later use). .Pp -The zone allocator stores state information inside the items proper -while they are not allocated, -so structures that will be managed by the zone allocator -and wish to use the type stable property of zones by leaving some fields -pre-filled between allocations, must reserve -two pointers at the very beginning for internal use by the zone -allocator, as follows: -.Bd -literal -offset indent -struct my_item { - struct my_item *z_rsvd1; - struct my_item *z_rsvd2; - /* rest of structure */ -}; -.Ed -.Pp -Alternatively they should assume those entries corrupted -after each allocation. After the first allocation of an item, it will have been cleared to zeroes, however subsequent allocations -will retain the contents as of the last free, with the exception of the -fields mentioned above. +will retain the contents as of the last free. .Pp The .Fn uma_zcreate ==== //depot/projects/dtrace/src/share/mklocale/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mklocale/Makefile,v 1.63 2005/03/04 14:24:29 ru Exp $ +# $FreeBSD: src/share/mklocale/Makefile,v 1.64 2006/10/02 00:23:14 ache Exp $ LOCALES= UTF-8 \ am_ET.UTF-8 \ @@ -77,7 +77,8 @@ en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES fi_FI \ fr_BE \ fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \ - ja_JP kk_KZ ko_KR lt_LT nl_BE nl_NL no_NO pl_PL pt_BR pt_PT \ + ja_JP kk_KZ ko_KR lt_LT mn_MN \ + nl_BE nl_NL no_NO pl_PL pt_BR pt_PT \ ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \ zh_TW UTF-8_UTF-8= ${UTF8LINKS:C/^/:/} ==== //depot/projects/dtrace/src/share/monetdef/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/monetdef/Makefile,v 1.62 2005/03/04 14:24:29 ru Exp $ +# $FreeBSD: src/share/monetdef/Makefile,v 1.63 2006/10/02 00:36:51 ache Exp $ LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ @@ -44,6 +44,7 @@ ko_KR.eucKR \ ko_KR.UTF-8 \ lt_LT.ISO8859-13 \ + mn_MN.UTF-8 \ nl_BE.ISO8859-1 \ nl_NL.ISO8859-1 \ no_NO.ISO8859-1 \ ==== //depot/projects/dtrace/src/share/msgdef/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/msgdef/Makefile,v 1.63 2005/09/28 07:40:03 ru Exp $ +# $FreeBSD: src/share/msgdef/Makefile,v 1.64 2006/10/02 00:36:52 ache Exp $ LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ @@ -39,6 +39,7 @@ kk_KZ.UTF-8 \ ko_KR.eucKR \ lt_LT.ISO8859-13 \ + mn_MN.UTF-8 \ nl_NL.ISO8859-1 \ no_NO.ISO8859-1 \ pl_PL.ISO8859-2 \ ==== //depot/projects/dtrace/src/share/numericdef/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/numericdef/Makefile,v 1.59 2005/03/04 14:24:30 ru Exp $ +# $FreeBSD: src/share/numericdef/Makefile,v 1.60 2006/10/02 00:36:52 ache Exp $ LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ @@ -26,6 +26,7 @@ kk_KZ.PT154 \ ko_KR.eucKR \ lt_LT.ISO8859-13 \ + mn_MN.UTF-8 \ nl_NL.ISO8859-1 \ no_NO.ISO8859-1 \ pl_PL.ISO8859-2 \ ==== //depot/projects/dtrace/src/share/timedef/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/timedef/Makefile,v 1.48 2005/03/04 14:24:30 ru Exp $ +# $FreeBSD: src/share/timedef/Makefile,v 1.49 2006/10/02 00:36:52 ache Exp $ LOCALES= am_ET.UTF-8 \ be_BY.CP1131 \ @@ -53,6 +53,7 @@ lt_LT.ISO8859-4 \ lt_LT.ISO8859-13 \ lt_LT.UTF-8 \ + mn_MN.UTF-8 \ nl_NL.ISO8859-1 \ no_NO.ISO8859-1 \ no_NO.UTF-8 \ ==== //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.652 2006/09/07 15:03:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.654 2006/10/02 15:42:01 phk Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -630,26 +631,6 @@ load_cr0(cr0); } -static int -sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS) -{ - int error; - error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, - req); - if (!error && req->newptr) - resettodr(); - return (error); -} - -SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, - &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); - -SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set, - CTLFLAG_RW, &disable_rtc_set, 0, ""); - -SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, - CTLFLAG_RW, &wall_cmos_clock, 0, ""); - /* * Initialize amd64 and configure to run kernel */ ==== //depot/projects/dtrace/src/sys/amd64/include/clock.h#4 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.52 2006/05/19 18:53:50 sobomax Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.53 2006/10/02 12:59:55 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -14,9 +14,7 @@ * i386 to clock driver interface. * XXX large parts of the driver and its interface are misplaced. */ -extern int adjkerntz; extern int clkintr_pending; -extern int disable_rtc_set; extern int pscnt; extern int psdiv; extern int statclock_disable; @@ -24,7 +22,6 @@ extern int timer0_max_count; extern uint64_t tsc_freq; extern int tsc_is_broken; -extern int wall_cmos_clock; extern struct mtx clock_lock; /* ==== //depot/projects/dtrace/src/sys/amd64/isa/clock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.224 2005/12/22 22:16:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); /* * Routines to handle clock hardware. @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -92,9 +93,7 @@ #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) -int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; -int disable_rtc_set; /* disable resettodr() if != 0 */ int pscnt = 1; int psdiv = 1; int statclock_disable; @@ -104,7 +103,6 @@ u_int timer_freq = TIMER_FREQ; int timer0_max_count; int timer0_real_max_count; -int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ struct mtx clock_lock; #define RTC_LOCK mtx_lock_spin(&clock_lock) #define RTC_UNLOCK mtx_unlock_spin(&clock_lock) @@ -664,7 +662,7 @@ /* sec now contains the number of seconds, since Jan 1 1970, in the local time zone */ - sec += tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + sec += utc_offset(); y = time_second - sec; if (y <= -2 || y >= 2) { @@ -702,7 +700,7 @@ /* Calculate local time to put in RTC */ - tm -= tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + tm -= utc_offset(); writertc(RTC_SEC, bin2bcd(tm%60)); tm /= 60; /* Write back Seconds */ writertc(RTC_MIN, bin2bcd(tm%60)); tm /= 60; /* Write back Minutes */ ==== //depot/projects/dtrace/src/sys/amd64/linux32/linux32_machdep.c#6 (text+ko) ==== @@ -29,11 +29,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.17 2006/08/28 13:09:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.18 2006/10/02 12:59:55 phk Exp $"); #include #include #include +#include #include #include #include ==== //depot/projects/dtrace/src/sys/arm/include/clock.h#3 (text+ko) ==== @@ -23,13 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/clock.h,v 1.2 2005/07/27 21:19:28 imp Exp $ + * $FreeBSD: src/sys/arm/include/clock.h,v 1.3 2006/10/02 12:59:55 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ -#define wall_cmos_clock 0 -#define adjkerntz 0 - #endif /* !_MACHINE_CLOCK_H_ */ ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#6 (text+ko) ==== @@ -25,13 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.59 2006/09/22 15:04:28 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.60 2006/10/02 12:59:55 phk Exp $"); #include "opt_compat.h" #include #include #include +#include #include #include #include ==== //depot/projects/dtrace/src/sys/conf/files#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1147 2006/10/01 11:34:54 ariff Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1148 2006/10/02 15:42:01 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1384,7 +1384,7 @@ kern/subr_autoconf.c standard kern/subr_blist.c standard kern/subr_bus.c standard -kern/subr_clock.c optional genclock +kern/subr_clock.c standard kern/subr_devstat.c standard kern/subr_disk.c standard kern/subr_eventhandler.c standard @@ -1404,6 +1404,7 @@ kern/subr_prf.c standard kern/subr_prof.c standard kern/subr_rman.c standard +kern/subr_rtc.c optional genclock kern/subr_sbuf.c standard kern/subr_scanf.c standard kern/subr_sleepqueue.c standard ==== //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#2 (text+ko) ==== @@ -78,10 +78,10 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20061001_0028" +#define HDA_DRV_TEST_REV "20061003_0029" #define HDA_WIDGET_PARSER_REV 1 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.1 2006/10/01 11:12:59 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.3 2006/10/02 16:30:04 ariff Exp $"); #undef HDA_DEBUG_ENABLED #define HDA_DEBUG_ENABLED 1 @@ -102,13 +102,17 @@ } \ } while(0) -#if 0 +#if 1 #undef HDAC_INTR_EXTRA #define HDAC_INTR_EXTRA 1 #endif -#define hdac_lock(sc) snd_mtxlock((sc)->lock) -#define hdac_unlock(sc) snd_mtxunlock((sc)->lock) +#define hdac_lock(sc) snd_mtxlock((sc)->lock) +#define hdac_unlock(sc) snd_mtxunlock((sc)->lock) + +#define HDA_FLAG_MATCH(fl, v) (((fl) & (v)) == (v)) +#define HDA_MATCH_ALL 0xffffffff +#define HDAC_INVALID 0xffffffff #define HDA_MODEL_CONSTRUCT(vendor, model) \ (((uint32_t)(model) << 16) | ((vendor##_VENDORID) & 0xffff)) @@ -156,7 +160,12 @@ #define ACER_VENDORID 0x1025 #define ACER_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(ACER, 0xffff) +/* Asus */ +#define ASUS_VENDORID 0x1043 +#define ASUS_M5200_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0x1993) +#define ASUS_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(ASUS, 0xffff) + /* Misc constants.. */ #define HDA_AMP_MUTE_DEFAULT (0xffffffff) #define HDA_AMP_MUTE_NONE (0) @@ -346,7 +355,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 3 00:38: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 532EB16A417; Tue, 3 Oct 2006 00:38:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F2B016A407 for ; Tue, 3 Oct 2006 00:38:21 +0000 (UTC) (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 DD44843D46 for ; Tue, 3 Oct 2006 00:38:20 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k930cKTO034122 for ; Tue, 3 Oct 2006 00:38:20 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k930cKUS034119 for perforce@freebsd.org; Tue, 3 Oct 2006 00:38:20 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 00:38:20 GMT Message-Id: <200610030038.k930cKUS034119@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 107134 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 00:38:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=107134 Change 107134 by imp@imp_lighthouse on 2006/10/03 00:37:57 Start porting boot2 to iic parts on kwikbyte board too. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#9 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#9 (text+ko) ==== @@ -59,7 +59,11 @@ dabtvec: B dabtvec @; Data Abort rsvdvec: +#ifdef BOOT_IIC + .long 12 << 10 @; 12k from iic part +#else .long ((1056 << 17) | (13 << 13) | (12 * 2)) +#endif irqvec: ldr pc, [pc,#-0xF20] @; IRQ : read the AIC fiqvec: From owner-p4-projects@FreeBSD.ORG Tue Oct 3 04:21:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A47B816A416; Tue, 3 Oct 2006 04:21:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 55D0C16A403 for ; Tue, 3 Oct 2006 04:21:22 +0000 (UTC) (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 E86AE43D45 for ; Tue, 3 Oct 2006 04:21:21 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k934LLe1082714 for ; Tue, 3 Oct 2006 04:21:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k934KKAA082309 for perforce@freebsd.org; Tue, 3 Oct 2006 04:20:20 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 3 Oct 2006 04:20:20 GMT Message-Id: <200610030420.k934KKAA082309@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 107139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 04:21:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=107139 Change 107139 by kmacy@kmacy_storage:sun4v_work_stable on 2006/10/03 04:19:58 IFC Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/MAINTAINERS#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/Makefile#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/Makefile.inc1#4 edit .. //depot/projects/kmacy_sun4v_stable/src/ObsoleteFiles.inc#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/UPDATING#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/cp/cp.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/df/df.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/ls/ls.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/pax/pax.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/ps/ps.1#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/bin/sh/sh.1#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/CHANGES#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/bind9/version#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/com_err/compile_et.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/gcc/cccp.1#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/gcc/cpp.1#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/gcc/doc/cpp.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/gcc/doc/gcc.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/gcc/doc/gcov.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/gcc/gcc.1#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/FREEBSD-upgrade#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/README.dag#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/VERSION#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/configure#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/configure.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/ethertype.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/pcap-dag.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/pcap-stdinc.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/pcap.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libpcap/scanner.l#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/libstdc++/include/ext/demangle.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/ntp/include/ntp_stdlib.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/ntp/include/ntpd.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/FREEBSD-upgrade#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/HISTORY#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/TODO#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/VERSION#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditd/auditd.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/bsm/libbsm.h#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/compat/strlcat.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/config/config.h#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/config/config.h.in#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/configure#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/configure.ac#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/etc/audit_event#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/bsm_control.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/bsm_io.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/bsm_token.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/libbsm/libbsm.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/arg32_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/arg32_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/data_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/data_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/file_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/file_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/header32_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/in_addr_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/in_addr_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/ip_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/ip_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/ipc_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/ipc_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/iport_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/iport_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/opaque_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/opaque_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/path_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/path_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/process32_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/process32_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/process32ex_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/process32ex_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/return32_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/return32_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/seq_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/seq_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/subject32_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/subject32_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/subject32ex_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/subject32ex_token-IPv4#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/subject32ex_token-IPv6#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/text_record#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/text_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/reference/trailer_token#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/test/samples/execve-long-args.trail#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/pnpinfo/pnpinfo.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/ABOUT-NLS#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/AUTHORS#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/COPYING#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/ChangeLog#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/ChangeLog.1#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/FREEBSD-Xlist#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/FREEBSD-upgrade#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/INSTALL#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/NEWS#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/PORTS#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/README#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/README-alpha#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/THANKS#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/TODO#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/doc/fdl.texi#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/doc/freemanuals.texi#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/doc/getdate.texi#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/doc/header.texi#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/doc/tar.texi#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/doc/version.texi#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/addext.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/alloca.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/argmatch.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/argmatch.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/backupfile.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/backupfile.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/basename.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/dirname.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/dirname.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/error.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/error.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/exclude.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/exclude.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/fileblocks.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/fnmatch.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/fnmatch.hin#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/ftruncate.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/full-write.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/full-write.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/getdate.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/getdate.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/getline.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/getline.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/getstr.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/getstr.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/hash.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/hash.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/human.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/human.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/lchown.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/lchown.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/malloc.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/memset.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/mktime.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/modechange.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/modechange.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/msleep.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/prepargs.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/prepargs.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/print-copyr.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/print-copyr.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/quote.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/quote.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/quotearg.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/quotearg.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/readutmp.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/realloc.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/rename.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/rmdir.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/safe-read.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/safe-read.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/save-cwd.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/save-cwd.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/savedir.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/savedir.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/stpcpy.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/strcasecmp.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/strncasecmp.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/strstr.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/strtoimax.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/strtol.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/strtoll.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/strtoul.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/strtoull.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/strtoumax.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/unicodeio.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/unicodeio.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/utime.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/waitpid.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/xalloc.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/xgetcwd.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/xmalloc.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/xstrdup.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/xstrtoimax.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/xstrtol.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/xstrtol.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/xstrtoul.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/lib/xstrtoumax.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/arith.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/buffer.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/common.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/compare.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/create.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/delete.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/extract.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/incremen.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/list.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/mangle.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/misc.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/names.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/rmt.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/rmt.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/rtapelib.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/system.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/tar.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/tar.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tar/src/update.c#2 delete .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/CHANGES#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/CREDITS#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/FILES#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/Makefile.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/VERSION#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/addrtoname.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/configure#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/configure.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/dccp.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/ethertype.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/icmp6.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/interface.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/ipproto.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/ipproto.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/llc.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/ppp.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-ap1394.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-ascii.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-atm.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-chdlc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-cip.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-dccp.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-ether.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-fddi.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-icmp6.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-ip.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-ip6.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-ipx.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-isoclns.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-lane.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-llc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-null.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-ospf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-pim.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-radius.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-sll.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-slow.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-symantec.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/print-token.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tcpdump.1#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tcpdump.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/.cvsignore#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/alltests.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/bgp_vpn_attrset.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/bgp_vpn_attrset.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/eapon1.gdbinit#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/eapon1.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/eapon1.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/eapon1.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/eapon2.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp-secrets.txt#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp0.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp0.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp1.gdbinit#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp1.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp1.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp2.gdbinit#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp2.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp2.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp3.gdbinit#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp3.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp4.gdbinit#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp4.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp5.gdbinit#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp5.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/esp5.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/espudp1.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/espudp1.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/espudp1.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/isakmp-delete-segfault.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/isakmp-identification-segfault.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/isakmp-pointer-loop.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/isakmp1.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/isakmp1.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/isakmp2.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/isakmp2.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/isakmp3.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/isakmp3.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/isakmp4.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/isakmp4.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/isakmp4500.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/lmp.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/lmp.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/lmp.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/mpls-ldp-hello.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/mpls-ldp-hello.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/mpls-ldp-hello.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/ospf-gmpls.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/ospf-gmpls.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/ospf-gmpls.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/print-A.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/print-AA.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/print-X.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/print-XX.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/print-capX.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/print-capXX.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/print-flags.puu#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/print-flags.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/print-x.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/tcpdump/tests/print-xx.out#1 branch .. //depot/projects/kmacy_sun4v_stable/src/contrib/telnet/telnet/telnet.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/contrib/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/CREDITS#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/INSTALL#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/LICENCE#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/Makefile.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/OVERVIEW#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/README#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/README.platform#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/README.tun#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/acss.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/atomicio.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/atomicio.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/audit-bsm.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/audit.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/audit.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth-bsdauth.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth-chall.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth-krb5.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth-options.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth-options.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth-passwd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth-rh-rsa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth-rhosts.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth-rsa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth-shadow.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth-sia.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth-skey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth1.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth2-chall.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth2-gss.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth2-hostbased.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth2-kbdint.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth2-none.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth2-passwd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth2-pubkey.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/auth2.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/authfd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/authfd.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/authfile.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/authfile.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/bufaux.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/bufaux.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/bufbn.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/buffer.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/buffer.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/buildpkg.sh.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/canohost.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/canohost.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/channels.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/channels.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/cipher-3des1.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/cipher-acss.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/cipher-aes.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/cipher-bf1.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/cipher-ctr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/cipher.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/cipher.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/cleanup.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/clientloop.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/clientloop.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/compat.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/compat.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/compress.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/compress.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/config.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/configure.ac#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/crc32.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/crc32.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/deattack.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/deattack.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/defines.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/dh.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/dh.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/dispatch.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/dispatch.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/dns.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/dns.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/entropy.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/fatal.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/getput.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/groupaccess.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/groupaccess.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/gss-genr.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/gss-serv-krb5.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/gss-serv.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/hostfile.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/hostfile.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/includes.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/kex.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/kex.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/kexdh.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/kexdhc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/kexgex.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/kexgexc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/key.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/key.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/log.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/log.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/loginrec.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/loginrec.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/logintest.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/mac.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/mac.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/match.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/match.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/md-sha256.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/md5crypt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/misc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/misc.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/moduli.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/monitor.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/monitor.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/monitor_fdpass.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/monitor_fdpass.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/monitor_mm.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/monitor_wrap.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/monitor_wrap.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/msg.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/msg.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/myproposal.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/nchan.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/Makefile.in#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/basename.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/bindresvport.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/bsd-arc4random.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/bsd-asprintf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/bsd-closefrom.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/bsd-cray.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/bsd-getpeereid.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/bsd-misc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/bsd-nextstep.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/bsd-openpty.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/bsd-snprintf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/bsd-waitpid.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/fake-rfc2553.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/fake-rfc2553.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/glob.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/glob.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/mktemp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/openbsd-compat.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/port-aix.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/port-aix.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/port-irix.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/port-linux.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/port-linux.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/port-solaris.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/port-solaris.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/port-tun.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/port-tun.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/readpassphrase.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/regress/Makefile.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/regress/closefromtest.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/regress/snprintftest.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/regress/strduptest.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/regress/strtonumtest.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/rresvport.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/setproctitle.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/sha2.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/sha2.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/strtonum.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/xcrypt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openbsd-compat/xmmap.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/openssh.xml.in#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/packet.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/packet.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/platform.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/platform.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/progressmeter.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/progressmeter.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/readconf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/readconf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/readpass.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/regress/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/regress/agent-getpeereid.sh#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/regress/cfgmatch.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/regress/cipher-speed.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/regress/forcecommand.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/regress/forwarding.sh#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/rsa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/rsa.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/scard-opensc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/scard.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/scard.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/scp.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/scp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/servconf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/servconf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/serverloop.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/serverloop.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/session.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/session.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sftp-client.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sftp-common.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sftp-common.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sftp-glob.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sftp-server.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sftp-server.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sftp.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sftp.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh-add.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh-agent.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh-agent.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh-dss.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh-gss.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh-keygen.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh-keyscan.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh-keysign.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh-keysign.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh-rand-helper.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh-rsa.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh1.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh2.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh_config#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ssh_namespace.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshconnect.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshconnect.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshconnect1.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshd.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshd_config#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshlogin.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshlogin.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshpty.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshpty.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshtty.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ttymodes.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/ttymodes.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/uidswap.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/uidswap.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/uuencode.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/uuencode.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/version.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/xmalloc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/xmalloc.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/CHANGES#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/Configure#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/FAQ#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/LICENSE#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/Makefile#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/Makefile.org#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/Makefile.shared#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/NEWS#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/README#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/CA.pl#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/dsa.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/enc.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/gendsa.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/genrsa.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/openssl.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/pkcs12.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/progs.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/progs.pl#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/rsa.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/smime.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/apps/speed.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/config#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/aes/Makefile#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/aes/aes.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/aes/aes_core.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/aes/aes_ige.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/aes/asm/aes-586.pl#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/tasn_dec.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/asn1/x_req.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_mont.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/bn/bn_prime.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/camellia/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/camellia/camellia.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/camellia/camellia.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/camellia/cmll_cbc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/camellia/cmll_cfb.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/camellia/cmll_ctr.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/camellia/cmll_ecb.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/camellia/cmll_locl.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/camellia/cmll_misc.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/camellia/cmll_ofb.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dh/dh.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dh/dh_err.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dh/dh_key.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/dsa.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/dsa_err.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/dsa/dsa_ossl.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec_asn1.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/ec/ec_err.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/err/err.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/Makefile#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/c_allc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/e_camellia.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/evp.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/evp_err.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/evp_test.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/evp/evptests.txt#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/obj_dat.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/obj_mac.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/obj_mac.num#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/objects/objects.txt#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/opensslconf.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/opensslv.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs12/p12_mutl.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/pkcs7/pk7_smime.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rand/rand_unix.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_eay.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_err.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/crypto/rsa/rsa_sign.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/ciphers.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/apps/smime.pod#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/doc/standards.txt#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/openssl.spec#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/d1_pkt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s2_clnt.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s2_lib.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/s3_srvr.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_algs.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_cert.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_ciph.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_lib.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/ssl_locl.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/t1_enc.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/ssl/tls1.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/Makefile#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/evptests.txt#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/test/igetest.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/tools/c_rehash#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/util/libeay.num#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/util/mk1mf.pl#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/util/mkdef.pl#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/util/mkfiles.pl#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssl/util/pl/Mingw32.pl#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/Makefile#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/defaults/rc.conf#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/libalias.conf#1 branch .. //depot/projects/kmacy_sun4v_stable/src/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/mtree/BSD.local.dist#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/network.subr#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/pccard_ether#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/Makefile#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/auditd#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/bthidd#1 branch .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/devd#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/mrouted#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/games/fortune/datfiles/startrek#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/lib/libstdc++/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/lib/libstdc++/config.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/binutils/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/binutils/as/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/binutils/ld/Makefile.arm#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/binutils/ld/armelf_fbsd.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh#1 branch .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/binutils/ld/genscripts.sh#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/binutils/libbfd/Makefile.arm#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/binutils/libiberty/config.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/cc/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/cc/Makefile.tgt#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/cc/cc/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/cc/cc_int/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/cc/cc_int/amd64.patch#2 delete .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff#1 branch .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/cc/cc_tools/arm.md.diff#1 branch .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/cc/cpp/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/gdb/arch/arm/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/gdb/arch/arm/config.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/gdb/arch/arm/init.c#1 branch .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/gzip/gzip.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/gzip/inflate.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/gzip/unlzh.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/gzip/unpack.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/tar/Makefile#2 delete .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/tar/config.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/tar/doc/Makefile#2 delete .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/tar/localedir.h#2 delete .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/tar/tar.1#2 delete .. //depot/projects/kmacy_sun4v_stable/src/include/Makefile#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/Makefile#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libalias/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libalias/libalias/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libalias/modules/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libalias/modules/Makefile.inc#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libalias/modules/cuseeme/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libalias/modules/dummy/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libalias/modules/ftp/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libalias/modules/irc/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libalias/modules/nbt/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libalias/modules/pptp/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libalias/modules/skinny/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libalias/modules/smedia/Makefile#1 branch .. //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/archive_read_open_file.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/archive_write.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/tar.5#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libbsm/Makefile#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/err.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/getgrent.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/pwcache.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/vis.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/i386/gen/Makefile.inc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/i386/gen/alloca.S#2 delete .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/i386/sys/i386_set_watch.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/isc/eventlib_p.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/net/gai_strerror.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/net/gethostbyname.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/posix1e/mac_is_present.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/rpc/clnt_bcast.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/rpc/clnt_vc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/rpc/getnetconfig.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/rpc/getnetpath.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/rpc/rpc_clnt_create.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/rpc/rpcb_clnt.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/rpc/rpcb_prot.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/rpc/svc_simple.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/rpc/svc_vc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdio/fclose.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdio/vfprintf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/a64l.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/alloca.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/getopt_long.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/posix_memalign.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/stdlib/strtonum.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/abort2.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/aio_error.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/chflags.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/connect.2#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/getsockopt.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/gettimeofday.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/kldnext.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/kqueue.2#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/listen.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/mmap.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/open.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/recv.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/send.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/sigqueue.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/timer_create.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/timer_delete.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/timer_settime.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/sys/utimes.2#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libdevinfo/devinfo.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libipsec/ipsec_set_policy.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libkvm/kvm.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libncp/ncpl_file.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libncp/ncpl_misc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libncp/ncpl_msg.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libncp/ncpl_nls.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libncp/ncpl_queue.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libncp/ncpl_rpc.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libpam/modules/pam_login_access/login.access.5#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libpam/modules/pam_opie/pam_opie.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libpmc/pmclog.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_atfork.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_barrier.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_cond.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_create.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_event.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_fork.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_getschedparam.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_init.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_kern.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_list.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_mutex.c#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_pspinlock.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_setprio.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_setschedparam.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_sig.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_spinlock.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_umtx.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libthr/thread/thr_umtx.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libutil/humanize_number.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libutil/kld.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libutil/pw_util.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/libexec/rtld-elf/rtld.1#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/libexec/tftpd/tftpd.8#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/Makefile#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/picobsd/bridge/PICOBSD#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/scripts/kernels-install.sh#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/release/scripts/package-split.py#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/camcontrol/camcontrol.8#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/devd/devd.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/devd/devd.cc#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/dhclient/bpf.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/dump/dump.8#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/fdisk_pc98/fdisk.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/fsdb/fsdb.8#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/gbde/gbde.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/concat/geom_concat.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/eli/geli.8#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/eli/geom_eli.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/label/geom_label.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/mirror/geom_mirror.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/nop/geom_nop.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/raid3/geom_raid3.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/shsec/geom_shsec.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/class/stripe/geom_stripe.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/core/geom.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/core/geom.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/geom/misc/subr.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ggate/ggatec/ggatec.8#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/gvinum/gvinum.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ifconfig/af_inet6.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ipf/ipf/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ipf/ipftest/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ipf/ipmon/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ipf/ipnat/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ipf/ippool/Makefile#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ipfw/ipfw.8#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/mca/mca.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/mdmfs/mdmfs.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/mount/mount.8#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/mount_std/mount_std.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/natd/natd.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/sconfig/sconfig.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/setkey/setkey.8#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/sysctl/sysctl.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/Makefile#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/Makefile.inc#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/Makefile.man#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/ASN1_STRING_length.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/ASN1_STRING_new.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/ASN1_generate_nconf.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_ctrl.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_f_base64.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_f_buffer.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_f_cipher.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_f_md.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_f_null.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_f_ssl.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_find_type.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_new.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_push.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_read.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_s_accept.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_s_bio.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_s_connect.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_s_fd.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_s_file.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_s_mem.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_s_null.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_s_socket.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_set_callback.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BIO_should_retry.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_BLINDING_new.3#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_CTX_new.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_CTX_start.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_add.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_add_word.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_bn2bin.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_cmp.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_copy.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_generate_prime.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_mod_inverse.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_new.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_num_bytes.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_rand.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_set_bit.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_swap.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/BN_zero.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/CONF_modules_free.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/CONF_modules_load_file.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DH_generate_key.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DH_generate_parameters.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DH_get_ex_new_index.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DH_new.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DH_set_method.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DH_size.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DSA_SIG_new.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DSA_do_sign.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DSA_dup_DH.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DSA_generate_key.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DSA_generate_parameters.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DSA_new.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DSA_set_method.3#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/secure/lib/libcrypto/man/DSA_sign.3#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 3 05:19:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46D9916A412; Tue, 3 Oct 2006 05:19:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22BBE16A403 for ; Tue, 3 Oct 2006 05:19:37 +0000 (UTC) (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 C5F7E43D49 for ; Tue, 3 Oct 2006 05:19:36 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k935Jaaf000863 for ; Tue, 3 Oct 2006 05:19:36 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k935JaTf000860 for perforce@freebsd.org; Tue, 3 Oct 2006 05:19:36 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 05:19:36 GMT Message-Id: <200610030519.k935JaTf000860@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 107141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 05:19:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=107141 Change 107141 by imp@imp_lighthouse on 2006/10/03 05:19:19 Better panic messages Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#17 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmc.c#17 (text+ko) ==== @@ -128,7 +128,7 @@ sc = device_get_softc(busdev); MMC_LOCK(sc); if (sc->owner) - panic("How did I get here?"); + panic("mmc: host bridge didn't seralize us."); sc->owner = dev; MMC_UNLOCK(sc); return (0); @@ -143,9 +143,9 @@ sc = device_get_softc(busdev); MMC_LOCK(sc); if (!sc->owner) - panic("No owner?"); + panic("mmc: releasing unowned bus."); if (sc->owner != dev) - panic("Wrong owner releasing?"); + panic("mmc: you don't own the bus. game over."); MMC_UNLOCK(sc); err = MMCBR_RELEASE_HOST(device_get_parent(busdev), dev); if (err) From owner-p4-projects@FreeBSD.ORG Tue Oct 3 05: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 A790516A412; Tue, 3 Oct 2006 05:57:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8197716A403 for ; Tue, 3 Oct 2006 05:57:25 +0000 (UTC) (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 5221A43D49 for ; Tue, 3 Oct 2006 05:57:25 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k935vPRR006904 for ; Tue, 3 Oct 2006 05:57:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k935vPQ9006885 for perforce@freebsd.org; Tue, 3 Oct 2006 05:57:25 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 05:57:25 GMT Message-Id: <200610030557.k935vPQ9006885@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 107142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 05:57:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=107142 Change 107142 by imp@imp_lighthouse on 2006/10/03 05:56:59 Add MMC_DATA_MULTI Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#12 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#12 (text+ko) ==== @@ -124,11 +124,13 @@ struct mmc_data { size_t len; /* size of the data */ + size_t xfer_len; void *data; /* data buffer */ uint32_t flags; -#define MMC_DATA_WRITE (1UL << 8) -#define MMC_DATA_READ (1UL << 9) -#define MMC_DATA_STREAM (1UL << 10) +#define MMC_DATA_WRITE (1UL << 0) +#define MMC_DATA_READ (1UL << 1) +#define MMC_DATA_STREAM (1UL << 2) +#define MMC_DATA_MULTI (1UL << 3) struct mmc_request *mrq; }; From owner-p4-projects@FreeBSD.ORG Tue Oct 3 05:57: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 2A67316A558; Tue, 3 Oct 2006 05:57:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0868516A556 for ; Tue, 3 Oct 2006 05:57:26 +0000 (UTC) (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 BD51B43D49 for ; Tue, 3 Oct 2006 05:57:25 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k935vPBS006915 for ; Tue, 3 Oct 2006 05:57:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k935vP68006911 for perforce@freebsd.org; Tue, 3 Oct 2006 05:57:25 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 05:57:25 GMT Message-Id: <200610030557.k935vP68006911@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 107143 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 05:57:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=107143 Change 107143 by imp@imp_lighthouse on 2006/10/03 05:57:12 teak bit dfn. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#16 edit .. //depot/projects/arm/src/sys/arm/at91/at91_mcireg.h#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#16 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -71,6 +72,7 @@ struct mtx sc_mtx; bus_dma_tag_t dmatag; bus_dmamap_t map; + int mapped; struct mmc_host host; int wire4; int bus_busy; @@ -257,7 +259,6 @@ return; } -#if 0 static void at91_mci_getaddr(void *arg, bus_dma_segment_t *segs, int nsegs, int error) { @@ -265,7 +266,6 @@ return; *(bus_addr_t *)arg = segs[0].ds_addr; } -#endif static int at91_mci_update_ios(device_t brdev, device_t reqdev) @@ -309,10 +309,15 @@ static void at91_mci_start_cmd(struct at91_mci_softc *sc, struct mmc_command *cmd) { - uint32_t cmdr; + uint32_t cmdr, ier = 0, mr; + struct mmc_data *data; + struct mmc_request *req; + size_t block_size = 1 << 9; // Fixed, per mmc/sd spec for 2GB cards sc->curcmd = cmd; + data = cmd->data; cmdr = cmd->opcode; + req = cmd->mrq; if (MMC_RSP(cmd->flags) == MMC_RSP_NONE) cmdr |= MCI_CMDR_RSPTYP_NO; else { @@ -323,24 +328,21 @@ else cmdr |= MCI_CMDR_RSPTYP_48; } -#if 0 - if (cmd->data) { - if (cmd->data->flags & MMC_DATA_READ) + if (data) { + if (data->flags & MMC_DATA_READ) cmdr |= MCI_CMDR_TRDIR; - if (cmd->data->flags & (MMC_DATA_READ | MMC_DATA_WRITE)) + if (data->flags & (MMC_DATA_READ | MMC_DATA_WRITE)) cmdr |= MCI_CMDR_TRCMD_START; - if (cmd->data->flags & MMC_DATA_STREAM) + if (data->flags & MMC_DATA_STREAM) cmdr |= MCI_CMDR_TRTYP_STREAM; - if (cmd->data->flags & MMC_DATA_MULTI) + if (data->flags & MMC_DATA_MULTI) cmdr |= MCI_CMDR_TRTYP_MULTIPLE; - // XXX bad } -#endif if (cmd->opcode == MMC_STOP_TRANSMISSION) cmdr |= MCI_CMDR_TRCMD_STOP; if (sc->host.ios.bus_mode == opendrain) cmdr |= MCI_CMDR_OPDCMD; - if (!cmd->data) { + if (!data) { at91_mci_pdc_disable(sc); printf("CMDR %x ARGR %x\n", cmdr, cmd->arg); WR4(sc, MCI_ARGR, cmd->arg); @@ -348,7 +350,43 @@ WR4(sc, MCI_IER, MCI_SR_ERROR | MCI_SR_CMDRDY); return; } - panic("WRITE THE DATA HANDLER"); + // Set block size and turn on PDC mode for dma xfer and disable + // PDC until we're ready. + mr = RD4(sc, MCI_MR) & ~MCI_MR_BLKLEN; + WR4(sc, MCI_MR, mr | (block_size << 16) | MCI_MR_PDCMODE); + WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS | PDC_PTCR_TXTDIS); + if (cmdr & MCI_CMDR_TRCMD_START) { + data->xfer_len = 0; + if (cmdr & MCI_CMDR_TRDIR) { + void *vaddr = cmd->data->data; + bus_addr_t paddr; + + if (bus_dmamap_load(sc->dmatag, sc->map, vaddr, + block_size, at91_mci_getaddr, &paddr, 0) != 0) { + if (req->cmd->flags & STOP_STARTED) + req->stop->error = EAGAIN; + else + req->cmd->error = EAGAIN; + req->done(req); + return; + } + sc->mapped++; + bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_PREREAD); + WR4(sc, PDC_RPR, paddr); + WR4(sc, PDC_RCR, data->len / 4); + ier = MCI_SR_ENDRX; + } else + panic("Write write support"); + } + WR4(sc, MCI_ARGR, cmd->arg); + WR4(sc, MCI_CMDR, cmdr); + if (cmdr & MCI_CMDR_TRCMD_START) { + if (cmdr & MCI_CMDR_TRDIR) + WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); + else + WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); + } + WR4(sc, MCI_IER, MCI_SR_ERROR | ier); } static void @@ -426,6 +464,21 @@ return (0); } +static void +at91_mci_read_done(struct at91_mci_softc *sc) +{ + uint32_t *walker; + struct mmc_command *cmd; + int i, len; + + cmd = sc->curcmd; + bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(sc->dmatag, sc->map); + walker = (uint32_t *)cmd->data->data; + len = cmd->data->len / 4; + for (i = 0; i < len; i++) + *walker = bswap32(*walker); +} static void at91_mci_intr(void *arg) @@ -467,7 +520,7 @@ } if (sr & MCI_SR_ENDRX) { printf("ENDRX\n"); -//XXX at91_mci_read_done(sc); + at91_mci_read_done(sc); } if (sr & MCI_SR_NOTBUSY) { printf("NOTBUSY\n"); ==== //depot/projects/arm/src/sys/arm/at91/at91_mcireg.h#6 (text+ko) ==== @@ -55,7 +55,7 @@ #define MCI_MR_PWSDIV (0x3fu << 8) /* (MCI) Power Saving Divider */ #define MCI_MR_PDCPADV (0x1u << 14) /* (MCI) PDC Padding Value */ #define MCI_MR_PDCMODE (0x1u << 15) /* (MCI) PDC Oriented Mode */ -#define MCI_MR_BLKLEN (0x1u << 18) /* (MCI) Data Block Length */ +#define MCI_MR_BLKLEN 0x3fff0000ul /* (MCI) Data Block Length */ /* -------- MCI_DTOR : (MCI Offset: 0x8) MCI Data Timeout Register -------- */ #define MCI_DTOR_DTOCYC (0xfu << 0) /* (MCI) Data Timeout Cycle Number */ #define MCI_DTOR_DTOMUL (0x7u << 4) /* (MCI) Data Timeout Multiplier */ From owner-p4-projects@FreeBSD.ORG Tue Oct 3 06:17: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 90AB616A412; Tue, 3 Oct 2006 06:17:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5365416A407 for ; Tue, 3 Oct 2006 06:17:54 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20DB043D46 for ; Tue, 3 Oct 2006 06:17:54 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k936HsQ8011108 for ; Tue, 3 Oct 2006 06:17:54 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k936HrKt011105 for perforce@freebsd.org; Tue, 3 Oct 2006 06:17:53 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 3 Oct 2006 06:17:53 GMT Message-Id: <200610030617.k936HrKt011105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107144 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 06:17:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=107144 Change 107144 by rdivacky@rdivacky_witten on 2006/10/03 06:17:44 Implement CLONE_FS - untested. Affected files ... .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#5 (text+ko) ==== @@ -375,7 +375,13 @@ ff |= RFMEM; if (args->flags & CLONE_SIGHAND) ff |= RFSIGSHARE; - if (!(args->flags & CLONE_FILES)) + /* + * XXX: in linux sharing of fs info (chroot/cwd/umask) + * and open files is independant. in fbsd its in one + * structure but in reality it doesnt make any problems + * because both this flags are set at once usually. + */ + if (!(args->flags & (CLONE_FILES | CLONE_FS))) ff |= RFFDG; /* From owner-p4-projects@FreeBSD.ORG Tue Oct 3 07:50: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 2470F16A416; Tue, 3 Oct 2006 07:50:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F32FC16A412 for ; Tue, 3 Oct 2006 07:50:17 +0000 (UTC) (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 6EBCE43D4C for ; Tue, 3 Oct 2006 07:50: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.6/8.13.6) with ESMTP id k937oHKZ025942 for ; Tue, 3 Oct 2006 07:50:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k937oHDa025937 for perforce@freebsd.org; Tue, 3 Oct 2006 07:50:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 07:50:17 GMT Message-Id: <200610030750.k937oHDa025937@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 107146 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 07:50:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=107146 Change 107146 by rwatson@rwatson_peppercorn on 2006/10/03 07:50:08 Update alpha for priv(9), as alpha does not exist in 7-CURRENT. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/alpha/alpha/promcons.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/alpha/alpha/sys_machdep.c#2 edit .. //depot/projects/trustedbsd/priv6/src/sys/alpha/osf1/osf1_misc.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/alpha/alpha/promcons.c#2 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -111,7 +112,8 @@ ttsetwater(tp); setuptimeout = 1; - } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { + } else if ((tp->t_state & TS_XCLUDE) && + priv_check(td, PRIV_TTY_EXCLUSIVE)) { splx(s); return EBUSY; } ==== //depot/projects/trustedbsd/priv6/src/sys/alpha/alpha/sys_machdep.c#2 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -124,7 +125,7 @@ if (error) return (error); - error = suser(td); + error = priv_check(td, PRIV_IO); if (error) return (error); ==== //depot/projects/trustedbsd/priv6/src/sys/alpha/osf1/osf1_misc.c#2 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -902,12 +903,15 @@ PROC_LOCK(p); oldcred = p->p_ucred; - if ((error = suser_cred(p->p_ucred, SUSER_ALLOWJAIL)) != 0 && - uid != oldcred->cr_ruid && uid != oldcred->cr_svuid) { - PROC_UNLOCK(p); - uifree(uip); - crfree(newcred); - return (error); + if (uid != oldcred->cr_ruid && uid != oldcred->cr_svuid) { + error = priv_check_cred(p->p_ucred, PRIV_SETUID, + SUSER_ALLOWJAIL); + if (error) { + PROC_UNLOCK(p); + uifree(uip); + crfree(newcred); + return (error); + } } crcopy(newcred, oldcred); @@ -956,11 +960,14 @@ PROC_LOCK(p); oldcred = p->p_ucred; - if (((error = suser_cred(p->p_ucred, SUSER_ALLOWJAIL)) != 0 ) && - gid != oldcred->cr_rgid && gid != oldcred->cr_svgid) { - PROC_UNLOCK(p); - crfree(newcred); - return (error); + if (gid != oldcred->cr_rgid && gid != oldcred->cr_svgid) { + error = priv_check_cred(p->p_ucred, PRIV_SETGID, + SUSER_ALLOWJAIL); + if (error) { + PROC_UNLOCK(p); + crfree(newcred); + return (error); + } } crcopy(newcred, oldcred); From owner-p4-projects@FreeBSD.ORG Tue Oct 3 07:51: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 5529D16A412; Tue, 3 Oct 2006 07:51:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0ABD516A407 for ; Tue, 3 Oct 2006 07:51:20 +0000 (UTC) (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 B56C643D49 for ; Tue, 3 Oct 2006 07:51: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.6/8.13.6) with ESMTP id k937pJrJ026343 for ; Tue, 3 Oct 2006 07:51:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k937pJ6G026339 for perforce@freebsd.org; Tue, 3 Oct 2006 07:51:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 07:51:19 GMT Message-Id: <200610030751.k937pJ6G026339@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 107147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 07:51:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=107147 Change 107147 by rwatson@rwatson_peppercorn on 2006/10/03 07:51:02 One more instance of alpha update for priv(9). Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/alpha/tlsb/zs_tlsb.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/alpha/tlsb/zs_tlsb.c#2 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -286,7 +287,8 @@ ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; - } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { + } else if ((tp->t_state & TS_XCLUDE) && + priv_check(td, PRIV_TTY_EXCLUSIVE)) { splx(s); return EBUSY; } From owner-p4-projects@FreeBSD.ORG Tue Oct 3 08:29:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6136916A416; Tue, 3 Oct 2006 08:29:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 15F4116A40F for ; Tue, 3 Oct 2006 08:29:10 +0000 (UTC) (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 AE2A443D5A for ; Tue, 3 Oct 2006 08:29: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.6/8.13.6) with ESMTP id k938T9q3033178 for ; Tue, 3 Oct 2006 08:29:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k938T9TZ033175 for perforce@freebsd.org; Tue, 3 Oct 2006 08:29:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 08:29:09 GMT Message-Id: <200610030829.k938T9TZ033175@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 107148 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 08:29:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=107148 Change 107148 by rwatson@rwatson_peppercorn on 2006/10/03 08:28:53 Make non-compiling and uncompilable code priv(9) compatible. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/compat/svr4/svr4_stat.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/compat/svr4/svr4_stat.c#2 (text+ko) ==== @@ -470,14 +470,10 @@ break; #if defined(WHY_DOES_AN_EMULATOR_WANT_TO_SET_HOSTNAMES) case SVR4_SI_SET_HOSTNAME: - if ((error = suser(td)) != 0) - return error; name = KERN_HOSTNAME; return kern_sysctl(&name, 1, 0, 0, uap->buf, rlen, td); case SVR4_SI_SET_SRPC_DOMAIN: - if ((error = suser(td)) != 0) - return error; name = KERN_NISDOMAINNAME; return kern_sysctl(&name, 1, 0, 0, uap->buf, rlen, td); #else From owner-p4-projects@FreeBSD.ORG Tue Oct 3 08:30: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 39C4B16A494; Tue, 3 Oct 2006 08:30:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 106E616A47C for ; Tue, 3 Oct 2006 08:30:11 +0000 (UTC) (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 AB8B243D55 for ; Tue, 3 Oct 2006 08:30: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.6/8.13.6) with ESMTP id k938UBXS033334 for ; Tue, 3 Oct 2006 08:30:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k938UBsi033331 for perforce@freebsd.org; Tue, 3 Oct 2006 08:30:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 08:30:11 GMT Message-Id: <200610030830.k938UBsi033331@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 107149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 08:30:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=107149 Change 107149 by rwatson@rwatson_peppercorn on 2006/10/03 08:29:45 Not very correct version ifdef'ing for priv(9) in 6.x. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/dev/ce/if_ce.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/dev/ce/if_ce.c#3 (text) ==== @@ -1342,7 +1342,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1383,7 +1383,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1413,7 +1413,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1433,7 +1433,7 @@ CE_DEBUG2 (d, ("ioctl: setcfg\n")); #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1535,7 +1535,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1571,7 +1571,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1599,7 +1599,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1623,7 +1623,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1651,7 +1651,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1677,7 +1677,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1707,7 +1707,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1731,7 +1731,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1759,7 +1759,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1785,7 +1785,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1813,7 +1813,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1841,7 +1841,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1869,7 +1869,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1902,7 +1902,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1929,7 +1929,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1948,7 +1948,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1986,7 +1986,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); From owner-p4-projects@FreeBSD.ORG Tue Oct 3 08:34: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 E84E516A407; Tue, 3 Oct 2006 08:34:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0A6C16A412 for ; Tue, 3 Oct 2006 08:34:17 +0000 (UTC) (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 892F643D46 for ; Tue, 3 Oct 2006 08:34: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.6/8.13.6) with ESMTP id k938YHZR034463 for ; Tue, 3 Oct 2006 08:34:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k938YH1n034457 for perforce@freebsd.org; Tue, 3 Oct 2006 08:34:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 08:34:17 GMT Message-Id: <200610030834.k938YH1n034457@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 107150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 08:34:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=107150 Change 107150 by rwatson@rwatson_peppercorn on 2006/10/03 08:33:17 Replace additional suser(9) references with priv(9) references. Affected files ... .. //depot/projects/trustedbsd/priv/sys/dev/cnw/if_cnw.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/dev/cnw/if_cnw.c#2 (text+ko) ==== @@ -125,6 +125,7 @@ #include #include #include +#include #include #include @@ -1339,7 +1340,7 @@ #if !defined(__FreeBSD__) error = suser(p->p_ucred, &p->p_acflag); #else - error = suser(td); + error = priv_check(td, PRIV_DRIVER); #endif if (error) break; @@ -1350,7 +1351,7 @@ #if !defined(__FreeBSD__) error = suser(p->p_ucred, &p->p_acflag); #else - error = suser(td); + error = priv_check(td, PRIV_DRIVER); #endif if (error) break; @@ -1361,7 +1362,7 @@ #if !defined(__FreeBSD__) error = suser(p->p_ucred, &p->p_acflag); #else - error = suser(td); + error = priv_check(td, PRIV_DRIVER); #endif if (error) break; From owner-p4-projects@FreeBSD.ORG Tue Oct 3 11:20: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 0AB8F16A416; Tue, 3 Oct 2006 11:20:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D914216A403 for ; Tue, 3 Oct 2006 11:20:53 +0000 (UTC) (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 732D543D4C for ; Tue, 3 Oct 2006 11:20: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.6/8.13.6) with ESMTP id k93BKreZ071442 for ; Tue, 3 Oct 2006 11:20:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93BKp3Y071439 for perforce@freebsd.org; Tue, 3 Oct 2006 11:20:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 11:20:51 GMT Message-Id: <200610031120.k93BKp3Y071439@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 107157 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 11:20:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=107157 Change 107157 by rwatson@rwatson_peppercorn on 2006/10/03 11:19:50 Replace some new suser(9) references with priv(9) references in if_cnw. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/dev/cnw/if_cnw.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/dev/cnw/if_cnw.c#2 (text+ko) ==== @@ -125,6 +125,7 @@ #include #include #include +#include #include #include @@ -1340,7 +1341,7 @@ #if !defined(__FreeBSD__) error = suser(p->p_ucred, &p->p_acflag); #else - error = suser(td); + error = priv_check(td, PRIV_DRIVER); #endif if (error) break; @@ -1351,7 +1352,7 @@ #if !defined(__FreeBSD__) error = suser(p->p_ucred, &p->p_acflag); #else - error = suser(td); + error = priv_check(td, PRIV_DRIVER); #endif if (error) break; @@ -1362,7 +1363,7 @@ #if !defined(__FreeBSD__) error = suser(p->p_ucred, &p->p_acflag); #else - error = suser(td); + error = priv_check(td, PRIV_DRIVER); #endif if (error) break; From owner-p4-projects@FreeBSD.ORG Tue Oct 3 11:22: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 76E6C16A412; Tue, 3 Oct 2006 11:22:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36A9116A403 for ; Tue, 3 Oct 2006 11:22:57 +0000 (UTC) (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 D474543D46 for ; Tue, 3 Oct 2006 11:22: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.6/8.13.6) with ESMTP id k93BMubj072308 for ; Tue, 3 Oct 2006 11:22:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93BMu9u072302 for perforce@freebsd.org; Tue, 3 Oct 2006 11:22:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 11:22:56 GMT Message-Id: <200610031122.k93BMu9u072302@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 107158 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 11:22:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=107158 Change 107158 by rwatson@rwatson_peppercorn on 2006/10/03 11:21:57 Approximately update priv6 altq for priv(9). Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_cbq.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_cdnr.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_hfsc.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_priq.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_red.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_rio.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_cbq.c#3 (text+ko) ==== @@ -1062,7 +1062,7 @@ /* currently only command that an ordinary user can call */ break; default: -#if (__FreeBSD_version > 700000) +#if (__FreeBSD_version > 600000) error = priv_check(p, PRIV_ALTQ_MANAGE); #elsif (__FreeBSD_version > 400000) error = suser(p); ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_cdnr.c#3 (text+ko) ==== @@ -1262,7 +1262,7 @@ case CDNR_GETSTATS: break; default: -#if (__FreeBSD_versoin > 700000) +#if (__FreeBSD_versoin > 600000) if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) #elsif (__FreeBSD_version > 400000) if ((error = suser(p)) != 0) ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_hfsc.c#3 (text+ko) ==== @@ -1975,7 +1975,7 @@ case HFSC_GETSTATS: break; default: -#if (__FreeBSD_version > 700000) +#if (__FreeBSD_version > 600000) if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) return (error); #elsif (__FreeBSD_version > 400000) ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_priq.c#3 (text+ko) ==== @@ -772,7 +772,7 @@ case PRIQ_GETSTATS: break; default: -#if (__FreeBSD_version > 700000) +#if (__FreeBSD_version > 600000) if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) return (error); #elsif (__FreeBSD_version > 400000) ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_red.c#3 (text+ko) ==== @@ -781,7 +781,7 @@ case RED_GETSTATS: break; default: -#if (__FreeBSD_version > 700000) +#if (__FreeBSD_version > 600000) if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) #elsif (__FreeBSD_version > 400000) if ((error = suser(p)) != 0) ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_rio.c#3 (text+ko) ==== @@ -531,7 +531,7 @@ case RIO_GETSTATS: break; default: -#if (__FreeBSD_versoin > 700000) +#if (__FreeBSD_versoin > 600000) if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) return (error); #elsif (__FreeBSD_version > 400000) From owner-p4-projects@FreeBSD.ORG Tue Oct 3 11:23: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 3FB7316A40F; Tue, 3 Oct 2006 11:23:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 13E2816A403 for ; Tue, 3 Oct 2006 11:23:59 +0000 (UTC) (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 D1DB243D46 for ; Tue, 3 Oct 2006 11:23:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93BNwJu072550 for ; Tue, 3 Oct 2006 11:23:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93BNwrJ072547 for perforce@freebsd.org; Tue, 3 Oct 2006 11:23:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 11:23:58 GMT Message-Id: <200610031123.k93BNwrJ072547@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 107159 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 11:23:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=107159 Change 107159 by rwatson@rwatson_peppercorn on 2006/10/03 11:23:49 Update for priv(9) difference in RELENG_6, annotate oddness. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -198,8 +199,12 @@ { int error; + /* + * XXXRW: Why is this required? We should only get here if privilege + * was granted for the sysctl call. + */ if (enable) { - error = suser(curthread); + error = priv_check(curthread, PRIV_DRIVER); if (error == 0) { error = alq_open(&ath_hal_alq, ath_hal_logfile, curthread->td_ucred, ALQ_DEFAULT_CMODE, From owner-p4-projects@FreeBSD.ORG Tue Oct 3 11:25: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 C01A916A492; Tue, 3 Oct 2006 11:25:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD3CF16A403 for ; Tue, 3 Oct 2006 11:25:14 +0000 (UTC) (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 B482F43D53 for ; Tue, 3 Oct 2006 11:25:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93BP0Gu072784 for ; Tue, 3 Oct 2006 11:25:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93BP0ka072781 for perforce@freebsd.org; Tue, 3 Oct 2006 11:25:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 11:25:00 GMT Message-Id: <200610031125.k93BP0ka072781@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 107160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 11:25:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=107160 Change 107160 by rwatson@rwatson_peppercorn on 2006/10/03 11:24:55 Sort of update for priv(9). Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/dev/drm/drmP.h#3 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/dev/drm/drmP.h#3 (text+ko) ==== @@ -236,7 +236,7 @@ #define PAGE_ALIGN(addr) round_page(addr) /* DRM_SUSER returns true if the user is superuser */ -#if __FreeBSD_version >= 700000 +#if __FreeBSD_version >= 600000 #define DRM_SUSER(p) (priv_check(p, PRIV_DRIVER) == 0) #else #define DRM_SUSER(p) (suser(p) == 0) From owner-p4-projects@FreeBSD.ORG Tue Oct 3 11:27:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95A8A16A540; Tue, 3 Oct 2006 11:27:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2374716A51A for ; Tue, 3 Oct 2006 11:27:04 +0000 (UTC) (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 CD2F343D58 for ; Tue, 3 Oct 2006 11:27:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93BR30x072962 for ; Tue, 3 Oct 2006 11:27:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93BR3vG072947 for perforce@freebsd.org; Tue, 3 Oct 2006 11:27:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 11:27:03 GMT Message-Id: <200610031127.k93BR3vG072947@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 107161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 11:27:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=107161 Change 107161 by rwatson@rwatson_peppercorn on 2006/10/03 11:26:05 Update for 6.x-only suser() use. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/dev/ipw/if_ipw.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/dev/ipw/if_ipw.c#2 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -1579,7 +1580,7 @@ case SIOCSLOADFW: /* only super-user can do that! */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_DRIVER)) != 0) break; ifr = (struct ifreq *)data; @@ -1588,7 +1589,7 @@ case SIOCSKILLFW: /* only super-user can do that! */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_DRIVER)) != 0) break; ifp->if_flags &= ~IFF_UP; From owner-p4-projects@FreeBSD.ORG Tue Oct 3 11:29: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 AD14716A47C; Tue, 3 Oct 2006 11:29:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8291C16A403 for ; Tue, 3 Oct 2006 11:29:07 +0000 (UTC) (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 3F62F43D4C for ; Tue, 3 Oct 2006 11:29: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.6/8.13.6) with ESMTP id k93BT7RJ073050 for ; Tue, 3 Oct 2006 11:29:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93BT6JW073047 for perforce@freebsd.org; Tue, 3 Oct 2006 11:29:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 11:29:06 GMT Message-Id: <200610031129.k93BT6JW073047@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 107162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 11:29:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=107162 Change 107162 by rwatson@rwatson_peppercorn on 2006/10/03 11:28:24 Replicate if_wi changes into 6.x if_owi for priv(9). Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/dev/owi/if_owi.c#2 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/dev/owi/if_owi.c#2 (text+ko) ==== @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include @@ -1397,7 +1398,8 @@ break; } /* Don't show WEP keys to non-root users. */ - if (wreq.wi_type == WI_RID_DEFLT_CRYPT_KEYS && suser(td)) + if (wreq.wi_type == WI_RID_DEFLT_CRYPT_KEYS && + priv_check(td, PRIV_NET80211_GETKEY)) break; if (wreq.wi_type == WI_RID_IFACE_STATS) { bcopy((char *)&sc->wi_stats, (char *)&wreq.wi_val, @@ -1409,7 +1411,7 @@ } #ifdef WICACHE else if (wreq.wi_type == WI_RID_ZERO_CACHE) { - error = suser(td); + error = priv_check(td, PRIV_DRIVER); if (error) break; sc->wi_sigitems = sc->wi_nextitem = 0; @@ -1447,7 +1449,7 @@ error = copyout(&wreq, ifr->ifr_data, sizeof(wreq)); break; case SIOCSWAVELAN: - if ((error = suser(td))) + if ((error = priv_check(td, PRIV_DRIVER))) goto out; error = copyin(ifr->ifr_data, &wreq, sizeof(wreq)); if (error) @@ -1522,7 +1524,7 @@ break; } len = sc->wi_keys.wi_keys[ireq->i_val].wi_keylen; - if (suser(td)) + if (priv_check(td, PRIV_NET80211_GETKEY)) bcopy(sc->wi_keys.wi_keys[ireq->i_val].wi_keydat, tmpkey, len); else @@ -1575,7 +1577,7 @@ } break; case SIOCS80211: - if ((error = suser(td))) + if ((error = priv_check(td, PRIV_NET80211_MANAGE))) goto out; switch(ireq->i_type) { case IEEE80211_IOC_SSID: From owner-p4-projects@FreeBSD.ORG Tue Oct 3 12:17: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 658C416A416; Tue, 3 Oct 2006 12:17:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1741216A40F for ; Tue, 3 Oct 2006 12:17:08 +0000 (UTC) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9BB743D68 for ; Tue, 3 Oct 2006 12:17:07 +0000 (GMT) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93CH7mX081950 for ; Tue, 3 Oct 2006 12:17:07 GMT (envelope-from ru@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93CH7en081947 for perforce@freebsd.org; Tue, 3 Oct 2006 12:17:07 GMT (envelope-from ru@freebsd.org) Date: Tue, 3 Oct 2006 12:17:07 GMT Message-Id: <200610031217.k93CH7en081947@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ru@freebsd.org using -f From: Ruslan Ermilov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 12:17:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=107163 Change 107163 by ru@ru_edoofus on 2006/10/03 12:16:37 - Stylize usage(). - Document -p. - Misc. markup fixes. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#4 (text+ko) ==== @@ -23,18 +23,19 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#3 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.8#4 $ .\" -.Dd March 27, 2006 +.Dd October 3, 2006 .Dt AUDITFILTERD 8 .Os .Sh NAME .Nm auditfilterd .Nd audit filter daemon .Sh SYNOPSIS -.Nm auditfilterd +.Nm .Op Fl d .Op Fl c Ar conffile +.Op Fl p Ar pipefile .Op Fl t Ar trailfile .Sh DESCRIPTION The @@ -44,18 +45,23 @@ It is configured using the .Xr audit_filter 5 configuration file. +The source can either be a pipe or a file. .Pp The options are as follows: -.Bl -tag -width Ds -.It Fl d -Starts the daemon in debug mode - it will not daemonize. +.Bl -tag -width indent .It Fl c Ar conffile Specify an alternative configuration file. +.It Fl d +Starts the daemon in debug mode \[em] it will not daemonize. +.It Fl p Ar pipefile +Specify a pipe as an alternative source of audit event records. +Default is +.Pa /dev/auditpipe . .It Fl t Ar trailfile -Specify an alternative source of audit event records. +Specify a file as an alternative source of audit event records. .El .Sh FILES -.Bl -tag -width "/etc/security/audit_filterd" -compact +.Bl -tag -width ".Pa /etc/security/audit_filterd" -compact .It Pa /etc/security/audit_filterd Default configuration file for .Nm . @@ -74,4 +80,5 @@ .Sh AUTHORS The .Nm -daemon and audit filter APIs were created by Robert Watson. +daemon and audit filter APIs were created by +.An Robert Watson . ==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#11 $ */ /* @@ -80,7 +80,7 @@ usage(void) { - fprintf(stderr, "auditfilterd [-c conffile] [-d] [-p pipefile]" + fprintf(stderr, "auditfilterd [-d] [-c conffile] [-p pipefile]" " [-t trailfile]\n"); fprintf(stderr, " -c Specify configuration file (default: %s)\n", AUDITFILTERD_CONFFILE); From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:03: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 2CEB216A415; Tue, 3 Oct 2006 14:03:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BED6016A40F for ; Tue, 3 Oct 2006 14:03:22 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89F4643D49 for ; Tue, 3 Oct 2006 14:03:22 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93E3MSj010602 for ; Tue, 3 Oct 2006 14:03:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93E3MM9010599 for perforce@freebsd.org; Tue, 3 Oct 2006 14:03:22 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:03:22 GMT Message-Id: <200610031403.k93E3MM9010599@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107164 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:03:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=107164 Change 107164 by millert@millert_macbook on 2006/10/03 14:02:21 Add ACCESS_MODE_TO_VNODE_MASK macro to convert {R,W,X}_OK values to V{READ,WRITE,EXEC} and use it instead of the bare shift. Do this in mac_vnode_check_access() instead of access1() to reduce vendor diffs. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#8 (text+ko) ==== @@ -2548,8 +2548,7 @@ } #ifdef MAC - /* the shift converts {R,W,X}_OK values to V{READ,WRITE,EXEC} */ - error = mac_vnode_check_access(vfs_context_ucred(ctx), vp, uflags << 6); + error = mac_vnode_check_access(vfs_context_ucred(ctx), vp, uflags); if (error) return (error); #endif /* MAC */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#5 (text+ko) ==== @@ -48,6 +48,8 @@ #include +/* convert {R,W,X}_OK values to V{READ,WRITE,EXEC} */ +#define ACCESS_MODE_TO_VNODE_MASK(m) (m << 6) static struct label * mac_devfsdirent_alloc_label(void) @@ -355,14 +357,16 @@ int mac_vnode_check_access(struct ucred *cred, struct vnode *vp, int acc_mode) { - int error; + int error, mask; ASSERT_VOP_LOCKED(vp, "mac_vnode_check_access"); if (!mac_enforce_fs) return (0); - MAC_CHECK(vnode_check_access, cred, vp, vp->v_label, acc_mode); + /* Convert {R,W,X}_OK values to V{READ,WRITE,EXEC} for entry points */ + mask = ACCESS_MODE_TO_VNODE_MASK(acc_mode); + MAC_CHECK(vnode_check_access, cred, vp, vp->v_label, mask); return (error); } From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:03: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 A911B16A55D; Tue, 3 Oct 2006 14:03:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E85416A536 for ; Tue, 3 Oct 2006 14:03:23 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDF4243D53 for ; Tue, 3 Oct 2006 14:03:22 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93E3MGD010610 for ; Tue, 3 Oct 2006 14:03:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93E3MwL010605 for perforce@freebsd.org; Tue, 3 Oct 2006 14:03:22 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:03:22 GMT Message-Id: <200610031403.k93E3MwL010605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107165 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:03:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=107165 Change 107165 by millert@millert_macbook on 2006/10/03 14:03:08 Add missing tasklabel_lock/unlock pair around call to mac_port_check_setlabel(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/mach_port.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/mach_port.c#3 (text+ko) ==== @@ -1898,6 +1898,7 @@ ipc_entry_t entry; kern_return_t kr; struct label inl; + ipc_port_t port; int rc; if (space == IS_NULL || space->is_task == NULL) @@ -1915,17 +1916,18 @@ if (kr != KERN_SUCCESS) return kr; - if (IOT_PORT != io_otype(entry->ie_object)) { + if (io_otype(entry->ie_object) != IOT_PORT) { is_write_unlock(space); return KERN_INVALID_RIGHT; } - ipc_port_t port = (ipc_port_t) entry->ie_object; + port = (ipc_port_t) entry->ie_object; + ip_lock(port); - ip_lock (port); - + tasklabel_lock(space->is_task); rc = mac_port_check_setlabel(&space->is_task->maclabel, &port->ip_label, &inl); + tasklabel_unlock(space->is_task); if (rc) kr = KERN_NO_ACCESS; else From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:04: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 ADDCF16A417; Tue, 3 Oct 2006 14:04:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86DAF16A415 for ; Tue, 3 Oct 2006 14:04:28 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0BCE43D5C for ; Tue, 3 Oct 2006 14:04:24 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93E4O4d010957 for ; Tue, 3 Oct 2006 14:04:24 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93E4O1D010952 for perforce@freebsd.org; Tue, 3 Oct 2006 14:04:24 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:04:24 GMT Message-Id: <200610031404.k93E4O1D010952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107166 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:04:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=107166 Change 107166 by millert@millert_macbook on 2006/10/03 14:04:00 Remove unused symbols Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#4 (text+ko) ==== @@ -20,11 +20,6 @@ _sbuf_len _strsep -_IS_64BIT_PROCESS - -_VNOP_SETXATTR -_VNOP_GETXATTR - _kauth_cred_dup _kauth_cred_dup_add From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:05:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 186CB16A416; Tue, 3 Oct 2006 14:05:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E50E816A407 for ; Tue, 3 Oct 2006 14:05:30 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B20343D5A for ; Tue, 3 Oct 2006 14:05:26 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93E5Qmf011092 for ; Tue, 3 Oct 2006 14:05:26 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93E5QBT011089 for perforce@freebsd.org; Tue, 3 Oct 2006 14:05:26 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:05:26 GMT Message-Id: <200610031405.k93E5QBT011089@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107167 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:05:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=107167 Change 107167 by millert@millert_macbook on 2006/10/03 14:04:41 Remove conf-parse.c and conf-parse.h for clean target Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/Makefile#4 (text+ko) ==== @@ -43,7 +43,7 @@ $(RANLIB) $(DESTDIR)/usr/lib/lib$(LIB).a clean: - rm -f lib$(LIB).a $(OBJS) + rm -f lib$(LIB).a $(OBJS) conf-parse.c conf-parse.h lib$(LIB).a:: $(OBJS) rm -f lib$(LIB).a From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:05:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B9E916A55F; Tue, 3 Oct 2006 14:05:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0157116A412 for ; Tue, 3 Oct 2006 14:05:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F21C743D76 for ; Tue, 3 Oct 2006 14:05:26 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93E5QXA011099 for ; Tue, 3 Oct 2006 14:05:26 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93E5QbH011095 for perforce@freebsd.org; Tue, 3 Oct 2006 14:05:26 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:05:26 GMT Message-Id: <200610031405.k93E5QbH011095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:05:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=107168 Change 107168 by millert@millert_macbook on 2006/10/03 14:05:14 Use the -C argument to gnutar and make instead of using an extra "cd" on the command line. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/release/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/release/Makefile#2 (text+ko) ==== @@ -18,18 +18,18 @@ install: all dist: - cd $(DESTDIR) && gnutar --owner root --group wheel -czf \ + gnutar -C $(DESTDIR) --owner root --group wheel -czf \ $(SOURCE_ROOT)/$(RELEASE_TARBALL) . package: - cd packages && sudo make + sudo make -C packages dmg: - cd packages && sudo make dmg + sudo make -C packages dmg cp packages/MAC.dmg .. packageclean: - cd packages && sudo make clean + sudo make -C packages clean distclean: rm -rf $(DESTDIR) $(SOURCE_ROOT)/$(RELEASE_TARBALL) From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:06: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 65B2416A415; Tue, 3 Oct 2006 14:06:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EA2916A403 for ; Tue, 3 Oct 2006 14:06:29 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01B9D43D46 for ; Tue, 3 Oct 2006 14:06:29 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93E6SpU011219 for ; Tue, 3 Oct 2006 14:06:28 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93E6Sow011216 for perforce@freebsd.org; Tue, 3 Oct 2006 14:06:28 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:06:28 GMT Message-Id: <200610031406.k93E6Sow011216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107169 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:06:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=107169 Change 107169 by millert@millert_macbook on 2006/10/03 14:06:01 Add separate typedefs for mpo_port_check_make_send_once, mpo_port_check_move_send_once, and mpo_port_check_hold_send_once. Policies that auto-generate methods by munging mac_policy.h require this for full coverage. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#9 (text+ko) ==== @@ -2509,6 +2509,28 @@ ); /** + @brief Access control check for producing a send once right from a receive right + @param task Label of the sender task + @param port Label of the affected port + + Access control check for obtaining send once rights from receive rights. + The new send once right may be destined for the calling task, or a different + task. In either case the mpo_port_check_hold_send_once entry point handles + the receiving task. port_check_make_send_once may be called as part of a + group of policy invocations when messages with port rights are sent. + All access control checks made for a particular message must be successful + for the message to be sent. + + The task label and the port are locked. Sleeping is permitted. + + @return Return 0 if access is granted, non-zero otherwise. +*/ +typedef int mpo_port_check_make_send_once_t( + struct label *task, + struct label *port +); + +/** @brief Access control check for copying a send right to another task @param task Label of the sender task @param port Label of the affected port @@ -2551,6 +2573,27 @@ ); /** + @brief Access control check for transferring a send once right + @param task Label of the sender task + @param port Label of the affected port + + Access control check for transferring a send once right from one task to + the task listening to the specified port. A complementary entry point, + mpo_port_check_hold_send_once, handles the receiving task. + port_check_move_send_once is called as part of a group of policy invocations + when messages with port rights are sent. All access control checks made + for a particular message must be successful for the message to be sent. + + The task label and the port are locked. Sleeping is permitted. + + @return Return 0 if access is granted, non-zero otherwise. +*/ +typedef int mpo_port_check_move_send_once_t( + struct label *task, + struct label *port +); + +/** @brief Access control check for obtaining a send right @param task Label of the receiving task @param port Label of the affected port @@ -2571,6 +2614,26 @@ ); /** + @brief Access control check for obtaining a send once right + @param task Label of the receiving task + @param port Label of the affected port + + Access control check for a task obtaining send once rights to a port. Usually, + these are port rights that were part of a message sent by another userspace + task. port_check_hold_send_once is called as part of a group of policy + invocations when messages with port rights are received. All of these access + control checks must succeed in order to receive the message. + + The task label and the port are locked. Sleeping is permitted. + + @return Return 0 if access is granted, non-zero otherwise. +*/ +typedef int mpo_port_check_hold_send_once_t( + struct label *task, + struct label *port +); + +/** @brief Access control check for receiving Mach messsages @param task Label of the receiving task @param sender Label of the sending task @@ -5050,13 +5113,13 @@ mpo_port_check_send_t *mpo_port_check_send; mpo_port_check_receive_t *mpo_port_check_receive; mpo_port_check_make_send_t *mpo_port_check_make_send; - mpo_port_check_make_send_t *mpo_port_check_make_send_once; + mpo_port_check_make_send_once_t *mpo_port_check_make_send_once; mpo_port_check_copy_send_t *mpo_port_check_copy_send; mpo_port_check_move_send_t *mpo_port_check_move_send; - mpo_port_check_move_send_t *mpo_port_check_move_send_once; + mpo_port_check_move_send_once_t *mpo_port_check_move_send_once; mpo_port_check_move_receive_t *mpo_port_check_move_receive; mpo_port_check_hold_send_t *mpo_port_check_hold_send; - mpo_port_check_hold_send_t *mpo_port_check_hold_send_once; + mpo_port_check_hold_send_once_t *mpo_port_check_hold_send_once; mpo_port_check_hold_receive_t *mpo_port_check_hold_receive; mpo_cred_check_visible_t *mpo_cred_check_visible; mpo_file_check_fcntl_t *mpo_file_check_fcntl; From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:11: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 7C6A716A595; Tue, 3 Oct 2006 14:11:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4991B16A4ED for ; Tue, 3 Oct 2006 14:11:38 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A993E43D45 for ; Tue, 3 Oct 2006 14:11:36 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93EBaDs012123 for ; Tue, 3 Oct 2006 14:11:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93EBaTE012118 for perforce@freebsd.org; Tue, 3 Oct 2006 14:11:36 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:11:36 GMT Message-Id: <200610031411.k93EBaTE012118@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107170 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:11:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=107170 Change 107170 by millert@millert_macbook on 2006/10/03 14:11:07 Replace the reference count in struct mac_label_element with a list of policy handles that act as "listeners". To find what policies care about what label namespaces we just have to walk the list of listeners for that particular label namespace. This makes internalization and externalization simpler and faster. Rewrote label internalization and externalization to use the new listener interface. Uses functions instead of macros for the heavy lifting. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#10 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_port.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_task.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#10 (text+ko) ==== @@ -493,14 +493,12 @@ void mac_policy_addto_labellist(mac_policy_handle_t handle, int static_entry) { - struct mac_label_element **new_mles; - struct mac_label_element *mle; + struct mac_label_listener **new_mlls; + struct mac_label_element *mle, **new_mles; struct mac_label_element_list_t *list; struct mac_policy_conf *mpc; const char *name; - int found; - u_int idx; - int midx; + u_int idx, mle_free, mll_free; mpc = mac_get_mpc(handle); @@ -510,7 +508,6 @@ if (mpc->mpc_labelname_count == 0) return; - /* XXX - do we really need two lists? slight advantage when removing. */ if (static_entry) list = &mac_static_label_element_list; else @@ -528,7 +525,14 @@ MALLOC(new_mles[idx], struct mac_label_element *, sizeof(struct mac_label_element), M_MACTEMP, M_WAITOK); - midx = 0; + mle_free = 0; + MALLOC(new_mlls, struct mac_label_listener **, + sizeof(struct mac_label_listener *) * + mpc->mpc_labelname_count, M_MACTEMP, M_WAITOK); + for (idx = 0; idx < mpc->mpc_labelname_count; idx++) + MALLOC(new_mlls[idx], struct mac_label_listener *, + sizeof(struct mac_label_listener), M_MACTEMP, M_WAITOK); + mll_free = 0; if (mac_late) mac_policy_grab_exclusive(); @@ -536,42 +540,43 @@ name = mpc->mpc_labelnames[idx]; - /* Check both label element lists and add to the - * appropriate list only if not already on a list + /* + * Check both label element lists and add to the + * appropriate list only if not already on a list. */ - found = FALSE; - LIST_FOREACH(mle, &mac_static_label_element_list, - mle_list) { - if (strcmp(name, mle->mle_name) == 0) { - /* ref count unused for static list */ - found = TRUE; + LIST_FOREACH(mle, &mac_static_label_element_list, mle_list) { + if (strcmp(name, mle->mle_name) == 0) break; - } } - if (!found) - LIST_FOREACH(mle, - &mac_label_element_list, mle_list) { - if (strcmp(name, mle->mle_name) == 0) { - mle->mle_refs++; - found = TRUE; + if (mle == NULL) { + LIST_FOREACH(mle, &mac_label_element_list, mle_list) { + if (strcmp(name, mle->mle_name) == 0) break; - } } - if (!found) { - strcpy(new_mles[midx]->mle_name, name); - new_mles[midx]->mle_refs = 1; - LIST_INSERT_HEAD(list, new_mles[midx], - mle_list); - midx++; + } + if (mle == NULL) { + mle = new_mles[mle_free]; + strcpy(mle->mle_name, name); + LIST_INIT(&mle->mle_listeners); + LIST_INSERT_HEAD(list, mle, mle_list); + mle_free++; } + /* Add policy handler as a listener. */ + new_mlls[mll_free]->mll_handle = handle; + LIST_INSERT_HEAD(&mle->mle_listeners, new_mlls[mll_free], + mll_list); + mll_free++; } if (mac_late) mac_policy_release_exclusive(); - /* Free up any unused label elements */ - for (idx = midx; idx < mpc->mpc_labelname_count; idx++) + /* Free up any unused label elements and listeners */ + for (idx = mle_free; idx < mpc->mpc_labelname_count; idx++) FREE(new_mles[idx], M_MACTEMP); FREE(new_mles, M_MACTEMP); + for (idx = mll_free; idx < mpc->mpc_labelname_count; idx++) + FREE(new_mlls[idx], M_MACTEMP); + FREE(new_mlls, M_MACTEMP); } /* @@ -583,10 +588,9 @@ void mac_policy_removefrom_labellist(mac_policy_handle_t handle) { + struct mac_label_listener *mll; struct mac_label_element *mle; struct mac_policy_conf *mpc; - const char *name; - u_int idx; mpc = mac_get_mpc(handle); @@ -597,24 +601,28 @@ return; /* - * Check each label namespace managed by the policy and remove - * it from the non-static list only if no other policy is interested - * in that label namespace. + * Unregister policy as being interested in any label + * namespaces. If no other policy is listening, remove + * that label element from the list. Note that we only + * have to worry about the non-static list. */ + /* XXX - how could mac_late *not* be set here?!? */ if (mac_late) mac_policy_grab_exclusive(); - for (idx = 0; idx < mpc->mpc_labelname_count; idx++) { - name = mpc->mpc_labelnames[idx]; - LIST_FOREACH(mle, &mac_label_element_list, mle_list) { - if (strcmp(name, mle->mle_name) == 0) { - if (--mle->mle_refs == 0) { + LIST_FOREACH(mle, &mac_label_element_list, mle_list) { + LIST_FOREACH(mll, &mle->mle_listeners, mll_list) { + if (mll->mll_handle == handle) { + LIST_REMOVE(mll, mll_list); + FREE(mll, M_MACTEMP); + if (LIST_EMPTY(&mle->mle_listeners)) { LIST_REMOVE(mle, mle_list); FREE(mle, M_MACTEMP); } - break; + goto done; } } } +done: if (mac_late) mac_policy_release_exclusive(); } @@ -1017,6 +1025,167 @@ return (0); } +/* + * Get the external forms of labels from all policies, for a single + * label namespace or "*" for all namespaces. Returns ENOENT if no policy + * is registered for the namespace, unless the namespace begins with a '?'. + */ +static int +mac_externalize_label(size_t mpo_externalize_off, struct label *label, + const char *element, struct sbuf *sb) +{ + struct mac_policy_conf *mpc; + struct mac_label_listener *mll; + struct mac_label_element *mle; + struct mac_label_element_list_t *element_list; + int (*mpo_externalize)(struct label *, char *, struct sbuf *); + int all_labels = 0, ignorenotfound = 0, error = 0, busy = FALSE; + unsigned int count = 0; + + if (element[0] == '?') { + element++; + ignorenotfound = 1; + } else if (element[0] == '*' && element[1] == '\0') + all_labels = 1; + + element_list = &mac_static_label_element_list; +element_loop: + LIST_FOREACH(mle, element_list, mle_list) { + if (!all_labels && strcmp(mle->mle_name, element) != 0) + continue; + LIST_FOREACH(mll, &mle->mle_listeners, mll_list) { + mpc = mac_policy_list.entries[mll->mll_handle].mpc; + if (mpc == NULL) + panic("%s: trying to externalize a policy " + "handle that doesn't exist", __func__); + mpo_externalize = *(typeof(mpo_externalize) *) + ((char *)mpc->mpc_ops + mpo_externalize_off); + if (mpo_externalize == NULL) + continue; + error = sbuf_printf(sb, "%s/", mle->mle_name); + if (error) + goto done; + error = mpo_externalize(label, mle->mle_name, sb); + if (error) + goto done; + error = sbuf_putc(sb, ','); + if (error) + goto done; + count++; + } + } + /* If there are dynamic policies present, check their elements too. */ + if (!busy && mac_policy_list_conditional_busy() == 1) { + element_list = &mac_label_element_list; + busy = TRUE; + goto element_loop; + } +done: + if (busy) + mac_policy_list_unbusy(); + if (!error && count == 0) { + if (!all_labels && !ignorenotfound) + error = ENOENT; /* XXX: ENOLABEL? */ + } + return (error); +} + +/* + * Get the external forms of labels from all policies, for all label + * namespaces contained in a list. + */ +int +mac_externalize(size_t mpo_externalize_off, struct label *label, + char *elementlist, char *outbuf, size_t outbuflen) +{ + char *element; + struct sbuf sb; + int error = 0, len; + + sbuf_new(&sb, outbuf, outbuflen, SBUF_FIXEDLEN); + while ((element = strsep(&elementlist, ",")) != NULL) { + error = mac_externalize_label(mpo_externalize_off, label, + element, &sb); + if (error) + break; + } + if ((len = sbuf_len(&sb)) > 0) + sbuf_setpos(&sb, len - 1); /* trim trailing comma */ + sbuf_finish(&sb); + return (error); +} + +/* + * Have all policies set the internal form of a label, for a single + * label namespace. + */ +static int +mac_internalize_label(size_t mpo_internalize_off, struct label *label, + char *element_name, char *element_data) +{ + struct mac_policy_conf *mpc; + struct mac_label_listener *mll; + struct mac_label_element *mle; + struct mac_label_element_list_t *element_list; + int (*mpo_internalize)(struct label *, char *, char *); + int error = 0, busy = FALSE; + unsigned int count = 0; + + element_list = &mac_static_label_element_list; +element_loop: + LIST_FOREACH(mle, element_list, mle_list) { + if (strcmp(element_name, mle->mle_name) == 0) + continue; + LIST_FOREACH(mll, &mle->mle_listeners, mll_list) { + mpc = mac_policy_list.entries[mll->mll_handle].mpc; + if (mpc == NULL) + panic("%s: trying to internalize a policy " + "handle that doesn't exist", __func__); + mpo_internalize = *(typeof(mpo_internalize) *) + ((char *)mpc->mpc_ops + mpo_internalize_off); + if (mpo_internalize == NULL) + continue; + error = mpo_internalize(label, element_name, + element_data); + if (error) + goto done; + count++; + } + } + /* If there are dynamic policies present, check their elements too. */ + if (!busy && mac_policy_list_conditional_busy() == 1) { + element_list = &mac_label_element_list; + busy = TRUE; + goto element_loop; + } +done: + if (busy) + mac_policy_list_unbusy(); + if (!error && count == 0) + error = EINVAL; + return (error); +} + +int +mac_internalize(size_t mpo_internalize_off, struct label *label, + char *textlabels) +{ + char *element_name, *element_data; + int error = 0; + + while (!error && (element_name = strsep(&textlabels, ",")) != NULL) { + element_data = strchr(element_name, '/'); + if (element_data == NULL) { + error = EINVAL; + break; + } + *element_data++ = '\0'; + error = mac_internalize_label(mpo_internalize_off, label, + element_name, element_data); + } + return (error); +} + /* system calls */ int ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#7 (text+ko) ==== @@ -91,12 +91,23 @@ */ extern void kmod_load_early(void); /* defined in libsa/kext.cpp */ +/* + * Policy that has registered with the framework for a specific + * label namespace name. + */ +struct mac_label_listener { + mac_policy_handle_t mll_handle; + LIST_ENTRY(mac_label_listener) mll_list; +}; + +LIST_HEAD(mac_label_listeners_t, mac_label_listener); + /* * Type of list used to manage label namespace names. */ struct mac_label_element { - int mle_refs; char mle_name[MAC_MAX_LABEL_ELEMENT_NAME]; + struct mac_label_listeners_t mle_listeners; LIST_ENTRY(mac_label_element) mle_list; }; @@ -302,222 +313,15 @@ } \ } while (0) -/* - * Get the external forms of labels from all policies, for a single - * label namespace. - */ -#define MAC_EXTERNALIZE2(obj, lname, label, element, sb, count) \ -do { \ - \ - struct mac_policy_conf *ME_mpc; \ - int ebusy = FALSE; \ - u_int idx, j, k, maxindex; \ - \ - count = 0; \ - maxindex = mac_policy_list.staticmax - 1; \ - for (j = 0, k = 0; j < 2; j++) { \ - for (; k <= maxindex; k++) { \ - ME_mpc = mac_policy_list.entries[k].mpc; \ - if (ME_mpc == NULL) \ - continue; \ - \ - if (ME_mpc->mpc_ops->mpo_## obj ##_externalize_## lname == NULL)\ - continue; \ - \ - if (ME_mpc->mpc_labelnames == NULL) \ - continue; \ - \ - for (idx = 0; idx < ME_mpc->mpc_labelname_count; idx++) { \ - if (strcmp(ME_mpc->mpc_labelnames[idx], element) != 0)\ - continue; \ - if (count == 0) { \ - error = sbuf_printf(&sb, "%s/", element);\ - if (error) \ - break; \ - } else { \ - error = sbuf_printf(&sb, ","); \ - if (error) \ - break; \ - } \ - error = ME_mpc->mpc_ops->mpo_## obj ##_externalize_## lname\ - (label, element, &sb); \ - if (error) \ - break; \ - count++; \ - } \ - if (error) \ - break; \ - } \ - if (ebusy || mac_policy_list_conditional_busy() == 0) \ - break; \ - maxindex = mac_policy_list.maxindex; \ - ebusy = TRUE; \ - } \ - if (ebusy) \ - mac_policy_list_unbusy(); \ -} while (0) +#define MAC_INTERNALIZE(obj, label, instring) \ + mac_internalize(offsetof(struct mac_policy_ops, mpo_ ## obj ## _internalize_label), label, instring) -#define MAC_EXTERNALIZE(obj, label, element, sb, count) \ - MAC_EXTERNALIZE2(obj, label, label, element, sb, count) +#define MAC_EXTERNALIZE2(obj, lname, label, elementlist, outbuf, outbuflen)\ + mac_externalize(offsetof(struct mac_policy_ops, mpo_ ## obj ## _externalize_ ## lname), label, elementlist, outbuf, outbuflen) -/* - * Get the external forms of labels from all policies, for all label - * namespaces contained in a list. - */ -#define MAC_EXTERNALIZE_LIST(obj, label, elementlist, outbuf, outbuflen)\ -do { \ - int ignorenotfound; \ - char *element, *sptr; \ - struct sbuf sb; \ - unsigned int count, total_count; \ - \ - error = 0; \ - total_count = 0; \ - sbuf_new(&sb, outbuf, outbuflen, SBUF_FIXEDLEN); \ - sptr = elementlist; \ - while ((element = strsep(&sptr, ",")) != NULL) { \ - if (element[0] == '?') { \ - element++; \ - ignorenotfound = 1; \ - } else \ - ignorenotfound = 0; \ - MAC_EXTERNALIZE(obj, label, element, sb, count); \ - if (error) \ - break; \ - if (count > 0) { \ - total_count += count; \ - error = sbuf_printf(&sb, ":"); \ - if (error) \ - break; \ - } else if (!ignorenotfound) { \ - error = ENOENT; /* XXX: ENOLABEL? */ \ - break; \ - } \ - } \ - /* Remove the last ':' if there was at least one match */ \ - if (total_count != 0) { \ - count = sbuf_len(&sb) - 1; \ - sbuf_setpos(&sb, count); \ - } \ - sbuf_finish(&sb); \ -} while (0) - -/* - * Get the external forms of MAC labels (normal or audit) from all - * policies, for all label namespaces contained in the master list of - * registered namespaces. - * This macro uses the mac_policy_list locking mechanisms to protect the - * non-static label element list. - */ -#define MAC_EXTERNALIZE_REGISTERED_LABELS2(obj, lname, label, outbuf, outbuflen, count) \ -do { \ - \ - struct mac_label_element *MERL_mle; \ - struct mac_label_element_list_t *element_list; \ - struct sbuf sb; \ - int busy = FALSE; \ - int i; \ - \ - sbuf_new(&sb, outbuf, outbuflen, SBUF_FIXEDLEN); \ - \ - element_list = &mac_static_label_element_list; \ - for (i = 0; i < 2; i++) { \ - LIST_FOREACH(MERL_mle, element_list, mle_list) { \ - MAC_EXTERNALIZE2(obj, lname, label, MERL_mle->mle_name, sb, count);\ - if (error) \ - break; \ - \ - if (LIST_NEXT(MERL_mle, mle_list) != NULL) { \ - error = sbuf_printf(&sb, ":"); \ - if (error) \ - break; \ - } \ - } \ - if (mac_policy_list_conditional_busy() == 0) \ - break; \ - element_list = &mac_label_element_list; \ - busy = TRUE; \ - } \ - if (busy) \ - mac_policy_list_unbusy(); \ - \ - sbuf_finish(&sb); \ - \ -} while (0) - -#define MAC_EXTERNALIZE_REGISTERED_LABELS(obj, label, outbuf, outbuflen, count) \ - MAC_EXTERNALIZE_REGISTERED_LABELS2(obj, label, label, outbuf, outbuflen, count) - -/* - * Have all policies set the internal form of a label, for a single - * label namespace. - */ -#define MAC_INTERNALIZE(obj, label, element, element_data, count) \ -do { \ - \ - struct mac_policy_conf *MI_mpc; \ - int busy = FALSE; \ - u_int idx, i, j, maxindex; \ - \ - count = 0; \ - maxindex = mac_policy_list.staticmax - 1; \ - for (i = 0, j = 0; i < 2; i++) { \ - for (; j <= maxindex; j++) { \ - MI_mpc = mac_policy_list.entries[j].mpc; \ - if (MI_mpc == NULL) \ - continue; \ - \ - if (MI_mpc->mpc_ops->mpo_## obj ##_internalize_label == NULL)\ - continue; \ - \ - if (MI_mpc->mpc_labelnames == NULL) \ - continue; \ - \ - for (idx = 0; idx < MI_mpc->mpc_labelname_count; idx++) { \ - if (strcmp(MI_mpc->mpc_labelnames[idx], element) != 0)\ - continue; \ - error = MI_mpc->mpc_ops->mpo_## obj ##_internalize_label\ - (label, element, element_data);\ - if (error) \ - break; \ - count++; \ - } \ - if (error) \ - break; \ - } \ - if (busy || mac_policy_list_conditional_busy() == 0) \ - break; \ - maxindex = mac_policy_list.maxindex; \ - busy = TRUE; \ - } \ - if (busy) \ - mac_policy_list_unbusy(); \ -} while (0) +#define MAC_EXTERNALIZE(obj, label, elementlist, outbuf, outbuflen) \ + MAC_EXTERNALIZE2(obj, label, label, elementlist, outbuf, outbuflen) -#define MAC_INTERNALIZE_LIST(obj, label, instring) do { \ - char *sptr, *element, *element_data; \ - int count; \ - \ - error = 0; \ - sptr = instring; \ - while ((element = strsep(&sptr, ",")) != NULL) { \ - element_data = element; \ - element = strsep(&element_data, "/"); \ - if (element_data == NULL) { \ - error = EINVAL; \ - break; \ - } \ - MAC_INTERNALIZE(obj, label, element, element_data, \ - count); \ - if (error) \ - break; \ - if (count == 0) { \ - error = EINVAL; \ - break; \ - } \ - } \ -} while (0) - /* * MAC_PERFORM performs the designated operation by walking the policy * module list and invoking that operation for each policy. @@ -604,4 +408,8 @@ void mac_policy_addto_labellist(const mac_policy_handle_t, int); void mac_policy_removefrom_labellist(const mac_policy_handle_t); +int mac_externalize(size_t mpo_externalize_off, struct label *label, + char *elementlist, char *outbuf, size_t outbuflen); +int mac_internalize(size_t mpo_internalize_off, struct label *label, + char *elementlist); #endif /* !_SECURITY_MAC_INTERNAL_H_ */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#4 (text+ko) ==== @@ -96,14 +96,9 @@ mac_pipe_externalize_label(struct label *label, char *elements, char *outbuf, size_t outbuflen) { - int error = 0; + int error; - if (elements[0] == '*') { - int count; - MAC_EXTERNALIZE_REGISTERED_LABELS(pipe, label, outbuf, - outbuflen, count); - } else - MAC_EXTERNALIZE_LIST(pipe, label, elements, outbuf, outbuflen); + error = MAC_EXTERNALIZE(pipe, label, elements, outbuf, outbuflen); return (error); } @@ -113,7 +108,7 @@ { int error; - MAC_INTERNALIZE_LIST(pipe, label, string); + error = MAC_INTERNALIZE(pipe, label, string); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_port.c#5 (text+ko) ==== @@ -104,7 +104,8 @@ { int error; - MAC_INTERNALIZE_LIST(cred, label, string); + /* XXX - should have mpo_port_internalize_label */ + error = MAC_INTERNALIZE(cred, label, string); return (error); } @@ -115,7 +116,8 @@ { int error; - MAC_EXTERNALIZE_LIST(cred, label, elements, outbuf, outbuflen); + /* XXX - should have mpo_port_externalize_label */ + error = MAC_EXTERNALIZE(cred, label, elements, outbuf, outbuflen); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#5 (text+ko) ==== @@ -99,13 +99,12 @@ mac_cred_get_audit_labels(struct proc *p, struct mac *mac) { struct ucred *cr; - int error = 0; - int count; + int error; cr = kauth_cred_proc_ref(p); - MAC_EXTERNALIZE_REGISTERED_LABELS2(cred, audit_label, cr->cr_label, - mac->m_string, mac->m_buflen, count); + error = MAC_EXTERNALIZE2(cred, audit_label, cr->cr_label, "*", + mac->m_string, mac->m_buflen); kauth_cred_rele(cr); return (error); @@ -141,12 +140,7 @@ { int error = 0; - if (elements[0] == '*') { - int count; - MAC_EXTERNALIZE_REGISTERED_LABELS(cred, label, outbuf, - outbuflen, count); - } else - MAC_EXTERNALIZE_LIST(cred, label, elements, outbuf, outbuflen); + error = MAC_EXTERNALIZE(cred, label, elements, outbuf, outbuflen); return (error); } @@ -156,7 +150,7 @@ { int error; - MAC_INTERNALIZE_LIST(cred, label, string); + error = MAC_INTERNALIZE(cred, label, string); return (error); } @@ -399,7 +393,7 @@ { int error; - MAC_EXTERNALIZE_LIST(lctx, label, elements, outbuf, outbuflen); + error = MAC_EXTERNALIZE(lctx, label, elements, outbuf, outbuflen); return (error); } @@ -409,7 +403,7 @@ { int error; - MAC_INTERNALIZE_LIST(lctx, label, string); + error = MAC_INTERNALIZE(lctx, label, string); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#4 (text+ko) ==== @@ -164,7 +164,7 @@ { int error; - MAC_EXTERNALIZE_LIST(socket, label, elements, outbuf, outbuflen); + error = MAC_EXTERNALIZE(socket, label, elements, outbuf, outbuflen); return (error); } @@ -175,7 +175,7 @@ { int error; - MAC_EXTERNALIZE_LIST(socket_peer, label, elements, outbuf, outbuflen); + error = MAC_EXTERNALIZE(socket_peer, label, elements, outbuf, outbuflen); return (error); } @@ -185,7 +185,7 @@ { int error; - MAC_INTERNALIZE_LIST(socket, label, string); + error = MAC_INTERNALIZE(socket, label, string); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_task.c#4 (text+ko) ==== @@ -93,12 +93,7 @@ { int error = 0; - if (elements[0] == '*') { - int count; - MAC_EXTERNALIZE_REGISTERED_LABELS(task, label, outbuf, - outbuflen, count); - } else - MAC_EXTERNALIZE_LIST(task, label, elements, outbuf, outbuflen); + error = MAC_EXTERNALIZE(task, label, elements, outbuf, outbuflen); return (error); } @@ -108,7 +103,7 @@ { int error; - MAC_INTERNALIZE_LIST(task, label, string); + error = MAC_INTERNALIZE(task, label, string); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#6 (text+ko) ==== @@ -1,4 +1,3 @@ - /*- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin @@ -175,14 +174,12 @@ int mac_vnode_get_audit_labels(struct vnode *vp, struct mac *mac) { - int error = 0; - int count; + int error; - // It is assumed that any necessary vnode locking is done on entry - MAC_EXTERNALIZE_REGISTERED_LABELS2(vnode, audit_label, vp->v_label, - mac->m_string, mac->m_buflen, count); + /* It is assumed that any necessary vnode locking is done on entry */ + error = MAC_EXTERNALIZE2(vnode, audit_label, vp->v_label, "*", + mac->m_string, mac->m_buflen); - // error is set by MAC_EXTERNALIZE_REGISTERED_LABELS return (error); } @@ -190,16 +187,10 @@ mac_vnode_externalize_label(struct label *label, char *elements, char *outbuf, size_t outbuflen, int flags __unused) { - int error = 0; + int error; - if (elements[0] == '*') { - int count; - MAC_EXTERNALIZE_REGISTERED_LABELS(vnode, label, outbuf, - outbuflen, count); - } else - MAC_EXTERNALIZE_LIST(vnode, label, elements, outbuf, outbuflen); + error = MAC_EXTERNALIZE(vnode, label, elements, outbuf, outbuflen); - // error is set by MAC_EXTERNALIZE_* return (error); } @@ -208,7 +199,7 @@ { int error; - MAC_INTERNALIZE_LIST(vnode, label, string); + error = MAC_INTERNALIZE(vnode, label, string); return (error); } @@ -218,7 +209,7 @@ { int error; - MAC_INTERNALIZE_LIST(mount, label, string); + error = MAC_INTERNALIZE(mount, label, string); return (error); } @@ -229,14 +220,8 @@ { int error; - if (elements[0] == '*') { - int count; - MAC_EXTERNALIZE_REGISTERED_LABELS(mount, label, outbuf, - outbuflen, count); - } else - MAC_EXTERNALIZE_LIST(mount, label, elements, outbuf, outbuflen); + error = MAC_EXTERNALIZE(mount, label, elements, outbuf, outbuflen); - // error is set by MAC_EXTERNALIZE_* return (error); } From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:11: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 CEBB416A5C8; Tue, 3 Oct 2006 14:11:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6BCEF16A4F6 for ; Tue, 3 Oct 2006 14:11:38 +0000 (UTC) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F37F43D55 for ; Tue, 3 Oct 2006 14:11:37 +0000 (GMT) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93EBbPw012129 for ; Tue, 3 Oct 2006 14:11:37 GMT (envelope-from ru@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93EBamY012126 for perforce@freebsd.org; Tue, 3 Oct 2006 14:11:36 GMT (envelope-from ru@freebsd.org) Date: Tue, 3 Oct 2006 14:11:36 GMT Message-Id: <200610031411.k93EBamY012126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ru@freebsd.org using -f From: Ruslan Ermilov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107171 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:11:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=107171 Change 107171 by ru@ru_edoofus on 2006/10/03 14:11:12 - Sort options. - Fix markup. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#14 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#13 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#14 $ .\" .Dd January 24, 2004 .Dt AUDITREDUCE 1 @@ -34,21 +34,21 @@ .Nm auditreduce .Nd "select records from audit trail files" .Sh SYNOPSIS -.Nm auditreduce +.Nm .Op Fl A -.Op Fl a Ar YYYYMMDD[HH[MM[SS]]] -.Op Fl b Ar YYYYMMDD[HH[MM[SS]]] +.Op Fl a Ar YYYYMMDD Ns Op Ar HH Ns Op Ar MM Ns Op Ar SS +.Op Fl b Ar YYYYMMDD Ns Op Ar HH Ns Op Ar MM Ns Op Ar SS .Op Fl c Ar flags .Op Fl d Ar YYYYMMDD .Op Fl e Ar euid .Op Fl f Ar egid .Op Fl g Ar rgid +.Op Fl j Ar id +.Op Fl m Ar event +.Op Fl o Ar object Ns = Ns Ar value .Op Fl r Ar ruid .Op Fl u Ar auid -.Op Fl j Ar id -.Op Fl m Ar event -.Op Fl o Ar object=value -.Op Ar file ... +.Op Ar .Sh DESCRIPTION The .Nm @@ -56,22 +56,21 @@ criteria. Matching audit records are printed to the standard output in their raw binary form. -If no filename is specified, the standard input is used +If no +.Ar file +argument is specified, the standard input is used by default. Use the -.Nm praudit +.Xr praudit 1 utility to print the selected audit records in human-readable form. -See -.Xr praudit 1 -for more information. .Pp The options are as follows: -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl A Select all records. -.It Fl a Ar YYYYMMDD[HH[MM[SS]]] +.It Fl a Ar YYYYMMDD Ns Op Ar HH Ns Op Ar MM Ns Op Ar SS Select records that occurred after or on the given datetime. -.It Fl b Ar YYYYMMDD[HH[MM[SS]]] +.It Fl b Ar YYYYMMDD Ns Op Ar HH Ns Op Ar MM Ns Op Ar SS Select records that occurred before the given datetime. .It Fl c Ar flags Select records matching the given audit classes specified as a comma @@ -86,15 +85,11 @@ or .Fl b . .It Fl e Ar euid -Select records with the given effective user id or name. +Select records with the given effective user ID or name. .It Fl f Ar egid -Select records with the given effective group id or name. +Select records with the given effective group ID or name. .It Fl g Ar rgid -Select records with the given real group id or name. -.It Fl r Ar ruid -Select records with the given real user id or name. -.It Fl u Ar auid -Select records with the given audit id. +Select records with the given real group ID or name. .It Fl j Ar id Select records having a subject token with matching ID. .It Fl m Ar event @@ -102,45 +97,53 @@ See .Xr audit_event 5 for a description of audit event names and numbers. -.It Fl o Ar object=value -.Bl -tag -width Ds -.It Nm file +.It Fl o Ar object Ns = Ns Ar value +.Bl -tag -width ".Cm msgqid" +.It Cm file Select records containing path tokens, where the pathname matches one of the comma delimited extended regular expression contained in given specification. -Regular expressions which are prefixed with a tilde (~) are excluded +Regular expressions which are prefixed with a tilde +.Pq Ql ~ +are excluded from the search results. These extended regular expressions are processed from left to right, and a path will either be selected or deslected based on the first match. .Pp -Since commas are used to delimit the regular expressions, a backslash (\\) -character should be used to escape the comma if it's a part of the search +Since commas are used to delimit the regular expressions, a backslash +.Pq Ql \e +character should be used to escape the comma if it is a part of the search pattern. -.It Nm msgqid -Select records containing the given message queue id. -.It Nm pid -Select records containing the given process id. -.It Nm semid -Select records containing the given semaphore id. -.It Nm shmid -Select records containing the given shared memory id. +.It Cm msgqid +Select records containing the given message queue ID. +.It Cm pid +Select records containing the given process ID. +.It Cm semid +Select records containing the given semaphore ID. +.It Cm shmid +Select records containing the given shared memory ID. .El +.It Fl r Ar ruid +Select records with the given real user ID or name. +.It Fl u Ar auid +Select records with the given audit ID. .El -.Sh Examples -.Pp +.Sh EXAMPLES To select all records associated with effective user ID root from the audit log .Pa /var/audit/20031016184719.20031017122634 : -.Pp -.Nm --e root /var/audit/20031016184719.20031017122634 +.Bd -literal -offset indent +auditreduce -e root \e + /var/audit/20031016184719.20031017122634 +.Ed .Pp To select all .Xr setlogin 2 events from that log: -.Pp -.Nm --m AUE_SETLOGIN /var/audit/20031016184719.20031017122634 +.Bd -literal -offset indent +auditreduce -m AUE_SETLOGIN \e + /var/audit/20031016184719.20031017122634 +.Ed .Pp Output from the above command lines will typically be piped to a new trail file, or via standard output to the @@ -148,23 +151,26 @@ command. .Pp Select all records containing a path token where the pathname contains -.Pa /etc/master.passwd -.Pp -.Nm --ofile="/etc/master.passwd" /var/audit/20031016184719.20031017122634 +.Pa /etc/master.passwd : +.Bd -literal -offset indent +auditreduce -o file="/etc/master.passwd" \e + /var/audit/20031016184719.20031017122634 +.Ed .Pp Select all records containing path tokens, where the pathname is a TTY device: -.Pp -.Nm --ofile="/dev/tty[a-zA-Z][0-9]+" /var/audit/20031016184719.20031017122634 +.Bd -literal -offset indent +auditreduce -o file="/dev/tty[a-zA-Z][0-9]+" \e + /var/audit/20031016184719.20031017122634 +.Ed .Pp Select all records containing path tokens, where the pathname is a TTY except for -.Pa /dev/ttyp2 -.Pp -.Nm --ofile="~/dev/ttyp2,/dev/tty[a-zA-Z][0-9]+" /var/audit/20031016184719.20031017122634 +.Pa /dev/ttyp2 : +.Bd -literal -offset indent +auditreduce -o file="~/dev/ttyp2,/dev/tty[a-zA-Z][0-9]+" \e + /var/audit/20031016184719.20031017122634 +.Ed .Sh SEE ALSO .Xr praudit 1 , .Xr audit_control 5 , @@ -175,9 +181,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:31: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 DCCB016A40F; Tue, 3 Oct 2006 14:31:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 934C216A403 for ; Tue, 3 Oct 2006 14:31:02 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DB0B43D45 for ; Tue, 3 Oct 2006 14:31:02 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93EV2Nj014876 for ; Tue, 3 Oct 2006 14:31:02 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93EV199014869 for perforce@freebsd.org; Tue, 3 Oct 2006 14:31:01 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:31:01 GMT Message-Id: <200610031431.k93EV199014869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:31:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=107172 Change 107172 by millert@millert_macbook on 2006/10/03 14:30:00 Return ENOENT in externalize routines when passed an element_name that is not supported for the label type being exported. Fixes "getfmac -l '*' /bin/ls" Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#11 edit .. //depot/projects/trustedbsd/sedarwin8/policies/count/mac_count.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/count/mk_count_decls.awk#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#16 edit .. //depot/projects/trustedbsd/sedarwin8/policies/stub/mk_stub_funcs.awk#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#11 (text+ko) ==== @@ -1066,8 +1066,21 @@ if (error) goto done; error = mpo_externalize(label, mle->mle_name, sb); - if (error) - goto done; + if (error) { + if (error != ENOENT) + goto done; + /* + * If a policy doesn't have a label to + * externalize it returns ENOENT. This + * may occur for policies that support + * multiple label elements for some + * (but not all) object types. + */ + sbuf_setpos(sb, sbuf_len(sb) - + (strlen(mle->mle_name) + 1)); + error = 0; + continue; + } error = sbuf_putc(sb, ','); if (error) goto done; ==== //depot/projects/trustedbsd/sedarwin8/policies/count/mac_count.c#4 (text+ko) ==== @@ -79,8 +79,8 @@ #define REG_COUNTER(n) \ sysctl_register_oid(&sysctl__security_mac_count_ ## n ## _c); -#define MAKE_RETSYSCTL(n) \ - static int n ## _ret; \ +#define MAKE_RETSYSCTL(n, v) \ + static int n ## _ret = v; \ SYSCTL_INT(_security_mac_retcontrol, OID_AUTO, n ## _ret, CTLFLAG_RW, \ &n ## _ret, 0, #n "() return value"); ==== //depot/projects/trustedbsd/sedarwin8/policies/count/mk_count_decls.awk#2 (text+ko) ==== @@ -1,5 +1,9 @@ { printf "MAKE_COUNTER(" $2 ");\n" - if ($1 == "int") - printf "MAKE_RETSYSCTL(" $2 ");\n" + if ($1 == "int") { + if ($2 ~ /externalize/) + printf "MAKE_RETSYSCTL(" $2 ", ENOENT);\n" + else + printf "MAKE_RETSYSCTL(" $2 ", 0);\n" + } } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#16 (text+ko) ==== @@ -2940,7 +2940,7 @@ struct n2##_security_struct *lsec; \ \ if (strcmp("sebsd", element_name) != 0) \ - return (0); \ + return (ENOENT); \ \ lsec = SLOT(label); \ return (sebsd_externalize_sid(lsec->sid, element_name, sb)); \ @@ -2958,7 +2958,7 @@ else if (strcmp("sebsd", element_name) == 0) sid = tsec->sid; else - return (0); + return (ENOENT); return (sebsd_externalize_sid(sid, element_name, sb)); } ==== //depot/projects/trustedbsd/sedarwin8/policies/stub/mk_stub_funcs.awk#2 (text+ko) ==== @@ -6,7 +6,10 @@ } printf "\n{\n" if ($1 == "int") { - printf "\treturn (0);\n" + if ($2 ~ /externalize/) + printf "\treturn (ENOENT);\n" + else + printf "\treturn (0);\n" } printf "}\n\n" } ==== //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#8 (text+ko) ==== @@ -590,7 +590,7 @@ init_label(dest, desttype, fcnname, fctx); } -static int +static void externalize_label(struct label *label, int type, const char *fcnname, const char *fctx) { @@ -600,10 +600,9 @@ #else use_label(label, type, fcnname, fctx); #endif - return (0); } -static int +static void internalize_label(struct label *label, int type, const char *fcnname, const char *fctx) { @@ -613,7 +612,6 @@ #else init_label(label, type, fcnname, fctx); #endif - return (0); } /* @@ -907,70 +905,80 @@ mac_test_cred_externalize_label(struct label *label, char *element_name, struct sbuf *sb) { - return EXTERNALIZE_LABEL(label, CREDTYPE); + EXTERNALIZE_LABEL(label, CREDTYPE); + return (ENOENT); } static int mac_test_lctx_externalize_label(struct label *label, char *element_name, struct sbuf *sb) { - return EXTERNALIZE_LABEL(label, LCTXTYPE); + EXTERNALIZE_LABEL(label, LCTXTYPE); + return (ENOENT); } static int mac_test_pipe_externalize_label(struct label *label, char *element_name, struct sbuf *sb) { - return EXTERNALIZE_LABEL(label, PIPETYPE); + EXTERNALIZE_LABEL(label, PIPETYPE); + return (ENOENT); } static int mac_test_vnode_externalize_label(struct label *label, char *element_name, struct sbuf *sb) { - return EXTERNALIZE_LABEL(label, VNODETYPE); + EXTERNALIZE_LABEL(label, VNODETYPE); + return (ENOENT); } static int mac_test_mount_externalize_label(struct label *label, char *element_name, struct sbuf *sb) { - return EXTERNALIZE_LABEL(label, MOUNTTYPE); + EXTERNALIZE_LABEL(label, MOUNTTYPE); + return (ENOENT); } static int mac_test_cred_internalize_label(struct label *label, char *element_name, char *element_data) { - return INTERNALIZE_LABEL(label, CREDTYPE); + INTERNALIZE_LABEL(label, CREDTYPE); + return (0); } static int mac_test_lctx_internalize_label(struct label *label, char *element_name, char *element_data) { - return INTERNALIZE_LABEL(label, LCTXTYPE); + INTERNALIZE_LABEL(label, LCTXTYPE); + return (0); } static int mac_test_pipe_internalize_label(struct label *label, char *element_name, char *element_data) { - return INTERNALIZE_LABEL(label, PIPETYPE); + INTERNALIZE_LABEL(label, PIPETYPE); + return (0); } static int mac_test_vnode_internalize_label(struct label *label, char *element_name, char *element_data) { - return INTERNALIZE_LABEL(label, VNODETYPE); + INTERNALIZE_LABEL(label, VNODETYPE); + return (0); } static int mac_test_mount_internalize_label(struct label *label, char *element_name, char *element_data) { - return INTERNALIZE_LABEL(label, MOUNTTYPE); + INTERNALIZE_LABEL(label, MOUNTTYPE); + return (0); } static void @@ -2349,7 +2357,8 @@ // this probably doesn't work. if (sbuf_cat(sb, "socket") < 0) return (ENOMEM); - return EXTERNALIZE_LABEL(label, SOCKETTYPE); + EXTERNALIZE_LABEL(label, SOCKETTYPE); + return 0; } static int @@ -2359,7 +2368,8 @@ //this probably doesn't work. if (sbuf_cat(sb, "socketpeer") < 0) return ENOMEM; - return EXTERNALIZE_LABEL(label, SOCKETTYPE); + EXTERNALIZE_LABEL(label, SOCKETTYPE); + return 0; } static int @@ -2369,7 +2379,8 @@ // KASSERT(thread_funnel_get() == network_flock, // "mac_test_socket_internalize_label: not holding the network funnel!"); - return INTERNALIZE_LABEL(label, SOCKETTYPE); + INTERNALIZE_LABEL(label, SOCKETTYPE); + return (0); } static void From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:32: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 BF34816A4C9; Tue, 3 Oct 2006 14:32:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7DF0416A4A7 for ; Tue, 3 Oct 2006 14:32:09 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 320A743D73 for ; Tue, 3 Oct 2006 14:32:04 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93EW45J015579 for ; Tue, 3 Oct 2006 14:32:04 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93EW3f0015576 for perforce@freebsd.org; Tue, 3 Oct 2006 14:32:03 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:32:03 GMT Message-Id: <200610031432.k93EW3f0015576@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:32:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=107173 Change 107173 by millert@millert_macbook on 2006/10/03 14:31:39 mac_labelzone_alloc() uses MAC_NOWAIT/MAC_WAITOK not M_NOWAIT/M_WAITOK so be more consistent with the flags used. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_msg.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#5 (text+ko) ==== @@ -57,7 +57,7 @@ { struct label *label; - label = mac_labelzone_alloc(M_WAITOK); + label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(pipe_init_label, label); return (label); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#6 (text+ko) ==== @@ -374,7 +374,7 @@ { struct label *label; - label = mac_labelzone_alloc(M_WAITOK); + label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(lctx_init_label, label); return (label); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#5 (text+ko) ==== @@ -533,7 +533,7 @@ return (error); } - intlabel = mac_socket_alloc_label(M_WAITOK); + intlabel = mac_socket_alloc_label(MAC_WAITOK); error = mac_socket_internalize_label(intlabel, buffer); FREE(buffer, M_MACTEMP); if (error) @@ -566,7 +566,7 @@ } MALLOC(buffer, char *, mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - intlabel = mac_socket_alloc_label(M_WAITOK); + intlabel = mac_socket_alloc_label(MAC_WAITOK); mac_socket_copy_label(so->so_label, intlabel); error = mac_socket_externalize_label(intlabel, elements, buffer, mac->m_buflen); @@ -603,7 +603,7 @@ } MALLOC(buffer, char *, mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - intlabel = mac_socket_alloc_label(M_WAITOK); + intlabel = mac_socket_alloc_label(MAC_WAITOK); mac_socket_copy_label(so->so_peerlabel, intlabel); error = mac_socket_peer_externalize_label(intlabel, elements, buffer, mac->m_buflen); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_msg.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ { struct label *label; - label = mac_labelzone_alloc(M_WAITOK); + label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(sysvmsg_init_label, label); return (label); } @@ -44,7 +44,7 @@ { struct label *label; - label = mac_labelzone_alloc(M_WAITOK); + label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(sysvmsq_init_label, label); return (label); } From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:34:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BC6B16A415; Tue, 3 Oct 2006 14:34:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A3F916A40F for ; Tue, 3 Oct 2006 14:34:22 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA02543D80 for ; Tue, 3 Oct 2006 14:34:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93EY7fS016165 for ; Tue, 3 Oct 2006 14:34:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93EY7GG016162 for perforce@freebsd.org; Tue, 3 Oct 2006 14:34:07 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:34:07 GMT Message-Id: <200610031434.k93EY7GG016162@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107175 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:34:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=107175 Change 107175 by millert@millert_macbook on 2006/10/03 14:33:32 Fix a memory leak on an error path Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setfiles/setfiles.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setfiles/setfiles.c#3 (text+ko) ==== @@ -332,6 +332,7 @@ "%s: %s not reset customized by admin to %s\n", progname, my_file, context); } + freecon(context); goto out; } From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:35:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA30116A407; Tue, 3 Oct 2006 14:35:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98F8016A4E5 for ; Tue, 3 Oct 2006 14:35:45 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12D3A43DC5 for ; Tue, 3 Oct 2006 14:35:09 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93EZ9Qk016360 for ; Tue, 3 Oct 2006 14:35:09 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93EZ9eT016357 for perforce@freebsd.org; Tue, 3 Oct 2006 14:35:09 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:35:09 GMT Message-Id: <200610031435.k93EZ9eT016357@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107176 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:35:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=107176 Change 107176 by millert@millert_macbook on 2006/10/03 14:34:15 Replace an occurrence of EOPNOTSUPP that should be ENOTSUP. EOPNOTSUPP means "Operation not supported on socket" but previously had been defined in terms of ENOTSUP. It was changed to have its own value for Unix '03 compliance Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#7 (text+ko) ==== @@ -1106,7 +1106,7 @@ } if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) - return (EOPNOTSUPP); + return (ENOTSUP); /* * Multi-phase commit. First check the policies to confirm the From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:35:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FB0B16A579; Tue, 3 Oct 2006 14:35:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 089E116A536 for ; Tue, 3 Oct 2006 14:35:46 +0000 (UTC) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42D8043DD4 for ; Tue, 3 Oct 2006 14:35:10 +0000 (GMT) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93EZApB016366 for ; Tue, 3 Oct 2006 14:35:10 GMT (envelope-from ru@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93EZ9wp016363 for perforce@freebsd.org; Tue, 3 Oct 2006 14:35:09 GMT (envelope-from ru@freebsd.org) Date: Tue, 3 Oct 2006 14:35:09 GMT Message-Id: <200610031435.k93EZ9wp016363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ru@freebsd.org using -f From: Ruslan Ermilov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:35:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=107177 Change 107177 by ru@ru_edoofus on 2006/10/03 14:34:25 - Add -p to usage() and SYNOPSIS, document it (possibly needs tweaking). - Make it clear in usage() and SYNOPSIS that -r and -s are exclusive. - Sort options. - Fix markup. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#10 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#10 (text+ko) ==== @@ -25,60 +25,72 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#9 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#10 $ .\" -.Dd January 24, 2004 +.Dd October 3, 2006 .Dt PRAUDIT 1 .Os .Sh NAME .Nm praudit .Nd "print the contents of audit trail files" .Sh SYNOPSIS -.Nm praudit -.Op Fl lrs +.Nm +.Op Fl lp +.Op Fl r | s .Op Fl d Ar del -.Op Ar file ... +.Op Ar .Sh DESCRIPTION The .Nm utility prints the contents of the audit trail files to the standard output in human-readable form. -If no filename is specified, the standard input is used +If no +.Ar file +argument is specified, the standard input is used by default. .Pp The options are as follows: -.Bl -tag -width Ds +.Bl -tag -width indent +.It Fl d Ar del +Specifies the delimiter. +The default delimiter is the comma. .It Fl l Prints the entire record on the same line. If this option is not specified, every token is displayed on a different line. +.It Fl p +Specify this option if input to +.Nm +is piped from the +.Xr tail 1 +utility. +This causes +.Nm +to sync to the start of the next record. .It Fl r Prints the records in their raw, numeric form. This option is exclusive from -.Fl s +.Fl s . .It Fl s Prints the tokens in their short form. Short text representations for record and event type are displayed. This option is exclusive from -.Fl r -.It Fl d Ar del -Specifies the delimiter. -The default delimiter is the comma. +.Fl r . .El .Pp If the raw or short forms are not specified, the default is to print the tokens in their long form. Events are displayed as per their descriptions given in .Pa /etc/security/audit_event ; -uids and gids are expanded to their names; +UIDs and GIDs are expanded to their names; dates and times are displayed in human-readable format. .Sh FILES -.Bl -tag -width "/etc/security/audit_control" -compact +.Bl -tag -width ".Pa /etc/security/audit_control" -compact .It Pa /etc/security/audit_class -Descriptions of audit event classes +Descriptions of audit event classes. .It Pa /etc/security/audit_event -Descriptions of audit events +Descriptions of audit events. .El .Sh SEE ALSO .Xr audit_class 5 , @@ -89,9 +101,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#10 $ */ /* @@ -34,7 +34,7 @@ */ /* - * praudit [-lrs] [-ddel] [filenames] + * praudit [-lp] [-r | -s] [-d del] [file ...] */ #include @@ -53,10 +53,10 @@ static int partial = 0; static void -usage() +usage(void) { - fprintf(stderr, "Usage: praudit [-lrs] [-ddel] [filenames]\n"); + fprintf(stderr, "usage: praudit [-lp] [-r | -s] [-d del] [file ...]\n"); exit(1); } @@ -109,12 +109,20 @@ int i; FILE *fp; - while ((ch = getopt(argc, argv, "lprsd:")) != -1) { + while ((ch = getopt(argc, argv, "d:lprs")) != -1) { switch(ch) { + case 'd': + del = optarg; + break; + case 'l': oneline = 1; break; + case 'p': + partial = 1; + break; + case 'r': if (shortfrm) usage(); /* Exclusive from shortfrm. */ @@ -127,14 +135,6 @@ shortfrm = 1; break; - case 'd': - del = optarg; - break; - - case 'p': - partial = 1; - break; - case '?': default: usage(); From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:35: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 24C9516A5CC; Tue, 3 Oct 2006 14:35:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CE8916A557 for ; Tue, 3 Oct 2006 14:35:46 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48B1843DCC for ; Tue, 3 Oct 2006 14:35:10 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93EZA1X016372 for ; Tue, 3 Oct 2006 14:35:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93EZASx016369 for perforce@freebsd.org; Tue, 3 Oct 2006 14:35:10 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:35:10 GMT Message-Id: <200610031435.k93EZASx016369@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107178 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:35:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=107178 Change 107178 by millert@millert_macbook on 2006/10/03 14:34:45 Use mnt_vfsstat instead of mnt_vtable to get at the vfs type string. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#17 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#17 (text+ko) ==== @@ -1185,24 +1185,18 @@ struct mount_security_struct *sbsec; int behavior, rc; - /* vfs_init() calls us with no mnt_vtable for dead_mountp */ - if (mp->mnt_vtable == NULL) - return; - - sbsec = SLOT(mntlabel); - /* TBD TBD TBD */ /* - * Make the label for the filesystem the same as the singlelabel - * which the filesystem will use if not a "multilabel" type. + * Update the mount label based on the policy. */ - rc = security_fs_use(mp->mnt_vtable->vfc_name, &behavior, &sbsec->sid); + sbsec = SLOT(mntlabel); + rc = security_fs_use(mp->mnt_vfsstat.f_fstypename, &behavior, &sbsec->sid); if (rc) { printf("%s: security_fs_use(%s) returned %d\n", __func__, - mp->mnt_vtable->vfc_name, rc); + mp->mnt_vfsstat.f_fstypename, rc); behavior = SECURITY_FS_USE_NONE; } else if (sebsd_verbose > 1) { printf("%s: security_fs_use(%s) behavior %d, sid %d\n", - __func__, mp->mnt_vtable->vfc_name, behavior, + __func__, mp->mnt_vfsstat.f_fstypename, behavior, sbsec->sid); } @@ -1253,7 +1247,7 @@ break; default: printf("%s: security_fs_use(%s) returned unrecognized " - "behavior %d\n", __func__, mp->mnt_vtable->vfc_name, + "behavior %d\n", __func__, mp->mnt_vfsstat.f_fstypename, behavior); behavior = SECURITY_FS_USE_NONE; break; From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:37:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9BC016A415; Tue, 3 Oct 2006 14:37:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B61D616A49E for ; Tue, 3 Oct 2006 14:37:01 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B9EE43DAD for ; Tue, 3 Oct 2006 14:36:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93EaCdq016579 for ; Tue, 3 Oct 2006 14:36:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93EaBHX016576 for perforce@freebsd.org; Tue, 3 Oct 2006 14:36:12 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:36:12 GMT Message-Id: <200610031436.k93EaBHX016576@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107179 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:37:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=107179 Change 107179 by millert@millert_macbook on 2006/10/03 14:35:17 Fix a label struct mismatch; was vnode, should be mount. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#18 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#18 (text+ko) ==== @@ -724,7 +724,8 @@ sebsd_vnode_update_extattr(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel, char *name) { - struct vnode_security_struct *vsec, *sbsec; + struct mount_security_struct *sbsec; + struct vnode_security_struct *vsec; /* * TBD: static buffers aren't a good idea, and SELinux contexts * aren't restricted in length. From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:41: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 3E68F16A47B; Tue, 3 Oct 2006 14:41:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE6B316A412 for ; Tue, 3 Oct 2006 14:41:19 +0000 (UTC) (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 6B8B843D5D for ; Tue, 3 Oct 2006 14:41: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.6/8.13.6) with ESMTP id k93EfJUf017211 for ; Tue, 3 Oct 2006 14:41:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93EfJXZ017203 for perforce@freebsd.org; Tue, 3 Oct 2006 14:41:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 14:41:19 GMT Message-Id: <200610031441.k93EfJXZ017203@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 107180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:41:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=107180 Change 107180 by rwatson@rwatson_peppercorn on 2006/10/03 14:40:42 Update for ru's on-going man page work on OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#42 edit .. //depot/projects/trustedbsd/openbsm/README#20 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#42 (text+ko) ==== @@ -2,6 +2,7 @@ - compat/clock_gettime.h now provides a compatibility implementation of clock_gettime(), which fixes building on Mac OS X. +- Countless man page fixes. OpenBSM 1.0 alpha 12 @@ -269,4 +270,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#41 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#42 $ ==== //depot/projects/trustedbsd/openbsm/README#20 (text+ko) ==== @@ -76,6 +76,7 @@ Martin Fong Pawel Worach Martin Englund + Ruslan Ermilov 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 @@ -97,4 +98,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#19 $ +$P4: //depot/projects/trustedbsd/openbsm/README#20 $ From owner-p4-projects@FreeBSD.ORG Tue Oct 3 14:46: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 738E016A417; Tue, 3 Oct 2006 14:46:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 324CB16A403 for ; Tue, 3 Oct 2006 14:46:45 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4551943D7C for ; Tue, 3 Oct 2006 14:46:26 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93EkQHn018551 for ; Tue, 3 Oct 2006 14:46:26 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93EkQPE018535 for perforce@freebsd.org; Tue, 3 Oct 2006 14:46:26 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 14:46:26 GMT Message-Id: <200610031446.k93EkQPE018535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107181 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 14:46:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=107181 Change 107181 by millert@millert_macbook on 2006/10/03 14:46:04 Add modification notices Add mac_getfsstat to audit Fix warnings for sbuf(9) Provide a MAC bypass mechanism for vn_rdwr() (ioflg IO_NOAUTH) and use in shift_data_down(), shift_data_up(). Split color policy into several files Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_event#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/disklib/mntopts.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount.tproj/mount.8#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount.tproj/mount.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_fdesc.tproj/mount_fdesc.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/bsm/audit_kevents.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_bsm_audit.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_bsm_klib.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/subr_sbuf.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/sbuf.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/vnode.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_vnops.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_xattr.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#12 edit .. //depot/projects/trustedbsd/sedarwin8/policies/color/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/color/color_util.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/color/mac_color.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/color/mac_color.h#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/bsm/bsm/etc/audit_event#3 (text+ko) ==== @@ -301,6 +301,7 @@ 415:AUE_GETLCID:getlcid(2):pc 416:AUE_MAC_MOUNT:mac_mount(2):ad 417:AUE_MAC_GET_MOUNT:mac_get_mount(2):fa +418:AUE_MAC_GETFSSTAT:mac_getfsstat(2):fa 451:AUE_EXTATTR_SET_FILE:extattr_set_file(2):fm 452:AUE_EXTATTR_GET_FILE:extattr_get_file(2):fa 453:AUE_EXTATTR_DELETE_FILE:extattr_delete_file(2):fm ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/disklib/mntopts.h#2 (text+ko) ==== @@ -54,6 +54,12 @@ * * @(#)mntopts.h 8.7 (Berkeley) 3/29/95 */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #ifdef linux #define MNT_RDONLY 0x00000001 /* read only filesystem */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount.tproj/mount.8#3 (text+ko) ==== @@ -31,6 +31,12 @@ .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 .\" +.\" +.\" NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce +.\" support for mandatory and extensible security protections. This notice +.\" is included in support of clause 2.2 (b) of the Apple Public License, +.\" Version 2.0. +.\" .Dd June 16, 1994 .Dt MOUNT 8 .Os BSD 4 ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount.tproj/mount.c#3 (text+ko) ==== @@ -52,7 +52,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin8/darwin/diskdev_cmds/mount_fdesc.tproj/mount_fdesc.c#3 (text+ko) ==== @@ -56,7 +56,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/bsm/audit_kevents.h#3 (text+ko) ==== @@ -353,6 +353,7 @@ #define AUE_GETLCID 415 #define AUE_MAC_MOUNT 416 #define AUE_MAC_GET_MOUNT 417 +#define AUE_MAC_GETFSSTAT 418 // BSM events for extended attributes #define AUE_EXTATTR_SET_FILE 451 ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_bsm_audit.c#4 (text+ko) ==== @@ -611,6 +611,7 @@ case AUE_GETAUDIT_ADDR: case AUE_GETAUID: case AUE_GETFSSTAT: + case AUE_MAC_GETFSSTAT: case AUE_PIPE: case AUE_SETPGRP: case AUE_SETRLIMIT: ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_bsm_klib.c#3 (text+ko) ==== @@ -460,6 +460,7 @@ AUE_GETLCID, /* 395 = getlcid */ AUE_MAC_MOUNT, /* 396 = __mac_mount */ AUE_MAC_GET_MOUNT, /* 397 = __mac_get_mount */ + AUE_MAC_GETFSSTAT, /* 398 = __mac_getfsstat */ }; int nsys_au_event = sizeof(sys_au_event) / sizeof(sys_au_event[0]); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/subr_sbuf.c#2 (text+ko) ==== @@ -83,6 +83,8 @@ #define SBUF_MAXEXTENDSIZE PAGE_SIZE #define SBUF_MAXEXTENDINCR PAGE_SIZE +#define isspace(c) ((c) == ' ' || ((c) >= '\t' && (c) <= '\r')) + /* * Debugging support */ @@ -299,11 +301,11 @@ if (len == 0) return (0); - if (len > SBUF_FREESPACE(s)) { + if ((int)len > SBUF_FREESPACE(s)) { sbuf_extend(s, len - SBUF_FREESPACE(s)); len = min(len, SBUF_FREESPACE(s)); } - if (copyin(uaddr, s->s_buf + s->s_len, len) != 0) + if (copyin(CAST_USER_ADDR_T(uaddr), s->s_buf + s->s_len, len) != 0) return (-1); s->s_len += len; @@ -365,11 +367,11 @@ if (len == 0) len = SBUF_FREESPACE(s); /* XXX return 0? */ - if (len > SBUF_FREESPACE(s)) { + if ((int)len > SBUF_FREESPACE(s)) { sbuf_extend(s, len); len = min(len, SBUF_FREESPACE(s)); } - switch (copyinstr(uaddr, s->s_buf + s->s_len, len + 1, &done)) { + switch (copyinstr(CAST_USER_ADDR_T(uaddr), s->s_buf + s->s_len, len + 1, &done)) { case ENAMETOOLONG: SBUF_SETFLAG(s, SBUF_OVERFLOWED); /* fall through */ @@ -480,11 +482,6 @@ return (0); } -static inline int isspace(ch) -{ - return (ch == ' ' || ch == '\n' || ch == '\t'); -} - /* * Trim whitespace characters from end of an sbuf. */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/sbuf.h#2 (text+ko) ==== @@ -74,7 +74,7 @@ int sbuf_done(struct sbuf *); void sbuf_delete(struct sbuf *); -#ifdef _KERNEL +#ifdef KERNEL struct uio; struct sbuf *sbuf_uionew(struct sbuf *, struct uio *, int *); int sbuf_bcopyin(struct sbuf *, const void *, size_t); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/vnode.h#2 (text+ko) ==== @@ -131,6 +131,7 @@ #define IO_NOCACHE 0x0800 /* same effect as VNOCACHE_DATA, but only for this 1 I/O */ #define IO_RAOFF 0x1000 /* same effect as VRAOFF, but only for this 1 I/O */ #define IO_DEFWRITE 0x2000 /* defer write if vfs.defwrite is set */ +#define IO_NOAUTH 0x4000 /* No authorization checks. */ /* * Component Name: this structure describes the pathname ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_vnops.c#5 (text+ko) ==== @@ -510,11 +510,17 @@ uio_addiov(auio, base, len); #ifdef MAC + /* XXXMAC + * IO_NOAUTH should be re-examined. + * Likely that mediation should be performed in caller. + */ + if ((ioflg & IO_NOAUTH) == 0) { /* passed cred is fp->f_cred */ - if (rw == UIO_READ) - error = mac_vnode_check_read(kauth_cred_get(), cred, vp); - else - error = mac_vnode_check_write(kauth_cred_get(), cred, vp); + if (rw == UIO_READ) + error = mac_vnode_check_read(kauth_cred_get(), cred, vp); + else + error = mac_vnode_check_write(kauth_cred_get(), cred, vp); + } #endif if (error == 0) { ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_xattr.c#4 (text+ko) ==== @@ -1932,14 +1932,14 @@ } for(pos=start+len-chunk; pos >= start; pos-=chunk) { - ret = vn_rdwr(UIO_READ, xvp, buff, chunk, pos, UIO_SYSSPACE, IO_NODELOCKED, ucred, &iolen, p); + ret = vn_rdwr(UIO_READ, xvp, buff, chunk, pos, UIO_SYSSPACE, IO_NODELOCKED|IO_NOAUTH, ucred, &iolen, p); if (iolen != 0) { printf("xattr:shift_data: error reading data @ %lld (read %d of %d) (%d)\n", pos, ret, chunk, ret); break; } - ret = vn_rdwr(UIO_WRITE, xvp, buff, chunk, pos + delta, UIO_SYSSPACE, IO_NODELOCKED, ucred, &iolen, p); + ret = vn_rdwr(UIO_WRITE, xvp, buff, chunk, pos + delta, UIO_SYSSPACE, IO_NODELOCKED|IO_NOAUTH, ucred, &iolen, p); if (iolen != 0) { printf("xattr:shift_data: error writing data @ %lld (wrote %d of %d) (%d)\n", pos+delta, ret, chunk, ret); @@ -1987,14 +1987,14 @@ } for(pos = start; pos < end; pos += chunk) { - ret = vn_rdwr(UIO_READ, xvp, buff, chunk, pos, UIO_SYSSPACE, IO_NODELOCKED, ucred, &iolen, p); + ret = vn_rdwr(UIO_READ, xvp, buff, chunk, pos, UIO_SYSSPACE, IO_NODELOCKED|IO_NOAUTH, ucred, &iolen, p); if (iolen != 0) { printf("xattr:shift_data: error reading data @ %lld (read %d of %d) (%d)\n", pos, ret, chunk, ret); break; } - ret = vn_rdwr(UIO_WRITE, xvp, buff, chunk, pos - delta, UIO_SYSSPACE, IO_NODELOCKED, ucred, &iolen, p); + ret = vn_rdwr(UIO_WRITE, xvp, buff, chunk, pos - delta, UIO_SYSSPACE, IO_NODELOCKED|IO_NOAUTH, ucred, &iolen, p); if (iolen != 0) { printf("xattr:shift_data: error writing data @ %lld (wrote %d of %d) (%d)\n", pos+delta, ret, chunk, ret); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#12 (text+ko) ==== @@ -295,6 +295,7 @@ case MLJ_TYPE_TASK: if (mlj->ops & MLJ_TASK_OP_INIT) MAC_PERFORM(task_init_label, mlj->l); + /* Not enough context to replay. */ if (mlj->ops & MLJ_TASK_OP_CREATE_K) ; break; ==== //depot/projects/trustedbsd/sedarwin8/policies/color/Makefile#2 (text+ko) ==== @@ -2,7 +2,7 @@ POLICY_VER= 1.0 POLICY_COMPVER= 1.0 POLICY_DESC= "MAC Color Security" -POLICY_SRCS= mac_color.c +POLICY_SRCS= mac_color.c color_util.c POLICY_NOMAN= yes include ../../Makeconfig ==== //depot/projects/trustedbsd/sedarwin8/policies/color/mac_color.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -42,232 +41,20 @@ #include #include +#include "mac_color.h" -#define MAC_COLOR_XATTR_NAME "security.color" -#define MAC_COLOR_POLICY_NAME "mac_color" -#define MAC_COLOR_LABEL_COUNT 1 static const char *labelnamespaces[MAC_COLOR_LABEL_COUNT] = { MAC_COLOR_POLICY_NAME }; -#define MAC_COLOR_NAMELEN 8 +static int color_slot; /* Per-policy label storage */ static mac_policy_handle_t mac_color_handle; -static int color_slot; -#define SLOT(l) ((struct color *)LABEL_TO_SLOT((l), color_slot).l_ptr) -#define SLOTREF(l) ((struct mac_color *)LABEL_TO_SLOT((l), color_slot).l_ptr) - -struct color { - char name[MAC_COLOR_NAMELEN]; - int level; - int refs; -}; - -static struct color colors[8] = { - {"red", 1, 0}, - {"orange", 2, 0}, - {"yellow", 3, 0}, - {"green", 4, 0}, - {"cyan", 5, 0}, - {"blue", 6, 0}, - {"indigo", 7, 0}, - {"violet", 8, 0} -}; - -struct mac_color { - LIST_ENTRY(mac_color) list; - int refs; - struct color *color; - int valid; -}; - -LIST_HEAD(mc_list, mac_color); -static struct mc_list mc_list_free; /* Free list */ -static struct mc_list mc_list_used; /* Labels in use */ -static int used_count = 0; -static int free_count = 0; -static int free_max = 256; - -SYSCTL_DECL(_security_mac); -SYSCTL_NODE(_security_mac, OID_AUTO, color, CTLFLAG_RW, 0, - "MAC Color Policy controls"); -static int mac_color_enabled = 1; -SYSCTL_INT(_security_mac_color, OID_AUTO, enabled, CTLFLAG_RW, - &mac_color_enabled, 0, "Enforce Mac Color Policy"); - -SYSCTL_NODE(_security_mac_color, OID_AUTO, used, CTLFLAG_RW, 0, NULL); -SYSCTL_INT(_security_mac_color_used, OID_AUTO, count, CTLFLAG_RD, - &used_count, 0, "Labels in use"); - -SYSCTL_NODE(_security_mac_color, OID_AUTO, free, CTLFLAG_RW, 0, NULL); -SYSCTL_INT(_security_mac_color_free, OID_AUTO, count, CTLFLAG_RD, - &free_count, 0, "Size of free list."); -SYSCTL_INT(_security_mac_color_free, OID_AUTO, max, CTLFLAG_RW, - &free_max, 0, "Maximum size of free list."); - - -#define MC_ALLOC(val, type, flag) \ - do { \ - val = (type *)mac_kalloc(sizeof(type), (flag)); \ - if (val != NULL && (((flag) & M_ZERO) == M_ZERO)) \ - bzero(val, sizeof(type)); \ - } while (0) -#define MC_FREE(p, type) \ - do { \ - if (p != NULL) \ - mac_kfree((void *)p, sizeof(type));\ - } while (0) - - -/* MAC Color label reference list */ - -static struct mac_color * -mc_alloc(int flag) -{ - struct mac_color *mc; - - if (LIST_EMPTY(&mc_list_free)) { - MC_ALLOC(mc, struct mac_color, flag|M_ZERO); - } else { - mc = LIST_FIRST(&mc_list_free); - LIST_REMOVE(mc, list); - free_count--; - mc->refs = 0; - mc->valid = 0; - } - - mc->refs++; - used_count++; - mc->color = &colors[0]; - LIST_INSERT_HEAD(&mc_list_used, mc, list); -// printf("mc_alloc, mc=%p, refs=%d\n", mc, mc->refs); - - return (mc); -} - -static void -mc_free(struct mac_color *mc) -{ - - if (mc == NULL) - return; -// printf("mc_free, mc=%p, refs=%d\n", mc, mc->refs); - LIST_REMOVE(mc, list); - used_count--; - - if (free_count >= free_max) - MC_FREE(mc, struct mac_color); - else { - LIST_INSERT_HEAD(&mc_list_free, mc, list); - free_count++; - } - - return; -} - - -/* MAC Color label routines */ - -static struct color * -co_findlabel(char *name) -{ - int i; - - for (i = 0; i < 8; i++) - if (strncmp(colors[i].name, name, MAC_COLOR_NAMELEN) == 0) - return (&colors[i]); - - return (NULL); -} - -static inline void -co_setlabel(struct label *label, struct color *color) -{ - - SLOT(label) = color; -} - -static inline void -co_setreflabel(struct label *label, struct mac_color *color) -{ - - SLOTREF(label) = color; -} - -static inline struct color * -co_getlabel(struct label *label) -{ - - return (SLOT(label)); -} - -static inline struct mac_color * -co_getreflabel(struct label *label) -{ - - return (SLOTREF(label)); -} - static void -color_destroy_reflabel(struct label *label) -{ - struct mac_color *mc; - - mc = co_getreflabel(label); - if (mc == NULL) - return; - - if (--mc->refs <= 0) - mc_free(mc); - - co_setreflabel(label, NULL); - - return; -} - - -static void -co_reference_label(struct label *src, struct label *dst) -{ - struct mac_color *mc; - - mc = co_getreflabel(src); - if (SLOTREF(dst) != NULL) { - /* Already has a reference. */ - if (SLOTREF(dst) == mc) { -// printf("co_reference_label: already has matching reference\n"); - return; - } else { -// printf("co_reference_label: already has a reference\n"); - } - color_destroy_reflabel(dst); - } - printf("co_reference_label: copying reference, mc=%p, refs=%d\n", mc, mc->refs); - mc->refs++; - co_setreflabel(dst, mc); - - return; -} - -static inline void -co_setlabelstring(struct label *label, char *color) -{ - - SLOT(label) = co_findlabel(color); /* Might set label to NULL */ -} - -static void -co_copylabel(struct label *src, struct label *dst) -{ - - SLOT(dst) = SLOT(src); /* Just copy the pointer */ -} - -static void color_init_reflabel(struct label *label) { - co_setreflabel(label, mc_alloc(M_WAITOK)); + co_init_reflabel(label); } static void @@ -278,27 +65,12 @@ } static void -color_policy_init(struct mac_policy_conf *conf) +color_destroy_reflabel(struct label *label) { - LIST_INIT(&mc_list_used); - LIST_INIT(&mc_list_free); + co_destroy_reflabel(label); } -static void -color_policy_initbsd(struct mac_policy_conf *conf) -{ - - sysctl_register_oid(&sysctl__security_mac_color); - sysctl_register_oid(&sysctl__security_mac_color_enabled); - sysctl_register_oid(&sysctl__security_mac_color_used); - sysctl_register_oid(&sysctl__security_mac_color_used_count); - sysctl_register_oid(&sysctl__security_mac_color_free); - sysctl_register_oid(&sysctl__security_mac_color_free_count); - sysctl_register_oid(&sysctl__security_mac_color_free_max); -} - - static int color_internalize_label(struct label *label, char *element_name, char *string) From owner-p4-projects@FreeBSD.ORG Tue Oct 3 15:01: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 E867016A415; Tue, 3 Oct 2006 15:01:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC3F916A40F for ; Tue, 3 Oct 2006 15:01:54 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 588B443D49 for ; Tue, 3 Oct 2006 15:01:54 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93F1sPJ023252 for ; Tue, 3 Oct 2006 15:01:54 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93F1lj5022984 for perforce@freebsd.org; Tue, 3 Oct 2006 15:01:47 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 15:01:47 GMT Message-Id: <200610031501.k93F1lj5022984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 15:01:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=107182 Change 107182 by millert@millert_macbook on 2006/10/03 15:01:03 Update to refpolicy rev 1980 from tresys svn repo with some SEDarwin changes. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Changelog#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/PropertyList.pm#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/README#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Rules.modular#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Rules.monolithic#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/build.conf#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/config/appconfig-strict-mls/default_type#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/config/appconfig-targeted-mcs/initrc_context#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/config/appconfig-targeted-mls/initrc_context#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/config/appconfig-targeted/initrc_context#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/doc/example.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/doc/example.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/doc/global_booleans.xml#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/doc/global_tunables.xml#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/doc/policy.xml#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/man/man8/samba_selinux.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/migscs.pl#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/booleans.conf#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/constraints#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/flask/access_vectors#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/flask/initial_sids#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/flask/mkflask.sh#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/flask/security_classes#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/global_booleans#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/global_tunables#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/mcs#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/mls#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules.conf#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/acct.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/alsa.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/alsa.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/amanda.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/amanda.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/anaconda.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/apt.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/apt.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/apt.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/backup.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/backup.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/backup.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/bootloader.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/certwatch.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/consoletype.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/dmesg.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/dmidecode.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/dpkg.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/dpkg.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/dpkg.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/firstboot.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/firstboot.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/firstboot.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/kudzu.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/logrotate.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/logrotate.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/logwatch.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/logwatch.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/mrtg.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/mrtg.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/netutils.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/netutils.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/portage.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/portage.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/portage.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/prelink.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/prelink.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/quota.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/quota.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/quota.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/readahead.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/rpm.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/rpm.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/rpm.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/su.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/su.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/su.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/sudo.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/sxid.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/sxid.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/sxid.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/tmpreaper.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/tripwire.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/tripwire.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/tripwire.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/updfstab.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/usbmodules.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/usermanage.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/usermanage.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/vbetool.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/vpn.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/ada.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/ada.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/ada.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/authbind.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/authbind.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/authbind.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/calamaris.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/calamaris.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/calamaris.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/cdrecord.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/cdrecord.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/ethereal.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/ethereal.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/ethereal.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/evolution.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/evolution.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/evolution.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/games.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/games.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/games.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/gift.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/gift.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/gift.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/gpg.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/gpg.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/irc.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/irc.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/java.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/java.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/java.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/loadkeys.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/lockdev.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/lockdev.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/mono.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/mozilla.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/mozilla.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/mozilla.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/mplayer.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/mplayer.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/mplayer.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/rssh.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/rssh.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/rssh.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/screen.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/screen.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/slocate.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/thunderbird.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/thunderbird.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/thunderbird.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/tvtime.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/tvtime.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/uml.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/uml.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/userhelper.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/userhelper.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/userhelper.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/usernetctl.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/usernetctl.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/vmware.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/vmware.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/vmware.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/webalizer.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/wine.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/wine.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/yam.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/yam.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/apps/yam.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corecommands.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corecommands.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corecommands.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corenetwork.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corenetwork.if#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corenetwork.if.in#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corenetwork.if.m4#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corenetwork.te#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corenetwork.te.in#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corenetwork.te.m4#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/devices.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/devices.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/devices.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/domain.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/domain.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/files.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/files.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/files.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/filesystem.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/filesystem.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/kernel.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/kernel.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/mcs.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/mcs.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/mls.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/mls.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/selinux.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/selinux.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/storage.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/storage.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/storage.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/terminal.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/terminal.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/terminal.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/afs.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/afs.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/afs.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/amavis.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/amavis.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/amavis.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/apache.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/apache.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/apache.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/apm.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/apm.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/arpwatch.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/asterisk.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/asterisk.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/asterisk.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/audioentropy.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/audioentropy.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/audioentropy.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/automount.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/automount.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/avahi.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/bind.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/bind.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/bind.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/bluetooth.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/bluetooth.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/bluetooth.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/canna.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cipe.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cipe.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cipe.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/clamav.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/clamav.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/clamav.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/clockspeed.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/clockspeed.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/clockspeed.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/comsat.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/courier.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/courier.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/courier.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cpucontrol.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cpucontrol.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cron.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cron.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cron.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cups.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cups.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cups.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cvs.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cvs.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cyrus.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cyrus.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dante.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dante.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dante.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dbskk.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dbus.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dbus.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dcc.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dcc.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dcc.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ddclient.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ddclient.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ddclient.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dhcp.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dictd.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dictd.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/distcc.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/djbdns.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/djbdns.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dnsmasq.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dnsmasq.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dnsmasq.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dovecot.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/dovecot.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/fetchmail.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/finger.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/finger.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ftp.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ftp.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ftp.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/gatekeeper.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/gatekeeper.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/gatekeeper.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/gpm.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/hal.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/hal.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/howl.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/i18n_input.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/i18n_input.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/imaze.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/imaze.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/imaze.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/inetd.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/inetd.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/inn.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/inn.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ircd.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ircd.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ircd.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/irqbalance.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/jabber.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/jabber.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/jabber.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/kerberos.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/kerberos.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/kerberos.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ktalk.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ktalk.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ldap.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ldap.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ldap.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/lpd.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/lpd.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/mailman.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/mailman.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/mailman.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/monop.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/monop.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/monop.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/mta.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/mta.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/mta.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/munin.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/munin.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/munin.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/mysql.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nagios.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nagios.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nagios.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nessus.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nessus.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nessus.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/networkmanager.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/networkmanager.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nis.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nis.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nis.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nscd.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nscd.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nsd.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nsd.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nsd.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ntop.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ntop.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ntop.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ntp.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nx.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nx.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/nx.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/oav.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/oav.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/oav.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/openca.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/openca.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/openca.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/openct.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/openvpn.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/openvpn.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/openvpn.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/pegasus.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/pegasus.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/perdition.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/perdition.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/perdition.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/portmap.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/portmap.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/portmap.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/portslave.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/portslave.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/portslave.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/postfix.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/postfix.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/postfix.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/postgresql.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/postgresql.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/postgresql.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/postgrey.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/postgrey.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/postgrey.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ppp.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ppp.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/privoxy.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/procmail.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/publicfile.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/pxe.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/pxe.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/pxe.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/pyzor.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/pyzor.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/pyzor.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/qmail.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/qmail.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/qmail.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/radius.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/radius.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/radius.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/radvd.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/razor.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/razor.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/razor.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/rdisc.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/remotelogin.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/resmgr.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/resmgr.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/resmgr.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/rhgb.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/rhgb.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/rhgb.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/rlogin.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/roundup.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/rpc.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/rpc.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/rpc.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/rshd.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/rsync.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/rsync.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/samba.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/samba.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/sasl.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/sendmail.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/sendmail.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/setroubleshoot.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/setroubleshoot.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/setroubleshoot.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/slrnpull.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/smartmon.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/snmp.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/snmp.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/snort.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/snort.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/snort.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/soundserver.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/soundserver.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/soundserver.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/spamassassin.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/spamassassin.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/spamassassin.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/speedtouch.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/speedtouch.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/speedtouch.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/squid.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/squid.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ssh.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ssh.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ssh.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/stunnel.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/sysstat.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/tcpd.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/telnet.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/tftp.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/tftp.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/timidity.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/tor.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/tor.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/tor.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/transproxy.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/transproxy.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/transproxy.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ucspitcp.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/uptime.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/uptime.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/uptime.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/uucp.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/uwimap.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/uwimap.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/uwimap.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/watchdog.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/watchdog.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/watchdog.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/xfs.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/xfs.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/xfs.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/xprint.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/xprint.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/xprint.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/xserver.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/xserver.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/xserver.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/zebra.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/authlogin.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/authlogin.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/authlogin.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/clock.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/clock.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/clock.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/daemontools.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/daemontools.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/fstools.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/fstools.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/fstools.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/getty.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/getty.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/hostname.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/hostname.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/hotplug.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/hotplug.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/hotplug.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/ipsec.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/iptables.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/libraries.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/libraries.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/libraries.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/locallogin.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/locallogin.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/logging.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/logging.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/logging.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/lvm.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/lvm.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/miscfiles.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/miscfiles.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/miscfiles.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/modutils.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/modutils.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/modutils.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/mount.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/mount.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/mount.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/pcmcia.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/raid.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/selinuxutil.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/selinuxutil.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/selinuxutil.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/setrans.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/setrans.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/setrans.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/sysnetwork.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/sysnetwork.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/sysnetwork.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/udev.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/udev.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/unconfined.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/unconfined.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/unconfined.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/userdomain.if#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/userdomain.te#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/xen.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/xen.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/xen.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/rolemap#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/support/loadable_module.spt#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/support/misc_macros.spt#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/support/obj_perm_sets.spt#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/users#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/support/Makefile.devel#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/support/comment_move_decl.sed#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/support/genclassperms.py#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/support/genhomedircon#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/support/gennetfilter.py#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/support/get_type_attr_decl.sed#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/support/pyplate.pyc#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/support/sedoctool.py#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/support/segenxml.py#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/update_plist#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Changelog#2 (text+ko) ==== @@ -1,3 +1,136 @@ +- Debian updates from Erich Schubert. +- Add nscd_socket_use() to auth_use_nsswitch(). +- Remove old selopt rules. +- Full support for netfilter_contexts. +- MRTG patch for daemon operation from Stefan. +- Add authlogin interface to abstract common access for login programs. +- Remove setbool auditallow, except for RHEL4. +- Change eventpollfs to task SID labeling. +- Add key support from Michael LeMay. +- Add ftpdctl domain to ftp, from Paul Howarth. +- Fix build system to not move type declarations out of optionals. +- Add gcc-config domain to portage. +- Add packet object class and support in corenetwork. +- Add a copy of genhomedircon for monolithic policy building, so that a + policycoreutils package update is not required for RHEL4 systems. +- Add appletalk sockets for use in cups. +- Add Make target to validate module linking. +- Make duplicate template and interface declarations a fatal error. +- Patch to stabilize modules.conf `make conf` output, from Erich Schubert. +- Move xconsole_device_t from devices to xserver since it is + not actually a device, it is a named pipe. +- Handle nonexistant .fc and .if files in devel Makefile by + automatically creating empty files. +- Remove unused devfs_control_t. +- Add rhel4 distro, which also implies redhat distro. +- Remove unneeded range_transition for su_exec_t and move the + type declaration back to the su module. +- Constrain transitions in MCS so unconfined_t cannot have + arbitrary category sets. +- Change reiserfs from xattr filesystem to genfscon as it's xattrs + are currently nonfunctional. +- Change files and filesystem modules to use their own interfaces. +- Add user fonts to xserver. +- Additional interfaces in corecommands, miscfiles, and userdomain + from Joy Latten. +- Miscellaneous fixes from Thomas Bleher. +- Deprecate module name as first parameter of optional_policy() + now that optionals are allowed everywhere. +- Enable optional blocks in base module and monolithic policy. + This requires checkpolicy 1.30.1. +- Fix vpn module declaration. +- Numerous fixes from Dan Walsh. +- Change build order to preserve m4 line number information so policy + compile errors are useful again. +- Additional MLS interfaces from Chad Hanson. +- Move some rules out of domain_type() and domain_base_type() + to the TE file, to use the domain attribute to take advantage + of space savings from attribute use. +- Add global stack smashing protector rule for urandom access from + Petre Rodan. +- Fix temporary rules at the bottom of portmap. +- Updated comments in mls file from Chad Hanson. +- Patches from Dan Walsh: + Fri, 17 Mar 2006 + Wed, 29 Mar 2006 + Tue, 11 Apr 2006 + Fri, 14 Apr 2006 + Tue, 18 Apr 2006 + Thu, 20 Apr 2006 + Tue, 02 May 2006 + Mon, 15 May 2006 + Thu, 18 May 2006 + Tue, 06 Jun 2006 + Mon, 12 Jun 2006 + Tue, 20 Jun 2006 + Wed, 26 Jul 2006 + Wed, 23 Aug 2006 + Thu, 31 Aug 2006 + Fri, 01 Sep 2006 +- Added modules: + afs + amavis (Erich Schubert) + apt (Erich Schubert) + asterisk + audioentropy + authbind + backup + calamaris + cipe + clamav (Erich Schubert) + clockspeed (Petre Rodan) + courier + dante + dcc + ddclient + dpkg (Erich Schubert) + dnsmasq + ethereal + evolution + games + gatekeeper + gift + imaze + ircd + jabber + monop + mozilla + mplayer + munin + nagios + nessus + nsd + ntop + nx + oav + openca + openvpn (Petre Rodan) + perdition + portslave + postgrey + pxe + pyzor (Dan Walsh) + qmail (Petre Rodan) + razor + resmgr + rhgb + rssh + snort + soundserver + speedtouch + sxid + thunderbird + tor (Erich Schubert) + transproxy + tripwire + uptime + uwimap + vmware + watchdog + xen (Dan Walsh) + xprint + yam + * Tue Mar 07 2006 Chris PeBenito - 20060307 - Make all interface parameters required. - Move boot_t, system_map_t, and modules_object_t to files module, ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Makefile#2 (text+ko) ==== @@ -23,6 +23,16 @@ # NO OPTIONS BELOW HERE # +# Include necesary bits for being inside of an SEDarwin build environment +ifeq ($(shell test -e ../../../Makeconfig && echo 1),1) + include ../../../Makeconfig + SEDARWIN_BUILD=1 +endif + + +# XXX - SEDarwin is not up to binary policy version 21 yet so force 20 +OUTPUT_POLICY = 20 + # Include the local build.conf if it exists, otherwise # include the configuration of the root directory. include build.conf @@ -32,109 +42,140 @@ endif # refpolicy version -VERSION = $(shell cat VERSION) +version = $(shell cat VERSION) ifdef LOCAL_ROOT -BUILDDIR := $(LOCAL_ROOT)/ -TMPDIR := $(LOCAL_ROOT)/tmp -TAGS := $(LOCAL_ROOT)/tags +builddir := $(LOCAL_ROOT)/ +tmpdir := $(LOCAL_ROOT)/tmp +tags := $(LOCAL_ROOT)/tags else -TMPDIR := tmp -TAGS := tags +tmpdir := tmp +tags := tags endif # executable paths -BINDIR := /usr/bin -SBINDIR := /usr/sbin -CHECKPOLICY := $(BINDIR)/checkpolicy -CHECKMODULE := $(BINDIR)/checkmodule -SEMODULE := $(SBINDIR)/semodule -SEMOD_PKG := $(BINDIR)/semodule_package -LOADPOLICY := $(SBINDIR)/load_policy -SETFILES := $(SBINDIR)/setfiles -GENHOMEDIRCON := $(SBINDIR)/genhomedircon -XMLLINT := $(BINDIR)/xmllint -SECHECK := $(BINDIR)/sechecker +BINDIR ?= /usr/bin +SBINDIR ?= /usr/sbin +# XXX - bad hack +ifeq ($(SEDARWIN_BUILD),1) +CHECKPOLICY ?= $(SOURCE_ROOT)/policies/sedarwin/programs/checkpolicy/checkpolicy +CHECKMODULE ?= $(SOURCE_ROOT)/policies/sedarwin/programs/checkpolicy/checkmodule +SEMODULE ?= $(SOURCE_ROOT)/policies/sedarwin/programs/semodule/semodule +SEMOD_PKG ?= $(SOURCE_ROOT)/policies/sedarwin/programs/semodule_package/semodule_package +SEMOD_LNK ?= $(SOURCE_ROOT)/policies/sedarwin/programs/semodule_link/semodule_link +SEMOD_EXP ?= $(SOURCE_ROOT)/policies/sedarwin/programs/semodule_expand/semodule_expand +LOADPOLICY ?= $(SOURCE_ROOT)/policies/sedarwin/programs/load_policy/load_policy +SETFILES ?= $(SOURCE_ROOT)/policies/sedarwin/programs/setfiles/setfiles +MIGBUILDDIR ?= $(DARWIN_ROOT)/bootstrap_cmds/migcom.tproj +MIG ?= sh $(MIGBUILDDIR)/mig.sh -I$(DARWIN)/BUILD/obj/EXPORT_HDRS/osfmk -migcom $(MIGBUILDDIR)/migcom +MIG_DEFS ?= $(DARWIN_ROOT)/launchd/src/bootstrap.defs $(DARWIN_ROOT)/netinfo/servers/notifyd/notify_ipc.defs ../examples/mig/mtest.defs +else +CHECKPOLICY ?= $(BINDIR)/checkpolicy +CHECKMODULE ?= $(BINDIR)/checkmodule +SEMODULE ?= $(BINDIR)/semodule +SEMOD_PKG ?= $(BINDIR)/semodule_package +SEMOD_LNK ?= $(BINDIR)/semodule_link +SEMOD_EXP ?= $(BINDIR)/semodule_expand +LOADPOLICY ?= $(BINDIR)/load_policy +SETFILES ?= $(BINDIR)/setfiles +MIG ?= $(BINDIR)/mig +endif + +XMLLINT ?= $(BINDIR)/xmllint +SECHECK ?= $(BINDIR)/sechecker # interpreters and aux tools -AWK ?= gawk +AWK ?= awk GREP ?= egrep +INSTALL ?= install M4 ?= m4 PYTHON ?= python SED ?= sed +SORT ?= LC_ALL=C sort CFLAGS += -Wall # policy source layout -POLDIR := policy -MODDIR := $(POLDIR)/modules -FLASKDIR := $(POLDIR)/flask -SECCLASS := $(FLASKDIR)/security_classes -ISIDS := $(FLASKDIR)/initial_sids -AVS := $(FLASKDIR)/access_vectors +poldir := policy +moddir := $(poldir)/modules +flaskdir := $(poldir)/flask +secclass := $(flaskdir)/security_classes +isids := $(flaskdir)/initial_sids +avs := $(flaskdir)/access_vectors +mig_secclass := $(poldir)/mig_classes +mig_avs := $(poldir)/mig_access_vectors +mig_msgids = $(poldir)/mig_msgids # local source layout ifdef LOCAL_ROOT -LOCAL_POLDIR := $(LOCAL_ROOT)/policy -LOCAL_MODDIR := $(LOCAL_POLDIR)/modules +local_poldir := $(LOCAL_ROOT)/policy +local_moddir := $(local_poldir)/modules endif # policy building support tools -SUPPORT := support -GENXML := $(PYTHON) $(SUPPORT)/segenxml.py -GENDOC := $(PYTHON) $(SUPPORT)/sedoctool.py -GENPERM := $(PYTHON) $(SUPPORT)/genclassperms.py -FCSORT := $(TMPDIR)/fc_sort -SETBOOLS := $(AWK) -f $(SUPPORT)/set_bools_tuns.awk +support := support +genxml := $(PYTHON) $(support)/segenxml.py +gendoc := $(PYTHON) $(support)/sedoctool.py +genperm := $(PYTHON) $(support)/genclassperms.py +fcsort := $(tmpdir)/fc_sort +setbools := $(AWK) -f $(support)/set_bools_tuns.awk +get_type_attr_decl := $(SED) -E -f $(support)/get_type_attr_decl.sed +comment_move_decl := $(SED) -E -f $(support)/comment_move_decl.sed +gennetfilter := $(PYTHON) $(support)/gennetfilter.py +# use our own genhomedircon to make sure we have a known usable one, +# so policycoreutils updates are not required (RHEL4) +genhomedircon := $(PYTHON) $(support)/genhomedircon # documentation paths -DOCS := doc -XMLDTD = $(DOCS)/policy.dtd -LAYERXML = metadata.xml -DOCTEMPLATE = $(DOCS)/templates -DOCFILES = $(DOCS)/Makefile.example $(addprefix $(DOCS)/,example.te example.if example.fc) +docs := doc +xmldtd = $(docs)/policy.dtd +layerxml = metadata.xml +doctemplate = $(docs)/templates +docfiles = $(docs)/Makefile.example $(addprefix $(docs)/,example.te example.if example.fc) ifndef LOCAL_ROOT -POLXML = $(DOCS)/policy.xml -TUNXML = $(DOCS)/global_tunables.xml -BOOLXML = $(DOCS)/global_booleans.xml -HTMLDIR = $(DOCS)/html +polxml = $(docs)/policy.xml +tunxml = $(docs)/global_tunables.xml +boolxml = $(docs)/global_booleans.xml +htmldir = $(docs)/html else -POLXML = $(LOCAL_ROOT)/doc/policy.xml -TUNXML = $(LOCAL_ROOT)/doc/global_tunables.xml -BOOLXML = $(LOCAL_ROOT)/doc/global_booleans.xml -HTMLDIR = $(LOCAL_ROOT)/doc/html +polxml = $(LOCAL_ROOT)/doc/policy.xml +tunxml = $(LOCAL_ROOT)/doc/global_tunables.xml +boolxml = $(LOCAL_ROOT)/doc/global_booleans.xml +htmldir = $(LOCAL_ROOT)/doc/html endif # config file paths -GLOBALTUN = $(POLDIR)/global_tunables -GLOBALBOOL = $(POLDIR)/global_booleans -TUNABLES = $(POLDIR)/tunables.conf -ROLEMAP = $(POLDIR)/rolemap -USER_FILES := $(POLDIR)/users +globaltun = $(poldir)/global_tunables +globalbool = $(poldir)/global_booleans +rolemap = $(poldir)/rolemap +user_files := $(poldir)/users # local config file paths ifndef LOCAL_ROOT -MOD_CONF = $(POLDIR)/modules.conf -BOOLEANS = $(POLDIR)/booleans.conf +mod_conf = $(poldir)/modules.conf +booleans = $(poldir)/booleans.conf +tunables = $(poldir)/tunables.conf else -MOD_CONF = $(LOCAL_POLDIR)/modules.conf -BOOLEANS = $(LOCAL_POLDIR)/booleans.conf +mod_conf = $(local_poldir)/modules.conf +booleans = $(local_poldir)/booleans.conf +tunables = $(local_poldir)/tunables.conf endif # install paths -PKGNAME ?= refpolicy-$(VERSION) -PREFIX = $(DESTDIR)/usr -TOPDIR = $(DESTDIR)/etc/selinux -INSTALLDIR = $(TOPDIR)/$(NAME) -SRCPATH = $(INSTALLDIR)/src -USERPATH = $(INSTALLDIR)/users -CONTEXTPATH = $(INSTALLDIR)/contexts -FCPATH = $(CONTEXTPATH)/files/file_contexts -SHAREDIR = $(PREFIX)/share/selinux -MODPKGDIR = $(SHAREDIR)/$(NAME) -HEADERDIR = $(MODPKGDIR)/include -DOCSDIR = $(PREFIX)/share/doc/$(PKGNAME) +PKGNAME ?= refpolicy-$(version) +prefix = $(DESTDIR)/usr +topdir = $(DESTDIR)/etc/sedarwin +installdir = $(topdir)/$(strip $(NAME)) +srcpath = $(installdir)/src +userpath = $(installdir)/users +contextpath = $(installdir)/contexts +fcpath = $(contextpath)/files/file_contexts +ncpath = $(contextpath)/netfilter_contexts +sharedir = $(prefix)/share/sedarwin +modpkgdir = $(sharedir)/$(strip $(NAME)) +headerdir = $(modpkgdir)/include +docsdir = $(prefix)/share/doc/$(PKGNAME) # compile strict policy if requested. ifneq ($(findstring strict,$(TYPE)),) @@ -151,6 +192,7 @@ M4PARAM += -D enable_mls CHECKPOLICY += -M CHECKMODULE += -M + gennetfilter += -m endif # enable MLS if MCS requested. @@ -158,6 +200,7 @@ M4PARAM += -D enable_mcs CHECKPOLICY += -M CHECKMODULE += -M + gennetfilter += -c endif # enable distribution-specific policy @@ -165,6 +208,11 @@ M4PARAM += -D distro_$(DISTRO) endif +# rhel4 also implies redhat +ifeq "$(DISTRO)" "rhel4" + M4PARAM += -D distro_redhat +endif + # enable polyinstantiation ifeq ($(POLY),y) M4PARAM += -D enable_polyinstantiation @@ -199,68 +247,69 @@ CTAGS ?= ctags -# determine the policy version and current kernel version if possible -PV := $(shell $(CHECKPOLICY) -V |cut -f 1 -d ' ') -KV := $(shell cat /selinux/policyvers) - -# dont print version warnings if we are unable to determine -# the currently running kernel's policy version -ifeq ($(KV),) - KV := $(PV) +m4support := $(wildcard $(poldir)/support/*.spt) +ifdef LOCAL_ROOT +m4support += $(wildcard $(local_poldir)/support/*.spt) endif -M4SUPPORT = $(wildcard $(POLDIR)/support/*.spt $(LOCAL_POLDIR)/support/*.spt) +appconf := config/appconfig-$(TYPE) +seusers := $(appconf)/seusers +appdir := $(contextpath) +appfiles := $(addprefix $(appdir)/,default_contexts default_type initrc_context failsafe_context userhelper_context removable_context dbus_contexts customizable_types) $(contextpath)/files/media +net_contexts := $(builddir)net_contexts -APPCONF := config/appconfig-$(TYPE) -SEUSERS := $(APPCONF)/seusers -APPDIR := $(CONTEXTPATH) -APPFILES := $(addprefix $(APPDIR)/,default_contexts default_type initrc_context failsafe_context userhelper_context removable_context dbus_contexts customizable_types) $(CONTEXTPATH)/files/media -CONTEXTFILES += $(wildcard $(APPCONF)/*_context*) $(APPCONF)/media - -ALL_LAYERS := $(filter-out $(MODDIR)/CVS,$(shell find $(wildcard $(MODDIR)/*) -maxdepth 0 -type d)) +all_layers := $(filter-out $(moddir)/CVS,$(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)) ifdef LOCAL_ROOT -ALL_LAYERS += $(filter-out $(LOCAL_MODDIR)/CVS,$(shell find $(wildcard $(LOCAL_MODDIR)/*) -maxdepth 0 -type d)) +all_layers += $(filter-out $(local_moddir)/CVS,$(shell find $(wildcard $(local_moddir)/*) -maxdepth 0 -type d)) endif -GENERATED_TE := $(basename $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.te.in))) -GENERATED_IF := $(basename $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.if.in))) -GENERATED_FC := $(basename $(foreach dir,$(ALL_LAYERS),$(wildcard $(dir)/*.fc.in))) +generated_te := $(basename $(foreach dir,$(all_layers),$(wildcard $(dir)/*.te.in))) +generated_if := $(basename $(foreach dir,$(all_layers),$(wildcard $(dir)/*.if.in))) +generated_fc := $(basename $(foreach dir,$(all_layers),$(wildcard $(dir)/*.fc.in))) # sort here since it removes duplicates, which can happen # when a generated file is already generated >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 3 15:03: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 3D8F616A40F; Tue, 3 Oct 2006 15:03:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 00AA216A403 for ; Tue, 3 Oct 2006 15:03:58 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB07F43D45 for ; Tue, 3 Oct 2006 15:03:57 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93F3vrR025394 for ; Tue, 3 Oct 2006 15:03:57 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93F3v7c025390 for perforce@freebsd.org; Tue, 3 Oct 2006 15:03:57 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 15:03:57 GMT Message-Id: <200610031503.k93F3v7c025390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107183 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 15:03:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=107183 Change 107183 by millert@millert_macbook on 2006/10/03 15:03:26 #ifdef out entrypoints for now where we are missing bits in refpolicy. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#19 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#19 (text+ko) ==== @@ -1527,6 +1527,7 @@ return (mount_has_perm(cred, mp, FILESYSTEM__GETATTR, NULL)); } +#ifdef FILESYSTEM__SETATTR static int sebsd_mount_check_setattr(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct vfs_attr *vfa) @@ -1534,6 +1535,7 @@ return (mount_has_perm(cred, mp, FILESYSTEM__SETATTR, NULL)); } +#endif static int sebsd_mount_check_remount(struct ucred *cred, struct mount *mp, @@ -1559,6 +1561,7 @@ return (pipe_has_perm(cred, pipe, FIFO_FILE__IOCTL)); } +#ifdef FIFO_FILE__POLL static int sebsd_pipe_check_kqfilter(struct ucred *cred, struct knote *kn, struct pipe *pipe, struct label *pipelabel) @@ -1566,6 +1569,7 @@ return (pipe_has_perm(cred, pipe, FIFO_FILE__POLL)); } +#endif static int sebsd_pipe_check_read(struct ucred *cred, struct pipe *pipe, @@ -1607,6 +1611,7 @@ return (rc); } +#ifdef FIFO_FILE__POLL static int sebsd_pipe_check_select(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, int which) @@ -1614,6 +1619,7 @@ return (pipe_has_perm(cred, pipe, FIFO_FILE__POLL)); } +#endif static int sebsd_pipe_check_stat(struct ucred *cred, struct pipe *pipe, @@ -2179,6 +2185,7 @@ return (vnode_has_perm(cred, vp, FILE__GETATTR)); } +#if defined(FILE__POLL) && defined(FILE__GETATTR) static int sebsd_vnode_check_kqfilter(struct ucred *cred, struct ucred *file_cred, struct knote *kn, struct vnode *vp, struct label *label) @@ -2194,6 +2201,7 @@ return (0); } } +#endif static int sebsd_vnode_check_link(struct ucred *cred, struct vnode *dvp, @@ -2439,6 +2447,7 @@ return (0); } +#ifdef FILE__POLL static int sebsd_vnode_check_select(struct ucred *cred, struct vnode *vp, struct label *label, int which) @@ -2446,6 +2455,7 @@ return (vnode_has_perm(cred, vp, FILE__POLL)); } +#endif #ifdef HAS_ACLS static int @@ -2457,6 +2467,7 @@ } #endif +#ifdef FILE__SETATTR static int sebsd_vnode_check_setattrlist(struct ucred *cred, struct vnode *vp, struct label *vlabel, struct attrlist *alist) @@ -2464,6 +2475,7 @@ return (vnode_has_perm(cred, vp, FILE__SETATTR)); } +#endif static int sebsd_vnode_check_setextattr(struct ucred *cred, struct vnode *vp, @@ -2710,6 +2722,7 @@ } #endif +#ifdef SOCKET__POLL static int sebsd_socket_check_kqfilter(struct ucred *cred, struct knote *kn, struct xsocket *xso, struct label *socklabel) @@ -2717,6 +2730,7 @@ return (socket_has_perm(cred, socklabel, SOCKET__POLL)); } +#endif static int sebsd_socket_check_listen(struct ucred *cred, struct xsocket *xso, @@ -2760,6 +2774,7 @@ return (0); } +#ifdef SOCKET__POLL static int sebsd_socket_check_select(struct ucred *cred, struct xsocket *xso, struct label *socklabel, int which) @@ -2767,6 +2782,7 @@ return (socket_has_perm(cred, socklabel, SOCKET__POLL)); } +#endif static int sebsd_socket_check_send(struct ucred *cred, struct xsocket *xso, @@ -3136,6 +3152,7 @@ return (ipc_has_perm(cred, msglabel, MSG__RECEIVE)); } +#ifdef MSG__DESTROY static int sebsd_sysvmsq_check_msgrmid(struct ucred *cred, struct msg *msgptr, struct label *msglabel) @@ -3143,6 +3160,7 @@ return (ipc_has_perm(cred, msglabel, MSG__DESTROY)); } +#endif static int sebsd_sysvmsq_check_msqget(struct ucred *cred, struct msqid_kernel *msqkptr, @@ -3561,11 +3579,11 @@ .mpo_socket_check_connect = sebsd_socket_check_connect, .mpo_socket_check_create = sebsd_socket_check_create, // .mpo_socket_check_deliver = sebsd_socket_check_deliver, - .mpo_socket_check_kqfilter = sebsd_socket_check_kqfilter, +// .mpo_socket_check_kqfilter = sebsd_socket_check_kqfilter, .mpo_socket_check_listen = sebsd_socket_check_listen, .mpo_socket_check_receive = sebsd_socket_check_receive, .mpo_socket_check_setlabel = sebsd_socket_check_setlabel, - .mpo_socket_check_select = sebsd_socket_check_select, +// .mpo_socket_check_select = sebsd_socket_check_select, .mpo_socket_check_send = sebsd_socket_check_send, .mpo_socket_check_stat = sebsd_socket_check_stat, .mpo_system_check_acct = sebsd_system_check_acct, @@ -3592,7 +3610,7 @@ .mpo_vnode_check_deleteextattr = NOT_IMPLEMENTED, #endif .mpo_vnode_check_getattrlist = sebsd_vnode_check_getattrlist, - .mpo_vnode_check_kqfilter = sebsd_vnode_check_kqfilter, +// .mpo_vnode_check_kqfilter = sebsd_vnode_check_kqfilter, .mpo_vnode_check_link = sebsd_vnode_check_link, .mpo_vnode_check_lookup = sebsd_vnode_check_lookup, .mpo_vnode_check_mmap = sebsd_vnode_check_mmap, @@ -3605,8 +3623,8 @@ .mpo_vnode_check_rename_from = sebsd_vnode_check_rename_from, .mpo_vnode_check_rename_to = sebsd_vnode_check_rename_to, .mpo_vnode_check_revoke = sebsd_vnode_check_revoke, - .mpo_vnode_check_select = sebsd_vnode_check_select, - .mpo_vnode_check_setattrlist = sebsd_vnode_check_setattrlist, +// .mpo_vnode_check_select = sebsd_vnode_check_select, +// .mpo_vnode_check_setattrlist = sebsd_vnode_check_setattrlist, .mpo_vnode_check_getextattr = sebsd_vnode_check_getextattr, .mpo_vnode_check_setextattr = sebsd_vnode_check_setextattr, .mpo_vnode_check_setflags = sebsd_vnode_check_setflags, @@ -3616,10 +3634,10 @@ .mpo_vnode_check_stat = sebsd_vnode_check_stat, .mpo_vnode_check_write = sebsd_vnode_check_write, .mpo_pipe_check_ioctl = sebsd_pipe_check_ioctl, - .mpo_pipe_check_kqfilter = sebsd_pipe_check_kqfilter, +// .mpo_pipe_check_kqfilter = sebsd_pipe_check_kqfilter, .mpo_pipe_check_read = sebsd_pipe_check_read, .mpo_pipe_check_setlabel = sebsd_pipe_check_setlabel, - .mpo_pipe_check_select = sebsd_pipe_check_select, +// .mpo_pipe_check_select = sebsd_pipe_check_select, .mpo_pipe_check_stat = sebsd_pipe_check_stat, .mpo_pipe_check_write = sebsd_pipe_check_write, @@ -3635,7 +3653,7 @@ .mpo_mount_check_remount = sebsd_mount_check_remount, .mpo_mount_check_stat = sebsd_mount_check_stat, .mpo_mount_check_getattr = sebsd_mount_check_getattr, - .mpo_mount_check_setattr = sebsd_mount_check_setattr, +// .mpo_mount_check_setattr = sebsd_mount_check_setattr, .mpo_vnode_write_extattr = sebsd_vnode_write_extattr, @@ -3660,7 +3678,7 @@ .mpo_sysvmsq_check_enqueue = sebsd_sysvmsq_check_enqueue, .mpo_sysvmsq_check_msgrcv = sebsd_sysvmsq_check_msgrcv, - .mpo_sysvmsq_check_msgrmid = sebsd_sysvmsq_check_msgrmid, +// .mpo_sysvmsq_check_msgrmid = sebsd_sysvmsq_check_msgrmid, .mpo_sysvmsq_check_msqget = sebsd_sysvmsq_check_msqget, .mpo_sysvmsq_check_msqsnd = sebsd_sysvmsq_check_msqsnd, .mpo_sysvmsq_check_msqrcv = sebsd_sysvmsq_check_msqrcv, From owner-p4-projects@FreeBSD.ORG Tue Oct 3 15:06:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D14016A415; Tue, 3 Oct 2006 15:06:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2408416A407 for ; Tue, 3 Oct 2006 15:06:02 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6248B43D4C for ; Tue, 3 Oct 2006 15:06:01 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93F61c5025787 for ; Tue, 3 Oct 2006 15:06:01 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93F610R025782 for perforce@freebsd.org; Tue, 3 Oct 2006 15:06:01 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 15:06:01 GMT Message-Id: <200610031506.k93F610R025782@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107184 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 15:06:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=107184 Change 107184 by millert@millert_macbook on 2006/10/03 15:05:29 Regenerate from refpolicy Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/av_inherit.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/av_perm_to_string.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/av_permissions.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/class_to_string.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/common_perm_to_string.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/initial_sid_to_string.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/flask.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/av_inherit.h#2 (text+ko) ==== @@ -1,21 +1,32 @@ /* This file is automatically generated. Do not edit. */ - S_(SECCLASS_DIR, file, 0x00100000UL) - S_(SECCLASS_FILE, file, 0x00100000UL) - S_(SECCLASS_LNK_FILE, file, 0x00100000UL) - S_(SECCLASS_CHR_FILE, file, 0x00100000UL) - S_(SECCLASS_BLK_FILE, file, 0x00100000UL) - S_(SECCLASS_SOCK_FILE, file, 0x00100000UL) - S_(SECCLASS_FIFO_FILE, file, 0x00100000UL) - S_(SECCLASS_SOCKET, socket, 0x01000000UL) - S_(SECCLASS_TCP_SOCKET, socket, 0x01000000UL) - S_(SECCLASS_UDP_SOCKET, socket, 0x01000000UL) - S_(SECCLASS_RAWIP_SOCKET, socket, 0x01000000UL) - S_(SECCLASS_NETLINK_SOCKET, socket, 0x01000000UL) - S_(SECCLASS_PACKET_SOCKET, socket, 0x01000000UL) - S_(SECCLASS_KEY_SOCKET, socket, 0x01000000UL) - S_(SECCLASS_UNIX_STREAM_SOCKET, socket, 0x01000000UL) - S_(SECCLASS_UNIX_DGRAM_SOCKET, socket, 0x01000000UL) + S_(SECCLASS_DIR, file, 0x00020000UL) + S_(SECCLASS_FILE, file, 0x00020000UL) + S_(SECCLASS_LNK_FILE, file, 0x00020000UL) + S_(SECCLASS_CHR_FILE, file, 0x00020000UL) + S_(SECCLASS_BLK_FILE, file, 0x00020000UL) + S_(SECCLASS_SOCK_FILE, file, 0x00020000UL) + S_(SECCLASS_FIFO_FILE, file, 0x00020000UL) + S_(SECCLASS_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_TCP_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_UDP_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_RAWIP_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_PACKET_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_KEY_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_UNIX_STREAM_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_UNIX_DGRAM_SOCKET, socket, 0x00400000UL) S_(SECCLASS_IPC, ipc, 0x00000200UL) S_(SECCLASS_SEM, ipc, 0x00000200UL) S_(SECCLASS_MSGQ, ipc, 0x00000200UL) S_(SECCLASS_SHM, ipc, 0x00000200UL) + S_(SECCLASS_NETLINK_ROUTE_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_FIREWALL_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_TCPDIAG_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_NFLOG_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_XFRM_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_SELINUX_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_AUDIT_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_IP6FW_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_DNRT_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_NETLINK_KOBJECT_UEVENT_SOCKET, socket, 0x00400000UL) + S_(SECCLASS_APPLETALK_SOCKET, socket, 0x00400000UL) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/av_perm_to_string.h#2 (text+ko) ==== @@ -3,7 +3,6 @@ S_(SECCLASS_FILESYSTEM, FILESYSTEM__REMOUNT, "remount") S_(SECCLASS_FILESYSTEM, FILESYSTEM__UNMOUNT, "unmount") S_(SECCLASS_FILESYSTEM, FILESYSTEM__GETATTR, "getattr") - S_(SECCLASS_FILESYSTEM, FILESYSTEM__SETATTR, "setattr") S_(SECCLASS_FILESYSTEM, FILESYSTEM__RELABELFROM, "relabelfrom") S_(SECCLASS_FILESYSTEM, FILESYSTEM__RELABELTO, "relabelto") S_(SECCLASS_FILESYSTEM, FILESYSTEM__TRANSITION, "transition") @@ -17,7 +16,10 @@ S_(SECCLASS_DIR, DIR__RMDIR, "rmdir") S_(SECCLASS_FILE, FILE__EXECUTE_NO_TRANS, "execute_no_trans") S_(SECCLASS_FILE, FILE__ENTRYPOINT, "entrypoint") - S_(SECCLASS_FD, FD__CREATE, "create") + S_(SECCLASS_FILE, FILE__EXECMOD, "execmod") + S_(SECCLASS_CHR_FILE, CHR_FILE__EXECUTE_NO_TRANS, "execute_no_trans") + S_(SECCLASS_CHR_FILE, CHR_FILE__ENTRYPOINT, "entrypoint") + S_(SECCLASS_CHR_FILE, CHR_FILE__EXECMOD, "execmod") S_(SECCLASS_FD, FD__USE, "use") S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__CONNECTTO, "connectto") S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__NEWCONN, "newconn") @@ -33,8 +35,6 @@ S_(SECCLASS_NODE, NODE__RAWIP_RECV, "rawip_recv") S_(SECCLASS_NODE, NODE__RAWIP_SEND, "rawip_send") S_(SECCLASS_NODE, NODE__ENFORCE_DEST, "enforce_dest") - S_(SECCLASS_NETIF, NETIF__GETATTR, "getattr") - S_(SECCLASS_NETIF, NETIF__SETATTR, "setattr") S_(SECCLASS_NETIF, NETIF__TCP_RECV, "tcp_recv") S_(SECCLASS_NETIF, NETIF__TCP_SEND, "tcp_send") S_(SECCLASS_NETIF, NETIF__UDP_RECV, "udp_recv") @@ -68,10 +68,14 @@ S_(SECCLASS_PROCESS, PROCESS__SETRLIMIT, "setrlimit") S_(SECCLASS_PROCESS, PROCESS__RLIMITINH, "rlimitinh") S_(SECCLASS_PROCESS, PROCESS__DYNTRANSITION, "dyntransition") + S_(SECCLASS_PROCESS, PROCESS__SETCURRENT, "setcurrent") + S_(SECCLASS_PROCESS, PROCESS__EXECMEM, "execmem") + S_(SECCLASS_PROCESS, PROCESS__EXECSTACK, "execstack") + S_(SECCLASS_PROCESS, PROCESS__EXECHEAP, "execheap") + S_(SECCLASS_PROCESS, PROCESS__SETKEYCREATE, "setkeycreate") S_(SECCLASS_MSGQ, MSGQ__ENQUEUE, "enqueue") S_(SECCLASS_MSG, MSG__SEND, "send") S_(SECCLASS_MSG, MSG__RECEIVE, "receive") - S_(SECCLASS_MSG, MSG__DESTROY, "destroy") S_(SECCLASS_SHM, SHM__LOCK, "lock") S_(SECCLASS_SECURITY, SECURITY__COMPUTE_AV, "compute_av") S_(SECCLASS_SECURITY, SECURITY__COMPUTE_CREATE, "compute_create") @@ -82,22 +86,21 @@ S_(SECCLASS_SECURITY, SECURITY__COMPUTE_USER, "compute_user") S_(SECCLASS_SECURITY, SECURITY__SETENFORCE, "setenforce") S_(SECCLASS_SECURITY, SECURITY__SETBOOL, "setbool") + S_(SECCLASS_SECURITY, SECURITY__SETSECPARAM, "setsecparam") + S_(SECCLASS_SECURITY, SECURITY__SETCHECKREQPROT, "setcheckreqprot") S_(SECCLASS_SYSTEM, SYSTEM__IPC_INFO, "ipc_info") S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read") S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod") S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_CONSOLE, "syslog_console") S_(SECCLASS_CAPABILITY, CAPABILITY__CHOWN, "chown") - S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_EXECUTE, "dac_execute") - S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_WRITE, "dac_write") + S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_OVERRIDE, "dac_override") S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_READ_SEARCH, "dac_read_search") S_(SECCLASS_CAPABILITY, CAPABILITY__FOWNER, "fowner") S_(SECCLASS_CAPABILITY, CAPABILITY__FSETID, "fsetid") S_(SECCLASS_CAPABILITY, CAPABILITY__KILL, "kill") - S_(SECCLASS_CAPABILITY, CAPABILITY__SETFCAP, "setfcap") S_(SECCLASS_CAPABILITY, CAPABILITY__SETGID, "setgid") S_(SECCLASS_CAPABILITY, CAPABILITY__SETUID, "setuid") - S_(SECCLASS_CAPABILITY, CAPABILITY__AUDIT_CONTROL, "audit_control") - S_(SECCLASS_CAPABILITY, CAPABILITY__AUDIT_WRITE, "audit_write") + S_(SECCLASS_CAPABILITY, CAPABILITY__SETPCAP, "setpcap") S_(SECCLASS_CAPABILITY, CAPABILITY__LINUX_IMMUTABLE, "linux_immutable") S_(SECCLASS_CAPABILITY, CAPABILITY__NET_BIND_SERVICE, "net_bind_service") S_(SECCLASS_CAPABILITY, CAPABILITY__NET_BROADCAST, "net_broadcast") @@ -117,6 +120,137 @@ S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_TIME, "sys_time") S_(SECCLASS_CAPABILITY, CAPABILITY__SYS_TTY_CONFIG, "sys_tty_config") S_(SECCLASS_CAPABILITY, CAPABILITY__MKNOD, "mknod") + S_(SECCLASS_CAPABILITY, CAPABILITY__LEASE, "lease") + S_(SECCLASS_CAPABILITY, CAPABILITY__AUDIT_WRITE, "audit_write") + S_(SECCLASS_CAPABILITY, CAPABILITY__AUDIT_CONTROL, "audit_control") + S_(SECCLASS_PASSWD, PASSWD__PASSWD, "passwd") + S_(SECCLASS_PASSWD, PASSWD__CHFN, "chfn") + S_(SECCLASS_PASSWD, PASSWD__CHSH, "chsh") + S_(SECCLASS_PASSWD, PASSWD__ROOTOK, "rootok") + S_(SECCLASS_PASSWD, PASSWD__CRONTAB, "crontab") + S_(SECCLASS_DRAWABLE, DRAWABLE__CREATE, "create") + S_(SECCLASS_DRAWABLE, DRAWABLE__DESTROY, "destroy") + S_(SECCLASS_DRAWABLE, DRAWABLE__DRAW, "draw") + S_(SECCLASS_DRAWABLE, DRAWABLE__COPY, "copy") + S_(SECCLASS_DRAWABLE, DRAWABLE__GETATTR, "getattr") + S_(SECCLASS_GC, GC__CREATE, "create") + S_(SECCLASS_GC, GC__FREE, "free") + S_(SECCLASS_GC, GC__GETATTR, "getattr") + S_(SECCLASS_GC, GC__SETATTR, "setattr") + S_(SECCLASS_WINDOW, WINDOW__ADDCHILD, "addchild") + S_(SECCLASS_WINDOW, WINDOW__CREATE, "create") + S_(SECCLASS_WINDOW, WINDOW__DESTROY, "destroy") + S_(SECCLASS_WINDOW, WINDOW__MAP, "map") + S_(SECCLASS_WINDOW, WINDOW__UNMAP, "unmap") + S_(SECCLASS_WINDOW, WINDOW__CHSTACK, "chstack") + S_(SECCLASS_WINDOW, WINDOW__CHPROPLIST, "chproplist") + S_(SECCLASS_WINDOW, WINDOW__CHPROP, "chprop") + S_(SECCLASS_WINDOW, WINDOW__LISTPROP, "listprop") + S_(SECCLASS_WINDOW, WINDOW__GETATTR, "getattr") + S_(SECCLASS_WINDOW, WINDOW__SETATTR, "setattr") + S_(SECCLASS_WINDOW, WINDOW__SETFOCUS, "setfocus") + S_(SECCLASS_WINDOW, WINDOW__MOVE, "move") + S_(SECCLASS_WINDOW, WINDOW__CHSELECTION, "chselection") + S_(SECCLASS_WINDOW, WINDOW__CHPARENT, "chparent") + S_(SECCLASS_WINDOW, WINDOW__CTRLLIFE, "ctrllife") + S_(SECCLASS_WINDOW, WINDOW__ENUMERATE, "enumerate") + S_(SECCLASS_WINDOW, WINDOW__TRANSPARENT, "transparent") + S_(SECCLASS_WINDOW, WINDOW__MOUSEMOTION, "mousemotion") + S_(SECCLASS_WINDOW, WINDOW__CLIENTCOMEVENT, "clientcomevent") + S_(SECCLASS_WINDOW, WINDOW__INPUTEVENT, "inputevent") + S_(SECCLASS_WINDOW, WINDOW__DRAWEVENT, "drawevent") + S_(SECCLASS_WINDOW, WINDOW__WINDOWCHANGEEVENT, "windowchangeevent") + S_(SECCLASS_WINDOW, WINDOW__WINDOWCHANGEREQUEST, "windowchangerequest") + S_(SECCLASS_WINDOW, WINDOW__SERVERCHANGEEVENT, "serverchangeevent") + S_(SECCLASS_WINDOW, WINDOW__EXTENSIONEVENT, "extensionevent") + S_(SECCLASS_FONT, FONT__LOAD, "load") + S_(SECCLASS_FONT, FONT__FREE, "free") + S_(SECCLASS_FONT, FONT__GETATTR, "getattr") + S_(SECCLASS_FONT, FONT__USE, "use") + S_(SECCLASS_COLORMAP, COLORMAP__CREATE, "create") + S_(SECCLASS_COLORMAP, COLORMAP__FREE, "free") + S_(SECCLASS_COLORMAP, COLORMAP__INSTALL, "install") + S_(SECCLASS_COLORMAP, COLORMAP__UNINSTALL, "uninstall") + S_(SECCLASS_COLORMAP, COLORMAP__LIST, "list") + S_(SECCLASS_COLORMAP, COLORMAP__READ, "read") + S_(SECCLASS_COLORMAP, COLORMAP__STORE, "store") + S_(SECCLASS_COLORMAP, COLORMAP__GETATTR, "getattr") + S_(SECCLASS_COLORMAP, COLORMAP__SETATTR, "setattr") + S_(SECCLASS_PROPERTY, PROPERTY__CREATE, "create") + S_(SECCLASS_PROPERTY, PROPERTY__FREE, "free") + S_(SECCLASS_PROPERTY, PROPERTY__READ, "read") + S_(SECCLASS_PROPERTY, PROPERTY__WRITE, "write") + S_(SECCLASS_CURSOR, CURSOR__CREATE, "create") + S_(SECCLASS_CURSOR, CURSOR__CREATEGLYPH, "createglyph") + S_(SECCLASS_CURSOR, CURSOR__FREE, "free") + S_(SECCLASS_CURSOR, CURSOR__ASSIGN, "assign") + S_(SECCLASS_CURSOR, CURSOR__SETATTR, "setattr") + S_(SECCLASS_XCLIENT, XCLIENT__KILL, "kill") + S_(SECCLASS_XINPUT, XINPUT__LOOKUP, "lookup") + S_(SECCLASS_XINPUT, XINPUT__GETATTR, "getattr") + S_(SECCLASS_XINPUT, XINPUT__SETATTR, "setattr") + S_(SECCLASS_XINPUT, XINPUT__SETFOCUS, "setfocus") + S_(SECCLASS_XINPUT, XINPUT__WARPPOINTER, "warppointer") + S_(SECCLASS_XINPUT, XINPUT__ACTIVEGRAB, "activegrab") + S_(SECCLASS_XINPUT, XINPUT__PASSIVEGRAB, "passivegrab") + S_(SECCLASS_XINPUT, XINPUT__UNGRAB, "ungrab") + S_(SECCLASS_XINPUT, XINPUT__BELL, "bell") + S_(SECCLASS_XINPUT, XINPUT__MOUSEMOTION, "mousemotion") + S_(SECCLASS_XINPUT, XINPUT__RELABELINPUT, "relabelinput") + S_(SECCLASS_XSERVER, XSERVER__SCREENSAVER, "screensaver") + S_(SECCLASS_XSERVER, XSERVER__GETHOSTLIST, "gethostlist") + S_(SECCLASS_XSERVER, XSERVER__SETHOSTLIST, "sethostlist") + S_(SECCLASS_XSERVER, XSERVER__GETFONTPATH, "getfontpath") + S_(SECCLASS_XSERVER, XSERVER__SETFONTPATH, "setfontpath") + S_(SECCLASS_XSERVER, XSERVER__GETATTR, "getattr") + S_(SECCLASS_XSERVER, XSERVER__GRAB, "grab") + S_(SECCLASS_XSERVER, XSERVER__UNGRAB, "ungrab") + S_(SECCLASS_XEXTENSION, XEXTENSION__QUERY, "query") + S_(SECCLASS_XEXTENSION, XEXTENSION__USE, "use") + S_(SECCLASS_PAX, PAX__PAGEEXEC, "pageexec") + S_(SECCLASS_PAX, PAX__EMUTRAMP, "emutramp") + S_(SECCLASS_PAX, PAX__MPROTECT, "mprotect") + S_(SECCLASS_PAX, PAX__RANDMMAP, "randmmap") + S_(SECCLASS_PAX, PAX__RANDEXEC, "randexec") + S_(SECCLASS_PAX, PAX__SEGMEXEC, "segmexec") + S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_READ, "nlmsg_read") + S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_WRITE, "nlmsg_write") + S_(SECCLASS_NETLINK_FIREWALL_SOCKET, NETLINK_FIREWALL_SOCKET__NLMSG_READ, "nlmsg_read") + S_(SECCLASS_NETLINK_FIREWALL_SOCKET, NETLINK_FIREWALL_SOCKET__NLMSG_WRITE, "nlmsg_write") + S_(SECCLASS_NETLINK_TCPDIAG_SOCKET, NETLINK_TCPDIAG_SOCKET__NLMSG_READ, "nlmsg_read") + S_(SECCLASS_NETLINK_TCPDIAG_SOCKET, NETLINK_TCPDIAG_SOCKET__NLMSG_WRITE, "nlmsg_write") + S_(SECCLASS_NETLINK_XFRM_SOCKET, NETLINK_XFRM_SOCKET__NLMSG_READ, "nlmsg_read") + S_(SECCLASS_NETLINK_XFRM_SOCKET, NETLINK_XFRM_SOCKET__NLMSG_WRITE, "nlmsg_write") + S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_READ, "nlmsg_read") + S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_WRITE, "nlmsg_write") + S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_RELAY, "nlmsg_relay") + S_(SECCLASS_NETLINK_AUDIT_SOCKET, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV, "nlmsg_readpriv") + S_(SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_READ, "nlmsg_read") + S_(SECCLASS_NETLINK_IP6FW_SOCKET, NETLINK_IP6FW_SOCKET__NLMSG_WRITE, "nlmsg_write") + S_(SECCLASS_DBUS, DBUS__ACQUIRE_SVC, "acquire_svc") + S_(SECCLASS_DBUS, DBUS__SEND_MSG, "send_msg") + S_(SECCLASS_NSCD, NSCD__GETPWD, "getpwd") + S_(SECCLASS_NSCD, NSCD__GETGRP, "getgrp") + S_(SECCLASS_NSCD, NSCD__GETHOST, "gethost") + S_(SECCLASS_NSCD, NSCD__GETSTAT, "getstat") + S_(SECCLASS_NSCD, NSCD__ADMIN, "admin") + S_(SECCLASS_NSCD, NSCD__SHMEMPWD, "shmempwd") + S_(SECCLASS_NSCD, NSCD__SHMEMGRP, "shmemgrp") + S_(SECCLASS_NSCD, NSCD__SHMEMHOST, "shmemhost") + S_(SECCLASS_ASSOCIATION, ASSOCIATION__SENDTO, "sendto") + S_(SECCLASS_ASSOCIATION, ASSOCIATION__RECVFROM, "recvfrom") + S_(SECCLASS_ASSOCIATION, ASSOCIATION__SETCONTEXT, "setcontext") + S_(SECCLASS_ASSOCIATION, ASSOCIATION__POLMATCH, "polmatch") + S_(SECCLASS_PACKET, PACKET__SEND, "send") + S_(SECCLASS_PACKET, PACKET__RECV, "recv") + S_(SECCLASS_PACKET, PACKET__RELABELTO, "relabelto") + S_(SECCLASS_KEY, KEY__VIEW, "view") + S_(SECCLASS_KEY, KEY__READ, "read") + S_(SECCLASS_KEY, KEY__WRITE, "write") + S_(SECCLASS_KEY, KEY__SEARCH, "search") + S_(SECCLASS_KEY, KEY__LINK, "link") + S_(SECCLASS_KEY, KEY__SETATTR, "setattr") + S_(SECCLASS_KEY, KEY__CREATE, "create") S_(SECCLASS_MACH_PORT, MACH_PORT__RELABELFROM, "relabelfrom") S_(SECCLASS_MACH_PORT, MACH_PORT__RELABELTO, "relabelto") S_(SECCLASS_MACH_PORT, MACH_PORT__SEND, "send") ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/av_permissions.h#2 (text+ko) ==== @@ -1,49 +1,44 @@ /* This file is automatically generated. Do not edit. */ -#define COMMON_FILE__POLL 0x00000001UL -#define COMMON_FILE__IOCTL 0x00000002UL -#define COMMON_FILE__READ 0x00000004UL -#define COMMON_FILE__WRITE 0x00000008UL -#define COMMON_FILE__CREATE 0x00000010UL -#define COMMON_FILE__GETATTR 0x00000020UL -#define COMMON_FILE__SETATTR 0x00000040UL -#define COMMON_FILE__LOCK 0x00000080UL -#define COMMON_FILE__RELABELFROM 0x00000100UL -#define COMMON_FILE__RELABELTO 0x00000200UL -#define COMMON_FILE__TRANSITION 0x00000400UL -#define COMMON_FILE__APPEND 0x00000800UL -#define COMMON_FILE__ACCESS 0x00001000UL -#define COMMON_FILE__UNLINK 0x00002000UL -#define COMMON_FILE__LINK 0x00004000UL -#define COMMON_FILE__RENAME 0x00008000UL -#define COMMON_FILE__EXECUTE 0x00010000UL -#define COMMON_FILE__SWAPON 0x00020000UL -#define COMMON_FILE__QUOTAON 0x00040000UL -#define COMMON_FILE__MOUNTON 0x00080000UL +#define COMMON_FILE__IOCTL 0x00000001UL +#define COMMON_FILE__READ 0x00000002UL +#define COMMON_FILE__WRITE 0x00000004UL +#define COMMON_FILE__CREATE 0x00000008UL +#define COMMON_FILE__GETATTR 0x00000010UL +#define COMMON_FILE__SETATTR 0x00000020UL +#define COMMON_FILE__LOCK 0x00000040UL +#define COMMON_FILE__RELABELFROM 0x00000080UL +#define COMMON_FILE__RELABELTO 0x00000100UL +#define COMMON_FILE__APPEND 0x00000200UL +#define COMMON_FILE__UNLINK 0x00000400UL +#define COMMON_FILE__LINK 0x00000800UL +#define COMMON_FILE__RENAME 0x00001000UL +#define COMMON_FILE__EXECUTE 0x00002000UL +#define COMMON_FILE__SWAPON 0x00004000UL +#define COMMON_FILE__QUOTAON 0x00008000UL +#define COMMON_FILE__MOUNTON 0x00010000UL -#define COMMON_SOCKET__POLL 0x00000001UL -#define COMMON_SOCKET__IOCTL 0x00000002UL -#define COMMON_SOCKET__READ 0x00000004UL -#define COMMON_SOCKET__WRITE 0x00000008UL -#define COMMON_SOCKET__CREATE 0x00000010UL -#define COMMON_SOCKET__GETATTR 0x00000020UL -#define COMMON_SOCKET__SETATTR 0x00000040UL -#define COMMON_SOCKET__LOCK 0x00000080UL -#define COMMON_SOCKET__RELABELFROM 0x00000100UL -#define COMMON_SOCKET__RELABELTO 0x00000200UL -#define COMMON_SOCKET__TRANSITION 0x00000400UL -#define COMMON_SOCKET__APPEND 0x00000800UL -#define COMMON_SOCKET__BIND 0x00001000UL -#define COMMON_SOCKET__CONNECT 0x00002000UL -#define COMMON_SOCKET__LISTEN 0x00004000UL -#define COMMON_SOCKET__ACCEPT 0x00008000UL -#define COMMON_SOCKET__GETOPT 0x00010000UL -#define COMMON_SOCKET__SETOPT 0x00020000UL -#define COMMON_SOCKET__SHUTDOWN 0x00040000UL -#define COMMON_SOCKET__RECVFROM 0x00080000UL -#define COMMON_SOCKET__SENDTO 0x00100000UL -#define COMMON_SOCKET__RECV_MSG 0x00200000UL -#define COMMON_SOCKET__SEND_MSG 0x00400000UL -#define COMMON_SOCKET__NAME_BIND 0x00800000UL +#define COMMON_SOCKET__IOCTL 0x00000001UL +#define COMMON_SOCKET__READ 0x00000002UL +#define COMMON_SOCKET__WRITE 0x00000004UL +#define COMMON_SOCKET__CREATE 0x00000008UL +#define COMMON_SOCKET__GETATTR 0x00000010UL +#define COMMON_SOCKET__SETATTR 0x00000020UL +#define COMMON_SOCKET__LOCK 0x00000040UL +#define COMMON_SOCKET__RELABELFROM 0x00000080UL +#define COMMON_SOCKET__RELABELTO 0x00000100UL +#define COMMON_SOCKET__APPEND 0x00000200UL +#define COMMON_SOCKET__BIND 0x00000400UL +#define COMMON_SOCKET__CONNECT 0x00000800UL +#define COMMON_SOCKET__LISTEN 0x00001000UL +#define COMMON_SOCKET__ACCEPT 0x00002000UL +#define COMMON_SOCKET__GETOPT 0x00004000UL +#define COMMON_SOCKET__SETOPT 0x00008000UL +#define COMMON_SOCKET__SHUTDOWN 0x00010000UL +#define COMMON_SOCKET__RECVFROM 0x00020000UL +#define COMMON_SOCKET__SENDTO 0x00040000UL +#define COMMON_SOCKET__RECV_MSG 0x00080000UL +#define COMMON_SOCKET__SEND_MSG 0x00100000UL +#define COMMON_SOCKET__NAME_BIND 0x00200000UL #define COMMON_IPC__CREATE 0x00000001UL #define COMMON_IPC__DESTROY 0x00000002UL @@ -59,282 +54,256 @@ #define FILESYSTEM__REMOUNT 0x00000002UL #define FILESYSTEM__UNMOUNT 0x00000004UL #define FILESYSTEM__GETATTR 0x00000008UL -#define FILESYSTEM__SETATTR 0x00000010UL -#define FILESYSTEM__RELABELFROM 0x00000020UL -#define FILESYSTEM__RELABELTO 0x00000040UL -#define FILESYSTEM__TRANSITION 0x00000080UL -#define FILESYSTEM__ASSOCIATE 0x00000100UL -#define FILESYSTEM__QUOTAMOD 0x00000200UL -#define FILESYSTEM__QUOTAGET 0x00000400UL +#define FILESYSTEM__RELABELFROM 0x00000010UL +#define FILESYSTEM__RELABELTO 0x00000020UL +#define FILESYSTEM__TRANSITION 0x00000040UL +#define FILESYSTEM__ASSOCIATE 0x00000080UL +#define FILESYSTEM__QUOTAMOD 0x00000100UL +#define FILESYSTEM__QUOTAGET 0x00000200UL + +#define DIR__IOCTL 0x00000001UL +#define DIR__READ 0x00000002UL +#define DIR__WRITE 0x00000004UL +#define DIR__CREATE 0x00000008UL +#define DIR__GETATTR 0x00000010UL +#define DIR__SETATTR 0x00000020UL +#define DIR__LOCK 0x00000040UL +#define DIR__RELABELFROM 0x00000080UL +#define DIR__RELABELTO 0x00000100UL +#define DIR__APPEND 0x00000200UL +#define DIR__UNLINK 0x00000400UL +#define DIR__LINK 0x00000800UL +#define DIR__RENAME 0x00001000UL +#define DIR__EXECUTE 0x00002000UL +#define DIR__SWAPON 0x00004000UL +#define DIR__QUOTAON 0x00008000UL +#define DIR__MOUNTON 0x00010000UL -#define DIR__POLL 0x00000001UL -#define DIR__IOCTL 0x00000002UL -#define DIR__READ 0x00000004UL -#define DIR__WRITE 0x00000008UL -#define DIR__CREATE 0x00000010UL -#define DIR__GETATTR 0x00000020UL -#define DIR__SETATTR 0x00000040UL -#define DIR__LOCK 0x00000080UL -#define DIR__RELABELFROM 0x00000100UL -#define DIR__RELABELTO 0x00000200UL -#define DIR__TRANSITION 0x00000400UL -#define DIR__APPEND 0x00000800UL -#define DIR__ACCESS 0x00001000UL -#define DIR__UNLINK 0x00002000UL -#define DIR__LINK 0x00004000UL -#define DIR__RENAME 0x00008000UL -#define DIR__EXECUTE 0x00010000UL -#define DIR__SWAPON 0x00020000UL -#define DIR__QUOTAON 0x00040000UL -#define DIR__MOUNTON 0x00080000UL +#define DIR__ADD_NAME 0x00020000UL +#define DIR__REMOVE_NAME 0x00040000UL +#define DIR__REPARENT 0x00080000UL +#define DIR__SEARCH 0x00100000UL +#define DIR__RMDIR 0x00200000UL -#define DIR__ADD_NAME 0x00100000UL -#define DIR__REMOVE_NAME 0x00200000UL -#define DIR__REPARENT 0x00400000UL -#define DIR__SEARCH 0x00800000UL -#define DIR__RMDIR 0x01000000UL +#define FILE__IOCTL 0x00000001UL +#define FILE__READ 0x00000002UL +#define FILE__WRITE 0x00000004UL +#define FILE__CREATE 0x00000008UL +#define FILE__GETATTR 0x00000010UL +#define FILE__SETATTR 0x00000020UL +#define FILE__LOCK 0x00000040UL +#define FILE__RELABELFROM 0x00000080UL +#define FILE__RELABELTO 0x00000100UL +#define FILE__APPEND 0x00000200UL +#define FILE__UNLINK 0x00000400UL +#define FILE__LINK 0x00000800UL +#define FILE__RENAME 0x00001000UL +#define FILE__EXECUTE 0x00002000UL +#define FILE__SWAPON 0x00004000UL +#define FILE__QUOTAON 0x00008000UL +#define FILE__MOUNTON 0x00010000UL -#define FILE__POLL 0x00000001UL -#define FILE__IOCTL 0x00000002UL -#define FILE__READ 0x00000004UL -#define FILE__WRITE 0x00000008UL -#define FILE__CREATE 0x00000010UL -#define FILE__GETATTR 0x00000020UL -#define FILE__SETATTR 0x00000040UL -#define FILE__LOCK 0x00000080UL -#define FILE__RELABELFROM 0x00000100UL -#define FILE__RELABELTO 0x00000200UL -#define FILE__TRANSITION 0x00000400UL -#define FILE__APPEND 0x00000800UL -#define FILE__ACCESS 0x00001000UL -#define FILE__UNLINK 0x00002000UL -#define FILE__LINK 0x00004000UL -#define FILE__RENAME 0x00008000UL -#define FILE__EXECUTE 0x00010000UL -#define FILE__SWAPON 0x00020000UL -#define FILE__QUOTAON 0x00040000UL -#define FILE__MOUNTON 0x00080000UL +#define FILE__EXECUTE_NO_TRANS 0x00020000UL +#define FILE__ENTRYPOINT 0x00040000UL +#define FILE__EXECMOD 0x00080000UL -#define FILE__EXECUTE_NO_TRANS 0x00100000UL -#define FILE__ENTRYPOINT 0x00200000UL +#define LNK_FILE__IOCTL 0x00000001UL +#define LNK_FILE__READ 0x00000002UL +#define LNK_FILE__WRITE 0x00000004UL +#define LNK_FILE__CREATE 0x00000008UL +#define LNK_FILE__GETATTR 0x00000010UL +#define LNK_FILE__SETATTR 0x00000020UL +#define LNK_FILE__LOCK 0x00000040UL +#define LNK_FILE__RELABELFROM 0x00000080UL +#define LNK_FILE__RELABELTO 0x00000100UL +#define LNK_FILE__APPEND 0x00000200UL +#define LNK_FILE__UNLINK 0x00000400UL +#define LNK_FILE__LINK 0x00000800UL +#define LNK_FILE__RENAME 0x00001000UL +#define LNK_FILE__EXECUTE 0x00002000UL +#define LNK_FILE__SWAPON 0x00004000UL +#define LNK_FILE__QUOTAON 0x00008000UL +#define LNK_FILE__MOUNTON 0x00010000UL -#define LNK_FILE__POLL 0x00000001UL -#define LNK_FILE__IOCTL 0x00000002UL -#define LNK_FILE__READ 0x00000004UL -#define LNK_FILE__WRITE 0x00000008UL -#define LNK_FILE__CREATE 0x00000010UL -#define LNK_FILE__GETATTR 0x00000020UL -#define LNK_FILE__SETATTR 0x00000040UL -#define LNK_FILE__LOCK 0x00000080UL -#define LNK_FILE__RELABELFROM 0x00000100UL -#define LNK_FILE__RELABELTO 0x00000200UL -#define LNK_FILE__TRANSITION 0x00000400UL -#define LNK_FILE__APPEND 0x00000800UL -#define LNK_FILE__ACCESS 0x00001000UL -#define LNK_FILE__UNLINK 0x00002000UL -#define LNK_FILE__LINK 0x00004000UL -#define LNK_FILE__RENAME 0x00008000UL -#define LNK_FILE__EXECUTE 0x00010000UL -#define LNK_FILE__SWAPON 0x00020000UL -#define LNK_FILE__QUOTAON 0x00040000UL -#define LNK_FILE__MOUNTON 0x00080000UL +#define CHR_FILE__IOCTL 0x00000001UL +#define CHR_FILE__READ 0x00000002UL +#define CHR_FILE__WRITE 0x00000004UL +#define CHR_FILE__CREATE 0x00000008UL +#define CHR_FILE__GETATTR 0x00000010UL +#define CHR_FILE__SETATTR 0x00000020UL +#define CHR_FILE__LOCK 0x00000040UL +#define CHR_FILE__RELABELFROM 0x00000080UL +#define CHR_FILE__RELABELTO 0x00000100UL +#define CHR_FILE__APPEND 0x00000200UL +#define CHR_FILE__UNLINK 0x00000400UL +#define CHR_FILE__LINK 0x00000800UL +#define CHR_FILE__RENAME 0x00001000UL +#define CHR_FILE__EXECUTE 0x00002000UL +#define CHR_FILE__SWAPON 0x00004000UL +#define CHR_FILE__QUOTAON 0x00008000UL +#define CHR_FILE__MOUNTON 0x00010000UL -#define CHR_FILE__POLL 0x00000001UL -#define CHR_FILE__IOCTL 0x00000002UL -#define CHR_FILE__READ 0x00000004UL -#define CHR_FILE__WRITE 0x00000008UL -#define CHR_FILE__CREATE 0x00000010UL -#define CHR_FILE__GETATTR 0x00000020UL -#define CHR_FILE__SETATTR 0x00000040UL -#define CHR_FILE__LOCK 0x00000080UL -#define CHR_FILE__RELABELFROM 0x00000100UL -#define CHR_FILE__RELABELTO 0x00000200UL -#define CHR_FILE__TRANSITION 0x00000400UL -#define CHR_FILE__APPEND 0x00000800UL -#define CHR_FILE__ACCESS 0x00001000UL -#define CHR_FILE__UNLINK 0x00002000UL -#define CHR_FILE__LINK 0x00004000UL -#define CHR_FILE__RENAME 0x00008000UL -#define CHR_FILE__EXECUTE 0x00010000UL -#define CHR_FILE__SWAPON 0x00020000UL -#define CHR_FILE__QUOTAON 0x00040000UL -#define CHR_FILE__MOUNTON 0x00080000UL +#define CHR_FILE__EXECUTE_NO_TRANS 0x00020000UL +#define CHR_FILE__ENTRYPOINT 0x00040000UL +#define CHR_FILE__EXECMOD 0x00080000UL -#define BLK_FILE__POLL 0x00000001UL -#define BLK_FILE__IOCTL 0x00000002UL -#define BLK_FILE__READ 0x00000004UL -#define BLK_FILE__WRITE 0x00000008UL -#define BLK_FILE__CREATE 0x00000010UL -#define BLK_FILE__GETATTR 0x00000020UL -#define BLK_FILE__SETATTR 0x00000040UL -#define BLK_FILE__LOCK 0x00000080UL -#define BLK_FILE__RELABELFROM 0x00000100UL -#define BLK_FILE__RELABELTO 0x00000200UL -#define BLK_FILE__TRANSITION 0x00000400UL -#define BLK_FILE__APPEND 0x00000800UL -#define BLK_FILE__ACCESS 0x00001000UL -#define BLK_FILE__UNLINK 0x00002000UL -#define BLK_FILE__LINK 0x00004000UL -#define BLK_FILE__RENAME 0x00008000UL -#define BLK_FILE__EXECUTE 0x00010000UL -#define BLK_FILE__SWAPON 0x00020000UL -#define BLK_FILE__QUOTAON 0x00040000UL -#define BLK_FILE__MOUNTON 0x00080000UL +#define BLK_FILE__IOCTL 0x00000001UL +#define BLK_FILE__READ 0x00000002UL +#define BLK_FILE__WRITE 0x00000004UL +#define BLK_FILE__CREATE 0x00000008UL +#define BLK_FILE__GETATTR 0x00000010UL +#define BLK_FILE__SETATTR 0x00000020UL +#define BLK_FILE__LOCK 0x00000040UL +#define BLK_FILE__RELABELFROM 0x00000080UL +#define BLK_FILE__RELABELTO 0x00000100UL +#define BLK_FILE__APPEND 0x00000200UL +#define BLK_FILE__UNLINK 0x00000400UL +#define BLK_FILE__LINK 0x00000800UL +#define BLK_FILE__RENAME 0x00001000UL +#define BLK_FILE__EXECUTE 0x00002000UL +#define BLK_FILE__SWAPON 0x00004000UL +#define BLK_FILE__QUOTAON 0x00008000UL +#define BLK_FILE__MOUNTON 0x00010000UL -#define SOCK_FILE__POLL 0x00000001UL -#define SOCK_FILE__IOCTL 0x00000002UL -#define SOCK_FILE__READ 0x00000004UL -#define SOCK_FILE__WRITE 0x00000008UL -#define SOCK_FILE__CREATE 0x00000010UL -#define SOCK_FILE__GETATTR 0x00000020UL -#define SOCK_FILE__SETATTR 0x00000040UL -#define SOCK_FILE__LOCK 0x00000080UL -#define SOCK_FILE__RELABELFROM 0x00000100UL -#define SOCK_FILE__RELABELTO 0x00000200UL -#define SOCK_FILE__TRANSITION 0x00000400UL -#define SOCK_FILE__APPEND 0x00000800UL -#define SOCK_FILE__ACCESS 0x00001000UL -#define SOCK_FILE__UNLINK 0x00002000UL -#define SOCK_FILE__LINK 0x00004000UL -#define SOCK_FILE__RENAME 0x00008000UL -#define SOCK_FILE__EXECUTE 0x00010000UL -#define SOCK_FILE__SWAPON 0x00020000UL -#define SOCK_FILE__QUOTAON 0x00040000UL -#define SOCK_FILE__MOUNTON 0x00080000UL +#define SOCK_FILE__IOCTL 0x00000001UL +#define SOCK_FILE__READ 0x00000002UL +#define SOCK_FILE__WRITE 0x00000004UL +#define SOCK_FILE__CREATE 0x00000008UL +#define SOCK_FILE__GETATTR 0x00000010UL +#define SOCK_FILE__SETATTR 0x00000020UL +#define SOCK_FILE__LOCK 0x00000040UL +#define SOCK_FILE__RELABELFROM 0x00000080UL +#define SOCK_FILE__RELABELTO 0x00000100UL +#define SOCK_FILE__APPEND 0x00000200UL +#define SOCK_FILE__UNLINK 0x00000400UL +#define SOCK_FILE__LINK 0x00000800UL +#define SOCK_FILE__RENAME 0x00001000UL +#define SOCK_FILE__EXECUTE 0x00002000UL +#define SOCK_FILE__SWAPON 0x00004000UL +#define SOCK_FILE__QUOTAON 0x00008000UL +#define SOCK_FILE__MOUNTON 0x00010000UL -#define FIFO_FILE__POLL 0x00000001UL -#define FIFO_FILE__IOCTL 0x00000002UL -#define FIFO_FILE__READ 0x00000004UL -#define FIFO_FILE__WRITE 0x00000008UL -#define FIFO_FILE__CREATE 0x00000010UL -#define FIFO_FILE__GETATTR 0x00000020UL -#define FIFO_FILE__SETATTR 0x00000040UL -#define FIFO_FILE__LOCK 0x00000080UL -#define FIFO_FILE__RELABELFROM 0x00000100UL -#define FIFO_FILE__RELABELTO 0x00000200UL -#define FIFO_FILE__TRANSITION 0x00000400UL -#define FIFO_FILE__APPEND 0x00000800UL -#define FIFO_FILE__ACCESS 0x00001000UL -#define FIFO_FILE__UNLINK 0x00002000UL -#define FIFO_FILE__LINK 0x00004000UL -#define FIFO_FILE__RENAME 0x00008000UL -#define FIFO_FILE__EXECUTE 0x00010000UL -#define FIFO_FILE__SWAPON 0x00020000UL -#define FIFO_FILE__QUOTAON 0x00040000UL -#define FIFO_FILE__MOUNTON 0x00080000UL +#define FIFO_FILE__IOCTL 0x00000001UL +#define FIFO_FILE__READ 0x00000002UL +#define FIFO_FILE__WRITE 0x00000004UL +#define FIFO_FILE__CREATE 0x00000008UL +#define FIFO_FILE__GETATTR 0x00000010UL +#define FIFO_FILE__SETATTR 0x00000020UL +#define FIFO_FILE__LOCK 0x00000040UL +#define FIFO_FILE__RELABELFROM 0x00000080UL +#define FIFO_FILE__RELABELTO 0x00000100UL +#define FIFO_FILE__APPEND 0x00000200UL +#define FIFO_FILE__UNLINK 0x00000400UL +#define FIFO_FILE__LINK 0x00000800UL +#define FIFO_FILE__RENAME 0x00001000UL +#define FIFO_FILE__EXECUTE 0x00002000UL +#define FIFO_FILE__SWAPON 0x00004000UL +#define FIFO_FILE__QUOTAON 0x00008000UL +#define FIFO_FILE__MOUNTON 0x00010000UL -#define FD__CREATE 0x00000001UL -#define FD__USE 0x00000002UL +#define FD__USE 0x00000001UL -#define SOCKET__POLL 0x00000001UL -#define SOCKET__IOCTL 0x00000002UL -#define SOCKET__READ 0x00000004UL -#define SOCKET__WRITE 0x00000008UL -#define SOCKET__CREATE 0x00000010UL -#define SOCKET__GETATTR 0x00000020UL -#define SOCKET__SETATTR 0x00000040UL -#define SOCKET__LOCK 0x00000080UL -#define SOCKET__RELABELFROM 0x00000100UL -#define SOCKET__RELABELTO 0x00000200UL -#define SOCKET__TRANSITION 0x00000400UL -#define SOCKET__APPEND 0x00000800UL -#define SOCKET__BIND 0x00001000UL -#define SOCKET__CONNECT 0x00002000UL -#define SOCKET__LISTEN 0x00004000UL -#define SOCKET__ACCEPT 0x00008000UL -#define SOCKET__GETOPT 0x00010000UL -#define SOCKET__SETOPT 0x00020000UL -#define SOCKET__SHUTDOWN 0x00040000UL -#define SOCKET__RECVFROM 0x00080000UL -#define SOCKET__SENDTO 0x00100000UL -#define SOCKET__RECV_MSG 0x00200000UL -#define SOCKET__SEND_MSG 0x00400000UL -#define SOCKET__NAME_BIND 0x00800000UL +#define SOCKET__IOCTL 0x00000001UL +#define SOCKET__READ 0x00000002UL +#define SOCKET__WRITE 0x00000004UL +#define SOCKET__CREATE 0x00000008UL +#define SOCKET__GETATTR 0x00000010UL +#define SOCKET__SETATTR 0x00000020UL +#define SOCKET__LOCK 0x00000040UL +#define SOCKET__RELABELFROM 0x00000080UL +#define SOCKET__RELABELTO 0x00000100UL +#define SOCKET__APPEND 0x00000200UL +#define SOCKET__BIND 0x00000400UL +#define SOCKET__CONNECT 0x00000800UL +#define SOCKET__LISTEN 0x00001000UL +#define SOCKET__ACCEPT 0x00002000UL +#define SOCKET__GETOPT 0x00004000UL +#define SOCKET__SETOPT 0x00008000UL +#define SOCKET__SHUTDOWN 0x00010000UL +#define SOCKET__RECVFROM 0x00020000UL +#define SOCKET__SENDTO 0x00040000UL +#define SOCKET__RECV_MSG 0x00080000UL +#define SOCKET__SEND_MSG 0x00100000UL +#define SOCKET__NAME_BIND 0x00200000UL -#define TCP_SOCKET__POLL 0x00000001UL -#define TCP_SOCKET__IOCTL 0x00000002UL -#define TCP_SOCKET__READ 0x00000004UL -#define TCP_SOCKET__WRITE 0x00000008UL -#define TCP_SOCKET__CREATE 0x00000010UL -#define TCP_SOCKET__GETATTR 0x00000020UL -#define TCP_SOCKET__SETATTR 0x00000040UL -#define TCP_SOCKET__LOCK 0x00000080UL -#define TCP_SOCKET__RELABELFROM 0x00000100UL -#define TCP_SOCKET__RELABELTO 0x00000200UL -#define TCP_SOCKET__TRANSITION 0x00000400UL -#define TCP_SOCKET__APPEND 0x00000800UL -#define TCP_SOCKET__BIND 0x00001000UL -#define TCP_SOCKET__CONNECT 0x00002000UL -#define TCP_SOCKET__LISTEN 0x00004000UL -#define TCP_SOCKET__ACCEPT 0x00008000UL -#define TCP_SOCKET__GETOPT 0x00010000UL -#define TCP_SOCKET__SETOPT 0x00020000UL -#define TCP_SOCKET__SHUTDOWN 0x00040000UL -#define TCP_SOCKET__RECVFROM 0x00080000UL -#define TCP_SOCKET__SENDTO 0x00100000UL -#define TCP_SOCKET__RECV_MSG 0x00200000UL -#define TCP_SOCKET__SEND_MSG 0x00400000UL -#define TCP_SOCKET__NAME_BIND 0x00800000UL +#define TCP_SOCKET__IOCTL 0x00000001UL +#define TCP_SOCKET__READ 0x00000002UL +#define TCP_SOCKET__WRITE 0x00000004UL +#define TCP_SOCKET__CREATE 0x00000008UL +#define TCP_SOCKET__GETATTR 0x00000010UL +#define TCP_SOCKET__SETATTR 0x00000020UL +#define TCP_SOCKET__LOCK 0x00000040UL +#define TCP_SOCKET__RELABELFROM 0x00000080UL +#define TCP_SOCKET__RELABELTO 0x00000100UL +#define TCP_SOCKET__APPEND 0x00000200UL +#define TCP_SOCKET__BIND 0x00000400UL +#define TCP_SOCKET__CONNECT 0x00000800UL +#define TCP_SOCKET__LISTEN 0x00001000UL +#define TCP_SOCKET__ACCEPT 0x00002000UL +#define TCP_SOCKET__GETOPT 0x00004000UL +#define TCP_SOCKET__SETOPT 0x00008000UL +#define TCP_SOCKET__SHUTDOWN 0x00010000UL +#define TCP_SOCKET__RECVFROM 0x00020000UL +#define TCP_SOCKET__SENDTO 0x00040000UL +#define TCP_SOCKET__RECV_MSG 0x00080000UL +#define TCP_SOCKET__SEND_MSG 0x00100000UL +#define TCP_SOCKET__NAME_BIND 0x00200000UL -#define TCP_SOCKET__CONNECTTO 0x01000000UL -#define TCP_SOCKET__NEWCONN 0x02000000UL -#define TCP_SOCKET__ACCEPTFROM 0x04000000UL -#define TCP_SOCKET__NODE_BIND 0x08000000UL -#define TCP_SOCKET__NAME_CONNECT 0x10000000UL +#define TCP_SOCKET__CONNECTTO 0x00400000UL +#define TCP_SOCKET__NEWCONN 0x00800000UL +#define TCP_SOCKET__ACCEPTFROM 0x01000000UL +#define TCP_SOCKET__NODE_BIND 0x02000000UL +#define TCP_SOCKET__NAME_CONNECT 0x04000000UL -#define UDP_SOCKET__POLL 0x00000001UL -#define UDP_SOCKET__IOCTL 0x00000002UL -#define UDP_SOCKET__READ 0x00000004UL -#define UDP_SOCKET__WRITE 0x00000008UL -#define UDP_SOCKET__CREATE 0x00000010UL -#define UDP_SOCKET__GETATTR 0x00000020UL -#define UDP_SOCKET__SETATTR 0x00000040UL -#define UDP_SOCKET__LOCK 0x00000080UL -#define UDP_SOCKET__RELABELFROM 0x00000100UL -#define UDP_SOCKET__RELABELTO 0x00000200UL -#define UDP_SOCKET__TRANSITION 0x00000400UL -#define UDP_SOCKET__APPEND 0x00000800UL -#define UDP_SOCKET__BIND 0x00001000UL -#define UDP_SOCKET__CONNECT 0x00002000UL -#define UDP_SOCKET__LISTEN 0x00004000UL -#define UDP_SOCKET__ACCEPT 0x00008000UL -#define UDP_SOCKET__GETOPT 0x00010000UL -#define UDP_SOCKET__SETOPT 0x00020000UL -#define UDP_SOCKET__SHUTDOWN 0x00040000UL -#define UDP_SOCKET__RECVFROM 0x00080000UL -#define UDP_SOCKET__SENDTO 0x00100000UL -#define UDP_SOCKET__RECV_MSG 0x00200000UL -#define UDP_SOCKET__SEND_MSG 0x00400000UL -#define UDP_SOCKET__NAME_BIND 0x00800000UL +#define UDP_SOCKET__IOCTL 0x00000001UL +#define UDP_SOCKET__READ 0x00000002UL +#define UDP_SOCKET__WRITE 0x00000004UL +#define UDP_SOCKET__CREATE 0x00000008UL +#define UDP_SOCKET__GETATTR 0x00000010UL +#define UDP_SOCKET__SETATTR 0x00000020UL +#define UDP_SOCKET__LOCK 0x00000040UL +#define UDP_SOCKET__RELABELFROM 0x00000080UL +#define UDP_SOCKET__RELABELTO 0x00000100UL +#define UDP_SOCKET__APPEND 0x00000200UL +#define UDP_SOCKET__BIND 0x00000400UL +#define UDP_SOCKET__CONNECT 0x00000800UL +#define UDP_SOCKET__LISTEN 0x00001000UL +#define UDP_SOCKET__ACCEPT 0x00002000UL +#define UDP_SOCKET__GETOPT 0x00004000UL +#define UDP_SOCKET__SETOPT 0x00008000UL +#define UDP_SOCKET__SHUTDOWN 0x00010000UL +#define UDP_SOCKET__RECVFROM 0x00020000UL +#define UDP_SOCKET__SENDTO 0x00040000UL +#define UDP_SOCKET__RECV_MSG 0x00080000UL +#define UDP_SOCKET__SEND_MSG 0x00100000UL +#define UDP_SOCKET__NAME_BIND 0x00200000UL -#define UDP_SOCKET__NODE_BIND 0x01000000UL +#define UDP_SOCKET__NODE_BIND 0x00400000UL -#define RAWIP_SOCKET__POLL 0x00000001UL -#define RAWIP_SOCKET__IOCTL 0x00000002UL -#define RAWIP_SOCKET__READ 0x00000004UL -#define RAWIP_SOCKET__WRITE 0x00000008UL -#define RAWIP_SOCKET__CREATE 0x00000010UL -#define RAWIP_SOCKET__GETATTR 0x00000020UL -#define RAWIP_SOCKET__SETATTR 0x00000040UL -#define RAWIP_SOCKET__LOCK 0x00000080UL -#define RAWIP_SOCKET__RELABELFROM 0x00000100UL -#define RAWIP_SOCKET__RELABELTO 0x00000200UL -#define RAWIP_SOCKET__TRANSITION 0x00000400UL -#define RAWIP_SOCKET__APPEND 0x00000800UL -#define RAWIP_SOCKET__BIND 0x00001000UL -#define RAWIP_SOCKET__CONNECT 0x00002000UL -#define RAWIP_SOCKET__LISTEN 0x00004000UL -#define RAWIP_SOCKET__ACCEPT 0x00008000UL -#define RAWIP_SOCKET__GETOPT 0x00010000UL -#define RAWIP_SOCKET__SETOPT 0x00020000UL -#define RAWIP_SOCKET__SHUTDOWN 0x00040000UL -#define RAWIP_SOCKET__RECVFROM 0x00080000UL -#define RAWIP_SOCKET__SENDTO 0x00100000UL -#define RAWIP_SOCKET__RECV_MSG 0x00200000UL -#define RAWIP_SOCKET__SEND_MSG 0x00400000UL -#define RAWIP_SOCKET__NAME_BIND 0x00800000UL +#define RAWIP_SOCKET__IOCTL 0x00000001UL +#define RAWIP_SOCKET__READ 0x00000002UL +#define RAWIP_SOCKET__WRITE 0x00000004UL +#define RAWIP_SOCKET__CREATE 0x00000008UL +#define RAWIP_SOCKET__GETATTR 0x00000010UL +#define RAWIP_SOCKET__SETATTR 0x00000020UL +#define RAWIP_SOCKET__LOCK 0x00000040UL +#define RAWIP_SOCKET__RELABELFROM 0x00000080UL +#define RAWIP_SOCKET__RELABELTO 0x00000100UL +#define RAWIP_SOCKET__APPEND 0x00000200UL +#define RAWIP_SOCKET__BIND 0x00000400UL +#define RAWIP_SOCKET__CONNECT 0x00000800UL +#define RAWIP_SOCKET__LISTEN 0x00001000UL +#define RAWIP_SOCKET__ACCEPT 0x00002000UL +#define RAWIP_SOCKET__GETOPT 0x00004000UL +#define RAWIP_SOCKET__SETOPT 0x00008000UL +#define RAWIP_SOCKET__SHUTDOWN 0x00010000UL +#define RAWIP_SOCKET__RECVFROM 0x00020000UL +#define RAWIP_SOCKET__SENDTO 0x00040000UL +#define RAWIP_SOCKET__RECV_MSG 0x00080000UL +#define RAWIP_SOCKET__SEND_MSG 0x00100000UL +#define RAWIP_SOCKET__NAME_BIND 0x00200000UL -#define RAWIP_SOCKET__NODE_BIND 0x01000000UL +#define RAWIP_SOCKET__NODE_BIND 0x00400000UL #define NODE__TCP_RECV 0x00000001UL #define NODE__TCP_SEND 0x00000002UL @@ -344,143 +313,131 @@ #define NODE__RAWIP_SEND 0x00000020UL #define NODE__ENFORCE_DEST 0x00000040UL -#define NETIF__GETATTR 0x00000001UL -#define NETIF__SETATTR 0x00000002UL -#define NETIF__TCP_RECV 0x00000004UL -#define NETIF__TCP_SEND 0x00000008UL -#define NETIF__UDP_RECV 0x00000010UL -#define NETIF__UDP_SEND 0x00000020UL -#define NETIF__RAWIP_RECV 0x00000040UL -#define NETIF__RAWIP_SEND 0x00000080UL +#define NETIF__TCP_RECV 0x00000001UL +#define NETIF__TCP_SEND 0x00000002UL +#define NETIF__UDP_RECV 0x00000004UL +#define NETIF__UDP_SEND 0x00000008UL +#define NETIF__RAWIP_RECV 0x00000010UL +#define NETIF__RAWIP_SEND 0x00000020UL -#define NETLINK_SOCKET__POLL 0x00000001UL -#define NETLINK_SOCKET__IOCTL 0x00000002UL -#define NETLINK_SOCKET__READ 0x00000004UL -#define NETLINK_SOCKET__WRITE 0x00000008UL -#define NETLINK_SOCKET__CREATE 0x00000010UL -#define NETLINK_SOCKET__GETATTR 0x00000020UL -#define NETLINK_SOCKET__SETATTR 0x00000040UL -#define NETLINK_SOCKET__LOCK 0x00000080UL -#define NETLINK_SOCKET__RELABELFROM 0x00000100UL -#define NETLINK_SOCKET__RELABELTO 0x00000200UL -#define NETLINK_SOCKET__TRANSITION 0x00000400UL -#define NETLINK_SOCKET__APPEND 0x00000800UL -#define NETLINK_SOCKET__BIND 0x00001000UL -#define NETLINK_SOCKET__CONNECT 0x00002000UL -#define NETLINK_SOCKET__LISTEN 0x00004000UL -#define NETLINK_SOCKET__ACCEPT 0x00008000UL -#define NETLINK_SOCKET__GETOPT 0x00010000UL -#define NETLINK_SOCKET__SETOPT 0x00020000UL -#define NETLINK_SOCKET__SHUTDOWN 0x00040000UL -#define NETLINK_SOCKET__RECVFROM 0x00080000UL -#define NETLINK_SOCKET__SENDTO 0x00100000UL -#define NETLINK_SOCKET__RECV_MSG 0x00200000UL -#define NETLINK_SOCKET__SEND_MSG 0x00400000UL -#define NETLINK_SOCKET__NAME_BIND 0x00800000UL +#define NETLINK_SOCKET__IOCTL 0x00000001UL +#define NETLINK_SOCKET__READ 0x00000002UL +#define NETLINK_SOCKET__WRITE 0x00000004UL +#define NETLINK_SOCKET__CREATE 0x00000008UL +#define NETLINK_SOCKET__GETATTR 0x00000010UL +#define NETLINK_SOCKET__SETATTR 0x00000020UL +#define NETLINK_SOCKET__LOCK 0x00000040UL +#define NETLINK_SOCKET__RELABELFROM 0x00000080UL +#define NETLINK_SOCKET__RELABELTO 0x00000100UL +#define NETLINK_SOCKET__APPEND 0x00000200UL +#define NETLINK_SOCKET__BIND 0x00000400UL +#define NETLINK_SOCKET__CONNECT 0x00000800UL +#define NETLINK_SOCKET__LISTEN 0x00001000UL +#define NETLINK_SOCKET__ACCEPT 0x00002000UL +#define NETLINK_SOCKET__GETOPT 0x00004000UL +#define NETLINK_SOCKET__SETOPT 0x00008000UL +#define NETLINK_SOCKET__SHUTDOWN 0x00010000UL +#define NETLINK_SOCKET__RECVFROM 0x00020000UL +#define NETLINK_SOCKET__SENDTO 0x00040000UL +#define NETLINK_SOCKET__RECV_MSG 0x00080000UL +#define NETLINK_SOCKET__SEND_MSG 0x00100000UL +#define NETLINK_SOCKET__NAME_BIND 0x00200000UL -#define PACKET_SOCKET__POLL 0x00000001UL -#define PACKET_SOCKET__IOCTL 0x00000002UL -#define PACKET_SOCKET__READ 0x00000004UL -#define PACKET_SOCKET__WRITE 0x00000008UL -#define PACKET_SOCKET__CREATE 0x00000010UL -#define PACKET_SOCKET__GETATTR 0x00000020UL -#define PACKET_SOCKET__SETATTR 0x00000040UL -#define PACKET_SOCKET__LOCK 0x00000080UL -#define PACKET_SOCKET__RELABELFROM 0x00000100UL -#define PACKET_SOCKET__RELABELTO 0x00000200UL -#define PACKET_SOCKET__TRANSITION 0x00000400UL -#define PACKET_SOCKET__APPEND 0x00000800UL -#define PACKET_SOCKET__BIND 0x00001000UL -#define PACKET_SOCKET__CONNECT 0x00002000UL -#define PACKET_SOCKET__LISTEN 0x00004000UL -#define PACKET_SOCKET__ACCEPT 0x00008000UL -#define PACKET_SOCKET__GETOPT 0x00010000UL -#define PACKET_SOCKET__SETOPT 0x00020000UL -#define PACKET_SOCKET__SHUTDOWN 0x00040000UL -#define PACKET_SOCKET__RECVFROM 0x00080000UL -#define PACKET_SOCKET__SENDTO 0x00100000UL -#define PACKET_SOCKET__RECV_MSG 0x00200000UL -#define PACKET_SOCKET__SEND_MSG 0x00400000UL -#define PACKET_SOCKET__NAME_BIND 0x00800000UL +#define PACKET_SOCKET__IOCTL 0x00000001UL +#define PACKET_SOCKET__READ 0x00000002UL +#define PACKET_SOCKET__WRITE 0x00000004UL +#define PACKET_SOCKET__CREATE 0x00000008UL +#define PACKET_SOCKET__GETATTR 0x00000010UL +#define PACKET_SOCKET__SETATTR 0x00000020UL +#define PACKET_SOCKET__LOCK 0x00000040UL +#define PACKET_SOCKET__RELABELFROM 0x00000080UL +#define PACKET_SOCKET__RELABELTO 0x00000100UL +#define PACKET_SOCKET__APPEND 0x00000200UL +#define PACKET_SOCKET__BIND 0x00000400UL +#define PACKET_SOCKET__CONNECT 0x00000800UL +#define PACKET_SOCKET__LISTEN 0x00001000UL +#define PACKET_SOCKET__ACCEPT 0x00002000UL +#define PACKET_SOCKET__GETOPT 0x00004000UL +#define PACKET_SOCKET__SETOPT 0x00008000UL +#define PACKET_SOCKET__SHUTDOWN 0x00010000UL +#define PACKET_SOCKET__RECVFROM 0x00020000UL +#define PACKET_SOCKET__SENDTO 0x00040000UL +#define PACKET_SOCKET__RECV_MSG 0x00080000UL +#define PACKET_SOCKET__SEND_MSG 0x00100000UL +#define PACKET_SOCKET__NAME_BIND 0x00200000UL >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 3 15:07:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C6BA16A417; Tue, 3 Oct 2006 15:07:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6263916A403 for ; Tue, 3 Oct 2006 15:07:05 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 195BC43D6B for ; Tue, 3 Oct 2006 15:07:04 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93F73Rx025835 for ; Tue, 3 Oct 2006 15:07:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93F729H025832 for perforce@freebsd.org; Tue, 3 Oct 2006 15:07:02 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 15:07:02 GMT Message-Id: <200610031507.k93F729H025832@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 15:07:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=107185 Change 107185 by millert@millert_macbook on 2006/10/03 15:06:08 Switch build system to refpolicy Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -SUBDIR= sedarwin libsecompat libsepol libselinux libsemanage programs policy \ - ../../darwin/pam_modules/pam_sedarwin pam.d +SUBDIR= libsecompat libsepol libselinux libsemanage programs \ + ../../darwin/pam_modules/pam_sedarwin pam.d refpolicy sedarwin include ../mk/subdir.mk From owner-p4-projects@FreeBSD.ORG Tue Oct 3 15:12:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C289A16A412; Tue, 3 Oct 2006 15:12:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F54216A403 for ; Tue, 3 Oct 2006 15:12:10 +0000 (UTC) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02A0E43D55 for ; Tue, 3 Oct 2006 15:12:10 +0000 (GMT) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93FC99f027716 for ; Tue, 3 Oct 2006 15:12:09 GMT (envelope-from ru@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93FC9NE027707 for perforce@freebsd.org; Tue, 3 Oct 2006 15:12:09 GMT (envelope-from ru@freebsd.org) Date: Tue, 3 Oct 2006 15:12:09 GMT Message-Id: <200610031512.k93FC9NE027707@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ru@freebsd.org using -f From: Ruslan Ermilov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107186 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 15:12:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=107186 Change 107186 by ru@ru_edoofus on 2006/10/03 15:12:02 Fix markup. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.2#8 edit .. //depot/projects/trustedbsd/openbsm/man/auditctl.2#7 edit .. //depot/projects/trustedbsd/openbsm/man/auditon.2#11 edit .. //depot/projects/trustedbsd/openbsm/man/getaudit.2#7 edit .. //depot/projects/trustedbsd/openbsm/man/getauid.2#7 edit .. //depot/projects/trustedbsd/openbsm/man/setaudit.2#7 edit .. //depot/projects/trustedbsd/openbsm/man/setauid.2#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.2#8 (text+ko) ==== @@ -24,25 +24,29 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.2#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.2#8 $ .\" .Dd April 19, 2005 .Dt AUDIT 2 .Os .Sh NAME .Nm audit -.Nd "Commit a BSM audit record to the audit log" +.Nd "commit BSM audit record to audit log" .Sh SYNOPSIS .In bsm/audit.h .Ft int .Fn audit "const char *record" "u_int length" .Sh DESCRIPTION +The .Fn audit +system call submits a completed BSM audit record to the system audit log. .Pp +The .Fa record -is a pointer to the the specific event to be recorded and -.Vt length +argument +is a pointer to the specific event to be recorded and +.Fa length is the size in bytes of the data to be written. .Sh RETURN VALUES .Rv -std @@ -57,9 +61,9 @@ argument is beyond the allocated address space of the process. .It Bq Er EINVAL The token ID is invalid or -.Vt length +.Va length is larger than -.Vt MAXAUDITDATA . +.Dv MAXAUDITDATA . .It Bq Er EPERM The process does not have sufficient permission to complete the operation. @@ -79,9 +83,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/openbsm/man/auditctl.2#7 (text+ko) ==== @@ -23,14 +23,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditctl.2#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditctl.2#7 $ .\" .Dd April 19, 2005 .Dt AUDITCTL 2 .Os .Sh NAME .Nm auditctl -.Nd "Configure system audit parameters" +.Nd "configure system audit parameters" .Sh SYNOPSIS .In bsm/audit.h .Ft int @@ -39,26 +39,23 @@ The .Fn auditctl system call directs the kernel to open a new audit trail log file. -.Fn auditctl -requires appropriate privilege. +It requires an appropriate privilege. In the .Fx implementation, .Fn auditctl opens new files, but -.Fn auditon +.Xr auditon 2 is used to disable the audit log. In the Mac OS X implementation, passing -.Va NULL +.Dv NULL to .Fn auditctl will disable the audit log. .Sh RETURN VALUES -.Nm -returns 0 on success, or returns -1 on failure, providing additional error -information via -.Va errno . +.Rv -std .Sh SEE ALSO +.Xr auditon 2 , .Xr libbsm 3 , .Xr auditd 8 .Sh HISTORY @@ -67,9 +64,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/openbsm/man/auditon.2#11 (text+ko) ==== @@ -25,37 +25,47 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#10 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#11 $ .\" .Dd April 19, 2005 .Dt AUDITON 2 .Os .Sh NAME .Nm auditon -.Nd "Configure system audit parameters" +.Nd "configure system audit parameters" .Sh SYNOPSIS .In bsm/audit.h .Ft int .Fn auditon "int cmd" "void *data" "u_int length" .Sh DESCRIPTION The -.Nm +.Fn auditon system call is used to manipulate various audit control operations. -.Ft *data +The +.Fa data +argument should point to a structure whose type depends on the command. -.Ft length -specifies the size of the -.Em data +The +.Fa length +argument +specifies the size of +.Fa *data in bytes. -.Ft cmd +The +.Fa cmd +argument may be any of the following: .Bl -tag -width ".It Dv A_GETPINFO_ADDR" .It Dv A_SETPOLICY Set audit policy flags. -.Ft *data -must point to a long value set to one of the audit +The +.Fa data +argument +must point to a +.Vt long +value set to one of the audit policy control values defined in -.Pa audit.h . +.In bsm/audit.h . Currently, only .Dv AUDIT_CNT and @@ -76,24 +86,28 @@ .Er ENOSYS . .It Dv A_SETKMASK Set the kernel preselection masks (success and failure). -.Ft *data +The +.Fa data +argument must point to a -.Ft au_mask_t +.Vt au_mask_t structure containing the mask values. These masks are used for non-attributable audit event preselection. .It Dv A_SETQCTRL Set kernel audit queue parameters. -.Ft *data +The +.Fa data +argument must point to a -.Ft au_qctrl_t +.Vt au_qctrl_t structure containing the kernel audit queue control settings: -.Va high water , -.Va low water , -.Va output buffer size , -.Va percent min free disk space , +.Dq "high water" , +.Dq "low water" , +.Dq "output buffer size" , +.Dq "percent min free disk space" , and -.Em delay +.Dq delay (not currently used). .It Dv A_SETSTAT Return @@ -106,8 +120,12 @@ .Er ENOSYS . .It Dv A_SETCOND Set the current auditing condition. -.Ft *data -must point to a long value containing the new +The +.Fa data +argument +must point to a +.Vt long +value containing the new audit condition, one of .Dv AUC_AUDITING , .Dv AUC_NOAUDIT , @@ -115,24 +133,30 @@ .Dv AUC_DISABLED . .It Dv A_SETCLASS Set the event class preselection mask for an audit event. -.Ft *data +The +.Fa data +argument must point to a -.Ft au_evclass_map_t +.Vt au_evclass_map_t structure containing the audit event and mask. .It Dv A_SETPMASK Set the preselection masks for a process. -.Ft *data +The +.Fa data +argument must point to a -.Ft auditpinfo_t +.Vt auditpinfo_t structure that contains the given process's audit preselection masks for both success and failure. .It Dv A_SETFSIZE Set the maximum size of the audit log file. -.Ft *data +The +.Fa data +argument must point to a -.Ft au_fstat_t +.Vt au_fstat_t structure with the -.Ft af_filesz +.Va af_filesz field set to the maximum audit log file size. A value of 0 indicates no limit to the size. @@ -141,18 +165,22 @@ .Er ENOSYS . .It Dv A_GETCLASS Return the event to class mapping for the designated audit event. -.Ft *data +The +.Fa data +argument must point to a -.Ft au_evclass_map_t +.Vt au_evclass_map_t structure. .It Dv A_GETKAUDIT Return .Er ENOSYS . .It Dv A_GETPINFO Return the audit settings for a process. -.Ft *data +The +.Fa data +argument must point to a -.Ft auditpinfo_t +.Vt auditpinfo_t structure which will be set to contain the audit ID, preselection mask, terminal ID, and audit session ID of the given process. @@ -161,15 +189,21 @@ .Er ENOSYS . .It Dv A_GETKMASK Return the current kernel preselection masks. -.Ft *data +The +.Fa data +argument must point to a -.Ft au_mask_t +.Vt au_mask_t structure which will be set to the current kernel preselection masks for non-attributable events. .It Dv A_GETPOLICY Return the current audit policy setting. -.Ft *data -must point to a long value which will be set to +The +.Fa data +argument +must point to a +.Vt long +value which will be set to one of the current audit policy flags. Currently, only .Dv AUDIT_CNT @@ -178,23 +212,28 @@ are implemented. .It Dv A_GETQCTRL Return the current kernel audit queue control parameters. -.Ft *data +The +.Fa data +argument must point to a -.Ft au_qctrl_t +.Vt au_qctrl_t structure which will be set to the current kernel audit queue control parameters. .It Dv A_GETFSIZE Returns the maximum size of the audit log file. -.Ft *data +The +.Fa data +argument must point to a -.Ft au_fstat_t +.Vt au_fstat_t structure. The -.Ft af_filesz +.Va af_filesz field will be set to the maximum audit log file size. A value of 0 indicates no limit to the size. The -.Ft af_currsz +.Va af_currsz +field will be set to the current audit log file size. .It Dv A_GETCWD .\" [COMMENTED OUT]: Valid description, not yet implemented. @@ -214,16 +253,24 @@ .Er ENOSYS . .It Dv A_GETCOND Return the current auditing condition. -.Ft *data -must point to a long value which will be set to +The +.Fa data +argument +must point to a +.Vt long +value which will be set to the current audit condition, either .Dv AUC_AUDITING or .Dv AUC_NOAUDIT . .It Dv A_SENDTRIGGER Send a trigger to the audit daemon. -.Fr *data -must point to a long value set to one of the acceptable +The +.Fa data +argument +must point to a +.Vt long +value set to one of the acceptable trigger values: .Dv AUDIT_TRIGGER_LOW_SPACE (low disk space where the audit log resides), @@ -279,9 +326,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/openbsm/man/getaudit.2#7 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#7 $ .\" .Dd April 19, 2005 .Dt GETAUDIT 2 @@ -31,7 +31,7 @@ .Sh NAME .Nm getaudit , .Nm getaudit_addr -.Nd "Retrieve audit session state" +.Nd "retrieve audit session state" .Sh SYNOPSIS .In bsm/audit.h .Ft int @@ -39,23 +39,24 @@ .Ft int .Fn getaudit_addr "auditinfo_addr_t *auditinfo_addr" "u_int length" .Sh DESCRIPTION +The .Fn getaudit +system call retrieves the active audit session state for the current process via the .Vt auditinfo_t pointed to by -.Va auditinfo . +.Fa auditinfo . +The .Fn getaudit_addr +system call retrieves extended state via -.Va auditinfo_addr +.Fa auditinfo_addr and -.Va length . +.Fa length . .Pp -This system call requires appropriate privilege to complete. +These system calls require an appropriate privilege to complete. .Sh RETURN VALUES -.Nm -returns 0 on success, or returns -1 on failure, providing additional error -information via -.Va errno . +.Rv -std getaudit getaudit_addr .Sh SEE ALSO .Xr audit 2 , .Xr auditon 2 , @@ -69,9 +70,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/openbsm/man/getauid.2#7 (text+ko) ==== @@ -23,31 +23,30 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/getauid.2#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/getauid.2#7 $ .\" .Dd April 19, 2005 .Dt GETAUID 2 .Os .Sh NAME .Nm getauid -.Nd "Retrieve audit session ID" +.Nd "retrieve audit session ID" .Sh SYNOPSIS .In bsm/audit.h .Ft int .Fn getauid "au_id_t *auid" .Sh DESCRIPTION -.Nm +The +.Fn getauid +system call retrieves the active audit session ID for the current process via the .Vt au_id_t pointed to by -.Va auid . +.Fa auid . .Pp -This system call requires appropriate privilege to complete. +This system call requires an appropriate privilege to complete. .Sh RETURN VALUES -.Nm -returns 0 on success, or returns -1 on failure, providing additional error -information via -.Va errno . +.Rv -std .Sh SEE ALSO .Xr audit 2 , .Xr auditon 2 , @@ -63,9 +62,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/openbsm/man/setaudit.2#7 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#7 $ .\" .Dd April 19, 2005 .Dt SETAUDIT 2 @@ -31,31 +31,32 @@ .Sh NAME .Nm setaudit , .Nm setaudit_addr -.Nd "Set audit session state" +.Nd "set audit session state" .Sh SYNOPSIS .In bsm/audit.h .Ft int .Fn setaudit "auditinfo_t *auditinfo" .Ft int -.Fn setaudit_addr "auditinfo_addr_t *auditinfo" "u_int length" +.Fn setaudit_addr "auditinfo_addr_t *auditinfo_addr" "u_int length" .Sh DESCRIPTION -.Nm +The +.Fn setaudit +system call sets the active audit session state for the current process via the .Vt auditinfo_t pointed to by -.Va auditinfo . +.Fa auditinfo . +The .Fn setaudit_addr +system call sets extended state via -.Va auditinfo_addr +.Fa auditinfo_addr and -.Va length . +.Fa length . .Pp -This system call requires appropriate privilege to complete. +These system calls require an appropriate privilege to complete. .Sh RETURN VALUES -.Nm -returns 0 on success, or returns -1 on failure, providing additional error -information via -.Va errno . +.Rv -std setaudit setaudit_addr .Sh SEE ALSO .Xr audit 2 , .Xr auditon 2 , @@ -69,9 +70,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/openbsm/man/setauid.2#7 (text+ko) ==== @@ -23,31 +23,30 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/setauid.2#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/setauid.2#7 $ .\" .Dd April 19, 2005 .Dt SETAUID 2 .Os .Sh NAME .Nm setauid -.Nd "Set audit session ID" +.Nd "set audit session ID" .Sh SYNOPSIS .In bsm/audit.h .Ft int .Fn setauid "au_id_t *auid" .Sh DESCRIPTION -.Nm +The +.Fn setauid +system call sets the active audit session ID for the current process from the .Vt au_id_t pointed to by -.Va auid . +.Fa auid . .Pp -This system call requires appropriate privilege to complete. +This system call requires an appropriate privilege to complete. .Sh RETURN VALUES -.Nm -returns 0 on success, or returns -1 on failure, providing additional error -information via -.Va errno . +.Rv -std .Sh SEE ALSO .Xr audit 2 , .Xr auditon 2 , @@ -63,9 +62,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. From owner-p4-projects@FreeBSD.ORG Tue Oct 3 15:17: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 7BCC416A415; Tue, 3 Oct 2006 15:17:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0CFFC16A403 for ; Tue, 3 Oct 2006 15:17:18 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 350E543D58 for ; Tue, 3 Oct 2006 15:17:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93FHHSb029518 for ; Tue, 3 Oct 2006 15:17:17 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93FHHEu029515 for perforce@freebsd.org; Tue, 3 Oct 2006 15:17:17 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 15:17:17 GMT Message-Id: <200610031517.k93FHHEu029515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107187 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 15:17:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=107187 Change 107187 by millert@millert_macbook on 2006/10/03 15:16:58 Add iokit access control driver and corresponding MAC entrypoint Panic if audit cannot be initialized Export mac_vnop_removexattr to kexts Better color policy Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/DeviceAccessControl.xcode/project.pbxproj#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/DeviceAccessControlFireWire.cpp#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/DeviceAccessControlFireWire.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/DeviceAccessControlUSB.cpp#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/DeviceAccessControlUSB.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/English.lproj/InfoPlist.strings#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/Info.plist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/drivers/DeviceAccessControl/README#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/drivers/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_audit.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/vnode.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_xattr.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/iokit/Kernel/IOCatalogue.cpp#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/iokit/Kernel/IOService.cpp#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/libsa/kext.cpp#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/conf/files#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#13 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#10 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs_subr.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/color/color_util.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/color/mac_color.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/color/mac_color.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/device_access/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/device_access/mac_device_access.c#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#3 (text+ko) ==== @@ -8,6 +8,7 @@ $(MAKE) -C cctools $(MAKE) -C kext_tools $(MAKE) -C $(XNU) + $(MAKE) -C drivers $(MAKE) -C bootstrap_cmds $(MAKE) -C libmac $(MAKE) -C mac_cmds @@ -28,6 +29,7 @@ $(DESTDIR)/$(SYSTEM_PLUGINS)/ install -m 644 $(XNU)/BUILD/dst/mach_kernel $(DESTDIR)/ tar -C $(XNU)/BUILD/dst -cf - usr/include | tar -C $(DESTDIR) -xf - + $(MAKE) -C drivers DSTROOT=$(DESTDIR) install $(MAKE) -C libmac install $(MAKE) -C mac_cmds install $(MAKE) -C osx_cmds install @@ -47,6 +49,7 @@ $(MAKE) -C bootstrap_cmds clean $(MAKE) -C cctools clean $(MAKE) -C kext_tools clean + $(MAKE) -C drivers clean $(MAKE) -C libmac clean $(MAKE) -C mac_cmds clean $(MAKE) -C osx_cmds clean ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_audit.c#5 (text+ko) ==== @@ -671,9 +671,8 @@ * size as the system call table. */ if (nsys_au_event != nsysent) { - printf("Security auditing service initialization failed, "); - printf("audit event table doesn't match syscall table.\n"); - return; + panic("Security auditing service initialization failed, " + "audit event table doesn't match syscall table."); } printf("Security auditing service present\n"); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/vnode.h#3 (text+ko) ==== @@ -645,6 +645,8 @@ int default_setxattr(vnode_t vp, const char *name, uio_t uio, int options, vfs_context_t context); +int default_removexattr(vnode_t vp, const char *name, int options, + vfs_context_t context); __END_DECLS #endif /* KERNEL */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_xattr.c#5 (text+ko) ==== @@ -53,7 +53,6 @@ /* * Default xattr support routines. */ -static int default_removexattr(vnode_t vp, const char *name, int options, vfs_context_t context); static int default_listxattr(vnode_t vp, uio_t uio, size_t *size, int options, vfs_context_t context); @@ -989,7 +988,7 @@ /* * Remove an extended attribute. */ -static int +int default_removexattr(vnode_t vp, const char *name, __unused int options, vfs_context_t context) { vnode_t xvp = NULL; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#5 (text+ko) ==== @@ -5,6 +5,7 @@ _mac_vnop_getxattr _mac_vnop_setxattr +_mac_vnop_removexattr _kau_will_audit _mac_audit_text @@ -35,3 +36,8 @@ _mac_zfree _mac_find_module_data + +_mac_iokit_check_device_allowed + +# This should really go in IOKit.exports. +__Z13osdict_encodeP12OSDictionary ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/iokit/Kernel/IOCatalogue.cpp#2 (text+ko) ==== @@ -123,14 +123,12 @@ extern "C" kern_return_t kmod_release(kmod_t id); /********************************************************************* -* This function takes a plist and looks for an OSModuleData dictionary. -* If it is found, an encoded copy is returned. +* This function takes an OSDictionary and returns a struct mac_module_data +* list. *********************************************************************/ -kmod_args_t -get_module_data(OSDictionary * kextPlist, mach_msg_type_number_t * datalen) +struct mac_module_data * +osdict_encode(OSDictionary *dict) { - - OSDictionary * kextModuleData = 0; // don't release const OSMetaClass * typeID; // don't release OSString * key = NULL; // don't release OSCollectionIterator * keyIterator = 0; // must release @@ -138,16 +136,11 @@ struct mac_module_data_element * element; unsigned int strtabsize = 0; unsigned int nkeys = 0; + unsigned int datalen; char * strtab = 0; vm_offset_t data_addr; - vm_map_copy_t copy = 0; - kextModuleData = OSDynamicCast(OSDictionary, - kextPlist->getObject("OSModuleData")); - if (!kextModuleData) - goto finish; - - keyIterator = OSCollectionIterator::withCollection(kextModuleData); + keyIterator = OSCollectionIterator::withCollection(dict); if (!keyIterator) goto finish; @@ -155,7 +148,7 @@ while ( (key = OSDynamicCast(OSString, keyIterator->getNextObject())) ) { // Get the key's value and determine its type - OSObject * value = kextModuleData->getObject(key); + OSObject * value = dict->getObject(key); if (!value) continue; @@ -183,12 +176,12 @@ /* * Allocate and fill in the module data structures. */ - *datalen = sizeof(struct mac_module_data) + + datalen = sizeof(struct mac_module_data) + sizeof(mac_module_data_element) * (nkeys - 1) + strtabsize; - if (kmem_alloc(kernel_map, &data_addr, *datalen) != KERN_SUCCESS) + if (kmem_alloc(kernel_map, &data_addr, datalen) != KERN_SUCCESS) goto finish; module_data = (mac_module_data *)data_addr; - module_data->size = *datalen; + module_data->size = datalen; module_data->count = nkeys; strtab = (char *)&module_data->data[nkeys]; @@ -197,7 +190,7 @@ while ( (key = OSDynamicCast(OSString, keyIterator->getNextObject())) ) { // Get the key's value and determine its type - OSObject * value = kextModuleData->getObject(key); + OSObject * value = dict->getObject(key); if (!value) continue; @@ -239,18 +232,41 @@ strtab += element->key_size + element->value_size; element++; } +finish: + if (keyIterator) + keyIterator->release(); + return(module_data); +} + +/********************************************************************* +* This function takes a plist and looks for an OSModuleData dictionary. +* If it is found, an encoded copy is returned. +*********************************************************************/ +kmod_args_t +get_module_data(OSDictionary * kextPlist, mach_msg_type_number_t * datalen) +{ + + OSDictionary * kextModuleData = 0; // don't release + struct mac_module_data * module_data = 0; + vm_map_copy_t copy = 0; + kextModuleData = OSDynamicCast(OSDictionary, + kextPlist->getObject("OSModuleData")); + if (!kextModuleData) + goto finish; + + module_data = osdict_encode(kextModuleData); + if (!module_data) + goto finish; + *datalen = module_data->size; /* * Make a CoW copy of data and free the original. The copy is * consumed by a call to vm_map_copyout() in kmod_start_or_stop(). */ - vm_map_copyin(kernel_map, (vm_offset_t)data_addr, *datalen, FALSE, ©); - kmem_free(kernel_map, data_addr, *datalen); + vm_map_copyin(kernel_map, (vm_offset_t)module_data, *datalen, FALSE, ©); + kmem_free(kernel_map, (vm_offset_t)module_data, *datalen); finish: - if (keyIterator) - keyIterator->release(); - return (kmod_args_t)copy; } @@ -1427,4 +1443,3 @@ IOLockUnlock(gIOKLDLock); } - ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/iokit/Kernel/IOService.cpp#2 (text+ko) ==== @@ -2320,6 +2320,8 @@ OSObject * nextMatch = 0; bool started; bool needReloc = false; + OSBoolean * isSandbox = 0; + bool useSandbox = false; #if IOMATCHDEBUG SInt64 debugFlags; #endif @@ -2428,6 +2430,8 @@ if( !symbol) continue; + IOLog("%s alloc (symbol %p props %p)\n", symbol->getCStringNoCopy(), symbol, props); + // alloc the driver instance inst = (IOService *) OSMetaClass::allocClassWithName( symbol); @@ -2454,7 +2458,10 @@ if( 0 == category) category = gIODefaultMatchCategoryKey; inst->setProperty( gIOMatchCategoryKey, (OSObject *) category ); - + + isSandbox = OSDynamicCast(OSBoolean, + props->getObject("IOKitForceMatch")); + // attach driver instance if( !(inst->attach( this ))) continue; @@ -2471,6 +2478,19 @@ newInst = inst->probe( this, &score ); inst->detach( this ); + /* + * If this is the Sandbox driver and it matched, this is a + * disallowed device; toss any drivers that were already + * matched. + */ + if (isSandbox && isSandbox->isTrue() && newInst != 0) { + if (startDict != 0) { + startDict->flushCollection(); + startDict->release(); + startDict = 0; + } + useSandbox = true; + } if( 0 == newInst) { #if IOMATCHDEBUG if( debugFlags & kIOLogProbe) @@ -2509,6 +2529,11 @@ props->release(); if( inst) inst->release(); + /* + * If we're forcing the sandbox, drop out of the loop. + */ + if (isSandbox && isSandbox->isTrue() && useSandbox) + break; } familyMatches->release(); familyMatches = 0; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/libsa/kext.cpp#2 (text+ko) ==== @@ -77,6 +77,8 @@ extern kmod_args_t get_module_data(OSDictionary * kextPlist, mach_msg_type_number_t * datalen); +extern struct mac_module_data *osdict_encode(OSDictionary *dict); + #define DEBUG #ifdef DEBUG #define LOG_DELAY(x) IODelay((x) * 1000000) ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/conf/files#2 (text+ko) ==== @@ -23,3 +23,4 @@ security/mac_socket.c optional mac security/mac_net.c optional mac security/mac_pipe.c optional mac +security/mac_iokit.c optional mac ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#8 (text+ko) ==== @@ -67,6 +67,12 @@ typedef struct mac *mac_t; +/* + * Device types for mac_iokit_check_device_allowed() + */ +#define MAC_DEVICE_USB 0 +#define MAC_DEVICE_FIREWIRE 1 + #ifndef KERNEL /* * Location of the userland MAC framework configuration file. mac.conf @@ -107,6 +113,11 @@ int mac_set_proc(const mac_t _label); int mac_syscall(const char *_policyname, int _call, void *_arg); int mac_to_text(mac_t mac, char **_text); +/* + * I/O Kit device access control. + * Note that this routine is called from a C++ I/O Kit driver. + */ +int mac_iokit_check_device_allowed(int devtype, struct module_data *mdata); __END_DECLS #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#13 (text+ko) ==== @@ -1947,15 +1947,22 @@ } int -mac_vnop_setxattr (struct vnode *vp, const char *name, char *buf, size_t len) +mac_vnop_setxattr(struct vnode *vp, const char *name, char *buf, size_t len) +{ + + return (ENOENT); +} + +int +mac_vnop_getxattr(struct vnode *vp, const char *name, char *buf, size_t len, + size_t *attrlen) { return (ENOENT); } int -mac_vnop_getxattr (struct vnode *vp, const char *name, char *buf, size_t len, - size_t *attrlen) +mac_vnop_removexattr(struct vnode *vp, const char *name) { return (ENOENT); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#10 (text+ko) ==== @@ -4924,8 +4924,33 @@ int error, int retval ); + +/** + @brief Device hardware access control + @param devtype Type of device connected + @param properties XML-formatted property list + @param proplen Length of the property list + + This is the MAC Framework device access control, which is called by the I/O + Kit when a new device is connected to the system to determine whether that + device should be trusted. A list of properties associated with the device + is passed as an XML-formatted string. The routine should examine these + properties to determine the trustworthiness of the device. A return value + of EPERM forces the device to be claimed by a special device driver that + will prevent its operation. + + @warning This is an experimental interface and may change in the future. + + @return Return EPERM to indicate that the device is untrusted and should + not be allowed to operate. Return zero to indicate that the device is + trusted and should be allowed to operate normally. + +*/ +typedef int mpo_iokit_check_device_allowed_t( + int devtype, + struct mac_module_data *mdata +); /*@}*/ - /*! \struct mac_policy_ops */ @@ -5232,6 +5257,7 @@ mpo_pipe_check_select_t *mpo_pipe_check_select; mpo_pipe_check_stat_t *mpo_pipe_check_stat; mpo_pipe_check_write_t *mpo_pipe_check_write; + mpo_iokit_check_device_allowed_t *mpo_iokit_check_device_allowed; }; /** @@ -5309,6 +5335,7 @@ int mac_vnop_setxattr(struct vnode *, const char *, char *, size_t); int mac_vnop_getxattr(struct vnode *, const char *, char *, size_t, size_t *); +int mac_vnop_removexattr(struct vnode *, const char *); /* * Arbitrary limit on how much data will be logged by the audit ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs_subr.c#3 (text+ko) ==== @@ -124,3 +124,19 @@ return (error); } + +int +mac_vnop_removexattr (struct vnode *vp, const char *name) +{ + struct vfs_context context; + int error; + + context.vc_proc = current_proc(); + context.vc_ucred = kauth_cred_get(); + + error = VNOP_REMOVEXATTR(vp, name, 0, &context); + if (error == ENOTSUP || error == EPERM) + error = default_removexattr(vp, name, 0, &context); + + return (error); +} ==== //depot/projects/trustedbsd/sedarwin8/policies/Makefile#3 (text+ko) ==== @@ -1,5 +1,6 @@ -SUBDIR= basetest color console count fwinteg ipctrace mls none \ - readonly stacktrace stub test vanity xattr extattr_test +SUBDIR= basetest color console count device_access extattr_test \ + fwinteg ipctrace mls multilabel none readonly stacktrace \ + stub test vanity xattr SUBDIR+= sedarwin include mk/subdir.mk ==== //depot/projects/trustedbsd/sedarwin8/policies/color/color_util.c#2 (text+ko) ==== @@ -96,14 +96,13 @@ LIST_REMOVE(mc, list); free_count--; mc->refs = 0; - mc->valid = 0; } - mc->refs++; + mc->refs = 1; used_count++; mc->color = &colors[0]; LIST_INSERT_HEAD(&mc_list_used, mc, list); -// printf("mc_alloc, mc=%p, refs=%d\n", mc, mc->refs); + MCPRINTF("%s:: mc=%p, refs=%d\n", __func__, mc, mc->refs); return (mc); } @@ -114,7 +113,7 @@ if (mc == NULL) return; -// printf("mc_free, mc=%p, refs=%d\n", mc, mc->refs); + MCPRINTF("%s:: mc=%p, refs=%d\n", __func__, mc, mc->refs); LIST_REMOVE(mc, list); used_count--; @@ -146,7 +145,10 @@ if (mc == NULL) return; - if (--mc->refs <= 0) + mc->refs--; + MCPRINTF("%s:: mc=%p, refs=%d\n", __func__, mc, mc->refs); + + if (mc->refs <= 0) mc_free(mc); co_setreflabel(label, NULL); @@ -205,15 +207,17 @@ if (SLOTREF(dst) != NULL) { /* Already has a reference. */ if (SLOTREF(dst) == mc) { -// printf("co_reference_label: already has matching reference\n"); + MCPRINTF("%s:: already has matching reference\n", + __func__); return; } else { -// printf("co_reference_label: already has a reference\n"); + MCPRINTF("%s:: already has a reference\n", __func__); } co_destroy_reflabel(dst); } - printf("co_reference_label: copying reference, mc=%p, refs=%d\n", mc, mc->refs); mc->refs++; + MCPRINTF("%s:: copying reference, mc=%p, refs=%d\n", __func__, mc, + mc->refs); co_setreflabel(dst, mc); return; @@ -234,6 +238,33 @@ } +int +co_maybe_promote_process(struct ucred *subject, struct label *object) +{ + struct color *filecolor, *credcolor; + + filecolor = co_getlabel(object); + credcolor = co_getreflabel(subject->cr_label)->color; + + /* + * If the file doesn't have a label or they are the same + */ + if ((filecolor == NULL) || (filecolor == credcolor)) + return (0); + + MCPRINTF("%s:: checking file label %s(%d) with cred %s(%d)\n", + __func__, filecolor->name, filecolor->level, + credcolor->name, credcolor->level); + + if (filecolor->level > credcolor->level) { + printf("%s:: promoting label from %s to %s\n", + __func__, credcolor->name, filecolor->name); + co_getreflabel(subject->cr_label)->color = filecolor; + } + + return (0); +} + void color_policy_init(struct mac_policy_conf *conf) { ==== //depot/projects/trustedbsd/sedarwin8/policies/color/mac_color.c#5 (text+ko) ==== @@ -24,6 +24,28 @@ * SUCH DAMAGE. */ +/* + * The MAC Color policy. + * + * This policy demonstrates the potential of using login context + * labels to share privilege amongst a group of processes. It also + * demonstrates the use of floating labels. + * + * The policy has a small number of "rules": + * 1) All processes have a color. Files may optionally have a color. + * 2) Colors are ranked low to high by their position in the + * spectrum (red to violet). + * 3) A subject takes on the color of the highest object it is accessing. + * 4) Objects created by a subject will have the higher of the color + * of the subject at the time of creation or the enclosing directory. + * 5) Objects created will only have a label if the parent directory + * has a label. + * + * Note that this is an example policy, not all entry points are + * imlemented and not all subject access considered. + */ + + #include #include #include @@ -33,6 +55,7 @@ #include #include #include +#include /* struct vfs_context */ #include #include #include @@ -46,7 +69,7 @@ static const char *labelnamespaces[MAC_COLOR_LABEL_COUNT] = { MAC_COLOR_POLICY_NAME }; -static int color_slot; /* Per-policy label storage */ +int color_slot; /* Per-policy label storage */ static mac_policy_handle_t mac_color_handle; @@ -77,7 +100,13 @@ { struct color *color; + if (strncmp(string, "unlabeled", 9) == 0) { + co_setreflabel(label, NULL); + return (0); + } + co_setlabelstring(label, string); + color = co_getlabel(label); if (color == NULL) { printf("%s: No matching color for %s\n", __func__, string); @@ -126,7 +155,6 @@ color_cred_create(struct ucred *parent_cred, struct ucred *child_cred) { -// co_copylabel(parent_cred->cr_label, child_cred->cr_label); co_reference_label(parent_cred->cr_label, child_cred->cr_label); } @@ -134,38 +162,52 @@ color_create_kernel_proc(struct ucred *cred) { - //co_setlabel(cred->cr_label, &colors[0]); + /* Nothing to do here */ } -/* ================================================================= * - * login context entry points - * ================================================================= */ +static int +color_cred_check_setlabel(struct ucred *cred, struct label *newlabel) +{ -#if 0 -static void -color_lctx_init_label(struct label *label) -{ + return (EPERM); } -static void -color_lctx_destroy_label(struct label *label) +static int +color_proc_check_signal(struct ucred *cred, struct proc *proc, int signum) { + + struct color *subjectcolor, *objectcolor; + + subjectcolor = co_getreflabel(cred->cr_label)->color; + objectcolor = co_getreflabel(proc_ucred(proc)->cr_label)->color; + + if (objectcolor->level > subjectcolor->level) { + printf("%s:: promoting label from %s to %s\n", + __func__, subjectcolor->name, objectcolor->name); + co_getreflabel(cred->cr_label)->color = objectcolor; + } + + return (0); } -#endif + +/* ================================================================= * + * login context entry points + * ================================================================= */ static void color_proc_create_lctx(struct proc *p, struct lctx *l) { -// co_copylabel(proc_ucred(p)->cr_label, l->lc_label); -// co_reference_label(proc_ucred(p)->cr_label, l->lc_label); - printf("create_lctx:: process(%s) color %s(%d) creating lctx (which was color %s(%d))\n", - p->p_comm, - co_getreflabel(proc_ucred(p)->cr_label)->color->name, - co_getreflabel(proc_ucred(p)->cr_label)->refs, - co_getreflabel(l->lc_label)->color->name, - co_getreflabel(l->lc_label)->refs); - co_getreflabel(l->lc_label)->color = co_getreflabel(proc_ucred(p)->cr_label)->color; + printf("%s: process(%s) color %s(%d) create lctx (was color %s(%d))\n", + __func__, p->p_comm, + co_getreflabel(proc_ucred(p)->cr_label)->color->name, + co_getreflabel(proc_ucred(p)->cr_label)->refs, + co_getreflabel(l->lc_label)->color->name, + co_getreflabel(l->lc_label)->refs); + + /* copy process label to lctx */ + co_getreflabel(l->lc_label)->color = + co_getreflabel(proc_ucred(p)->cr_label)->color; } static void @@ -173,37 +215,56 @@ { co_reference_label(l->lc_label, proc_ucred(p)->cr_label); - printf("join_lctx:: process(%s) color %s to join lctx color %s\n", - p->p_comm, - co_getreflabel(p->p_ucred->cr_label)->color->name, - co_getreflabel(l->lc_label)->color->name); + MCPRINTF("%s:: process(%s) pid(%d) '%s' to join lctx '%s'\n", + __func__, p->p_comm, p->p_pid, + co_getreflabel(p->p_ucred->cr_label)->color->name, + co_getreflabel(l->lc_label)->color->name); } static void color_proc_leave_lctx(struct proc *p, struct lctx *l) { - printf("leave_lctx:: process(%s) color %s to join lctx color %s\n", - p->p_comm, - co_getreflabel(p->p_ucred->cr_label)->color->name, - co_getreflabel(l->lc_label)->color->name); + MCPRINTF("%s:: process(%s) pid(%d) '%s' to leave lctx '%s'\n", + __func__, p->p_comm, p->p_pid, + co_getreflabel(p->p_ucred->cr_label)->color->name, + co_getreflabel(l->lc_label)->color->name); } static void color_lctx_setlabel(struct lctx *l, struct label *newlabel) { - printf("lctx_setlabel:: newlabel color %s for lctx color %s\n", - co_getreflabel(newlabel)->color->name, - co_getreflabel(l->lc_label)->color->name); + printf("%s:: newlabel color %s for lctx color %s\n", + __func__, co_getreflabel(newlabel)->color->name, + co_getreflabel(l->lc_label)->color->name); } /* ================================================================= * * vnode entry points * ================================================================= */ +static void +color_mount_create(struct ucred *cred, struct mount *mp, + struct label *mntlabel) +{ + struct color *credcolor; + + credcolor = co_getreflabel(cred->cr_label)->color; + co_setlabel(mntlabel, credcolor); +} + static int -color_vnode_associate_extattr(struct mount *mp, struct label *fslabel, +color_mount_check_setlabel(struct ucred *cred, struct mount *mp, + struct label *mntlabel) +{ + + return (EPERM); +} + + +static int +color_vnode_associate_extattr(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { int error; @@ -214,6 +275,7 @@ error = mac_vnop_getxattr(vp, MAC_COLOR_XATTR_NAME, buf, sizeof(buf), &buflen); + /* If there's no attribute, the label is NULL */ if (error == ENOATTR || error == EOPNOTSUPP) return (0); @@ -227,11 +289,20 @@ } static void -color_vnode_associate_singlelabel(struct mount *mp, struct label *fslabel, +color_devfs_vnode_associate(struct mount *mp, struct label *mntlabel, + struct devnode *de, struct label *delabel, struct vnode *vp, + struct label *vlabel) +{ + + co_copylabel(mntlabel, vlabel); +} + +static void +color_vnode_associate_singlelabel(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel) { - co_setlabel(vlabel, NULL); + co_copylabel(mntlabel, vlabel); } static void @@ -251,30 +322,39 @@ static int color_vnode_create_extattr(struct ucred *cred, struct mount *mp, - struct label *fslabel, struct vnode *dvp, struct label *dlabel, + struct label *mntlabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp) { - int error; - struct color *color; + int error = 0; + struct color *dircolor, *credcolor, *newcolor; - /* For now, just inherit the parent directory label */ - color = co_getlabel(dlabel); - if (color == NULL) - return (0); + dircolor = co_getlabel(dlabel); + credcolor = co_getreflabel(cred->cr_label)->color; - error = mac_vnop_setxattr(vp, MAC_COLOR_XATTR_NAME, - color->name, sizeof(color->name)); + /* + * Process credentials always have labels, but files may not. + * If the parent directory has no label, the new file will have + * no label. Otherwise, the new file gets the higher of the + * parent label or the process label. + */ + if ((dircolor == NULL) || (dircolor->level > credcolor->level)) + newcolor = dircolor; + else + newcolor = credcolor; - if (error) - co_setlabel(vlabel, NULL); - else - co_copylabel(dlabel, vlabel); + co_setlabel(vlabel, newcolor); + if (newcolor != NULL) { + error = mac_vnop_setxattr(vp, MAC_COLOR_XATTR_NAME, + newcolor->name, sizeof(newcolor->name)); + if (error) + printf("%s:: Couldn't set file label \n", __func__); + } return (error); } static void -color_vnode_update_extattr(struct mount *mp, struct label *fslabel, +color_vnode_update_extattr(struct mount *mp, struct label *mntlabel, struct vnode *vp, struct label *vlabel, char *name) { int error; @@ -285,6 +365,7 @@ error = mac_vnop_getxattr(vp, MAC_COLOR_XATTR_NAME, buf, sizeof(buf), &buflen); + /* It's ok to have a NULL file label */ if (error) return; @@ -300,10 +381,11 @@ { int error; struct color *color; + struct vfs_context context; color = co_getlabel(intlabel); if (color == NULL) - return (0); + return (mac_vnop_removexattr(vp, MAC_COLOR_XATTR_NAME)); error = mac_vnop_setxattr(vp, MAC_COLOR_XATTR_NAME, color->name, sizeof(color->name)); @@ -312,90 +394,357 @@ } static int +color_vnode_check_access(struct ucred *cred, struct vnode *vp, + struct label *label, int acc_mode) +{ + + return (co_maybe_promote_process(cred, label)); +} + +static int +color_vnode_check_chdir(struct ucred *cred, struct vnode *dvp, + struct label *label) +{ + + return (co_maybe_promote_process(cred, label)); +} + +static int +color_vnode_check_chroot(struct ucred *cred, struct vnode *dvp, + struct label *label) +{ + + return (co_maybe_promote_process(cred, label)); +} + +static int +color_vnode_check_create(struct ucred *cred, struct vnode *dvp, + struct label *label, struct componentname *cnp, struct vnode_attr *vap) +{ + + return (co_maybe_promote_process(cred, label)); +} + +static int +color_vnode_check_unlink(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) +{ + + (void)co_maybe_promote_process(cred, dlabel); + return (co_maybe_promote_process(cred, label)); +} + +static int +color_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp, + struct label *label, const char *name) +{ + + return (co_maybe_promote_process(cred, label)); +} + +static int + +color_vnode_check_exchangedata(struct ucred *cred, struct vnode *v1, + struct label *vl1, struct vnode *v2, struct label *vl2) +{ + + (void)co_maybe_promote_process(cred, vl1); + return (co_maybe_promote_process(cred, vl2)); +} + +static int +color_vnode_check_exec(struct ucred *cred, struct vnode *vp, + struct label *label, struct label *execlabel) +{ + + if (execlabel != NULL) + (void)co_maybe_promote_process(cred, execlabel); + return (co_maybe_promote_process(cred, label)); +} + +static int +color_vnode_check_getattrlist(struct ucred *cred, struct vnode *vp, + struct label *label, struct attrlist *alist) +{ + + return (co_maybe_promote_process(cred, label)); +} + +static int +color_vnode_check_getextattr(struct ucred *cred, struct vnode *vp, + struct label *label, const char *name, struct uio *uio) +{ + + return (co_maybe_promote_process(cred, label)); +} + +static int +color_vnode_check_kqfilter(struct ucred *cred, struct ucred *file_cred, + struct knote *kn, struct vnode *vp, struct label *label) +{ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 3 15:18: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 58D8F16A47B; Tue, 3 Oct 2006 15:18:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3182C16A412 for ; Tue, 3 Oct 2006 15:18:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD57C43D5A for ; Tue, 3 Oct 2006 15:18:18 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93FII2W030018 for ; Tue, 3 Oct 2006 15:18:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93FIIId030015 for perforce@freebsd.org; Tue, 3 Oct 2006 15:18:18 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 15:18:18 GMT Message-Id: <200610031518.k93FIIId030015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 15:18:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=107188 Change 107188 by millert@millert_macbook on 2006/10/03 15:17:45 Remove MAC_DEBUG missed before. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#7 (text+ko) ==== @@ -47,10 +47,6 @@ #include -#ifdef MAC_DEBUG -extern u_int nmaccreds, nmacprocs; -#endif - #include struct label * From owner-p4-projects@FreeBSD.ORG Tue Oct 3 15:19: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 4A90616A415; Tue, 3 Oct 2006 15:19:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CC4016A403 for ; Tue, 3 Oct 2006 15:19:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB26C43D46 for ; Tue, 3 Oct 2006 15:19:20 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93FJKSh030053 for ; Tue, 3 Oct 2006 15:19:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93FJK2b030050 for perforce@freebsd.org; Tue, 3 Oct 2006 15:19:20 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 15:19:20 GMT Message-Id: <200610031519.k93FJK2b030050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107189 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 15:19:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=107189 Change 107189 by millert@millert_macbook on 2006/10/03 15:18:35 Merge sebsd_cred_createlabels() into sebsd_task_create(), its only consumer. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#20 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#20 (text+ko) ==== @@ -779,29 +779,25 @@ } static void -sebsd_cred_createlabels(struct label *pl, struct label *chl) +sebsd_task_create(struct task *parent, struct task *child, struct label *pl, + struct label *chl, struct label *chpl) { int rc; - struct task_security_struct *parent, *task; + struct task_security_struct *psec, *chsec, *chpsec; rc = ss_precondition(); if (rc <= 0) return; - parent = SLOT(pl); - task = SLOT(chl); + psec = SLOT(pl); + chsec = SLOT(chl); + chpsec = SLOT(chpl); /* Default to using the attributes from the parent process */ - task->osid = parent->osid; - task->sid = parent->sid; -} - -static void -sebsd_task_create(struct task *parent, struct task *child, struct label *pl, - struct label *chl, struct label *chpl) -{ - sebsd_cred_createlabels(pl, chl); - sebsd_cred_createlabels(pl, chpl); + chsec->osid = psec->osid; + chsec->sid = psec->sid; + chpsec->osid = psec->osid; + chpsec->sid = psec->sid; } static void From owner-p4-projects@FreeBSD.ORG Tue Oct 3 15:19: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 B4A3016A55C; Tue, 3 Oct 2006 15:19:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77BFB16A54B for ; Tue, 3 Oct 2006 15:19:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AF4643D46 for ; Tue, 3 Oct 2006 15:19:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93FJLK7030059 for ; Tue, 3 Oct 2006 15:19:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93FJKRr030056 for perforce@freebsd.org; Tue, 3 Oct 2006 15:19:20 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 15:19:20 GMT Message-Id: <200610031519.k93FJKRr030056@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107190 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 15:19:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=107190 Change 107190 by millert@millert_macbook on 2006/10/03 15:19:01 Add support for DTYPE_VNODE in mac_{get,set}_fd(2). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#14 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#14 (text+ko) ==== @@ -1523,6 +1523,7 @@ size_t ulen; struct socket *so; struct label *intlabel; + struct vnode *vp; AUDIT_ARG(fd, uap->fd); @@ -1568,6 +1569,20 @@ buffer, mac.m_buflen); mac_socket_free_label(intlabel); break; + case DTYPE_VNODE: + intlabel = mac_vnode_alloc_label(); + vp = (struct vnode *)fp->f_fglob->fg_data; + + error = vnode_getwithref(vp); + if (error == 0) { + mac_vnode_copy_label(vp->v_label, intlabel); + error = mac_vnode_externalize_label(intlabel, + elements, buffer, + mac.m_buflen, M_WAITOK); + vnode_put(vp); + } + mac_vnode_free_label(intlabel); + break; default: error = ENOSYS; // only sockets are handled so far } @@ -1669,11 +1684,13 @@ struct fileproc *fp; struct mac mac; + struct vfs_context context; int error; size_t ulen; char *buffer; struct label *intlabel; struct socket *so; + struct vnode *vp; AUDIT_ARG(fd, uap->fd); @@ -1717,6 +1734,27 @@ } mac_socket_free_label(intlabel); break; + case DTYPE_VNODE: + intlabel = mac_vnode_alloc_label(); + + error = mac_vnode_internalize_label(intlabel, buffer); + if (error) { + mac_vnode_free_label(intlabel); + break; + } + + context.vc_proc = p; + context.vc_ucred = kauth_cred_get(); + vp = (struct vnode *)fp->f_fglob->fg_data; + + error = vnode_getwithref(vp); + if (error == 0) { + error = vn_setlabel(vp, intlabel, &context); + vnode_put(vp); + } + + mac_vnode_free_label(intlabel); + break; default: error = ENOSYS; // only sockets are handled at this point } From owner-p4-projects@FreeBSD.ORG Tue Oct 3 15:21: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 CC25E16A47E; Tue, 3 Oct 2006 15:21:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A435516A415 for ; Tue, 3 Oct 2006 15:21:28 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB7AA43D73 for ; Tue, 3 Oct 2006 15:21:24 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93FLO4O030616 for ; Tue, 3 Oct 2006 15:21:24 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93FLO0T030603 for perforce@freebsd.org; Tue, 3 Oct 2006 15:21:24 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 15:21:24 GMT Message-Id: <200610031521.k93FLO0T030603@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 15:21:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=107191 Change 107191 by millert@millert_macbook on 2006/10/03 15:20:28 Harness for testing MAC.loginPlugin outside the LoginWindow.app Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/TestLP/English.lproj/InfoPlist.strings#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/TestLP/English.lproj/MainMenu.nib/classes.nib#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/TestLP/English.lproj/MainMenu.nib/info.nib#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/TestLP/English.lproj/MainMenu.nib/keyedobjects.nib#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/TestLP/Info.plist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/TestLP/TestController.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/TestLP/TestController.m#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/TestLP/TestLP.xcode/project.pbxproj#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/TestLP/TestLP_Prefix.pch#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/TestLP/loginPlugin.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/TestLP/main.m#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Oct 3 15:38: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 C74B316A492; Tue, 3 Oct 2006 15:38:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E15F16A417 for ; Tue, 3 Oct 2006 15:38:52 +0000 (UTC) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A03643D6A for ; Tue, 3 Oct 2006 15:38:46 +0000 (GMT) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93Fckek036272 for ; Tue, 3 Oct 2006 15:38:46 GMT (envelope-from ru@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93FcjmE036269 for perforce@freebsd.org; Tue, 3 Oct 2006 15:38:45 GMT (envelope-from ru@freebsd.org) Date: Tue, 3 Oct 2006 15:38:45 GMT Message-Id: <200610031538.k93FcjmE036269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ru@freebsd.org using -f From: Ruslan Ermilov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 15:38:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=107192 Change 107192 by ru@ru_edoofus on 2006/10/03 15:38:41 - Shorten short descriptions (.Nd). - Fix markup. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#12 edit .. //depot/projects/trustedbsd/openbsm/man/audit_class.5#9 edit .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#15 edit .. //depot/projects/trustedbsd/openbsm/man/audit_event.5#10 edit .. //depot/projects/trustedbsd/openbsm/man/audit_user.5#9 edit .. //depot/projects/trustedbsd/openbsm/man/audit_warn.5#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#12 (text+ko) ==== @@ -23,14 +23,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#11 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#12 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 .Os .Sh NAME .Nm audit -.Nd "Basic Security Module (BSM) File Format" +.Nd "Basic Security Module (BSM) file format" .Sh DESCRIPTION The .Nm ==== //depot/projects/trustedbsd/openbsm/man/audit_class.5#9 (text+ko) ==== @@ -25,14 +25,14 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_class.5#9 $ .\" .Dd January 24, 2004 .Dt AUDIT_CLASS 5 .Os .Sh NAME .Nm audit_class -.Nd "contains audit event class descriptions" +.Nd "audit event class descriptions" .Sh DESCRIPTION The .Nm @@ -42,7 +42,7 @@ mask (bitmap) to a class and a description. Entries are of the form: .Pp -.Dl classmask:eventclass:description +.D1 Ar classmask Ns : Ns Ar eventclass Ns : Ns Ar description .Pp Example entries in this file are: .Bd -literal -offset indent @@ -54,7 +54,7 @@ 0xffffffff:all:all flags set .Ed .Sh FILES -.Bl -tag -width "/etc/security/audit_class" -compact +.Bl -tag -width ".Pa /etc/security/audit_class" -compact .It Pa /etc/security/audit_class .El .Sh HISTORY @@ -63,9 +63,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#15 (text+ko) ==== @@ -26,25 +26,25 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#14 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#15 $ .\" .Dd January 4, 2006 .Dt AUDIT_CONTROL 5 .Os .Sh NAME .Nm audit_control -.Nd "contains audit system parameters" +.Nd "audit system parameters" .Sh DESCRIPTION The .Nm file contains several audit system parameters. Each line of this file is of the form: .Pp -.Dl parameter:value +.D1 Ar parameter Ns : Ns Ar value .Pp The parameters are: -.Bl -tag -width Ds -.It Pa dir +.Bl -tag -width indent +.It Va dir The directory where audit log files are stored. There may be more than one of these entries. Changes to this entry can only be enacted by restarting the @@ -76,73 +76,85 @@ .El .Sh AUDIT FLAGS Audit flags are a comma-delimited list of audit classes as defined in the -.Pa audit_class +.Xr audit_class 5 file. -See -.Xr audit_class 5 -for details. Event classes may be preceded by a prefix which changes their interpretation. The following prefixes may be used for each class: .Pp -.Bl -tag -width Ds -compact -offset indent +.Bl -tag -width indent -compact -offset indent .It (none) -Record both successful and failed events -.It + -Record successful events -.It - -Record failed events -.It ^ -Record neither successful nor failed events -.It ^+ -Do not record successful events -.It ^- -Do not record failed events +Record both successful and failed events. +.It Li + +Record successful events. +.It Li - +Record failed events. +.It Li ^ +Record neither successful nor failed events. +.It Li ^+ +Do not record successful events. +.It Li ^- +Do not record failed events. .El .Sh AUDIT POLICY FLAGS The policy flags field is a comma-delimited list of policy flags from the following list: .Pp -.Bl -tag -width zonename -compact -offset indent -.It cnt +.Bl -tag -width ".Cm zonename" -compact -offset indent +.It Cm cnt Allow processes to continue running even though events are not being audited. If not set, processes will be suspended when the audit store space is exhausted. Currently, this is not a recoverable state. -.It ahlt -Fail stop the system if unable to audit an event--this consists of first +.It Cm ahlt +Fail stop the system if unable to audit an event\[em]this consists of first draining pending records to disk, and then halting the operating system. -.It argv +.It Cm argv Audit command line arguments to .Xr execve 2 . -.It arge +.It Cm arge Audit environmental variable arguments to .Xr execve 2 . -.It seq +.It Cm seq Include a unique audit sequence number token in generated audit records (not -implemented on FreeBSD or Darwin). -.It group +implemented on +.Fx +or Darwin). +.It Cm group Include supplementary groups list in generated audit records (not implemented -on FreeBSD or Darwin; supplementary groups are never included in records on +on +.Fx +or Darwin; supplementary groups are never included in records on these systems). -.It trail -Append a trailer token to each audit record (not implemented on FreeBSD or +.It Cm trail +Append a trailer token to each audit record (not implemented on +.Fx +or Darwin; trailers are always included in records on these systems). -.It path -Include secondary file paths in audit records (not implemented on FreeBSD or +.It Cm path +Include secondary file paths in audit records (not implemented on +.Fx +or Darwin; secondary paths are never included in records on these systems). -.It zonename -Include a zone ID token with each audit record (not implemented on FreeBSD or -Darwin; FreeBSD audit records do not currently include the jail ID or name.) -.It perzone -Enable auditing for each local zone (not implemented on FreeBSD or Darwin; on -FreeBSD, audit records are collected from all jails and placed in a single -global trail, and only limited audit controls are permitted within a jail.) +.It Cm zonename +Include a zone ID token with each audit record (not implemented on +.Fx +or +Darwin; +.Fx +audit records do not currently include the jail ID or name). +.It Cm perzone +Enable auditing for each local zone (not implemented on +.Fx +or Darwin; on +.Fx , +audit records are collected from all jails and placed in a single +global trail, and only limited audit controls are permitted within a jail). .El .Pp It is recommended that installations set the -.Dv cnt +.Cm cnt flag but not -.Dv ahlt +.Cm ahlt flag unless it is intended that audit logs exceeding available disk space halt the system. .Sh DEFAULT @@ -169,7 +181,7 @@ The trail file will not be automatically rotated by the audit daemon based on file size. .Sh FILES -.Bl -tag -width "/etc/security/audit_control" -compact +.Bl -tag -width ".Pa /etc/security/audit_control" -compact .It Pa /etc/security/audit_control .El .Sh SEE ALSO @@ -183,9 +195,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/openbsm/man/audit_event.5#10 (text+ko) ==== @@ -25,14 +25,14 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#9 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_event.5#10 $ .\" .Dd January 24, 2004 .Dt AUDIT_EVENT 5 .Os .Sh NAME .Nm audit_event -.Nd "contains audit event descriptions" +.Nd "audit event descriptions" .Sh DESCRIPTION The .Nm @@ -40,16 +40,15 @@ Each line maps an audit event number to a name, a description, and a class. Entries are of the form: .Pp -.Dl eventnum:eventname:description:eventclass +.Sm off +.D1 Ar eventnum : eventname : description : eventclass +.Sm on .Pp Each -.Vt eventclass +.Ar eventclass should have a corresponding entry in the -.Pa audit_class +.Xr audit_class 5 file. -See -.Xr audit_class 5 -for details. .Pp Example entries in this file are: .Bd -literal -offset indent @@ -59,7 +58,7 @@ 3:AUE_OPEN:open(2):fa .Ed .Sh FILES -.Bl -tag -width "/etc/security/audit_event" -compact +.Bl -tag -width ".Pa /etc/security/audit_event" -compact .It Pa /etc/security/audit_event .El .Sh SEE ALSO @@ -70,9 +69,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/openbsm/man/audit_user.5#9 (text+ko) ==== @@ -25,20 +25,20 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_user.5#9 $ .\" .Dd February 5, 2006 .Dt AUDIT_USER 5 .Os .Sh NAME .Nm audit_user -.Nd "specifies events to be audited for the given users" +.Nd "events to be audited for given users" .Sh DESCRIPTION The .Nm file specifies which audit event classes are to be audited for the given users. If specified, these flags are combined with the system-wide audit flags in the -.Pa audit_control +.Xr audit_control 5 file to determine which classes of events to audit for that user. These settings take effect when the user logs in. .Pp @@ -46,12 +46,12 @@ list of classes that should not be audited. Entries are of the form: .Pp -.Dl username:alwaysaudit:neveraudit +.D1 Ar username Ns : Ns Ar alwaysaudit Ns : Ns Ar neveraudit .Pp In the format above, -.Vt alwaysaudit +.Ar alwaysaudit is a set of event classes that are always audited, and -.Vt neveraudit +.Ar neveraudit is a set of event classes that should not be audited. These sets can indicate the inclusion or exclusion of multiple classes, and whether to audit successful @@ -67,14 +67,16 @@ .Ed .Pp These settings would cause login/logout and administrative events that -succeed on behalf of user root to be audited. +succeed on behalf of user +.Dq Li root +to be audited. No failure events are audited. For the user -.Em jdoe , +.Dq Li jdoe , failed file creation events are audited, administrative events are audited, and successful file write events are never audited. .Sh FILES -.Bl -tag -width "/etc/security/audit_user" -compact +.Bl -tag -width ".Pa /etc/security/audit_user" -compact .It Pa /etc/security/audit_user .El .Sh SEE ALSO @@ -85,9 +87,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. ==== //depot/projects/trustedbsd/openbsm/man/audit_warn.5#8 (text+ko) ==== @@ -25,7 +25,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_warn.5#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_warn.5#8 $ .\" .Dd March 17, 2004 .Dt AUDIT_WARN 5 @@ -34,7 +34,9 @@ .Nm audit_warn .Nd "alert when audit daemon issues warnings" .Sh DESCRIPTION +The .Nm +script runs when .Xr auditd 8 generates warning messages. @@ -49,7 +51,7 @@ For example, a low-space warning could result in an email message being sent to the administrator. .Sh FILES -.Bl -tag -width "/etc/security/audit_warn" -compact +.Bl -tag -width ".Pa /etc/security/audit_messages" -compact .It Pa /etc/security/audit_warn .It Pa /etc/security/audit_messages .El @@ -61,9 +63,13 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Sh AUTHORS +.An -nosplit This software was created by McAfee Research, the security research division of McAfee, Inc., under contract to Apple Computer Inc. -Additional authors include Wayne Salamon, Robert Watson, and SPARTA Inc. +Additional authors include +.An Wayne Salamon , +.An Robert Watson , +and SPARTA Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. From owner-p4-projects@FreeBSD.ORG Tue Oct 3 16:24: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 9A92316A40F; Tue, 3 Oct 2006 16:24:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D1F816A403 for ; Tue, 3 Oct 2006 16:24:45 +0000 (UTC) (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 162B943D45 for ; Tue, 3 Oct 2006 16:24:45 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93GOiEB045032 for ; Tue, 3 Oct 2006 16:24:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93GOiDK045029 for perforce@freebsd.org; Tue, 3 Oct 2006 16:24:44 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 16:24:44 GMT Message-Id: <200610031624.k93GOiDK045029@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 107193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 16:24:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=107193 Change 107193 by imp@imp_lighthouse on 2006/10/03 16:23:52 Tweak debug to report block number read. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#6 (text+ko) ==== @@ -179,7 +179,7 @@ } while (bp == NULL); MMCBUS_ACQUIRE_BUS(device_get_parent(dev), dev); bioq_remove(&sc->bio_queue, bp); - printf("mmc_task: request %p\n", bp); + printf("mmc_task: request %p for block %lld\n", bp, bp->bio_pblkno); sz = sc->disk->d_sectorsize; end = bp->bio_pblkno + (bp->bio_bcount / sz); // XXX should use read/write_mulit From owner-p4-projects@FreeBSD.ORG Tue Oct 3 16:26: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 B447516A47B; Tue, 3 Oct 2006 16:26:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D4A716A416 for ; Tue, 3 Oct 2006 16:26:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F21143D45 for ; Tue, 3 Oct 2006 16:26:49 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93GQnTN045306 for ; Tue, 3 Oct 2006 16:26:49 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93GQlG4045285 for perforce@freebsd.org; Tue, 3 Oct 2006 16:26:47 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 16:26:47 GMT Message-Id: <200610031626.k93GQlG4045285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 16:26:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=107194 Change 107194 by millert@millert_macbook on 2006/10/03 16:26:07 Rename entrypoints again; hopefully for the last time Remove mac_devfs_create_symlink(); Darwin devfs doesn't have them. Use a perl script to generate access control checks in mac_test Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/bsm/audit_kernel.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/bsd_init.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_audit.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_credential.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_exec.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_exit.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_fork.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_proc.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_prot.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_sig.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/posix_sem.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/posix_shm.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_pipe.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_msg.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_sem.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_shm.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_mbuf.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_mbuf2.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket2.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_usrreq.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_tree.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_vfsops.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_vnops.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/bpf.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/bsd_comp.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/dlil.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/ppp_deflate.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/igmp.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_icmp.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_output.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/raw_ip.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_input.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_output.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_subr.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet6/mld6.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet6/nd6_nbr.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/nfs/nfs_vfsops.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/kauth.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_init.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_subr.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_xattr.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_object.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_port.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/mach_msg.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/mach_port.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/ipc_kobject.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/ipc_tt.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/security.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/mach/security.defs#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#9 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_audit.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#15 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_mach_internal.h#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#11 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_port.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_posix_sem.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_posix_shm.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_msg.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_sem.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_shm.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_task.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs_subr.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/basetest/mac_basetest.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/color/mac_color.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/console/mac_console.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/console/mac_console.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/device_access/mac_device_access.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/extattr_test/mac_extattr_test.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/fwinteg/mac_fwinteg.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/ipctrace/module/ipctrace.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#10 edit .. //depot/projects/trustedbsd/sedarwin8/policies/multilabel/multilabel.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/readonly/mac_readonly.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#21 edit .. //depot/projects/trustedbsd/sedarwin8/policies/stacktrace/module/mac_stacktrace.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_parse.pl#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/vanity/vanity.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/xattr/xattr.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/bsm/audit_kernel.h#4 (text+ko) ==== @@ -250,7 +250,7 @@ #ifdef MAC /* MAC security related fields added by MAC policies - * ar_forced_by_mac is 1 if mac_audit_preselect() forced this + * ar_forced_by_mac is 1 if mac_audit_check_preselect() forced this * call to be audited, 0 otherwise. */ LIST_HEAD(mac_audit_record_list_t, mac_audit_record) *ar_mac_records; @@ -291,7 +291,7 @@ #ifdef MAC /* * The parameter list of audit_syscall_exit() was modified to also take the - * Darwin syscall number, which is required by mac_audit_postselect(). + * Darwin syscall number, which is required by mac_audit_check_postselect(). */ void audit_syscall_exit(unsigned short code, int error, struct proc *proc, struct uthread *uthread); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/bsd_init.c#5 (text+ko) ==== @@ -391,8 +391,8 @@ file_lock_init(); #ifdef MAC - mac_proc_create_swapper(p->p_ucred); - mac_task_update_from_cred (p->p_ucred, (struct task *) p->task); + mac_cred_label_associate_kernel(p->p_ucred); + mac_task_label_update_cred (p->p_ucred, (struct task *) p->task); #endif /* Create the file descriptor table. */ @@ -662,8 +662,8 @@ vm_set_shared_region(get_threadtask(th_act), system_region); } #ifdef MAC - mac_proc_create_init(p->p_ucred); - mac_task_update_from_cred (p->p_ucred, (struct task *) p->task); + mac_cred_label_associate_user(p->p_ucred); + mac_task_label_update_cred (p->p_ucred, (struct task *) p->task); #endif load_init_program(p); /* turn on app-profiling i.e. pre-heating */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_audit.c#6 (text+ko) ==== @@ -1506,7 +1506,7 @@ } mac.m_buflen = MAC_AUDIT_LABEL_LEN; mac.m_string = ar->k_ar.ar_cred_mac_labels; - mac_cred_get_audit_labels(p, &mac); + mac_cred_label_externalize_audit(p, &mac); ar->k_ar.ar_mac_records = (struct mac_audit_record_list_t *) kalloc(sizeof(*ar->k_ar.ar_mac_records)); @@ -1708,7 +1708,7 @@ do { int error; - error = mac_audit_preselect(kauth_cred_get(), code, + error = mac_audit_check_preselect(kauth_cred_get(), code, (void *) uthread->uu_arg); if (error == MAC_AUDIT_YES) { @@ -1736,7 +1736,7 @@ /* * Note: The audit_syscall_exit() parameter list was modified to support - * mac_audit_postselect(), which requires the Darwin syscall number. + * mac_audit_check_postselect(), which requires the Darwin syscall number. */ #ifdef MAC void @@ -1770,13 +1770,13 @@ /* * Note, no other postselect mechanism exists. If - * mac_audit_postselect returns MAC_AUDIT_NO, the + * mac_audit_check_postselect returns MAC_AUDIT_NO, the * record will be suppressed. Other values at this * point result in the audit record being committed. * This suppression behavior will probably go away in * the port to 10.3.4. */ - mac_error = mac_audit_postselect(kauth_cred_get(), code, + mac_error = mac_audit_check_postselect(kauth_cred_get(), code, (void *) uthread->uu_arg, error, retval, uthread->uu_ar->k_ar.ar_forced_by_mac); @@ -2505,7 +2505,7 @@ if (*vnode_mac_labelp != NULL) { mac.m_buflen = MAC_AUDIT_LABEL_LEN; mac.m_string = *vnode_mac_labelp; - mac_vnode_get_audit_labels(vp, &mac); + mac_vnode_label_externalize_audit(vp, &mac); } else { /* XXX What to do here? This may be an "audit6" req. */ printf("Could not store vnode audit labels"); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_credential.c#4 (text+ko) ==== @@ -1601,7 +1601,7 @@ #endif #ifdef MAC - mac_cred_init(newcred); + mac_cred_label_init(newcred); #endif return(newcred); @@ -1654,7 +1654,7 @@ if (err == 0) break; #ifdef MAC - mac_cred_destroy(new_cred); + mac_cred_label_destroy(new_cred); #endif FREE(new_cred, M_KAUTH); new_cred = NULL; @@ -1932,19 +1932,19 @@ * Update the MAC label associated with a credential. */ kauth_cred_t -kauth_cred_setlabel(kauth_cred_t cred, struct label *label) +kauth_cred_label_update(kauth_cred_t cred, struct label *label) { kauth_cred_t newcred; struct ucred temp_cred; bcopy(cred, &temp_cred, sizeof(temp_cred)); - mac_cred_init(&temp_cred); - mac_cred_create(cred, &temp_cred); - mac_cred_setlabel(&temp_cred, label); + mac_cred_label_init(&temp_cred); + mac_cred_label_associate(cred, &temp_cred); + mac_cred_label_update(&temp_cred, label); newcred = kauth_cred_update(cred, &temp_cred, TRUE); - mac_cred_destroy(&temp_cred); + mac_cred_label_destroy(&temp_cred); return (newcred); } #endif @@ -2016,7 +2016,7 @@ bcopy(cred, newcred, sizeof(*newcred)); #ifdef MAC newcred->cr_label = temp_label; - mac_cred_create(cred, newcred); + mac_cred_label_associate(cred, newcred); #endif newcred->cr_ref = 1; } @@ -2041,7 +2041,7 @@ if (error == 0) break; #ifdef MAC - mac_cred_destroy(newcred); + mac_cred_label_destroy(newcred); #endif FREE(newcred, M_KAUTH); } @@ -2106,7 +2106,7 @@ if (err == 0) break; #ifdef MAC - mac_cred_destroy(newcred); + mac_cred_label_destroy(newcred); #endif FREE(newcred, M_KAUTH); newcred = NULL; @@ -2162,7 +2162,7 @@ if (err == 0) break; #ifdef MAC - mac_cred_destroy(new_cred); + mac_cred_label_destroy(new_cred); #endif FREE(new_cred, M_KAUTH); new_cred = NULL; @@ -2226,7 +2226,7 @@ /* found a match, remove it from the hash table */ TAILQ_REMOVE(&kauth_cred_table_anchor[hash_key], found_cred, cr_link); #ifdef MAC - mac_cred_destroy(cred); + mac_cred_label_destroy(cred); #endif FREE(cred, M_KAUTH); #if KAUTH_CRED_HASH_DEBUG ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_exec.c#4 (text+ko) ==== @@ -886,10 +886,10 @@ #ifdef MAC if (uap->mac_p != USER_ADDR_NULL) { - imgp->ip_execlabelp = mac_cred_alloc_label(); + imgp->ip_execlabelp = mac_cred_label_alloc(); error = mac_execve_enter(uap->mac_p, imgp->ip_execlabelp); if (error) { - mac_cred_free_label(imgp->ip_execlabelp); + mac_cred_label_free(imgp->ip_execlabelp); return (error); } } @@ -973,8 +973,8 @@ * actually read by the interpreter. */ #ifdef MAC - imgp->ip_scriptlabelp = mac_vnode_alloc_label(); - mac_vnode_copy_label(imgp->ip_vp->v_label, + imgp->ip_scriptlabelp = mac_vnode_label_alloc(); + mac_vnode_label_copy(imgp->ip_vp->v_label, imgp->ip_scriptlabelp); #endif vnode_put(imgp->ip_vp); @@ -1019,9 +1019,9 @@ } #ifdef MAC if (imgp->ip_execlabelp) - mac_cred_free_label(imgp->ip_execlabelp); + mac_cred_label_free(imgp->ip_execlabelp); if (imgp->ip_scriptlabelp) - mac_vnode_free_label(imgp->ip_scriptlabelp); + mac_vnode_label_free(imgp->ip_scriptlabelp); #endif return(error); @@ -1462,7 +1462,7 @@ #ifdef MAC int mac_transition; - mac_transition = mac_vnode_execve_will_transition(cred, imgp->ip_vp, + mac_transition = mac_cred_check_label_update_execve(cred, imgp->ip_vp, imgp->ip_scriptlabelp, imgp->ip_execlabelp, p); #endif @@ -1507,9 +1507,9 @@ * something similar here, or risk vulnerability. */ if (mac_transition && !imgp->ip_no_trans) { - mac_vnode_execve_transition(cred, p->p_ucred, imgp->ip_vp, + mac_cred_label_update_execve(cred, p->p_ucred, imgp->ip_vp, imgp->ip_scriptlabelp, imgp->ip_execlabelp); - mac_task_update_from_cred(p->p_ucred, p->task); + mac_task_label_update_cred(p->p_ucred, p->task); } #endif /* ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_exit.c#4 (text+ko) ==== @@ -209,7 +209,7 @@ /* * The parameter list of audit_syscall_exit() was augmented to * take the Darwin syscall number as the first parameter, - * which is currently required by mac_audit_postselect(). + * which is currently required by mac_audit_check_postselect(). */ AUDIT_SYSCALL_EXIT(SYS_exit, 0, p, ut); /* Exit is always successfull */ @@ -630,7 +630,7 @@ wakeup(&child->p_stat); #ifdef MAC - mac_proc_destroy(child); + mac_proc_label_destroy(child); #endif lck_mtx_destroy(&child->p_mlock, proc_lck_grp); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_fork.c#4 (text+ko) ==== @@ -290,7 +290,7 @@ } #ifdef MAC - mac_task_update_from_cred(child->p_ucred, task); + mac_task_label_update_cred(child->p_ucred, task); #endif if (child->p_nice != 0) @@ -443,7 +443,7 @@ panic("forkproc: M_SUBPROC zone exhausted (p_sigacts)"); #ifdef MAC - mac_proc_init(newproc); + mac_proc_label_init(newproc); #endif /* ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_proc.c#4 (text+ko) ==== @@ -894,7 +894,7 @@ LIST_INIT(&l->lc_members); lck_mtx_init(&l->lc_mtx, lctx_lck_grp, lctx_lck_attr); #ifdef MAC - l->lc_label = mac_lctx_alloc_label(); + l->lc_label = mac_lctx_label_alloc(); #endif ALLLCTX_LOCK; LIST_INSERT_HEAD(&alllctx, l, lc_list); @@ -920,9 +920,9 @@ #ifdef MAC if (create) - mac_proc_create_lctx(p, l); + mac_lctx_label_associate(p, l); else - mac_proc_join_lctx(p, l); + mac_lctx_notify_join(p, l); #endif LCTX_UNLOCK(l); @@ -946,7 +946,7 @@ LIST_REMOVE(p, p_lclist); l->lc_mc--; #ifdef MAC - mac_proc_leave_lctx(p, l); + mac_lctx_notify_leave(p, l); #endif if (LIST_EMPTY(&l->lc_members)) { ALLLCTX_LOCK; @@ -956,7 +956,7 @@ LCTX_UNLOCK(l); lck_mtx_destroy(&l->lc_mtx, lctx_lck_grp); #ifdef MAC - mac_lctx_free_label(l->lc_label); + mac_lctx_label_free(l->lc_label); l->lc_label = NULL; #endif FREE(l, M_LCTX); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_prot.c#6 (text+ko) ==== @@ -1013,7 +1013,7 @@ HOST_PRIV_NULL : host_priv_self()) != KERN_SUCCESS); #ifdef MAC - mac_task_update_from_cred(p->p_ucred, p->task); + mac_task_label_update_cred(p->p_ucred, p->task); #endif } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_sig.c#4 (text+ko) ==== @@ -135,7 +135,7 @@ void exit1(struct proc *, int, int *); void psignal_uthread(thread_t, int); kern_return_t do_bsdexception(int, int, int); -void __posixsem_syscall_return(kern_return_t); +void __posix_sem_syscall_return(kern_return_t); /* implementations in osfmk/kern/sync_sema.c. We do not want port.h in this scope, so void * them */ kern_return_t semaphore_timedwait_signal_trap_internal(void *, void *,time_t, int32_t, void (*)(int)); @@ -841,7 +841,7 @@ } void -__posixsem_syscall_return(kern_return_t kern_result) +__posix_sem_syscall_return(kern_return_t kern_result) { int error = 0; @@ -885,17 +885,17 @@ } if (uap->mutex_sem == (void *)NULL) - kern_result = semaphore_timedwait_trap_internal(uap->cond_sem, then.tv_sec, then.tv_nsec, __posixsem_syscall_return); + kern_result = semaphore_timedwait_trap_internal(uap->cond_sem, then.tv_sec, then.tv_nsec, __posix_sem_syscall_return); else - kern_result = semaphore_timedwait_signal_trap_internal(uap->cond_sem, uap->mutex_sem, then.tv_sec, then.tv_nsec, __posixsem_syscall_return); + kern_result = semaphore_timedwait_signal_trap_internal(uap->cond_sem, uap->mutex_sem, then.tv_sec, then.tv_nsec, __posix_sem_syscall_return); } else { if (uap->mutex_sem == (void *)NULL) - kern_result = semaphore_wait_trap_internal(uap->cond_sem, __posixsem_syscall_return); + kern_result = semaphore_wait_trap_internal(uap->cond_sem, __posix_sem_syscall_return); else - kern_result = semaphore_wait_signal_trap_internal(uap->cond_sem, uap->mutex_sem, __posixsem_syscall_return); + kern_result = semaphore_wait_signal_trap_internal(uap->cond_sem, uap->mutex_sem, __posix_sem_syscall_return); } out: ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/posix_sem.c#3 (text+ko) ==== @@ -144,11 +144,11 @@ LIST_HEAD(psemhashhead, psemcache) *psemhashtbl; /* Hash Table */ u_long psemhash; /* size of hash table - 1 */ long psemnument; /* number of cache entries allocated */ -long posixsem_max = 10000; /* tunable for max POSIX semaphores */ +long posix_sem_max = 10000; /* tunable for max POSIX semaphores */ /* 10000 limits to ~1M of memory */ SYSCTL_NODE(_kern, KERN_POSIX, posix, CTLFLAG_RW, 0, "Posix"); SYSCTL_NODE(_kern_posix, OID_AUTO, sem, CTLFLAG_RW, 0, "Semaphores"); -SYSCTL_INT (_kern_posix_sem, OID_AUTO, max, CTLFLAG_RW, &posixsem_max, 0, "max"); +SYSCTL_INT (_kern_posix_sem, OID_AUTO, max, CTLFLAG_RW, &posix_sem_max, 0, "max"); struct psemstats psemstats; /* cache effectiveness statistics */ @@ -271,7 +271,7 @@ if (psem_cache_search(&dpinfo, pnp, &dpcp) == -1) { return(EEXIST); } - if (psemnument >= posixsem_max) + if (psemnument >= posix_sem_max) return(ENOSPC); psemnument++; /* @@ -487,14 +487,14 @@ pinfo->sem_proc = p; #ifdef MAC PSEM_SUBSYS_UNLOCK(); - mac_posixsem_init(pinfo); + mac_posixsem_label_init(pinfo); PSEM_SUBSYS_LOCK(); error = mac_posixsem_check_create(kauth_cred_get(), nameptr); if (error) { PSEM_SUBSYS_UNLOCK(); goto bad2; } - mac_posixsem_create(kauth_cred_get(), pinfo, nameptr); + mac_posixsem_label_associate(kauth_cred_get(), pinfo, nameptr); #endif } else { /* semaphore should exist as it is without O_CREAT */ @@ -582,7 +582,7 @@ bad1: if (pinfo_alloc) { #ifdef MAC - mac_posixsem_destroy(pinfo); + mac_posixsem_label_destroy(pinfo); #endif FREE(pinfo, M_SHM); } @@ -1030,7 +1030,7 @@ kret = semaphore_destroy(kernel_task, pinfo->psem_semobject); #ifdef MAC - mac_posixsem_destroy(pinfo); + mac_posixsem_label_destroy(pinfo); #endif switch (kret) { ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/posix_shm.c#3 (text+ko) ==== @@ -488,14 +488,14 @@ pinfo->pshm_gid = kauth_cred_get()->cr_gid; #ifdef MAC PSHM_SUBSYS_UNLOCK(); - mac_posixshm_init(pinfo); + mac_posixshm_label_init(pinfo); PSHM_SUBSYS_LOCK(); error = mac_posixshm_check_create(kauth_cred_get(), nameptr); if (error) { PSHM_SUBSYS_UNLOCK(); goto bad2; } - mac_posixshm_create(kauth_cred_get(), pinfo, nameptr); + mac_posixshm_label_associate(kauth_cred_get(), pinfo, nameptr); #endif } else { /* already exists */ @@ -597,7 +597,7 @@ bad2: if (pinfo_alloc) { #ifdef MAC - mac_posixshm_destroy(pinfo); + mac_posixshm_label_destroy(pinfo); #endif FREE(pinfo, M_SHM); } @@ -1028,7 +1028,7 @@ mach_memory_entry_port_release(pinfo->pshm_memobject); PSHM_SUBSYS_LOCK(); #ifdef MAC - mac_posixshm_destroy(pinfo); + mac_posixshm_label_destroy(pinfo); #endif FREE(pinfo,M_SHM); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_pipe.c#3 (text+ko) ==== @@ -353,12 +353,12 @@ * XXXXXXXX SHOULD NOT HOLD FILE_LOCK() XXXXXXXXXXXX * * struct pipe represents a pipe endpoint. The MAC label is shared - * between the connected endpoints. As a result mac_pipe_init() and - * mac_pipe_create() should only be called on one of the endpoints + * between the connected endpoints. As a result mac_pipe_label_init() and + * mac_pipe_label_associate() should only be called on one of the endpoints * after they have been connected. */ - mac_pipe_init(rpipe); - mac_pipe_create(kauth_cred_get(), rpipe); + mac_pipe_label_init(rpipe); + mac_pipe_label_associate(kauth_cred_get(), rpipe); wpipe->pipe_label = rpipe->pipe_label; #endif proc_fdlock(p); @@ -1479,7 +1479,7 @@ * Free the shared pipe label only after the two ends are disconnected. */ if (cpipe->pipe_label != NULL && cpipe->pipe_peer == NULL) - mac_pipe_destroy(cpipe); + mac_pipe_label_destroy(cpipe); #endif /* ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_msg.c#5 (text+ko) ==== @@ -227,7 +227,7 @@ msghdrs[i-1].msg_next = &msghdrs[i]; msghdrs[i].msg_next = NULL; #ifdef MAC - mac_sysvmsg_init(&msghdrs[i]); + mac_sysvmsg_label_init(&msghdrs[i]); #endif } free_msghdrs = &msghdrs[0]; @@ -239,7 +239,7 @@ msqids[i].u.msg_qbytes = 0; /* implies entry is available */ msqids[i].u.msg_perm.seq = 0; /* reset to a known value */ #ifdef MAC - mac_sysvmsq_init(&msqids[i]); + mac_sysvmsq_label_init(&msqids[i]); #endif } } @@ -278,7 +278,7 @@ msghdr->msg_next = free_msghdrs; free_msghdrs = msghdr; #ifdef MAC - mac_sysvmsg_cleanup(msghdr); + mac_sysvmsg_label_recycle(msghdr); #endif } @@ -383,7 +383,7 @@ msqptr->u.msg_qbytes = 0; /* Mark it as free */ #ifdef MAC - mac_sysvmsq_cleanup(msqptr); + mac_sysvmsq_label_recycle(msqptr); #endif wakeup((caddr_t)msqptr); @@ -570,7 +570,7 @@ msqptr->u.msg_rtime = 0; msqptr->u.msg_ctime = sysv_msgtime(); #ifdef MAC - mac_sysvmsq_create(cred, msqptr); + mac_sysvmsq_label_associate(cred, msqptr); #endif } else { #ifdef MSG_DEBUG_OK @@ -803,7 +803,7 @@ msghdr->msg_ts = msgsz; #ifdef MAC - mac_sysvmsg_create(kauth_cred_get(), msqptr, msghdr); + mac_sysvmsg_label_associate(kauth_cred_get(), msqptr, msghdr); #endif /* * Allocate space for the message ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_sem.c#5 (text+ko) ==== @@ -326,7 +326,7 @@ #ifdef MAC for (i = seminfo.semmni; i < newSize; i++) { - mac_sysvsem_init(&newSema[i]); + mac_sysvsem_label_init(&newSema[i]); } #endif @@ -683,7 +683,7 @@ } semakptr->u.sem_perm.mode = 0; #ifdef MAC - mac_sysvsem_cleanup(semakptr); + mac_sysvsem_label_recycle(semakptr); #endif semundo_clear(semid, -1); wakeup((caddr_t)semakptr); @@ -952,7 +952,7 @@ bzero(sema[semid].u.sem_base, sizeof(sema[semid].u.sem_base[0])*nsems); #ifdef MAC - mac_sysvsem_create(cred, &sema[semid]); + mac_sysvsem_label_associate(cred, &sema[semid]); #endif #ifdef SEM_DEBUG printf("sembase = 0x%x, next = 0x%x\n", sema[semid].u.sem_base, ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_shm.c#5 (text+ko) ==== @@ -246,7 +246,7 @@ shmseg->u.shm_perm.mode = SHMSEG_FREE; #ifdef MAC /* Reset the MAC label */ - mac_sysvshm_cleanup(shmseg); + mac_sysvshm_label_recycle(shmseg); #endif } @@ -685,7 +685,7 @@ shmseg->u.shm_lpid = shmseg->u.shm_nattch = 0; shmseg->u.shm_atime = shmseg->u.shm_dtime = 0; #ifdef MAC - mac_sysvshm_create(cred, shmseg); + mac_sysvshm_label_associate(cred, shmseg); #endif shmseg->u.shm_ctime = sysv_shmtime(); shm_committed += btoc(size); @@ -870,7 +870,7 @@ shmsegs[i].u.shm_perm.mode = SHMSEG_FREE; shmsegs[i].u.shm_perm.seq = 0; #ifdef MAC - mac_sysvshm_init(&shmsegs[i]); + mac_sysvshm_label_init(&shmsegs[i]); #endif } shm_last_free = 0; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_mbuf.c#4 (text+ko) ==== @@ -506,7 +506,7 @@ m->m_data = m->m_pktdat; _M_CLEAR_PKTHDR(m); #ifdef MAC - if (mac_mbuf_init(m, canwait)) { + if (mac_mbuf_label_init(m, canwait)) { m_free(m); return (NULL); } @@ -577,7 +577,7 @@ m->m_len = 0; _M_CLEAR_PKTHDR(m) #ifdef MAC - if (mac_mbuf_init(m, nowait)) { + if (mac_mbuf_label_init(m, nowait)) { m_free(m); return (NULL); } @@ -921,7 +921,7 @@ _M_CLEAR_PKTHDR(m); #ifdef MAC MBUF_UNLOCK(); - if (mac_mbuf_init(m, how)) { + if (mac_mbuf_label_init(m, how)) { m_free(m); goto fail; } @@ -1094,7 +1094,7 @@ _M_CLEAR_PKTHDR(m); #ifdef MAC MBUF_UNLOCK(); - if (mac_mbuf_init(m, how)) { + if (mac_mbuf_label_init(m, how)) { m_free(m); goto fail; } @@ -1237,7 +1237,7 @@ _M_CLEAR_PKTHDR(m); #ifdef MAC MBUF_UNLOCK(); - if (mac_mbuf_init(m, how)) { + if (mac_mbuf_label_init(m, how)) { m_free(m); return(top); } @@ -1644,7 +1644,7 @@ _M_CLEAR_PKTHDR(n); #ifdef MAC MBUF_UNLOCK(); - if (mac_mbuf_init(n, wait)) { + if (mac_mbuf_label_init(n, wait)) { m_free(n); goto nospace_unlock; } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_mbuf2.c#4 (text+ko) ==== @@ -482,7 +482,7 @@ if (t != NULL && t->m_tag_id == KERNEL_MODULE_TAG_ID && t->m_tag_type == KERNEL_TAG_TYPE_MACLABEL) - mac_mbuf_destroy_tag(t); + mac_mbuf_tag_destroy(t); #endif #ifndef __APPLE__ free(t, M_PACKET_TAGS); @@ -580,11 +580,11 @@ if (t != NULL && t->m_tag_id == KERNEL_MODULE_TAG_ID && t->m_tag_type == KERNEL_TAG_TYPE_MACLABEL) { - if (mac_mbuf_init_tag(p, how) != 0) { + if (mac_mbuf_tag_init(p, how) != 0) { m_tag_free(p); return (NULL); } - mac_mbuf_copy_tag(t, p); + mac_mbuf_tag_copy(t, p); } else #endif bcopy(t + 1, p + 1, t->m_tag_len); /* Copy the data */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket.c#5 (text+ko) ==== @@ -424,7 +424,7 @@ so->so_gencnt = ++so_gencnt; so->so_zone = socket_zone; #ifdef MAC_SOCKET - if (mac_socket_init(so, waitok) != 0) { + if (mac_socket_label_init(so, waitok) != 0) { sodealloc(so); return (NULL); } @@ -490,7 +490,7 @@ so->so_rcv.sb_so = so->so_snd.sb_so = so; #endif #ifdef MAC_SOCKET - mac_socket_create(kauth_cred_get(), so); + mac_socket_label_associate(kauth_cred_get(), so); #endif //### Attachement will create the per pcb lock if necessary and increase refcount @@ -574,7 +574,7 @@ so->so_gencnt = ++so_gencnt; #ifdef MAC_SOCKET - mac_socket_destroy(so); + mac_socket_label_destroy(so); #endif #ifndef __APPLE__ if (so->so_rcv.sb_hiwat) @@ -2557,7 +2557,7 @@ sizeof(extmac)); if (error) return (error); - error = mac_socket_getlabel(proc_ucred(sopt->sopt_p), + error = mac_socket_label_get(proc_ucred(sopt->sopt_p), so, &extmac); if (error) return (error); @@ -2573,7 +2573,7 @@ sizeof(extmac)); if (error) return (error); - error = mac_getsockopt_peerlabel( + error = mac_socketpeer_label_get( proc_ucred(sopt->sopt_p), so, &extmac); if (error) return (error); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket2.c#4 (text+ko) ==== @@ -294,7 +294,7 @@ so->so_uid = head->so_uid; so->so_usecount = 1; #ifdef MAC_SOCKET - mac_socket_accept(head, so); + mac_socket_label_associate_accept(head, so); #endif #ifdef __APPLE__ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_usrreq.c#5 (text+ko) ==== @@ -809,8 +809,8 @@ #ifdef MAC_SOCKET /* XXXMAC: recursive lock: SOCK_LOCK(so); */ - mac_socket_peer_set_from_socket(so, so3); - mac_socket_peer_set_from_socket(so3, so); + mac_socketpeer_label_associate_socket(so, so3); + mac_socketpeer_label_associate_socket(so3, so); /* XXXMAC: SOCK_UNLOCK(so); */ #endif so2->so_usecount--; /* drop reference taken on so2 */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_tree.c#4 (text+ko) ==== @@ -165,8 +165,8 @@ TAILQ_INIT(&devfs_hidden_mount->mnt_workerqueue); TAILQ_INIT(&devfs_hidden_mount->mnt_newvnodes); #ifdef MAC - mac_mount_init(devfs_hidden_mount); - mac_mount_create(kauth_cred_get(), devfs_hidden_mount); + mac_mount_label_init(devfs_hidden_mount); + mac_mount_label_associate(kauth_cred_get(), devfs_hidden_mount); #endif /* Initialize the default IO constraints */ @@ -178,7 +178,7 @@ = (struct devfsmount *)devfs_hidden_mount->mnt_data; #endif /* HIDDEN_MOUNTPOINT */ #ifdef MAC - mac_devfs_create_directory(NULL, "/", strlen("/"), + mac_devfs_label_associate_directory(NULL, "/", strlen("/"), dev_root->de_dnp, "/"); #endif devfs_ready = 1; @@ -308,7 +308,7 @@ break; dnp = dirent_p->de_dnp; #ifdef MAC - mac_devfs_create_directory(NULL, + mac_devfs_label_associate_directory(NULL, dirnode->dn_typeinfo.Dir.myname->de_name, strlen(dirnode->dn_typeinfo.Dir.myname->de_name), dnp, fullpath); @@ -513,8 +513,8 @@ dnp->dn_nextsibling = proto; proto->dn_prevsiblingp = &(dnp->dn_nextsibling); #ifdef MAC - mac_devfs_init(dnp); - mac_devfs_copy_label(proto->dn_label, dnp->dn_label); + mac_devfs_label_init(dnp); + mac_devfs_label_copy(proto->dn_label, dnp->dn_label); #endif } else { struct timeval tv; @@ -531,7 +531,7 @@ dnp->dn_mtime.tv_sec = tv.tv_sec; dnp->dn_ctime.tv_sec = tv.tv_sec; #ifdef MAC - mac_devfs_init(dnp); + mac_devfs_label_init(dnp); #endif } dnp->dn_dvm = dvm; @@ -613,7 +613,7 @@ return; } #ifdef MAC - mac_devfs_destroy(dnp); + mac_devfs_label_destroy(dnp); #endif if (dnp->dn_type == DEV_SLNK) { DEVFS_DECR_STRINGSPACE(dnp->dn_typeinfo.Slnk.namelen + 1); @@ -1080,7 +1080,7 @@ vnode_lock(vn_p); if ((vn_p->v_lflag & VL_LABELED) == 0) { vn_p->v_lflag |= VL_LABEL; - mac_devfs_vnode_associate(dnp->dn_dvm->mount, dnp, vn_p); + mac_vnode_label_associate_devfs(dnp->dn_dvm->mount, dnp, vn_p); vn_p->v_lflag |= VL_LABELED; vn_p->v_lflag &= ~VL_LABEL; @@ -1225,7 +1225,7 @@ new_dev->de_dnp->dn_uid = uid; new_dev->de_dnp->dn_mode |= perms; #ifdef MAC - mac_devfs_create_device(NULL, NULL, dev, new_dev->de_dnp, + mac_devfs_label_associate_device(NULL, NULL, dev, new_dev->de_dnp, buff); #endif devfs_propogate(dnp->dn_typeinfo.Dir.myname, new_dev); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_vfsops.c#3 (text+ko) ==== @@ -419,8 +419,8 @@ mp->mnt_vfsstat.f_owner = kauth_cred_getuid(kauth_cred_get()); (void) copystr(mntname, mp->mnt_vfsstat.f_mntonname, MAXPATHLEN - 1, 0); #ifdef MAC - mac_mount_init(mp); - mac_mount_create(kauth_cred_get(), mp); + mac_mount_label_init(mp); + mac_mount_label_associate(kauth_cred_get(), mp); #endif error = devfs_mount(mp, NULL, NULL, &context); @@ -433,7 +433,7 @@ mount_lock_destroy(mp); #ifdef MAC - mac_mount_destroy(mp); + mac_mount_label_destroy(mp); #endif FREE_ZONE(mp, sizeof (struct mount), M_MOUNT); vnode_put(vp); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_vnops.c#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 3 16:29: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 A371216A415; Tue, 3 Oct 2006 16:29:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74A2A16A403 for ; Tue, 3 Oct 2006 16:29:58 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2063843D5C for ; Tue, 3 Oct 2006 16:29:54 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93GTr9L045976 for ; Tue, 3 Oct 2006 16:29:53 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93GTrQt045973 for perforce@freebsd.org; Tue, 3 Oct 2006 16:29:53 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 16:29:53 GMT Message-Id: <200610031629.k93GTrQt045973@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 16:29:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=107195 Change 107195 by millert@millert_macbook on 2006/10/03 16:29:24 MAC interfaces for iokit checks Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_iokit.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Oct 3 16:35:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15B1D16A417; Tue, 3 Oct 2006 16:35:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7ED016A412 for ; Tue, 3 Oct 2006 16:35:01 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD81F43D49 for ; Tue, 3 Oct 2006 16:35:00 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93GZ0a5047344 for ; Tue, 3 Oct 2006 16:35:00 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93GZ0kg047341 for perforce@freebsd.org; Tue, 3 Oct 2006 16:35:00 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 16:35:00 GMT Message-Id: <200610031635.k93GZ0kg047341@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107196 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 16:35:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=107196 Change 107196 by millert@millert_macbook on 2006/10/03 16:34:57 Add support for labelling file descriptors; adapted from SEBSD. We may want to change some of the entry points and add others (e.g. ones specifically for locking). Currently only the test and sedarwin modules use file descriptor labels. Note that fd passing had to be reworked somewhat since we need access to the label of the sender's descriptor for the label checks. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_descrip.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_generic.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_usrreq.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc_vnops.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/file_internal.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_conf.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#10 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/conf/files#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_file.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#12 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#11 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/Makefile.install#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/rules#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#22 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_descrip.c#3 (text+ko) ==== @@ -381,7 +381,7 @@ pop = &fdp->fd_ofileflags[fd]; #ifdef MAC - error = mac_file_check_fcntl(fp->f_cred, fp, uap->cmd, uap->arg); + error = mac_file_check_fcntl(proc_ucred(p), fp, uap->cmd, uap->arg); if (error) goto out; #endif @@ -401,22 +401,40 @@ goto out; case F_GETFD: - *retval = (*pop & UF_EXCLOSE)? 1 : 0; - error = 0; +#ifdef MAC + error = mac_file_check_get_ofileflags(proc_ucred(p), fp, *pop); + if (error == 0) +#endif + *retval = (*pop & UF_EXCLOSE)? 1 : 0; goto out; case F_SETFD: - *pop = (*pop &~ UF_EXCLOSE) | - (uap->arg & 1)? UF_EXCLOSE : 0; - error = 0; +#ifdef MAC + error = mac_file_check_change_ofileflags(proc_ucred(p), + fp, *pop, (*pop &~ UF_EXCLOSE) | + ((uap->arg & 1) ? UF_EXCLOSE : 0)); + if (error == 0) +#endif + *pop = (*pop &~ UF_EXCLOSE) | + (uap->arg & 1)? UF_EXCLOSE : 0; goto out; case F_GETFL: - *retval = OFLAGS(fp->f_flag); - error = 0; +#ifdef MAC + error = mac_file_check_get_flags(proc_ucred(p), fp, fp->f_flag); + if (error == 0) +#endif + *retval = OFLAGS(fp->f_flag); goto out; case F_SETFL: +#ifdef MAC + error = mac_file_check_change_flags(proc_ucred(p), + fp, fp->f_flag, (fp->f_flag & ~FCNTLFLAGS) | + (FFLAGS(CAST_DOWN(int, uap->arg)) & FCNTLFLAGS)); + if (error) + goto out; +#endif fp->f_flag &= ~FCNTLFLAGS; tmp = CAST_DOWN(int, uap->arg); fp->f_flag |= FFLAGS(tmp) & FCNTLFLAGS; @@ -955,6 +973,9 @@ { struct fileproc *nfp; struct fileproc *ofp; +#ifdef MAC + int error; +#endif if ((ofp = fdp->fd_ofiles[old]) == NULL || (fdp->fd_ofileflags[old] & UF_RESERVED)) { @@ -962,6 +983,17 @@ return (EBADF); } fg_ref(ofp); + +#ifdef MAC + error = mac_file_check_dup(proc_ucred(p), ofp, new); + if (error) { + fg_drop(ofp); + _fdrelse(fdp, new); + proc_fdunlock(p); + return (error); + } +#endif + proc_fdunlock(p); MALLOC_ZONE(nfp, struct fileproc *, sizeof(struct fileproc), M_FILEPROC, M_WAITOK); @@ -971,6 +1003,10 @@ nfp->f_flags = ofp->f_flags; nfp->f_fglob = ofp->f_fglob; nfp->f_iocount = 0; +#ifdef MAC + mac_file_label_init(nfp); + mac_file_label_copy(ofp->f_label, nfp->f_label); +#endif fdp->fd_ofiles[new] = nfp; fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE; @@ -1087,6 +1123,9 @@ if (!locked) proc_fdunlock(p); +#ifdef MAC + mac_file_label_destroy(fp); +#endif FREE_ZONE(fp, sizeof *fp, M_FILEPROC); return(error); } @@ -1438,6 +1477,9 @@ fdp->fd_ofiles[fd] == NULL && !(fdp->fd_ofileflags[fd] & UF_RESERVED)) fdp->fd_lastfile--; +#ifdef MAC + mac_file_label_destroy(fp); +#endif FREE_ZONE(fp, sizeof *fp, M_FILEPROC); } @@ -1889,6 +1931,12 @@ */ proc_fdunlock(p); +#ifdef MAC + error = mac_file_check_create(proc_ucred(p)); + if (error) + return (error); +#endif + MALLOC_ZONE(fp, struct fileproc *, sizeof(struct fileproc), M_FILEPROC, M_WAITOK); MALLOC_ZONE(fg, struct fileglob *, sizeof(struct fileglob), M_FILEGLOB, M_WAITOK); bzero(fp, sizeof(struct fileproc)); @@ -1898,10 +1946,16 @@ fp->f_iocount = 1; fg->fg_count = 1; fp->f_fglob = fg; +#ifdef MAC + mac_file_label_init(fp); +#endif proc_fdlock(p); fp->f_cred = kauth_cred_proc_ref(p); +#ifdef MAC + mac_file_label_associate(fp->f_cred, fp); +#endif lck_mtx_lock(file_flist_lock); @@ -1965,9 +2019,13 @@ proc_fdlock(p); while (i >= 0) { - if ((*flags & (UF_RESERVED|UF_EXCLOSE)) == UF_EXCLOSE) { - struct fileproc *fp = *fpp; + struct fileproc *fp = *fpp; + if ((*flags & UF_RESERVED) == 0 && ((*flags & UF_EXCLOSE) != 0 +#ifdef MAC + || (fp && mac_file_check_inherit(proc_ucred(p), fp)) +#endif + )) { if (i < fdp->fd_knlistsize) knote_fdclose(p, i); @@ -1975,8 +2033,15 @@ if (i == fdp->fd_lastfile && i > 0) fdp->fd_lastfile--; closef_locked(fp, fp->f_fglob, p); +#ifdef MAC + mac_file_label_destroy(fp); +#endif FREE_ZONE(fp, sizeof *fp, M_FILEPROC); } +#ifdef MAC + else if ((*flags & UF_RESERVED) == 0 && fp != NULL) + mac_file_label_update(proc_ucred(p), fp); +#endif i--; fpp--; flags--; } @@ -2137,6 +2202,10 @@ fp->f_iocount = 0; fp->f_fglob = ofp->f_fglob; (void)fg_ref(fp); +#ifdef MAC + mac_file_label_init(fp); + mac_file_label_copy(ofp->f_label, fp->f_label); +#endif *fpp = fp; } else { *fpp = NULL; @@ -2192,6 +2261,9 @@ if (fp->f_flags & FP_WAITEVENT) (void)waitevent_close(p, fp); (void) closef_locked(fp, fp->f_fglob, p); +#ifdef MAC + mac_file_label_destroy(fp); +#endif FREE_ZONE(fp, sizeof *fp, M_FILEPROC); } } @@ -2371,6 +2443,9 @@ proc_fdunlock(p); fg_free(fp->f_fglob); +#ifdef MAC + mac_file_label_destroy(fp); +#endif FREE_ZONE(fp, sizeof *fp, M_FILEPROC); } @@ -2409,6 +2484,12 @@ lf.l_len = 0; if (how & LOCK_UN) { lf.l_type = F_UNLCK; +#ifdef MAC + error = mac_file_check_change_flags(proc_ucred(p), fp, + fp->f_flag, fp->f_flag & ~FHASLOCK); + if (error) + goto out; +#endif fp->f_flag &= ~FHASLOCK; error = VNOP_ADVLOCK(vp, (caddr_t)fp->f_fglob, F_UNLCK, &lf, F_FLOCK, &context); goto out; @@ -2421,6 +2502,12 @@ error = EBADF; goto out; } +#ifdef MAC + error = mac_file_check_change_flags(proc_ucred(p), fp, + fp->f_flag, fp->f_flag | FHASLOCK); + if (error) + goto out; +#endif fp->f_flag |= FHASLOCK; if (how & LOCK_NB) { error = VNOP_ADVLOCK(vp, (caddr_t)fp->f_fglob, F_SETLK, &lf, F_FLOCK, &context); @@ -2471,6 +2558,9 @@ { struct fileproc *wfp; struct fileproc *fp; +#ifdef MAC + int myerror; +#endif struct proc * p = current_proc(); /* @@ -2490,6 +2580,13 @@ proc_fdunlock(p); return (EBADF); } +#ifdef MAC + myerror = mac_file_check_dup(proc_ucred(p), wfp, dfd); + if (myerror) { + proc_fdunlock(p); + return (myerror); + } +#endif /* * There are two cases of interest here. * @@ -2541,6 +2638,9 @@ proc_fdunlock(p); +#ifdef MAC + mac_file_label_destroy(wfp); +#endif FREE_ZONE(wfp, sizeof *fp, M_FILEPROC); return (0); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_generic.c#2 (text+ko) ==== @@ -737,6 +737,13 @@ error = EBADF; goto out; } + +#ifdef MAC + error = mac_file_check_ioctl(proc_ucred(p), fp, uap->com, + (void *)uap->data); + if (error) + goto out; +#endif #if NETAT /* @@ -762,12 +769,22 @@ switch (com = uap->com) { case FIONCLEX: - *fdflags(p, uap->fd) &= ~UF_EXCLOSE; - error =0; +#ifdef MAC + error = mac_file_check_change_ofileflags(proc_ucred(p), + fp, *fdflags(p, uap->fd), + *fdflags(p, uap->fd) & ~UF_EXCLOSE); + if (error == 0) +#endif + *fdflags(p, uap->fd) &= ~UF_EXCLOSE; goto out; case FIOCLEX: - *fdflags(p, uap->fd) |= UF_EXCLOSE; - error =0; +#ifdef MAC + error = mac_file_check_change_ofileflags(proc_ucred(p), + fp, *fdflags(p, uap->fd), + *fdflags(p, uap->fd) | UF_EXCLOSE); + if (error == 0) +#endif + *fdflags(p, uap->fd) |= UF_EXCLOSE; goto out; } @@ -831,6 +848,13 @@ switch (com) { case FIONBIO: +#ifdef MAC + error = mac_file_check_change_flags(proc_ucred(p), fp, + fp->f_flag, *(int *)datap ? fp->f_flag | FNONBLOCK : + fp->f_flag & ~FNONBLOCK); + if (error) + goto out; +#endif if ( (tmp = *(int *)datap) ) fp->f_flag |= FNONBLOCK; else @@ -839,6 +863,13 @@ break; case FIOASYNC: +#ifdef MAC + error = mac_file_check_change_flags(proc_ucred(p), fp, + fp->f_flag, *(int *)datap ? fp->f_flag | FASYNC : + fp->f_flag & ~FASYNC); + if (error) + goto out; +#endif if ( (tmp = *(int *)datap) ) fp->f_flag |= FASYNC; else ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_usrreq.c#6 (text+ko) ==== @@ -129,8 +129,8 @@ static void unp_gc(void); static void unp_scan(struct mbuf *, void (*)(struct fileglob *)); static void unp_mark(struct fileglob *); -static void unp_discard(struct fileglob *); -static void unp_discard_fdlocked(struct fileglob *, struct proc *); +static void unp_discard(struct fileproc *); +static void unp_discard_fdlocked(struct fileproc *, struct proc *); static int unp_internalize(struct mbuf *, struct proc *); static int unp_listen(struct unpcb *, struct proc *); @@ -1059,9 +1059,8 @@ struct proc *p = current_proc(); /* XXX */ int i; struct cmsghdr *cm = mtod(rights, struct cmsghdr *); - struct fileglob **rp = (struct fileglob **)(cm + 1); + struct fileproc **rp = (struct fileproc **)(cm + 1); struct fileproc *fp; - struct fileglob *fg; int newfds = (cm->cmsg_len - sizeof(*cm)) / sizeof (int); int f; @@ -1072,8 +1071,8 @@ */ if (!fdavail(p, newfds)) { for (i = 0; i < newfds; i++) { - fg = *rp; - unp_discard_fdlocked(fg, p); + fp = *rp; + unp_discard_fdlocked(fp, p); *rp++ = 0; } proc_fdunlock(p); @@ -1087,15 +1086,26 @@ * XXX this assumes a pointer and int are the same size...! */ for (i = 0; i < newfds; i++) { + fp = *rp; +#ifdef MAC + /* + * If receive access is denied, don't pass along + * and error message, just discard the descriptor. + */ + if (mac_file_check_receive(proc_ucred(p), fp)) { + *rp++ = 0; + unp_discard_fdlocked(fp, p); + continue; + } +#endif if (fdalloc(p, 0, &f)) panic("unp_externalize"); - fg = *rp; - MALLOC_ZONE(fp, struct fileproc *, sizeof(struct fileproc), M_FILEPROC, M_WAITOK); - bzero(fp, sizeof(struct fileproc)); fp->f_iocount = 0; - fp->f_fglob = fg; +#ifdef MAC + mac_file_label_update(proc_ucred(p), fp); +#endif p->p_fd->fd_ofiles[f] = fp; - fg_removeuipc(fg); + fg_removeuipc(fp->f_fglob); *fdflags(p, f) &= ~UF_RESERVED; unp_rights--; *(int *)rp++ = f; @@ -1140,8 +1150,8 @@ struct proc *p) { struct cmsghdr *cm = mtod(control, struct cmsghdr *); - struct fileglob **rp; - struct fileproc *fp; + struct fileproc **rp; + struct fileproc *fp, *ofp; register int i, error; int oldfds; int fdgetf_noref(proc_t, struct fileglob **, struct fileproc **); @@ -1153,20 +1163,28 @@ oldfds = (cm->cmsg_len - sizeof (*cm)) / sizeof (int); proc_fdlock(p); - rp = (struct fileglob **)(cm + 1); + rp = (struct fileproc **)(cm + 1); for (i = 0; i < oldfds; i++) { - if (error = fdgetf_noref(p, *(int *)rp++, (struct fileglob **)0)) { + if (error = fdgetf_noref(p, *(int *)rp++, (struct fileproc **)0)) { proc_fdunlock(p); return (error); } } - rp = (struct fileglob **)(cm + 1); + rp = (struct fileproc **)(cm + 1); for (i = 0; i < oldfds; i++) { - (void) fdgetf_noref(p, *(int *)rp, &fp); + (void) fdgetf_noref(p, *(int *)rp, &ofp); + MALLOC_ZONE(fp, struct fileproc *, sizeof(struct fileproc), + M_FILEPROC, M_WAITOK); + bzero(fp, sizeof(struct fileproc)); + fp->f_fglob = ofp->f_fglob; +#ifdef MAC + mac_file_label_init(fp); + mac_file_label_copy(ofp->f_label, fp->f_label); +#endif fg_insertuipc(fp->f_fglob); - *rp++ = fp->f_fglob; + *rp++ = fp; unp_rights++; } proc_fdunlock(p); @@ -1375,7 +1393,7 @@ { if (m) { - unp_scan(m, unp_discard); + unp_scan(m, (void (*)(struct fileglob *))unp_discard); } } @@ -1440,23 +1458,27 @@ /* should run under kernel funnel */ static void -unp_discard(fg) - struct fileglob *fg; +unp_discard(fp) + struct fileproc *fp; { struct proc *p = current_proc(); /* XXX */ proc_fdlock(p); - unp_discard_fdlocked(fg, p); + unp_discard_fdlocked(fp, p); proc_fdunlock(p); } static void -unp_discard_fdlocked(fg, p) - struct fileglob *fg; +unp_discard_fdlocked(fp, p) + struct fileproc *fp; struct proc *p; { - fg_removeuipc(fg); + fg_removeuipc(fp->f_fglob); unp_rights--; - (void) closef_locked((struct fileproc *)0, fg, p); + (void) closef_locked((struct fileproc *)0, fp->f_fglob, p); +#ifdef MAC + mac_file_label_destroy(fp); +#endif + FREE(fp, M_FILEPROC); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc_vnops.c#2 (text+ko) ==== @@ -226,6 +226,10 @@ struct componentname *cnp = ap->a_cnp; char *pname = cnp->cn_nameptr; struct proc *p = vfs_context_proc(ap->a_context); +#ifdef MAC + struct filedesc *fdp = p->p_fd; + struct fileproc *fp; +#endif int numfiles = p->p_fd->fd_nfiles; int fd; int error; @@ -322,6 +326,11 @@ if (error) goto bad; VTOFDESC(fvp)->fd_fd = fd; +#ifdef MAC + fp = fdp->fd_ofiles[fd]; + mac_vnode_label_associate_file(vfs_context_ucred(ap->a_context), + fp, fvp); +#endif *vpp = fvp; return (0); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/file_internal.h#3 (text+ko) ==== @@ -86,6 +86,7 @@ int32_t f_iocount; struct fileglob * f_fglob; void * f_waddr; + struct label *f_label; }; #define FILEPROC_NULL (struct fileproc *)0 ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_conf.c#2 (text+ko) ==== @@ -141,7 +141,7 @@ /* File Descriptor Filesystem */ #if FDESC - { &fdesc_vfsops, "fdesc", 7, 0, 0, NULL, NULL, 0, {0}, VFC_VFSGENERICARGS|VFC_VFSNOMACLABEL , 0, 0}, + { &fdesc_vfsops, "fdesc", 7, 0, 0, NULL, NULL, 0, {0}, VFC_VFSGENERICARGS , 0, 0}, #endif /* Volume ID Filesystem */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#10 (text+ko) ==== @@ -1737,6 +1737,12 @@ type = F_FLOCK; if ((flags & FNONBLOCK) == 0) type |= F_WAIT; +#ifdef MAC + error = mac_file_check_change_flags(vfs_context_ucred(ctx), + fp, fp->f_fglob->fg_flag, fp->f_fglob->fg_flag | FHASLOCK); + if (error) + goto bad; +#endif if ((error = VNOP_ADVLOCK(vp, (caddr_t)fp->f_fglob, F_SETLK, &lf, type, ctx))) goto bad; fp->f_fglob->fg_flag |= FHASLOCK; @@ -2461,6 +2467,21 @@ file_drop(uap->fd); return(ESPIPE); } + + context.vc_proc = p; + context.vc_ucred = kauth_cred_get(); +#ifdef MAC + if (uap->whence == L_INCR && uap->offset == 0) + error = mac_file_check_get_offset(vfs_context_ucred(&context), + fp); + else + error = mac_file_check_change_offset(vfs_context_ucred(&context), + fp); + if (error) { + file_drop(uap->fd); + return (error); + } +#endif if ( (error = vnode_getwithref(vp)) ) { file_drop(uap->fd); return(error); @@ -2471,8 +2492,6 @@ offset += fp->f_fglob->fg_offset; break; case L_XTND: - context.vc_proc = p; - context.vc_ucred = kauth_cred_get(); if ((error = vnode_size(vp, &file_size, &context)) != 0) break; offset += file_size; @@ -4468,6 +4487,15 @@ error = EBADF; goto out; } + + context.vc_proc = p; + context.vc_ucred = fp->f_fglob->fg_cred; + +#ifdef MAC + error = mac_file_check_change_offset(kauth_cred_get(), fp); + if (error) + goto out; +#endif if ( (error = vnode_getwithref(vp)) ) { goto out; } @@ -4481,9 +4509,6 @@ goto out; } - context.vc_proc = p; - context.vc_ucred = fp->f_fglob->fg_cred; - #ifdef MAC error = mac_vnode_check_readdir(vfs_context_ucred(&context), vp); if (error != 0) { @@ -4780,6 +4805,15 @@ error = EBADF; goto out; } + + context.vc_proc = p; + context.vc_ucred = kauth_cred_get(); + +#ifdef MAC + error = mac_file_check_change_offset(vfs_context_ucred(&context), fp); + if (error) + goto out; +#endif if ( (error = vnode_getwithref(vp)) ) goto out; @@ -4791,9 +4825,6 @@ goto out; } - context.vc_proc = p; - context.vc_ucred = kauth_cred_get(); - #ifdef MAC error = mac_vnode_check_readdir(vfs_context_ucred(&context), vp); if (error != 0) { ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#7 (text+ko) ==== @@ -24,6 +24,8 @@ _kauth_cred_dup _kauth_cred_dup_add +_sotoxsocket + _mac_kalloc _mac_kfree _mac_wire ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/conf/files#3 (text+ko) ==== @@ -24,3 +24,4 @@ security/mac_net.c optional mac security/mac_pipe.c optional mac security/mac_iokit.c optional mac +security/mac_file.c optional mac ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#6 (text+ko) ==== @@ -89,6 +89,7 @@ */ void mac_cred_label_init(struct ucred *); void mac_devfs_label_init(struct devnode *); +void mac_file_label_init(struct fileproc *fp); int mac_mbuf_label_init(struct mbuf *, int); int mac_mbuf_tag_init(struct m_tag *, int); void mac_mount_label_init(struct mount *); @@ -104,11 +105,15 @@ void mac_vnode_label_init(struct vnode *vp); void mac_vnode_label_copy(struct label *, struct label *label); void mac_devfs_label_copy(struct label *, struct label *label); +void mac_file_label_copy(struct label *, struct label *label); void mac_mbuf_tag_copy(struct m_tag *, struct m_tag *); void mac_mbuf_label_copy(struct mbuf *m_from, struct mbuf *m_to); void mac_socket_label_copy(struct label *from, struct label *to); +void mac_file_label_associate(struct ucred *cred, struct fileproc *fp); +void mac_file_label_update(struct ucred *cred, struct fileproc *fp); void mac_cred_label_destroy(struct ucred *); void mac_devfs_label_destroy(struct devnode *); +void mac_file_label_destroy(struct fileproc *fp); void mac_mbuf_label_destroy(struct mbuf *); void mac_mbuf_tag_destroy(struct m_tag *); void mac_mount_label_destroy(struct mount *); @@ -286,11 +291,25 @@ int mac_sysvsem_check_semctl(struct ucred *cred, struct semid_kernel *semakptr, int cmd); int mac_file_check_fcntl(struct ucred *cred, struct fileproc *fp, int cmd, - int arg); + long arg); int mac_file_check_get(struct ucred *cred, struct fileproc *fp, char *elements, int len); +int mac_file_check_create(struct ucred *cred); +int mac_file_check_dup(struct ucred *cred, struct fileproc *fp, int newfd); int mac_file_check_ioctl(struct ucred *cred, struct fileproc *fp, - int com, void *data); + u_long com, void *data); +int mac_file_check_inherit(struct ucred *cred, struct fileproc *fp); +int mac_file_check_receive(struct ucred *cred, struct fileproc *fp); +int mac_file_check_get_flags(struct ucred *cred, struct fileproc *fp, + u_int flags); +int mac_file_check_get_ofileflags(struct ucred *cred, struct fileproc *fp, + char flags); +int mac_file_check_change_flags(struct ucred *cred, struct fileproc *fp, + u_int oldflags, u_int newflags); +int mac_file_check_change_ofileflags(struct ucred *cred, + struct fileproc *fp, char oldflags, char newflags); +int mac_file_check_get_offset(struct ucred *cred, struct fileproc *fp); +int mac_file_check_change_offset(struct ucred *cred, struct fileproc *fp); int mac_file_check_set(struct ucred *cred, struct fileproc *fp, char *buf, int buflen); int mac_sysvsem_check_semget(struct ucred *cred, ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#12 (text+ko) ==== @@ -287,6 +287,14 @@ ); /** + @brief Initialize file label + @param label New label to initialize +*/ +typedef void mpo_file_label_init_t( + struct label *label +); + +/** @brief Initialize Login Context label @param label New label to initialize */ @@ -530,6 +538,38 @@ ); /** + @brief Create file label + @param cred Subject credential + @param fp Fileproc structure + @param label Policy label for fp +*/ +typedef void mpo_file_label_associate_t( + struct ucred *cred, + struct fileproc *fp, + struct label *label +); + +/** + @brief Update file label + @param cred Subject credential + @param fp Fileproc structure + @param label New policy label for fp +*/ +typedef void mpo_file_label_update_t( + struct ucred *cred, + struct fileproc *fp, + struct label *label +); + +/** + @brief Destroy file label + @param label The label to be destroyed +*/ +typedef void mpo_file_label_destroy_t( + struct label *label +); + +/** @brief Destroy devfs label @param label The label to be destroyed @@ -947,6 +987,19 @@ ); /** + @brief Copy a file label + @param src Source file label + @param dest Destination file label + + Copy the file label information from src to dest. This is + used when duplicating, passing or inheriting file descriptors. +*/ +typedef void mpo_file_label_copy_t( + struct label *src, + struct label *dest +); + +/** @brief Externalize a user credential label @param label Label to be externalized @param element_name Name of the label namespace for which labels should be @@ -2727,7 +2780,7 @@ struct ucred *cred, struct fileproc *fp, int cmd, - int arg + long arg ); /** @@ -3537,6 +3590,41 @@ ); /** + @brief Access control for creating a file descriptor + @param cred Subject credential + + Determine whether the subject identified by the credential can + allocate a new file descriptor. + + @return Return 0 if access if granted, otherwise an appropriate + value for errno should be returned. +*/ +typedef int mpo_file_check_create_t( + struct ucred *cred +); + +/** + @brief Access control for duplicating a file descriptor + @param cred Subject credential + @param fp Fileproc structure + @param label Policy label for fp + @param newfd New file descriptor number + + Determine whether the subject identified by the credential can + duplicate the file structure represented by fp and as file + descriptor number newfd. + + @return Return 0 if access if granted, otherwise an appropriate + value for errno should be returned. +*/ +typedef int mpo_file_check_dup_t( + struct ucred *cred, + struct fileproc *fp, + struct label *label, + int newfd +); + +/** @brief Access control check for file ioctl @param cred Subject credential @param fp Fileproc structure @@ -3558,11 +3646,167 @@ struct ucred *cred, struct fileproc *fp, struct label *label, - unsigned int cmd, + unsigned long cmd, void *data ); /** + @brief Access control for inheriting a file descriptor + @param cred Subject credential + @param fp Fileproc structure + @param label Policy label for fp + + Determine whether the subject identified by the credential can + inherit the file structure represented by fp. + + @return Return 0 if access if granted, otherwise an appropriate + value for errno should be returned. +*/ +typedef int mpo_file_check_inherit_t( + struct ucred *cred, + struct fileproc *fp, + struct label *label +); + +/** + @brief Access control for receiving a file descriptor + @param cred Subject credential + @param fp Fileproc structure + @param label Policy label for fp + + Determine whether the subject identified by the credential can + receive the file structure represented by fp. + + @return Return 0 if access if granted, otherwise an appropriate + value for errno should be returned. +*/ +typedef int mpo_file_check_receive_t( + struct ucred *cred, + struct fileproc *fp, + struct label *label +); + +/** + @brief Access control for getting file descriptor flags + @param cred Subject credential + @param fp Fileproc structure + @param label Policy label for fp + @param flags Requested flags + + Determine whether the subject identified by the credential can + get the specified flags for the file structure represented by fp. + + @return Return 0 if access if granted, otherwise an appropriate + value for errno should be returned. +*/ +typedef int mpo_file_check_get_flags_t( + struct ucred *cred, + struct fileproc *fp, + struct label *label, + u_int flags +); + +/** + @brief Access control for getting open file flags + @param cred Subject credential + @param fp Fileproc structure + @param label Policy label for fp + @param flags Requested flags + + Determine whether the subject identified by the credential can + get the open file flags for the file structure represented by fp. + + @return Return 0 if access if granted, otherwise an appropriate + value for errno should be returned. +*/ +typedef int mpo_file_check_get_ofileflags_t( + struct ucred *cred, + struct fileproc *fp, + struct label *label, + char flags +); + +/** + @brief Access control for changing file descriptor flags + @param cred Subject credential + @param fp Fileproc structure + @param label Policy label for fp + @param oldflags Old fd flags + @param newflags New fd flags + + Determine whether the subject identified by the credential can + change the specified flags for the file structure represented by fp. + + @return Return 0 if access if granted, otherwise an appropriate + value for errno should be returned. +*/ +typedef int mpo_file_check_change_flags_t( + struct ucred *cred, + struct fileproc *fp, + struct label *label, + u_int oldflags, + u_int newflags +); + +/** + @brief Access control for changing open file flags + @param cred Subject credential + @param fp Fileproc structure + @param label Policy label for fp + @param flags Old flags + @param flags New flags + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 3 16:37:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2357F16A47B; Tue, 3 Oct 2006 16:37:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F0AEE16A415 for ; Tue, 3 Oct 2006 16:37:03 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF01443D46 for ; Tue, 3 Oct 2006 16:37:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93Gb3Ap047755 for ; Tue, 3 Oct 2006 16:37:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93Gb3ox047752 for perforce@freebsd.org; Tue, 3 Oct 2006 16:37:03 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 16:37:03 GMT Message-Id: <200610031637.k93Gb3ox047752@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107197 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 16:37:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=107197 Change 107197 by millert@millert_macbook on 2006/10/03 16:36:42 Cripple the Color MAC.loginPlugin and remove the ability to make a selection. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/MAC.loginPlugin/plugins/Color/Color.nib/info.nib#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/MAC.loginPlugin/plugins/Color/Color.nib/info.nib#2 (text+ko) ==== @@ -3,19 +3,19 @@ IBDocumentLocation - 69 15 356 240 0 0 1024 746 + 128 28 356 240 0 0 1600 1178 IBEditorPositions 5 - 393 444 238 108 0 0 1024 746 + 681 712 308 128 0 0 1600 1178 IBFramework Version - 364.0 + 437.0 IBOpenObjects 5 IBSystem Version - 7W98 + 8J135 From owner-p4-projects@FreeBSD.ORG Tue Oct 3 16:37:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B84C316A55F; Tue, 3 Oct 2006 16:37:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6550916A557 for ; Tue, 3 Oct 2006 16:37:04 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 397A943D46 for ; Tue, 3 Oct 2006 16:37:04 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93Gb4a8047762 for ; Tue, 3 Oct 2006 16:37:04 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93Gb3dk047758 for perforce@freebsd.org; Tue, 3 Oct 2006 16:37:03 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 16:37:03 GMT Message-Id: <200610031637.k93Gb3dk047758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 16:37:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=107198 Change 107198 by millert@millert_macbook on 2006/10/03 16:37:00 Update from DSEP Affected files ... .. //depot/projects/trustedbsd/sedarwin8/ERRATA#2 edit .. //depot/projects/trustedbsd/sedarwin8/README#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/ERRATA#2 (text+ko) ==== @@ -16,10 +16,6 @@ 96: There is no security for fsoctl, ioctl, sysctl. (225 was duplicate) -117: The mpo_check_port_relabel entry point does not hold the task - label lock. Policies implmenting this entry point should - exercise caution. - 130: The Mach error returns from the framework don't always map well. Most framework entry points return bsd errno values, which are not usable as returns from mach calls. Ideally, the ==== //depot/projects/trustedbsd/sedarwin8/README#2 (text+ko) ==== @@ -9,13 +9,23 @@ ============ This release includes a port of the TrustedBSD MAC Framework to Apple's -Darwin 8.6 (Mac OS X 10.4.6) operating system, made up of kernel, library, +Darwin 8.7 (Mac OS X 10.4.7) operating system, made up of kernel, library, and user space tool extensions to support flexible policy introduction. In addition, several sample policy modules are present: - SEDarwin, a port of NSA's FLASK security architecture and Type Enforcement policy language from SELinux. - - MLS, a simple implementation of multi-level security + - mac_mls, a simple implementation of multi-level security + - mac_console policy, an example policy that demonstrates how login context + labels are used to identify processes associated with the current user + - mac_color policy, an example policy that demonstrates how login context + labels are used to share privilege amongst a group of processes. It also + demonstrates the use of floating labels. + - mac_device_access policy, an example policy to allow connection of + specified USB and FireWire devices and to prevent the use of unknown + devices. + - mac_extattr_test policy, an example policy to test the operation of + extremely long extended attribute values. - mac_fwinteg, an example of a minimal base policy that enforces other required and allowable policies - mac_readonly, an example integrity policy to maintain a valid @@ -34,7 +44,7 @@ appropriate for use in production environments. The following modifications have been made relative to Apple's Darwin -10.4.6 release: +10.4.7 release: - Inclusion of a subset of the MAC Framework entry points to provide label support and protection of files, processes, System V @@ -50,6 +60,124 @@ Mach servers. The launchd and notifyd daemons have been modified to use our security-enhanced MiG. +New Features in the 20060929 release +===================================== + + - Update to a newer version of Tiger; the vendor source base was + updated to Apple's 10.4.7 release (xnu-792.6.76 for PPC). + + - The MLS policy module was updated to + -- handle the access() permissions correctly. A separate + mac_mls_check_vnode_access() entry point was + implemented instead of using mac_mls_check_vnode_open(). + -- require both read and write access for all System V shared + memory operations on struct shmid_ds. + -- mediate system accounting (acct) to match mdeiation for auditing. + The file must be set to high; the subject privileged. + + - Changed how label handles are freed when their reference count is zero to + fix a race condition between a user program requesting and accessing a + label of a labeled kernel object and the destruction of that object. + + - Made changes to kernel credential caching by adding a + kauth_cred_dup_add() function to duplicate an existing ucred and adding + the dupe to the cred hash. This helps policy modules modify the ucred of + a specific process at fork time, so credentials are shared amongst + threads in a single process, but not among different processes. + + - New entrypoints have been added for more granular Mach access control + checks: + mpo_check_port_make + mpo_check_port_make_send_once + mpo_check_port_move_send + mpo_check_port_move_send_once + mpo_check_port_receive + + - MAC Policy socket interfaces were updated to use xsocket structure + instead of a socket, as information such as protocol number and protocol + family are unavailable. Modified entrypoints are: + mpo_create_socket + mpo_create_socket_from_socket + mpo_create_mbuf_from_socket + mpo_relabel_socket + mpo_set_socket_peer_from_socket + mpo_set_socket_peer_from_mbuf + mpo_check_socket_accept + mpo_check_socket_bind + mpo_check_socket_connect + mpo_check_socket_deliver + mpo_check_socket_kqfilter + mpo_check_socket_listen + mpo_check_socket_receive + mpo_check_socket_relabel + mpo_check_socket_select + mpo_check_socket_send + mpo_check_socket_stat + + - Completed mount label support. User space mount programs were + modified to allow additional parameters to specify labels. + + - Auditing of system calls such as mac_xxx(), setlcid(), getlcid(), + mac_mount(), mac_get_mount(), mac_getfsstat() was added. + + - Policies do not need mac.h anymore. The entire policy interface is + available in mac_policy.h + + - A new mac_console policy demonstrates how login context labels are used + to identify processes associated with the current user + + - A new mac_color policy demonstrates how login context labels are used + to share privilege amongst a group of processes. It also demonstrates + the use of floating labels. + + - A new mac_device_access policy demonstrates a mechanism to block + use of unknown or unauthorized USB and FireWire devices as well as + a way to allow use of known, authorized devices. This policy uses + the following entry point. + mpo_check_device_allowed + + - A new mac_extattr_test policy demonstrates how to test the operation of + extremely long extended attribute values. + + - Modules can access data items from their Info.plist files and can be + accessed by the new mac_find_module_data() function. + + - The ipctrace module has been updated with additional NULL label checks + so that it may be loaded late. Locking has been improved/corrected and + a new destroy method has been added. + + - The mac_test module has been updated to generate mac_test_check_xxx + routines automatically from mac_policy.h. + + - The stub, count and stacktrace policy build commands have been updated to + correctly interpret typedefs that are encountered in mac_policy.h. + + - Fixed the order of message checks: port check should be done before + rights check. + + - Cleanup of code by removing MAC_DEBUG, fields from label structure used + in panther, unused definitions for atomic operations. + + - Correct label allocation for System V message queues to manage label + storage entirely within the MAC Framework. + + - MAC helper functions have been added to delete extended attributes. + + - kernel symbol printing has been reenabled. + + - Improved documentation has been included. In particular, + updates were made to the Design and Implementation document, the + Policy Module Writing guide, and man pages. A new document + (ISSO-06-008-Boot.pdf) discusses Boot time improvements made, their + interaction with the MAC Framework and sample policies with respect to + boot integrity. + + - The MAC Framework API documentation has been updated; + documentation is available in the docs/Framework/html/ + directory. + + - The ERRATA has the current list of defects. + New Features in the 20060630 release ===================================== From owner-p4-projects@FreeBSD.ORG Tue Oct 3 18:44: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 6684F16A415; Tue, 3 Oct 2006 18:44:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E3D1A16A40F for ; Tue, 3 Oct 2006 18:44:49 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FEFE43D49 for ; Tue, 3 Oct 2006 18:44:49 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93IinCA078477 for ; Tue, 3 Oct 2006 18:44:49 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93Iinjr078474 for perforce@freebsd.org; Tue, 3 Oct 2006 18:44:49 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 18:44:49 GMT Message-Id: <200610031844.k93Iinjr078474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107203 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 18:44:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=107203 Change 107203 by millert@millert_macbook on 2006/10/03 18:44:18 Darwin-specific refpolicy modules Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/crashreporterd.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/crashreporterd.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/crashreporterd.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/distnoted.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/distnoted.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/distnoted.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/netinfod.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/netinfod.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/netinfod.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/update.fc#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/update.if#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/update.te#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Oct 3 19:11: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 BAB5516A412; Tue, 3 Oct 2006 19:11:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D3E916A40F for ; Tue, 3 Oct 2006 19:11:25 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3599843D55 for ; Tue, 3 Oct 2006 19:11:25 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93JBPog084476 for ; Tue, 3 Oct 2006 19:11:25 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93JBOcl084459 for perforce@freebsd.org; Tue, 3 Oct 2006 19:11:24 GMT (envelope-from millert@freebsd.org) Date: Tue, 3 Oct 2006 19:11:24 GMT Message-Id: <200610031911.k93JBOcl084459@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107206 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 19:11:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=107206 Change 107206 by millert@millert_g5tower on 2006/10/03 19:10:28 Set executible bit Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/update_plist#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/update_plist#2 (xtext/text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Oct 3 19:39: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 23EB716A415; Tue, 3 Oct 2006 19:39:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E2F6C16A40F for ; Tue, 3 Oct 2006 19:39:00 +0000 (UTC) (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 8E60D43D46 for ; Tue, 3 Oct 2006 19:39:00 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93Jd089088398 for ; Tue, 3 Oct 2006 19:39:00 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93Jd06K088391 for perforce@freebsd.org; Tue, 3 Oct 2006 19:39:00 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 19:39:00 GMT Message-Id: <200610031939.k93Jd06K088391@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 107208 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 19:39:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=107208 Change 107208 by imp@imp_lighthouse on 2006/10/03 19:38:15 Definitions for mmc ivars (that is, attributes of mmc children). Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmcvar.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Oct 3 19:42:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12FC816A412; Tue, 3 Oct 2006 19:42:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E08B716A403 for ; Tue, 3 Oct 2006 19:42:04 +0000 (UTC) (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 ABE9C43D49 for ; Tue, 3 Oct 2006 19:42:04 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93Jg4hj089137 for ; Tue, 3 Oct 2006 19:42:04 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93Jg43f089133 for perforce@freebsd.org; Tue, 3 Oct 2006 19:42:04 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 19:42:04 GMT Message-Id: <200610031942.k93Jg43f089133@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 107209 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 19:42:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=107209 Change 107209 by imp@imp_lighthouse on 2006/10/03 19:41:03 Add data command logging decrement mapped when we unmap the DMA buffer On the error path, if we have a dma buffer mapped, unmap it In read finished processing: o swap all the words in the buffer, not just the first one o Disable ENDRX and enable RXBUFF interrutps o turn off transfer bits of PDC (maybe could RXTDIS?) When we get a RXBUFF interrupt, disable it before enabling CMDRDY Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#17 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#17 (text+ko) ==== @@ -378,6 +378,7 @@ } else panic("Write write support"); } + printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg); WR4(sc, MCI_ARGR, cmd->arg); WR4(sc, MCI_CMDR, cmdr); if (cmdr & MCI_CMDR_TRCMD_START) { @@ -474,10 +475,15 @@ cmd = sc->curcmd; bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_POSTREAD); bus_dmamap_unload(sc->dmatag, sc->map); + sc->mapped--; walker = (uint32_t *)cmd->data->data; len = cmd->data->len / 4; for (i = 0; i < len; i++) - *walker = bswap32(*walker); + walker[i] = bswap32(walker[i]); + // Finish up the sequence... + WR4(sc, MCI_IDR, MCI_SR_ENDRX); + WR4(sc, MCI_IER, MCI_SR_RXBUFF); + WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS | PDC_PTCR_TXTDIS); } static void @@ -506,6 +512,10 @@ else cmd->error = MMC_ERR_FAILED; done = 1; + if (sc->mapped && cmd->error) { + bus_dmamap_unload(sc->dmatag, sc->map); + sc->mapped--; + } } else { if (sr & MCI_SR_TXBUFE) { printf("TXBUFE\n"); @@ -513,6 +523,7 @@ } if (sr & MCI_SR_RXBUFF) { printf("RXBUFF\n"); + WR4(sc, MCI_IDR, MCI_SR_RXBUFF); WR4(sc, MCI_IER, MCI_SR_CMDRDY); } if (sr & MCI_SR_ENDTX) { From owner-p4-projects@FreeBSD.ORG Tue Oct 3 19:43: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 4E2B316A47C; Tue, 3 Oct 2006 19:43:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EFEAD16A407 for ; Tue, 3 Oct 2006 19:43:06 +0000 (UTC) (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 8A32F43D4C for ; Tue, 3 Oct 2006 19:43:06 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93Jh692089465 for ; Tue, 3 Oct 2006 19:43:06 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93Jh6Y9089462 for perforce@freebsd.org; Tue, 3 Oct 2006 19:43:06 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 19:43:06 GMT Message-Id: <200610031943.k93Jh6Y9089462@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 107210 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 19:43:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=107210 Change 107210 by imp@imp_lighthouse on 2006/10/03 19:42:58 Select the card on acquire bus, and deselect it on release. (I'm not sure that's RIGHT, but it is what I do) Implement needed ivars (and DSR_IMP, since I thought it was) Calculate clock correctly (0 was a bad choice) minor clean ups We can now read one block from the SD card, but we have some wild memory thing, so we die soon after. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#18 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmc.c#18 (text+ko) ==== @@ -77,6 +77,7 @@ #define MMC_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); static void mmc_delayed_attach(void *); +static int mmc_wait_for_cmd(struct mmc_softc *sc, struct mmc_command *cmd, int retries); static void mmc_ms_delay(int ms) @@ -120,6 +121,7 @@ mmc_acquire_bus(device_t busdev, device_t dev) { struct mmc_softc *sc; + struct mmc_command cmd; int err; err = MMCBR_ACQUIRE_HOST(device_get_parent(busdev), dev); @@ -131,6 +133,15 @@ panic("mmc: host bridge didn't seralize us."); sc->owner = dev; MMC_UNLOCK(sc); + // XXX Should do lazy selection. + + printf("Selecting card %#x\n", mmc_get_rca(dev)); + cmd.opcode = MMC_SELECT_CARD; + cmd.arg = mmc_get_rca(dev) << 16; + cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; + mmc_wait_for_cmd(sc, &cmd, CMD_RETRIES); + + // XXX should set bus width here? return (0); } @@ -138,9 +149,17 @@ mmc_release_bus(device_t busdev, device_t dev) { struct mmc_softc *sc; + struct mmc_command cmd; int err; sc = device_get_softc(busdev); + // XXX Should do lazy selection. + + cmd.opcode = MMC_DESELECT_CARD; + cmd.arg = 0; + cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; + mmc_wait_for_cmd(sc, &cmd, CMD_RETRIES); + MMC_LOCK(sc); if (!sc->owner) panic("mmc: releasing unowned bus."); @@ -206,7 +225,6 @@ do { err = msleep(req, &sc->sc_mtx, PZERO | PCATCH, "mmcreq", hz / 10); - printf("err is %d flags %x\n", err, req->flags); } while (!(req->flags & MMC_REQ_DONE) && err == EAGAIN); printf("Request %p done with error %d\n", req, err); MMC_UNLOCK(sc); @@ -580,8 +598,22 @@ static int mmc_calculate_clock(struct mmc_softc *sc) { - // xxx - return 0; + int max_dtr = 0; + int nkid, i, f_min, f_max; + device_t *kids; + + f_min = mmcbr_get_f_min(sc->dev); + f_max = mmcbr_get_f_max(sc->dev); + max_dtr = f_max; + if (device_get_children(sc->dev, &kids, &nkid) != 0) + panic("can't get children"); + for (i = 0; i < nkid; i++) + if (mmc_get_tran_speed(kids[i]) < max_dtr) + max_dtr = mmc_get_tran_speed(kids[i]); + free(kids, M_TEMP); + device_printf(sc->dev, "setting transfer rate to %d.%03dMHz\n", + max_dtr / 1000000, (max_dtr / 1000) % 1000); + return max_dtr; } static void @@ -605,21 +637,29 @@ static int mmc_read_ivar(device_t bus, device_t child, int which, u_char *result) { -// struct at91_mci_softc *sc = device_get_softc(bus); struct mmc_ivars *ivar = device_get_ivars(child); switch (which) { default: return (EINVAL); + case MMC_IVAR_DSR_IMP: + *(int *)result = ivar->csd.dsr_imp; + break; case MMC_IVAR_MEDIA_SIZE: *(int *)result = ivar->csd.capacity; break; case MMC_IVAR_MODE: *(int *)result = ivar->mode; break; + case MMC_IVAR_RCA: + *(int *)result = ivar->rca; + break; case MMC_IVAR_SECTOR_SIZE: *(int *)result = 512; break; + case MMC_IVAR_TRAN_SPEED: + *(int *)result = ivar->csd.tran_speed; + break; } return (0); } @@ -627,9 +667,7 @@ static int mmc_write_ivar(device_t bus, device_t child, int which, uintptr_t value) { -// struct at91_mci_softc *sc = device_get_softc(bus); -// struct mmc_ivars *ivar = device_get_ivars(child); - + // None are writable ATM switch (which) { default: return (EINVAL); From owner-p4-projects@FreeBSD.ORG Tue Oct 3 20:08: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 65F8C16A40F; Tue, 3 Oct 2006 20:08:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E28B16A417 for ; Tue, 3 Oct 2006 20:08:39 +0000 (UTC) (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 E123343D78 for ; Tue, 3 Oct 2006 20:08:38 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93K8cOG094361 for ; Tue, 3 Oct 2006 20:08:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93K8c8Y094358 for perforce@freebsd.org; Tue, 3 Oct 2006 20:08:38 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 20:08:38 GMT Message-Id: <200610032008.k93K8c8Y094358@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 107211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 20:08:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=107211 Change 107211 by imp@imp_lighthouse on 2006/10/03 20:07:37 minor code motion to do less work in the no data case. Mask off RCRCE on CMD2 and ACMD47. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#18 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#18 (text+ko) ==== @@ -328,28 +328,27 @@ else cmdr |= MCI_CMDR_RSPTYP_48; } - if (data) { - if (data->flags & MMC_DATA_READ) - cmdr |= MCI_CMDR_TRDIR; - if (data->flags & (MMC_DATA_READ | MMC_DATA_WRITE)) - cmdr |= MCI_CMDR_TRCMD_START; - if (data->flags & MMC_DATA_STREAM) - cmdr |= MCI_CMDR_TRTYP_STREAM; - if (data->flags & MMC_DATA_MULTI) - cmdr |= MCI_CMDR_TRTYP_MULTIPLE; - } if (cmd->opcode == MMC_STOP_TRANSMISSION) cmdr |= MCI_CMDR_TRCMD_STOP; if (sc->host.ios.bus_mode == opendrain) cmdr |= MCI_CMDR_OPDCMD; if (!data) { + // The no data case is fairly simple at91_mci_pdc_disable(sc); printf("CMDR %x ARGR %x\n", cmdr, cmd->arg); WR4(sc, MCI_ARGR, cmd->arg); WR4(sc, MCI_CMDR, cmdr); WR4(sc, MCI_IER, MCI_SR_ERROR | MCI_SR_CMDRDY); return; - } +l } + if (data->flags & MMC_DATA_READ) + cmdr |= MCI_CMDR_TRDIR; + if (data->flags & (MMC_DATA_READ | MMC_DATA_WRITE)) + cmdr |= MCI_CMDR_TRCMD_START; + if (data->flags & MMC_DATA_STREAM) + cmdr |= MCI_CMDR_TRTYP_STREAM; + if (data->flags & MMC_DATA_MULTI) + cmdr |= MCI_CMDR_TRTYP_MULTIPLE; // Set block size and turn on PDC mode for dma xfer and disable // PDC until we're ready. mr = RD4(sc, MCI_MR) & ~MCI_MR_BLKLEN; @@ -364,9 +363,11 @@ if (bus_dmamap_load(sc->dmatag, sc->map, vaddr, block_size, at91_mci_getaddr, &paddr, 0) != 0) { if (req->cmd->flags & STOP_STARTED) - req->stop->error = EAGAIN; + req->stop->error = ERR_NO_MEMORY; else - req->cmd->error = EAGAIN; + req->cmd->error = ERR_NO_MEMORY; + sc->req = NULL; + sc->curcmd = NULL; req->done(req); return; } @@ -396,6 +397,8 @@ struct mmc_request *req; req = sc->req; + if (req == NULL) + return; // assert locked if (!(sc->flags & CMD_STARTED)) { sc->flags |= CMD_STARTED; @@ -498,12 +501,12 @@ sr = RD4(sc, MCI_SR) & RD4(sc, MCI_IMR); printf("i 0x%x\n", sr); cmd = sc->curcmd; + // Ignore CRC errors on CMD2 and ACMD47, per relevant standards + if (cmd->opcode == MMC_SEND_OP_COND || + cmd->opcode == ACMD_SD_SEND_OP_COND) + sr &= ~MCI_SR_RCRCE; if (sr & MCI_SR_ERROR) { - // Ignore CRC errors on CMD2 and ACMD47, per relevant standards - if ((sr & MCI_SR_RCRCE) && (cmd->opcode == MMC_SEND_OP_COND || - cmd->opcode == ACMD_SD_SEND_OP_COND)) - cmd->error = MMC_ERR_NONE; - else if (sr & (MCI_SR_RTOE | MCI_SR_DTOE)) + if (sr & (MCI_SR_RTOE | MCI_SR_DTOE)) cmd->error = MMC_ERR_TIMEOUT; else if (sr & (MCI_SR_RCRCE | MCI_SR_DCRCE)) cmd->error = MMC_ERR_BADCRC; From owner-p4-projects@FreeBSD.ORG Tue Oct 3 20:09: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 ECD2F16A417; Tue, 3 Oct 2006 20:09:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C747F16A415 for ; Tue, 3 Oct 2006 20:09:40 +0000 (UTC) (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 92EB143D45 for ; Tue, 3 Oct 2006 20:09:40 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93K9eFD094411 for ; Tue, 3 Oct 2006 20:09:40 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93K9eha094408 for perforce@freebsd.org; Tue, 3 Oct 2006 20:09:40 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 20:09:40 GMT Message-Id: <200610032009.k93K9eha094408@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 107212 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 20:09:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=107212 Change 107212 by imp@imp_lighthouse on 2006/10/03 20:09:31 Turns out this is a bad idea Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#19 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#19 (text+ko) ==== @@ -501,12 +501,12 @@ sr = RD4(sc, MCI_SR) & RD4(sc, MCI_IMR); printf("i 0x%x\n", sr); cmd = sc->curcmd; - // Ignore CRC errors on CMD2 and ACMD47, per relevant standards - if (cmd->opcode == MMC_SEND_OP_COND || - cmd->opcode == ACMD_SD_SEND_OP_COND) - sr &= ~MCI_SR_RCRCE; if (sr & MCI_SR_ERROR) { - if (sr & (MCI_SR_RTOE | MCI_SR_DTOE)) + // Ignore CRC errors on CMD2 and ACMD47, per relevant standards + if ((sr & MCI_SR_RCRCE) && (cmd->opcode == MMC_SEND_OP_COND || + cmd->opcode == ACMD_SD_SEND_OP_COND)) + cmd->error = MMC_ERR_NONE; + else if (sr & (MCI_SR_RTOE | MCI_SR_DTOE)) cmd->error = MMC_ERR_TIMEOUT; else if (sr & (MCI_SR_RCRCE | MCI_SR_DCRCE)) cmd->error = MMC_ERR_BADCRC; From owner-p4-projects@FreeBSD.ORG Tue Oct 3 20:39:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF73E16A4EC; Tue, 3 Oct 2006 20:39:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B9E816A4E0 for ; Tue, 3 Oct 2006 20:39:30 +0000 (UTC) (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 473C743DCB for ; Tue, 3 Oct 2006 20:39:18 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93KdIHt099394 for ; Tue, 3 Oct 2006 20:39:18 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93KdHwf099391 for perforce@freebsd.org; Tue, 3 Oct 2006 20:39:17 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 20:39:17 GMT Message-Id: <200610032039.k93KdHwf099391@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 107214 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 20:39:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=107214 Change 107214 by imp@imp_lighthouse on 2006/10/03 20:39:06 Compile nit Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#20 edit .. //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#13 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#20 (text+ko) ==== @@ -340,7 +340,7 @@ WR4(sc, MCI_CMDR, cmdr); WR4(sc, MCI_IER, MCI_SR_ERROR | MCI_SR_CMDRDY); return; -l } + } if (data->flags & MMC_DATA_READ) cmdr |= MCI_CMDR_TRDIR; if (data->flags & (MMC_DATA_READ | MMC_DATA_WRITE)) @@ -363,9 +363,9 @@ if (bus_dmamap_load(sc->dmatag, sc->map, vaddr, block_size, at91_mci_getaddr, &paddr, 0) != 0) { if (req->cmd->flags & STOP_STARTED) - req->stop->error = ERR_NO_MEMORY; + req->stop->error = MMC_ERR_NO_MEMORY; else - req->cmd->error = ERR_NO_MEMORY; + req->cmd->error = MMC_ERR_NO_MEMORY; sc->req = NULL; sc->curcmd = NULL; req->done(req); ==== //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#13 (text+ko) ==== @@ -69,6 +69,7 @@ #define MMC_ERR_FIFO 3 #define MMC_ERR_FAILED 4 #define MMC_ERR_INVALID 5 +#define MMC_ERR_NO_MEMORY 6 struct mmc_data *data; /* Data segment with cmd */ struct mmc_request *mrq; /* backpointer to request */ }; From owner-p4-projects@FreeBSD.ORG Tue Oct 3 20:39: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 E617E16A4C9; Tue, 3 Oct 2006 20:39:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC41716A49E for ; Tue, 3 Oct 2006 20:39:31 +0000 (UTC) (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 00D5D43DDB for ; Tue, 3 Oct 2006 20:39:17 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93KdHaP099388 for ; Tue, 3 Oct 2006 20:39:17 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93KdHt6099385 for perforce@freebsd.org; Tue, 3 Oct 2006 20:39:17 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 20:39:17 GMT Message-Id: <200610032039.k93KdHt6099385@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 107213 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 20:39:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=107213 Change 107213 by imp@imp_lighthouse on 2006/10/03 20:38:55 Only select a card when it is the card acquiring the bus. Ditto deselect. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#19 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmc.c#19 (text+ko) ==== @@ -133,15 +133,15 @@ panic("mmc: host bridge didn't seralize us."); sc->owner = dev; MMC_UNLOCK(sc); - // XXX Should do lazy selection. - printf("Selecting card %#x\n", mmc_get_rca(dev)); - cmd.opcode = MMC_SELECT_CARD; - cmd.arg = mmc_get_rca(dev) << 16; - cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; - mmc_wait_for_cmd(sc, &cmd, CMD_RETRIES); - - // XXX should set bus width here? + if (busdev != dev) { + // XXX Should do lazy selection. + cmd.opcode = MMC_SELECT_CARD; + cmd.arg = mmc_get_rca(dev) << 16; + cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; + mmc_wait_for_cmd(sc, &cmd, CMD_RETRIES); + // XXX should set bus width here? + } return (0); } @@ -153,13 +153,14 @@ int err; sc = device_get_softc(busdev); - // XXX Should do lazy selection. - cmd.opcode = MMC_DESELECT_CARD; - cmd.arg = 0; - cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; - mmc_wait_for_cmd(sc, &cmd, CMD_RETRIES); - + if (busdev != dev) { + // XXX Should do lazy selection. + cmd.opcode = MMC_DESELECT_CARD; + cmd.arg = 0; + cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; + mmc_wait_for_cmd(sc, &cmd, CMD_RETRIES); + } MMC_LOCK(sc); if (!sc->owner) panic("mmc: releasing unowned bus."); From owner-p4-projects@FreeBSD.ORG Tue Oct 3 20:47:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D58BB16A4C9; Tue, 3 Oct 2006 20:47:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A582E16A416 for ; Tue, 3 Oct 2006 20:47:09 +0000 (UTC) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC3F443D9F for ; Tue, 3 Oct 2006 20:46:28 +0000 (GMT) (envelope-from ru@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93KkRHj001128 for ; Tue, 3 Oct 2006 20:46:27 GMT (envelope-from ru@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93KkRGP001125 for perforce@freebsd.org; Tue, 3 Oct 2006 20:46:27 GMT (envelope-from ru@freebsd.org) Date: Tue, 3 Oct 2006 20:46:27 GMT Message-Id: <200610032046.k93KkRGP001125@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ru@freebsd.org using -f From: Ruslan Ermilov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107215 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 20:47:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=107215 Change 107215 by ru@ru_edoofus on 2006/10/03 20:45:57 Fix markup. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#13 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#12 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#13 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 @@ -41,16 +41,16 @@ moderately backward and forward compatible way. .Pp BSM token streams typically begin and end with a -.Dv file +.Dq file token, which provides time stamp and file name information for the stream; when processing a BSM token stream from a stream as opposed to a single file source, file tokens may be seen at any point between ordinary records identifying when particular parts of the stream begin and end. All other tokens will appear in the context of a complete BSM audit record, which begins with a -.Dv header +.Dq header token, and ends with a -.Dv trailer +.Dq trailer token, which describe the audit record. Between these two tokens will appear a variety of data tokens, such as process information, file path names, IPC object information, MAC labels, @@ -68,535 +68,539 @@ records by hand. .Ss File Token The -.Dv file +.Dq file token is used at the beginning and end of an audit log file to indicate when the audit log begins and ends. It includes a pathname so that, if concatenated together, original file boundaries are still observable, and gaps in the audit log can be identified. A -.Dv file +.Dq file token can be created using .Xr au_to_file 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Seconds" Ta "4 bytes" Ta "File time stamp" -.It Li "Microseconds" Ta "4 bytes" Ta "File time stamp" -.It Li "File name lengh" Ta "2 bytes" Ta "File name of audit trail" -.It Li "File pathname" Ta "N bytes + 1 nul" Ta "File name of audit trail" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Seconds 4 bytes File time stamp" +.It "Microseconds 4 bytes File time stamp" +.It "File name lengh 2 bytes File name of audit trail" +.It "File pathname N bytes + 1 NUL File name of audit trail" .El .Ss Header Token The -.Dv header +.Dq header token is used to mark the beginning of a complete audit record, and includes the length of the total record in bytes, a version number for the record layout, the event type and subtype, and the time at which the event occurred. A 32-bit -.Dv header +.Dq header token can be created using .Xr au_to_header32 3 ; a 64-bit -.Dv header +.Dq header token can be created using .Xr au_to_header64 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Record Byte Count" Ta "4 bytes" Ta "Number of bytes in record" -.It Li "Version Number" Ta "2 bytes" Ta "Record version number" -.It Li "Event Type" Ta "2 bytes" Ta "Event type" -.It Li "Event Modifier" Ta "2 bytes" Ta "Event sub-type" -.It Li "Seconds" Ta "4/8 bytes" Ta "Record time stamp (32/64-bits)" -.It Li "Nanoseconds" Ta "4/8 byets" Ta "Record time stamp (32/64-bits)" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Record Byte Count 4 bytes Number of bytes in record" +.It "Version Number 2 bytes Record version number" +.It "Event Type 2 bytes Event type" +.It "Event Modifier 2 bytes Event sub-type" +.It "Seconds 4/8 bytes Record time stamp (32/64-bits)" +.It "Nanoseconds 4/8 bytes Record time stamp (32/64-bits)" .El .Ss Expanded Header Token The -.Dv expanded header +.Dq expanded header token is an expanded version of the -.Dv header +.Dq header token, with the addition of a machine IPv4 or IPv6 address. A 32-bit extended -.Dv header +.Dq header token can be created using .Xr au_to_header32_ex 3 ; a 64-bit extended -.Dv header +.Dq header token can be created using .Xr au_to_header64_ex 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Record Byte Count" Ta "4 bytes" Ta "Number of bytes in record" -.It Li "Version Number" Ta "2 bytes" Ta "Record version number" -.It Li "Event Type" Ta "2 bytes" Ta "Event type" -.It Li "Event Modifier" Ta "2 bytes" Ta "Event sub-type" -.It Li "Address Type/Length" Ta "1 byte" Ta "Host address type and length" -.It Li "Machine Address" Ta "4/16 bytes" Ta "IPv4 or IPv6 address" -.It Li "Seconds" Ta "4/8 bytes" Ta "Record time stamp (32/64-bits)" -.It Li "Nanoseconds" Ta "4/8 byets" Ta "Record time stamp (32/64-bits)" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Record Byte Count 4 bytes Number of bytes in record" +.It "Version Number 2 bytes Record version number" +.It "Event Type 2 bytes Event type" +.It "Event Modifier 2 bytes Event sub-type" +.It "Address Type/Length 1 byte Host address type and length" +.It "Machine Address 4/16 bytes IPv4 or IPv6 address" +.It "Seconds 4/8 bytes Record time stamp (32/64-bits)" +.It "Nanoseconds 4/8 bytes Record time stamp (32/64-bits)" .El .Ss Trailer Token The -.Dv trailer +.Dq trailer terminates a BSM audit record, and contains a magic number, .Dv TRAILER_PAD_MAGIC and length that can be used to validate that the record was read properly. A -.Dv trailer +.Dq trailer token can be created using .Xr au_to_trailer 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Trailer Magic" Ta "2 bytes" Ta "Trailer magic number" -.It Li "Record Byte Count" Ta "4 bytes" Ta "Number of bytes in record" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Trailer Magic 2 bytes Trailer magic number" +.It "Record Byte Count 4 bytes Number of bytes in record" .El .Ss Arbitrary Data Token The -.Dv arbitrary data +.Dq arbitrary data token contains a byte stream of opaque (untyped) data. The size of the data is calculated as the size of each unit of data multipled by the number of units of data. A -.Dv How to print +.Dq How to print field is present to specify how to print the data, but interpretation of that field is not currently defined. An -.Dv arbitrary data +.Dq arbitrary data token can be created using .Xr au_to_data 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "How to Print" Ta "1 byte" Ta "User-defined printing information" -.It Li "Basic Unit" Ta "1 byte" Ta "Size of a unit in bytes" -.It Li "Unit Count" Ta "1 byte" Ta "Number of units of data present" -.It Li "Data Items" Ta "Variable" Ta "User data" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "How to Print 1 byte User-defined printing information" +.It "Basic Unit 1 byte Size of a unit in bytes" +.It "Unit Count 1 byte Number of units of data present" +.It "Data Items Variable User data" .El .Ss in_addr Token The -.Dv in_addr +.Dq in_addr token holds a network byte order IPv4 or IPv6 address. An -.Dv in_addr +.Dq in_addr token can be created using .Xr au_to_in_addr 3 for an IPv4 address, or .Xr au_to_in_addr_ex 3 for an IPv6 address. .Pp -See the BUGS section for information on the storage of this token. +See the +.Sx BUGS +section for information on the storage of this token. .Pp -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "IP Address Type" Ta "1 byte" Ta "Type of address" -.It Li "IP Address" Ta "4/16 bytes" Ta "IPv4 or IPv6 address" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "IP Address Type 1 byte Type of address" +.It "IP Address 4/16 bytes IPv4 or IPv6 address" .El .Ss Expanded in_addr Token The -.Dv expanded in_addr +.Dq expanded in_addr token ... .Pp -See the BUGS section for information on the storage of this token. -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" +See the +.Sx BUGS +section for information on the storage of this token. +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" .It XXXX .El .Ss ip Token The -.Dv ip +.Dq ip token contains an IP packet header in network byte order. An -.Dv ip +.Dq ip token can be created using .Xr au_to_ip 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Version and IHL" Ta "1 byte" Ta "Version and IP header length" -.It Li "Type of Service" Ta "1 byte" Ta "IP TOS field" -.It Li "Length" Ta "2 bytes" Ta "IP packet length in network byte order" -.It Li "ID" Ta "2 bytes" Ta "IP header ID for reassembly" -.It Li "Offset" Ta "2 bytes" Ta "IP fragment offset and flags, network byte order" -.It Li "TTL" Ta "1 byte" Ta "IP Time-to-Live" -.It Li "Protocol" Ta "1 byte" Ta "IP protocol number" -.It Li "Checksum" Ta "2 bytes" Ta "IP header checksum, network byte order" -.It Li "Source Address" Ta "4 bytes" Ta "IPv4 source address" -.It Li "Destination Address" Ta "4 bytes" Ta "IPv4 destination address" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Version and IHL 1 byte Version and IP header length" +.It "Type of Service 1 byte IP TOS field" +.It "Length 2 bytes IP packet length in network byte order" +.It "ID 2 bytes IP header ID for reassembly" +.It "Offset 2 bytes IP fragment offset and flags, network byte order" +.It "TTL 1 byte IP Time-to-Live" +.It "Protocol 1 byte IP protocol number" +.It "Checksum 2 bytes IP header checksum, network byte order" +.It "Source Address 4 bytes IPv4 source address" +.It "Destination Address 4 bytes IPv4 destination address" .El .Ss Expanded ip Token The -.Dv expanded ip +.Dq expanded ip token ... -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" .It XXXX .El .Ss iport Token The -.Dv iport +.Dq iport token stores an IP port number in network byte order. An -.Dv iport +.Dq iport token can be created using .Xr au_to_iport 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Port Number" Ta "2 bytes" Ta "Port number in network byte order" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Port Number 2 bytes Port number in network byte order" .El .Ss Path Token The -.Dv path +.Dq path token contains a pathname. A -.Dv path +.Dq path token can be created using .Xr au_to_path 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Path Length" Ta "2 bytes" Ta "Length of path in bytes" -.It Li "Path" Ta "N bytes + 1 nul" Ta "Path name" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Path Length 2 bytes Length of path in bytes" +.It "Path N bytes + 1 NUL Path name" .El .Ss path_attr Token The -.Dv path_attr -token contains a set of nul-terminated path names. +.Dq path_attr +token contains a set of NUL-terminated path names. The .Xr libbsm 3 API cannot currently create a -.Dv path_attr +.Dq path_attr token. -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Count" Ta "2 bytes" Ta "Number of nul-terminated string(s) in token" -.It Li "Path" Ta "Variable" Ta "count nul-terminated string(s)" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Count 2 bytes Number of NUL-terminated string(s) in token" +.It "Path Variable count NUL-terminated string(s)" .El .Ss Process Token The -.Dv process +.Dq process token contains a description of the security properties of a process involved as the target of an auditable event, such as the destination for signal delivery. It should not be confused with the -.Dv subject +.Dq subject token, which describes the subject performing an auditable event. This includes both the traditional .Ux security properties, such as user IDs and group IDs, but also audit information such as the audit user ID and session. A -.Dv process +.Dq process token can be created using .Xr au_to_process32 3 or .Xr au_to_process64 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Audit ID" Ta "4 bytes" Ta "Audit user ID" -.It Li "Effective User ID" Ta "4 bytes" Ta "Effective user ID" -.It Li "Effective Group ID "Ta "4 bytes" Ta "Effective group ID" -.It Li "Real User ID" Ta "4 bytes" Ta "Real user ID" -.It Li "Real Group ID" Ta "4 bytes" Ta "Real group ID" -.It Li "Process ID" Ta "4 bytes" Ta "Process ID" -.It Li "Session ID" Ta "4 bytes" Ta "Audit session ID" -.It Li "Terminal Port ID" Ta "4/8 bytes" Ta "Terminal port ID (32/64-bits)" -.It Li "Terminal Machine Address" Ta "4 bytes" Ta "IP address of machine" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Audit ID 4 bytes Audit user ID" +.It "Effective User ID 4 bytes Effective user ID" +.It "Effective Group ID 4 bytes Effective group ID" +.It "Real User ID 4 bytes Real user ID" +.It "Real Group ID 4 bytes Real group ID" +.It "Process ID 4 bytes Process ID" +.It "Session ID 4 bytes Audit session ID" +.It "Terminal Port ID 4/8 bytes Terminal port ID (32/64-bits)" +.It "Terminal Machine Address 4 bytes IP address of machine" .El .Ss Expanded Process Token The -.Dv expanded process +.Dq expanded process token contains the contents of the -.Dv process +.Dq process token, with the addition of a machine address type and variable length address storage capable of containing IPv6 addresses. An -.Dv expanded process +.Dq expanded process token can be created using .Xr au_to_process32_ex 3 or .Xr au_to_process64_ex 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Audit ID" Ta "4 bytes" Ta "Audit user ID" -.It Li "Effective User ID" Ta "4 bytes" Ta "Effective user ID" -.It Li "Effective Group ID "Ta "4 bytes" Ta "Effective group ID" -.It Li "Real User ID" Ta "4 bytes" Ta "Real user ID" -.It Li "Real Group ID" Ta "4 bytes" Ta "Real group ID" -.It Li "Process ID" Ta "4 bytes" Ta "Process ID" -.It Li "Session ID" Ta "4 bytes" Ta "Audit session ID" -.It Li "Terminal Port ID" Ta "4/8 bytes" Ta "Terminal port ID (32/64-bits)" -.It Li "Terminal Address Type/Length" Ta "1 byte" "Length of machine address" -.It Li "Terminal Machine Address" Ta "4 bytes" Ta "IPv4 or IPv6 address of machine" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Audit ID 4 bytes Audit user ID" +.It "Effective User ID 4 bytes Effective user ID" +.It "Effective Group ID 4 bytes Effective group ID" +.It "Real User ID 4 bytes Real user ID" +.It "Real Group ID 4 bytes Real group ID" +.It "Process ID 4 bytes Process ID" +.It "Session ID 4 bytes Audit session ID" +.It "Terminal Port ID 4/8 bytes Terminal port ID (32/64-bits)" +.It "Terminal Address Type/Length 1 byte Length of machine address" +.It "Terminal Machine Address 4 bytes IPv4 or IPv6 address of machine" .El .Ss Return Token The -.Dv return +.Dq return token contains a system call or library function return condition, including return value and error number associated with the global variable .Er errno . A -.Dv return +.Dq return token can be created using .Xr au_to_return32 3 or .Xr au_to_return64 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Error Number" Ta "1 byte" Ta "Errno value, or 0 if undefined" -.It Li "Return Value" Ta "4/8 bytes" Ta "Return value (32/64-bits)" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Error Number 1 byte Errno value, or 0 if undefined" +.It "Return Value 4/8 bytes Return value (32/64-bits)" .El .Ss Subject Token The -.Dv subject +.Dq subject token contains information on the subject performing the operation described by an audit record, and includes similar information to that found in the -.Dv process +.Dq process and -.Dv expanded process +.Dq expanded process tokens. However, those tokens are used where the process being described is the target of the operation, not the authorizing party. A -.Dv subject +.Dq subject token can be created using .Xr au_to_subject32 3 and .Xr au_to_subject64 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Audit ID" Ta "4 bytes" Ta "Audit user ID" -.It Li "Effective User ID" Ta "4 bytes" Ta "Effective user ID" -.It Li "Effective Group ID "Ta "4 bytes" Ta "Effective group ID" -.It Li "Real User ID" Ta "4 bytes" Ta "Real user ID" -.It Li "Real Group ID" Ta "4 bytes" Ta "Real group ID" -.It Li "Process ID" Ta "4 bytes" Ta "Process ID" -.It Li "Session ID" Ta "4 bytes" Ta "Audit session ID" -.It Li "Terminal Port ID" Ta "4/8 bytes" Ta "Terminal port ID (32/64-bits)" -.It Li "Terminal Machine Address" Ta "4 bytes" Ta "IP address of machine" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Audit ID 4 bytes Audit user ID" +.It "Effective User ID 4 bytes Effective user ID" +.It "Effective Group ID 4 bytes Effective group ID" +.It "Real User ID 4 bytes Real user ID" +.It "Real Group ID 4 bytes Real group ID" +.It "Process ID 4 bytes Process ID" +.It "Session ID 4 bytes Audit session ID" +.It "Terminal Port ID 4/8 bytes Terminal port ID (32/64-bits)" +.It "Terminal Machine Address 4 bytes IP address of machine" .El .Ss Expanded Subject Token The -.Dv expanded subject +.Dq expanded subject token consists of the same elements as the -.Dv subject +.Dq subject token, with the addition of type/length and variable size machine address information in the terminal ID. An -.Dv expanded subject +.Dq expanded subject token can be created using .Xr au_to_subject32_ex 3 or .Xr au_to_subject64_ex 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Audit ID" Ta "4 bytes" Ta "Audit user ID" -.It Li "Effective User ID" Ta "4 bytes" Ta "Effective user ID" -.It Li "Effective Group ID "Ta "4 bytes" Ta "Effective group ID" -.It Li "Real User ID" Ta "4 bytes" Ta "Real user ID" -.It Li "Real Group ID" Ta "4 bytes" Ta "Real group ID" -.It Li "Process ID" Ta "4 bytes" Ta "Process ID" -.It Li "Session ID" Ta "4 bytes" Ta "Audit session ID" -.It Li "Terminal Port ID" Ta "4/8 bytes" Ta "Terminal port ID (32/64-bits)" -.It Li "Terminal Address Type/Length" Ta "1 byte" "Length of machine address" -.It Li "Terminal Machine Address" Ta "4 bytes" Ta "IPv4 or IPv6 address of machine" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Audit ID 4 bytes Audit user ID" +.It "Effective User ID 4 bytes Effective user ID" +.It "Effective Group ID 4 bytes Effective group ID" +.It "Real User ID 4 bytes Real user ID" +.It "Real Group ID 4 bytes Real group ID" +.It "Process ID 4 bytes Process ID" +.It "Session ID 4 bytes Audit session ID" +.It "Terminal Port ID 4/8 bytes Terminal port ID (32/64-bits)" +.It "Terminal Address Type/Length 1 byte Length of machine address" +.It "Terminal Machine Address 4 bytes IPv4 or IPv6 address of machine" .El .Ss System V IPC Token The -.Dv System V IPC +.Dq System V IPC token ... -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Object ID type" Ta "1 byte" Ta "Object ID" -.It Li "Object ID" Ta "4 bytes" Ta "Object ID" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Object ID type 1 byte Object ID" +.It "Object ID 4 bytes Object ID" .El .Ss Text Token The -.Dv text -token contains a single nul-terminated text string. +.Dq text +token contains a single NUL-terminated text string. A -.Dv text +.Dq text token may be created using .Xr au_to_text 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Text Length" Ta "2 bytes" Ta "Length of text string including nul" -.It Li "Text" Ta "N bytes + 1 nul" Ta "Text string including nul" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Text Length 2 bytes Length of text string including NUL" +.It "Text N bytes + 1 NUL Text string including NUL" .El .Ss Attribute Token The -.Dv attribute +.Dq attribute token describes the attributes of a file associated with the audit event. As files may be identified by 0, 1, or many path names, a path name is not included with the attribute block for a file; optional -.Dv path +.Dq path tokens may also be present in an audit record indicating which path, if any, was used to reach the object. An -.Dv attribute +.Dq attribute token can be created using .Xr au_to_attr32 3 or .Xr au_to_attr64 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "File Access Mode" Ta "1 byte" Ta "mode_t associated with file" -.It Li "Owner User ID" Ta "4 bytes" Ta "uid_t associated with file" -.It Li "Owner Group ID" Ta "4 bytes" Ta "gid_t associated with file" -.It Li "File System ID" Ta "4 bytes" Ta "fsid_t associated with file" -.It Li "File System Node ID" Ta "8 bytes" Ta "ino_t associated with file" -.It Li "Device" Ta "4/8 bytes" Ta "Device major/minor number (32/64-bit)" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "File Access Mode 1 byte mode_t associated with file" +.It "Owner User ID 4 bytes uid_t associated with file" +.It "Owner Group ID 4 bytes gid_t associated with file" +.It "File System ID 4 bytes fsid_t associated with file" +.It "File System Node ID 8 bytes ino_t associated with file" +.It "Device 4/8 bytes Device major/minor number (32/64-bit)" .El .Ss Groups Token The -.Dv groups +.Dq groups token contains a list of group IDs associated with the audit event. A -.Dv groups +.Dq groups token can be created using .Xr au_to_groups 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Number of Groups" Ta "2 bytes" Ta "Number of groups in token" -.It Li "Group List" Ta "N * 4 bytes" Ta "List of N group IDs" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Number of Groups 2 bytes Number of groups in token" +.It "Group List N * 4 bytes List of N group IDs" .El .Ss System V IPC Permission Token The -.Dv System V IPC permission +.Dq System V IPC permission token ... -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It XXXXX .El .Ss Arg Token The -.Dv arg +.Dq arg token ... -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It XXXXX .El .Ss exec_args Token The -.Dv exec_args +.Dq exec_args token ... -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It XXXXX .El .Ss exec_env Token The -.Dv exec_env +.Dq exec_env token ... -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It XXXXX .El .Ss Exit Token The -.Dv exit +.Dq exit token contains process exit/return code information. An -.Dv exit +.Dq exit token can be created using .Xr au_to_exit 3 . -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Status" Ta "4 bytes" Ta "Process status on exit" -.It Li "Return Value" ta "4 bytes" Ta "Process return value on exit" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Status 4 bytes Process status on exit" +.It "Return Value 4 bytes Process return value on exit" .El .Ss Socket Token The -.Dv socket +.Dq socket token ... -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It XXXXX .El .Ss Expanded Socket Token The -.Dv expanded socket +.Dq expanded socket token ... -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It XXXXX .El .Ss Seq Token The -.Dv seq +.Dq seq token contains a unique and monotonically increasing audit event sequence ID. Due to the limited range of 32 bits, serial number arithmetic and caution should be used when comparing sequence numbers. -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li "Sequence Number" Ta "4 bytes" Ta "Audit event sequence number" +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It "Sequence Number 4 bytes Audit event sequence number" .El .Ss privilege Token The -.Dv privilege +.Dq privilege token ... -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It XXXXX .El .Ss Use-of-auth Token The -.Dv use-of-auth +.Dq use-of-auth token ... -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It XXXXX .El .Ss Command Token The -.Dv command +.Dq command token ... -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It XXXXX .El .Ss ACL Token The -.Dv ACL +.Dq ACL token ... -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It XXXXX .El .Ss Zonename Token The -.Dv zonename +.Dq zonename token ... -.Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" -.It Sy "Field" Ta Sy Bytes Ta Sy Description -.It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" +.It Sy "Field Bytes Description" +.It "Token ID 1 byte Token ID" +.It XXXXX .El .Sh SEE ALSO .Xr libbsm 3 , @@ -614,15 +618,15 @@ .An Robert Watson Aq rwatson@FreeBSD.org . .Sh BUGS The -.Dv How to print +.Dq How to print field in the -.Dv arbitrary data +.Dq arbitrary data token has undefined values. .Pp The -.Dv in_addr +.Dq in_addr and -.Dv in_addr_ex +.Dq in_addr_ex token layout documented here appears to be in conflict with the .Xr libbsm 3 implementations of From owner-p4-projects@FreeBSD.ORG Tue Oct 3 21:36:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B2EE16A417; Tue, 3 Oct 2006 21:36:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5482216A412 for ; Tue, 3 Oct 2006 21:36:02 +0000 (UTC) (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 773D743D46 for ; Tue, 3 Oct 2006 21:35:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93LZwpJ019512 for ; Tue, 3 Oct 2006 21:35:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93LZwOw019509 for perforce@freebsd.org; Tue, 3 Oct 2006 21:35:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 21:35:58 GMT Message-Id: <200610032135.k93LZwOw019509@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 107221 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 21:36:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=107221 Change 107221 by rwatson@rwatson_peppercorn on 2006/10/03 21:35:23 Define event numbers for some more interesting events. Listen because it's interesting, and mlockall/munlockall because they require privilege. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#46 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#46 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#45 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#46 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -493,6 +493,9 @@ #define AUE_KMQ_TIMEDSEND 43137 /* FreeBSD. */ #define AUE_KMQ_NOTIFY 43138 /* FreeBSD. */ #define AUE_KMQ_UNLINK 43139 /* FreeBSD. */ +#define AUE_LISTEN 43140 /* FreeBSD/Darwin/Linux. */ +#define AUE_MLOCKALL 43141 /* FreeBSD. */ +#define AUE_MUNLOCKALL 43142 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -590,16 +593,13 @@ #define AUE_GETSOCKOPT AUE_NULL #define AUE_GTSOCKOPT AUE_GETSOCKOPT /* XXX: Typo in Darwin. */ #define AUE_ISSETUGID AUE_NULL -#define AUE_LISTEN AUE_NULL #define AUE_LSTATV AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL #define AUE_MKCOMPLEX AUE_NULL -#define AUE_MLOCKALL AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL -#define AUE_MUNLOCKALL AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL #define AUE_PREADV AUE_NULL ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#18 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#19 $ # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -441,6 +441,9 @@ 43137:AUE_KMQ_TIMEDSEND:mq_timedsend(2):ip 43138:AUE_KMQ_NOTIFY:mq_notify(2):ip 43139:AUE_KMQ_UNLINK:mq_unlink(2):ip +43140:AUE_LISTEN:listen(2):nt +43141:AUE_MLOCKALL:mlockall(2):pc +43142:AUE_MUNLOCKALL:munlockall(2):pc # # User space system events. # From owner-p4-projects@FreeBSD.ORG Tue Oct 3 22:30:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E7A916A47E; Tue, 3 Oct 2006 22:30:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EDA8816A40F for ; Tue, 3 Oct 2006 22:30:19 +0000 (UTC) (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 16C4843D58 for ; Tue, 3 Oct 2006 22:30:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93MU7a2028506 for ; Tue, 3 Oct 2006 22:30:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93MU7Ht028503 for perforce@freebsd.org; Tue, 3 Oct 2006 22:30:07 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 22:30:07 GMT Message-Id: <200610032230.k93MU7Ht028503@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 107223 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 22:30:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=107223 Change 107223 by imp@imp_lighthouse on 2006/10/03 22:29:29 Witness and hard wire root. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/TSC4370#12 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/TSC4370#12 (text+ko) ==== @@ -44,6 +44,7 @@ #options MD_ROOT #MD is a potential root device #options MD_ROOT_SIZE=4096 # 4MB ram disk #options ROOTDEVNAME=\"ufs:md0\" +options ROOTDEVNAME=\"ufs:mmcsd0s1a\" #options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server #options NFS_ROOT #NFS usable as /, requires NFSCLIENT @@ -84,10 +85,10 @@ ##device da # Direct Access (disks) # Debugging for use in -current -#options INVARIANTS #Enable calls of extra sanity checking -#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +options WITNESS #Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed device mem # Memory and kernel memory devices device md From owner-p4-projects@FreeBSD.ORG Tue Oct 3 22:30:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 576C516A558; Tue, 3 Oct 2006 22:30:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F197316A47B for ; Tue, 3 Oct 2006 22:30:19 +0000 (UTC) (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 83F7C43D5A for ; Tue, 3 Oct 2006 22:30:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93MU8ee028512 for ; Tue, 3 Oct 2006 22:30:08 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93MU8G9028509 for perforce@freebsd.org; Tue, 3 Oct 2006 22:30:08 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 22:30:08 GMT Message-Id: <200610032230.k93MU8G9028509@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 107224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 22:30:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=107224 Change 107224 by imp@imp_lighthouse on 2006/10/03 22:29:45 Less verbosity Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#21 edit .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#20 edit .. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#21 (text+ko) ==== @@ -335,7 +335,7 @@ if (!data) { // The no data case is fairly simple at91_mci_pdc_disable(sc); - printf("CMDR %x ARGR %x\n", cmdr, cmd->arg); +// printf("CMDR %x ARGR %x\n", cmdr, cmd->arg); WR4(sc, MCI_ARGR, cmd->arg); WR4(sc, MCI_CMDR, cmdr); WR4(sc, MCI_IER, MCI_SR_ERROR | MCI_SR_CMDRDY); @@ -379,7 +379,7 @@ } else panic("Write write support"); } - printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg); +// printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg); WR4(sc, MCI_ARGR, cmd->arg); WR4(sc, MCI_CMDR, cmdr); if (cmdr & MCI_CMDR_TRCMD_START) { @@ -402,10 +402,12 @@ // assert locked if (!(sc->flags & CMD_STARTED)) { sc->flags |= CMD_STARTED; +// printf("Starting CMD\n"); at91_mci_start_cmd(sc, req->cmd); return; } if (!(sc->flags & STOP_STARTED) && req->stop) { +// printf("Starting Stop\n"); sc->flags |= STOP_STARTED; at91_mci_start_cmd(sc, req->stop); return; @@ -499,7 +501,7 @@ AT91_MCI_LOCK(sc); sr = RD4(sc, MCI_SR) & RD4(sc, MCI_IMR); - printf("i 0x%x\n", sr); +// printf("i 0x%x\n", sr); cmd = sc->curcmd; if (sr & MCI_SR_ERROR) { // Ignore CRC errors on CMD2 and ACMD47, per relevant standards @@ -521,39 +523,39 @@ } } else { if (sr & MCI_SR_TXBUFE) { - printf("TXBUFE\n"); +// printf("TXBUFE\n"); //XXX at91_mci_xmit_done(sc); } if (sr & MCI_SR_RXBUFF) { - printf("RXBUFF\n"); +// printf("RXBUFF\n"); WR4(sc, MCI_IDR, MCI_SR_RXBUFF); WR4(sc, MCI_IER, MCI_SR_CMDRDY); } if (sr & MCI_SR_ENDTX) { - printf("ENDTX\n"); +// printf("ENDTX\n"); } if (sr & MCI_SR_ENDRX) { - printf("ENDRX\n"); +// printf("ENDRX\n"); at91_mci_read_done(sc); } if (sr & MCI_SR_NOTBUSY) { - printf("NOTBUSY\n"); +// printf("NOTBUSY\n"); WR4(sc, MCI_IER, MCI_SR_CMDRDY); } if (sr & MCI_SR_DTIP) { - printf("Data transfer in progress\n"); +// printf("Data transfer in progress\n"); } if (sr & MCI_SR_BLKE) { - printf("Block transfer end\n"); +// printf("Block transfer end\n"); } if (sr & MCI_SR_TXRDY) { - printf("Ready to transmit\n"); +// printf("Ready to transmit\n"); } if (sr & MCI_SR_RXRDY) { - printf("Ready to receive\n"); +// printf("Ready to receive\n"); } if (sr & MCI_SR_CMDRDY) { - printf("Command ready\n"); +// printf("Command ready\n"); done = 1; cmd->error = MMC_ERR_NONE; } @@ -564,7 +566,7 @@ for (i = 0; i < ((cmd->flags & MMC_RSP_136) ? 4 : 1); i++) { cmd->resp[i] = RD4(sc, MCI_RSPR + i * 4); - printf("RSPR[%d] = %x\n", i, cmd->resp[i]); +// printf("RSPR[%d] = %x\n", i, cmd->resp[i]); } } at91_mci_start(sc); ==== //depot/projects/arm/src/sys/dev/mmc/mmc.c#20 (text+ko) ==== @@ -77,7 +77,10 @@ #define MMC_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); static void mmc_delayed_attach(void *); -static int mmc_wait_for_cmd(struct mmc_softc *sc, struct mmc_command *cmd, int retries); +static int mmc_wait_for_cmd(struct mmc_softc *sc, struct mmc_command *cmd, + int retries); +static int mmc_wait_for_command(struct mmc_softc *sc, uint32_t opcode, + uint32_t arg, uint32_t flags, uint32_t *resp, int retries); static void mmc_ms_delay(int ms) @@ -105,7 +108,6 @@ /* We'll probe and attach our children later, but before / mount */ sc->config_intrhook.ich_func = mmc_delayed_attach; sc->config_intrhook.ich_arg = sc; - printf("arg is %p\n", sc); if (config_intrhook_establish(&sc->config_intrhook) != 0) device_printf(dev, "config_intrhook_establish failed\n"); return (0); @@ -121,7 +123,6 @@ mmc_acquire_bus(device_t busdev, device_t dev) { struct mmc_softc *sc; - struct mmc_command cmd; int err; err = MMCBR_ACQUIRE_HOST(device_get_parent(busdev), dev); @@ -136,10 +137,9 @@ if (busdev != dev) { // XXX Should do lazy selection. - cmd.opcode = MMC_SELECT_CARD; - cmd.arg = mmc_get_rca(dev) << 16; - cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; - mmc_wait_for_cmd(sc, &cmd, CMD_RETRIES); + mmc_wait_for_command(sc, MMC_SELECT_CARD, + mmc_get_rca(dev) << 16, MMC_RSP_R1 | MMC_CMD_AC, + NULL, CMD_RETRIES); // XXX should set bus width here? } return (0); @@ -149,17 +149,14 @@ mmc_release_bus(device_t busdev, device_t dev) { struct mmc_softc *sc; - struct mmc_command cmd; int err; sc = device_get_softc(busdev); if (busdev != dev) { - // XXX Should do lazy selection. - cmd.opcode = MMC_DESELECT_CARD; - cmd.arg = 0; - cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; - mmc_wait_for_cmd(sc, &cmd, CMD_RETRIES); + // XXX Should do lazy deselection. + mmc_wait_for_command(sc, MMC_DESELECT_CARD, 0, + MMC_RSP_R1 | MMC_CMD_AC, NULL, CMD_RETRIES); } MMC_LOCK(sc); if (!sc->owner) @@ -205,7 +202,7 @@ { struct mmc_softc *sc; - printf("Wakeup for req %p done_data %p\n", req, req->done_data); +// printf("Wakeup for req %p done_data %p\n", req, req->done_data); sc = (struct mmc_softc *)req->done_data; MMC_LOCK(sc); req->flags |= MMC_REQ_DONE; @@ -220,14 +217,14 @@ req->done = mmc_wakeup; req->done_data = sc; - printf("Submitting request %p sc %p\n", req, sc); +// printf("Submitting request %p sc %p\n", req, sc); MMCBR_REQUEST(device_get_parent(sc->dev), sc->dev, req); MMC_LOCK(sc); do { err = msleep(req, &sc->sc_mtx, PZERO | PCATCH, "mmcreq", hz / 10); } while (!(req->flags & MMC_REQ_DONE) && err == EAGAIN); - printf("Request %p done with error %d\n", req, err); +// printf("Request %p done with error %d\n", req, err); MMC_UNLOCK(sc); return (err); } @@ -237,7 +234,6 @@ { struct mmc_softc *sc = device_get_softc(brdev); - printf("passing along request %p\n", req); return mmc_wait_for_req(sc, req); } @@ -251,7 +247,7 @@ cmd->retries = retries; cmd->data = NULL; mreq.cmd = cmd; - printf("CMD: %x ARG %x\n", cmd->opcode, cmd->arg); +// printf("CMD: %x ARG %x\n", cmd->opcode, cmd->arg); mmc_wait_for_req(sc, &mreq); return (cmd->error); } @@ -281,6 +277,31 @@ return (err); } +static int +mmc_wait_for_command(struct mmc_softc *sc, uint32_t opcode, + uint32_t arg, uint32_t flags, uint32_t *resp, int retries) +{ + struct mmc_command cmd; + int err; + + memset(&cmd, 0, sizeof(cmd)); + cmd.opcode = opcode; + cmd.arg = arg; + cmd.flags = flags; + err = mmc_wait_for_cmd(sc, &cmd, retries); + if (err) + return (err); + if (cmd.error) + return (cmd.error); + if (resp) { + if (flags & MMC_RSP_136) + memcpy(resp, cmd.resp, 4 * sizeof(uint32_t)); + else + *resp = cmd.resp[0]; + } + return (0); +} + static void mmc_idle_cards(struct mmc_softc *sc) { @@ -297,7 +318,6 @@ cmd.arg = 0; cmd.flags = MMC_RSP_NONE | MMC_CMD_BC; mmc_wait_for_cmd(sc, &cmd, 0); - printf("GO_IDLE returns %d\n", cmd.error); mmc_ms_delay(1); mmcbr_set_chip_select(dev, cs_dontcare); @@ -565,7 +585,6 @@ if (mmc_send_op_cond(sc, 0, &ocr) != MMC_ERR_NONE) return; // Failed both, punt! XXX power down? } - printf("OCR IS %x\n", ocr); mmcbr_set_ocr(dev, mmc_select_vdd(sc, ocr)); if (mmcbr_get_ocr(dev) != 0) mmc_idle_cards(sc); @@ -682,7 +701,6 @@ { struct mmc_softc *sc = xsc; - device_printf(sc->dev, "insert mmc/sd probe code here\n"); mmc_scan(sc); config_intrhook_disestablish(&sc->config_intrhook); } ==== //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#7 (text+ko) ==== @@ -95,7 +95,7 @@ sc->disk->d_close = mmcsd_close; sc->disk->d_strategy = mmcsd_strategy; // sc->disk->d_dump = mmcsd_dump; Need polling mmc layer - sc->disk->d_name = "flash/card"; + sc->disk->d_name = "mmcsd"; sc->disk->d_drv1 = sc; sc->disk->d_maxsize = DFLTPHYS; sc->disk->d_sectorsize = mmc_get_sector_size(dev); @@ -179,13 +179,15 @@ } while (bp == NULL); MMCBUS_ACQUIRE_BUS(device_get_parent(dev), dev); bioq_remove(&sc->bio_queue, bp); - printf("mmc_task: request %p for block %lld\n", bp, bp->bio_pblkno); +// printf("mmc_task: request %p for block %lld\n", bp, bp->bio_pblkno); sz = sc->disk->d_sectorsize; end = bp->bio_pblkno + (bp->bio_bcount / sz); // XXX should use read/write_mulit for (block = bp->bio_pblkno; block < end; block++) { char *vaddr = bp->bio_data + (block - bp->bio_pblkno) * sz; memset(&req, 0, sizeof(req)); + memset(&cmd, 0, sizeof(cmd)); + memset(&stop, 0, sizeof(stop)); req.cmd = &cmd; cmd.data = &data; req.stop = &stop; From owner-p4-projects@FreeBSD.ORG Tue Oct 3 23:52: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 56CCD16A51B; Tue, 3 Oct 2006 23:52:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D28F16A519 for ; Tue, 3 Oct 2006 23:52:54 +0000 (UTC) (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 D956F43D6A for ; Tue, 3 Oct 2006 23:52:53 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93NqrEF044387 for ; Tue, 3 Oct 2006 23:52:53 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93NqriK044383 for perforce@freebsd.org; Tue, 3 Oct 2006 23:52:53 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Oct 2006 23:52:53 GMT Message-Id: <200610032352.k93NqriK044383@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 107226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Oct 2006 23:52:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=107226 Change 107226 by imp@imp_lighthouse on 2006/10/03 23:52:30 Need to enable this pin for GPIO access. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#20 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#20 (text+ko) ==== @@ -291,6 +291,7 @@ case GPIO_CFG: /* Configure GPIO pins */ cfg = (struct gpio_cfg *)data; if (cfg->cfgmask & GPIO_CFG_INPUT) { + WR4(sc, PIO_PER, cfg->iomask); WR4(sc, PIO_OER, cfg->iomask & ~cfg->input); WR4(sc, PIO_ODR, cfg->iomask & cfg->input); } From owner-p4-projects@FreeBSD.ORG Wed Oct 4 00:12: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 CBBF616A4A0; Wed, 4 Oct 2006 00:12:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BDB016A492 for ; Wed, 4 Oct 2006 00:12:19 +0000 (UTC) (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 43D0A43D5C for ; Wed, 4 Oct 2006 00:12:19 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k940CJ58048731 for ; Wed, 4 Oct 2006 00:12:19 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k940CITR048727 for perforce@freebsd.org; Wed, 4 Oct 2006 00:12:18 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Oct 2006 00:12:18 GMT Message-Id: <200610040012.k940CITR048727@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 107228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 00:12:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=107228 Change 107228 by imp@imp_lighthouse on 2006/10/04 00:11:36 slam a few pins to be gpio. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#36 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#36 (text+ko) ==== @@ -249,6 +249,8 @@ at91_pio_use_gpio(AT91RM92_PIOA_BASE, AT91C_PIO_PA24); at91_pio_gpio_output(AT91RM92_PIOA_BASE, AT91C_PIO_PA24, 0); at91_pio_gpio_clear(AT91RM92_PIOA_BASE, AT91C_PIO_PA24); + at91_pio_use_gpio(AT91RM92_PIOB_BASE, + AT91C_PIO_PB16 | AT91C_PIO_PB17 | AT91C_PIO_PB18 | AT91C_PIO_PB19); #endif return (ramsize()); From owner-p4-projects@FreeBSD.ORG Wed Oct 4 00:18: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 7017716A492; Wed, 4 Oct 2006 00:18:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32F5A16A47C for ; Wed, 4 Oct 2006 00:18:28 +0000 (UTC) (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 F3A8743D4C for ; Wed, 4 Oct 2006 00:18:27 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k940IRZq049267 for ; Wed, 4 Oct 2006 00:18:27 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k940IR4n049264 for perforce@freebsd.org; Wed, 4 Oct 2006 00:18:27 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Oct 2006 00:18:27 GMT Message-Id: <200610040018.k940IR4n049264@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 107229 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 00:18:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=107229 Change 107229 by imp@imp_lighthouse on 2006/10/04 00:17:41 Fix broken locking. simplify a open/close. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#8 (text+ko) ==== @@ -89,7 +89,6 @@ sc->dev = dev; MMCSD_LOCK_INIT(sc); - MMCSD_LOCK(sc); sc->disk = disk_alloc(); sc->disk->d_open = mmcsd_open; sc->disk->d_close = mmcsd_close; @@ -103,7 +102,6 @@ sc->disk->d_unit = device_get_unit(dev); disk_create(sc->disk, DISK_VERSION); bioq_init(&sc->bio_queue); - MMCSD_UNLOCK(sc); kthread_create(&mmcsd_task, sc, &sc->p, 0, 0, "task: mmc/sd card"); return (0); @@ -118,27 +116,12 @@ static int mmcsd_open(struct disk *dp) { - struct mmcsd_softc *sc; - - sc = (struct mmcsd_softc *)dp->d_drv1; - - MMCSD_LOCK(sc); - MMCSD_UNLOCK(sc); - return 0; } static int mmcsd_close(struct disk *dp) { - struct mmcsd_softc *sc; - - sc = (struct mmcsd_softc *)dp->d_drv1; - - MMCSD_LOCK(sc); - MMCSD_UNLOCK(sc); - - // XXX do nothing since we don't lock for now return 0; } @@ -168,17 +151,17 @@ uint32_t block; device_t dev; - MMCSD_LOCK(sc); - printf("mmcsd_task: start\n"); dev = sc->dev; for (;;) { + MMCSD_LOCK(sc); do { bp = bioq_first(&sc->bio_queue); if (bp == NULL) msleep(sc, &sc->sc_mtx, PRIBIO, "jobqueue", 0); } while (bp == NULL); + bioq_remove(&sc->bio_queue, bp); + MMCSD_UNLOCK(sc); MMCBUS_ACQUIRE_BUS(device_get_parent(dev), dev); - bioq_remove(&sc->bio_queue, bp); // printf("mmc_task: request %p for block %lld\n", bp, bp->bio_pblkno); sz = sc->disk->d_sectorsize; end = bp->bio_pblkno + (bp->bio_bcount / sz); From owner-p4-projects@FreeBSD.ORG Wed Oct 4 00:18: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 C37A216A559; Wed, 4 Oct 2006 00:18:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 85A0C16A501 for ; Wed, 4 Oct 2006 00:18:28 +0000 (UTC) (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 3D15343D4C for ; Wed, 4 Oct 2006 00:18:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k940ISJk049273 for ; Wed, 4 Oct 2006 00:18:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k940IS2w049270 for perforce@freebsd.org; Wed, 4 Oct 2006 00:18:28 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Oct 2006 00:18:28 GMT Message-Id: <200610040018.k940IS2w049270@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 107230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 00:18:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=107230 Change 107230 by imp@imp_lighthouse on 2006/10/04 00:17:58 Nits Affected files ... .. //depot/projects/arm/src/sys/dev/flash/at45.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/dev/flash/at45.c#2 (text+ko) ==== @@ -25,8 +25,6 @@ #include __FBSDID("$FreeBSD$"); - - #define CONTINUOUS_ARRAY_READ 0xE8 #define CONTINUOUS_ARRAY_READ_HF 0x0B #define CONTINUOUS_ARRAY_READ_LF 0x03 From owner-p4-projects@FreeBSD.ORG Wed Oct 4 00:18: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 241D616A5CB; Wed, 4 Oct 2006 00:18:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB74C16A58D for ; Wed, 4 Oct 2006 00:18:28 +0000 (UTC) (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 91F9343D4C for ; Wed, 4 Oct 2006 00:18:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k940ISmH049280 for ; Wed, 4 Oct 2006 00:18:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k940ISxR049277 for perforce@freebsd.org; Wed, 4 Oct 2006 00:18:28 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Oct 2006 00:18:28 GMT Message-Id: <200610040018.k940ISxR049277@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 107231 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 00:18:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=107231 Change 107231 by imp@imp_lighthouse on 2006/10/04 00:18:06 bpf Affected files ... .. //depot/projects/arm/src/sys/arm/conf/TSC4370#13 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/TSC4370#13 (text+ko) ==== @@ -105,3 +105,8 @@ # SPI bus device spibus device at45 # at45db642 and maybe others + +# The `bpf' device enables the Berkeley Packet Filter. +# Be aware of the administrative consequences of enabling this! +# Note that 'bpf' is required for DHCP. +device bpf # Berkeley packet filter From owner-p4-projects@FreeBSD.ORG Wed Oct 4 01:27: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 4AF4116A40F; Wed, 4 Oct 2006 01:27:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F60616A403 for ; Wed, 4 Oct 2006 01:27:57 +0000 (UTC) (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 D26F843D45 for ; Wed, 4 Oct 2006 01:27:56 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k941RuuE069181 for ; Wed, 4 Oct 2006 01:27:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k941RuFj069178 for perforce@freebsd.org; Wed, 4 Oct 2006 01:27:56 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Oct 2006 01:27:56 GMT Message-Id: <200610040127.k941RuFj069178@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 107232 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 01:27:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=107232 Change 107232 by imp@imp_lighthouse on 2006/10/04 01:27:23 _IOR is for reading data from the kernel. _IOW is for writing data into the kernel. Config is definitely writing data into the kernel. Switch. Affected files ... .. //depot/projects/arm/src/sys/sys/gpio.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/sys/gpio.h#4 (text+ko) ==== @@ -55,6 +55,6 @@ #define GPIO_GET _IOR('g', 2, uint32_t) /* Read output bit state */ #define GPIO_READ _IOR('g', 3, uint32_t) /* Read input bit state */ #define GPIO_INFO _IOR('g', 4, struct gpio_info) /* State of gpio cfg */ -#define GPIO_CFG _IOR('g', 5, struct gpio_cfg) /* Configure gpio */ +#define GPIO_CFG _IOW('g', 5, struct gpio_cfg) /* Configure gpio */ #endif /* _SYS_GPIO_H */ From owner-p4-projects@FreeBSD.ORG Wed Oct 4 01:28: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 E242D16A416; Wed, 4 Oct 2006 01:28:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB51316A403 for ; Wed, 4 Oct 2006 01:28:58 +0000 (UTC) (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 8A60C43D4C for ; Wed, 4 Oct 2006 01:28:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k941SwKI069225 for ; Wed, 4 Oct 2006 01:28:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k941SwcW069222 for perforce@freebsd.org; Wed, 4 Oct 2006 01:28:58 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Oct 2006 01:28:58 GMT Message-Id: <200610040128.k941SwcW069222@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 107233 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 01:28:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=107233 Change 107233 by imp@imp_lighthouse on 2006/10/04 01:28:10 Be chatty about setting bus width, for the moment max freq 30MHz (doubles freq) Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#22 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#22 (text+ko) ==== @@ -195,7 +195,7 @@ goto out; } sc->host.f_min = 375000; - sc->host.f_max = 25000000; + sc->host.f_max = 30000000; sc->host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340; sc->host.caps = MMC_CAP_4_BIT_DATA; child = device_add_child(dev, "mmc", 0); @@ -290,10 +290,13 @@ else clkdiv = (at91_master_clock / ios->clock) / 2; } - if (ios->bus_width == bus_width_4 && sc->wire4) + if (ios->bus_width == bus_width_4 && sc->wire4) { + device_printf(sc->dev, "Setting controller bus width to 4\n"); WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) | MCI_SDCR_SDCBUS); - else + } else { + device_printf(sc->dev, "Setting controller bus width to 1\n"); WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS); + } WR4(sc, MCI_MR, (RD4(sc, MCI_MR) & ~MCI_MR_CLKDIV) | clkdiv); #if 0 if (sc->vcc_pin) { From owner-p4-projects@FreeBSD.ORG Wed Oct 4 04:22:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1456516A415; Wed, 4 Oct 2006 04:22:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA82E16A40F for ; Wed, 4 Oct 2006 04:22:04 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25FA343D4C for ; Wed, 4 Oct 2006 04:22:04 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k944M4sv003528 for ; Wed, 4 Oct 2006 04:22:04 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k944M1HJ003511 for perforce@freebsd.org; Wed, 4 Oct 2006 04:22:01 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 4 Oct 2006 04:22:01 GMT Message-Id: <200610040422.k944M1HJ003511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 107237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 04:22:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=107237 Change 107237 by mjacob@newisp on 2006/10/04 04:21:19 IFC Affected files ... .. //depot/projects/newisp/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/newisp/amd64/amd64/machdep.c#3 integrate .. //depot/projects/newisp/amd64/include/clock.h#2 integrate .. //depot/projects/newisp/amd64/isa/clock.c#2 integrate .. //depot/projects/newisp/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/newisp/arm/include/clock.h#2 integrate .. //depot/projects/newisp/boot/common/merge_help.awk#2 integrate .. //depot/projects/newisp/boot/common/panic.c#2 integrate .. //depot/projects/newisp/boot/ficl/Makefile#2 integrate .. //depot/projects/newisp/boot/forth/loader.conf#2 integrate .. //depot/projects/newisp/boot/i386/Makefile.inc#2 integrate .. //depot/projects/newisp/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/newisp/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/newisp/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/newisp/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/newisp/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/newisp/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/newisp/boot/i386/loader/help.i386#2 integrate .. //depot/projects/newisp/cam/cam_periph.c#2 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/newisp/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/newisp/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/newisp/conf/NOTES#6 integrate .. //depot/projects/newisp/conf/files#5 integrate .. //depot/projects/newisp/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/newisp/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/newisp/dev/bge/if_bge.c#7 integrate .. //depot/projects/newisp/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/newisp/dev/digi/digi.c#2 integrate .. //depot/projects/newisp/dev/em/if_em.c#9 integrate .. //depot/projects/newisp/dev/kbdmux/kbdmux.c#4 integrate .. //depot/projects/newisp/dev/mfi/mfi.c#6 integrate .. //depot/projects/newisp/dev/mfi/mfi_debug.c#2 integrate .. //depot/projects/newisp/dev/sound/driver.c#2 integrate .. //depot/projects/newisp/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/newisp/dev/sound/pci/ak452x.c#2 delete .. //depot/projects/newisp/dev/sound/pci/ak452x.h#2 delete .. //depot/projects/newisp/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/newisp/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/newisp/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/newisp/dev/sound/pci/envy24ht.c#1 branch .. //depot/projects/newisp/dev/sound/pci/envy24ht.h#1 branch .. //depot/projects/newisp/dev/sound/pci/hda/hda_reg.h#1 branch .. //depot/projects/newisp/dev/sound/pci/hda/hdac.c#1 branch .. //depot/projects/newisp/dev/sound/pci/hda/hdac.h#1 branch .. //depot/projects/newisp/dev/sound/pci/hda/hdac_private.h#1 branch .. //depot/projects/newisp/dev/sound/pci/hda/hdac_reg.h#1 branch .. //depot/projects/newisp/dev/sound/pci/spicds.c#1 branch .. //depot/projects/newisp/dev/sound/pci/spicds.h#1 branch .. //depot/projects/newisp/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/newisp/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/newisp/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/newisp/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/newisp/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/newisp/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/newisp/dev/sound/pcm/mixer.h#3 integrate .. //depot/projects/newisp/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/newisp/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/newisp/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/newisp/dev/syscons/syscons.c#3 integrate .. //depot/projects/newisp/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/newisp/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/newisp/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/newisp/dev/uart/uart_kbd_sun.c#3 integrate .. //depot/projects/newisp/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/newisp/dev/usb/ehci.c#3 integrate .. //depot/projects/newisp/dev/usb/ohci.c#3 integrate .. //depot/projects/newisp/dev/usb/ukbd.c#3 integrate .. //depot/projects/newisp/dev/usb/usb_subr.c#4 integrate .. //depot/projects/newisp/dev/usb/usbdi.c#3 integrate .. //depot/projects/newisp/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/newisp/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/newisp/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/newisp/fs/procfs/procfs_ioctl.c#2 integrate .. //depot/projects/newisp/geom/eli/g_eli.c#2 integrate .. //depot/projects/newisp/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/newisp/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/newisp/geom/label/g_label_msdosfs.h#2 integrate .. //depot/projects/newisp/geom/nop/g_nop.h#3 integrate .. //depot/projects/newisp/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/newisp/i386/bios/apm.c#2 integrate .. //depot/projects/newisp/i386/i386/local_apic.c#5 integrate .. //depot/projects/newisp/i386/i386/machdep.c#3 integrate .. //depot/projects/newisp/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/newisp/i386/include/clock.h#2 integrate .. //depot/projects/newisp/i386/isa/clock.c#2 integrate .. //depot/projects/newisp/i386/isa/pmtimer.c#2 integrate .. //depot/projects/newisp/ia64/ia64/clock.c#2 integrate .. //depot/projects/newisp/ia64/include/clock.h#2 integrate .. //depot/projects/newisp/kern/init_sysent.c#6 integrate .. //depot/projects/newisp/kern/kern_lock.c#2 integrate .. //depot/projects/newisp/kern/kern_proc.c#4 integrate .. //depot/projects/newisp/kern/kern_time.c#2 integrate .. //depot/projects/newisp/kern/subr_clock.c#2 integrate .. //depot/projects/newisp/kern/subr_rtc.c#1 branch .. //depot/projects/newisp/kern/sys_generic.c#2 integrate .. //depot/projects/newisp/kern/syscalls.c#6 integrate .. //depot/projects/newisp/kern/syscalls.master#6 integrate .. //depot/projects/newisp/kern/systrace_args.c#6 integrate .. //depot/projects/newisp/kern/tty.c#5 integrate .. //depot/projects/newisp/kern/tty_pts.c#2 integrate .. //depot/projects/newisp/kern/tty_pty.c#3 integrate .. //depot/projects/newisp/kern/tty_tty.c#3 integrate .. //depot/projects/newisp/kern/vfs_bio.c#2 integrate .. //depot/projects/newisp/kern/vfs_mount.c#4 integrate .. //depot/projects/newisp/kern/vfs_subr.c#4 integrate .. //depot/projects/newisp/modules/digi/digi/Makefile#2 integrate .. //depot/projects/newisp/modules/if_tap/Makefile#2 integrate .. //depot/projects/newisp/modules/kbdmux/Makefile#2 integrate .. //depot/projects/newisp/modules/libalias/Makefile#3 integrate .. //depot/projects/newisp/modules/libalias/modules/Makefile#2 integrate .. //depot/projects/newisp/modules/procfs/Makefile#2 integrate .. //depot/projects/newisp/modules/sound/driver/Makefile#2 integrate .. //depot/projects/newisp/modules/sound/driver/ak452x/Makefile#2 delete .. //depot/projects/newisp/modules/sound/driver/envy24/Makefile#2 integrate .. //depot/projects/newisp/modules/sound/driver/envy24ht/Makefile#1 branch .. //depot/projects/newisp/modules/sound/driver/hda/Makefile#1 branch .. //depot/projects/newisp/modules/sound/driver/spicds/Makefile#1 branch .. //depot/projects/newisp/modules/ukbd/Makefile#2 integrate .. //depot/projects/newisp/modules/vkbd/Makefile#2 integrate .. //depot/projects/newisp/net/bridgestp.c#2 integrate .. //depot/projects/newisp/net/if_tap.c#2 integrate .. //depot/projects/newisp/net/if_tap.h#2 integrate .. //depot/projects/newisp/netgraph/atm/ccatm/ng_ccatm.c#2 integrate .. //depot/projects/newisp/netinet/in.c#2 integrate .. //depot/projects/newisp/netinet/in_var.h#3 integrate .. //depot/projects/newisp/netinet/ip_mroute.c#2 integrate .. //depot/projects/newisp/netinet/ip_mroute.h#2 integrate .. //depot/projects/newisp/netinet/ip_output.c#5 integrate .. //depot/projects/newisp/netinet/tcp_output.c#4 integrate .. //depot/projects/newisp/netinet/tcp_subr.c#6 integrate .. //depot/projects/newisp/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/newisp/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/newisp/netinet6/nd6.c#3 integrate .. //depot/projects/newisp/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/newisp/pc98/cbus/clock.c#2 integrate .. //depot/projects/newisp/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/newisp/pc98/pc98/machdep.c#2 integrate .. //depot/projects/newisp/pci/agp_i810.c#2 integrate .. //depot/projects/newisp/powerpc/include/clock.h#2 integrate .. //depot/projects/newisp/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/newisp/security/audit/audit.c#5 integrate .. //depot/projects/newisp/security/audit/audit_bsm.c#6 integrate .. //depot/projects/newisp/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/newisp/security/mac/mac_framework.h#1 branch .. //depot/projects/newisp/sparc64/include/clock.h#2 integrate .. //depot/projects/newisp/sys/buf.h#2 integrate .. //depot/projects/newisp/sys/clock.h#2 integrate .. //depot/projects/newisp/sys/consio.h#2 integrate .. //depot/projects/newisp/sys/digiio.h#2 integrate .. //depot/projects/newisp/sys/ioccom.h#2 integrate .. //depot/projects/newisp/sys/kbio.h#2 integrate .. //depot/projects/newisp/sys/kernel.h#2 integrate .. //depot/projects/newisp/sys/lockmgr.h#2 integrate .. //depot/projects/newisp/sys/mount.h#4 integrate .. //depot/projects/newisp/sys/param.h#6 integrate .. //depot/projects/newisp/sys/pioctl.h#2 integrate .. //depot/projects/newisp/sys/proc.h#2 integrate .. //depot/projects/newisp/sys/syscall.h#6 integrate .. //depot/projects/newisp/sys/syscall.mk#6 integrate .. //depot/projects/newisp/sys/sysproto.h#6 integrate .. //depot/projects/newisp/sys/systm.h#3 integrate .. //depot/projects/newisp/sys/time.h#2 integrate .. //depot/projects/newisp/sys/ttycom.h#2 integrate .. //depot/projects/newisp/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/newisp/vm/vm_page.c#3 integrate Differences ... ==== //depot/projects/newisp/amd64/amd64/local_apic.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.29 2006/09/11 20:12:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.31 2006/09/27 22:09:35 sobomax Exp $"); #include "opt_hwpmc_hooks.h" @@ -613,13 +613,17 @@ /* Send EOI first thing. */ lapic_eoi(); -#ifdef SMP +#if defined(SMP) && !defined(SCHED_ULE) /* * Don't do any accounting for the disabled HTT cores, since it * will provide misleading numbers for the userland. * * No locking is necessary here, since even if we loose the race * when hlt_cpus_mask changes it is not a big deal, really. + * + * Don't do that for ULE, since ULE doesn't consider hlt_cpus_mask + * and unlike other schedulers it actually schedules threads to + * those CPUs. */ if ((hlt_cpus_mask & (1 << PCPU_GET(cpuid))) != 0) return; ==== //depot/projects/newisp/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.652 2006/09/07 15:03:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.654 2006/10/02 15:42:01 phk Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -630,26 +631,6 @@ load_cr0(cr0); } -static int -sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS) -{ - int error; - error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, - req); - if (!error && req->newptr) - resettodr(); - return (error); -} - -SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, - &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); - -SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set, - CTLFLAG_RW, &disable_rtc_set, 0, ""); - -SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, - CTLFLAG_RW, &wall_cmos_clock, 0, ""); - /* * Initialize amd64 and configure to run kernel */ ==== //depot/projects/newisp/amd64/include/clock.h#2 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.52 2006/05/19 18:53:50 sobomax Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.53 2006/10/02 12:59:55 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -14,9 +14,7 @@ * i386 to clock driver interface. * XXX large parts of the driver and its interface are misplaced. */ -extern int adjkerntz; extern int clkintr_pending; -extern int disable_rtc_set; extern int pscnt; extern int psdiv; extern int statclock_disable; @@ -24,7 +22,6 @@ extern int timer0_max_count; extern uint64_t tsc_freq; extern int tsc_is_broken; -extern int wall_cmos_clock; extern struct mtx clock_lock; /* ==== //depot/projects/newisp/amd64/isa/clock.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.224 2005/12/22 22:16:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); /* * Routines to handle clock hardware. @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -92,9 +93,7 @@ #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) -int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; -int disable_rtc_set; /* disable resettodr() if != 0 */ int pscnt = 1; int psdiv = 1; int statclock_disable; @@ -104,7 +103,6 @@ u_int timer_freq = TIMER_FREQ; int timer0_max_count; int timer0_real_max_count; -int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ struct mtx clock_lock; #define RTC_LOCK mtx_lock_spin(&clock_lock) #define RTC_UNLOCK mtx_unlock_spin(&clock_lock) @@ -664,7 +662,7 @@ /* sec now contains the number of seconds, since Jan 1 1970, in the local time zone */ - sec += tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + sec += utc_offset(); y = time_second - sec; if (y <= -2 || y >= 2) { @@ -702,7 +700,7 @@ /* Calculate local time to put in RTC */ - tm -= tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + tm -= utc_offset(); writertc(RTC_SEC, bin2bcd(tm%60)); tm /= 60; /* Write back Seconds */ writertc(RTC_MIN, bin2bcd(tm%60)); tm /= 60; /* Write back Minutes */ ==== //depot/projects/newisp/amd64/linux32/linux32_machdep.c#3 (text+ko) ==== @@ -29,11 +29,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.17 2006/08/28 13:09:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.18 2006/10/02 12:59:55 phk Exp $"); #include #include #include +#include #include #include #include ==== //depot/projects/newisp/arm/include/clock.h#2 (text+ko) ==== @@ -23,13 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/clock.h,v 1.2 2005/07/27 21:19:28 imp Exp $ + * $FreeBSD: src/sys/arm/include/clock.h,v 1.3 2006/10/02 12:59:55 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ -#define wall_cmos_clock 0 -#define adjkerntz 0 - #endif /* !_MACHINE_CLOCK_H_ */ ==== //depot/projects/newisp/boot/common/merge_help.awk#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/usr/bin/awk -f # -# $FreeBSD: src/sys/boot/common/merge_help.awk,v 1.5 2001/11/07 17:53:25 fenner Exp $ +# $FreeBSD: src/sys/boot/common/merge_help.awk,v 1.6 2006/09/28 19:06:20 jhb Exp $ # # Merge two boot loader help files for FreeBSD 3.0 # Joe Abley @@ -25,9 +25,12 @@ match($0, " T[[:graph:]]+"); T = substr($0, RSTART + 2, RLENGTH - 2); match($0, " S[[:graph:]]+"); + SSTART = RSTART S = (RLENGTH == -1) ? "" : substr($0, RSTART + 2, RLENGTH - 2); match($0, " D[[:graph:]][[:print:]]*$"); D = substr($0, RSTART + 2); + if (SSTART > RSTART) + S = ""; # find a suitable place to store this one... ind++; ==== //depot/projects/newisp/boot/common/panic.c#2 (text+ko) ==== @@ -34,11 +34,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/panic.c,v 1.7 2003/08/25 23:30:41 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/panic.c,v 1.8 2006/09/29 20:57:38 ru Exp $"); #include #include +extern void exit(int) __dead2; + void panic(const char *fmt,...) { ==== //depot/projects/newisp/boot/ficl/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.43 2006/05/12 04:07:42 jhb Exp $ +# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.44 2006/09/28 10:02:03 ru Exp $ # .PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/} BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ @@ -42,7 +42,7 @@ #SOFTWORDS+= oo.fr classes.fr .if ${MACHINE_ARCH} == "amd64" -CFLAGS+= -m32 -I. +CFLAGS+= -m32 -march=i386 -I. .endif CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/} \ ==== //depot/projects/newisp/boot/forth/loader.conf#2 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.111 2006/08/18 19:03:28 brueffer Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.113 2006/10/01 14:58:30 ariff Exp $ ############################################################## ### Basic configuration options ############################ @@ -309,7 +309,6 @@ sound_load="NO" # Digital sound subsystem snd_ad1816_load="NO" # ad1816 -snd_ak452x_load="NO" # ak452x snd_als4000_load="NO" # als4000 snd_atiixp_load="NO" # atiixp snd_cmi_load="NO" # cmi @@ -319,9 +318,11 @@ snd_emu10k1_load="NO" # Creative Sound Blaster Live snd_emu10kx_load="NO" # Creative SoundBlaster Live! and Audigy snd_envy24_load="NO" # VIA Envy24 +snd_envy24ht_load="NO" # VIA Envy24HT snd_es137x_load="NO" # es137x snd_ess_load="NO" # ess snd_fm801_load="NO" # fm801 +snd_hda_load="NO" # Intel High Definition Audio (Controller) snd_ich_load="NO" # Intel ICH snd_maestro_load="NO" # Maestro snd_maestro3_load="NO" # Maestro3 @@ -331,6 +332,7 @@ snd_sb8_load="NO" # Sound Blaster Pro snd_sbc_load="NO" # Sbc snd_solo_load="NO" # Solo +snd_spicds_load="NO" # SPI codecs snd_t4dwave_load="NO" # t4dwave snd_via8233_load="NO" # via8233 snd_via82c686_load="NO" # via82c686 ==== //depot/projects/newisp/boot/i386/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # Common defines for all of /sys/boot/i386/ # -# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.11 2005/07/15 12:22:14 ache Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.12 2006/09/28 10:02:04 ru Exp $ BINDIR?= /boot @@ -10,7 +10,7 @@ LDFLAGS+= -nostdlib .if ${MACHINE_ARCH} == "amd64" -CFLAGS+= -m32 +CFLAGS+= -m32 -march=i386 LDFLAGS+= -m elf_i386_fbsd AFLAGS+= --32 .endif ==== //depot/projects/newisp/boot/i386/btx/btx/btx.S#2 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.38 2004/11/24 14:54:33 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.42 2006/09/28 19:42:10 jhb Exp $ */ /* @@ -208,7 +208,7 @@ #ifdef PAGING or $0x80000001,%eax # mode and enable paging #else - or $0x01,%eax # mode + inc %ax # mode #endif mov %eax,%cr0 # ljmp $SEL_SCODE,$init.8 # To 32-bit code @@ -493,9 +493,7 @@ je v86wrmsr # Yes cmpb $0x32,(%esi) # Is it a RDMSR? je v86rdmsr # Yes - cmpb $0x20,(%esi) # Is this a - jne v86mon.4 # MOV EAX,CR0 - cmpb $0xc0,0x1(%esi) # instruction? + cmpb $0x20,(%esi) # Is this a MOV reg,CRx? je v86mov # Yes v86mon.4: cmpb $0xfa,%al # CLI? je v86cli # Yes @@ -527,10 +525,24 @@ leal 0x8(%esp,1),%esp # Discard int no, error iret # To V86 mode /* - * Emulate MOV EAX,CR0. + * Emulate MOV reg,CRx. */ -v86mov: movl %cr0,%eax # CR0 to - movl %eax,0x1c(%ebp) # saved EAX +v86mov: movb 0x1(%esi),%bl # Fetch Mod R/M byte + testb $0x10,%bl # Read CR2 or CR3? + jnz v86mov.1 # Yes + movl %cr0,%eax # Read CR0 + testb $0x20,%bl # Read CR4 instead? + jz v86mov.2 # No + movl %cr4,%eax # Read CR4 + jmp v86mov.2 +v86mov.1: movl %cr2,%eax # Read CR2 + testb $0x08,%bl # Read CR3 instead? + jz v86mov.2 # No + movl %cr3,%eax # Read CR3 +v86mov.2: andl $0x7,%ebx # Compute offset in + shl $2,%ebx # frame of destination + neg %ebx # register + movl %eax,0x1c(%ebp,%ebx,1) # Store CR to reg incl %esi # Adjust IP /* * Return from emulating a 0x0f prefixed instruction @@ -606,41 +618,27 @@ * reads count of words from saved %cx * returns success by setting %ah to 0 */ -int15_87: pushl %eax # Save - pushl %ebx # some information - pushl %esi # onto the stack. - pushl %edi - xorl %eax,%eax # clean EAX - xorl %ebx,%ebx # clean EBX - movl 0x4(%ebp),%esi # Get user's ESI - movl 0x3C(%ebp),%ebx # store ES - movw %si,%ax # store SI - shll $0x4,%ebx # Make it a seg. - addl %eax,%ebx # ebx=(es<<4)+si - movb 0x14(%ebx),%al # Grab the - movb 0x17(%ebx),%ah # necessary - shll $0x10,%eax # information - movw 0x12(%ebx),%ax # from - movl %eax,%esi # the - movb 0x1c(%ebx),%al # GDT in order to - movb 0x1f(%ebx),%ah # have %esi offset - shll $0x10,%eax # of source and %edi - movw 0x1a(%ebx),%ax # of destination. - movl %eax,%edi +int15_87: pushl %esi # Save + pushl %edi # registers + movzwl 0x4(%ebp),%eax # Load user's SI + movl 0x3C(%ebp),%edi # Load ES + leal (%eax,%edi,4),%edi # EDI = (ES << 4) + SI + movl 0x11(%edi),%eax # Read base of + movb 0x17(%edi),%al # GDT entry + ror $8,%eax # for source + xchgl %eax,%esi # into %esi + movl 0x19(%edi),%eax # Read base of + movb 0x1f(%edi),%al # GDT entry for + ror $8,%eax # destination + xchgl %eax,%edi # into %edi pushl %ds # Make: popl %es # es = ds - pushl %ecx # stash ECX - xorl %ecx,%ecx # highw of ECX is clear - movw 0x18(%ebp),%cx # Get user's ECX - shll $0x1,%ecx # Convert from num words to num - # bytes + movzwl 0x18(%ebp),%ecx # Get user's CX + shll $0x1,%ecx # Convert count from words rep # repeat... movsb # perform copy. - popl %ecx # Restore - popl %edi - popl %esi # previous - popl %ebx # register - popl %eax # values. + popl %edi # Restore + popl %esi # registers movb $0x0,0x1d(%ebp) # set ah = 0 to indicate # success andb $0xfe,%dl # clear CF @@ -659,23 +657,16 @@ cmpb $0x19,%al # is it int 19? je reboot # yes, reboot the machine cmpb $0x15,%al # is it int 15? - jne v86intn.3 # no, skip parse - pushl %eax # stash EAX - movl 0x1c(%ebp),%eax # user's saved EAX - cmpb $0x87,%ah # is it the memcpy subfunction? - jne v86intn.1 # no, keep checking - popl %eax # get the stack straight - jmp int15_87 # it's our cue -v86intn.1: cmpw $0x4f53,%ax # is it the delete key callout? - jne v86intn.2 # no, handle the int normally - movb BDA_KEYFLAGS,%al # get the shift key state - andb $0xc,%al # mask off just Ctrl and Alt - cmpb $0xc,%al # are both Ctrl and Alt down? - jne v86intn.2 # no, handle the int normally - popl %eax # restore EAX - jmp reboot # reboot the machine -v86intn.2: popl %eax # restore EAX -v86intn.3: subl %edi,%esi # From + jne v86intn.1 # no, skip parse + cmpb $0x87,0x1d(%ebp) # is it the memcpy subfunction? + je int15_87 # yes + cmpw $0x4f53,0x1c(%ebp) # is it the delete key callout? + jne v86intn.1 # no, handle the int normally + movb BDA_KEYFLAGS,%ch # get the shift key state + andb $0xc,%ch # mask off just Ctrl and Alt + cmpb $0xc,%ch # are both Ctrl and Alt down? + je reboot # yes, reboot the machine +v86intn.1: subl %edi,%esi # From shrl $0x4,%edi # linear movw %dx,-0x2(%ebx) # Save flags movw %di,-0x4(%ebx) # Save CS @@ -907,8 +898,7 @@ dump.3: lodsl # Set offset xchgl %eax,%edx # Save lodsl # Get segment - shll $0x4,%eax # * 0x10 - addl %edx,%eax # + offset + leal (%edx,%eax,4),%eax # * 0x10 + offset xchgl %eax,%esi # Set pointer dump.4: movb $2,%dl # Num lines dump.4a: movb $0x10,%cl # Bytes to dump ==== //depot/projects/newisp/boot/i386/libi386/biospci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.5 2004/10/22 14:56:23 simokawa Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.6 2006/09/29 20:27:41 ru Exp $"); /* * PnP enumerator using the PCI BIOS. @@ -36,6 +36,7 @@ #include #include #include +#include "libi386.h" /* * Stupid PCI BIOS interface doesn't let you simply enumerate everything ==== //depot/projects/newisp/boot/i386/libi386/biossmap.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.4 2005/12/19 09:00:11 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.6 2006/09/29 20:07:16 jhb Exp $"); /* * Obtain memory configuration information from the BIOS @@ -95,6 +95,7 @@ break; } while (v86.ebx != 0 && smaplen < n); } + void bios_addsmapdata(struct preloaded_file *kfp) { @@ -105,3 +106,18 @@ len = smaplen * sizeof(*smapbase); file_addmetadata(kfp, MODINFOMD_SMAP, len, smapbase); } + +COMMAND_SET(smap, "smap", "show BIOS SMAP", command_smap); + +static int +command_smap(int argc, char *argv[]) +{ + int i; + + if (smapbase == 0 || smaplen == 0) + return (CMD_ERROR); + for (i = 0; i < smaplen; i++) + printf("SMAP type=%02x base=%016llx len=%016llx\n", + smapbase[i].type, smapbase[i].base, smapbase[i].length); + return (CMD_OK); +} ==== //depot/projects/newisp/boot/i386/libi386/bootinfo64.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.36 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.37 2006/09/29 20:27:41 ru Exp $"); #include #include @@ -143,9 +143,7 @@ u_int64_t envp; vm_offset_t size; char *rootdevname; - int i, howto; - char *kernelname; - const char *kernelpath; + int howto; howto = bi_getboothowto(args); ==== //depot/projects/newisp/boot/i386/libi386/elf64_freebsd.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/elf64_freebsd.c,v 1.15 2004/08/29 00:48:41 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/elf64_freebsd.c,v 1.16 2006/09/29 20:27:41 ru Exp $"); #define __ELF_WORD_SIZE 64 #include @@ -61,7 +61,7 @@ u_int32_t entry_hi; u_int32_t entry_lo; -extern amd64_tramp(); +extern void amd64_tramp(); /* * There is an a.out kernel and one or more a.out modules loaded. ==== //depot/projects/newisp/boot/i386/libi386/libi386.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.25 2006/04/11 20:11:30 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.26 2006/09/29 20:27:41 ru Exp $ */ @@ -96,8 +96,8 @@ /* when heap is at the top of extended memory */ /* for other cases - just the same as memtop */ -int biospci_find_devclass(uint32_t class, int index); -int biospci_write_config(uint32_t locator, int offset, int width, int val); +int biospci_find_devclass(uint32_t class, int index, uint32_t *locator); +int biospci_write_config(uint32_t locator, int offset, int width, uint32_t val); int biospci_read_config(uint32_t locator, int offset, int width, uint32_t *val); void biosacpi_detect(void); ==== //depot/projects/newisp/boot/i386/loader/help.i386#2 (text+ko) ==== @@ -54,3 +54,10 @@ forced by setting this variable. ################################################################################ +# Tsmap DDisplay BIOS SMAP table + + smap + + Displays the BIOS SMAP (system memory map) table. + +################################################################################ ==== //depot/projects/newisp/cam/cam_periph.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.62 2006/05/24 15:22:21 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.63 2006/10/01 20:23:50 mjacob Exp $"); #include #include @@ -86,6 +86,14 @@ MALLOC_DEFINE(M_CAMPERIPH, "CAM periph", "CAM peripheral buffers"); +static int periph_selto_delay = 1000; +TUNABLE_INT("kern.cam.periph_selto_delay", &periph_selto_delay); +static int periph_noresrc_delay = 500; +TUNABLE_INT("kern.cam.periph_noresrc_delay", &periph_noresrc_delay); +static int periph_busy_delay = 500; +TUNABLE_INT("kern.cam.periph_busy_delay", &periph_busy_delay); + + void periphdriver_register(void *data) { @@ -1544,7 +1552,7 @@ int error, printed = 0; int openings; u_int32_t relsim_flags; - u_int32_t timeout; + u_int32_t timeout = 0; action_string = NULL; status = ccb->ccb_h.status; @@ -1636,11 +1644,11 @@ } /* - * Wait a second to give the device + * Wait a bit to give the device * time to recover before we try again. */ relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT; - timeout = 1000; + timeout = periph_selto_delay; break; } } @@ -1699,8 +1707,16 @@ } break; case CAM_RESRC_UNAVAIL: + /* Wait a bit for the resource shortage to abate. */ + timeout = periph_noresrc_delay; + /* FALLTHROUGH */ case CAM_BUSY: - /* timeout??? */ + if (timeout == 0) { + /* Wait a bit for the busy condition to abate. */ + timeout = periph_busy_delay; + } + relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT; + /* FALLTHROUGH */ default: /* decrement the number of retries */ if (ccb->ccb_h.retry_count > 0) { ==== //depot/projects/newisp/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ==== @@ -25,13 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.59 2006/09/22 15:04:28 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.60 2006/10/02 12:59:55 phk Exp $"); #include "opt_compat.h" #include #include #include +#include #include #include #include ==== //depot/projects/newisp/compat/freebsd32/freebsd32_proto.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.66 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.67 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/newisp/compat/freebsd32/freebsd32_syscall.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.64 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.65 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/newisp/compat/freebsd32/freebsd32_syscalls.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.55 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.56 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/newisp/compat/freebsd32/freebsd32_sysent.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.65 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.66 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ #include "opt_compat.h" ==== //depot/projects/newisp/compat/freebsd32/syscalls.master#7 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -141,7 +141,7 @@ 61 AUE_CHROOT NOPROTO { int chroot(char *path); } 62 AUE_FSTAT OBSOL ofstat 63 AUE_NULL OBSOL ogetkerninfo -64 AUE_GETPAGESIZE OBSOL ogetpagesize +64 AUE_NULL OBSOL ogetpagesize ; XXX implement (not OBSOL at all) 65 AUE_MSYNC NOPROTO { int msync(void *addr, size_t len, \ int flags); } ==== //depot/projects/newisp/conf/NOTES#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1383 2006/09/26 12:36:33 ru Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1385 2006/10/01 14:56:10 ariff Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1923,7 +1923,6 @@ # since this is unsupported at the moment...). # # snd_ad1816: Analog Devices AD1816 ISA PnP/non-PnP. -# snd_ak452x: Asahi Kasei AK452x codec, needed by snd_envy24. # snd_als4000: Avance Logic ALS4000 PCI. # snd_atiixp: ATI IXP 200/300/400 PCI. # snd_au88x0 Aureal Vortex 1/2/Advantage PCI. This driver @@ -1937,12 +1936,15 @@ # snd_ds1: Yamaha DS-1 PCI. # snd_emu10k1: Creative EMU10K1 PCI and EMU10K2 (Audigy) PCI. # snd_emu10kx: Creative SoundBlaster Live! and Audigy -# snd_envy24: VIA Envy24 and compatible, needs snd_ak452x. +# snd_envy24: VIA Envy24 and compatible, needs snd_spicds. +# snd_envy24ht: VIA Envy24HT and compatible, needs snd_spicds. # snd_es137x: Ensoniq AudioPCI ES137x PCI. # snd_ess: Ensoniq ESS ISA PnP/non-PnP, to be used in # conjunction with snd_sbc. # snd_fm801: Forte Media FM801 PCI. # snd_gusc: Gravis UltraSound ISA PnP/non-PnP. +# snd_hda: Intel High Definition Audio (Controller) and +# compatible. # snd_ich: Intel ICH PCI and some more audio controllers # embedded in a chipset, for example nVidia # nForce controllers. @@ -1956,6 +1958,7 @@ # conjunction with snd_sbc. # snd_sbc: Creative SoundBlaster ISA PnP/non-PnP. # Supports ESS and Avance ISA chips as well. +# snd_spicds: SPI codec driver, needed by Envy24/Envy24HT drivers. # snd_solo: ESS Solo-1x PCI. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 4 05:23: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 C2C9516A4F4; Wed, 4 Oct 2006 05:23:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 716FC16A4F1 for ; Wed, 4 Oct 2006 05:23:23 +0000 (UTC) (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 17CD443D58 for ; Wed, 4 Oct 2006 05:23:20 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k945NJuO033621 for ; Wed, 4 Oct 2006 05:23:19 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k945NJpR033617 for perforce@freebsd.org; Wed, 4 Oct 2006 05:23:19 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Oct 2006 05:23:19 GMT Message-Id: <200610040523.k945NJpR033617@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 107238 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 05:23:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=107238 Change 107238 by imp@imp_lighthouse on 2006/10/04 05:22:50 Keep track of the last selected card and short-circuit any attempt to select the card again. Also, never deselect the card unless the bus code wants the mmc bus. This should save two command round trips per I/O. Since we're doing 8k transfers, this saves us 2 of the 34 commands. Not a lot, but every little bit helps. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#21 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmc.c#21 (text+ko) ==== @@ -46,6 +46,7 @@ struct mtx sc_mtx; struct intr_config_hook config_intrhook; device_t owner; + uint32_t last_rca; }; /* @@ -124,6 +125,7 @@ { struct mmc_softc *sc; int err; + int rca; err = MMCBR_ACQUIRE_HOST(device_get_parent(busdev), dev); if (err) @@ -136,12 +138,26 @@ MMC_UNLOCK(sc); if (busdev != dev) { - // XXX Should do lazy selection. - mmc_wait_for_command(sc, MMC_SELECT_CARD, - mmc_get_rca(dev) << 16, MMC_RSP_R1 | MMC_CMD_AC, - NULL, CMD_RETRIES); + // Keep track of the last rca that we've selected. If + // we're asked to do it again, don't. We never unselect + // unless the bus code itself wants the mmc bus. + rca = mmc_get_rca(dev); + if (sc->last_rca != rca) { + mmc_wait_for_command(sc, MMC_SELECT_CARD, rca << 16, + MMC_RSP_R1 | MMC_CMD_AC, NULL, CMD_RETRIES); + sc->last_rca = rca; + } + // XXX should set bus width here? + } else { + // If there's a card selected, stand down. + if (sc->last_rca != 0) { + mmc_wait_for_command(sc, MMC_SELECT_CARD, 0, + MMC_RSP_R1 | MMC_CMD_AC, NULL, CMD_RETRIES); + sc->last_rca = 0; + } // XXX should set bus width here? } + return (0); } @@ -153,11 +169,6 @@ sc = device_get_softc(busdev); - if (busdev != dev) { - // XXX Should do lazy deselection. - mmc_wait_for_command(sc, MMC_DESELECT_CARD, 0, - MMC_RSP_R1 | MMC_CMD_AC, NULL, CMD_RETRIES); - } MMC_LOCK(sc); if (!sc->owner) panic("mmc: releasing unowned bus."); From owner-p4-projects@FreeBSD.ORG Wed Oct 4 05:37: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 EDED416A492; Wed, 4 Oct 2006 05:37:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C027A16A47C for ; Wed, 4 Oct 2006 05:37:38 +0000 (UTC) (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 47A0943D58 for ; Wed, 4 Oct 2006 05:37:38 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k945bcXb037727 for ; Wed, 4 Oct 2006 05:37:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k945bbuU037724 for perforce@freebsd.org; Wed, 4 Oct 2006 05:37:37 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Oct 2006 05:37:37 GMT Message-Id: <200610040537.k945bbuU037724@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 107239 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 05:37:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=107239 Change 107239 by imp@imp_lighthouse on 2006/10/04 05:36:42 Don't need a stop command for the simple case of reading a single block. This reduces the number of round trips (commands) by 16 for a 8k transfer. We're down from 34 to 16, or a 53% savings. Multi-block will be the next big win, where we can go all the way down to 2 (start multi-block ... stop at the end). Since we went from 200kB/s to 220kB/s when I doubled the transfer speed, this tells me that 80% of the time isn't affected by the transfer. I hope that the 53% savings will cut the 80% down to 40% which should result in bootsting the speed to something like 400kB/s. We'll see tomorrow if this actually is the case or not. This is a 4 to 1 overhead still. And it is 10x slower than the max transfer rate based solely on clock speed (3.75MB/s). This large factor makes me think that some part of this analysis is flawed. It can't be too fast to do the byte-swapping after the transfers either. 4 bit bus will also help, once I've implemented it, but so long as the non-data portion of the transfers dominates so much, it does little good for the overall numbers. I might be able to get it up to 500k/s by enabling 4-bit bus. This is still well short of the 15MB/s that the clock rate suggests these cards top out at. I'd imagine that multi-block would be a big win... Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#9 (text+ko) ==== @@ -173,7 +173,7 @@ memset(&stop, 0, sizeof(stop)); req.cmd = &cmd; cmd.data = &data; - req.stop = &stop; +// req.stop = &stop; if (bp->bio_cmd == BIO_READ) cmd.opcode = MMC_READ_SINGLE_BLOCK; else @@ -189,9 +189,9 @@ data.flags = MMC_DATA_READ; else data.flags = MMC_DATA_WRITE; - stop.opcode = MMC_STOP_TRANSMISSION; - stop.arg = 0; - stop.flags = MMC_RSP_R1B | MMC_CMD_AC; +// stop.opcode = MMC_STOP_TRANSMISSION; +// stop.arg = 0; +// stop.flags = MMC_RSP_R1B | MMC_CMD_AC; MMCBUS_WAIT_FOR_REQUEST(device_get_parent(dev), dev, &req); // XXX error handling From owner-p4-projects@FreeBSD.ORG Wed Oct 4 09:44: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 E5C3916A47B; Wed, 4 Oct 2006 09:44:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C239616A412 for ; Wed, 4 Oct 2006 09:44:48 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8509143D55 for ; Wed, 4 Oct 2006 09:44:48 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k949imfS025642 for ; Wed, 4 Oct 2006 09:44:48 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k949im26025639 for perforce@freebsd.org; Wed, 4 Oct 2006 09:44:48 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 4 Oct 2006 09:44:48 GMT Message-Id: <200610040944.k949im26025639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 107244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 09:44:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=107244 Change 107244 by gonzo@gonzo_hq on 2006/10/04 09:44:18 o Rename KSEG2 to KSSEG. o Add KSEG3 bounds to defines. o Move KVA from wrongly chosen KSSEG to KSEG3. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/cpuregs.h#9 edit .. //depot/projects/mips2/src/sys/mips/include/vmparam.h#7 edit .. //depot/projects/mips2/src/sys/mips/mips/tlb.c#10 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/cpuregs.h#9 (text+ko) ==== @@ -81,8 +81,10 @@ #define MIPS_KSEG0_END 0x9fffffff #define MIPS_KSEG1_START 0xa0000000 #define MIPS_KSEG1_END 0xbfffffff -#define MIPS_KSEG2_START 0xc0000000 -#define MIPS_KSEG2_END 0xffffffff +#define MIPS_KSSEG_START 0xc0000000 +#define MIPS_KSSEG_END 0xdfffffff +#define MIPS_KSEG3_START 0xe0000000 +#define MIPS_KSEG3_END 0xffffffff #define MIPS_MAX_MEM_ADDR 0xbe000000 #define MIPS_RESERVED_ADDR 0xbfc80000 ==== //depot/projects/mips2/src/sys/mips/include/vmparam.h#7 (text+ko) ==== @@ -106,8 +106,8 @@ #define VM_MIN_ADDRESS ((vm_offset_t)0x0000000000010000) #define VM_MAXUSER_ADDRESS ((vm_offset_t)MIPS_KSEG0_START-1) #define VM_MAX_ADDRESS ((vm_offset_t)0x0000000100000000) -#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)MIPS_KSEG2_START) -#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)MIPS_KSEG2_END) +#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)MIPS_KSEG3_START) +#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)MIPS_KSEG3_END) #define KERNBASE (VM_MIN_KERNEL_ADDRESS) /* virtual sizes (bytes) for various kernel submaps */ ==== //depot/projects/mips2/src/sys/mips/mips/tlb.c#10 (text+ko) ==== @@ -218,7 +218,7 @@ u_long ehi; /* Bogus VPN2. */ - ehi = MIPS_KSEG2_START + 0x0fff0000 + 2 * i * PAGE_SIZE; + ehi = MIPS_KSEG3_START + 0x0fff0000 + 2 * i * PAGE_SIZE; mips_wr_index(i); mips_wr_entrylo0(0); mips_wr_entrylo1(0); From owner-p4-projects@FreeBSD.ORG Wed Oct 4 12:10: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 4372B16A412; Wed, 4 Oct 2006 12:10:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 00E0716A4C2 for ; Wed, 4 Oct 2006 12:10:10 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4354A43DA3 for ; Wed, 4 Oct 2006 12:09:04 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k94C94Nl089381 for ; Wed, 4 Oct 2006 12:09:04 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k94C8qsL089374 for perforce@freebsd.org; Wed, 4 Oct 2006 12:08:52 GMT (envelope-from piso@freebsd.org) Date: Wed, 4 Oct 2006 12:08:52 GMT Message-Id: <200610041208.k94C8qsL089374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 107250 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 12:10:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=107250 Change 107250 by piso@piso_newluxor on 2006/10/04 12:08:16 IFC@107247 Affected files ... .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#8 integrate .. //depot/projects/soc2005/libalias/UPDATING#9 integrate .. //depot/projects/soc2005/libalias/contrib/libstdc++/include/ext/demangle.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssh/CREDITS#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/INSTALL#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/LICENCE#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/OVERVIEW#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/README#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/README.platform#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/README.tun#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/acss.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/atomicio.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/atomicio.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/audit-bsm.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/audit.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/audit.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth-bsdauth.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth-chall.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth-krb5.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth-options.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth-options.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth-passwd.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth-rh-rsa.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth-rhosts.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth-rsa.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth-shadow.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth-sia.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth-skey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth1.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth2-chall.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth2-gss.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth2-hostbased.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth2-kbdint.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth2-none.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth2-passwd.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth2-pubkey.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/auth2.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/authfd.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/authfd.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/authfile.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/authfile.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/bufaux.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/bufaux.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/bufbn.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/buffer.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/buffer.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/buildpkg.sh.in#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/canohost.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/canohost.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/channels.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/channels.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/cipher-3des1.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/cipher-acss.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/cipher-aes.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/cipher-bf1.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/cipher-ctr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/cipher.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/cipher.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/cleanup.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/clientloop.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/clientloop.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/compat.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/compat.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/compress.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/compress.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/config.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/configure.ac#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/crc32.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/crc32.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/deattack.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/deattack.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/defines.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/dh.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/dh.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/dispatch.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/dispatch.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/dns.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/dns.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/entropy.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/fatal.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/getput.h#2 delete .. //depot/projects/soc2005/libalias/crypto/openssh/groupaccess.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/groupaccess.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/gss-genr.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/gss-serv-krb5.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/gss-serv.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/hostfile.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/hostfile.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/includes.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/kex.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/kex.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/kexdh.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/kexdhc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/kexgex.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/kexgexc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/key.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/key.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/log.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/log.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/loginrec.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/logintest.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/mac.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/mac.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/match.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/match.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/md-sha256.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/md5crypt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/misc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/misc.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/moduli.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/monitor.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/monitor.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/monitor_fdpass.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/monitor_fdpass.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/monitor_mm.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/monitor_wrap.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/monitor_wrap.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/msg.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/msg.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/myproposal.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/nchan.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/Makefile.in#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/basename.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/bindresvport.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/bsd-arc4random.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/bsd-asprintf.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/bsd-closefrom.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/bsd-cray.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/bsd-getpeereid.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/bsd-misc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/bsd-nextstep.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/bsd-openpty.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/bsd-snprintf.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/bsd-waitpid.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/fake-rfc2553.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/fake-rfc2553.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/glob.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/glob.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/mktemp.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/openbsd-compat.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/port-aix.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/port-aix.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/port-irix.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/port-linux.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/port-linux.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/port-solaris.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/port-solaris.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/port-tun.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/port-tun.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/readpassphrase.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/regress/Makefile.in#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/regress/closefromtest.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/regress/snprintftest.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/regress/strduptest.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/regress/strtonumtest.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/rresvport.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/setproctitle.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/sha2.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/sha2.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/strtonum.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/xcrypt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openbsd-compat/xmmap.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/openssh.xml.in#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/packet.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/packet.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/platform.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/platform.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/progressmeter.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/progressmeter.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/readconf.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/readconf.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/readpass.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/regress/Makefile#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/regress/agent-getpeereid.sh#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/regress/cfgmatch.sh#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/regress/cipher-speed.sh#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/regress/forcecommand.sh#1 branch .. //depot/projects/soc2005/libalias/crypto/openssh/regress/forwarding.sh#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/rsa.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/rsa.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/scard-opensc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/scard.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/scard.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/scp.1#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/scp.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/servconf.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/servconf.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/serverloop.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/serverloop.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/session.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/session.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sftp-client.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sftp-common.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sftp-common.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sftp-glob.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sftp-server.8#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sftp-server.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sftp.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sftp.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh-add.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh-agent.1#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh-agent.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh-dss.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh-gss.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh-keygen.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh-keyscan.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh-keysign.8#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh-keysign.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh-rand-helper.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh-rsa.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh.1#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh1.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh2.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh_config#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ssh_namespace.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sshconnect.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sshconnect.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sshconnect1.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sshd.8#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sshd.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sshd_config#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sshlogin.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sshlogin.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sshpty.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sshpty.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/sshtty.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ttymodes.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/ttymodes.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/uidswap.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/uidswap.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/uuencode.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/uuencode.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/version.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/xmalloc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssh/xmalloc.h#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/CHANGES#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/Configure#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/FAQ#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/LICENSE#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/Makefile#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/Makefile.org#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/Makefile.shared#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/NEWS#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/README#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/CA.pl#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/dsa.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/enc.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/gendsa.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/genrsa.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/openssl.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/pkcs12.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/progs.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/progs.pl#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/rsa.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/smime.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/apps/speed.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/config#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/Makefile#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/aes.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/aes_core.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/aes_ige.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/aes/asm/aes-586.pl#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/tasn_dec.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/asn1/x_req.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_mont.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/bn/bn_prime.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/Makefile#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/camellia.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/camellia.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/cmll_cbc.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/cmll_cfb.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/cmll_ctr.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/cmll_ecb.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/cmll_locl.h#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/cmll_misc.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/camellia/cmll_ofb.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dh/dh.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dh/dh_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dh/dh_key.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/dsa/dsa_ossl.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_asn1.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/ec/ec_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/err/err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/Makefile#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/c_allc.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/e_camellia.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evp_test.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/evp/evptests.txt#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_dat.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_mac.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/obj_mac.num#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/objects/objects.txt#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/opensslconf.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/opensslv.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs12/p12_mutl.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/pkcs7/pk7_smime.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rand/rand_unix.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_eay.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_err.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/crypto/rsa/rsa_sign.c#4 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/ciphers.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/apps/smime.pod#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/doc/standards.txt#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/openssl.spec#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/d1_pkt.c#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s2_clnt.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s2_lib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/s3_srvr.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_algs.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_cert.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_ciph.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_lib.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/ssl_locl.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/t1_enc.c#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/ssl/tls1.h#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/Makefile#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/evptests.txt#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/test/igetest.c#1 branch .. //depot/projects/soc2005/libalias/crypto/openssl/tools/c_rehash#2 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/libeay.num#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/mk1mf.pl#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/mkdef.pl#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/mkfiles.pl#3 integrate .. //depot/projects/soc2005/libalias/crypto/openssl/util/pl/Mingw32.pl#3 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.local.dist#3 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.usr.dist#5 integrate .. //depot/projects/soc2005/libalias/etc/network.subr#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/dhclient#4 integrate .. //depot/projects/soc2005/libalias/etc/rc.subr#4 integrate .. //depot/projects/soc2005/libalias/gnu/lib/libstdc++/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/Makefile#4 integrate .. //depot/projects/soc2005/libalias/lib/Makefile#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_extract.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/posix1e/mac_is_present.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/a64l.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/posix_memalign.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/strtonum.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/abort2.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libutil/kld.3#3 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate .. //depot/projects/soc2005/libalias/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/concat/geom_concat.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/eli/geom_eli.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/label/geom_label.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/mirror/geom_mirror.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/nop/geom_nop.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/raid3/geom_raid3.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/shsec/geom_shsec.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/stripe/geom_stripe.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/core/geom.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/core/geom.h#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/misc/subr.h#2 integrate .. //depot/projects/soc2005/libalias/sbin/gvinum/gvinum.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/soc2005/libalias/sbin/mca/mca.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/mdmfs/mdmfs.8#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/Makefile#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/Makefile.inc#5 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/Makefile.man#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ASN1_STRING_length.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ASN1_STRING_new.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ASN1_generate_nconf.3#2 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_ctrl.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_f_base64.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_f_buffer.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_f_cipher.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_f_md.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_f_null.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_f_ssl.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_find_type.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_new.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_push.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_read.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_s_accept.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_s_bio.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_s_connect.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_s_fd.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_s_file.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_s_mem.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_s_null.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_s_socket.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_set_callback.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BIO_should_retry.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_BLINDING_new.3#2 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_CTX_new.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_CTX_start.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_add.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_add_word.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_bn2bin.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_cmp.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_copy.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_generate_prime.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_mod_inverse.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_new.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_num_bytes.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_rand.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_set_bit.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_swap.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/BN_zero.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/CONF_modules_free.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/CONF_modules_load_file.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DH_generate_key.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DH_generate_parameters.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DH_get_ex_new_index.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DH_new.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DH_set_method.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DH_size.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DSA_SIG_new.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DSA_do_sign.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DSA_dup_DH.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DSA_generate_key.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DSA_generate_parameters.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DSA_new.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DSA_set_method.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DSA_sign.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/DSA_size.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ERR_GET_LIB.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ERR_clear_error.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ERR_error_string.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ERR_get_error.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ERR_load_strings.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ERR_print_errors.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ERR_put_error.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ERR_remove_state.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ERR_set_mark.3#2 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/EVP_BytesToKey.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/EVP_DigestInit.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/EVP_EncryptInit.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/EVP_OpenInit.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/EVP_PKEY_new.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/EVP_SealInit.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/EVP_SignInit.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/EVP_VerifyInit.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/OBJ_nid2obj.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/OPENSSL_Applink.3#2 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/OPENSSL_config.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/OPENSSL_ia32cap.3#2 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/PKCS12_create.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/PKCS12_parse.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/PKCS7_decrypt.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/PKCS7_encrypt.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/PKCS7_sign.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/PKCS7_verify.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RAND_add.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RAND_bytes.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RAND_cleanup.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RAND_egd.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RAND_load_file.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RAND_set_rand_method.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RSA_blinding_on.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RSA_check_key.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RSA_generate_key.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RSA_new.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RSA_print.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RSA_private_encrypt.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RSA_public_encrypt.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RSA_set_method.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RSA_sign.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/RSA_size.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/X509_NAME_print_ex.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/X509_new.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/bio.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/blowfish.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/bn.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/bn_internal.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/buffer.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/crypto.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/d2i_DHparams.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/d2i_X509.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/d2i_X509_CRL.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/d2i_X509_NAME.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/d2i_X509_REQ.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/d2i_X509_SIG.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/des.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/dh.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/dsa.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ecdsa.3#2 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/engine.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/err.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/evp.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/hmac.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/lh_stats.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/lhash.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/md5.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/mdc2.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/pem.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/rand.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/rc4.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ripemd.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/rsa.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/sha.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/threads.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ui.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/ui_compat.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/man/x509.3#2 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/opensslconf-amd64.h#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/opensslconf-arm.h#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/opensslconf-i386.h#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/opensslconf-ia64.h#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/opensslconf-powerpc.h#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libcrypto/opensslconf-sparc64.h#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssh/Makefile#2 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/Makefile.man#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CIPHER_get_name.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_COMP_add_compression_method.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_add_session.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_ctrl.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_flush_sessions.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_free.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_new.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_sess_number.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_sessions.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_cert_store.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_info_callback.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_mode.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_options.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_timeout.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_set_verify.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_CTX_use_certificate.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_SESSION_free.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_SESSION_get_time.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_accept.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_alert_type_string.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_clear.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_connect.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_do_handshake.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_free.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_SSL_CTX.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_ciphers.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_client_CA_list.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_current_cipher.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_default_timeout.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_error.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_ex_new_index.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_fd.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_peer_cert_chain.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_peer_certificate.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_rbio.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_session.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_verify_result.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_get_version.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_library_init.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_load_client_CA_file.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_new.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_pending.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_read.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_rstate_string.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_session_reused.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_set_bio.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_set_connect_state.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_set_fd.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_set_session.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_set_shutdown.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_set_verify_result.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_shutdown.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_state_string.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_want.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/SSL_write.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/d2i_SSL_SESSION.3#3 integrate .. //depot/projects/soc2005/libalias/secure/lib/libssl/man/ssl.3#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/Makefile.man#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/CA.pl.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/asn1parse.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/ca.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/ciphers.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/crl.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/crl2pkcs7.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/dgst.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/dhparam.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/dsa.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/dsaparam.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/ec.1#2 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/ecparam.1#2 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/enc.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/errstr.1#2 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/gendsa.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/genrsa.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/nseq.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/ocsp.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/openssl.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/passwd.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/pkcs12.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/pkcs7.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/pkcs8.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/rand.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/req.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/rsa.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/rsautl.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/s_client.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/s_server.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/s_time.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/sess_id.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/smime.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/speed.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/spkac.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/verify.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/version.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/x509.1#3 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/openssl/man/x509v3_config.1#2 integrate .. //depot/projects/soc2005/libalias/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/colldef/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/Makefile#3 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_attr.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_attr_get_np.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_attr_setcreatesuspend_np.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_cancel.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_cleanup_pop.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_cleanup_push.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_cond_broadcast.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_cond_destroy.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_cond_init.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_cond_signal.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_condattr.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_create.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_detach.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_equal.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_exit.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_getconcurrency.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_getspecific.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_join.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_key_create.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_key_delete.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_kill.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_main_np.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_multi_np.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_mutex_destroy.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_mutex_init.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_mutex_lock.3#3 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_mutex_trylock.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_mutex_unlock.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_mutexattr.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_once.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_resume_all_np.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_resume_np.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_rwlock_destroy.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_rwlock_init.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_rwlock_rdlock.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_rwlock_unlock.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_schedparam.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_self.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_set_name_np.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_setspecific.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_sigmask.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_suspend_all_np.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_suspend_np.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_switch_add_np.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/pthread_testcancel.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man3/siginfo.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/Makefile#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/acpi_dock.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/amdsmb.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/audit.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/auditpipe.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/bce.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ddb.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/enc.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/geom_fox.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ipmi.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/le.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/padlock.4#4 integrate .. //depot/projects/soc2005/libalias/share/man/man4/mfi.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/mxge.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/nfe.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/nfsmb.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ng_tag.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/pcm.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/rr232x.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/sched_core.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/sched_ule.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/snd_emu10kx.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/snd_envy24.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/snd_envy24ht.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/snd_hda.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/snd_spicds.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/stge.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ufoma.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/bluetooth.device.conf.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/ext2fs.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/freebsd-update.conf.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/mqueuefs.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/reiserfs.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man5/src.conf.5#4 integrate .. //depot/projects/soc2005/libalias/share/man/man7/build.7#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/Makefile#4 integrate .. //depot/projects/soc2005/libalias/share/man/man9/config_intrhook.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/device_get_sysctl.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/firmware.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/hash.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/rwlock.9#3 integrate .. //depot/projects/soc2005/libalias/share/man/man9/sysctl.9#3 integrate .. //depot/projects/soc2005/libalias/share/man/man9/zone.9#2 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.compat.mk#2 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.own.mk#3 integrate .. //depot/projects/soc2005/libalias/share/mklocale/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/monetdef/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/monetdef/mn_MN.UTF-8.src#1 branch .. //depot/projects/soc2005/libalias/share/msgdef/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/msgdef/mn_MN.UTF-8.src#1 branch .. //depot/projects/soc2005/libalias/share/numericdef/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/numericdef/mn_MN.UTF-8.src#1 branch .. //depot/projects/soc2005/libalias/share/timedef/Makefile#2 integrate .. //depot/projects/soc2005/libalias/share/timedef/mn_MN.UTF-8.src#1 branch .. //depot/projects/soc2005/libalias/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/clock.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/soc2005/libalias/sys/arm/include/clock.h#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/soc2005/libalias/sys/cam/cam_periph.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/soc2005/libalias/sys/conf/NOTES#8 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#12 integrate .. //depot/projects/soc2005/libalias/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/driver.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/ak452x.c#3 delete .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/ak452x.h#3 delete .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hda_reg.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac_private.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac_reg.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pcm/ac97_patch.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/bios/apm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_xenix.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/clock.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/isa/clock.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/include/clock.h#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/init_sysent.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_lock.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_proc.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_time.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_clock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_rtc.c#1 branch .. //depot/projects/soc2005/libalias/sys/kern/syscalls.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.master#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/systrace_args.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/tty_pty.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/soc2005/libalias/sys/modules/sound/driver/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/modules/sound/driver/ak452x/Makefile#2 delete .. //depot/projects/soc2005/libalias/sys/modules/sound/driver/envy24/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/sound/driver/envy24ht/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/sound/driver/hda/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/sound/driver/spicds/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/net/bridgestp.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/if_ether.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/nd6.c#4 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/soc2005/libalias/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/clock.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/clock.c#3 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_bsm.c#8 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_framework.h#1 branch .. //depot/projects/soc2005/libalias/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/_elf_solaris.h#1 branch .. //depot/projects/soc2005/libalias/sys/sys/buf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/clock.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/elf.h#1 branch .. //depot/projects/soc2005/libalias/sys/sys/kernel.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/lockmgr.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/mount.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/param.h#9 integrate .. //depot/projects/soc2005/libalias/sys/sys/proc.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.h#9 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.mk#9 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysproto.h#9 integrate .. //depot/projects/soc2005/libalias/sys/sys/systm.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/time.h#3 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/soc2005/libalias/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate .. //depot/projects/soc2005/libalias/tools/build/options/WITHOUT_LIBC_R#2 delete .. //depot/projects/soc2005/libalias/tools/tools/recoverdisk/recoverdisk.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/calendar.freebsd#6 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/getent/getent.1#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/cached/cached.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/cached/cached.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/cached/cached.conf.5#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/config/configvers.h#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/config/mkmakefile.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ipfwpcap/ipfwpcap.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ntp/doc/ntp-keygen.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/nvram/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/nvram/nvram.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/quot/quot.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/sade.8#3 integrate Differences ... ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.53 2006/09/29 10:39:23 bms Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.55 2006/10/01 17:48:43 ru Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20060930: demangle.h from contrib/libstdc++/include/ext/ +OLD_FILES+=usr/include/c++/3.4/ext/demangle.h # 20060929: mrouted removed OLD_FILES+=usr/sbin/map-mbone OLD_FILES+=usr/sbin/mrinfo @@ -2958,6 +2960,14 @@ OLD_LIBS+=lib/libutil.so.5 # 20060413: shared library moved to /usr/lib OLD_LIBS+=lib/libgpib.so.1 +# 20060413: libpcap.so.4 moved to /lib/ +OLD_LIBS+=usr/lib/libpcap.so.4 +# 20060412: libpthread.so.2 moved to /lib/ +.if ${TARGET_ARCH} != "sparc64" +OLD_LIBS+=usr/lib/libpthread.so.2 +.else +OLD_LIBS+=usr/lib/libthr.so.2 +.endif # 20060127: revert libdisk to static-only OLD_LIBS+=usr/lib/libdisk.so.3 # 20050722: bump for 6.0-RELEASE ==== //depot/projects/soc2005/libalias/UPDATING#9 (text+ko) ==== @@ -24,6 +24,13 @@ 20060929: mrouted and its utilities have been removed from the base system. +20060927: + Some ioctl(2) command codes have changed. Full backward ABI + compatibility is provided if the "options COMPAT_FREEBSD6" is + present in the kernel configuration file. Make sure to add + this option to your kernel config file, or recompile X.Org + and the rest of ports; otherwise they may refuse to work. + 20060924: tcpslice has been removed from the base system. @@ -624,4 +631,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.459 2006/09/29 10:39:23 bms Exp $ +$FreeBSD: src/UPDATING,v 1.460 2006/09/30 20:01:15 ru Exp $ ==== //depot/projects/soc2005/libalias/crypto/openssh/CREDITS#2 (text+ko) ==== @@ -25,6 +25,7 @@ Christos Zoulas - Autoconf fixes Chun-Chung Chen - RPM fixes Corinna Vinschen - Cygwin support +Chad Mynhier - Solaris Process Contract support Dan Brosemer - Autoconf support, build fixes Darren Hall - AIX patches Darren Tucker - AIX BFF package scripts @@ -100,5 +101,5 @@ Damien Miller -$Id: CREDITS,v 1.80 2005/08/26 20:15:20 tim Exp $ +$Id: CREDITS,v 1.81 2006/08/30 17:24:41 djm Exp $ ==== //depot/projects/soc2005/libalias/crypto/openssh/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,1672 @@ +20060926 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 4 14:30: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 3F40116A415; Wed, 4 Oct 2006 14:30:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF49016A40F for ; Wed, 4 Oct 2006 14:30:10 +0000 (UTC) (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 6F82943D76 for ; Wed, 4 Oct 2006 14:30:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k94EU3HG050843 for ; Wed, 4 Oct 2006 14:30:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k94EU2lA050840 for perforce@freebsd.org; Wed, 4 Oct 2006 14:30:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 4 Oct 2006 14:30:02 GMT Message-Id: <200610041430.k94EU2lA050840@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 107251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 14:30:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=107251 Change 107251 by rwatson@rwatson_zoo on 2006/10/04 14:29:54 Catch up with new super-user checks: there's a rather nasty race in umtx priority propagation in the event we allow privileges to be revoked, and I have e-mailed davidxu about ensuring that restore of priority is done unconditionally. Affected files ... .. //depot/projects/trustedbsd/priv/sys/kern/kern_umtx.c#4 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/kern/kern_umtx.c#4 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -1607,7 +1608,7 @@ if ((error = umtx_key_get(m, TYPE_PP_UMUTEX, GET_SHARE(flags), &uq->uq_key)) != 0) return (error); - su = (suser(td) == 0); + su = (priv_check(td, PRIV_SCHED_RTPRIO) == 0); for (;;) { old_inherited_pri = uq->uq_inherited_pri; umtxq_lock(&uq->uq_key); @@ -1728,7 +1729,7 @@ id = td->td_tid; uq = td->td_umtxq; - su = (suser(td) == 0); + su = (priv_check(td, PRIV_SCHED_RTPRIO) == 0); /* * Make sure we own this mtx. From owner-p4-projects@FreeBSD.ORG Wed Oct 4 17:29:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C1FC16A47E; Wed, 4 Oct 2006 17:29:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18E2B16A415 for ; Wed, 4 Oct 2006 17:29:36 +0000 (UTC) (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 979EB43D4C for ; Wed, 4 Oct 2006 17:29:29 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k94HTTMx017358 for ; Wed, 4 Oct 2006 17:29:29 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k94HTTbS017355 for perforce@freebsd.org; Wed, 4 Oct 2006 17:29:29 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Oct 2006 17:29:29 GMT Message-Id: <200610041729.k94HTTbS017355@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 107253 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 17:29:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=107253 Change 107253 by imp@imp_lighthouse on 2006/10/04 17:29:27 Use taskqueue_fast rather than taskqueue_swi. The former uses sleep locks, rather than spin locks, which is bad from a FAST ISR. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_tc.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_tc.c#7 (text+ko) ==== @@ -481,7 +481,7 @@ r = RD4(tc, TC_RA) & 0xffff; pps_capture(&tc->pps); tc->pps.capcount = r; - taskqueue_enqueue_fast(taskqueue_swi, &tc->task); + taskqueue_enqueue_fast(taskqueue_fast, &tc->task); } if (status & TC_SR_LDRBS) RD4(tc, TC_RB); From owner-p4-projects@FreeBSD.ORG Wed Oct 4 18:01:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0821B16A412; Wed, 4 Oct 2006 18:01:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B578016A403 for ; Wed, 4 Oct 2006 18:01:09 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F1F343D46 for ; Wed, 4 Oct 2006 18:01:09 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k94I19re026518 for ; Wed, 4 Oct 2006 18:01:09 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k94I19Iv026515 for perforce@freebsd.org; Wed, 4 Oct 2006 18:01:09 GMT (envelope-from millert@freebsd.org) Date: Wed, 4 Oct 2006 18:01:09 GMT Message-Id: <200610041801.k94I19Iv026515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 107254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 18:01:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=107254 Change 107254 by millert@millert_macbook on 2006/10/04 18:01:02 Fix logic thinko; == that should have been != Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#16 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#16 (text+ko) ==== @@ -1148,7 +1148,7 @@ element_list = &mac_static_label_element_list; element_loop: LIST_FOREACH(mle, element_list, mle_list) { - if (strcmp(element_name, mle->mle_name) == 0) + if (strcmp(element_name, mle->mle_name) != 0) continue; LIST_FOREACH(mll, &mle->mle_listeners, mll_list) { mpc = mac_policy_list.entries[mll->mll_handle].mpc; From owner-p4-projects@FreeBSD.ORG Wed Oct 4 19:52:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0C1616A47B; Wed, 4 Oct 2006 19:52:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B346416A40F for ; Wed, 4 Oct 2006 19:52:36 +0000 (UTC) (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 A9E3843D6E for ; Wed, 4 Oct 2006 19:52:32 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k94JqWrk067643 for ; Wed, 4 Oct 2006 19:52:32 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k94JqVZ7067637 for perforce@freebsd.org; Wed, 4 Oct 2006 19:52:31 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 4 Oct 2006 19:52:31 GMT Message-Id: <200610041952.k94JqVZ7067637@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 107258 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 19:52:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=107258 Change 107258 by kmacy@kmacy_storage:sun4v_work_stable on 2006/10/04 19:52:04 IFC Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/config.h#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshd.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/network.subr#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/dhclient#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.subr#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/archive_read_extract.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/ddb.4#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/Makefile#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/zone.9#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ohci.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/init_sysent.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_resource.c#4 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/syscalls.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/syscalls.master#7 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/systrace_args.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/_elf_solaris.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/elf.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/mount.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/syscall.h#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/syscall.mk#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/sysproto.h#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/time.h#3 integrate Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/FREEBSD-upgrade#2 (text+ko) ==== @@ -42,20 +42,28 @@ 7) Run configure with the appropriate arguments: $ ./configure --prefix=/usr --sysconfdir=/etc/ssh \ - --with-pam --with-tcp-wrappers --with-libedit + --with-pam --with-tcp-wrappers --with-libedit \ + --with-ssl-engine + + This will regenerate config.h, which must be committed along with + the rest. Note that we don't want to configure OpenSSH for Kerberos using configure since we have to be able to turn it on or off depending on the value of MK_KERBEROS. Our Makefiles take care of this. -8) Commit the resulting config.h. Make sure you don't accidentally - commit any other files created by autoconf, autoheader or - configure; they'll just clutter up the repo and cause trouble at - the next upgrade. +8) If source files have been added or removed, update the appropriate + makefiles to reflect changes in the vendor's Makefile.in. + +9) Build libssh. Follow the instructions in ssh_namespace.h to get a + list of new symbols. Update ssh_namespace.h, build everything, + install and test. -9) Build and test. +A) Build and test the pam_ssh PAM module. It gropes around libssh's + internals and will break if something significant changes or if + ssh_namespace.h is out of whack. -A) Re-commit everything on freefall (you *did* use a test repo for +B) Re-commit everything on repoman (you *did* use a test repo for this, didn't you?) @@ -126,4 +134,4 @@ -- des@FreeBSD.org -$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.11 2006/03/17 18:54:20 ru Exp $ +$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.12 2006/10/02 12:39:28 des Exp $ ==== //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/config.h#4 (text+ko) ==== @@ -458,7 +458,7 @@ #define HAVE_INT64_T 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_INTTYPES_H */ +#define HAVE_INTTYPES_H 1 /* define if you have intxx_t data type */ #define HAVE_INTXX_T 1 @@ -548,7 +548,7 @@ #define HAVE_MEMMOVE 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_MEMORY_H */ +#define HAVE_MEMORY_H 1 /* Define to 1 if you have the `mkdtemp' function. */ #define HAVE_MKDTEMP 1 @@ -780,7 +780,7 @@ #define HAVE_STDINT_H 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_STDLIB_H */ +#define HAVE_STDLIB_H 1 /* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 @@ -915,7 +915,7 @@ #define HAVE_SYS_TIME_H 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TYPES_H */ +#define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_UN_H 1 @@ -1243,7 +1243,7 @@ /* #undef SSH_TUN_PREPEND_AF */ /* Define to 1 if you have the ANSI C header files. */ -/* #undef STDC_HEADERS */ +#define STDC_HEADERS 1 /* Define if you want a different $PATH for the superuser */ /* #undef SUPERUSER_PATH */ ==== //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshd.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.43 2006/09/30 13:38:05 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.44 2006/10/03 11:33:25 des Exp $"); #include #include @@ -83,7 +83,9 @@ #ifdef __FreeBSD__ #include -#ifdef GSSAPI +#if defined(GSSAPI) && defined(HAVE_GSSAPI_H) +#include +#elif defined(GSSAPI) && defined(HAVE_GSSAPI_GSSAPI_H) #include #endif #endif ==== //depot/projects/kmacy_sun4v_stable/src/etc/network.subr#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/etc/network.subr,v 1.173 2006/09/21 01:44:52 brooks Exp $ +# $FreeBSD: src/etc/network.subr,v 1.174 2006/10/02 10:13:29 gnn Exp $ # # @@ -41,6 +41,10 @@ { _cfg=1 + if checkyesno ipv6_enable; then + ${SYSCTL_W} net.inet6.ip6.auto_linklocal=1 + fi + ifconfig_args=`ifconfig_getargs $1` if [ -n "${ifconfig_args}" ]; then ifconfig $1 up ==== //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/dhclient#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.24 2006/08/17 19:57:10 brian Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.25 2006/10/02 18:50:58 brooks Exp $ # # PROVIDE: dhclient @@ -53,6 +53,7 @@ ifn="$2" load_rc_config $name +load_rc_config network if ! dhcpif $ifn; then return 1 ==== //depot/projects/kmacy_sun4v_stable/src/etc/rc.subr#5 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.66 2006/04/01 10:05:50 he Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.68 2006/08/22 11:17:28 flz Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.69 2006/10/02 08:20:37 yar Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -1008,7 +1008,7 @@ case ${rc_debug} in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) if [ -x /usr/bin/logger ]; then - logger "$0: INFO: $*" + logger "$0: DEBUG: $*" fi echo 1>&2 "$0: DEBUG: $*" ;; ==== //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.90 2006/08/24 15:46:29 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.91 2006/10/03 00:03:30 imp Exp $ .include @@ -24,10 +24,6 @@ sort \ ${_texinfo} -.if ${MACHINE_ARCH} == "arm" -MK_GDB= no # not yet -.endif - .if ${MK_CXX} != "no" _gperf= gperf .if ${MK_GROFF} != "no" ==== //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/archive_read_extract.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.47 2006/09/05 05:59:45 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.48 2006/10/04 02:08:04 kientzle Exp $"); #include #ifdef HAVE_SYS_ACL_H @@ -85,7 +85,8 @@ struct extract { mode_t umask; - mode_t default_dir_mode; + mode_t default_dir_mode_initial; + mode_t default_dir_mode_final; struct archive_string create_parent_dir; struct fixup_entry *fixup_list; struct fixup_entry *current_fixup; @@ -108,9 +109,11 @@ * Mode to use for newly-created dirs during extraction; the correct * mode will be set at the end of the extraction. */ -#define SECURE_DIR_MODE 0700 +#define MINIMUM_DIR_MODE 0700 +#define MAXIMUM_DIR_MODE 0775 static int archive_extract_cleanup(struct archive *); +static int create_extract(struct archive *a); static int extract_block_device(struct archive *, struct archive_entry *, int); static int extract_char_device(struct archive *, @@ -169,17 +172,11 @@ char *original_filename; if (a->extract == NULL) { - a->extract = malloc(sizeof(*a->extract)); - if (a->extract == NULL) { - archive_set_error(a, ENOMEM, "Can't extract"); - return (ARCHIVE_FATAL); - } - a->cleanup_archive_extract = archive_extract_cleanup; - memset(a->extract, 0, sizeof(*a->extract)); + ret = create_extract(a); + if (ret) + return (ret); } extract = a->extract; - umask(extract->umask = umask(0)); /* Read the current umask. */ - extract->default_dir_mode = DEFAULT_DIR_MODE & ~extract->umask; extract->pst = NULL; extract->current_fixup = NULL; restore_pwd = -1; @@ -293,6 +290,35 @@ return (ret); } + +static int +create_extract(struct archive *a) +{ + struct extract *extract; + + extract = malloc(sizeof(*extract)); + if (extract == NULL) { + archive_set_error(a, ENOMEM, "Can't extract"); + return (ARCHIVE_FATAL); + } + a->cleanup_archive_extract = archive_extract_cleanup; + memset(extract, 0, sizeof(*extract)); + umask(extract->umask = umask(0)); /* Read the current umask. */ + /* Final permission for default dirs. */ + extract->default_dir_mode_final + = DEFAULT_DIR_MODE & ~extract->umask; + /* Temporary permission for default dirs during extract. */ + extract->default_dir_mode_initial + = extract->default_dir_mode_final; + extract->default_dir_mode_initial |= MINIMUM_DIR_MODE; + extract->default_dir_mode_initial &= MAXIMUM_DIR_MODE; + /* If the two permissions above are different, then + * the "final" permissions will be applied in the + * post-extract fixup pass. */ + a->extract = extract; + return (ARCHIVE_OK); +} + /* * Cleanup function for archive_extract. Mostly, this involves processing * the fixup list, which is used to address a number of problems: @@ -508,6 +534,7 @@ struct extract *extract; struct fixup_entry *fe; char *path, *p; + mode_t restore_mode, final_mode; extract = a->extract; extract->pst = NULL; /* Invalidate cached stat data. */ @@ -554,7 +581,16 @@ break; } - if (mkdir(path, SECURE_DIR_MODE) == 0) + final_mode = archive_entry_mode(entry) & + (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO); + if ((flags & ARCHIVE_EXTRACT_PERM) == 0) + final_mode &= ~extract->umask; + /* Constrain the permissions in effect during the restore. */ + restore_mode = final_mode; + restore_mode |= MINIMUM_DIR_MODE; + restore_mode &= MAXIMUM_DIR_MODE; + + if (mkdir(path, restore_mode) == 0) goto success; if (extract->pst == NULL && stat(path, &extract->st) == 0) @@ -575,27 +611,26 @@ } /* One final attempt to create the dir. */ - if (mkdir(path, SECURE_DIR_MODE) != 0) { + if (mkdir(path, restore_mode) != 0) { archive_set_error(a, errno, "Can't create directory"); return (ARCHIVE_WARN); } success: /* Add this dir to the fixup list. */ - fe = current_fixup(a, path); - fe->fixup |= FIXUP_MODE; - fe->mode = archive_entry_mode(entry); - if ((flags & ARCHIVE_EXTRACT_PERM) == 0) - fe->mode &= ~extract->umask; + if (final_mode != restore_mode) { + fe = current_fixup(a, path); + fe->fixup |= FIXUP_MODE; + fe->mode = final_mode; + } if (flags & ARCHIVE_EXTRACT_TIME) { + fe = current_fixup(a, path); fe->fixup |= FIXUP_TIMES; fe->mtime = archive_entry_mtime(entry); fe->mtime_nanos = archive_entry_mtime_nsec(entry); fe->atime = archive_entry_atime(entry); fe->atime_nanos = archive_entry_atime_nsec(entry); } - /* For now, set the mode to SECURE_DIR_MODE. */ - archive_entry_set_mode(entry, SECURE_DIR_MODE); return (restore_metadata(a, -1, entry, flags)); } @@ -656,12 +691,9 @@ static int create_dir_mutable(struct archive *a, char *path, int flags) { - mode_t old_umask; int r; - old_umask = umask(~SECURE_DIR_MODE); r = create_dir_recursive(a, path, flags); - umask(old_umask); return (r); } @@ -735,10 +767,13 @@ return (r); } - if (mkdir(path, SECURE_DIR_MODE) == 0) { - le = new_fixup(a, path); - le->fixup |= FIXUP_MODE; - le->mode = extract->default_dir_mode; + if (mkdir(path, extract->default_dir_mode_initial) == 0) { + if (extract->default_dir_mode_initial + != extract->default_dir_mode_final) { + le = new_fixup(a, path); + le->fixup |= FIXUP_MODE; + le->mode = extract->default_dir_mode_final; + } return (ARCHIVE_OK); } @@ -1052,12 +1087,26 @@ mode &= ~ S_ISGID; } - /* - * Ensure we change permissions on the object we extracted, - * and not any incidental symlink that might have gotten in - * the way. - */ - if (!S_ISLNK(archive_entry_mode(entry))) { + if (S_ISLNK(archive_entry_mode(entry))) { +#ifdef HAVE_LCHMOD + /* + * If this is a symlink, use lchmod(). If the + * platform doesn't support lchmod(), just skip it as + * permissions on symlinks are actually ignored on + * most platforms. + */ + if (lchmod(name, mode) != 0) { + archive_set_error(a, errno, "Can't set permissions"); + return (ARCHIVE_WARN); + } +#endif + } else if (!S_ISDIR(archive_entry_mode(entry))) { + /* + * If it's not a symlink and not a dir, then use + * fchmod() or chmod(), depending on whether we have + * an fd. Dirs get their perms set during the + * post-extract fixup, which is handled elsewhere. + */ #ifdef HAVE_FCHMOD if (fd >= 0) { if (fchmod(fd, mode) != 0) { @@ -1067,22 +1116,13 @@ } } else #endif - if (chmod(name, mode) != 0) { - archive_set_error(a, errno, "Can't set permissions"); - return (ARCHIVE_WARN); - } -#ifdef HAVE_LCHMOD - } else { - /* - * If lchmod() isn't supported, it's no big deal. - * Permissions on symlinks are actually ignored on - * most platforms. - */ - if (lchmod(name, mode) != 0) { - archive_set_error(a, errno, "Can't set permissions"); - return (ARCHIVE_WARN); - } -#endif + /* If this platform lacks fchmod(), then + * we'll just use chmod(). */ + if (chmod(name, mode) != 0) { + archive_set_error(a, errno, + "Can't set permissions"); + return (ARCHIVE_WARN); + } } if (flags & ARCHIVE_EXTRACT_ACL) { ==== //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/arc4random.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.10 2004/03/24 14:44:57 green Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.11 2006/10/04 01:17:23 ache Exp $"); #include "namespace.h" #include @@ -61,6 +61,7 @@ static struct arc4_stream rs; static int rs_initialized; static int rs_stired; +static int arc4_count; static inline u_int8_t arc4_getbyte(struct arc4_stream *); static void arc4_stir(struct arc4_stream *); @@ -127,7 +128,8 @@ * by Ilya Mironov. */ for (n = 0; n < 1024; n++) - arc4_getbyte(as); + (void) arc4_getbyte(as); + arc4_count = 400000; } static inline u_int8_t @@ -172,7 +174,7 @@ static void arc4_check_stir(void) { - if (!rs_stired) { + if (!rs_stired || --arc4_count == 0) { arc4_stir(&rs); rs_stired = 1; } ==== //depot/projects/kmacy_sun4v_stable/src/sbin/ifconfig/ifconfig.8#5 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.121 2006/09/18 11:55:10 ru Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.122 2006/10/02 08:55:54 schweikh Exp $ .\" .Dd September 6, 2006 .Dt IFCONFIG 8 @@ -427,7 +427,7 @@ The routing metric is used by the routing protocol .Pq Xr routed 8 . Higher metrics have the effect of making a route -less favorable; metrics are counted as addition hops +less favorable; metrics are counted as additional hops to the destination network or host. .It Cm mtu Ar n Set the maximum transmission unit of the interface to @@ -615,7 +615,7 @@ or .Cm - for the address. -This option is useful when more than one access points have the same SSID. +This option is useful when more than one access point uses the same SSID. Another name for the .Cm bssid parameter is @@ -1525,5 +1525,5 @@ .Pp If you delete such an address using .Nm , -the kernel may act very oddly. +the kernel may act very odd. Do this at your own risk. ==== //depot/projects/kmacy_sun4v_stable/src/share/man/man4/ddb.4#3 (text+ko) ==== @@ -57,7 +57,7 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.33 2006/09/18 15:24:18 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.34 2006/10/03 21:06:19 ru Exp $ .Dd September 15, 2006 .Dt DDB 4 .Os @@ -151,7 +151,7 @@ browse through the history buffer, and move the cursor within the current line. .Sh COMMANDS -.Bl -ohang +.Bl -tag -width indent -compact .It Cm examine .It Cm x Display the addressed locations according to the formats in the modifier. @@ -212,15 +212,18 @@ No alternate format. .El .El +.Pp .It Cm xf Examine forward: Execute an examine command with the last specified parameters to it except that the next address displayed by it is used as the start address. +.Pp .It Cm xb Examine backward: Execute an examine command with the last specified parameters to it except that the last start address subtracted by the size displayed by it is used as the start address. +.Pp .It Cm print Ns Op Cm /acdoruxz Print .Ar addr Ns s @@ -249,6 +252,7 @@ eax = xxxxxx ecx = yyyyyy .Ed +.Pp .It Xo .Cm write Ns Op Cm /bhl .Ar addr Ar expr1 Op Ar "expr2 ..." @@ -271,6 +275,7 @@ since there is no delimiter between expressions, strange things may happen. It is best to enclose each expression in parentheses. +.Pp .It Xo .Cm set .Li \&$ Ns Ar variable @@ -280,6 +285,7 @@ Set the named variable or register with the value of .Ar expr . Valid variable names are described below. +.Pp .It Cm break Ns Op Cm /u Set a break point at .Ar addr . @@ -311,6 +317,7 @@ user space break points may not work correctly. Setting a break point at the low-level code paths may also cause strange behavior. +.Pp .It Cm delete Ar addr .It Cm delete Li \&# Ns Ar number Delete the break point. @@ -322,6 +329,7 @@ specified in the original .Cm break command. +.Pp .It Cm step Ns Op Cm /p Single step .Ar count @@ -337,6 +345,7 @@ On machines with software-emulated single-stepping (e.g., pmax), stepping through code executed by interrupt handlers will probably do the wrong thing. +.Pp .It Cm continue Ns Op Cm /c Continue execution until a breakpoint or watchpoint. If the @@ -348,6 +357,7 @@ when counting, the debugger is really silently single-stepping. This means that single-stepping on low-level code may cause strange behavior. +.Pp .It Cm until Ns Op Cm /p Stop at the next call or return instruction. If the @@ -356,6 +366,7 @@ cumulative instruction count at each call or return. Otherwise, only print when the matching return is hit. +.Pp .It Cm next Ns Op Cm /p .It Cm match Ns Op Cm /p Stop at the matching return instruction. @@ -364,6 +375,7 @@ modifier is specified, print the call nesting depth and the cumulative instruction count at each call or return. Otherwise, only print when the matching return is hit. +.Pp .It Xo .Cm trace Ns Op Cm /u .Op Ar frame @@ -385,6 +397,7 @@ .Sy Warning : User space stack trace is valid only if the machine dependent code supports it. +.Pp .It Xo .Cm search Ns Op Cm /bhl .Ar addr @@ -400,6 +413,7 @@ The optional .Ar count argument limits the search. +.Pp .It Cm show all procs Ns Op Cm /m .It Cm ps Ns Op Cm /m Display all process information. @@ -410,6 +424,7 @@ .Li m modifier will alter the display to show VM map addresses for the process and not show other info. +.Pp .It Cm show registers Ns Op Cm /u Display the register set. If the @@ -422,6 +437,7 @@ .Li u modifier depends on the machine. If not supported, incorrect information will be displayed. +.Pp .It Cm show geom Op Ar addr If the .Ar addr @@ -430,6 +446,7 @@ .Ar addr is given, displays details about the given GEOM object (class, geom, provider or consumer). +.Pp .It Xo .Cm show map Ns Op Cm /f .Ar addr @@ -440,6 +457,7 @@ .Li f modifier is specified the complete map is printed. +.Pp .It Xo .Cm show object Ns Op Cm /f .Ar addr @@ -450,12 +468,16 @@ .Li f option is specified the complete object is printed. +.Pp .It Cm show vnode Ar addr Displays details about the given vnode. +.Pp .It Cm "show watches" Displays all watchpoints. +.Pp .It Cm reset Hard reset the system. +.Pp .It Xo .Cm watch .Ar addr Ns Li \&, Ns Ar size @@ -472,6 +494,7 @@ Attempts to watch wired kernel memory may cause unrecoverable error in some systems such as i386. Watchpoints on user addresses work best. +.Pp .It Xo .Cm hwatch .Ar addr Ns Li \&, Ns Ar size @@ -490,11 +513,13 @@ .Cm hwatch for setting watchpoints on kernel address locations only, and avoid its use on user mode address spaces. +.Pp .It Xo .Cm dhwatch .Ar addr Ns Li \&, Ns Ar size .Xc Delete specified hardware watchpoint. +.Pp .It Cm gdb Toggles between remote GDB and DDB mode. In remote GDB mode, another machine is required that runs @@ -504,6 +529,7 @@ Currently only available on the .Em i386 architecture. +.Pp .It Cm help Print a short summary of the available commands and command abbreviations. ==== //depot/projects/kmacy_sun4v_stable/src/share/man/man9/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.278 2006/09/25 20:12:13 imp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.279 2006/10/02 11:51:25 andre Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -110,6 +110,7 @@ g_provider_by_name.9 \ groupmember.9 \ g_wither_geom.9 \ + hash.9 \ hashinit.9 \ hexdump.9 \ ieee80211.9 \ @@ -587,6 +588,12 @@ MLINKS+=g_provider.9 g_destroy_provider.9 \ g_provider.9 g_error_provider.9 \ g_provider.9 g_new_providerf.9 +MLINKS+=hash.9 hash32.9 \ + hash.9 hash32_buf.9 \ + hash.9 hash32_str.9 \ + hash.9 hash32_strn.9 \ + hash.9 hash32_stre.9 \ + hash.9 hash32_strne.9 MLINKS+=hashinit.9 hashdestroy.9 \ hashinit.9 phashinit.9 MLINKS+=ieee80211.9 ieee80211_attach.9 \ ==== //depot/projects/kmacy_sun4v_stable/src/share/man/man9/zone.9#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/zone.9,v 1.26 2004/01/25 11:39:41 des Exp $ +.\" $FreeBSD: src/share/man/man9/zone.9,v 1.27 2006/10/02 07:27:00 kib Exp $ .\" .Dd July 21, 2003 .Dt ZONE 9 @@ -65,27 +65,9 @@ are not, and provides functions for allocating items from the zone and for releasing them back (which makes them available for later use). .Pp -The zone allocator stores state information inside the items proper -while they are not allocated, -so structures that will be managed by the zone allocator -and wish to use the type stable property of zones by leaving some fields -pre-filled between allocations, must reserve -two pointers at the very beginning for internal use by the zone -allocator, as follows: -.Bd -literal -offset indent -struct my_item { - struct my_item *z_rsvd1; - struct my_item *z_rsvd2; - /* rest of structure */ -}; -.Ed -.Pp -Alternatively they should assume those entries corrupted -after each allocation. After the first allocation of an item, it will have been cleared to zeroes, however subsequent allocations -will retain the contents as of the last free, with the exception of the -fields mentioned above. +will retain the contents as of the last free. .Pp The .Fn uma_zcreate ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.66 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.67 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.64 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.65 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.55 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.56 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.65 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.66 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ #include "opt_compat.h" ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -141,7 +141,7 @@ 61 AUE_CHROOT NOPROTO { int chroot(char *path); } 62 AUE_FSTAT OBSOL ofstat 63 AUE_NULL OBSOL ogetkerninfo -64 AUE_GETPAGESIZE OBSOL ogetpagesize +64 AUE_NULL OBSOL ogetpagesize ; XXX implement (not OBSOL at all) 65 AUE_MSYNC NOPROTO { int msync(void *addr, size_t len, \ int flags); } ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/aic/aic_pccard.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic/aic_pccard.c,v 1.17 2005/09/20 19:45:08 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic/aic_pccard.c,v 1.18 2006/10/03 04:51:18 imp Exp $"); #include #include @@ -54,7 +54,7 @@ static int aic_pccard_probe(device_t); static int aic_pccard_attach(device_t); -const struct pccard_product aic_pccard_products[] = { +static const struct pccard_product aic_pccard_products[] = { PCMCIA_CARD(ADAPTEC, APA1460), PCMCIA_CARD(ADAPTEC, APA1460A), PCMCIA_CARD(NEWMEDIA, BUSTOASTER), ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/bge/if_bge.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.149 2006/09/23 18:55:49 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.150 2006/10/03 09:31:49 glebius Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -191,7 +191,6 @@ { SK_VENDORID, SK_DEVICEID_ALTIMA }, - { TC_VENDORID, TC_DEVICEID_3C985 }, { TC_VENDORID, TC_DEVICEID_3C996 }, { 0, 0 } ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/bge/if_bgereg.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.55 2006/09/09 03:36:57 ambrisko Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.56 2006/10/03 09:31:49 glebius Exp $ */ /* @@ -2027,10 +2027,9 @@ #define ALTEON_DEVICEID_BCM5701 0x0004 /* - * 3Com 3c985 PCI vendor/device ID. + * 3Com 3c996 PCI vendor/device ID. */ #define TC_VENDORID 0x10B7 -#define TC_DEVICEID_3C985 0x0001 #define TC_DEVICEID_3C996 0x0003 /* ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ehci.c#4 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.49 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.51 2006/10/03 08:38:08 iedowse Exp $"); #include #include @@ -2867,7 +2867,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 4 20:12: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 B7F0D16A47C; Wed, 4 Oct 2006 20:12:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 85B2016A40F for ; Wed, 4 Oct 2006 20:12:03 +0000 (UTC) (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 0C8B543D76 for ; Wed, 4 Oct 2006 20:11:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k94KBxRS074687 for ; Wed, 4 Oct 2006 20:11:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k94KBxUk074684 for perforce@freebsd.org; Wed, 4 Oct 2006 20:11:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 4 Oct 2006 20:11:59 GMT Message-Id: <200610042011.k94KBxUk074684@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 107261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 20:12:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=107261 Change 107261 by rwatson@rwatson_zoo on 2006/10/04 20:11:22 Keep comments about layering, but switch to priv(9). Affected files ... .. //depot/projects/trustedbsd/priv/sys/net/if_gre.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/net/if_gre.c#3 (text+ko) ==== @@ -457,7 +457,7 @@ * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_SETIFFLAGS)) != 0) break; if ((ifr->ifr_flags & IFF_LINK0) != 0) sc->g_proto = IPPROTO_GRE; @@ -473,7 +473,7 @@ * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_SETIFMTU)) != 0) break; if (ifr->ifr_mtu < 576) { error = EINVAL; @@ -485,12 +485,36 @@ ifr->ifr_mtu = GRE2IFP(sc)->if_mtu; break; case SIOCADDMULTI: + /* + * XXXRW: Isn't this suser() redundant to the ifnet layer + * check? + */ + if ((error = priv_check(curthread, PRIV_NET_ADDMULTI)) != 0) + break; + if (ifr == 0) { + error = EAFNOSUPPORT; + break; + } + switch (ifr->ifr_addr.sa_family) { +#ifdef INET + case AF_INET: + break; +#endif +#ifdef INET6 + case AF_INET6: + break; +#endif + default: + error = EAFNOSUPPORT; + break; + } + break; case SIOCDELMULTI: /* * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_DELIFGROUP)) != 0) break; if (ifr == 0) { error = EAFNOSUPPORT; @@ -515,7 +539,7 @@ * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_GRE)) != 0) break; sc->g_proto = ifr->ifr_flags; switch (sc->g_proto) { @@ -606,7 +630,7 @@ * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_SETIFPHYS)) != 0) break; if (aifr->ifra_addr.sin_family != AF_INET || aifr->ifra_dstaddr.sin_family != AF_INET) { @@ -626,7 +650,7 @@ * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_SETIFPHYS)) != 0) break; if (lifr->addr.ss_family != AF_INET || lifr->dstaddr.ss_family != AF_INET) { @@ -647,7 +671,7 @@ * XXXRW: Isn't this suser() redundant to the ifnet layer * check? */ - if ((error = suser(curthread)) != 0) + if ((error = priv_check(curthread, PRIV_NET_SETIFPHYS)) != 0) break; sc->g_src.s_addr = INADDR_ANY; sc->g_dst.s_addr = INADDR_ANY; From owner-p4-projects@FreeBSD.ORG Wed Oct 4 20:12:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E08316A560; Wed, 4 Oct 2006 20:12:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E77B016A54D for ; Wed, 4 Oct 2006 20:12:03 +0000 (UTC) (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 8961843D6E for ; Wed, 4 Oct 2006 20:11:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k94KBxJV074681 for ; Wed, 4 Oct 2006 20:11:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k94KBvbL074652 for perforce@freebsd.org; Wed, 4 Oct 2006 20:11:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 4 Oct 2006 20:11:57 GMT Message-Id: <200610042011.k94KBvbL074652@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 107260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 20:12:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=107260 Change 107260 by rwatson@rwatson_zoo on 2006/10/04 20:11:06 Wrong include block: the previous one was !FreeBSD. Affected files ... .. //depot/projects/trustedbsd/priv/sys/dev/cnw/if_cnw.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/dev/cnw/if_cnw.c#3 (text+ko) ==== @@ -125,7 +125,6 @@ #include #include #include -#include #include #include @@ -237,6 +236,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Wed Oct 4 21:31: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 9D05416A4EF; Wed, 4 Oct 2006 21:31:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 54CFE16A4EE for ; Wed, 4 Oct 2006 21:31:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE1A743D86 for ; Wed, 4 Oct 2006 21:31:47 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k94LVkvk008900 for ; Wed, 4 Oct 2006 21:31:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k94LVjwj008897 for perforce@freebsd.org; Wed, 4 Oct 2006 21:31:45 GMT (envelope-from jb@freebsd.org) Date: Wed, 4 Oct 2006 21:31:45 GMT Message-Id: <200610042131.k94LVjwj008897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107269 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 21:31:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=107269 Change 107269 by jb@jb_freebsd7 on 2006/10/04 21:31:14 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#25 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/chinsan.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#14 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#13 integrate .. //depot/projects/dtrace/ports/KNOBS#5 integrate .. //depot/projects/dtrace/ports/LEGAL#7 integrate .. //depot/projects/dtrace/ports/MOVED#17 integrate .. //depot/projects/dtrace/src/crypto/openssh/sshd.c#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/Makefile#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_extract.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/gen/arc4random.c#3 integrate .. //depot/projects/dtrace/src/share/man/man4/ddb.4#5 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/dtrace/src/sys/dev/aic/aic_pccard.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ohci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb_subr.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdi.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.master#10 integrate .. //depot/projects/dtrace/src/sys/kern/systrace_args.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/dtrace/src/sys/sys/_elf_solaris.h#2 integrate .. //depot/projects/dtrace/src/sys/sys/elf.h#2 integrate .. //depot/projects/dtrace/src/sys/sys/mount.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.h#11 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.mk#11 integrate .. //depot/projects/dtrace/src/sys/sys/sysproto.h#11 integrate .. //depot/projects/dtrace/src/sys/sys/time.h#9 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#12 integrate .. //depot/projects/dtrace/www/en/platforms/ia64/index.xsl#4 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#25 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -374,6 +374,11 @@ &pgpkey.foxfair; + + &a.chinsan; + &pgpkey.chinsan; + + &a.jkh; &pgpkey.jkh; ==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#13 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -39,6 +39,7 @@ + ==== //depot/projects/dtrace/ports/KNOBS#5 (text+ko) ==== @@ -1,7 +1,7 @@ # # KNOBS - A list of popular knobs and descriptions # -# $FreeBSD: ports/KNOBS,v 1.16 2006/09/18 15:53:50 skv Exp $ +# $FreeBSD: ports/KNOBS,v 1.17 2006/10/04 20:20:38 shaun Exp $ # # Rules to adding knobs: # @@ -50,6 +50,7 @@ GNUTLS Adds GnuTLS support GSASL Adds GSASL support GSM GSM audio codec support +GSSAPI GSSAPI (Kerberos) support GSTREAMER Gstreamer multimedia support GTK1 Adds Gtk+1 support GTK2 Adds Gtk+2 support ==== //depot/projects/dtrace/ports/LEGAL#7 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.499 2006/10/02 12:38:31 vd Exp $ +# $FreeBSD: ports/LEGAL,v 1.502 2006/10/03 18:53:18 alepulver Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -76,14 +76,11 @@ redistribution bicom* archivers/bicom Contact author personally regarding commercial use -bk-*-x86-freebsd* devel/bitkeeper Redistribution is not permitted blast-freebsd* biology/blast Must be downloaded from vendor site boodler-* audio/boodler Not for commercial use Browser*.tar.gz net/ldapbrowser No reply from author regarding redistribution licensing bsp_upektfmess-* security/bsp_upektfmess License prohibits redistribution -bugseeker2ee* java/bugseeker License does not allow - redistribution bzip-* archivers/bzip Some algorithms used may infringe certain US patents. Opinions differ. Commercial @@ -93,6 +90,7 @@ ccc-*.alpha.rpm lang/compaq-cc Distribution not allowed checkpassword-*.tar.gz security/checkpassword Unsure of djb's license citrix_ica-*-de.tar.gz german/citrix_ica License prohibits redistribution +citrix_ica-*-ja.tar.gz japanese/citrix_ica License prohibits redistribution citrix_ica-*.tar.gz net/citrix_ica License prohibits redistribution cfs-* security/cfs Crypto; export-controlled clibpdf*.tar.gz print/clibpdf Needs a license to bundle with @@ -212,7 +210,6 @@ festival/voice_mwm_di-* audio/festvox-mwm No commercial use festival/voice_ogirab_di-* audio/festvox-ogirab No commercial use festival/voice_tll_di-* audio/festvox-tll No commercial use -ffj30_ce_ml.class java/forte Restrictive license fMSX* emulators/fmsx Unclear legal status of distributed ROMs foiltex* textproc/foiltex Redistribution on a not-for-profit @@ -238,6 +235,9 @@ before downloading freqship/* sysutils/freqsdwn License agreement is required to download +fretsonfire/FretsOnFire-*-linux* games/fretsonfire-data Only Unreal Voodoo + site is allowed to + distribute the music ftree-* misc/ftree Cannot distribute commercially fwtk/* security/fwtk No redistribution allowed Frisk-* games/xfrisk Copyright/trademark violation? @@ -252,12 +252,9 @@ you have to acquire a license giftool-* graphics/giftool Do not redistribute for profit glimpse-* textproc/glimpse Do not sell for profit -gnome2/MCity-Alloy-* x11-themes/metacity-theme-alloy-c Themes may contain artwork not +gnome2/MCity-microGUI* x11-themes/metacity-theme-microgui Themes may contain artwork not done by the author. Keep FreeBSD safe if the theme author violated copyrights -gnome2/MCity-Hacked-2* x11-themes/metacity-theme-hacked-2 See x11-themes/metacity-theme-alloy-c -gnome2/MCity-Iridium-rounded* x11-themes/metacity-theme-iridium-rounded See x11-themes/metacity-theme-alloy-c -gnome2/MCity-microGUI* x11-themes/metacity-theme-microgui See x11-themes/metacity-theme-alloy-c gnupg-* security/gnupg Crypto; export-controlled goemon.tgz audio/timidity Uses copyrighted patches gogo239b.tgz audio/gogo Condition is not clear @@ -384,7 +381,7 @@ original package only Linux-ACU-Driver-v* sysutils/linux-acu Redistribution not allowed linux-gtk2 x11-toolkits/linux-gtk2 LGPL binary, no source -linuxq3ademo-* games/linux-q3ademo Restrictive license by Loki Software +linuxq3ademo-* games/linux-quake3-demo Restrictive license by Loki Software l0phtcrack/* security/l0phtcrack Parts are under GPL, so binaries should not be distributed. Contains crypto @@ -438,7 +435,6 @@ netbeans-* java/netbeans Restrictive copyright netcomponents-* java/netcomponents No redistribution except as part of a substantially different product -netscape-*-us-* www/netscape* Crypto; export-controlled netshow_linux.gz multimedia/netshow Commercial software nfbtr758.zip textproc/nfbtrans Unclear copyright status nntpcache-* news/nntpcache Commercial or government use @@ -446,7 +442,6 @@ nsc2ke.* math/nsc2ke No resale, contact author for commercial usage nte-1.* mbone/nte Crypto; export-controlled -nwrite-* misc/nwrite Ownership in dispute MRONWnn6.tgz japanese/Wnn6 You should buy from Omron Software Co., Ltd. oneko-*.tar.gz games/oneko-sakura Including derivatives from @@ -474,7 +469,6 @@ usage and distribution perforce/* devel/perforce Restricted distribution pgp* security/pgp* Various locality restrictions -pim6dd-*.tar.gz net/pim6dd Cannot be sold for profit platon* biology/platon US$ 5000 for commercial users, (free for academic) pmake-*.tar.Z devel/pmake Non-commercial use only @@ -562,7 +556,6 @@ swing1_1_1* java/jfc Do not distribute without value-added application systemc-2*.tgz cad/systemc License agreement required. -tasks.zip www/tasks License prohibits redistribution tcetest_* games/linux-enemyterritory-tce Redistribution limited texcm-ttf-20010117/* x11-fonts/texcm-ttf Cannot be sold or distributed with any commercial product @@ -635,7 +628,6 @@ wgetpro* ftp/wgetpro U.S. Patent 6,041,345 win32/* multimedia/win32-codecs Licensing status of the codecs is unknown -xbarcode-*.tar.gz graphics/xbarcode Must not be sold xchada01.lzh games/xchadance Contains commercial character data xephem-* astro/xephem Personal use only @@ -651,7 +643,6 @@ X-Plane-Net-Install.gz games/linux-x-plane-net-installer Redistribution prohibited XLIN*.tar.bz2 games/linux-x-plane Redistribution prohibited xmdiary-* deskutils/xmdiary Do not sell for profit -xothello.tgz games/xothello Possible trademark infringement xrisk-* games/xrisk Copyright/trademark violation? xsmbrowser-* net/xsmbrowser Commercial software xteddy-* games/xteddy Do not sell for profit ==== //depot/projects/dtrace/ports/MOVED#17 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1145 2006/10/02 17:37:20 alepulver Exp $ +# $FreeBSD: ports/MOVED,v 1.1146 2006/10/03 14:28:09 girgen Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2221,7 +2221,6 @@ net-mgmt/nfdump-devel|net-mgmt/nfdump|2006-04-02|Development port no longer needed devel/py-twistedXish|net-im/py-twistedWords|2006-04-05|Incorporated into net-im/py-twistedWords devel/upp602|devel/upp|2006-04-05|Was created in a bad directory -mail/mulberry||2006-04-06|Has expired: mastersite disappeared, no longer maintained by author textproc/pyenchant|textproc/py-enchant|2006-04-06|Rename to consistency with other Python ports security/skip||2006-04-06|Port has become obsolete mail/prom-mew||2006-04-07|Has expired: mastersite disappeared, no longer maintained by author ==== //depot/projects/dtrace/src/crypto/openssh/sshd.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.43 2006/09/30 13:38:05 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.44 2006/10/03 11:33:25 des Exp $"); #include #include @@ -83,7 +83,9 @@ #ifdef __FreeBSD__ #include -#ifdef GSSAPI +#if defined(GSSAPI) && defined(HAVE_GSSAPI_H) +#include +#elif defined(GSSAPI) && defined(HAVE_GSSAPI_GSSAPI_H) #include #endif #endif ==== //depot/projects/dtrace/src/gnu/usr.bin/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.90 2006/08/24 15:46:29 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.91 2006/10/03 00:03:30 imp Exp $ .include @@ -24,10 +24,6 @@ sort \ ${_texinfo} -.if ${MACHINE_ARCH} == "arm" -MK_GDB= no # not yet -.endif - .if ${MK_CXX} != "no" _gperf= gperf .if ${MK_GROFF} != "no" ==== //depot/projects/dtrace/src/lib/libarchive/archive_read_extract.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.47 2006/09/05 05:59:45 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.48 2006/10/04 02:08:04 kientzle Exp $"); #include #ifdef HAVE_SYS_ACL_H @@ -85,7 +85,8 @@ struct extract { mode_t umask; - mode_t default_dir_mode; + mode_t default_dir_mode_initial; + mode_t default_dir_mode_final; struct archive_string create_parent_dir; struct fixup_entry *fixup_list; struct fixup_entry *current_fixup; @@ -108,9 +109,11 @@ * Mode to use for newly-created dirs during extraction; the correct * mode will be set at the end of the extraction. */ -#define SECURE_DIR_MODE 0700 +#define MINIMUM_DIR_MODE 0700 +#define MAXIMUM_DIR_MODE 0775 static int archive_extract_cleanup(struct archive *); +static int create_extract(struct archive *a); static int extract_block_device(struct archive *, struct archive_entry *, int); static int extract_char_device(struct archive *, @@ -169,17 +172,11 @@ char *original_filename; if (a->extract == NULL) { - a->extract = malloc(sizeof(*a->extract)); - if (a->extract == NULL) { - archive_set_error(a, ENOMEM, "Can't extract"); - return (ARCHIVE_FATAL); - } - a->cleanup_archive_extract = archive_extract_cleanup; - memset(a->extract, 0, sizeof(*a->extract)); + ret = create_extract(a); + if (ret) + return (ret); } extract = a->extract; - umask(extract->umask = umask(0)); /* Read the current umask. */ - extract->default_dir_mode = DEFAULT_DIR_MODE & ~extract->umask; extract->pst = NULL; extract->current_fixup = NULL; restore_pwd = -1; @@ -293,6 +290,35 @@ return (ret); } + +static int +create_extract(struct archive *a) +{ + struct extract *extract; + + extract = malloc(sizeof(*extract)); + if (extract == NULL) { + archive_set_error(a, ENOMEM, "Can't extract"); + return (ARCHIVE_FATAL); + } + a->cleanup_archive_extract = archive_extract_cleanup; + memset(extract, 0, sizeof(*extract)); + umask(extract->umask = umask(0)); /* Read the current umask. */ + /* Final permission for default dirs. */ + extract->default_dir_mode_final + = DEFAULT_DIR_MODE & ~extract->umask; + /* Temporary permission for default dirs during extract. */ + extract->default_dir_mode_initial + = extract->default_dir_mode_final; + extract->default_dir_mode_initial |= MINIMUM_DIR_MODE; + extract->default_dir_mode_initial &= MAXIMUM_DIR_MODE; + /* If the two permissions above are different, then + * the "final" permissions will be applied in the + * post-extract fixup pass. */ + a->extract = extract; + return (ARCHIVE_OK); +} + /* * Cleanup function for archive_extract. Mostly, this involves processing * the fixup list, which is used to address a number of problems: @@ -508,6 +534,7 @@ struct extract *extract; struct fixup_entry *fe; char *path, *p; + mode_t restore_mode, final_mode; extract = a->extract; extract->pst = NULL; /* Invalidate cached stat data. */ @@ -554,7 +581,16 @@ break; } - if (mkdir(path, SECURE_DIR_MODE) == 0) + final_mode = archive_entry_mode(entry) & + (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO); + if ((flags & ARCHIVE_EXTRACT_PERM) == 0) + final_mode &= ~extract->umask; + /* Constrain the permissions in effect during the restore. */ + restore_mode = final_mode; + restore_mode |= MINIMUM_DIR_MODE; + restore_mode &= MAXIMUM_DIR_MODE; + + if (mkdir(path, restore_mode) == 0) goto success; if (extract->pst == NULL && stat(path, &extract->st) == 0) @@ -575,27 +611,26 @@ } /* One final attempt to create the dir. */ - if (mkdir(path, SECURE_DIR_MODE) != 0) { + if (mkdir(path, restore_mode) != 0) { archive_set_error(a, errno, "Can't create directory"); return (ARCHIVE_WARN); } success: /* Add this dir to the fixup list. */ - fe = current_fixup(a, path); - fe->fixup |= FIXUP_MODE; - fe->mode = archive_entry_mode(entry); - if ((flags & ARCHIVE_EXTRACT_PERM) == 0) - fe->mode &= ~extract->umask; + if (final_mode != restore_mode) { + fe = current_fixup(a, path); + fe->fixup |= FIXUP_MODE; + fe->mode = final_mode; + } if (flags & ARCHIVE_EXTRACT_TIME) { + fe = current_fixup(a, path); fe->fixup |= FIXUP_TIMES; fe->mtime = archive_entry_mtime(entry); fe->mtime_nanos = archive_entry_mtime_nsec(entry); fe->atime = archive_entry_atime(entry); fe->atime_nanos = archive_entry_atime_nsec(entry); } - /* For now, set the mode to SECURE_DIR_MODE. */ - archive_entry_set_mode(entry, SECURE_DIR_MODE); return (restore_metadata(a, -1, entry, flags)); } @@ -656,12 +691,9 @@ static int create_dir_mutable(struct archive *a, char *path, int flags) { - mode_t old_umask; int r; - old_umask = umask(~SECURE_DIR_MODE); r = create_dir_recursive(a, path, flags); - umask(old_umask); return (r); } @@ -735,10 +767,13 @@ return (r); } - if (mkdir(path, SECURE_DIR_MODE) == 0) { - le = new_fixup(a, path); - le->fixup |= FIXUP_MODE; - le->mode = extract->default_dir_mode; + if (mkdir(path, extract->default_dir_mode_initial) == 0) { + if (extract->default_dir_mode_initial + != extract->default_dir_mode_final) { + le = new_fixup(a, path); + le->fixup |= FIXUP_MODE; + le->mode = extract->default_dir_mode_final; + } return (ARCHIVE_OK); } @@ -1052,12 +1087,26 @@ mode &= ~ S_ISGID; } - /* - * Ensure we change permissions on the object we extracted, - * and not any incidental symlink that might have gotten in - * the way. - */ - if (!S_ISLNK(archive_entry_mode(entry))) { + if (S_ISLNK(archive_entry_mode(entry))) { +#ifdef HAVE_LCHMOD + /* + * If this is a symlink, use lchmod(). If the + * platform doesn't support lchmod(), just skip it as + * permissions on symlinks are actually ignored on + * most platforms. + */ + if (lchmod(name, mode) != 0) { + archive_set_error(a, errno, "Can't set permissions"); + return (ARCHIVE_WARN); + } +#endif + } else if (!S_ISDIR(archive_entry_mode(entry))) { + /* + * If it's not a symlink and not a dir, then use + * fchmod() or chmod(), depending on whether we have + * an fd. Dirs get their perms set during the + * post-extract fixup, which is handled elsewhere. + */ #ifdef HAVE_FCHMOD if (fd >= 0) { if (fchmod(fd, mode) != 0) { @@ -1067,22 +1116,13 @@ } } else #endif - if (chmod(name, mode) != 0) { - archive_set_error(a, errno, "Can't set permissions"); - return (ARCHIVE_WARN); - } -#ifdef HAVE_LCHMOD - } else { - /* - * If lchmod() isn't supported, it's no big deal. - * Permissions on symlinks are actually ignored on - * most platforms. - */ - if (lchmod(name, mode) != 0) { - archive_set_error(a, errno, "Can't set permissions"); - return (ARCHIVE_WARN); - } -#endif + /* If this platform lacks fchmod(), then + * we'll just use chmod(). */ + if (chmod(name, mode) != 0) { + archive_set_error(a, errno, + "Can't set permissions"); + return (ARCHIVE_WARN); + } } if (flags & ARCHIVE_EXTRACT_ACL) { ==== //depot/projects/dtrace/src/lib/libc/gen/arc4random.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.10 2004/03/24 14:44:57 green Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.11 2006/10/04 01:17:23 ache Exp $"); #include "namespace.h" #include @@ -61,6 +61,7 @@ static struct arc4_stream rs; static int rs_initialized; static int rs_stired; +static int arc4_count; static inline u_int8_t arc4_getbyte(struct arc4_stream *); static void arc4_stir(struct arc4_stream *); @@ -127,7 +128,8 @@ * by Ilya Mironov. */ for (n = 0; n < 1024; n++) - arc4_getbyte(as); + (void) arc4_getbyte(as); + arc4_count = 400000; } static inline u_int8_t @@ -172,7 +174,7 @@ static void arc4_check_stir(void) { - if (!rs_stired) { + if (!rs_stired || --arc4_count == 0) { arc4_stir(&rs); rs_stired = 1; } ==== //depot/projects/dtrace/src/share/man/man4/ddb.4#5 (text+ko) ==== @@ -57,7 +57,7 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.33 2006/09/18 15:24:18 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.34 2006/10/03 21:06:19 ru Exp $ .Dd September 15, 2006 .Dt DDB 4 .Os @@ -151,7 +151,7 @@ browse through the history buffer, and move the cursor within the current line. .Sh COMMANDS -.Bl -ohang +.Bl -tag -width indent -compact .It Cm examine .It Cm x Display the addressed locations according to the formats in the modifier. @@ -212,15 +212,18 @@ No alternate format. .El .El +.Pp .It Cm xf Examine forward: Execute an examine command with the last specified parameters to it except that the next address displayed by it is used as the start address. +.Pp .It Cm xb Examine backward: Execute an examine command with the last specified parameters to it except that the last start address subtracted by the size displayed by it is used as the start address. +.Pp .It Cm print Ns Op Cm /acdoruxz Print .Ar addr Ns s @@ -249,6 +252,7 @@ eax = xxxxxx ecx = yyyyyy .Ed +.Pp .It Xo .Cm write Ns Op Cm /bhl .Ar addr Ar expr1 Op Ar "expr2 ..." @@ -271,6 +275,7 @@ since there is no delimiter between expressions, strange things may happen. It is best to enclose each expression in parentheses. +.Pp .It Xo .Cm set .Li \&$ Ns Ar variable @@ -280,6 +285,7 @@ Set the named variable or register with the value of .Ar expr . Valid variable names are described below. +.Pp .It Cm break Ns Op Cm /u Set a break point at .Ar addr . @@ -311,6 +317,7 @@ user space break points may not work correctly. Setting a break point at the low-level code paths may also cause strange behavior. +.Pp .It Cm delete Ar addr .It Cm delete Li \&# Ns Ar number Delete the break point. @@ -322,6 +329,7 @@ specified in the original .Cm break command. +.Pp .It Cm step Ns Op Cm /p Single step .Ar count @@ -337,6 +345,7 @@ On machines with software-emulated single-stepping (e.g., pmax), stepping through code executed by interrupt handlers will probably do the wrong thing. +.Pp .It Cm continue Ns Op Cm /c Continue execution until a breakpoint or watchpoint. If the @@ -348,6 +357,7 @@ when counting, the debugger is really silently single-stepping. This means that single-stepping on low-level code may cause strange behavior. +.Pp .It Cm until Ns Op Cm /p Stop at the next call or return instruction. If the @@ -356,6 +366,7 @@ cumulative instruction count at each call or return. Otherwise, only print when the matching return is hit. +.Pp .It Cm next Ns Op Cm /p .It Cm match Ns Op Cm /p Stop at the matching return instruction. @@ -364,6 +375,7 @@ modifier is specified, print the call nesting depth and the cumulative instruction count at each call or return. Otherwise, only print when the matching return is hit. +.Pp .It Xo .Cm trace Ns Op Cm /u .Op Ar frame @@ -385,6 +397,7 @@ .Sy Warning : User space stack trace is valid only if the machine dependent code supports it. +.Pp .It Xo .Cm search Ns Op Cm /bhl .Ar addr @@ -400,6 +413,7 @@ The optional .Ar count argument limits the search. +.Pp .It Cm show all procs Ns Op Cm /m .It Cm ps Ns Op Cm /m Display all process information. @@ -410,6 +424,7 @@ .Li m modifier will alter the display to show VM map addresses for the process and not show other info. +.Pp .It Cm show registers Ns Op Cm /u Display the register set. If the @@ -422,6 +437,7 @@ .Li u modifier depends on the machine. If not supported, incorrect information will be displayed. +.Pp .It Cm show geom Op Ar addr If the .Ar addr @@ -430,6 +446,7 @@ .Ar addr is given, displays details about the given GEOM object (class, geom, provider or consumer). +.Pp .It Xo .Cm show map Ns Op Cm /f .Ar addr @@ -440,6 +457,7 @@ .Li f modifier is specified the complete map is printed. +.Pp .It Xo .Cm show object Ns Op Cm /f .Ar addr @@ -450,12 +468,16 @@ .Li f option is specified the complete object is printed. +.Pp .It Cm show vnode Ar addr Displays details about the given vnode. +.Pp .It Cm "show watches" Displays all watchpoints. +.Pp .It Cm reset Hard reset the system. +.Pp .It Xo .Cm watch .Ar addr Ns Li \&, Ns Ar size @@ -472,6 +494,7 @@ Attempts to watch wired kernel memory may cause unrecoverable error in some systems such as i386. Watchpoints on user addresses work best. +.Pp .It Xo .Cm hwatch .Ar addr Ns Li \&, Ns Ar size @@ -490,11 +513,13 @@ .Cm hwatch for setting watchpoints on kernel address locations only, and avoid its use on user mode address spaces. +.Pp .It Xo .Cm dhwatch .Ar addr Ns Li \&, Ns Ar size .Xc Delete specified hardware watchpoint. +.Pp .It Cm gdb Toggles between remote GDB and DDB mode. In remote GDB mode, another machine is required that runs @@ -504,6 +529,7 @@ Currently only available on the .Em i386 architecture. +.Pp .It Cm help Print a short summary of the available commands and command abbreviations. ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.66 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.67 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.64 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.65 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.55 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.56 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.65 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.66 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ #include "opt_compat.h" ==== //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#7 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -141,7 +141,7 @@ 61 AUE_CHROOT NOPROTO { int chroot(char *path); } 62 AUE_FSTAT OBSOL ofstat 63 AUE_NULL OBSOL ogetkerninfo -64 AUE_GETPAGESIZE OBSOL ogetpagesize +64 AUE_NULL OBSOL ogetpagesize ; XXX implement (not OBSOL at all) 65 AUE_MSYNC NOPROTO { int msync(void *addr, size_t len, \ int flags); } ==== //depot/projects/dtrace/src/sys/dev/aic/aic_pccard.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic/aic_pccard.c,v 1.17 2005/09/20 19:45:08 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic/aic_pccard.c,v 1.18 2006/10/03 04:51:18 imp Exp $"); #include #include @@ -54,7 +54,7 @@ static int aic_pccard_probe(device_t); static int aic_pccard_attach(device_t); -const struct pccard_product aic_pccard_products[] = { +static const struct pccard_product aic_pccard_products[] = { PCMCIA_CARD(ADAPTEC, APA1460), PCMCIA_CARD(ADAPTEC, APA1460A), PCMCIA_CARD(NEWMEDIA, BUSTOASTER), ==== //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#12 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.149 2006/09/23 18:55:49 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.150 2006/10/03 09:31:49 glebius Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -191,7 +191,6 @@ { SK_VENDORID, SK_DEVICEID_ALTIMA }, - { TC_VENDORID, TC_DEVICEID_3C985 }, { TC_VENDORID, TC_DEVICEID_3C996 }, { 0, 0 } ==== //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#8 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.55 2006/09/09 03:36:57 ambrisko Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.56 2006/10/03 09:31:49 glebius Exp $ */ /* @@ -2027,10 +2027,9 @@ #define ALTEON_DEVICEID_BCM5701 0x0004 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 4 21:44:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41C3416A417; Wed, 4 Oct 2006 21:44:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0262016A416 for ; Wed, 4 Oct 2006 21:44:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28AB943D58 for ; Wed, 4 Oct 2006 21:44:04 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k94Li4wr013216 for ; Wed, 4 Oct 2006 21:44:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k94Li3IZ013204 for perforce@freebsd.org; Wed, 4 Oct 2006 21:44:03 GMT (envelope-from jb@freebsd.org) Date: Wed, 4 Oct 2006 21:44:03 GMT Message-Id: <200610042144.k94Li3IZ013204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 21:44:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=107272 Change 107272 by jb@jb_freebsd7 on 2006/10/04 21:44:00 Loopback from current. Affected files ... .. //depot/projects/dtrace/src/sys/amd64/include/elf.h#4 integrate .. //depot/projects/dtrace/src/sys/arm/include/elf.h#5 integrate .. //depot/projects/dtrace/src/sys/i386/include/elf.h#4 integrate .. //depot/projects/dtrace/src/sys/ia64/include/elf.h#4 integrate .. //depot/projects/dtrace/src/sys/powerpc/include/elf.h#4 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/elf.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/elf32.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/elf64.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/elf_common.h#6 integrate Differences ... ==== //depot/projects/dtrace/src/sys/amd64/include/elf.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/elf.h,v 1.18 2004/08/03 08:21:48 dfr Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.19 2006/10/04 21:37:09 jb Exp $ */ #ifndef _MACHINE_ELF_H_ ==== //depot/projects/dtrace/src/sys/arm/include/elf.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/elf.h,v 1.7 2006/08/24 23:00:03 cognet Exp $ + * $FreeBSD: src/sys/arm/include/elf.h,v 1.8 2006/10/04 21:37:09 jb Exp $ */ #ifndef _MACHINE_ELF_H_ ==== //depot/projects/dtrace/src/sys/i386/include/elf.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/i386/include/elf.h,v 1.16 2004/08/02 19:12:17 dfr Exp $ + * $FreeBSD: src/sys/i386/include/elf.h,v 1.17 2006/10/04 21:37:09 jb Exp $ */ #ifndef _MACHINE_ELF_H_ ==== //depot/projects/dtrace/src/sys/ia64/include/elf.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/ia64/include/elf.h,v 1.14 2006/01/28 17:58:22 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/elf.h,v 1.15 2006/10/04 21:37:09 jb Exp $ */ #ifndef _MACHINE_ELF_H_ ==== //depot/projects/dtrace/src/sys/powerpc/include/elf.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/elf.h,v 1.7 2004/11/02 09:47:01 ssouhlal Exp $ + * $FreeBSD: src/sys/powerpc/include/elf.h,v 1.8 2006/10/04 21:37:10 jb Exp $ */ #ifndef _MACHINE_ELF_H_ ==== //depot/projects/dtrace/src/sys/sparc64/include/elf.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/sparc64/include/elf.h,v 1.14 2005/12/07 03:41:12 obrien Exp $ + * $FreeBSD: src/sys/sparc64/include/elf.h,v 1.15 2006/10/04 21:37:10 jb Exp $ */ #ifndef _MACHINE_ELF_H_ ==== //depot/projects/dtrace/src/sys/sys/elf32.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/sys/elf32.h,v 1.11 2005/12/18 19:43:33 kan Exp $ + * $FreeBSD: src/sys/sys/elf32.h,v 1.12 2006/10/04 21:37:10 jb Exp $ */ #ifndef _SYS_ELF32_H_ ==== //depot/projects/dtrace/src/sys/sys/elf64.h#6 (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/sys/elf64.h,v 1.15 2006/05/12 05:04:46 jhb Exp $ + * $FreeBSD: src/sys/sys/elf64.h,v 1.16 2006/10/04 21:37:10 jb Exp $ */ #ifndef _SYS_ELF64_H_ ==== //depot/projects/dtrace/src/sys/sys/elf_common.h#6 (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/sys/elf_common.h,v 1.19 2006/05/31 13:47:32 maxim Exp $ + * $FreeBSD: src/sys/sys/elf_common.h,v 1.20 2006/10/04 21:37:10 jb Exp $ */ #ifndef _SYS_ELF_COMMON_H_ From owner-p4-projects@FreeBSD.ORG Wed Oct 4 23:04: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 E497816A416; Wed, 4 Oct 2006 23:04:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9819716A40F for ; Wed, 4 Oct 2006 23:04:47 +0000 (UTC) (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 4C10B43D53 for ; Wed, 4 Oct 2006 23:04:47 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k94N4lpp038781 for ; Wed, 4 Oct 2006 23:04:47 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k94N4ltM038773 for perforce@freebsd.org; Wed, 4 Oct 2006 23:04:47 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Oct 2006 23:04:47 GMT Message-Id: <200610042304.k94N4ltM038773@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 107275 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 23:04:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=107275 Change 107275 by imp@imp_lighthouse on 2006/10/04 23:03:50 30MHz works too, you know... Use it instead. Don't know why 15MHz was selected, nor why Linux limits the speed to 25MHz. This shaves 2s off the boot time. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#11 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#11 (text+ko) ==== @@ -83,7 +83,6 @@ } while( !(status & AT91C_MCI_NOTBUSY) && (timeout>0) ); - //TODO: Make interrupts work! AT91F_MCI_Handler(); } @@ -96,35 +95,6 @@ AT91S_MCIDeviceStatus status; int sizeToWrite; - //See if we are requested to write partial sectors, and have the capability to do so - if ((length % sectorLength) && !(MCI_Device_Features.Write_Partial)) - //Return error if appropriat - return MCI_UNSUPP_SIZE_ERROR; - - //See if we are requested to write to anywhere but a sectors' boundary - //and have the capability to do so - if ((offset) && !(MCI_Device_Features.Write_Partial)) - //Return error if appropriat - return MCI_UNSUPP_OFFSET_ERROR; - - //If the address we're trying to write != sector boundary - if (offset) - { - //* Wait MCI Device Ready - AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT); - - //Calculate the nr of bytes to write - sizeToWrite = sectorLength - offset; - //Do the writing - status = AT91F_MCI_WriteBlock(&MCI_Device, dest, (unsigned int*)source, sizeToWrite); - //TODO:Status checking - - //Update counters & pointers - length -= sizeToWrite; - dest += sizeToWrite; - source += sizeToWrite; - } - //As long as there is data to write while (length) { @@ -257,7 +227,7 @@ AT91F_MCI_Configure(AT91C_BASE_MCI, AT91C_MCI_DTOR_1MEGA_CYCLES, - AT91C_MCI_MR_PDCMODE, // 15MHz for MCK = 60MHz (CLKDIV = 1) + AT91C_MCI_PDCMODE, AT91C_MCI_SDCARD_4BITS_SLOTA); if (AT91F_MCI_SDCard_Init(&MCI_Device) != AT91C_INIT_OK) From owner-p4-projects@FreeBSD.ORG Wed Oct 4 23:13: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 B03EA16A412; Wed, 4 Oct 2006 23:13:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 738F816A407 for ; Wed, 4 Oct 2006 23:13:59 +0000 (UTC) (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 0DFAB43D46 for ; Wed, 4 Oct 2006 23:13:59 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k94NDwR9041483 for ; Wed, 4 Oct 2006 23:13:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k94NDwkg041480 for perforce@freebsd.org; Wed, 4 Oct 2006 23:13:58 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Oct 2006 23:13:58 GMT Message-Id: <200610042313.k94NDwkg041480@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 107276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 23:14:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=107276 Change 107276 by imp@imp_lighthouse on 2006/10/04 23:13:03 GC Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#5 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#5 (text+ko) ==== @@ -38,10 +38,10 @@ //*---------------------------------------------------------------------------- static inline void AT91F_PMC_EnablePeriphClock ( - AT91PS_PMC pPMC, // \arg pointer to PMC controller - unsigned int periphIds) // \arg IDs of peripherals to enable + AT91PS_PMC pPMC, // \arg pointer to PMC controller + unsigned int periphIds) // \arg IDs of peripherals to enable { - pPMC->PMC_PCER = periphIds; + pPMC->PMC_PCER = periphIds; } /* ***************************************************************************** @@ -68,12 +68,6 @@ /* ***************************************************************************** SOFTWARE API FOR MCI ***************************************************************************** */ -//* Classic MCI Mode Register Configuration with PDC mode enabled and MCK = MCI Clock -#define AT91C_MCI_MR_PDCMODE (AT91C_MCI_CLKDIV |\ - AT91C_MCI_PWSDIV |\ - (AT91C_MCI_PWSDIV<<1) |\ - AT91C_MCI_PDCMODE) - //* Classic MCI Data Timeout Register Configuration with 1048576 MCK cycles between 2 data transfer #define AT91C_MCI_DTOR_1MEGA_CYCLES (AT91C_MCI_DTOCYC | AT91C_MCI_DTOMUL) @@ -119,242 +113,6 @@ } //*---------------------------------------------------------------------------- -//* \fn AT91F_MCI_EnableIt -//* \brief Enable MCI IT -//*---------------------------------------------------------------------------- -static inline -void AT91F_MCI_EnableIt( - AT91PS_MCI pMCI, // \arg pointer to a MCI controller - unsigned int flag) // \arg IT to be enabled -{ - //* Write to the IER register - pMCI->MCI_IER = flag; -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_MCI_DisableIt -//* \brief Disable MCI IT -//*---------------------------------------------------------------------------- -static inline -void AT91F_MCI_DisableIt( - AT91PS_MCI pMCI, // \arg pointer to a MCI controller - unsigned int flag) // \arg IT to be disabled -{ - //* Write to the IDR register - pMCI->MCI_IDR = flag; -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_MCI_Enable_Interface -//* \brief Enable the MCI Interface -//*---------------------------------------------------------------------------- -static inline -void AT91F_MCI_Enable_Interface( - AT91PS_MCI pMCI) // \arg pointer to a MCI controller -{ - //* Enable the MCI - pMCI->MCI_CR = AT91C_MCI_MCIEN; -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_MCI_Disable_Interface -//* \brief Disable the MCI Interface -//*---------------------------------------------------------------------------- -static inline -void AT91F_MCI_Disable_Interface( - AT91PS_MCI pMCI) // \arg pointer to a MCI controller -{ - //* Disable the MCI - pMCI->MCI_CR = AT91C_MCI_MCIDIS; -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_MCI_Cfg_ModeRegister -//* \brief Configure the MCI Mode Register -//*---------------------------------------------------------------------------- -static inline -void AT91F_MCI_Cfg_ModeRegister( - AT91PS_MCI pMCI, // \arg pointer to a MCI controller - unsigned int mode_register) // \arg value to set in the mode register -{ - //* Configure the MCI MR - pMCI->MCI_MR = mode_register; -} - -/* ***************************************************************************** - SOFTWARE API FOR AIC - ***************************************************************************** */ -#define AT91C_AIC_BRANCH_OPCODE ((void (*) ()) 0xE51FFF20) // ldr, pc, [pc, #-&F20] - -//*---------------------------------------------------------------------------- -//* \fn AT91F_AIC_ConfigureIt -//* \brief Interrupt Handler Initialization -//*---------------------------------------------------------------------------- -static inline unsigned int -AT91F_AIC_ConfigureIt( - AT91PS_AIC pAic, // \arg pointer to the AIC registers - unsigned int irq_id, // \arg interrupt number to initialize - unsigned int priority, // \arg priority to give to the interrupt - unsigned int src_type, // \arg activation and sense of activation - void (*newHandler) (void) ) // \arg address of the interrupt handler -{ - unsigned int oldHandler; - unsigned int mask ; - - oldHandler = pAic->AIC_SVR[irq_id]; - - mask = 0x1 << irq_id ; - //* Disable the interrupt on the interrupt controller - pAic->AIC_IDCR = mask ; - //* Save the interrupt handler routine pointer and the interrupt priority - pAic->AIC_SVR[irq_id] = (unsigned int) newHandler ; - //* Store the Source Mode Register - pAic->AIC_SMR[irq_id] = src_type | priority ; - //* Clear the interrupt on the interrupt controller - pAic->AIC_ICCR = mask ; - - return oldHandler; -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_AIC_EnableIt -//* \brief Enable corresponding IT number -//*---------------------------------------------------------------------------- -static inline -void AT91F_AIC_EnableIt( - AT91PS_AIC pAic, // \arg pointer to the AIC registers - unsigned int irq_id ) // \arg interrupt number to initialize -{ - //* Enable the interrupt on the interrupt controller - pAic->AIC_IECR = 0x1 << irq_id ; -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_AIC_DisableIt -//* \brief Disable corresponding IT number -//*---------------------------------------------------------------------------- -static inline void -AT91F_AIC_DisableIt( - AT91PS_AIC pAic, // \arg pointer to the AIC registers - unsigned int irq_id ) // \arg interrupt number to initialize -{ - unsigned int mask = 0x1 << irq_id; - //* Disable the interrupt on the interrupt controller - pAic->AIC_IDCR = mask ; - //* Clear the interrupt on the Interrupt Controller ( if one is pending ) - pAic->AIC_ICCR = mask ; -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_AIC_ClearIt -//* \brief Clear corresponding IT number -//*---------------------------------------------------------------------------- -static inline void -AT91F_AIC_ClearIt( - AT91PS_AIC pAic, // \arg pointer to the AIC registers - unsigned int irq_id) // \arg interrupt number to initialize -{ - //* Clear the interrupt on the Interrupt Controller ( if one is pending ) - pAic->AIC_ICCR = (0x1 << irq_id); -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_AIC_AcknowledgeIt -//* \brief Acknowledge corresponding IT number -//*---------------------------------------------------------------------------- -static inline void -AT91F_AIC_AcknowledgeIt( - AT91PS_AIC pAic) // \arg pointer to the AIC registers -{ - pAic->AIC_EOICR = pAic->AIC_EOICR; -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_AIC_SetExceptionVector -//* \brief Configure vector handler -//*---------------------------------------------------------------------------- -static inline unsigned int -AT91F_AIC_SetExceptionVector( - unsigned int *pVector, // \arg pointer to the AIC registers - void (*Handler)(void) ) // \arg Interrupt Handler -{ - unsigned int oldVector = *pVector; - - if ((unsigned int) Handler == (unsigned int) AT91C_AIC_BRANCH_OPCODE) - *pVector = (unsigned int) AT91C_AIC_BRANCH_OPCODE; - else - *pVector = (((((unsigned int) Handler) - ((unsigned int) pVector) - 0x8) >> 2) & 0x00FFFFFF) | 0xEA000000; - - return oldVector; -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_AIC_Trig -//* \brief Trig an IT -//*---------------------------------------------------------------------------- -static inline void -AT91F_AIC_Trig( - AT91PS_AIC pAic, // \arg pointer to the AIC registers - unsigned int irq_id) // \arg interrupt number -{ - pAic->AIC_ISCR = (0x1 << irq_id) ; -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_AIC_IsActive -//* \brief Test if an IT is active -//*---------------------------------------------------------------------------- -static inline unsigned int -AT91F_AIC_IsActive( - AT91PS_AIC pAic, // \arg pointer to the AIC registers - unsigned int irq_id) // \arg Interrupt Number -{ - return (pAic->AIC_ISR & (0x1 << irq_id)); -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_AIC_IsPending -//* \brief Test if an IT is pending -//*---------------------------------------------------------------------------- -static inline unsigned int -AT91F_AIC_IsPending( - AT91PS_AIC pAic, // \arg pointer to the AIC registers - unsigned int irq_id) // \arg Interrupt Number -{ - return (pAic->AIC_IPR & (0x1 << irq_id)); -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_AIC_Open -//* \brief Set exception vectors and AIC registers to default values -//*---------------------------------------------------------------------------- -static inline void -AT91F_AIC_Open( - AT91PS_AIC pAic, // \arg pointer to the AIC registers - void (*IrqHandler)(void), // \arg Default IRQ vector exception - void (*FiqHandler)(void), // \arg Default FIQ vector exception - void (*DefaultHandler)(void), // \arg Default Handler set in ISR - void (*SpuriousHandler)(void), // \arg Default Spurious Handler - unsigned int protectMode) // \arg Debug Control Register -{ - int i; - - // Disable all interrupts and set IVR to the default handler - for (i = 0; i < 32; ++i) { - AT91F_AIC_DisableIt(pAic, i); - AT91F_AIC_ConfigureIt(pAic, i, AT91C_AIC_PRIOR_LOWEST, AT91C_AIC_SRCTYPE_INT_LEVEL_SENSITIVE, DefaultHandler); - } - - // Set the IRQ exception vector - AT91F_AIC_SetExceptionVector((unsigned int *) 0x18, IrqHandler); - // Set the Fast Interrupt exception vector - AT91F_AIC_SetExceptionVector((unsigned int *) 0x1C, FiqHandler); - - pAic->AIC_SPU = (unsigned int) SpuriousHandler; - pAic->AIC_DCR = protectMode; -} - -//*---------------------------------------------------------------------------- //* \fn AT91F_MCI_CfgPMC //* \brief Enable Peripheral clock in PMC for MCI //*---------------------------------------------------------------------------- @@ -494,50 +252,6 @@ } //*---------------------------------------------------------------------------- -//* \fn AT91F_PDC_IsTxEmpty -//* \brief Test if the current transfer descriptor has been sent -//*---------------------------------------------------------------------------- -static inline int -AT91F_PDC_IsTxEmpty( // \return return 1 if transfer is complete - AT91PS_PDC pPDC ) // \arg pointer to a PDC controller -{ - return !(pPDC->PDC_TCR); -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_PDC_IsNextTxEmpty -//* \brief Test if the next transfer descriptor has been moved to the current td -//*---------------------------------------------------------------------------- -static inline int -AT91F_PDC_IsNextTxEmpty( // \return return 1 if transfer is complete - AT91PS_PDC pPDC ) // \arg pointer to a PDC controller -{ - return !(pPDC->PDC_TNCR); -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_PDC_IsRxEmpty -//* \brief Test if the current transfer descriptor has been filled -//*---------------------------------------------------------------------------- -static inline int -AT91F_PDC_IsRxEmpty( // \return return 1 if transfer is complete - AT91PS_PDC pPDC ) // \arg pointer to a PDC controller -{ - return !(pPDC->PDC_RCR); -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_PDC_IsNextRxEmpty -//* \brief Test if the next transfer descriptor has been moved to the current td -//*---------------------------------------------------------------------------- -static inline int -AT91F_PDC_IsNextRxEmpty( // \return return 1 if transfer is complete - AT91PS_PDC pPDC ) // \arg pointer to a PDC controller -{ - return !(pPDC->PDC_RNCR); -} - -//*---------------------------------------------------------------------------- //* \fn AT91F_PDC_Open //* \brief Open PDC: disable TX and RX reset transfer descriptors, re-enable RX and TX //*---------------------------------------------------------------------------- @@ -560,82 +274,4 @@ AT91F_PDC_EnableTx(pPDC); } -//*---------------------------------------------------------------------------- -//* \fn AT91F_PDC_Close -//* \brief Close PDC: disable TX and RX reset transfer descriptors -//*---------------------------------------------------------------------------- -static inline void -AT91F_PDC_Close( - AT91PS_PDC pPDC) // \arg pointer to a PDC controller -{ - //* Disable the RX and TX PDC transfer requests - AT91F_PDC_DisableRx(pPDC); - AT91F_PDC_DisableTx(pPDC); - - //* Reset all Counter register Next buffer first - AT91F_PDC_SetNextTx(pPDC, (char *) 0, 0); - AT91F_PDC_SetNextRx(pPDC, (char *) 0, 0); - AT91F_PDC_SetTx(pPDC, (char *) 0, 0); - AT91F_PDC_SetRx(pPDC, (char *) 0, 0); - -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_PDC_SendFrame -//* \brief Close PDC: disable TX and RX reset transfer descriptors -//*---------------------------------------------------------------------------- -static inline unsigned int -AT91F_PDC_SendFrame( - AT91PS_PDC pPDC, - char *pBuffer, - unsigned int szBuffer, - char *pNextBuffer, - unsigned int szNextBuffer ) -{ - if (AT91F_PDC_IsTxEmpty(pPDC)) { - //* Buffer and next buffer can be initialized - AT91F_PDC_SetTx(pPDC, pBuffer, szBuffer); - AT91F_PDC_SetNextTx(pPDC, pNextBuffer, szNextBuffer); - return 2; - } - else if (AT91F_PDC_IsNextTxEmpty(pPDC)) { - //* Only one buffer can be initialized - AT91F_PDC_SetNextTx(pPDC, pBuffer, szBuffer); - return 1; - } - else { - //* All buffer are in use... - return 0; - } -} - -//*---------------------------------------------------------------------------- -//* \fn AT91F_PDC_ReceiveFrame -//* \brief Close PDC: disable TX and RX reset transfer descriptors -//*---------------------------------------------------------------------------- -static inline unsigned int -AT91F_PDC_ReceiveFrame( - AT91PS_PDC pPDC, - char *pBuffer, - unsigned int szBuffer, - char *pNextBuffer, - unsigned int szNextBuffer ) -{ - if (AT91F_PDC_IsRxEmpty(pPDC)) { - //* Buffer and next buffer can be initialized - AT91F_PDC_SetRx(pPDC, pBuffer, szBuffer); - AT91F_PDC_SetNextRx(pPDC, pNextBuffer, szNextBuffer); - return 2; - } - else if (AT91F_PDC_IsNextRxEmpty(pPDC)) { - //* Only one buffer can be initialized - AT91F_PDC_SetNextRx(pPDC, pBuffer, szBuffer); - return 1; - } - else { - //* All buffer are in use... - return 0; - } -} - #endif From owner-p4-projects@FreeBSD.ORG Wed Oct 4 23:26: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 17DE616A416; Wed, 4 Oct 2006 23:26:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D2CE216A403 for ; Wed, 4 Oct 2006 23:26:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AA0143D46 for ; Wed, 4 Oct 2006 23:26:15 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k94NQFGg048443 for ; Wed, 4 Oct 2006 23:26:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k94NQE8N048440 for perforce@freebsd.org; Wed, 4 Oct 2006 23:26:14 GMT (envelope-from jb@freebsd.org) Date: Wed, 4 Oct 2006 23:26:14 GMT Message-Id: <200610042326.k94NQE8N048440@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107278 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 23:26:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=107278 Change 107278 by jb@jb_freebsd7 on 2006/10/04 23:25:40 Somehow this file didn't get integrated. Perhaps because it was ignored due to having "CVS" in the file name? Trying to reduce diffs between this project and current. Affected files ... .. //depot/projects/dtrace/src/contrib/cvs/DEVEL-CVS#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Oct 4 23:29: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 2BE2616A4A7; Wed, 4 Oct 2006 23:29:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E11EE16A49E for ; Wed, 4 Oct 2006 23:29:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6ECDE43D4C for ; Wed, 4 Oct 2006 23:29:19 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k94NTJUg049170 for ; Wed, 4 Oct 2006 23:29:19 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k94NTJcV049167 for perforce@freebsd.org; Wed, 4 Oct 2006 23:29:19 GMT (envelope-from jb@freebsd.org) Date: Wed, 4 Oct 2006 23:29:19 GMT Message-Id: <200610042329.k94NTJcV049167@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Oct 2006 23:29:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=107279 Change 107279 by jb@jb_freebsd7 on 2006/10/04 23:29:13 Another file with "CVS" in the name that didn't get integrated. Affected files ... .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_CVS#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 5 00:30: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 569B116A416; Thu, 5 Oct 2006 00:30:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F113D16A412 for ; Thu, 5 Oct 2006 00:30:34 +0000 (UTC) (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 BF38343D45 for ; Thu, 5 Oct 2006 00:30:34 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k950UYvF067658 for ; Thu, 5 Oct 2006 00:30:34 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k950UYSW067655 for perforce@freebsd.org; Thu, 5 Oct 2006 00:30:34 GMT (envelope-from imp@freebsd.org) Date: Thu, 5 Oct 2006 00:30:34 GMT Message-Id: <200610050030.k950UYSW067655@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 107281 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Oct 2006 00:30:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=107281 Change 107281 by imp@imp_lighthouse on 2006/10/05 00:29:40 Allocate up to MAXPHYS for transfers. Map data->len rather than block_len, these used to be the same, but if I do multiblock, they will be different. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#23 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#23 (text+ko) ==== @@ -173,8 +173,8 @@ * Allocate DMA tags and maps */ err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, 2058, 1, 2048, BUS_DMA_ALLOCNOW, - NULL, NULL, &sc->dmatag); + BUS_SPACE_MAXADDR, NULL, NULL, MAXPHYS, 1, MAXPHYS, + BUS_DMA_ALLOCNOW, NULL, NULL, &sc->dmatag); if (err != 0) goto out; @@ -364,7 +364,7 @@ bus_addr_t paddr; if (bus_dmamap_load(sc->dmatag, sc->map, vaddr, - block_size, at91_mci_getaddr, &paddr, 0) != 0) { + data->len, at91_mci_getaddr, &paddr, 0) != 0) { if (req->cmd->flags & STOP_STARTED) req->stop->error = MMC_ERR_NO_MEMORY; else From owner-p4-projects@FreeBSD.ORG Thu Oct 5 00:54: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 5EB2816A416; Thu, 5 Oct 2006 00:54:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E949816A40F for ; Thu, 5 Oct 2006 00:54:05 +0000 (UTC) (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 AECBC43D46 for ; Thu, 5 Oct 2006 00:54:05 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k950s5rN082720 for ; Thu, 5 Oct 2006 00:54:05 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k950s5e0082716 for perforce@freebsd.org; Thu, 5 Oct 2006 00:54:05 GMT (envelope-from imp@freebsd.org) Date: Thu, 5 Oct 2006 00:54:05 GMT Message-Id: <200610050054.k950s5e0082716@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 107283 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Oct 2006 00:54:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=107283 Change 107283 by imp@imp_lighthouse on 2006/10/05 00:53:44 First cut at a rock-simple bounce buffer for the stupid write path. Also, first cut at the write path. It seems to work.. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#24 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#24 (text+ko) ==== @@ -61,6 +61,8 @@ #include "mmcbr_if.h" +#define BBSZ 512 + struct at91_mci_softc { void *intrhand; /* Interrupt handle */ device_t dev; @@ -78,6 +80,7 @@ int bus_busy; struct mmc_request *req; struct mmc_command *curcmd; + char bounce_buffer[BBSZ]; }; static inline uint32_t @@ -313,9 +316,13 @@ at91_mci_start_cmd(struct at91_mci_softc *sc, struct mmc_command *cmd) { uint32_t cmdr, ier = 0, mr; + uint32_t *src, *dst; + int i; struct mmc_data *data; struct mmc_request *req; size_t block_size = 1 << 9; // Fixed, per mmc/sd spec for 2GB cards + void *vaddr; + bus_addr_t paddr; sc->curcmd = cmd; data = cmd->data; @@ -358,29 +365,41 @@ WR4(sc, MCI_MR, mr | (block_size << 16) | MCI_MR_PDCMODE); WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS | PDC_PTCR_TXTDIS); if (cmdr & MCI_CMDR_TRCMD_START) { + if (cmdr & MCI_CMDR_TRDIR) + vaddr = cmd->data->data; + else { + if (data->len != BBSZ) + panic("Write multiblock write support"); + vaddr = sc->bounce_buffer; + src = (uint32_t *)cmd->data->data; + dst = (uint32_t *)vaddr; + for (i = 0; i < data->len / 4; i++) + dst[i] = bswap32(src[i]); + } data->xfer_len = 0; + if (bus_dmamap_load(sc->dmatag, sc->map, vaddr, data->len, + at91_mci_getaddr, &paddr, 0) != 0) { + if (req->cmd->flags & STOP_STARTED) + req->stop->error = MMC_ERR_NO_MEMORY; + else + req->cmd->error = MMC_ERR_NO_MEMORY; + sc->req = NULL; + sc->curcmd = NULL; + req->done(req); + return; + } + sc->mapped++; if (cmdr & MCI_CMDR_TRDIR) { - void *vaddr = cmd->data->data; - bus_addr_t paddr; - - if (bus_dmamap_load(sc->dmatag, sc->map, vaddr, - data->len, at91_mci_getaddr, &paddr, 0) != 0) { - if (req->cmd->flags & STOP_STARTED) - req->stop->error = MMC_ERR_NO_MEMORY; - else - req->cmd->error = MMC_ERR_NO_MEMORY; - sc->req = NULL; - sc->curcmd = NULL; - req->done(req); - return; - } - sc->mapped++; bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_PREREAD); WR4(sc, PDC_RPR, paddr); WR4(sc, PDC_RCR, data->len / 4); ier = MCI_SR_ENDRX; - } else - panic("Write write support"); + } else { + bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_PREWRITE); + WR4(sc, PDC_TPR, paddr); + WR4(sc, PDC_TCR, data->len / 4); + ier = MCI_SR_TXBUFE; + } } // printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg); WR4(sc, MCI_ARGR, cmd->arg); @@ -495,6 +514,18 @@ } static void +at91_mci_xmit_done(struct at91_mci_softc *sc) +{ + // Finish up the sequence... + WR4(sc, PDC_PTCR, PDC_PTCR_RXTDIS | PDC_PTCR_TXTDIS); + WR4(sc, MCI_IDR, MCI_SR_TXBUFE); + WR4(sc, MCI_IER, MCI_SR_NOTBUSY); + bus_dmamap_sync(sc->dmatag, sc->map, BUS_DMASYNC_POSTWRITE); + bus_dmamap_unload(sc->dmatag, sc->map); + sc->mapped--; +} + +static void at91_mci_intr(void *arg) { struct at91_mci_softc *sc = (struct at91_mci_softc*)arg; @@ -527,7 +558,7 @@ } else { if (sr & MCI_SR_TXBUFE) { // printf("TXBUFE\n"); -//XXX at91_mci_xmit_done(sc); + at91_mci_xmit_done(sc); } if (sr & MCI_SR_RXBUFF) { // printf("RXBUFF\n"); @@ -543,6 +574,7 @@ } if (sr & MCI_SR_NOTBUSY) { // printf("NOTBUSY\n"); + WR4(sc, MCI_IDR, MCI_SR_NOTBUSY); WR4(sc, MCI_IER, MCI_SR_CMDRDY); } if (sr & MCI_SR_DTIP) { From owner-p4-projects@FreeBSD.ORG Thu Oct 5 00:55: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 4654A16A417; Thu, 5 Oct 2006 00:55:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0CD6516A415 for ; Thu, 5 Oct 2006 00:55:07 +0000 (UTC) (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 83C5F43D49 for ; Thu, 5 Oct 2006 00:55:07 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k950t72N083030 for ; Thu, 5 Oct 2006 00:55:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k950t7HF083027 for perforce@freebsd.org; Thu, 5 Oct 2006 00:55:07 GMT (envelope-from imp@freebsd.org) Date: Thu, 5 Oct 2006 00:55:07 GMT Message-Id: <200610050055.k950t7HF083027@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 107284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Oct 2006 00:55:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=107284 Change 107284 by imp@imp_lighthouse on 2006/10/05 00:54:24 Multi block read support, ifdef'd. It doesn't quite work right for reasons unknown. Committed so I don't lose it. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#10 (text+ko) ==== @@ -52,6 +52,8 @@ struct bio_queue_head bio_queue; }; +#define MULTI_BLOCK_READ_BROKEN + /* bus entry points */ static int mmcsd_probe(device_t dev); static int mmcsd_attach(device_t dev); @@ -143,12 +145,11 @@ struct mmcsd_softc *sc = (struct mmcsd_softc*)arg; struct bio *bp; int sz; - daddr_t end; + daddr_t block, end; struct mmc_command cmd; struct mmc_command stop; struct mmc_request req; struct mmc_data data; - uint32_t block; device_t dev; dev = sc->dev; @@ -166,32 +167,53 @@ sz = sc->disk->d_sectorsize; end = bp->bio_pblkno + (bp->bio_bcount / sz); // XXX should use read/write_mulit - for (block = bp->bio_pblkno; block < end; block++) { + for (block = bp->bio_pblkno; block < end;) { char *vaddr = bp->bio_data + (block - bp->bio_pblkno) * sz; memset(&req, 0, sizeof(req)); memset(&cmd, 0, sizeof(cmd)); memset(&stop, 0, sizeof(stop)); req.cmd = &cmd; cmd.data = &data; -// req.stop = &stop; - if (bp->bio_cmd == BIO_READ) + if (bp->bio_cmd == BIO_READ) { +#ifdef MULTI_BLOCK_READ + if (end - block > 1) + cmd.opcode = MMC_READ_MULTIPLE_BLOCK; + else + cmd.opcode = MMC_READ_SINGLE_BLOCK; +#else cmd.opcode = MMC_READ_SINGLE_BLOCK; - else +#endif + } else cmd.opcode = MMC_WRITE_BLOCK; cmd.arg = block << 9; cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC; // data.timeout_ns = ; // data.timeout_clks = ; - data.len = 512; data.data = vaddr; data.mrq = &req; - if (bp->bio_cmd == BIO_READ) + if (bp->bio_cmd == BIO_READ) { data.flags = MMC_DATA_READ; - else +#ifdef MULTI_BLOCK_READ + data.len = bp->bio_bcount; + if (end - block > 1) { + req.stop = &stop; + data.flags |= MMC_DATA_MULTI; + } + printf("Len %d %lld-%lld flags %#x sz %d\n", + data.len, block, end, data.flags, sz); + block = end; +#else + data.len = sz; + block++; +#endif + } else { data.flags = MMC_DATA_WRITE; -// stop.opcode = MMC_STOP_TRANSMISSION; -// stop.arg = 0; -// stop.flags = MMC_RSP_R1B | MMC_CMD_AC; + data.len = sz; + block++; + } + stop.opcode = MMC_STOP_TRANSMISSION; + stop.arg = 0; + stop.flags = MMC_RSP_R1B | MMC_CMD_AC; MMCBUS_WAIT_FOR_REQUEST(device_get_parent(dev), dev, &req); // XXX error handling From owner-p4-projects@FreeBSD.ORG Thu Oct 5 02:06: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 6B3AF16A47B; Thu, 5 Oct 2006 02:06:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A33716A416 for ; Thu, 5 Oct 2006 02:06:46 +0000 (UTC) (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 8216343D69 for ; Thu, 5 Oct 2006 02:06:41 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9526f31003789 for ; Thu, 5 Oct 2006 02:06:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9526eI7003771 for perforce@freebsd.org; Thu, 5 Oct 2006 02:06:40 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 5 Oct 2006 02:06:40 GMT Message-Id: <200610050206.k9526eI7003771@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 107289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Oct 2006 02:06:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=107289 Change 107289 by kmacy@kmacy_storage:sun4v_work_stable on 2006/10/05 02:05:59 IFC Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/configure.ac#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/include/elf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/add.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/label.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/remove.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ipfw/ipfw.8#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/Makefile#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/kqueue.9#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/amd64/include/elf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/arm/include/elf.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/conf/files#6 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-lowlevel.c#3 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/ata/ata-queue.c#4 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/i386/include/elf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/ia64/include/elf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/elf32.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/elf64.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/elf_common.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/signalvar.h#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/tools/tools/tinybsd/tinybsd#2 integrate Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/configure.ac#3 (text+ko) ==== @@ -1,5 +1,4 @@ -# $Id: configure.ac,v 1.367 2006/09/24 19:08:59 tim Exp $ -# $FreeBSD: src/crypto/openssh/configure.ac,v 1.14 2006/09/30 13:38:04 des Exp $ +# $Id: configure.ac,v 1.369 2006/10/03 16:34:35 tim Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -16,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) -AC_REVISION($Revision: 1.367 $) +AC_REVISION($Revision: 1.369 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -128,6 +127,136 @@ ] ) +# Allow user to specify flags +AC_ARG_WITH(cflags, + [ --with-cflags Specify additional flags to pass to compiler], + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + CFLAGS="$CFLAGS $withval" + fi + ] +) +AC_ARG_WITH(cppflags, + [ --with-cppflags Specify additional flags to pass to preprocessor] , + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + CPPFLAGS="$CPPFLAGS $withval" + fi + ] +) +AC_ARG_WITH(ldflags, + [ --with-ldflags Specify additional flags to pass to linker], + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + LDFLAGS="$LDFLAGS $withval" + fi + ] +) +AC_ARG_WITH(libs, + [ --with-libs Specify additional libraries to link with], + [ + if test -n "$withval" && test "x$withval" != "xno" && \ + test "x${withval}" != "xyes"; then + LIBS="$LIBS $withval" + fi + ] +) +AC_ARG_WITH(Werror, + [ --with-Werror Build main code with -Werror], + [ + if test -n "$withval" && test "x$withval" != "xno"; then + werror_flags="-Werror" + if test "x${withval}" != "xyes"; then + werror_flags="$withval" + fi + fi + ] +) + +AC_CHECK_HEADERS( \ + bstring.h \ + crypt.h \ + crypto/sha2.h \ + dirent.h \ + endian.h \ + features.h \ + fcntl.h \ + floatingpoint.h \ + getopt.h \ + glob.h \ + ia.h \ + iaf.h \ + limits.h \ + login.h \ + maillock.h \ + ndir.h \ + net/if_tun.h \ + netdb.h \ + netgroup.h \ + pam/pam_appl.h \ + paths.h \ + pty.h \ + readpassphrase.h \ + rpc/types.h \ + security/pam_appl.h \ + sha2.h \ + shadow.h \ + stddef.h \ + stdint.h \ + string.h \ + strings.h \ + sys/audit.h \ + sys/bitypes.h \ + sys/bsdtty.h \ + sys/cdefs.h \ + sys/dir.h \ + sys/mman.h \ + sys/ndir.h \ + sys/prctl.h \ + sys/pstat.h \ + sys/select.h \ + sys/stat.h \ + sys/stream.h \ + sys/stropts.h \ + sys/strtio.h \ + sys/sysmacros.h \ + sys/time.h \ + sys/timers.h \ + sys/un.h \ + time.h \ + tmpdir.h \ + ttyent.h \ + unistd.h \ + usersec.h \ + util.h \ + utime.h \ + utmp.h \ + utmpx.h \ + vis.h \ +) + +# lastlog.h requires sys/time.h to be included first on Solaris +AC_CHECK_HEADERS(lastlog.h, [], [], [ +#ifdef HAVE_SYS_TIME_H +# include +#endif +]) + +# sys/ptms.h requires sys/stream.h to be included first on Solaris +AC_CHECK_HEADERS(sys/ptms.h, [], [], [ +#ifdef HAVE_SYS_STREAM_H +# include +#endif +]) + +# login_cap.h requires sys/types.h on NetBSD +AC_CHECK_HEADERS(login_cap.h, [], [], [ +#include +]) + # Messages for features tested for in target-specific section SIA_MSG="no" SPC_MSG="no" @@ -664,55 +793,6 @@ ;; esac -# Allow user to specify flags -AC_ARG_WITH(cflags, - [ --with-cflags Specify additional flags to pass to compiler], - [ - if test -n "$withval" && test "x$withval" != "xno" && \ - test "x${withval}" != "xyes"; then - CFLAGS="$CFLAGS $withval" - fi - ] -) -AC_ARG_WITH(cppflags, - [ --with-cppflags Specify additional flags to pass to preprocessor] , - [ - if test -n "$withval" && test "x$withval" != "xno" && \ - test "x${withval}" != "xyes"; then - CPPFLAGS="$CPPFLAGS $withval" - fi - ] -) -AC_ARG_WITH(ldflags, - [ --with-ldflags Specify additional flags to pass to linker], - [ - if test -n "$withval" && test "x$withval" != "xno" && \ - test "x${withval}" != "xyes"; then - LDFLAGS="$LDFLAGS $withval" - fi - ] -) -AC_ARG_WITH(libs, - [ --with-libs Specify additional libraries to link with], - [ - if test -n "$withval" && test "x$withval" != "xno" && \ - test "x${withval}" != "xyes"; then - LIBS="$LIBS $withval" - fi - ] -) -AC_ARG_WITH(Werror, - [ --with-Werror Build main code with -Werror], - [ - if test -n "$withval" && test "x$withval" != "xno"; then - werror_flags="-Werror" - if test "x${withval}" != "xyes"; then - werror_flags="$withval" - fi - fi - ] -) - AC_MSG_CHECKING(compiler and flags for sanity) AC_RUN_IFELSE( [AC_LANG_SOURCE([ @@ -728,87 +808,6 @@ ) dnl Checks for header files. -AC_CHECK_HEADERS( \ - bstring.h \ - crypt.h \ - crypto/sha2.h \ - dirent.h \ - endian.h \ - features.h \ - fcntl.h \ - floatingpoint.h \ - getopt.h \ - glob.h \ - ia.h \ - iaf.h \ - limits.h \ - login.h \ - maillock.h \ - ndir.h \ - net/if_tun.h \ - netdb.h \ - netgroup.h \ - pam/pam_appl.h \ - paths.h \ - pty.h \ - readpassphrase.h \ - rpc/types.h \ - security/pam_appl.h \ - sha2.h \ - shadow.h \ - stddef.h \ - stdint.h \ - string.h \ - strings.h \ - sys/audit.h \ - sys/bitypes.h \ - sys/bsdtty.h \ - sys/cdefs.h \ - sys/dir.h \ - sys/mman.h \ - sys/ndir.h \ - sys/prctl.h \ - sys/pstat.h \ - sys/select.h \ - sys/stat.h \ - sys/stream.h \ - sys/stropts.h \ - sys/strtio.h \ - sys/sysmacros.h \ - sys/time.h \ - sys/timers.h \ - sys/un.h \ - time.h \ - tmpdir.h \ - ttyent.h \ - unistd.h \ - usersec.h \ - util.h \ - utime.h \ - utmp.h \ - utmpx.h \ - vis.h \ -) - -# lastlog.h requires sys/time.h to be included first on Solaris -AC_CHECK_HEADERS(lastlog.h, [], [], [ -#ifdef HAVE_SYS_TIME_H -# include -#endif -]) - -# sys/ptms.h requires sys/stream.h to be included first on Solaris -AC_CHECK_HEADERS(sys/ptms.h, [], [], [ -#ifdef HAVE_SYS_STREAM_H -# include -#endif -]) - -# login_cap.h requires sys/types.h on NetBSD -AC_CHECK_HEADERS(login_cap.h, [], [], [ -#include -]) - # Checks for libraries. AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match)) AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) @@ -1952,7 +1951,7 @@ AC_TRY_COMPILE( [ #include ], [ -int main(void){ENGINE_load_builtin_engines();ENGINE_register_all_complete();} +ENGINE_load_builtin_engines();ENGINE_register_all_complete(); ], [ AC_MSG_RESULT(yes) AC_DEFINE(USE_OPENSSL_ENGINE, 1, ==== //depot/projects/kmacy_sun4v_stable/src/include/elf.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/elf.h,v 1.8 2002/07/04 11:05:39 markm Exp $ + * $FreeBSD: src/include/elf.h,v 1.9 2006/10/04 07:25:55 jb Exp $ */ /* @@ -38,4 +38,8 @@ #include #include +#ifdef _SOLARIS_C_SOURCE +#include +#endif + #endif /* !_ELF_H_ */ ==== //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/add.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.15 2006/10/04 18:20:25 marcel Exp $"); #include @@ -163,7 +163,7 @@ case 'b': if (block > 0) usage_add(); - block = strtol(optarg, &p, 10); + block = strtoll(optarg, &p, 10); if (*p != 0 || block < 1) usage_add(); break; @@ -177,7 +177,7 @@ case 's': if (size > 0) usage_add(); - size = strtol(optarg, &p, 10); + size = strtoll(optarg, &p, 10); if (*p != 0 || size < 1) usage_add(); break; ==== //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/label.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.2 2006/06/22 22:05:28 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.3 2006/10/04 18:20:25 marcel Exp $"); #include @@ -184,7 +184,7 @@ case 'b': if (block > 0) usage_label(); - block = strtol(optarg, &p, 10); + block = strtoll(optarg, &p, 10); if (*p != 0 || block < 1) usage_label(); break; @@ -208,7 +208,7 @@ case 's': if (size > 0) usage_label(); - size = strtol(optarg, &p, 10); + size = strtoll(optarg, &p, 10); if (*p != 0 || size < 1) usage_label(); break; ==== //depot/projects/kmacy_sun4v_stable/src/sbin/gpt/remove.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.9 2006/06/22 22:05:28 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.10 2006/10/04 18:20:25 marcel Exp $"); #include @@ -155,7 +155,7 @@ case 'b': if (block > 0) usage_remove(); - block = strtol(optarg, &p, 10); + block = strtoll(optarg, &p, 10); if (*p != 0 || block < 1) usage_remove(); break; @@ -169,7 +169,7 @@ case 's': if (size > 0) usage_remove(); - size = strtol(optarg, &p, 10); + size = strtoll(optarg, &p, 10); if (*p != 0 || size < 1) usage_remove(); break; ==== //depot/projects/kmacy_sun4v_stable/src/sbin/ipfw/ipfw.8#6 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.195 2006/09/18 11:55:10 ru Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.196 2006/10/04 19:29:05 keramida Exp $ .\" .Dd July 25, 2006 .Dt IPFW 8 @@ -951,20 +951,20 @@ .It Ar addr Ns / Ns Ar masklen Matches all addresses with base .Ar addr -(specified as an IP address or a hostname) +(specified as an IP address, a network number, or a hostname) and mask width of .Cm masklen bits. -As an example, 1.2.3.4/25 will match +As an example, 1.2.3.4/25 or 1.2.3.0/25 will match all IP numbers from 1.2.3.0 to 1.2.3.127 . .It Ar addr Ns : Ns Ar mask Matches all addresses with base .Ar addr -(specified as an IP address or a hostname) +(specified as an IP address, a network number, or a hostname) and the mask of .Ar mask , specified as a dotted quad. -As an example, 1.2.3.4:255.0.255.0 will match +As an example, 1.2.3.4:255.0.255.0 or 1.0.3.0:255.0.255.0 will match 1.*.3.*. This form is advised only for non-contiguous masks. @@ -977,7 +977,7 @@ .It Ar list : Bro Ar num | num-num Brc Ns Op Ns , Ns Ar list Matches all addresses with base address .Ar addr -(specified as an IP address or a hostname) +(specified as an IP address, a network number, or a hostname) and whose last byte is in the list between braces { } . Note that there must be no spaces between braces and numbers (spaces after commas are allowed). @@ -997,6 +997,7 @@ the complexity of rulesets. .br As an example, an address specified as 1.2.3.4/24{128,35-55,89} +or 1.2.3.0/24{128,35-55,89} will match the following IP addresses: .br 1.2.3.128, 1.2.3.35 to 1.2.3.55, 1.2.3.89 . ==== //depot/projects/kmacy_sun4v_stable/src/share/man/man9/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.279 2006/10/02 11:51:25 andre Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.280 2006/10/04 20:16:23 jmg Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -129,6 +129,7 @@ kernacc.9 \ kernel_mount.9 \ kobj.9 \ + kqueue.9 \ kthread.9 \ ktr.9 \ lock.9 \ @@ -665,6 +666,20 @@ kobj.9 kobj_create.9 \ kobj.9 kobj_delete.9 \ kobj.9 kobj_init.9 +MLINKS+=kqueue.9 kqfd_register.9 \ + kqueue.9 knlist_add.9 \ + kqueue.9 knlist_remove.9 \ + kqueue.9 knlist_remove_inevent.9 \ + kqueue.9 knlist_empty.9 \ + kqueue.9 knlist_init.9 \ + kqueue.9 knlist_destroy.9 \ + kqueue.9 knlist_clear.9 \ + kqueue.9 knlist_delete.9 \ + kqueue.9 knote_fdclose.9 \ + kqueue.9 KNOTE_LOCKED.9 \ + kqueue.9 KNOTE_UNLOCKED.9 \ + kqueue.9 kqueue_add_filteropts.9 \ + kqueue.9 kqueue_del_filteropts.9 MLINKS+=kthread.9 kproc_shutdown.9 \ kthread.9 kproc_start.9 \ kthread.9 kthread_create.9 \ ==== //depot/projects/kmacy_sun4v_stable/src/sys/amd64/ia32/ia32_signal.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.14 2005/12/06 23:06:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.15 2006/10/05 01:56:10 davidxu Exp $"); #include "opt_compat.h" @@ -67,6 +67,7 @@ #include #include +#include #include #include #include @@ -298,7 +299,7 @@ freebsd4_ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe4 sf, *sfp; - struct ia32_siginfo siginfo; + struct siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; @@ -308,7 +309,7 @@ td = curthread; p = td->td_proc; - siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + siginfo_to_siginfo32(&ksi->ksi_info, &siginfo); PROC_LOCK_ASSERT(p, MA_OWNED); sig = siginfo.si_signo; @@ -407,7 +408,7 @@ ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe sf, *sfp; - struct ia32_siginfo siginfo; + struct siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; @@ -416,7 +417,7 @@ int oonstack; int sig; - siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + siginfo_to_siginfo32(&ksi->ksi_info, &siginfo); td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); @@ -741,20 +742,3 @@ pcb->pcb_flags |= PCB_FULLCTX; td->td_retval[1] = 0; } - -void -siginfo_to_ia32siginfo(siginfo_t *src, struct ia32_siginfo *dst) -{ - dst->si_signo = src->si_signo; - dst->si_errno = src->si_errno; - dst->si_code = src->si_code; - dst->si_pid = src->si_pid; - dst->si_uid = src->si_uid; - dst->si_status = src->si_status; - dst->si_addr = dst->si_addr; - dst->si_value.sigval_int = src->si_value.sival_int; - dst->si_band = src->si_band; - dst->si_trapno = src->si_trapno; - dst->si_timerid = src->si_timerid; - dst->si_overrun = src->si_overrun; -} ==== //depot/projects/kmacy_sun4v_stable/src/sys/amd64/include/elf.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/elf.h,v 1.18 2004/08/03 08:21:48 dfr Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.19 2006/10/04 21:37:09 jb Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -108,31 +108,6 @@ * Relocation types. */ -#define R_X86_64_NONE 0 /* No relocation. */ -#define R_X86_64_64 1 /* Add 64 bit symbol value. */ -#define R_X86_64_PC32 2 /* PC-relative 32 bit signed sym value. */ -#define R_X86_64_GOT32 3 /* PC-relative 32 bit GOT offset. */ -#define R_X86_64_PLT32 4 /* PC-relative 32 bit PLT offset. */ -#define R_X86_64_COPY 5 /* Copy data from shared object. */ -#define R_X86_64_GLOB_DAT 6 /* Set GOT entry to data address. */ -#define R_X86_64_JMP_SLOT 7 /* Set GOT entry to code address. */ -#define R_X86_64_RELATIVE 8 /* Add load address of shared object. */ -#define R_X86_64_GOTPCREL 9 /* Add 32 bit signed pcrel offset to GOT. */ -#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */ -#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */ -#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */ -#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative symbol value */ -#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */ -#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative symbol value */ -#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */ -#define R_X86_64_DTPOFF64 17 /* Offset in TLS block */ -#define R_X86_64_TPOFF64 18 /* Offset in static TLS block */ -#define R_X86_64_TLSGD 19 /* PC relative offset to GD GOT entry */ -#define R_X86_64_TLSLD 20 /* PC relative offset to LD GOT entry */ -#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */ -#define R_X86_64_GOTTPOFF 22 /* PC relative offset to IE GOT entry */ -#define R_X86_64_TPOFF32 23 /* Offset in static TLS block */ - #define R_X86_64_COUNT 24 /* Count of defined relocation types. */ /* Define "machine" characteristics */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/arm/include/elf.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/elf.h,v 1.7 2006/08/24 23:00:03 cognet Exp $ + * $FreeBSD: src/sys/arm/include/elf.h,v 1.8 2006/10/04 21:37:09 jb Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -82,40 +82,6 @@ #define AT_COUNT 15 /* Count of defined aux entry types. */ -#define R_ARM_NONE 0 /* No relocation. */ -#define R_ARM_PC24 1 -#define R_ARM_ABS32 2 -#define R_ARM_REL32 3 -#define R_ARM_PC13 4 -#define R_ARM_ABS16 5 -#define R_ARM_ABS12 6 -#define R_ARM_THM_ABS5 7 -#define R_ARM_ABS8 8 -#define R_ARM_SBREL32 9 -#define R_ARM_THM_PC22 10 -#define R_ARM_THM_PC8 11 -#define R_ARM_AMP_VCALL9 12 -#define R_ARM_SWI24 13 -#define R_ARM_THM_SWI8 14 -#define R_ARM_XPC25 15 -#define R_ARM_THM_XPC22 16 -#define R_ARM_COPY 20 /* Copy data from shared object. */ -#define R_ARM_GLOB_DAT 21 /* Set GOT entry to data address. */ -#define R_ARM_JUMP_SLOT 22 /* Set GOT entry to code address. */ -#define R_ARM_RELATIVE 23 /* Add load address of shared object. */ -#define R_ARM_GOTOFF 24 /* Add GOT-relative symbol address. */ -#define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */ -#define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */ -#define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */ -#define R_ARM_GNU_VTENTRY 100 -#define R_ARM_GNU_VTINHERIT 101 -#define R_ARM_RSBREL32 250 -#define R_ARM_THM_RPC22 251 -#define R_ARM_RREL32 252 -#define R_ARM_RABS32 253 -#define R_ARM_RPC24 254 -#define R_ARM_RBASE 255 - #define R_ARM_COUNT 33 /* Count of defined relocation types. */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_misc.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.60 2006/10/02 12:59:55 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.61 2006/10/05 01:56:10 davidxu Exp $"); #include "opt_compat.h" @@ -88,6 +88,7 @@ #include #include +#include #include CTASSERT(sizeof(struct timeval32) == 8); @@ -192,12 +193,6 @@ } #endif -struct sigaltstack32 { - u_int32_t ss_sp; - u_int32_t ss_size; - int ss_flags; -}; - CTASSERT(sizeof(struct sigaltstack32) == 12); int @@ -2178,6 +2173,89 @@ return (kern_thr_suspend(td, tsp)); } +void +siginfo_to_siginfo32(siginfo_t *src, struct siginfo32 *dst) +{ + bzero(dst, sizeof(*dst)); + dst->si_signo = src->si_signo; + dst->si_errno = src->si_errno; + dst->si_code = src->si_code; + dst->si_pid = src->si_pid; + dst->si_uid = src->si_uid; + dst->si_status = src->si_status; + dst->si_addr = dst->si_addr; + dst->si_value.sigval_int = src->si_value.sival_int; + dst->si_timerid = src->si_timerid; + dst->si_overrun = src->si_overrun; +} + +int +freebsd32_sigtimedwait(struct thread *td, struct freebsd32_sigtimedwait_args *uap) +{ + struct timespec32 ts32; + struct timespec ts; + struct timespec *timeout; + sigset_t set; + ksiginfo_t ksi; + struct siginfo32 si32; + int error; + + if (uap->timeout) { + error = copyin(uap->timeout, &ts32, sizeof(ts32)); + if (error) + return (error); + ts.tv_sec = ts32.tv_sec; + ts.tv_nsec = ts32.tv_nsec; + timeout = &ts; + } else + timeout = NULL; + + error = copyin(uap->set, &set, sizeof(set)); + if (error) + return (error); + + error = kern_sigtimedwait(td, set, &ksi, timeout); + if (error) + return (error); + + if (uap->info) { + siginfo_to_siginfo32(&ksi.ksi_info, &si32); + error = copyout(&si32, uap->info, sizeof(struct siginfo32)); + } + + if (error == 0) + td->td_retval[0] = ksi.ksi_signo; + return (error); +} + +/* + * MPSAFE + */ +int +freebsd32_sigwaitinfo(struct thread *td, struct freebsd32_sigwaitinfo_args *uap) +{ + ksiginfo_t ksi; + struct siginfo32 si32; + sigset_t set; + int error; + + error = copyin(uap->set, &set, sizeof(set)); + if (error) + return (error); + + error = kern_sigtimedwait(td, set, &ksi, NULL); + if (error) + return (error); + + if (uap->info) { + siginfo_to_siginfo32(&ksi.ksi_info, &si32); + error = copyout(&si32, uap->info, sizeof(struct siginfo32)); + } + if (error == 0) + td->td_retval[0] = ksi.ksi_signo; + return (error); +} + #if 0 int ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_proto.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.67 2006/10/03 20:48:11 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.68 2006/10/05 01:58:56 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -244,6 +244,15 @@ char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)]; char stat_l_[PADL_(struct module_stat32 *)]; struct module_stat32 * stat; char stat_r_[PADR_(struct module_stat32 *)]; }; +struct freebsd32_sigtimedwait_args { + char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)]; + char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)]; + char timeout_l_[PADL_(const struct timespec *)]; const struct timespec * timeout; char timeout_r_[PADR_(const struct timespec *)]; +}; +struct freebsd32_sigwaitinfo_args { + char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)]; + char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)]; +}; struct freebsd32_kevent_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char changelist_l_[PADL_(const struct kevent32 *)]; const struct kevent32 * changelist; char changelist_r_[PADR_(const struct kevent32 *)]; @@ -333,6 +342,8 @@ int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *); int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *); int freebsd32_modstat(struct thread *, struct freebsd32_modstat_args *); +int freebsd32_sigtimedwait(struct thread *, struct freebsd32_sigtimedwait_args *); +int freebsd32_sigwaitinfo(struct thread *, struct freebsd32_sigwaitinfo_args *); int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *); int freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *); int freebsd32_sigaction(struct thread *, struct freebsd32_sigaction_args *); @@ -471,6 +482,8 @@ #define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV #define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV #define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_sigtimedwait AUE_SIGWAIT +#define FREEBSD32_SYS_AUE_freebsd32_sigwaitinfo AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE #define FREEBSD32_SYS_AUE_freebsd32_sigaction AUE_SIGACTION ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscall.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.65 2006/10/03 20:48:11 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.66 2006/10/05 01:58:57 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp */ #define FREEBSD32_SYS_syscall 0 @@ -260,6 +260,8 @@ /* 342 is old freebsd32_sigaction */ #define FREEBSD32_SYS_sigpending 343 /* 344 is old freebsd32_sigreturn */ +#define FREEBSD32_SYS_freebsd32_sigtimedwait 345 +#define FREEBSD32_SYS_freebsd32_sigwaitinfo 346 #define FREEBSD32_SYS___acl_get_file 347 #define FREEBSD32_SYS___acl_set_file 348 #define FREEBSD32_SYS___acl_get_fd 349 ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.56 2006/10/03 20:48:11 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.57 2006/10/05 01:58:57 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp */ const char *freebsd32_syscallnames[] = { @@ -352,8 +352,8 @@ "old.freebsd32_sigaction", /* 342 = old freebsd32_sigaction */ "sigpending", /* 343 = sigpending */ "old.freebsd32_sigreturn", /* 344 = old freebsd32_sigreturn */ - "#345", /* 345 = sigtimedwait */ - "#346", /* 346 = sigwaitinfo */ + "freebsd32_sigtimedwait", /* 345 = freebsd32_sigtimedwait */ + "freebsd32_sigwaitinfo", /* 346 = freebsd32_sigwaitinfo */ "__acl_get_file", /* 347 = __acl_get_file */ "__acl_set_file", /* 348 = __acl_set_file */ "__acl_get_fd", /* 349 = __acl_get_fd */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_sysent.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.66 2006/10/03 20:48:11 rwatson Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.67 2006/10/05 01:58:57 davidxu Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp */ #include "opt_compat.h" @@ -377,8 +377,8 @@ { compat4(AS(freebsd4_freebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION, NULL, 0, 0 }, /* 342 = old freebsd32_sigaction */ { AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING, NULL, 0, 0 }, /* 343 = sigpending */ { compat4(AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn), AUE_SIGRETURN, NULL, 0, 0 }, /* 344 = old freebsd32_sigreturn */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 345 = sigtimedwait */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 346 = sigwaitinfo */ + { AS(freebsd32_sigtimedwait_args), (sy_call_t *)freebsd32_sigtimedwait, AUE_SIGWAIT, NULL, 0, 0 }, /* 345 = freebsd32_sigtimedwait */ + { AS(freebsd32_sigwaitinfo_args), (sy_call_t *)freebsd32_sigwaitinfo, AUE_NULL, NULL, 0, 0 }, /* 346 = freebsd32_sigwaitinfo */ { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL, NULL, 0, 0 }, /* 347 = __acl_get_file */ { AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL, NULL, 0, 0 }, /* 348 = __acl_set_file */ { AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0 }, /* 349 = __acl_get_fd */ ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/syscalls.master#7 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -578,10 +578,11 @@ 343 AUE_SIGPENDING NOPROTO { int sigpending(sigset_t *set); } 344 AUE_SIGRETURN COMPAT4 { int freebsd32_sigreturn( \ const struct freebsd4_freebsd32_ucontext *sigcntxp); } -; XXX implement -345 AUE_SIGWAIT UNIMPL sigtimedwait -; XXX implement -346 AUE_NULL UNIMPL sigwaitinfo +345 AUE_SIGWAIT STD { int freebsd32_sigtimedwait(const sigset_t *set, \ + siginfo_t *info, \ + const struct timespec *timeout); } +346 AUE_NULL STD { int freebsd32_sigwaitinfo(const sigset_t *set, \ + siginfo_t *info); } 347 AUE_NULL NOPROTO { int __acl_get_file(const char *path, \ acl_type_t type, struct acl *aclp); } 348 AUE_NULL NOPROTO { int __acl_set_file(const char *path, \ ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/ia32/ia32_genassym.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 5 07:46:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A20A16A47B; Thu, 5 Oct 2006 07:46:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B0A9C16A415 for ; Thu, 5 Oct 2006 07:46:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C1C943D49 for ; Thu, 5 Oct 2006 07:46:55 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k957kt6p026562 for ; Thu, 5 Oct 2006 07:46:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k957kmMs026529 for perforce@freebsd.org; Thu, 5 Oct 2006 07:46:48 GMT (envelope-from jb@freebsd.org) Date: Thu, 5 Oct 2006 07:46:48 GMT Message-Id: <200610050746.k957kmMs026529@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Oct 2006 07:46:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=107298 Change 107298 by jb@jb_freebsd7 on 2006/10/05 07:45:58 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#26 integrate .. //depot/projects/dtrace/ports/KNOBS#6 integrate .. //depot/projects/dtrace/ports/LEGAL#8 integrate .. //depot/projects/dtrace/src/crypto/openssh/configure.ac#4 integrate .. //depot/projects/dtrace/src/include/elf.h#4 integrate .. //depot/projects/dtrace/src/sbin/gpt/add.c#3 integrate .. //depot/projects/dtrace/src/sbin/gpt/label.c#3 integrate .. //depot/projects/dtrace/src/sbin/gpt/remove.c#3 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#8 integrate .. //depot/projects/dtrace/src/share/man/man9/kqueue.9#1 branch .. //depot/projects/dtrace/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/dtrace/src/sys/compat/ia32/ia32_genassym.c#3 integrate .. //depot/projects/dtrace/src/sys/compat/ia32/ia32_signal.h#3 integrate .. //depot/projects/dtrace/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/dtrace/src/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/dtrace/src/sys/conf/files.sun4v#4 integrate .. //depot/projects/dtrace/src/sys/conf/options.sun4v#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_sig.c#7 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/clock.c#7 integrate .. //depot/projects/dtrace/src/sys/sun4v/compile/.cvsignore#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/DEFAULTS#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#9 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC.hints#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/MAC#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/NOTES#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/_bus.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/_inttypes.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/_limits.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/_stdint.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/_types.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/asi.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/asm.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/asmacros.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/atomic.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/bus.h#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/bus_common.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/bus_dma.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/bus_private.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/cache.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ccr.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/cddl/mdesc.h#1 branch .. //depot/projects/dtrace/src/sys/sun4v/include/cddl/mdesc_impl.h#1 branch .. //depot/projects/dtrace/src/sys/sun4v/include/clock.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/cpu.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/cpufunc.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/db_machdep.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/elf.h#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/endian.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/exec.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/float.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/floatingpoint.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/fp.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/frame.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/fsr.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/gdb_machdep.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/hv_pcivar.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/hviommu.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/hypervisor_api.h#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/hypervisorvar.h#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/idprom.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ieee.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ieeefp.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/in_cksum.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/instr.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/intr_machdep.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/iommureg.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/iommuvar.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/kdb.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/kerneldump.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ktr.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/limits.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/lsu.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/md_var.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/mdesc_bus.h#1 branch .. //depot/projects/dtrace/src/sys/sun4v/include/mdesc_bus_subr.h#1 branch .. //depot/projects/dtrace/src/sys/sun4v/include/memdev.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/metadata.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/mmu.h#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/mutex.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/nexusvar.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_bus.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_machdep.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_mem.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_nexus.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ofw_upa.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/param.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pcpu.h#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pmap.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pmc_mdep.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/proc.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/profile.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pstate.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ptrace.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/reg.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/reloc.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/resource.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/runq.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/sc_machdep.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/setjmp.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/sf_buf.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/sigframe.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/signal.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/stdarg.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/sun4v_cpufunc.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/sysarch.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tick.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tlb.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tsb.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tstate.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/tte_hash.h#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ucontext.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/upa.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/utrap.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/varargs.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/ver.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/vmparam.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/watch.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/wstate.h#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_bus_if.m#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_bus_subr.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_diff.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_findname.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_fini.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_init.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_subr.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/mdesc/mdesc_vdevfindval.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/sun4v/autoconf.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/bus_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/clock.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/counter.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/db_disasm.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/db_hwwatch.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/db_interface.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/db_trace.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/eeprom.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/elf_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/exception.S#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/fpemu.c#1 branch .. //depot/projects/dtrace/src/sys/sun4v/sun4v/gdb_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/genassym.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hcall.S#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hviommu.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/identcpu.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/in_cksum.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/interrupt.S#6 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/iommu.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/locore.S#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mem.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_exception.S#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_locore.S#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/nexus.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/ofw_bus.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/ofw_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#12 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/prof_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/rtc.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/rwindow.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/support.S#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/swtch.S#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/sys_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/t1_copy.S#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tick.c#4 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tlb.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#8 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap_trace.S#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tte.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/uio_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/wbuf.S#3 integrate .. //depot/projects/dtrace/src/sys/sys/signalvar.h#3 integrate .. //depot/projects/dtrace/src/tools/tools/tinybsd/tinybsd#2 integrate .. //depot/projects/dtrace/www/en/projects/Makefile#4 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode-2006.sgml#1 branch Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#26 (text+ko) ==== @@ -1,4 +1,4 @@ - + + DESTDIR, as all these files are processed of a context of target environment. + + + Tinderbox + + If you're an avid ports contributor, you might want to take a + look at Tinderbox. It is a powerful + system for building and testing ports based on the scripts used on + Pointyhat. You can install + Tinderbox using + misc/tinderbox port. Be sure + to read supplied documentation since the configuration is not + trivial. + + Visit the Tinderbox website + for more details. + + ==== //depot/projects/dtrace/ports/MOVED#19 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1149 2006/10/06 03:53:42 maho Exp $ +# $FreeBSD: ports/MOVED,v 1.1151 2006/10/06 20:48:15 joerg Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -927,7 +927,6 @@ games/linux_nwndata|games/nwndata|2004-03-01|Data files are not Linux-specific games/linux_nwnclient|games/linux-nwnclient|2004-03-01|Misnamed sysutils/fsck_ext2fs|sysutils/e2fsprogs|2004-03-01|Better utility -audio/audacity-devel|audio/audacity|2004-03-03|removed (obsolete) japanese/vfxdvi118||2004-03-04|removed (obsolate) japanese/vfxdvi240||2004-03-04|removed (obsolate) japanese/vfxdvi300||2004-03-04|removed (obsolate) @@ -2484,3 +2483,5 @@ net/coda5_client||2006-10-05|Has expired: no longer available from mastersite net/coda5_doc||2006-10-05|Has expired: coda5 removed math/ufspase|math/suitespase|2006-10-05|portname has been changed +devel/avr-gcc|devel/avr-gcc-3|2006-10-05|retire AVR-GCC 3.x +devel/avr-gcc-devel|devel/avr-gcc|2006-10-06|make AVR-GCC 4.x the default version ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#8 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.68 2006/10/05 01:58:56 davidxu Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.69 2006/10/06 08:24:37 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp */ @@ -289,6 +289,12 @@ char oucp_l_[PADL_(struct freebsd32_ucontext *)]; struct freebsd32_ucontext * oucp; char oucp_r_[PADR_(struct freebsd32_ucontext *)]; char ucp_l_[PADL_(const struct freebsd32_ucontext *)]; const struct freebsd32_ucontext * ucp; char ucp_r_[PADR_(const struct freebsd32_ucontext *)]; }; +struct freebsd32_umtx_lock_args { + char umtx_l_[PADL_(struct umtx *)]; struct umtx * umtx; char umtx_r_[PADR_(struct umtx *)]; +}; +struct freebsd32_umtx_unlock_args { + char umtx_l_[PADL_(struct umtx *)]; struct umtx * umtx; char umtx_r_[PADR_(struct umtx *)]; +}; struct freebsd32_thr_suspend_args { char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; }; @@ -351,6 +357,8 @@ int freebsd32_getcontext(struct thread *, struct freebsd32_getcontext_args *); int freebsd32_setcontext(struct thread *, struct freebsd32_setcontext_args *); int freebsd32_swapcontext(struct thread *, struct freebsd32_swapcontext_args *); +int freebsd32_umtx_lock(struct thread *, struct freebsd32_umtx_lock_args *); +int freebsd32_umtx_unlock(struct thread *, struct freebsd32_umtx_unlock_args *); int freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *); int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *); int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *); @@ -491,6 +499,8 @@ #define FREEBSD32_SYS_AUE_freebsd32_getcontext AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_setcontext AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_swapcontext AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_umtx_lock AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_umtx_unlock AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_NULL ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#8 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.66 2006/10/05 01:58:57 davidxu Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.67 2006/10/06 08:24:37 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp */ @@ -306,8 +306,8 @@ #define FREEBSD32_SYS_thr_exit 431 #define FREEBSD32_SYS_thr_self 432 #define FREEBSD32_SYS_thr_kill 433 -#define FREEBSD32_SYS__umtx_lock 434 -#define FREEBSD32_SYS__umtx_unlock 435 +#define FREEBSD32_SYS_freebsd32_umtx_lock 434 +#define FREEBSD32_SYS_freebsd32_umtx_unlock 435 #define FREEBSD32_SYS_jail_attach 436 #define FREEBSD32_SYS_freebsd32_thr_suspend 442 #define FREEBSD32_SYS_thr_wake 443 ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#8 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.57 2006/10/05 01:58:57 davidxu Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.58 2006/10/06 08:24:37 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp */ @@ -441,8 +441,8 @@ "thr_exit", /* 431 = thr_exit */ "thr_self", /* 432 = thr_self */ "thr_kill", /* 433 = thr_kill */ - "_umtx_lock", /* 434 = _umtx_lock */ - "_umtx_unlock", /* 435 = _umtx_unlock */ + "freebsd32_umtx_lock", /* 434 = freebsd32_umtx_lock */ + "freebsd32_umtx_unlock", /* 435 = freebsd32_umtx_unlock */ "jail_attach", /* 436 = jail_attach */ "#437", /* 437 = extattr_list_fd */ "#438", /* 438 = extattr_list_file */ ==== //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#8 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.67 2006/10/05 01:58:57 davidxu Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.68 2006/10/06 08:24:37 davidxu Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp */ @@ -466,8 +466,8 @@ { AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL, NULL, 0, 0 }, /* 431 = thr_exit */ { AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL, NULL, 0, 0 }, /* 432 = thr_self */ { AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL, NULL, 0, 0 }, /* 433 = thr_kill */ - { AS(_umtx_lock_args), (sy_call_t *)_umtx_lock, AUE_NULL, NULL, 0, 0 }, /* 434 = _umtx_lock */ - { AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock, AUE_NULL, NULL, 0, 0 }, /* 435 = _umtx_unlock */ + { AS(freebsd32_umtx_lock_args), (sy_call_t *)freebsd32_umtx_lock, AUE_NULL, NULL, 0, 0 }, /* 434 = freebsd32_umtx_lock */ + { AS(freebsd32_umtx_unlock_args), (sy_call_t *)freebsd32_umtx_unlock, AUE_NULL, NULL, 0, 0 }, /* 435 = freebsd32_umtx_unlock */ { AS(jail_attach_args), (sy_call_t *)jail_attach, AUE_NULL, NULL, 0, 0 }, /* 436 = jail_attach */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 437 = extattr_list_fd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 438 = extattr_list_file */ ==== //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#9 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.81 2006/10/05 01:56:10 davidxu Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.82 2006/10/06 08:22:08 davidxu Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -721,8 +721,8 @@ 431 AUE_NULL NOPROTO { void thr_exit(long *state); } 432 AUE_NULL NOPROTO { int thr_self(long *id); } 433 AUE_NULL NOPROTO { int thr_kill(long id, int sig); } -434 AUE_NULL NOPROTO { int _umtx_lock(struct umtx *umtx); } -435 AUE_NULL NOPROTO { int _umtx_unlock(struct umtx *umtx); } +434 AUE_NULL STD { int freebsd32_umtx_lock(struct umtx *umtx); } +435 AUE_NULL STD { int freebsd32_umtx_unlock(struct umtx *umtx); } 436 AUE_NULL NOPROTO { int jail_attach(int jid); } 437 AUE_EXTATTR_LIST_FD UNIMPL extattr_list_fd 438 AUE_EXTATTR_LIST_FILE UNIMPL extattr_list_file ==== //depot/projects/dtrace/src/sys/conf/NOTES#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1386 2006/10/05 20:31:58 simon Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1387 2006/10/06 10:43:40 ru Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -124,6 +124,7 @@ options GEOM_APPLE # Apple partitioning options GEOM_BDE # Disk encryption. options GEOM_BSD # BSD disklabels +options GEOM_CACHE # Disk cache. options GEOM_CONCAT # Disk concatenation. options GEOM_ELI # Disk encryption. options GEOM_FOX # Redundant path mitigation ==== //depot/projects/dtrace/src/sys/conf/files#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1148 2006/10/02 15:42:01 phk Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1149 2006/10/06 10:43:41 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1167,6 +1167,7 @@ geom/bde/g_bde_crypt.c optional geom_bde geom/bde/g_bde_lock.c optional geom_bde geom/bde/g_bde_work.c optional geom_bde +geom/cache/g_cache.c optional geom_cache geom/concat/g_concat.c optional geom_concat geom/eli/g_eli.c optional geom_eli geom/eli/g_eli_crypto.c optional geom_eli ==== //depot/projects/dtrace/src/sys/conf/options#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.559 2006/09/26 12:36:33 ru Exp $ +# $FreeBSD: src/sys/conf/options,v 1.560 2006/10/06 10:43:42 ru Exp $ # # On the handling of kernel options # @@ -78,6 +78,7 @@ GEOM_APPLE opt_geom.h GEOM_BDE opt_geom.h GEOM_BSD opt_geom.h +GEOM_CACHE opt_geom.h GEOM_CONCAT opt_geom.h GEOM_ELI opt_geom.h GEOM_FOX opt_geom.h ==== //depot/projects/dtrace/src/sys/dev/fxp/if_fxp.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.257 2006/05/16 14:36:25 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.258 2006/10/06 20:53:01 jmg Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -2192,6 +2192,11 @@ mii = device_get_softc(sc->miibus); FXP_LOCK(sc); + if (mii->mii_instance) { + struct mii_softc *miisc; + LIST_FOREACH(miisc, &mii->mii_phys, mii_list) + mii_phy_reset(miisc); + } mii_mediachg(mii); FXP_UNLOCK(sc); return (0); ==== //depot/projects/dtrace/src/sys/dev/pci/pci_user.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_user.c,v 1.20 2005/08/26 01:00:19 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_user.c,v 1.21 2006/10/06 14:31:32 ru Exp $"); #include "opt_bus.h" /* XXX trim includes */ #include "opt_compat.h" @@ -374,12 +374,14 @@ case 4: case 2: case 1: - /* make sure register is in bounds and aligned */ - if (cmd == PCIOCREAD || cmd == PCIOCWRITE) - if (io->pi_reg < 0 || - io->pi_reg + io->pi_width > PCI_REGMAX || - io->pi_reg & (io->pi_width - 1)) - error = EINVAL; + /* Make sure register is in bounds and aligned. */ + if ((cmd == PCIOCREAD || cmd == PCIOCWRITE) && + (io->pi_reg < 0 || + io->pi_reg + io->pi_width > PCI_REGMAX + 1 || + io->pi_reg & (io->pi_width - 1))) { + error = EINVAL; + break; + } /* * Assume that the user-level bus number is * in fact the physical PCI bus number. ==== //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#3 (text+ko) ==== @@ -67,6 +67,8 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +#include + #include #include #include @@ -78,25 +80,23 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20061003_0029" +#define HDA_DRV_TEST_REV "20061007_0030" #define HDA_WIDGET_PARSER_REV 1 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.3 2006/10/02 16:30:04 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.4 2006/10/06 18:59:27 ariff Exp $"); #undef HDA_DEBUG_ENABLED #define HDA_DEBUG_ENABLED 1 #ifdef HDA_DEBUG_ENABLED -#define HDA_DEBUG_MSG(stmt) do { \ - if (bootverbose) { \ - stmt \ - } \ +#define HDA_DEBUG(stmt) do { \ + stmt \ } while(0) #else -#define HDA_DEBUG_MSG(stmt) +#define HDA_DEBUG(stmt) #endif -#define HDA_BOOTVERBOSE_MSG(stmt) do { \ +#define HDA_BOOTVERBOSE(stmt) do { \ if (bootverbose) { \ stmt \ } \ @@ -109,6 +109,8 @@ #define hdac_lock(sc) snd_mtxlock((sc)->lock) #define hdac_unlock(sc) snd_mtxunlock((sc)->lock) +#define hdac_lockassert(sc) snd_mtxassert((sc)->lock) +#define hdac_lockowned(sc) mtx_owned((sc)->lock) #define HDA_FLAG_MATCH(fl, v) (((fl) & (v)) == (v)) #define HDA_MATCH_ALL 0xffffffff @@ -180,15 +182,32 @@ #define HDA_ADC_PATH (1 << 1) #define HDA_ADC_RECSEL (1 << 2) -#define HDA_CTL_OUT 0x1 -#define HDA_CTL_IN 0x2 +#define HDA_CTL_OUT (1 << 0) +#define HDA_CTL_IN (1 << 1) #define HDA_CTL_BOTH (HDA_CTL_IN | HDA_CTL_OUT) -#define HDA_QUIRK_GPIO1 (1 << 0) -#define HDA_QUIRK_GPIO2 (1 << 1) -#define HDA_QUIRK_SOFTPCMVOL (1 << 2) -#define HDA_QUIRK_FIXEDRATE (1 << 3) -#define HDA_QUIRK_FORCESTEREO (1 << 4) +#define HDA_GPIO_MAX 15 +/* 0 - 14 = GPIO */ +#define HDA_QUIRK_GPIO0 (1 << 0) +#define HDA_QUIRK_GPIO1 (1 << 1) +#define HDA_QUIRK_GPIO2 (1 << 2) +#define HDA_QUIRK_SOFTPCMVOL (1 << 15) +#define HDA_QUIRK_FIXEDRATE (1 << 16) +#define HDA_QUIRK_FORCESTEREO (1 << 17) + +static const struct { + char *key; + uint32_t value; +} hdac_quirks_tab[] = { + { "gpio0", HDA_QUIRK_GPIO0 }, + { "gpio1", HDA_QUIRK_GPIO1 }, + { "gpio2", HDA_QUIRK_GPIO2 }, + { "softpcmvol", HDA_QUIRK_SOFTPCMVOL }, + { "fixedrate", HDA_QUIRK_FIXEDRATE }, + { "forcestereo", HDA_QUIRK_FORCESTEREO } +}; +#define HDAC_QUIRKS_TAB_LEN \ + (sizeof(hdac_quirks_tab) / sizeof(hdac_quirks_tab[0])) #define HDA_BDL_MIN 2 #define HDA_BDL_MAX 256 @@ -287,7 +306,8 @@ #define HDA_CODEC_ALC260 HDA_CODEC_CONSTRUCT(REALTEK, 0x0260) #define HDA_CODEC_ALC861 HDA_CODEC_CONSTRUCT(REALTEK, 0x0861) #define HDA_CODEC_ALC880 HDA_CODEC_CONSTRUCT(REALTEK, 0x0880) -#define HDA_CODEC_ALC882 HDA_CODEC_CONSTRUCT(REALTEK, 0x0260) +#define HDA_CODEC_ALC882 HDA_CODEC_CONSTRUCT(REALTEK, 0x0882) +#define HDA_CODEC_ALC883 HDA_CODEC_CONSTRUCT(REALTEK, 0x0883) #define HDA_CODEC_ALCXXXX HDA_CODEC_CONSTRUCT(REALTEK, 0xffff) /* Analog Device */ @@ -316,9 +336,13 @@ * Ok, the truth is, I don't have any idea at all whether * it is "Venice" or "Waikiki" or other unnamed CXyadayada. The only * place that tell me it is "Venice" is from its Windows driver INF. + * + * Venice - CX????? + * Waikiki - CX20551-22 */ #define CONEXANT_VENDORID 0x14f1 #define HDA_CODEC_CXVENICE HDA_CODEC_CONSTRUCT(CONEXANT, 0x5045) +#define HDA_CODEC_CXWAIKIKI HDA_CODEC_CONSTRUCT(CONEXANT, 0x5047) #define HDA_CODEC_CXXXXX HDA_CODEC_CONSTRUCT(CONEXANT, 0xffff) @@ -331,6 +355,7 @@ { HDA_CODEC_ALC861, "Realtek ALC861" }, { HDA_CODEC_ALC880, "Realtek ALC880" }, { HDA_CODEC_ALC882, "Realtek ALC882" }, + { HDA_CODEC_ALC883, "Realtek ALC883" }, { HDA_CODEC_AD1981HD, "Analog Device AD1981HD" }, { HDA_CODEC_AD1983, "Analog Device AD1983" }, { HDA_CODEC_AD1986A, "Analog Device AD1986A" }, @@ -340,6 +365,7 @@ { HDA_CODEC_STAC9220, "Sigmatel STAC9220" }, { HDA_CODEC_STAC922XD, "Sigmatel STAC9220D/9223D" }, { HDA_CODEC_CXVENICE, "Conexant Venice" }, + { HDA_CODEC_CXWAIKIKI, "Conexant Waikiki" }, /* Unknown codec */ { HDA_CODEC_ALCXXXX, "Realtek (Unknown)" }, { HDA_CODEC_ADXXXX, "Analog Device (Unknown)" }, @@ -582,9 +608,9 @@ res = hdac_command(sc, HDA_CMD_GET_PIN_SENSE(cad, hdac_hp_switch[i].hpnid), cad); - HDA_BOOTVERBOSE_MSG( + HDA_BOOTVERBOSE( device_printf(sc->dev, - "Pin sense: nid=%d res=0x%08x\n", + "HDA_DEBUG: Pin sense: nid=%d res=0x%08x\n", hdac_hp_switch[i].hpnid, res); ); res >>= 31; @@ -616,7 +642,8 @@ if (res != 0) { /* HP in */ w = hdac_widget_get(devinfo, hdac_hp_switch[i].hpnid); - if (w != NULL) { + if (w != NULL && w->type == + HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX) { if (forcemute == 0) w->wclass.pin.ctrl |= HDA_CMD_SET_PIN_WIDGET_CTRL_OUT_ENABLE; @@ -630,7 +657,8 @@ for (j = 0; hdac_hp_switch[i].spkrnid[j] != -1; j++) { w = hdac_widget_get(devinfo, hdac_hp_switch[i].spkrnid[j]); - if (w != NULL) { + if (w != NULL && w->type == + HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX) { w->wclass.pin.ctrl &= ~HDA_CMD_SET_PIN_WIDGET_CTRL_OUT_ENABLE; hdac_command(sc, @@ -642,7 +670,8 @@ } else { /* HP out */ w = hdac_widget_get(devinfo, hdac_hp_switch[i].hpnid); - if (w != NULL) { + if (w != NULL && w->type == + HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX) { w->wclass.pin.ctrl &= ~HDA_CMD_SET_PIN_WIDGET_CTRL_OUT_ENABLE; hdac_command(sc, @@ -652,7 +681,8 @@ for (j = 0; hdac_hp_switch[i].spkrnid[j] != -1; j++) { w = hdac_widget_get(devinfo, hdac_hp_switch[i].spkrnid[j]); - if (w != NULL) { + if (w != NULL && w->type == + HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_PIN_COMPLEX) { if (forcemute == 0) w->wclass.pin.ctrl |= HDA_CMD_SET_PIN_WIDGET_CTRL_OUT_ENABLE; @@ -685,8 +715,8 @@ sc = codec->sc; - HDA_BOOTVERBOSE_MSG( - device_printf(sc->dev, "Unsol Tag: 0x%08x\n", tag); + HDA_BOOTVERBOSE( + device_printf(sc->dev, "HDA_DEBUG: Unsol Tag: 0x%08x\n", tag); ); device_get_children(sc->dev, &devlist, &devcount); @@ -733,14 +763,17 @@ /* XXX to be removed */ #ifdef HDAC_INTR_EXTRA - if ((res & HDAC_SDSTS_DESE) || (res & HDAC_SDSTS_FIFOE)) - device_printf(sc->dev, - "PCMDIR_%s intr triggered beyond stream boundary: %08x\n", - (ch->dir == PCMDIR_PLAY) ? "PLAY" : "REC", res); + HDA_BOOTVERBOSE( + if (res & (HDAC_SDSTS_DESE | HDAC_SDSTS_FIFOE)) + device_printf(sc->dev, + "PCMDIR_%s intr triggered beyond stream boundary:" + "%08x\n", + (ch->dir == PCMDIR_PLAY) ? "PLAY" : "REC", res); + ); #endif HDAC_WRITE_1(&sc->mem, ch->off + HDAC_SDSTS, - HDAC_SDSTS_DESE | HDAC_SDSTS_FIFOE | HDAC_SDSTS_BCIS ); + HDAC_SDSTS_DESE | HDAC_SDSTS_FIFOE | HDAC_SDSTS_BCIS ); /* XXX to be removed */ #ifdef HDAC_INTR_EXTRA @@ -779,17 +812,17 @@ hdac_lock(sc); /* Do we have anything to do? */ intsts = HDAC_READ_4(&sc->mem, HDAC_INTSTS); - if ((intsts & HDAC_INTSTS_GIS) != HDAC_INTSTS_GIS) { + if (!HDA_FLAG_MATCH(intsts, HDAC_INTSTS_GIS)) { hdac_unlock(sc); return; } /* Was this a controller interrupt? */ - if ((intsts & HDAC_INTSTS_CIS) == HDAC_INTSTS_CIS) { + if (HDA_FLAG_MATCH(intsts, HDAC_INTSTS_CIS)) { rirb_base = (struct hdac_rirb *)sc->rirb_dma.dma_vaddr; rirbsts = HDAC_READ_1(&sc->mem, HDAC_RIRBSTS); /* Get as many responses that we can */ - while ((rirbsts & HDAC_RIRBSTS_RINTFL) == HDAC_RIRBSTS_RINTFL) { + while (HDA_FLAG_MATCH(rirbsts, HDAC_RIRBSTS_RINTFL)) { HDAC_WRITE_1(&sc->mem, HDAC_RIRBSTS, HDAC_RIRBSTS_RINTFL); rirbwp = HDAC_READ_1(&sc->mem, HDAC_RIRBWP); bus_dmamap_sync(sc->rirb_dma.dma_tag, sc->rirb_dma.dma_map, @@ -818,7 +851,7 @@ HDAC_WRITE_4(&sc->mem, HDAC_INTSTS, HDAC_INTSTS_CIS); #endif } - if ((intsts & HDAC_INTSTS_SIS_MASK)) { + if (intsts & HDAC_INTSTS_SIS_MASK) { if (intsts & (1 << sc->num_iss)) hdac_stream_intr(sc, &sc->play); if (intsts & (1 << 0)) @@ -844,7 +877,7 @@ } /**************************************************************************** - * int had_reset(hdac_softc *) + * int hdac_reset(hdac_softc *) * * Reset the hdac to a quiescent and known state. ****************************************************************************/ @@ -893,7 +926,7 @@ count = 10000; do { gctl = HDAC_READ_4(&sc->mem, HDAC_GCTL); - if ((gctl & HDAC_GCTL_CRST)) + if (gctl & HDAC_GCTL_CRST) break; DELAY(10); } while (--count); @@ -903,12 +936,6 @@ } /* - * Enable unsolicited interrupt. - */ - gctl = HDAC_READ_4(&sc->mem, HDAC_GCTL); - HDAC_WRITE_4(&sc->mem, HDAC_GCTL, gctl | HDAC_GCTL_UNSOL); - - /* * Wait for codecs to finish their own reset sequence. The delay here * should be of 250us but for some reasons, on it's not enough on my * computer. Let's use twice as much as necessary to make sure that @@ -941,7 +968,7 @@ sc->num_oss = HDAC_GCAP_OSS(gcap); sc->num_bss = HDAC_GCAP_BSS(gcap); - sc->support_64bit = (gcap & HDAC_GCAP_64OK) == HDAC_GCAP_64OK; + sc->support_64bit = HDA_FLAG_MATCH(gcap, HDAC_GCAP_64OK); corbsize = HDAC_READ_1(&sc->mem, HDAC_CORBSIZE); if ((corbsize & HDAC_CORBSIZE_CORBSZCAP_256) == @@ -1356,8 +1383,6 @@ int i; uint16_t statests; - SLIST_INIT(&sc->codec_list); - statests = HDAC_READ_2(&sc->mem, HDAC_STATESTS); for (i = 0; i < HDAC_CODEC_MAX; i++) { if (HDAC_STATESTS_SDIWAKE(statests, i)) { @@ -1375,13 +1400,12 @@ codec->sc = sc; codec->cad = i; sc->codecs[i] = codec; - SLIST_INSERT_HEAD(&sc->codec_list, codec, next_codec); if (hdac_probe_codec(codec) != 0) break; } } /* All codecs have been probed, now try to attach drivers to them */ - bus_generic_attach(sc->dev); + /* bus_generic_attach(sc->dev); */ } /**************************************************************************** @@ -1400,9 +1424,8 @@ int i; nid_t cad = codec->cad; - HDA_DEBUG_MSG( - device_printf(sc->dev, "%s: Probing codec: %d\n", - __func__, cad); + HDA_BOOTVERBOSE( + device_printf(sc->dev, "HDA_DEBUG: Probing codec: %d\n", cad); ); vendorid = hdac_command(sc, HDA_CMD_GET_PARAMETER(cad, 0x0, HDA_PARAM_VENDOR_ID), @@ -1416,9 +1439,9 @@ startnode = HDA_PARAM_SUB_NODE_COUNT_START(subnode); endnode = startnode + HDA_PARAM_SUB_NODE_COUNT_TOTAL(subnode); - HDA_DEBUG_MSG( - device_printf(sc->dev, "%s: \tstartnode=%d endnode=%d\n", - __func__, startnode, endnode); + HDA_BOOTVERBOSE( + device_printf(sc->dev, "HDA_DEBUG: \tstartnode=%d endnode=%d\n", + startnode, endnode); ); for (i = startnode; i < endnode; i++) { devinfo = hdac_probe_function(codec, i); @@ -1432,20 +1455,18 @@ HDA_PARAM_REVISION_ID_REVISION_ID(revisionid); devinfo->stepping_id = HDA_PARAM_REVISION_ID_STEPPING_ID(revisionid); - HDA_DEBUG_MSG( + HDA_BOOTVERBOSE( device_printf(sc->dev, - "%s: \tFound AFG nid=%d " + "HDA_DEBUG: \tFound AFG nid=%d " "[startnode=%d endnode=%d]\n", - __func__, devinfo->nid, - startnode, endnode); + devinfo->nid, startnode, endnode); ); return (1); } } - HDA_DEBUG_MSG( - device_printf(sc->dev, "%s: \tAFG not found\n", - __func__); + HDA_BOOTVERBOSE( + device_printf(sc->dev, "HDA_DEBUG: \tAFG not found\n"); ); return (0); } @@ -1536,10 +1557,10 @@ i += entnum; } - HDA_BOOTVERBOSE_MSG( + HDA_BOOTVERBOSE( if (w->nconns != found) { device_printf(sc->dev, - "node %d: WARNING!!! Connection " + "HDA_DEBUG: nid=%d WARNING!!! Connection " "length=%d != found=%d\n", nid, w->nconns, found); } @@ -1904,7 +1925,7 @@ break; DELAY(10); } while (--to); - if ((ctl & HDAC_SDCTL_SRST)) + if (ctl & HDAC_SDCTL_SRST) device_printf(sc->dev, "can't reset!\n"); } @@ -2052,7 +2073,7 @@ struct hdac_command_list cl; uint32_t response = HDAC_INVALID; - if (!mtx_owned(sc->lock)) + if (!hdac_lockowned(sc)) device_printf(sc->dev, "WARNING!!!! mtx not owned!!!!\n"); cl.num_commands = 1; cl.verbs = &verb; @@ -2312,13 +2333,6 @@ nid_t cad = ch->devinfo->codec->cad; uint16_t fmt; - /* - * 8bit = 0 - * 16bit = 1 - * 20bit = 2 - * 24bit = 3 - * 32bit = 4 - */ fmt = 0; if (ch->fmt & AFMT_S16_LE) fmt |= ch->bit16 << 4; @@ -2342,9 +2356,10 @@ HDAC_WRITE_2(&sc->mem, ch->off + HDAC_SDFMT, fmt); for (i = 0; ch->io[i] != -1; i++) { - HDA_BOOTVERBOSE_MSG( + HDA_BOOTVERBOSE( device_printf(sc->dev, - "PCMDIR_%s: Stream setup nid=%d fmt=0x%08x\n", + "HDA_DEBUG: PCMDIR_%s: Stream setup nid=%d " + "fmt=0x%08x\n", (ch->dir == PCMDIR_PLAY) ? "PLAY" : "REC", ch->io[i], fmt); ); @@ -2474,14 +2489,6 @@ int i, j, softpcmvol; nid_t cad; - if (resource_int_value(device_get_name(sc->dev), - device_get_unit(sc->dev), "softpcmvol", &softpcmvol) == 0) - softpcmvol = (softpcmvol != 0) ? 1 : 0; - else - softpcmvol = (devinfo->function.audio.quirks & - HDA_QUIRK_SOFTPCMVOL) ? - 1 : 0; - hdac_lock(sc); mask = 0; @@ -2505,6 +2512,16 @@ HDA_CMD_SET_UNSOLICITED_RESPONSE_ENABLE| HDAC_UNSOLTAG_EVENT_HP), cad); hdac_hp_switch_handler(devinfo); + HDA_BOOTVERBOSE( + device_printf(sc->dev, + "HDA_DEBUG: Enabling headphone/speaker " + "audio routing switching:\n"); + device_printf(sc->dev, + "HDA_DEBUG: \tindex=%d nid=%d " + "pci_subvendor=0x%08x " + "codec=0x%08x\n", + i, w->nid, sc->pci_subvendor, id); + ); } break; } @@ -2541,7 +2558,9 @@ if (!(mask & SOUND_MASK_PCM)) { softpcmvol = 1; mask |= SOUND_MASK_PCM; - } + } else + softpcmvol = (devinfo->function.audio.quirks & + HDA_QUIRK_SOFTPCMVOL) ? 1 : 0; i = 0; ctl = NULL; @@ -2559,9 +2578,9 @@ d = device_get_softc(sc->dev); if (d != NULL) { d->flags |= SD_F_SOFTPCMVOL; - HDA_BOOTVERBOSE_MSG( + HDA_BOOTVERBOSE( device_printf(sc->dev, - "%s Soft PCM volume\n", + "HDA_DEBUG: %s Soft PCM volume\n", (softpcmvol == 1) ? "Forcing" : "Enabling"); ); @@ -2593,9 +2612,8 @@ NULL) { if (ctl->widget == NULL || ctl->enable == 0) continue; - if ((ctl->ossmask & (SOUND_MASK_VOLUME | - SOUND_MASK_PCM)) != (SOUND_MASK_VOLUME | - SOUND_MASK_PCM)) + if (!HDA_FLAG_MATCH(ctl->ossmask, + SOUND_MASK_VOLUME | SOUND_MASK_PCM)) continue; if (!(ctl->mute == 1 && ctl->step == 0)) ctl->enable = 0; @@ -2789,6 +2807,14 @@ device_printf(dev, "cannot allocate softc\n"); return (ENOMEM); } + + sc->lock = snd_mtxcreate(device_get_nameunit(dev), HDAC_MTX_NAME); + if (sc->lock == NULL) { + device_printf(dev, "mutex creation failed\n"); + free(sc, M_DEVBUF); + return (ENOMEM); + } + sc->dev = dev; sc->pci_subvendor = pci_get_subdevice(sc->dev) << 16; sc->pci_subvendor |= pci_get_subvendor(sc->dev); @@ -2827,6 +2853,7 @@ if (result != 0) { device_printf(sc->dev, "%s: bus_dma_tag_create failed (%x)\n", __func__, result); + snd_mtxfree(sc->lock); free(sc, M_DEVBUF); return (ENXIO); } @@ -2838,31 +2865,28 @@ pci_enable_busmaster(dev); - /* Initialize driver mutex */ - sc->lock = snd_mtxcreate(device_get_nameunit(dev), HDAC_MTX_NAME); - /* Allocate resources */ result = hdac_mem_alloc(sc); if (result != 0) - goto fail; + goto hdac_attach_fail; result = hdac_irq_alloc(sc); if (result != 0) - goto fail; + goto hdac_attach_fail; /* Get Capabilities */ result = hdac_get_capabilities(sc); if (result != 0) - goto fail; + goto hdac_attach_fail; /* Allocate CORB and RIRB dma memory */ result = hdac_dma_alloc(sc, &sc->corb_dma, sc->corb_size * sizeof(uint32_t)); if (result != 0) - goto fail; + goto hdac_attach_fail; result = hdac_dma_alloc(sc, &sc->rirb_dma, sc->rirb_size * sizeof(struct hdac_rirb)); if (result != 0) - goto fail; + goto hdac_attach_fail; /* Quiesce everything */ hdac_reset(sc); @@ -2883,16 +2907,17 @@ hdac_attach2((void *)sc); } - return(0); + return (0); -fail: +hdac_attach_fail: hdac_dma_free(&sc->rirb_dma); hdac_dma_free(&sc->corb_dma); hdac_irq_free(sc); hdac_mem_free(sc); snd_mtxfree(sc->lock); + free(sc, M_DEVBUF); - return(ENXIO); + return (ENXIO); } static void @@ -2919,7 +2944,7 @@ devinfo->startnode = HDA_PARAM_SUB_NODE_COUNT_START(res); devinfo->endnode = devinfo->startnode + devinfo->nodecnt; - HDA_BOOTVERBOSE_MSG( + HDA_BOOTVERBOSE( device_printf(sc->dev, " Vendor: 0x%08x\n", devinfo->vendor_id); device_printf(sc->dev, " Device: 0x%08x\n", @@ -2995,6 +3020,7 @@ struct hdac_audio_ctl *ctls; struct hdac_widget *w, *cw; int i, j, cnt, max, ocap, icap; + int mute, offset, step, size; /* XXX This is redundant */ max = 0; @@ -3053,22 +3079,44 @@ ocap = w->param.outamp_cap; icap = w->param.inamp_cap; if (ocap != 0) { + mute = HDA_PARAM_OUTPUT_AMP_CAP_MUTE_CAP(ocap); + step = HDA_PARAM_OUTPUT_AMP_CAP_NUMSTEPS(ocap); + size = HDA_PARAM_OUTPUT_AMP_CAP_STEPSIZE(ocap); + offset = HDA_PARAM_OUTPUT_AMP_CAP_OFFSET(ocap); + /*if (offset > step) { + HDA_BOOTVERBOSE( + device_printf(sc->dev, + "HDA_DEBUG: BUGGY outamp: nid=%d " + "[offset=%d > step=%d]\n", + w->nid, offset, step); + ); + offset = step; + }*/ ctls[cnt].enable = 1; ctls[cnt].widget = w; - ctls[cnt].mute = - HDA_PARAM_OUTPUT_AMP_CAP_MUTE_CAP(ocap); - ctls[cnt].step = - HDA_PARAM_OUTPUT_AMP_CAP_NUMSTEPS(ocap); - ctls[cnt].size = - HDA_PARAM_OUTPUT_AMP_CAP_STEPSIZE(ocap); - ctls[cnt].offset = - HDA_PARAM_OUTPUT_AMP_CAP_OFFSET(ocap); - ctls[cnt].left = ctls[cnt].offset; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 7 00:43: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 579FC16A415; Sat, 7 Oct 2006 00:43:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0F97B16A407 for ; Sat, 7 Oct 2006 00:43:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FDFB43D5D for ; Sat, 7 Oct 2006 00:43:42 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k970hg81092064 for ; Sat, 7 Oct 2006 00:43:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k970hgEB092061 for perforce@freebsd.org; Sat, 7 Oct 2006 00:43:42 GMT (envelope-from jb@freebsd.org) Date: Sat, 7 Oct 2006 00:43:42 GMT Message-Id: <200610070043.k970hgEB092061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 00:43:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=107386 Change 107386 by jb@jb_freebsd7 on 2006/10/07 00:43:31 IFlibbsdelf Affected files ... .. //depot/projects/dtrace/src/lib/libelf/elf_strptr.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_update.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_getshdr.c#3 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_rel.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_rela.c#2 integrate Differences ... ==== //depot/projects/dtrace/src/lib/libelf/elf_strptr.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/lib/libelf/elf_update.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 John Birrell jb@freebsd.org + * Copyright (c) 2006 Joseph Koshy * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,14 +27,797 @@ #include __FBSDID("$FreeBSD$"); +#include +#include + +#include +#include +#include #include -#include +#include +#include +#include #include "_libelf.h" +/* + * Update the internal data structures associated with an ELF object. + * Returns the size in bytes the ELF object would occupy in its file + * representation. + * + * After a successful call to this function, the following structures + * are updated: + * + * - The ELF header is updated. + * - All sections are sorted in order of ascending addresses and their + * section header table entries updated. An error is signalled + * if an overlap was detected among sections. + * - All data descriptors associated with a section are sorted in order + * of ascending addresses. Overlaps, if detected, are signalled as + * errors. Other sanity checks for alignments, section types etc. are + * made. + * + * After a resync_elf() successfully returns, the ELF descriptor is + * ready for being handed over to _libelf_write_elf(). + * + * File alignments: + * PHDR - Addr + * SHDR - Addr + * + * XXX: how do we handle 'flags'. + */ + +/* + * Compute the extents of a section, by looking at the. + */ +static int +_libelf_compute_section_extents(Elf *e, Elf_Scn *s, off_t *rc) +{ + int ec; + Elf_Data *d, *td; + unsigned int elftype; + uint64_t sh_align, sh_offset, sh_size; + uint64_t scn_size, scn_alignment; + + /* + * We need to recompute library private data structures if one + * or more of the following is true: + * - The underlying Shdr structure has been marked `dirty'. Significant + * fields include: `sh_offset', `sh_type', `sh_size', `sh_addralign'. + * - The Elf_Data structures part of this section have been marked + * `dirty'. Affected members include `d_align', `d_offset', `d_type', + * and `d_size'. + * - The section as a whole is `dirty', e.g., it has been allocated + * using elf_newscn(). + * + * Each of these conditions would result in the ELF_F_DIRTY bit being + * set on the section descriptor's `s_flags' field. + */ + + if ((s->s_flags & ELF_F_DIRTY) == 0) + return (1); + + ec = e->e_class; + + if (ec == ELFCLASS32) { + elftype = _libelf_xlate_shtype(s->s_shdr.s_shdr32.sh_type); + sh_align = (uint64_t) s->s_shdr.s_shdr32.sh_addralign; + sh_size = (uint64_t) s->s_shdr.s_shdr32.sh_size; + sh_offset = (uint64_t) s->s_shdr.s_shdr32.sh_offset; + } else { + elftype = _libelf_xlate_shtype(s->s_shdr.s_shdr64.sh_type); + sh_align = s->s_shdr.s_shdr64.sh_addralign; + sh_size = s->s_shdr.s_shdr64.sh_size; + sh_offset = s->s_shdr.s_shdr64.sh_offset; + } + + if (elftype > ELF_T_LAST) { + LIBELF_SET_ERROR(SECTION, 0); + return (0); + } + + /* + * Compute the extent of the data descriptors associated with + * this section. + */ + scn_size = 0L; + scn_alignment = 0; + + if (sh_align == 0) + sh_align = _libelf_malign(elftype, ec); + + STAILQ_FOREACH_SAFE(d, &s->s_data, d_next, td) { + if (d->d_type != elftype) { + LIBELF_SET_ERROR(DATA, 0); + return (0); + } + if (d->d_version != e->e_version) { + LIBELF_SET_ERROR(VERSION, 0); + return (0); + } + if (d->d_align % sh_align) { + LIBELF_SET_ERROR(DATA, 0); + return (0); + } + + if ((uint64_t) d->d_off + d->d_size > scn_size) + scn_size = d->d_off + d->d_size; + if (d->d_align > scn_alignment) + scn_alignment = d->d_align; + } + + /* + * If the application is requesting full control over the layout + * of the section, check its values for sanity. + */ + if (e->e_flags & ELF_F_LAYOUT) { + if (scn_alignment > sh_align || sh_offset % sh_align || + sh_size < scn_size) { + LIBELF_SET_ERROR(LAYOUT, 0); + return (0); + } + } else { + /* + * Otherwise compute the values in the section header. + */ + + if (scn_alignment > sh_align) + sh_align = scn_alignment; + + sh_size = scn_size; + sh_offset = roundup(*rc, sh_align); + + if (ec == ELFCLASS32) { + s->s_shdr.s_shdr32.sh_offset = (uint32_t) sh_offset; + s->s_shdr.s_shdr32.sh_size = (uint32_t) sh_size; + s->s_shdr.s_shdr32.sh_addralign = (uint32_t) sh_align; + } else { + s->s_shdr.s_shdr64.sh_offset = sh_offset; + s->s_shdr.s_shdr64.sh_size = sh_size; + s->s_shdr.s_shdr64.sh_addralign = sh_align; + } + } + + *rc = sh_offset + sh_size; + + s->s_size = sh_size; + s->s_offset = sh_offset; + return (1); +} + + +/* + * Insert a section in ascending order in the list + */ + +static int +_libelf_insert_section(Elf *e, Elf_Scn *s) +{ + Elf_Scn *t, *prevt; + uint64_t smax, smin, tmax, tmin; + + smin = s->s_offset; + smax = smin + s->s_size; + + prevt = NULL; + STAILQ_FOREACH(t, &e->e_u.e_elf.e_scn, s_next) { + tmin = t->s_offset; + tmax = tmin + t->s_size; + + /* check if there is an overlap */ + if (tmax < smin) { + prevt = t; + continue; + } else if (smax < tmin) + break; + else { + LIBELF_SET_ERROR(LAYOUT, 0); + return (0); + } + } + + if (prevt) + STAILQ_INSERT_AFTER(&e->e_u.e_elf.e_scn, prevt, s, s_next); + else + STAILQ_INSERT_HEAD(&e->e_u.e_elf.e_scn, s, s_next); + return (1); +} + +static off_t +_libelf_resync_sections(Elf *e, off_t rc) +{ + int ec; + off_t nrc; + size_t sh_type; + Elf_Scn *s, *ts; + + ec = e->e_class; + + /* + * Make a pass through sections, computing the extent of each + * section. Order in increasing order of addresses. + */ + + nrc = rc; + STAILQ_FOREACH(s, &e->e_u.e_elf.e_scn, s_next) + if (_libelf_compute_section_extents(e, s, &nrc) == 0) + return ((off_t) -1); + + STAILQ_FOREACH_SAFE(s, &e->e_u.e_elf.e_scn, s_next, ts) { + if (ec == ELFCLASS32) + sh_type = s->s_shdr.s_shdr32.sh_type; + else + sh_type = s->s_shdr.s_shdr64.sh_type; + + /* XXX Do we need the 'size' field of an SHT_NOBITS section */ + if (sh_type == SHT_NOBITS || sh_type == SHT_NULL) + continue; + + if (s->s_offset < (uint64_t) rc) { + if (s->s_offset + s->s_size < (uint64_t) rc) { + /* + * Try insert this section in the + * correct place in the list, + * detecting overlaps if any. + */ + STAILQ_REMOVE(&e->e_u.e_elf.e_scn, s, _Elf_Scn, + s_next); + if (_libelf_insert_section(e, s) == 0) + return ((off_t) -1); + } else { + LIBELF_SET_ERROR(LAYOUT, 0); + return ((off_t) -1); + } + } else + rc = s->s_offset + s->s_size; + } + + assert(nrc == rc); + + return (rc); +} + +static off_t +_libelf_resync_elf(Elf *e) +{ + int ec, eh_class, eh_type; + unsigned int eh_byteorder, eh_version; + size_t align, fsz; + uint16_t phnum, shnum; + off_t rc, phoff, shoff; + void *ehdr; + Elf32_Ehdr *eh32; + Elf64_Ehdr *eh64; + + rc = 0; + + ec = e->e_class; + + assert(ec == ELFCLASS32 || ec == ELFCLASS64); + + /* + * Prepare the EHDR. + */ + if ((ehdr = _libelf_ehdr(e, ec, 0)) == NULL) + return ((off_t) -1); + + eh32 = ehdr; + eh64 = ehdr; + + if (ec == ELFCLASS32) { + eh_byteorder = eh32->e_ident[EI_DATA]; + eh_class = eh32->e_ident[EI_CLASS]; + phnum = eh32->e_phnum; + phoff = (uint64_t) eh32->e_phoff; + shnum = eh32->e_shnum; + shoff = (uint64_t) eh32->e_shoff; + eh_type = eh32->e_type; + eh_version = eh32->e_version; + } else { + eh_byteorder = eh64->e_ident[EI_DATA]; + eh_class = eh64->e_ident[EI_CLASS]; + phnum = eh64->e_phnum; + phoff = eh64->e_phoff; + shnum = eh64->e_shnum; + shoff = eh64->e_shoff; + eh_type = eh64->e_type; + eh_version = eh64->e_version; + } + + if (eh_version == EV_NONE) + eh_version = EV_CURRENT; + + if (eh_version != e->e_version) { /* always EV_CURRENT */ + LIBELF_SET_ERROR(VERSION, 0); + return ((off_t) -1); + } + + if (eh_class != e->e_class) { + LIBELF_SET_ERROR(CLASS, 0); + return ((off_t) -1); + } + + if (e->e_cmd != ELF_C_WRITE && eh_byteorder != e->e_byteorder) { + LIBELF_SET_ERROR(HEADER, 0); + return ((off_t) -1); + } + +#define INITIALIZE_EHDR(E,EC,V) do { \ + (E)->e_ident[EI_MAG0] = ELFMAG0; \ + (E)->e_ident[EI_MAG1] = ELFMAG1; \ + (E)->e_ident[EI_MAG2] = ELFMAG2; \ + (E)->e_ident[EI_MAG3] = ELFMAG3; \ + (E)->e_ident[EI_CLASS] = (EC); \ + (E)->e_ident[EI_VERSION] = (V); \ + (E)->e_ehsize = _libelf_fsize(ELF_T_EHDR, (EC), (V), 1);\ + (E)->e_phentsize = _libelf_fsize(ELF_T_PHDR, (EC), (V), \ + 1); \ + (E)->e_shentsize = _libelf_fsize(ELF_T_SHDR, (EC), (V), \ + 1); \ + } while (0) + + if (ec == ELFCLASS32) + INITIALIZE_EHDR(eh32, ec, eh_version); + else + INITIALIZE_EHDR(eh64, ec, eh_version); + + (void) elf_flagehdr(e, ELF_C_SET, ELF_F_DIRTY); + + rc += _libelf_fsize(ELF_T_EHDR, ec, eh_version, 1); + + /* + * Compute the layout the program header table, if one is + * present. The program header table needs to be aligned to a + * `natural' boundary. + */ + if (phnum) { + fsz = _libelf_fsize(ELF_T_PHDR, ec, eh_version, phnum); + align = _libelf_malign(ELF_T_PHDR, ec); + + if (e->e_flags & ELF_F_LAYOUT) { + /* + * Check offsets for sanity. + */ + if (rc > phoff) { + LIBELF_SET_ERROR(HEADER, 0); + return ((off_t) -1); + } + + if (phoff % align) { + LIBELF_SET_ERROR(LAYOUT, 0); + return ((off_t) -1); + } + + } else + phoff = roundup(rc, align); + + rc = phoff + fsz * phnum; + } + + /* + * Compute the layout of the sections associated with the + * file. + */ + + if ((rc = _libelf_resync_sections(e, rc)) < 0) + return ((off_t) -1); + + /* + * Compute the space taken up by the section header table, if + * one is needed. + */ + if (shnum) { + fsz = _libelf_fsize(ELF_T_SHDR, ec, eh_version, 1); + align = _libelf_malign(ELF_T_SHDR, ec); + + if (e->e_flags & ELF_F_LAYOUT) { + if (rc < shoff) { + LIBELF_SET_ERROR(HEADER, 0); + return ((off_t) -1); + } + + if (shoff % align) { + LIBELF_SET_ERROR(LAYOUT, 0); + return ((off_t) -1); + } + } else + shoff = roundup(rc, align); + + rc = shoff + fsz * shnum; + } + + /* + * Update the `e_phoff' and `e_shoff' fields if the library is + * doing the layout. + */ + if ((e->e_flags & ELF_F_LAYOUT) == 0) { + if (ec == ELFCLASS32) { + eh32->e_phoff = phoff; + eh32->e_shoff = shoff; + } else { + eh64->e_phoff = phoff; + eh64->e_shoff = shoff; + } + } + + return (rc); +} + +/* + * Write out the contents of a section. + */ + +static off_t +_libelf_write_scn(Elf *e, char *nf, Elf_Scn *s, off_t rc) +{ + int ec; + size_t fsz, msz, nobjects, sh_type; + uint64_t sh_off; + int elftype; + Elf_Data *d, dst; + + if ((ec = e->e_class) == ELFCLASS32) + sh_type = s->s_shdr.s_shdr32.sh_type; + else + sh_type = s->s_shdr.s_shdr64.sh_type; + + /* + * Ignore sections that do not allocate space in the file. + */ + if (sh_type == SHT_NOBITS || sh_type == SHT_NULL) + return (rc); + + + elftype = _libelf_xlate_shtype(sh_type); + assert(elftype >= ELF_T_FIRST && elftype <= ELF_T_LAST); + + msz = _libelf_msize(elftype, ec, e->e_version); + + sh_off = s->s_offset; + assert(sh_off % _libelf_malign(elftype, ec) == 0); + + /* + * If the section has a `rawdata' descriptor, and the section + * contents have not been modified, use its contents directly. + * The `s_rawoff' member contains the offset into the original + * file, while `s_offset' contains its new location in the + * destination. + */ + + if (STAILQ_EMPTY(&s->s_data)) { + + if ((d = elf_rawdata(s, NULL)) == NULL) + return ((off_t) -1); + + STAILQ_FOREACH(d, &s->s_rawdata, d_next) { + if ((uint64_t) rc < sh_off + d->d_off) + (void) memset(nf + rc, + LIBELF_PRIVATE(fillchar), sh_off + + d->d_off - rc); + rc = sh_off + d->d_off; + + assert(d->d_buf != NULL); + assert(d->d_type == ELF_T_BYTE); + assert(d->d_version == e->e_version); + + (void) memcpy(nf + rc, + e->e_rawfile + s->s_rawoff + d->d_off, d->d_size); + + rc += d->d_size; + } + + return (rc); + } + + /* + * Iterate over the set of data descriptors for this section. + * The prior call to _libelf_resync_elf() would have setup the + * descriptors for this step. + */ + + dst.d_version = e->e_version; + + STAILQ_FOREACH(d, &s->s_data, d_next) { + + if ((uint64_t) rc < sh_off + d->d_off) + (void) memset(nf + rc, + LIBELF_PRIVATE(fillchar), sh_off + d->d_off - rc); + + rc = sh_off + d->d_off; + + assert(d->d_buf != NULL); + assert(d->d_type == (Elf_Type) elftype); + assert(d->d_version == e->e_version); + assert(d->d_size % msz == 0); + + nobjects = d->d_size / msz; + + fsz = _libelf_fsize(elftype, ec, e->e_version, nobjects); + + dst.d_buf = nf + rc; + dst.d_size = fsz * nobjects; + + if (_libelf_xlate(&dst, d, e->e_byteorder, ec, ELF_TOFILE) == + NULL) + return ((off_t) -1); + + rc += fsz * nobjects; + } + + return ((off_t) rc); +} + +/* + * Write out the file image. + * + * The original file could have been mapped in with an ELF_C_RDWR + * command and the application could have added new content or + * re-arranged its sections before calling elf_update(). Consequently + * its not safe to work `in place' on the original file. So we + * malloc() the required space for the updated ELF object and build + * the object there and write it out to the underlying file at the + * end. Note that the application may have opened the underlying file + * in ELF_C_RDWR and only retrieved/modified a few sections. We take + * care to avoid translating file sections unnecessarily. + * + * Gaps in the coverage of the file by the file's sections will be + * filled with the fill character set by elf_fill(3). + */ + +static off_t +_libelf_write_elf(Elf *e, off_t newsize) +{ + int ec; + off_t rc; + size_t fsz, msz, phnum, shnum; + uint64_t phoff, shoff; + void *ehdr; + char *newfile; + Elf_Data dst, src; + Elf_Scn *scn, *tscn; + Elf32_Ehdr *eh32; + Elf64_Ehdr *eh64; + + assert(e->e_kind == ELF_K_ELF); + assert(e->e_cmd != ELF_C_READ); + assert(e->e_fd >= 0); + + if ((newfile = malloc(newsize)) == NULL) { + LIBELF_SET_ERROR(RESOURCE, errno); + return ((off_t) -1); + } + + ec = e->e_class; + + ehdr = _libelf_ehdr(e, ec, 0); + assert(ehdr != NULL); + + if (ec == ELFCLASS32) { + eh32 = (Elf32_Ehdr *) ehdr; + + phnum = eh32->e_phnum; + phoff = (uint64_t) eh32->e_phoff; + shnum = eh32->e_shnum; + shoff = (uint64_t) eh32->e_shoff; + + } else { + eh64 = (Elf64_Ehdr *) ehdr; + + phnum = eh64->e_phnum; + phoff = eh64->e_phoff; + shnum = eh64->e_shnum; + shoff = eh64->e_shoff; + } + + fsz = _libelf_fsize(ELF_T_EHDR, ec, e->e_version, 1); + msz = _libelf_msize(ELF_T_EHDR, ec, e->e_version); + + (void) memset(&dst, 0, sizeof(dst)); + (void) memset(&src, 0, sizeof(src)); + + src.d_buf = ehdr; + src.d_size = msz; + src.d_type = ELF_T_EHDR; + src.d_version = dst.d_version = e->e_version; + + rc = 0; + + dst.d_buf = newfile + rc; + dst.d_size = fsz; + + if (_libelf_xlate(&dst, &src, e->e_byteorder, ec, ELF_TOFILE) == + NULL) + goto error; + + rc += fsz; + + /* + * Write the program header table if present. + */ + + if (phnum != 0 && phoff != 0) { + assert((unsigned) rc <= phoff); + + fsz = _libelf_fsize(ELF_T_PHDR, ec, e->e_version, 1); + + assert(phoff % _libelf_malign(ELF_T_PHDR, ec) == 0); + assert(fsz > 0); + + src.d_version = dst.d_version = e->e_version; + src.d_type = ELF_T_PHDR; + + if (ec == ELFCLASS32) + src.d_buf = e->e_u.e_elf.e_phdr.e_phdr32; + else + src.d_buf = e->e_u.e_elf.e_phdr.e_phdr64; + + src.d_size = phnum * _libelf_msize(ELF_T_PHDR, ec, + e->e_version); + + dst.d_size = fsz; + + if ((uint64_t) rc < phoff) + (void) memset(newfile + rc, + LIBELF_PRIVATE(fillchar), phoff - rc); + + rc = phoff; + dst.d_buf = newfile + rc; + + if (_libelf_xlate(&dst, &src, e->e_byteorder, ec, ELF_TOFILE) == + NULL) + goto error; + } + + /* + * Write out individual sections. + */ + + STAILQ_FOREACH(scn, &e->e_u.e_elf.e_scn, s_next) + if ((rc = _libelf_write_scn(e, newfile, scn, rc)) < 0) + goto error; + + /* + * Write out the section header table, if required. + */ + + if (shnum != 0 && shoff != 0) { + assert((unsigned) rc <= shoff); + + if ((uint64_t) rc < shoff) + (void) memset(newfile + rc, + LIBELF_PRIVATE(fillchar), shoff - rc); + + rc = shoff; + + assert(rc % _libelf_malign(ELF_T_SHDR, ec) == 0); + + src.d_type = ELF_T_SHDR; + src.d_size = _libelf_msize(ELF_T_SHDR, ec, e->e_version); + src.d_version = dst.d_version = e->e_version; + + fsz = _libelf_fsize(ELF_T_SHDR, ec, e->e_version, 1); + + STAILQ_FOREACH(scn, &e->e_u.e_elf.e_scn, s_next) { + if (ec == ELFCLASS32) + src.d_buf = &scn->s_shdr.s_shdr32; + else + src.d_buf = &scn->s_shdr.s_shdr64; + + dst.d_size = fsz; + dst.d_buf = newfile + rc; + + if (_libelf_xlate(&dst, &src, e->e_byteorder, ec, + ELF_TOFILE) != &dst) + goto error; + + rc += fsz; + } + } + + /* + */ + + assert(rc == newsize); + + /* + * Write out the constructed contents and remap the file in + * read-only. + */ + + if (munmap(e->e_rawfile, e->e_rawsize) < 0 || + write(e->e_fd, newfile, newsize) != newsize || + lseek(e->e_fd, 0, SEEK_SET) < 0 || + (e->e_rawfile = mmap(NULL, e->e_rawsize, PROT_READ, MAP_PRIVATE, + e->e_fd, (off_t) 0)) == MAP_FAILED) { + LIBELF_SET_ERROR(IO, errno); + goto error; + } + e->e_rawsize = newsize; + + /* + * Reset flags, remove existing section descriptors and + * {E,P}HDR pointers so that a subsequent elf_get{e,p}hdr() + * and elf_getscn() will function correctly. + */ + + e->e_flags &= ~ELF_F_DIRTY; + + STAILQ_FOREACH_SAFE(scn, &e->e_u.e_elf.e_scn, s_next, tscn) + _libelf_release_scn(scn); + + if (ec == ELFCLASS32) { + free(e->e_u.e_elf.e_ehdr.e_ehdr32); + if (e->e_u.e_elf.e_phdr.e_phdr32) + free(e->e_u.e_elf.e_phdr.e_phdr32); + + e->e_u.e_elf.e_ehdr.e_ehdr32 = NULL; + e->e_u.e_elf.e_phdr.e_phdr32 = NULL; + } else { + free(e->e_u.e_elf.e_ehdr.e_ehdr64); + if (e->e_u.e_elf.e_phdr.e_phdr64) + free(e->e_u.e_elf.e_phdr.e_phdr64); + + e->e_u.e_elf.e_ehdr.e_ehdr64 = NULL; + e->e_u.e_elf.e_phdr.e_phdr64 = NULL; + } + + return (rc); + + error: + if (newfile) + free(newfile); + return ((off_t) -1); +} + off_t -elf_update(__unused Elf *elf, __unused Elf_Cmd cmd) +elf_update(Elf *e, Elf_Cmd c) { - printf("%s: not implemented\n", __FUNCTION__); - return (0); + int ec; + off_t rc; + + rc = (off_t) -1; + + if (e == NULL || e->e_kind != ELF_K_ELF || + (c != ELF_C_NULL && c != ELF_C_WRITE)) { + LIBELF_SET_ERROR(ARGUMENT, 0); + return (rc); + } + + if ((ec = e->e_class) != ELFCLASS32 && ec != ELFCLASS64) { + LIBELF_SET_ERROR(CLASS, 0); + return (rc); + } + + if (e->e_version == EV_NONE) + e->e_version = EV_CURRENT; + + if (c == ELF_C_WRITE && e->e_cmd == ELF_C_READ) { + LIBELF_SET_ERROR(MODE, 0); + return (rc); + } + + if ((rc = _libelf_resync_elf(e)) < 0) + return (rc); + + if (c == ELF_C_NULL) + return (rc); + + if (e->e_cmd == ELF_C_READ) { + /* + * This descriptor was opened in read-only mode or by + * elf_memory(). + */ + if (e->e_fd) + LIBELF_SET_ERROR(MODE, 0); + else + LIBELF_SET_ERROR(ARGUMENT, 0); + return ((off_t) -1); + } + + if (e->e_fd < 0) { + LIBELF_SET_ERROR(SEQUENCE, 0); + return ((off_t) -1); + } + + return (_libelf_write_elf(e, rc)); } ==== //depot/projects/dtrace/src/lib/libelf/gelf_getshdr.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 John Birrell jb@freebsd.org + * Copyright (c) 2006 Joseph Koshy * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,36 +27,91 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include -#include #include "_libelf.h" Elf32_Shdr * -elf32_getshdr(__unused Elf_Scn *scn) +elf32_getshdr(Elf_Scn *s) { - printf("%s: not implemented\n", __FUNCTION__); - return (0); + int ec; + Elf *e; + + if (s == NULL || (e = s->s_elf) == NULL || + e->e_kind != ELF_K_ELF) { + LIBELF_SET_ERROR(ARGUMENT, 0); + return (NULL); + } + + ec = e->e_class; + + assert(ec == ELFCLASS32 || ec == ELFCLASS64); + + if (ec != ELFCLASS32) { + LIBELF_SET_ERROR(CLASS, 0); + return (NULL); + } + + return (&s->s_shdr.s_shdr32); } Elf64_Shdr * -elf64_getshdr(__unused Elf_Scn *scn) +elf64_getshdr(Elf_Scn *s) { - printf("%s: not implemented\n", __FUNCTION__); - return (0); + int ec; + Elf *e; + + if (s == NULL || (e = s->s_elf) == NULL || + e->e_kind != ELF_K_ELF) { + LIBELF_SET_ERROR(ARGUMENT, 0); + return (NULL); + } + + ec = e->e_class; + + assert(ec == ELFCLASS32 || ec == ELFCLASS64); + + if (ec != ELFCLASS64) { + LIBELF_SET_ERROR(CLASS, 0); + return (NULL); + } + + return (&s->s_shdr.s_shdr64); } GElf_Shdr * -gelf_getshdr(__unused Elf_Scn *scn, __unused GElf_Shdr *dst) +gelf_getshdr(Elf_Scn *s, GElf_Shdr *d) { - printf("%s: not implemented\n", __FUNCTION__); - return (0); -} + int ec; + Elf *e; + Elf32_Shdr *sh32; + + if (s == NULL || d == NULL || + (e = s->s_elf) || e->e_kind != ELF_K_ELF) { + LIBELF_SET_ERROR(ARGUMENT, 0); + return (NULL); + } + + ec = e->e_class; + assert(ec == ELFCLASS32 || ec == ELFCLASS64); + + if (ec == ELFCLASS32) { + sh32 = &s->s_shdr.s_shdr32; + + d->sh_name = sh32->sh_name; + d->sh_type = sh32->sh_type; + d->sh_flags = (Elf64_Xword) sh32->sh_flags; + d->sh_addr = (Elf64_Addr) sh32->sh_addr; + d->sh_offset = (Elf64_Off) sh32->sh_offset; + d->sh_size = (Elf64_Xword) sh32->sh_size; + d->sh_link = sh32->sh_link; + d->sh_info = sh32->sh_info; + d->sh_addralign = (Elf64_Xword) sh32->sh_addralign; + d->sh_entsize = (Elf64_Xword) sh32->sh_entsize; + } else + *d = s->s_shdr.s_shdr64; -int -elf_getshstrndx(__unused Elf *elf, __unused size_t *dst) -{ - printf("%s: not implemented\n", __FUNCTION__); - return (0); + return (d); } ==== //depot/projects/dtrace/src/lib/libelf/gelf_rel.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/lib/libelf/gelf_rela.c#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Oct 7 00:46: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 680FF16A415; Sat, 7 Oct 2006 00:46:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B74716A403 for ; Sat, 7 Oct 2006 00:46:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9DDF43D46 for ; Sat, 7 Oct 2006 00:46:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k970kkvL092695 for ; Sat, 7 Oct 2006 00:46:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k970kkZF092692 for perforce@freebsd.org; Sat, 7 Oct 2006 00:46:46 GMT (envelope-from jb@freebsd.org) Date: Sat, 7 Oct 2006 00:46:46 GMT Message-Id: <200610070046.k970kkZF092692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 00:46:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=107387 Change 107387 by jb@jb_freebsd7 on 2006/10/07 00:46:23 sun4v uses the sparc64 version of this file. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/genassym.c#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Oct 7 04:29: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 33EF116A417; Sat, 7 Oct 2006 04:29:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E240F16A412 for ; Sat, 7 Oct 2006 04:29:28 +0000 (UTC) (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 AD30043D49 for ; Sat, 7 Oct 2006 04:29:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k974TSTe098144 for ; Sat, 7 Oct 2006 04:29:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k974TShl098141 for perforce@freebsd.org; Sat, 7 Oct 2006 04:29:28 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Oct 2006 04:29:28 GMT Message-Id: <200610070429.k974TShl098141@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 107391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 04:29:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=107391 Change 107391 by imp@imp_lighthouse on 2006/10/07 04:29:14 Start on deferred ID. Affected files ... .. //depot/projects/arm/src/sys/dev/flash/at45d.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/dev/flash/at45d.c#3 (text+ko) ==== @@ -39,9 +39,23 @@ struct at45d_softc { + struct intr_config_hook config_intrhook; + device_t dev; + struct mtx sc_mtx; int dummy; }; +#define AT45D_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) +#define AT45D_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) +#define AT45D_LOCK_INIT(_sc) \ + mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \ + "at45d", MTX_DEF) +#define AT45D_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); +#define AT45D_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); +#define AT45D_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); + +static void at45d_delayed_attach(void *xsc); + #define CONTINUOUS_ARRAY_READ 0xE8 #define CONTINUOUS_ARRAY_READ_HF 0x0B #define CONTINUOUS_ARRAY_READ_LF 0x03 @@ -244,6 +258,17 @@ static int at45d_attach(device_t dev) { + struct at45d_softc *sc; + + sc = device_get_softc(dev); + sc->dev = dev; + AT45D_LOCK_INIT(sc); + + /* We'll see what kind of flash we have later... */ + sc->config_intrhook.ich_func = at45d_delayed_attach; + sc->config_intrhook.ich_arg = sc; + if (config_intrhook_establish(&sc->config_intrhook) != 0) + device_printf(dev, "config_intrhook_establish failed\n"); return (0); } @@ -253,6 +278,14 @@ return EIO; } +static void +at45d_delayed_attach(void *xsc) +{ + struct at45d_softc *sc = xsc; + + config_intrhook_disestablish(&sc->config_intrhook); +} + static devclass_t at45d_devclass; static device_method_t at45d_methods[] = { From owner-p4-projects@FreeBSD.ORG Sat Oct 7 04:35:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A0DF16A40F; Sat, 7 Oct 2006 04:35:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC6E916A403 for ; Sat, 7 Oct 2006 04:35:36 +0000 (UTC) (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 A3B5243D46 for ; Sat, 7 Oct 2006 04:35:36 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k974ZanR001270 for ; Sat, 7 Oct 2006 04:35:36 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k974Zaar001267 for perforce@freebsd.org; Sat, 7 Oct 2006 04:35:36 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Oct 2006 04:35:36 GMT Message-Id: <200610070435.k974Zaar001267@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 107392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 04:35:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=107392 Change 107392 by imp@imp_lighthouse on 2006/10/07 04:34:40 Properly transpot the request uphill. Affected files ... .. //depot/projects/arm/src/sys/dev/spibus/spibus.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/dev/spibus/spibus.c#6 (text+ko) ==== @@ -158,7 +158,7 @@ static int spibus_transfer_impl(device_t dev, device_t child, struct spi_command *cmd) { - return (SPIBUS_TRANSFER(dev, child, cmd)); + return (SPIBUS_TRANSFER(device_get_parent(dev), child, cmd)); } static device_method_t spibus_methods[] = { From owner-p4-projects@FreeBSD.ORG Sat Oct 7 04:37: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 45B1916A412; Sat, 7 Oct 2006 04:37:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F1C916A407 for ; Sat, 7 Oct 2006 04:37:40 +0000 (UTC) (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 CDC4443D49 for ; Sat, 7 Oct 2006 04:37:39 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k974bd4j001860 for ; Sat, 7 Oct 2006 04:37:39 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k974bdDi001857 for perforce@freebsd.org; Sat, 7 Oct 2006 04:37:39 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Oct 2006 04:37:39 GMT Message-Id: <200610070437.k974bdDi001857@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 107393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 04:37:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=107393 Change 107393 by imp@imp_lighthouse on 2006/10/07 04:36:49 check right return value. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#25 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#25 (text+ko) ==== @@ -233,7 +233,7 @@ rid = 0; sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (sc->mem_res == NULL) + if (sc->irq_res == NULL) goto errout; return (0); errout: From owner-p4-projects@FreeBSD.ORG Sat Oct 7 04:39:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B75316A40F; Sat, 7 Oct 2006 04:39:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BA6616A403 for ; Sat, 7 Oct 2006 04:39:43 +0000 (UTC) (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 0A2C443D45 for ; Sat, 7 Oct 2006 04:39:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k974dgR2002427 for ; Sat, 7 Oct 2006 04:39:42 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k974dgnr002418 for perforce@freebsd.org; Sat, 7 Oct 2006 04:39:42 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Oct 2006 04:39:42 GMT Message-Id: <200610070439.k974dgnr002418@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 107394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 04:39:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=107394 Change 107394 by imp@imp_lighthouse on 2006/10/07 04:38:56 Wow. That's a common bug. Check irq_res when allocating an interrupt. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#9 edit .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#25 edit .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#56 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#9 (text+ko) ==== @@ -176,7 +176,7 @@ rid = 0; sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (sc->mem_res == NULL) + if (sc->irq_res == NULL) goto errout; return (0); errout: ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#25 (text+ko) ==== @@ -173,7 +173,7 @@ rid = 0; sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (sc->mem_res == NULL) + if (sc->irq_res == NULL) goto errout; return (0); errout: ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#56 (text+ko) ==== @@ -333,7 +333,7 @@ rid = 0; sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (sc->mem_res == NULL) + if (sc->irq_res == NULL) goto errout; /* From owner-p4-projects@FreeBSD.ORG Sat Oct 7 05:08: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 9E64816A40F; Sat, 7 Oct 2006 05:08:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 79CC116A407 for ; Sat, 7 Oct 2006 05:08:19 +0000 (UTC) (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 3B62E43D49 for ; Sat, 7 Oct 2006 05:08:19 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9758J3w023411 for ; Sat, 7 Oct 2006 05:08:19 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9758IJ9023408 for perforce@freebsd.org; Sat, 7 Oct 2006 05:08:18 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Oct 2006 05:08:18 GMT Message-Id: <200610070508.k9758IJ9023408@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 107395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 05:08:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=107395 Change 107395 by imp@imp_lighthouse on 2006/10/07 05:07:56 Make this interrupt driven... Also, make it non-locking, since no locks are needed (I don't think) Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_spi.c#8 (text+ko) ==== @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -50,9 +49,9 @@ void *intrhand; /* Interrupt handle */ struct resource *irq_res; /* IRQ resource */ struct resource *mem_res; /* Memory resource */ - struct mtx sc_mtx; /* basically a perimeter lock */ bus_dma_tag_t dmatag; /* bus dma tag for mbufs */ bus_dmamap_t map[4]; /* Maps for the transaction */ + volatile int rxdone; }; static inline uint32_t @@ -67,19 +66,7 @@ bus_write_4(sc->mem_res, off, val); } -#define AT91_SPI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) -#define AT91_SPI_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) -#define AT91_SPI_LOCK_INIT(_sc) \ - mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \ - "spi", MTX_DEF) -#define AT91_SPI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); -#define AT91_SPI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); -#define AT91_SPI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); - -static devclass_t at91_spi_devclass; - /* bus entry points */ - static int at91_spi_probe(device_t dev); static int at91_spi_attach(device_t dev); static int at91_spi_detach(device_t dev); @@ -87,6 +74,7 @@ /* helper routines */ static int at91_spi_activate(device_t dev); static void at91_spi_deactivate(device_t dev); +static void at91_spi_intr(void *arg); static int at91_spi_probe(device_t dev) @@ -106,8 +94,6 @@ if (err) goto out; - AT91_SPI_LOCK_INIT(sc); - /* * Allocate DMA tags and maps */ @@ -124,6 +110,7 @@ // reset the SPI WR4(sc, SPI_CR, SPI_CR_SWRST); + WR4(sc, SPI_IDR, 0xffffffff); WR4(sc, SPI_MR, (0xf << 24) | SPI_MR_MSTR | SPI_MR_MODFDIS | (0xE << 16)); @@ -164,7 +151,7 @@ at91_spi_activate(device_t dev) { struct at91_spi_softc *sc; - int rid; + int rid, err = ENOMEM; sc = device_get_softc(dev); rid = 0; @@ -175,12 +162,16 @@ rid = 0; sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (sc->mem_res == NULL) + if (sc->irq_res == NULL) + goto errout; + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + at91_spi_intr, sc, &sc->intrhand); + if (err != 0) goto errout; return (0); errout: at91_spi_deactivate(dev); - return (ENOMEM); + return (err); } static void @@ -216,7 +207,7 @@ at91_spi_transfer(device_t dev, device_t child, struct spi_command *cmd) { struct at91_spi_softc *sc; - int i; + int i, rxdone, err; bus_addr_t addr; sc = device_get_softc(dev); @@ -250,27 +241,50 @@ WR4(sc, PDC_RNCR, cmd->tx_data_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); + WR4(sc, SPI_IER, SPI_SR_ENDRX); WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN | PDC_PTCR_RXTEN); - // wait for completion - // XXX should be done as an ISR of some sort. - while (RD4(sc, SPI_SR) & SPI_SR_ENDRX) - DELAY(700); - - // Sync the buffers after the DMA is done, and unload them. - bus_dmamap_sync(sc->dmatag, sc->map[0], BUS_DMASYNC_POSTWRITE); - bus_dmamap_sync(sc->dmatag, sc->map[1], BUS_DMASYNC_POSTWRITE); - bus_dmamap_sync(sc->dmatag, sc->map[2], BUS_DMASYNC_POSTREAD); - bus_dmamap_sync(sc->dmatag, sc->map[3], BUS_DMASYNC_POSTREAD); + rxdone = sc->rxdone; + do { + err = msleep(sc, NULL, PCATCH | PZERO, "spi", hz); + } while (rxdone == sc->rxdone && err != EINTR); + WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); + if (err == 0) { + // Sync the buffers after the DMA is done, and unload them. + bus_dmamap_sync(sc->dmatag, sc->map[0], BUS_DMASYNC_POSTWRITE); + bus_dmamap_sync(sc->dmatag, sc->map[1], BUS_DMASYNC_POSTWRITE); + bus_dmamap_sync(sc->dmatag, sc->map[2], BUS_DMASYNC_POSTREAD); + bus_dmamap_sync(sc->dmatag, sc->map[3], BUS_DMASYNC_POSTREAD); + } for (i = 0; i < 4; i++) bus_dmamap_unload(sc->dmatag, sc->map[i]); - return (0); + return (err); out:; while (i-- > 0) bus_dmamap_unload(sc->dmatag, sc->map[i]); return (EIO); } +static void +at91_spi_intr(void *arg) +{ + struct at91_spi_softc *sc = (struct at91_spi_softc*)arg; + uint32_t sr; + + sr = RD4(sc, SPI_SR) & RD4(sc, SPI_IMR); + if (sr & SPI_SR_ENDRX) { + sc->rxdone++; + WR4(sc, SPI_IDR, SPI_SR_ENDRX); + wakeup(sc); + } + if (sr & ~SPI_SR_ENDRX) { + device_printf(sc->dev, "Unexpected ISR %#x\n", sr); + WR4(sc, SPI_IDR, sr & ~SPI_SR_ENDRX); + } +} + +static devclass_t at91_spi_devclass; + static device_method_t at91_spi_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_spi_probe), From owner-p4-projects@FreeBSD.ORG Sat Oct 7 05:13: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 449E916A415; Sat, 7 Oct 2006 05:13:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EBBD616A40F for ; Sat, 7 Oct 2006 05:13:26 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98D4243D46 for ; Sat, 7 Oct 2006 05:13:26 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k975DQXQ025819 for ; Sat, 7 Oct 2006 05:13:26 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k975DQAZ025816 for perforce@freebsd.org; Sat, 7 Oct 2006 05:13:26 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 7 Oct 2006 05:13:26 GMT Message-Id: <200610070513.k975DQAZ025816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 107396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 05:13:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=107396 Change 107396 by mjacob@newisp on 2006/10/07 05:12:59 Change DISABLE_INTS/ENABLE_INTS macros to avoid possible namespace collisions. Use MBOX_GET_RESOURCE_COUNT to set exchange count limits for target mode. Add more 24XX target mode support (ATIOQ handling; at least some of ABTS handling). Check for interrupts at the end of isp_start- apparently the ZIO option for 2300 && 2400 cards will *not* assert an interrupt if you've just updated the request queue pointers. Field ASYNC_LIP_ERROR- it's just treated like a LIP. Field RQSTYPE_ABTS_RCVD/RQSYTYPE_ABTS_RSP IOCBs- they're the 24XX way of doing ABORT TASK. Plus much much more! Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#15 edit .. //depot/projects/newisp/dev/isp/isp_freebsd.c#12 edit .. //depot/projects/newisp/dev/isp/isp_freebsd.h#7 edit .. //depot/projects/newisp/dev/isp/isp_ioctl.h#2 edit .. //depot/projects/newisp/dev/isp/isp_library.c#8 edit .. //depot/projects/newisp/dev/isp/isp_library.h#7 edit .. //depot/projects/newisp/dev/isp/isp_pci.c#12 edit .. //depot/projects/newisp/dev/isp/isp_sbus.c#5 edit .. //depot/projects/newisp/dev/isp/isp_stds.h#4 edit .. //depot/projects/newisp/dev/isp/isp_target.c#6 edit .. //depot/projects/newisp/dev/isp/isp_target.h#8 edit .. //depot/projects/newisp/dev/isp/isp_tpublic.h#3 edit .. //depot/projects/newisp/dev/isp/ispmbox.h#7 edit .. //depot/projects/newisp/dev/isp/ispreg.h#5 edit .. //depot/projects/newisp/dev/isp/ispvar.h#5 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#15 (text+ko) ==== @@ -78,8 +78,9 @@ static const char pskip[] = "SCSI phase skipped for target %d.%d.%d"; static const char topology[] = - "Our PortID 0x%06x N-Port Handle %d, Connection Topology '%s'\n" - " WWNN 0x%08x%08x WWPN 0x%08x%08x"; + "HBA PortID 0x%06x N-Port Handle %d, Connection Topology '%s'"; +static const char ourwwn[] = + "HBA WWNN 0x%08x%08x HBA WWPN 0x%08x%08x"; static const char finmsg[] = "%d.%d.%d: FIN dl%d resid %d STS 0x%x SKEY %c XS_ERR=0x%x"; static const char sc0[] = @@ -217,7 +218,7 @@ isp->isp_touched = 1; } - DISABLE_INTS(isp); + ISP_DISABLE_INTS(isp); /* * Pick an initial maxcmds value which will be used @@ -1139,6 +1140,14 @@ if (IS_DUALBUS(isp)) { isp_setdfltparm(isp, 1); } + + /* + * If we have neither Target nor Initiator role, leave now. + */ + if (isp->isp_role == ISP_ROLE_NONE) { + return; + } + if (IS_FC(isp)) { /* * Do this *before* initializing the firmware. @@ -1825,27 +1834,36 @@ if (isp->isp_role & ISP_ROLE_TARGET) { /* - * Target Mode Only + * Get current resource count */ - icbp->icb_xchgcnt = fcp->isp_maxalloc; + MEMZERO(&mbs, sizeof (mbs)); + mbs.param[0] = MBOX_GET_RESOURCE_COUNT; + mbs.obits = 0x4cf; + isp_mboxcmd(isp, &mbs, MBLOGALL); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + return; + } + icbp->icb_xchgcnt = mbs.param[3]; } + icbp->icb_fwoptions1 = fcp->isp_fwoptions; + icbp->icb_hardaddr = fcp->isp_loopid; - if (icbp->icb_hardaddr > 125) { /* * We end up with these Loop IDs for F-Port topologies */ if (icbp->icb_hardaddr != 0xff && icbp->icb_hardaddr != 0x800) { - isp_prt(isp, ISP_LOGERR, - "bad hard address %u- resetting to zero", - icbp->icb_hardaddr); + isp_prt(isp, ISP_LOGERR, + "bad hard address %u- resetting to zero", + icbp->icb_hardaddr); + icbp->icb_hardaddr = 0; } - icbp->icb_hardaddr = 0; } - icbp->icb_fwoptions1 = fcp->isp_fwoptions; - icbp->icb_fwoptions1 |= ICB2400_OPT1_HARD_ADDRESS; + if (isp->isp_confopts & ISP_CFG_OWNLOOPID) { + icbp->icb_fwoptions1 |= ICB2400_OPT1_HARD_ADDRESS; + } icbp->icb_fwoptions2 = fcp->isp_xfwoptions; switch(isp->isp_confopts & ISP_CFG_PORT_PREF) { @@ -1893,7 +1911,9 @@ icbp->icb_fwoptions3 |= ICB2400_OPT3_RATE_AUTO; } - + if ((isp->isp_confopts & ISP_CFG_OWNLOOPID) == 0) { + icbp->icb_fwoptions3 |= ICB2400_OPT3_SOFTID; + } icbp->icb_logintime = ICB_LOGIN_TOV; nwwn = ISP_NODEWWN(isp); @@ -1939,14 +1959,35 @@ icbp->icb_rqstaddr[RQRSP_ADDR1631] = DMA_WD1(isp->isp_rquest_dma); icbp->icb_rqstaddr[RQRSP_ADDR3247] = DMA_WD2(isp->isp_rquest_dma); icbp->icb_rqstaddr[RQRSP_ADDR4863] = DMA_WD3(isp->isp_rquest_dma); + icbp->icb_respaddr[RQRSP_ADDR0015] = DMA_WD0(isp->isp_result_dma); icbp->icb_respaddr[RQRSP_ADDR1631] = DMA_WD1(isp->isp_result_dma); icbp->icb_respaddr[RQRSP_ADDR3247] = DMA_WD2(isp->isp_result_dma); icbp->icb_respaddr[RQRSP_ADDR4863] = DMA_WD3(isp->isp_result_dma); +#ifdef ISP_TARGET_MODE + if (isp->isp_role & ISP_ROLE_TARGET) { + icbp->icb_atioqlen = RESULT_QUEUE_LEN(isp); + if (icbp->icb_atioqlen < 8) { + isp_prt(isp, ISP_LOGERR, "bad ATIO queue length %d", + icbp->icb_atioqlen); + return; + } + icbp->icb_atioqaddr[RQRSP_ADDR0015] = DMA_WD0(isp->isp_atioq_dma); + icbp->icb_atioqaddr[RQRSP_ADDR1631] = DMA_WD1(isp->isp_atioq_dma); + icbp->icb_atioqaddr[RQRSP_ADDR3247] = DMA_WD2(isp->isp_atioq_dma); + icbp->icb_atioqaddr[RQRSP_ADDR4863] = DMA_WD3(isp->isp_atioq_dma); + isp_prt(isp, ISP_LOGDEBUG0, + "isp_fibre_init_2400: atioq %04x%04x%04x%04x", + DMA_WD3(isp->isp_atioq_dma), DMA_WD2(isp->isp_atioq_dma), + DMA_WD1(isp->isp_atioq_dma), DMA_WD0(isp->isp_atioq_dma)); + } +#endif + isp_prt(isp, ISP_LOGDEBUG0, "isp_fibre_init_2400: fwopt1 0x%x fwopt2 0x%x fwopt3 0x%x", icbp->icb_fwoptions1, icbp->icb_fwoptions2, icbp->icb_fwoptions3); + isp_prt(isp, ISP_LOGDEBUG0, "isp_fibre_init_2400: rqst %04x%04x%04x%04x rsp %04x%04x%04x%04x", DMA_WD3(isp->isp_rquest_dma), DMA_WD2(isp->isp_rquest_dma), @@ -1954,13 +1995,13 @@ DMA_WD3(isp->isp_result_dma), DMA_WD2(isp->isp_result_dma), DMA_WD1(isp->isp_result_dma), DMA_WD0(isp->isp_result_dma)); + if (isp->isp_dblev & ISP_LOGDEBUG1) { + isp_print_bytes(isp, "isp_fibre_init_2400", sizeof (*icbp), + icbp); + } FC_SCRATCH_ACQUIRE(isp); isp_put_icb_2400(isp, icbp, fcp->isp_scratch); - if (isp->isp_dblev & ISP_LOGDEBUG1) { - isp_print_bytes(isp, "isp_fibre_init_2400", sizeof (*icbp), - fcp->isp_scratch); - } /* * Init the firmware @@ -2568,7 +2609,8 @@ * Announce ourselves, too. */ isp_prt(isp, ISP_LOGCONFIG, topology, fcp->isp_portid, - fcp->isp_loopid, toponames[fcp->isp_topo], + fcp->isp_loopid, toponames[fcp->isp_topo]); + isp_prt(isp, ISP_LOGCONFIG, ourwwn, (uint32_t) (ISP_NODEWWN(isp) >> 32), (uint32_t) ISP_NODEWWN(isp), (uint32_t) (ISP_PORTWWN(isp) >> 32), @@ -3874,7 +3916,7 @@ isp_start(XS_T *xs) { ispsoftc_t *isp; - uint32_t nxti, optr, handle; + uint32_t nxti, optr, handle, isr, sema, mbox; uint8_t local[QENTRY_LEN]; ispreq_t *reqp, *qep; void *cdbp; @@ -4130,8 +4172,8 @@ (long) XS_XFRLEN(xs)); ISP_ADD_REQUEST(isp, nxti); isp->isp_nactive++; - if (IS_24XX(isp) || IS_23XX(isp)) { - isp_intr(isp, 0, 0, 0); + if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) { + isp_intr(isp, isr, sema, mbox); } return (CMD_QUEUED); } @@ -4416,6 +4458,7 @@ if (IS_24XX(isp)) { ISP_WRITE(isp, BIU2400_HCCR, HCCR_2400_CMD_CLEAR_RISC_INT); + ISP_DISABLE_INTS(isp); } else { ISP_WRITE(isp, HCCR, HCCR_CMD_CLEAR_RISC_INT); ISP_WRITE(isp, BIU_SEMA, 0); @@ -4423,6 +4466,39 @@ return; } +#ifdef ISP_TARGET_MODE + /* + * Check for ATIO Queue entries. + */ + if ((isp->isp_role & ISP_ROLE_TARGET) && IS_24XX(isp)) { + iptr = ISP_READ(isp, isp->isp_atioinrp); + optr = ISP_READ(isp, isp->isp_atiooutrp); + + isp->isp_rspbsy = 1; + i = 0; + while (optr != iptr) { + uint8_t qe[QENTRY_LEN]; + uint16_t oop; + isphdr_t *hp; + void *addr; + + oop = optr; + optr = ISP_NXT_QENTRY(optr, RESULT_QUEUE_LEN(isp)); + MEMORYBARRIER(isp, SYNC_ATIOQ, oop, QENTRY_LEN); + addr = (isphdr_t *) ISP_QUEUE_ENTRY(isp->isp_atioq, optr); + isp_get_hdr(isp, addr, (isphdr_t *)qe); + hp = (isphdr_t *)qe; + isp_prt(isp, ISP_LOGALL, "ATIOQ: got 0x%x", hp->rqs_entry_type); + isp_print_bytes(isp, "ATIOQU", QENTRY_LEN, addr); + i++; + } + if (i) { + ISP_WRITE(isp, isp->isp_atiooutrp, optr); + } + isp->isp_rspbsy = 0; + } +#endif + /* * Get the current Response Queue Out Pointer. * @@ -5049,6 +5125,7 @@ #endif break; } + case ASYNC_LIP_ERROR: case ASYNC_LIP_F8: case ASYNC_LIP_OCCURRED: FCPARAM(isp)->isp_fwstate = FW_CONFIG_WAIT; @@ -5254,6 +5331,8 @@ case RQSTYPE_CTIO2: case RQSTYPE_CTIO3: case RQSTYPE_CTIO7: + case RQSTYPE_ABTS_RCVD: + case RQSTYPE_ABTS_RSP: isp->isp_rsltccmplt++; /* count as a response completion */ #ifdef ISP_TARGET_MODE if (isp_target_notify(isp, (ispstatusreq_t *) hp, optrp)) { @@ -6212,7 +6291,7 @@ ISPOPMAP(0x00, 0x00), /* 0x3f: */ ISPOPMAP(0x03, 0x01), /* 0x40: MBOX_LOOP_PORT_BYPASS */ ISPOPMAP(0x03, 0x01), /* 0x41: MBOX_LOOP_PORT_ENABLE */ - ISPOPMAP(0x03, 0x07), /* 0x42: MBOX_GET_RESOURCE_COUNTS */ + ISPOPMAP(0x03, 0x07), /* 0x42: MBOX_GET_RESOURCE_COUNT */ ISPOPMAP(0x01, 0x01), /* 0x43: MBOX_REQUEST_NON_PARTICIPATING_MODE */ ISPOPMAP(0x00, 0x00), /* 0x44: */ ISPOPMAP(0x00, 0x00), /* 0x45: */ @@ -6351,7 +6430,7 @@ NULL, "LOOP PORT BYPASS", "LOOP PORT ENABLE", - "GET RESOURCE COUNTS", + "GET RESOURCE COUNT", "REQUEST NON PARTICIPATING MODE", NULL, NULL, @@ -7035,23 +7114,27 @@ if (isp->isp_state != ISP_RUNSTATE) { isp_prt(isp, ISP_LOGERR, "isp_reinit cannot restart card"); + ISP_DISABLE_INTS(isp); } - } else if (IS_FC(isp)) { - /* - * If we're in ISP_ROLE_NONE, turn off the lasers. - */ - if (!IS_24XX(isp)) { - ISP_WRITE(isp, BIU2100_CSR, BIU2100_FPM0_REGS); - ISP_WRITE(isp, FPM_DIAG_CONFIG, FPM_SOFT_RESET); - ISP_WRITE(isp, BIU2100_CSR, BIU2100_FB_REGS); - ISP_WRITE(isp, FBM_CMD, FBMCMD_FIFO_RESET_ALL); - ISP_WRITE(isp, BIU2100_CSR, BIU2100_RISC_REGS); + } else { + ISP_DISABLE_INTS(isp); + if (IS_FC(isp)) { + /* + * If we're in ISP_ROLE_NONE, turn off the lasers. + */ + if (!IS_24XX(isp)) { + ISP_WRITE(isp, BIU2100_CSR, BIU2100_FPM0_REGS); + ISP_WRITE(isp, FPM_DIAG_CONFIG, FPM_SOFT_RESET); + ISP_WRITE(isp, BIU2100_CSR, BIU2100_FB_REGS); + ISP_WRITE(isp, FBM_CMD, FBMCMD_FIFO_RESET_ALL); + ISP_WRITE(isp, BIU2100_CSR, BIU2100_RISC_REGS); + } } } isp->isp_nactive = 0; for (tmp = 0; tmp < isp->isp_maxcmds; tmp++) { - uint16_t handle; + uint32_t handle; xs = isp->isp_xflist[tmp]; if (xs == NULL) { @@ -7071,6 +7154,9 @@ XS_SETERR(xs, HBA_BUSRESET); isp_done(xs); } +#ifdef ISP_TARGET_MODE + MEMZERO(isp->isp_tgtlist, isp->isp_maxcmds * sizeof (void **)); +#endif } /* @@ -7889,7 +7975,7 @@ break; } } - ENABLE_INTS(isp); + ISP_ENABLE_INTS(isp); mbs.param[0] = MBOX_READ_RAM_WORD; mbs.param[1] = 0x1000; isp->isp_mbxworkp = (void *) ptr; @@ -8032,7 +8118,7 @@ isp_prt(isp, ISP_LOGERR, "Board Would Not Reset"); return; } - ENABLE_INTS(isp); + ISP_ENABLE_INTS(isp); MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_READ_RAM_WORD; mbs.param[1] = 0x800; ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#12 (text+ko) ==== @@ -245,7 +245,7 @@ if (isp->isp_role != ISP_ROLE_NONE) { isp->isp_state = ISP_RUNSTATE; - ENABLE_INTS(isp); + ISP_ENABLE_INTS(isp); } if (isplist == NULL) { isplist = isp; @@ -660,7 +660,7 @@ { ispsoftc_t *isp = arg; if (isp->isp_role != ISP_ROLE_NONE) { - ENABLE_INTS(isp); + ISP_ENABLE_INTS(isp); #if 0 isp->isp_osinfo.intsok = 1; #endif @@ -3286,7 +3286,7 @@ } else { ISP_WRITE(isp, HCCR, HCCR_CMD_RESET); } - DISABLE_INTS(isp); + ISP_DISABLE_INTS(isp); } void ==== //depot/projects/newisp/dev/isp/isp_freebsd.h#7 (text+ko) ==== ==== //depot/projects/newisp/dev/isp/isp_ioctl.h#2 (text+ko) ==== ==== //depot/projects/newisp/dev/isp/isp_library.c#8 (text) ==== @@ -180,10 +180,6 @@ * action because things may have changed while we were doing this. * Any failure or change of state causes us to return a nonzero value. * - * We honor HBA roles in that if we're not in Initiator mode, we don't - * attempt to sync up the database (that's for somebody else to do, - * if ever). - * * We assume we enter here with any locks held. */ @@ -193,6 +189,9 @@ fcparam *fcp; int *tptr; + if (isp->isp_role == ISP_ROLE_NONE) { + return (0); + } fcp = FCPARAM(isp); tptr = &tval; if (fcp->isp_fwstate < FW_READY || @@ -209,6 +208,10 @@ return (-1); } } + if ((isp->isp_role & ISP_ROLE_INITIATOR) == 0) { + fcp->isp_loopstate = LOOP_READY; + return (0); + } if (isp_control(isp, ISPCTL_SCAN_LOOP, NULL) != 0) { isp_prt(isp, ISP_LOGINFO, "isp_fc_runstate: scan loop fails"); return (LOOP_PDB_RCVD); @@ -692,6 +695,7 @@ ISP_IOXPUT_8(isp, src->icb_icnt, &dst->icb_icnt); } ISP_IOXPUT_16(isp, src->icb_lunetimeout, &dst->icb_lunetimeout); + ISP_IOXPUT_16(isp, src->icb_reserved1, &dst->icb_reserved1); ISP_IOXPUT_16(isp, src->icb_xfwoptions, &dst->icb_xfwoptions); if (ISP_IS_SBUS(isp)) { ISP_IOXPUT_8(isp, src->icb_racctimer, &dst->icb_idelaytimer); @@ -2499,6 +2503,114 @@ } ISP_IOXGET_16(isp, &src->na_oxid, dst->na_oxid); } + +void +isp_get_abts(ispsoftc_t *isp, abts_t *src, abts_t *dst) +{ + int i; + + isp_get_hdr(isp, &src->abts_header, &dst->abts_header); + for (i = 0; i < 6; i++) { + ISP_IOXGET_8(isp, &src->abts_reserved0[i], + dst->abts_reserved0[i]); + } + ISP_IOXGET_16(isp, &src->abts_nphdl, dst->abts_nphdl); + ISP_IOXGET_16(isp, &src->abts_reserved1, dst->abts_reserved1); + ISP_IOXGET_16(isp, &src->abts_sof, dst->abts_sof); + ISP_IOXGET_32(isp, &src->abts_rxid_abts, dst->abts_rxid_abts); + ISP_IOXGET_16(isp, &src->abts_did_lo, dst->abts_did_lo); + ISP_IOXGET_8(isp, &src->abts_did_hi, dst->abts_did_hi); + ISP_IOXGET_8(isp, &src->abts_r_ctl, dst->abts_r_ctl); + ISP_IOXGET_16(isp, &src->abts_sid_lo, dst->abts_sid_lo); + ISP_IOXGET_8(isp, &src->abts_sid_hi, dst->abts_sid_hi); + ISP_IOXGET_8(isp, &src->abts_cs_ctl, dst->abts_cs_ctl); + ISP_IOXGET_16(isp, &src->abts_fs_ctl, dst->abts_fs_ctl); + ISP_IOXGET_8(isp, &src->abts_f_ctl, dst->abts_f_ctl); + ISP_IOXGET_8(isp, &src->abts_type, dst->abts_type); + ISP_IOXGET_16(isp, &src->abts_seq_cnt, dst->abts_seq_cnt); + ISP_IOXGET_8(isp, &src->abts_df_ctl, dst->abts_df_ctl); + ISP_IOXGET_8(isp, &src->abts_seq_id, dst->abts_seq_id); + ISP_IOXGET_16(isp, &src->abts_rx_id, dst->abts_rx_id); + ISP_IOXGET_16(isp, &src->abts_ox_id, dst->abts_ox_id); + ISP_IOXGET_32(isp, &src->abts_param, dst->abts_param); + for (i = 0; i < 16; i++) { + ISP_IOXGET_8(isp, &src->abts_reserved2[i], + dst->abts_reserved2[i]); + } + ISP_IOXGET_32(isp, &src->abts_rxid_task, dst->abts_rxid_task); +} + +void +isp_put_abts_rsp(ispsoftc_t *isp, abts_rsp_t *src, abts_rsp_t *dst) +{ + int i; + + isp_put_hdr(isp, &src->abts_rsp_header, &dst->abts_rsp_header); + ISP_IOXPUT_32(isp, src->abts_rsp_handle, &dst->abts_rsp_handle); + ISP_IOXPUT_16(isp, src->abts_rsp_status, &dst->abts_rsp_status); + ISP_IOXPUT_16(isp, src->abts_rsp_nphdl, &dst->abts_rsp_nphdl); + ISP_IOXPUT_16(isp, src->abts_rsp_ctl_flags, &dst->abts_rsp_ctl_flags); + ISP_IOXPUT_16(isp, src->abts_rsp_sof, &dst->abts_rsp_sof); + ISP_IOXPUT_32(isp, src->abts_rsp_rxid_abts, &dst->abts_rsp_rxid_abts); + ISP_IOXPUT_16(isp, src->abts_rsp_did_lo, &dst->abts_rsp_did_lo); + ISP_IOXPUT_8(isp, src->abts_rsp_did_hi, &dst->abts_rsp_did_hi); + ISP_IOXPUT_8(isp, src->abts_rsp_r_ctl, &dst->abts_rsp_r_ctl); + ISP_IOXPUT_16(isp, src->abts_rsp_sid_lo, &dst->abts_rsp_sid_lo); + ISP_IOXPUT_8(isp, src->abts_rsp_sid_hi, &dst->abts_rsp_sid_hi); + ISP_IOXPUT_8(isp, src->abts_rsp_cs_ctl, &dst->abts_rsp_cs_ctl); + ISP_IOXPUT_16(isp, src->abts_rsp_fs_ctl, &dst->abts_rsp_fs_ctl); + ISP_IOXPUT_8(isp, src->abts_rsp_f_ctl, &dst->abts_rsp_f_ctl); + ISP_IOXPUT_8(isp, src->abts_rsp_type, &dst->abts_rsp_type); + ISP_IOXPUT_16(isp, src->abts_rsp_seq_cnt, &dst->abts_rsp_seq_cnt); + ISP_IOXPUT_8(isp, src->abts_rsp_df_ctl, &dst->abts_rsp_df_ctl); + ISP_IOXPUT_8(isp, src->abts_rsp_seq_id, &dst->abts_rsp_seq_id); + ISP_IOXPUT_16(isp, src->abts_rsp_rx_id, &dst->abts_rsp_rx_id); + ISP_IOXPUT_16(isp, src->abts_rsp_ox_id, &dst->abts_rsp_ox_id); + ISP_IOXPUT_32(isp, src->abts_rsp_param, &dst->abts_rsp_param); + for (i = 0; i < 12; i++) { + ISP_IOXPUT_8(isp, src->abts_rsp_reserved2[i], + &dst->abts_rsp_reserved2[i]); + } + ISP_IOXPUT_16(isp, src->abts_rsp_subcode1, &dst->abts_rsp_subcode1); + ISP_IOXPUT_16(isp, src->abts_rsp_subcode2, &dst->abts_rsp_subcode2); + ISP_IOXPUT_32(isp, src->abts_rsp_rxid_task, &dst->abts_rsp_rxid_task); +} + +void +isp_get_abts_rsp(ispsoftc_t *isp, abts_rsp_t *src, abts_rsp_t *dst) +{ + int i; + + isp_get_hdr(isp, &src->abts_rsp_header, &dst->abts_rsp_header); + ISP_IOXGET_32(isp, &src->abts_rsp_handle, dst->abts_rsp_handle); + ISP_IOXGET_16(isp, &src->abts_rsp_status, dst->abts_rsp_status); + ISP_IOXGET_16(isp, &src->abts_rsp_nphdl, dst->abts_rsp_nphdl); + ISP_IOXGET_16(isp, &src->abts_rsp_ctl_flags, dst->abts_rsp_ctl_flags); + ISP_IOXGET_16(isp, &src->abts_rsp_sof, dst->abts_rsp_sof); + ISP_IOXGET_32(isp, &src->abts_rsp_rxid_abts, dst->abts_rsp_rxid_abts); + ISP_IOXGET_16(isp, &src->abts_rsp_did_lo, dst->abts_rsp_did_lo); + ISP_IOXGET_8(isp, &src->abts_rsp_did_hi, dst->abts_rsp_did_hi); + ISP_IOXGET_8(isp, &src->abts_rsp_r_ctl, dst->abts_rsp_r_ctl); + ISP_IOXGET_16(isp, &src->abts_rsp_sid_lo, dst->abts_rsp_sid_lo); + ISP_IOXGET_8(isp, &src->abts_rsp_sid_hi, dst->abts_rsp_sid_hi); + ISP_IOXGET_8(isp, &src->abts_rsp_cs_ctl, dst->abts_rsp_cs_ctl); + ISP_IOXGET_16(isp, &src->abts_rsp_fs_ctl, dst->abts_rsp_fs_ctl); + ISP_IOXGET_8(isp, &src->abts_rsp_f_ctl, dst->abts_rsp_f_ctl); + ISP_IOXGET_8(isp, &src->abts_rsp_type, dst->abts_rsp_type); + ISP_IOXGET_16(isp, &src->abts_rsp_seq_cnt, dst->abts_rsp_seq_cnt); + ISP_IOXGET_8(isp, &src->abts_rsp_df_ctl, dst->abts_rsp_df_ctl); + ISP_IOXGET_8(isp, &src->abts_rsp_seq_id, dst->abts_rsp_seq_id); + ISP_IOXGET_16(isp, &src->abts_rsp_rx_id, dst->abts_rsp_rx_id); + ISP_IOXGET_16(isp, &src->abts_rsp_ox_id, dst->abts_rsp_ox_id); + ISP_IOXGET_32(isp, &src->abts_rsp_param, dst->abts_rsp_param); + for (i = 0; i < 12; i++) { + ISP_IOXGET_8(isp, &src->abts_rsp_reserved2[i], + dst->abts_rsp_reserved2[i]); + } + ISP_IOXGET_16(isp, &src->abts_rsp_subcode1, dst->abts_rsp_subcode1); + ISP_IOXGET_16(isp, &src->abts_rsp_subcode2, dst->abts_rsp_subcode2); + ISP_IOXGET_32(isp, &src->abts_rsp_rxid_task, dst->abts_rsp_rxid_task); +} #endif /* ISP_TARGET_MODE */ /* * vim:ts=8:sw=8 ==== //depot/projects/newisp/dev/isp/isp_library.h#7 (text) ==== @@ -202,5 +202,11 @@ isp_get_notify_ack_fc_e(ispsoftc_t *, na_fcentry_e_t *, na_fcentry_e_t *); extern void isp_get_notify_ack_24xx(ispsoftc_t *, na_fcentry_24xx_t *, na_fcentry_24xx_t *); +extern void +isp_get_abts(ispsoftc_t *, abts_t *, abts_t *); +extern void +isp_put_abts_rsp(ispsoftc_t *, abts_rsp_t *, abts_rsp_t *); +extern void +isp_get_abts_rsp(ispsoftc_t *, abts_rsp_t *, abts_rsp_t *); #endif /* ISP_TARGET_MODE */ #endif /* _ISP_LIBRARY_H */ ==== //depot/projects/newisp/dev/isp/isp_pci.c#12 (text+ko) ==== @@ -1208,9 +1208,7 @@ return (ENXIO); } isp = (ispsoftc_t *) pcs; - ISP_LOCK(isp); - DISABLE_INTS(isp); - ISP_UNLOCK(isp); + ISP_DISABLE_INTS(isp); return (0); } @@ -2874,7 +2872,7 @@ isp_pci_wr_reg(isp, HCCR, PCI_HCCR_CMD_BIOS); } /* and enable interrupts */ - ENABLE_INTS(isp); + ISP_ENABLE_INTS(isp); } static void ==== //depot/projects/newisp/dev/isp/isp_sbus.c#5 (text+ko) ==== ==== //depot/projects/newisp/dev/isp/isp_stds.h#4 (text+ko) ==== ==== //depot/projects/newisp/dev/isp/isp_target.c#6 (text+ko) ==== @@ -127,10 +127,13 @@ in_entry_t *inotp; in_fcentry_t *inot_fcp; in_fcentry_e_t *inote_fcp; + in_fcentry_24xx_t *inot_24xx; na_entry_t *nackp; na_fcentry_t *nack_fcp; na_fcentry_e_t *nacke_fcp; isphdr_t *hp; + abts_t *abts; + abts_rsp_t *abts_rsp; void * *vp; #define atiop unp.atiop #define at2iop unp.at2iop @@ -144,9 +147,12 @@ #define inotp unp.inotp #define inot_fcp unp.inot_fcp #define inote_fcp unp.inote_fcp +#define inot_24xx unp.inot_24xx #define nackp unp.nackp #define nack_fcp unp.nack_fcp #define nacke_fcp unp.nacke_fcp +#define abts unp.abts +#define abts_rsp unp.abts_rsp #define hdrp unp.hp } unp; uint8_t local[QENTRY_LEN]; @@ -168,10 +174,12 @@ isp_handle_atio(isp, (at_entry_t *) local); } break; + case RQSTYPE_CTIO: isp_get_ctio(isp, ctiop, (ct_entry_t *) local); isp_handle_ctio(isp, (ct_entry_t *) local); break; + case RQSTYPE_ATIO2: if (FCPARAM(isp)->isp_2klogin) { isp_get_atio2e(isp, at2eiop, (at2e_entry_t *) local); @@ -180,6 +188,7 @@ } isp_handle_atio2(isp, (at2_entry_t *) local); break; + case RQSTYPE_CTIO3: case RQSTYPE_CTIO2: if (FCPARAM(isp)->isp_2klogin) { @@ -189,10 +198,12 @@ } isp_handle_ctio2(isp, (ct2_entry_t *) local); break; + case RQSTYPE_CTIO7: isp_get_ctio7(isp, ct7iop, (ct7_entry_t *) local); isp_handle_ctio7(isp, (ct7_entry_t *) local); break; + case RQSTYPE_ENABLE_LUN: case RQSTYPE_MODIFY_LUN: isp_get_enable_lun(isp, lunenp, (lun_entry_t *) local); @@ -208,7 +219,13 @@ * (we set this initially in the Enable Lun entry). */ bus = 0; - if (IS_FC(isp)) { + if (IS_24XX(isp)) { + isp_get_notify_24xx(isp, inot_24xx, + (in_fcentry_24xx_t *)local); + inot_24xx = (in_fcentry_24xx_t *) local; + status = inot_24xx->in_status; + seqid = 0; + } else if (IS_FC(isp)) { if (FCPARAM(isp)->isp_2klogin) { isp_get_notify_fc_e(isp, inote_fcp, (in_fcentry_e_t *)local); @@ -247,13 +264,16 @@ isp_prt(isp, ISP_LOGWARN, "Firmware out of ATIOs"); isp_notify_ack(isp, local); break; - case IN_RESET: + case IN_RESET: /* same as IN24XX_LIP_RESET */ + case IN24XX_LINK_RESET: (void) isp_target_async(isp, 0, ASYNC_BUS_RESET); break; - case IN_PORT_LOGOUT: + case IN_PORT_LOGOUT: /* same as IN24XX_PORT_LOGOUT */ case IN_ABORT_TASK: - case IN_PORT_CHANGED: - case IN_GLOBAL_LOGO: + case IN_PORT_CHANGED: /* same as IN24XX_PORT_CHANGED */ + case IN_GLOBAL_LOGO: /* same as IN24XX_LINK_FAILED */ + case IN24XX_SRR_RCVD: + case IN24XX_ELS_RCVD: (void) isp_async(isp, ISPASYNC_TARGET_ACTION, &local); break; default: @@ -289,6 +309,19 @@ nackp->na_event, nackp->na_status, nackp->na_seqid); } break; + + case RQSTYPE_ABTS_RCVD: + isp_get_abts(isp, abts, (abts_t *)local); + (void) isp_async(isp, ISPASYNC_TARGET_ACTION, &local); + break; + case RQSTYPE_ABTS_RSP: + isp_get_abts_rsp(isp, abts_rsp, (abts_rsp_t *)local); + abts_rsp = (abts_rsp_t *) local; + isp_prt(isp, ISP_LOGALL, + "ABTS RSP response[0x%x]: status=0x%x sub=(0x%x 0x%x)", + abts_rsp->abts_rsp_rxid_task, abts_rsp->abts_rsp_status, + abts_rsp->abts_rsp_subcode1, abts_rsp->abts_rsp_subcode2); + break; default: isp_prt(isp, ISP_LOGERR, "Unknown entry type 0x%x in isp_target_notify", type); @@ -307,9 +340,12 @@ #undef inotp #undef inot_fcp #undef inote_fcp +#undef inot_24xx #undef nackp #undef nack_fcp #undef nacke_fcp +#undef abts +#undef abts_rsp #undef hdrp return (rval); } @@ -586,6 +622,7 @@ notify.nt_ncode = NT_LINK_DOWN; (void) isp_async(isp, ISPASYNC_TARGET_NOTIFY, ¬ify); break; + case ASYNC_LIP_ERROR: case ASYNC_LIP_F8: case ASYNC_LIP_OCCURRED: case ASYNC_LOOP_RESET: @@ -777,7 +814,41 @@ MEMZERO(storage, QENTRY_LEN); - if (IS_FC(isp)) { + if (IS_24XX(isp) && arg != NULL && (((isphdr_t *)arg)->rqs_entry_type == RQSTYPE_ABTS_RCVD)) { + abts_t *abts = arg; + abts_rsp_t *abts_rsp = (abts_rsp_t *) storage; + /* + * The caller will have set response values as appropriate + * in the ABTS structure just before calling us. + */ + MEMCPY(abts_rsp, abts, QENTRY_LEN); + abts_rsp->abts_rsp_header.rqs_entry_type = RQSTYPE_ABTS_RSP; + isp_put_abts_rsp(isp, abts_rsp, (abts_rsp_t *)outp); + + } else if (IS_24XX(isp)) { + na_fcentry_24xx_t *na = (na_fcentry_24xx_t *) storage; + if (arg) { + in_fcentry_24xx_t *in = arg; + na->na_nphdl = in->in_nphdl; + na->na_status = in->in_status; + na->na_status_subcode = in->in_status_subcode; + na->na_rxid = in->in_rxid; + na->na_oxid = in->in_oxid; + if (in->in_status == IN24XX_SRR_RCVD) { + na->na_srr_rxid = in->in_srr_rxid; + na->na_srr_reloff_hi = in->in_srr_reloff_hi; + na->na_srr_reloff_lo = in->in_srr_reloff_lo; + na->na_srr_iu = in->in_srr_iu; + na->na_srr_flags = 1; + na->na_srr_reject_vunique = 0; + na->na_srr_reject_explanation = 1; + na->na_srr_reject_code = 1; + } + } + na->na_header.rqs_entry_type = RQSTYPE_NOTIFY_ACK; + na->na_header.rqs_entry_count = 1; + isp_put_notify_24xx_ack(isp, na, (na_fcentry_24xx_t *)outp); + } else if (IS_FC(isp)) { na_fcentry_t *na = (na_fcentry_t *) storage; int iid = 0; ==== //depot/projects/newisp/dev/isp/isp_target.h#8 (text+ko) ==== @@ -799,6 +799,78 @@ #define CT7_SRR 0x45 /* SRR Received */ /* + * Other 24XX related target IOCBs + */ + +/* + * ABTS Received + */ +typedef struct { + isphdr_t abts_header; + uint8_t abts_reserved0[6]; + uint16_t abts_nphdl; + uint16_t abts_reserved1; + uint16_t abts_sof; + uint32_t abts_rxid_abts; + uint16_t abts_did_lo; + uint8_t abts_did_hi; + uint8_t abts_r_ctl; + uint16_t abts_sid_lo; + uint8_t abts_sid_hi; + uint8_t abts_cs_ctl; + uint16_t abts_fs_ctl; + uint8_t abts_f_ctl; + uint8_t abts_type; + uint16_t abts_seq_cnt; + uint8_t abts_df_ctl; + uint8_t abts_seq_id; + uint16_t abts_rx_id; + uint16_t abts_ox_id; + uint32_t abts_param; + uint8_t abts_reserved2[16]; + uint32_t abts_rxid_task; +} abts_t; + +typedef struct { + isphdr_t abts_rsp_header; + uint32_t abts_rsp_handle; + uint16_t abts_rsp_status; + uint16_t abts_rsp_nphdl; + uint16_t abts_rsp_ctl_flags; + uint16_t abts_rsp_sof; + uint32_t abts_rsp_rxid_abts; + uint16_t abts_rsp_did_lo; + uint8_t abts_rsp_did_hi; + uint8_t abts_rsp_r_ctl; + uint16_t abts_rsp_sid_lo; + uint8_t abts_rsp_sid_hi; + uint8_t abts_rsp_cs_ctl; + uint16_t abts_rsp_fs_ctl; + uint8_t abts_rsp_f_ctl; + uint8_t abts_rsp_type; + uint16_t abts_rsp_seq_cnt; + uint8_t abts_rsp_df_ctl; + uint8_t abts_rsp_seq_id; + uint16_t abts_rsp_rx_id; + uint16_t abts_rsp_ox_id; + uint32_t abts_rsp_param; + uint8_t abts_rsp_reserved2[12]; + uint16_t abts_rsp_subcode1; + uint16_t abts_rsp_subcode2; + uint32_t abts_rsp_rxid_task; +} abts_rsp_t; + +#define ISP24XX_ABTS_RSP_TERMINATE 0x01 + +#define ISP24XX_ABTS_RSP_COMPLETE 0x00 +#define ISP24XX_ABTS_RSP_RESET 0x04 +#define ISP24XX_ABTS_RSP_ABORTED 0x05 +#define ISP24XX_ABTS_RSP_TIMEOUT 0x06 +#define ISP24XX_ABTS_RSP_INVXID 0x08 +#define ISP24XX_ABTS_RSP_LOGOUT 0x29 +#define ISP24XX_ABTS_RSP_SUBCODE 0x31 + +/* * Debug macros */ ==== //depot/projects/newisp/dev/isp/isp_tpublic.h#3 (text+ko) ==== ==== //depot/projects/newisp/dev/isp/ispmbox.h#7 (text+ko) ==== @@ -340,6 +340,8 @@ #define RQSTYPE_CT_PASSTHRU 0x29 #define RQSTYPE_T6RQS 0x48 #define RQSTYPE_LOGIN 0x52 +#define RQSTYPE_ABTS_RCVD 0x54 /* 24XX only */ +#define RQSTYPE_ABTS_RSP 0x55 /* 24XX only */ #define ISP_RQDSEG 4 @@ -798,7 +800,7 @@ uint8_t icb_ccnt; uint8_t icb_icnt; uint16_t icb_lunetimeout; - uint16_t icb__reserved1; + uint16_t icb_reserved1; uint16_t icb_xfwoptions; uint8_t icb_racctimer; uint8_t icb_idelaytimer; @@ -939,7 +941,7 @@ uint16_t icb_prqstqlen; uint16_t icb_rqstaddr[4]; uint16_t icb_respaddr[4]; - uint16_t icb_priaddr[4]; + uint16_t icb_priaddr[4]; uint16_t icb_reserved1[4]; uint16_t icb_atio_in; uint16_t icb_atioqlen; ==== //depot/projects/newisp/dev/isp/ispreg.h#5 (text+ko) ==== @@ -763,20 +763,20 @@ /* * Defines for Interrupts */ -#define INTS_ENABLED(isp) \ +#define ISP_INTS_ENABLED(isp) \ ((IS_SCSI(isp))? \ (ISP_READ(isp, BIU_ICR) & BIU_IMASK) : \ (IS_24XX(isp)? (ISP_READ(isp, BIU2400_ICR) & BIU2400_IMASK) : \ (ISP_READ(isp, BIU_ICR) & BIU2100_IMASK))) -#define ENABLE_INTS(isp) \ +#define ISP_ENABLE_INTS(isp) \ (IS_SCSI(isp) ? \ ISP_WRITE(isp, BIU_ICR, BIU_IMASK) : \ (IS_24XX(isp) ? \ (ISP_WRITE(isp, BIU2400_ICR, BIU2400_IMASK)) : \ (ISP_WRITE(isp, BIU_ICR, BIU2100_IMASK)))) -#define DISABLE_INTS(isp) \ +#define ISP_DISABLE_INTS(isp) \ IS_24XX(isp)? ISP_WRITE(isp, BIU2400_ICR, 0) : ISP_WRITE(isp, BIU_ICR, 0) /* ==== //depot/projects/newisp/dev/isp/ispvar.h#5 (text+ko) ==== @@ -126,6 +126,7 @@ #define SYNC_SFORDEV 2 /* scratch, sync for ISP */ #define SYNC_SFORCPU 3 /* scratch, sync for CPU */ #define SYNC_REG 4 /* for registers */ +#define SYNC_ATIOQ 5 /* atio result queue (24xx) */ /* * Request/Response Queue defines and macros. From owner-p4-projects@FreeBSD.ORG Sat Oct 7 06:40: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 29E8C16A416; Sat, 7 Oct 2006 06:40:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D497816A40F for ; Sat, 7 Oct 2006 06:40:15 +0000 (UTC) (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 8AFAE43D58 for ; Sat, 7 Oct 2006 06:40:15 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k976eFj1060062 for ; Sat, 7 Oct 2006 06:40:15 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k976eFK7060056 for perforce@freebsd.org; Sat, 7 Oct 2006 06:40:15 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Oct 2006 06:40:15 GMT Message-Id: <200610070640.k976eFK7060056@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 107397 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 06:40:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=107397 Change 107397 by imp@imp_lighthouse on 2006/10/07 06:39:41 Minor tweaks Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_spi.c#9 (text+ko) ==== @@ -51,7 +51,7 @@ struct resource *mem_res; /* Memory resource */ bus_dma_tag_t dmatag; /* bus dma tag for mbufs */ bus_dmamap_t map[4]; /* Maps for the transaction */ - volatile int rxdone; + int rxdone; }; static inline uint32_t @@ -128,8 +128,6 @@ WR4(sc, PDC_RCR, 0); WR4(sc, PDC_TPR, 0); WR4(sc, PDC_TCR, 0); - WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); - WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); RD4(sc, SPI_RDR); RD4(sc, SPI_SR); @@ -246,7 +244,7 @@ rxdone = sc->rxdone; do { - err = msleep(sc, NULL, PCATCH | PZERO, "spi", hz); + err = msleep(&sc->rxdone, NULL, PCATCH | PZERO, "spi", hz); } while (rxdone == sc->rxdone && err != EINTR); WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); if (err == 0) { @@ -275,7 +273,7 @@ if (sr & SPI_SR_ENDRX) { sc->rxdone++; WR4(sc, SPI_IDR, SPI_SR_ENDRX); - wakeup(sc); + wakeup(&sc->rxdone); } if (sr & ~SPI_SR_ENDRX) { device_printf(sc->dev, "Unexpected ISR %#x\n", sr); From owner-p4-projects@FreeBSD.ORG Sat Oct 7 06:59: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 73E5E16A415; Sat, 7 Oct 2006 06:59:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36F5F16A403 for ; Sat, 7 Oct 2006 06:59:40 +0000 (UTC) (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 032ED43D4C for ; Sat, 7 Oct 2006 06:59:40 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k976xd7W067787 for ; Sat, 7 Oct 2006 06:59:39 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k976xdi7067784 for perforce@freebsd.org; Sat, 7 Oct 2006 06:59:39 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Oct 2006 06:59:39 GMT Message-Id: <200610070659.k976xdi7067784@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 107398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 06:59:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=107398 Change 107398 by imp@imp_lighthouse on 2006/10/07 06:59:29 Get the MFG ID and print it. Affected files ... .. //depot/projects/arm/src/sys/dev/flash/at45d.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/dev/flash/at45d.c#4 (text+ko) ==== @@ -37,6 +37,9 @@ #include #include +#include +#include "spibus_if.h" + struct at45d_softc { struct intr_config_hook config_intrhook; @@ -247,6 +250,34 @@ } #endif +static int +at45d_get_mfg_info(device_t dev, uint8_t *resp) +{ + uint8_t txCmdBuf[8], rxCmdBuf[8], txBuf[8], rxBuf[8]; + struct spi_command cmd; + int err; + + memset(txCmdBuf, 0, sizeof(txCmdBuf)); + memset(txBuf, 0, sizeof(txBuf)); + memset(rxCmdBuf, 0, sizeof(rxCmdBuf)); + memset(rxBuf, 0, sizeof(rxBuf)); + + txCmdBuf[0] = MANUFACTURER_ID; + + cmd.tx_cmd = &txCmdBuf; + cmd.rx_cmd = &rxCmdBuf; + cmd.tx_cmd_sz = 1; + cmd.rx_cmd_sz = 1; + cmd.tx_data = &txBuf; + cmd.rx_data = &rxBuf; + cmd.tx_data_sz = 4; + cmd.rx_data_sz = 4; + err = SPIBUS_TRANSFER(device_get_parent(dev), dev, &cmd); + if (err) + return (err); + memcpy(resp, rxBuf, 4); + return (0); +} static int at45d_probe(device_t dev) @@ -282,7 +313,10 @@ at45d_delayed_attach(void *xsc) { struct at45d_softc *sc = xsc; + uint8_t buf[4]; + at45d_get_mfg_info(sc->dev, buf); + printf("Reply is %#x %#x %#x %#x\n", buf[0], buf[1], buf[2], buf[3]); config_intrhook_disestablish(&sc->config_intrhook); } From owner-p4-projects@FreeBSD.ORG Sat Oct 7 07:15: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 E30D516A417; Sat, 7 Oct 2006 07:14:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C4DA16A407 for ; Sat, 7 Oct 2006 07:14:59 +0000 (UTC) (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 4DE3843D45 for ; Sat, 7 Oct 2006 07:14:59 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k977Exjd075497 for ; Sat, 7 Oct 2006 07:14:59 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k977Ext4075491 for perforce@freebsd.org; Sat, 7 Oct 2006 07:14:59 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Oct 2006 07:14:59 GMT Message-Id: <200610070714.k977Ext4075491@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 107399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 07:15:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=107399 Change 107399 by imp@imp_lighthouse on 2006/10/07 07:14:29 Simplify a bit Affected files ... .. //depot/projects/arm/src/sys/dev/flash/at45d.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/dev/flash/at45d.c#5 (text+ko) ==== @@ -250,32 +250,56 @@ } #endif +static uint8_t +at45d_get_status(device_t dev) +{ + uint8_t txBuf[8], rxBuf[8]; + struct spi_command cmd; + int err; + + memset(&cmd, 0, sizeof(cmd)); + memset(txBuf, 0, sizeof(txBuf)); + memset(rxBuf, 0, sizeof(rxBuf)); + + txBuf[0] = STATUS_REGISTER_READ; + cmd.tx_cmd = txBuf; + cmd.rx_cmd = rxBuf; + cmd.rx_cmd_sz = 2; + cmd.tx_cmd_sz = 2; + err = SPIBUS_TRANSFER(device_get_parent(dev), dev, &cmd); + return (rxBuf[1]); +} + +static void +at45d_wait_for_device_ready(device_t dev) +{ + while (at45d_get_status(dev) & 0x80) + continue; +} + static int at45d_get_mfg_info(device_t dev, uint8_t *resp) { - uint8_t txCmdBuf[8], rxCmdBuf[8], txBuf[8], rxBuf[8]; + uint8_t txBuf[8], rxBuf[8]; struct spi_command cmd; int err; - memset(txCmdBuf, 0, sizeof(txCmdBuf)); + memset(&cmd, 0, sizeof(cmd)); memset(txBuf, 0, sizeof(txBuf)); - memset(rxCmdBuf, 0, sizeof(rxCmdBuf)); memset(rxBuf, 0, sizeof(rxBuf)); - txCmdBuf[0] = MANUFACTURER_ID; - - cmd.tx_cmd = &txCmdBuf; - cmd.rx_cmd = &rxCmdBuf; - cmd.tx_cmd_sz = 1; - cmd.rx_cmd_sz = 1; - cmd.tx_data = &txBuf; - cmd.rx_data = &rxBuf; - cmd.tx_data_sz = 4; - cmd.rx_data_sz = 4; + txBuf[0] = MANUFACTURER_ID; + cmd.tx_cmd = &txBuf; + cmd.rx_cmd = &rxBuf; + cmd.tx_cmd_sz = 5; + cmd.rx_cmd_sz = 5; err = SPIBUS_TRANSFER(device_get_parent(dev), dev, &cmd); if (err) return (err); - memcpy(resp, rxBuf, 4); + memcpy(resp, rxBuf + 1, 4); + // XXX We really should 'decode' the reply into some kind of + // XXX structure. To be generic (and not just for atmel parts) + // XXX we'd have to loop until we got a full reply. return (0); } @@ -317,6 +341,8 @@ at45d_get_mfg_info(sc->dev, buf); printf("Reply is %#x %#x %#x %#x\n", buf[0], buf[1], buf[2], buf[3]); + at45d_wait_for_device_ready(sc->dev); + printf("Status is %#x\b", at45d_get_status(sc->dev)); config_intrhook_disestablish(&sc->config_intrhook); } From owner-p4-projects@FreeBSD.ORG Sat Oct 7 07:20: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 14ED616A415; Sat, 7 Oct 2006 07:20:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C004816A40F for ; Sat, 7 Oct 2006 07:20:06 +0000 (UTC) (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 76B3E43D45 for ; Sat, 7 Oct 2006 07:20:06 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k977K6Pq077002 for ; Sat, 7 Oct 2006 07:20:06 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k977K6HQ076999 for perforce@freebsd.org; Sat, 7 Oct 2006 07:20:06 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Oct 2006 07:20:06 GMT Message-Id: <200610070720.k977K6HQ076999@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 107400 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 07:20:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=107400 Change 107400 by imp@imp_lighthouse on 2006/10/07 07:19:43 Handle case where only cmd is specified, but no data. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_spi.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_spi.c#10 (text+ko) ==== @@ -205,7 +205,7 @@ at91_spi_transfer(device_t dev, device_t child, struct spi_command *cmd) { struct at91_spi_softc *sc; - int i, rxdone, err; + int i, j, rxdone, err, mode[4]; bus_addr_t addr; sc = device_get_softc(dev); @@ -217,28 +217,32 @@ WR4(sc, PDC_TPR, addr); WR4(sc, PDC_TCR, cmd->tx_cmd_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREWRITE); - i++; - if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->tx_data, - cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) - goto out; - WR4(sc, PDC_TNPR, addr); - WR4(sc, PDC_TNCR, cmd->tx_cmd_sz); - bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREWRITE); - i++; + mode[i++] = BUS_DMASYNC_POSTWRITE; + if (cmd->tx_data_sz > 0) { + if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->tx_data, + cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) + goto out; + WR4(sc, PDC_TNPR, addr); + WR4(sc, PDC_TNCR, cmd->tx_cmd_sz); + bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREWRITE); + mode[i++] = BUS_DMASYNC_POSTWRITE; + } if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->rx_cmd, cmd->tx_cmd_sz, at91_getaddr, &addr, 0) != 0) goto out; WR4(sc, PDC_RPR, addr); WR4(sc, PDC_RCR, cmd->tx_cmd_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); - i++; - if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->rx_data, - cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) - goto out; - WR4(sc, PDC_RNPR, addr); - WR4(sc, PDC_RNCR, cmd->tx_data_sz); - bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); - + mode[i++] = BUS_DMASYNC_POSTREAD; + if (cmd->tx_data_sz > 0) { + if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->rx_data, + cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) + goto out; + WR4(sc, PDC_RNPR, addr); + WR4(sc, PDC_RNCR, cmd->tx_data_sz); + bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); + mode[i++] = BUS_DMASYNC_POSTREAD; + } WR4(sc, SPI_IER, SPI_SR_ENDRX); WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN | PDC_PTCR_RXTEN); @@ -248,18 +252,15 @@ } while (rxdone == sc->rxdone && err != EINTR); WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); if (err == 0) { - // Sync the buffers after the DMA is done, and unload them. - bus_dmamap_sync(sc->dmatag, sc->map[0], BUS_DMASYNC_POSTWRITE); - bus_dmamap_sync(sc->dmatag, sc->map[1], BUS_DMASYNC_POSTWRITE); - bus_dmamap_sync(sc->dmatag, sc->map[2], BUS_DMASYNC_POSTREAD); - bus_dmamap_sync(sc->dmatag, sc->map[3], BUS_DMASYNC_POSTREAD); + for (j = 0; j < i; j++) + bus_dmamap_sync(sc->dmatag, sc->map[j], mode[j]); } - for (i = 0; i < 4; i++) - bus_dmamap_unload(sc->dmatag, sc->map[i]); + for (j = 0; j < i; j++) + bus_dmamap_unload(sc->dmatag, sc->map[j]); return (err); out:; - while (i-- > 0) - bus_dmamap_unload(sc->dmatag, sc->map[i]); + for (j = 0; j < i; j++) + bus_dmamap_unload(sc->dmatag, sc->map[j]); return (EIO); } From owner-p4-projects@FreeBSD.ORG Sat Oct 7 08:47: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 84C3D16A47B; Sat, 7 Oct 2006 08:47:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A04016A415 for ; Sat, 7 Oct 2006 08:47:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 524B543D5A for ; Sat, 7 Oct 2006 08:47:06 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k978kuOU011366 for ; Sat, 7 Oct 2006 08:46:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k978ktF2011363 for perforce@freebsd.org; Sat, 7 Oct 2006 08:46:55 GMT (envelope-from jb@freebsd.org) Date: Sat, 7 Oct 2006 08:46:55 GMT Message-Id: <200610070846.k978ktF2011363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 08:47:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=107403 Change 107403 by jb@jb_freebsd7 on 2006/10/07 08:46:55 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.openssl.mk#3 integrate .. //depot/projects/dtrace/src/bin/cp/utils.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssh/config.h#5 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#16 integrate .. //depot/projects/dtrace/src/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/mixer#3 integrate .. //depot/projects/dtrace/src/include/Makefile#5 integrate .. //depot/projects/dtrace/src/sbin/geom/class/Makefile#3 integrate .. //depot/projects/dtrace/src/sbin/geom/class/cache/Makefile#1 branch .. //depot/projects/dtrace/src/sbin/geom/class/cache/geom_cache.c#1 branch .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#12 integrate .. //depot/projects/dtrace/src/share/mk/sys.mk#5 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.australia#3 integrate .. //depot/projects/dtrace/www/share/mk/doc.xml.mk#5 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1579,6 +1579,11 @@ it.comp.os.freebsd (Italian) + + + tw.bbs.comp.386bsd (Traditional Chinese) + ==== //depot/projects/dtrace/ports/Mk/bsd.openssl.mk#3 (text+ko) ==== @@ -2,18 +2,18 @@ # Date created: 31 May 2002 # Whom: dinoex # -# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.31 2006/08/04 12:34:41 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.32 2006/10/07 08:15:48 dinoex Exp $ # # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk # # the user/port can now set this options in the makefiles. # # WITH_OPENSSL_BASE=yes - Use the version in the base system. -# WITH_OPENSSL_PORT=yes - Use the port, even if base if up to date +# WITH_OPENSSL_PORT=yes - Use the port, even if base is up to date # WITH_OPENSSL_BETA=yes - Use a snapshot of recent openssl # WITH_OPENSSL_STABLE=yes - Use an older openssl version # -# USE_OPENSSL_RPATH=yes - pass RFLAGS options in CFLAGS, +# USE_OPENSSL_RPATH=yes - Pass RFLAGS options in CFLAGS, # needed for ports who don't use LDFLAGS # # Overrideable defaults: @@ -118,6 +118,19 @@ OPENSSL_SHLIBVER?= 3 .endif .else +.if !defined(OPENSSL_PORT) && \ + exists(${LOCALBASE}/lib/libcrypto.so) +# find installed port and use it for dependency +PKG_DBDIR?= ${DESTDIR}/var/db/pkg +OPENSSL_INSTALLED!= grep -l -r "libssl.so." "${PKG_DBDIR}" | \ + while read contents; do \ + sslprefix=`grep "^@cwd " "$${contents}" | ${HEAD} -n 1`; \ + if test "$${sslprefix}" = "@cwd ${LOCALBASE_REL}" ; then \ + echo "$${contents}"; break; fi; done +OPENSSL_PORT!= grep "^@comment ORIGIN:" "${OPENSSL_INSTALLED}" | ${CUT} -d : -f 2 +OPENSSL_SHLIBFILE!= grep "^lib/libssl.so." "${OPENSSL_INSTALLED}" +OPENSSL_SHLIBVER?= ${OPENSSL_SHLIBFILE:E} +.endif OPENSSL_PORT?= security/openssl .if ( ${OSVERSION} >= 600100 ) OPENSSL_SHLIBVER?= 5 ==== //depot/projects/dtrace/src/bin/cp/utils.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.49 2006/08/25 09:58:13 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.50 2006/10/06 08:30:33 maxim Exp $"); #include #include @@ -64,7 +64,7 @@ int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0; ssize_t wcount; size_t wresid; - size_t wtotal; + off_t wtotal; char *bufp; #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED char *p; ==== //depot/projects/dtrace/src/crypto/openssh/config.h#5 (text+ko) ==== @@ -1314,7 +1314,7 @@ /* #undef WORDS_BIGENDIAN */ /* Define if xauth is found in your path */ -#define XAUTH_PATH "/usr/X11R6/bin/xauth" +/* #undef XAUTH_PATH */ /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ ==== //depot/projects/dtrace/src/etc/defaults/rc.conf#16 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.297 2006/09/29 15:45:09 bms Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.298 2006/10/06 23:22:12 flz Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -535,6 +535,7 @@ # ruleset file. newsyslog_enable="YES" # Run newsyslog at startup. newsyslog_flags="-CN" # Newsyslog flags to create marked files +mixer_enable="YES" # Run the sound mixer. ############################################################## ### Jail Configuration ####################################### ==== //depot/projects/dtrace/src/etc/mtree/BSD.include.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.108 2006/09/07 18:24:24 emax Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.109 2006/10/06 08:27:07 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -100,6 +100,8 @@ .. .. geom + cache + .. concat .. eli ==== //depot/projects/dtrace/src/etc/rc.d/mixer#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/mixer,v 1.6 2005/12/10 19:49:03 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mixer,v 1.7 2006/10/06 23:22:13 flz Exp $ # # PROVIDE: mixer @@ -34,6 +34,7 @@ . /etc/rc.subr name="mixer" +rcvar="mixer_enable" stop_cmd="mixer_stop" start_cmd="mixer_start" reload_cmd="mixer_start" ==== //depot/projects/dtrace/src/include/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.263 2006/09/07 18:24:24 emax Exp $ +# $FreeBSD: src/include/Makefile,v 1.264 2006/10/06 08:27:06 ru Exp $ # # Doing a "make install" builds /usr/include. @@ -45,8 +45,8 @@ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ - geom/concat geom/eli geom/gate geom/label geom/mirror geom/nop \ - geom/raid3 geom/shsec geom/stripe \ + geom/cache geom/concat geom/eli geom/gate geom/label geom/mirror \ + geom/nop geom/raid3 geom/shsec geom/stripe \ isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ ==== //depot/projects/dtrace/src/sbin/geom/class/Makefile#3 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/sbin/geom/class/Makefile,v 1.11 2006/03/17 18:54:30 ru Exp $ +# $FreeBSD: src/sbin/geom/class/Makefile,v 1.12 2006/10/06 08:27:06 ru Exp $ .include -SUBDIR= concat +SUBDIR= cache +SUBDIR+=concat .if ${MK_OPENSSL} != "no" SUBDIR+=eli .endif ==== //depot/projects/dtrace/src/share/man/man5/rc.conf.5#12 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.307 2006/09/29 15:45:10 bms Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.308 2006/10/06 23:22:13 flz Exp $ .\" -.Dd September 29, 2006 +.Dd October 6, 2006 .Dt RC.CONF 5 .Os .Sh NAME @@ -3612,6 +3612,11 @@ autobridge_interfaces="bridge0" autobridge_bridge0="tap* dc0 vlan[345]" .Ed +.It mixer_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable support for sound mixer. .El .Sh FILES .Bl -tag -width ".Pa /etc/defaults/rc.conf" -compact @@ -3668,6 +3673,7 @@ .Xr lpd 8 , .Xr mdconfig 8 , .Xr mdmfs 8 , +.Xr mixer 8, .Xr mountd 8 , .Xr moused 8 , .Xr mrouted 8 , ==== //depot/projects/dtrace/src/share/mk/sys.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/share/mk/sys.mk,v 1.87 2005/09/28 08:17:30 ru Exp $ +# $FreeBSD: src/share/mk/sys.mk,v 1.88 2006/10/06 23:32:23 lesi Exp $ unix ?= We run FreeBSD, not UNIX. .FreeBSD ?= true @@ -19,8 +19,6 @@ .SUFFIXES: .out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh .endif -X11BASE ?= /usr/X11R6 - AR ?= ar .if defined(%POSIX) ARFLAGS ?= -rv ==== //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.australia#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* * Australian holidays * - * $FreeBSD: src/usr.bin/calendar/calendars/calendar.australia,v 1.6 2004/11/21 23:05:06 grog Exp $ + * $FreeBSD: src/usr.bin/calendar/calendars/calendar.australia,v 1.7 2006/10/06 23:20:01 flz Exp $ */ #ifndef _calendar_australia_ @@ -55,4 +55,4 @@ 5/MonFirst Labour Day (Qld) Aug 14 RNA Show Day (Brisbane metro) -#endif+#endif ==== //depot/projects/dtrace/www/share/mk/doc.xml.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # doc.xml.mk -# $FreeBSD: www/share/mk/doc.xml.mk,v 1.10 2006/09/22 21:05:03 hrs Exp $ +# $FreeBSD: www/share/mk/doc.xml.mk,v 1.11 2006/10/07 04:05:33 trhodes Exp $ XML_CATALOG_FILES= file://${.OBJDIR}/catalog-cwd.xml \ file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \ @@ -57,6 +57,7 @@ DEPENDSET.DEFAULT+= wwwstd +.if !defined(WEB_ONLY) # DEPENDSET: transtable ...................................................... _DEPENDSET.transtable= ${XML_TRANSTABLE} ${XSL_TRANSTABLE} \ ${XSL_TRANSTABLE_MASTER} ${XSL_TRANSTABLE_COMMON} @@ -116,6 +117,7 @@ CLEANFILES+= ${XML_MIRRORS}.sort CLEANFILES+= ${XML_MIRRORS}.sort.tmp .endif +.endif # !defined(WEB_ONLY) # DEPENDSET: usergroups ...................................................... _DEPENDSET.usergroups= ${XML_USERGROUPS} ${XML_USERGROUPS_LOCAL} \ From owner-p4-projects@FreeBSD.ORG Sat Oct 7 09:26: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 B517E16A416; Sat, 7 Oct 2006 09:26:47 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B5C816A40F for ; Sat, 7 Oct 2006 09:26:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5653943D53 for ; Sat, 7 Oct 2006 09:26:47 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k979QlGm034586 for ; Sat, 7 Oct 2006 09:26:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k979Qkau034574 for perforce@freebsd.org; Sat, 7 Oct 2006 09:26:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 7 Oct 2006 09:26:46 GMT Message-Id: <200610070926.k979Qkau034574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 09:26:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=107405 Change 107405 by hselasky@hselasky_mini_itx on 2006/10/07 09:26:28 Temporary workarounds to prevent the evident panic, when the keyboard layer is being called without Giant. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#12 (text+ko) ==== @@ -869,6 +869,10 @@ { struct ukbd_softc *sc = kbd->kb_data; + if (!mtx_owned(&Giant)) { + return 0; /* XXX */ + } + mtx_assert(&Giant, MA_OWNED); if (!KBD_IS_ACTIVE(kbd)) { @@ -891,6 +895,10 @@ { struct ukbd_softc *sc = kbd->kb_data; + if (!mtx_owned(&Giant)) { + return 0; /* XXX */ + } + mtx_assert(&Giant, MA_OWNED); if (!KBD_IS_ACTIVE(kbd)) { @@ -915,6 +923,10 @@ u_int32_t scancode; #endif + if (!mtx_owned(&Giant)) { + return -1; /* XXX */ + } + mtx_assert(&Giant, MA_OWNED); #ifdef UKBD_EMULATE_ATSCANCODE @@ -961,6 +973,9 @@ #ifdef UKBD_EMULATE_ATSCANCODE u_int32_t scancode; #endif + if (!mtx_owned(&Giant)) { + return NOKEY; /* XXX */ + } mtx_assert(&Giant, MA_OWNED); @@ -1272,6 +1287,10 @@ { struct ukbd_softc *sc = kbd->kb_data; + if (!mtx_owned(&Giant)) { + return; /* XXX */ + } + mtx_assert(&Giant, MA_OWNED); sc->sc_flags &= ~(UKBD_FLAG_COMPOSE|UKBD_FLAG_POLLING); @@ -1310,6 +1329,10 @@ { struct ukbd_softc *sc = kbd->kb_data; + if (!mtx_owned(&Giant)) { + return 0; /* XXX */ + } + mtx_assert(&Giant, MA_OWNED); if (on) { From owner-p4-projects@FreeBSD.ORG Sat Oct 7 10:27:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DDF116A412; Sat, 7 Oct 2006 10:27:10 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D33816A403 for ; Sat, 7 Oct 2006 10:27:10 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE71943D67 for ; Sat, 7 Oct 2006 10:27:02 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97AR210058690 for ; Sat, 7 Oct 2006 10:27:02 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97AR2vt058686 for perforce@freebsd.org; Sat, 7 Oct 2006 10:27:02 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 7 Oct 2006 10:27:02 GMT Message-Id: <200610071027.k97AR2vt058686@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107407 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 10:27:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=107407 Change 107407 by rdivacky@rdivacky_witten on 2006/10/07 10:26:15 Make sem_undo's process referenced structures instead of preallocated from an array. This means that we can have arbitrary number of sem_undo structures (as memory permits) and we can share these structures. This is a pre-requisite for CLONE_SYSVSEM. This is UNTESTED and this commit is only for me to be able to generate diffs from p4. Affected files ... .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#2 edit .. //depot/projects/linuxolator/src/sys/kern/sysv_sem.c#3 edit .. //depot/projects/linuxolator/src/sys/sys/proc.h#2 edit .. //depot/projects/linuxolator/src/sys/sys/sem.h#2 edit Differences ... ==== //depot/projects/linuxolator/src/sys/kern/kern_fork.c#2 (text+ko) ==== @@ -418,6 +418,7 @@ p2->p_state = PRS_NEW; /* protect against others */ p2->p_pid = trypid; AUDIT_ARG(pid, p2->p_pid); + p2->p_semundo = NULL; LIST_INSERT_HEAD(&allproc, p2, p_list); LIST_INSERT_HEAD(PIDHASH(p2->p_pid), p2, p_hash); sx_xunlock(&allproc_lock); ==== //depot/projects/linuxolator/src/sys/kern/sysv_sem.c#3 (text+ko) ==== @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -101,8 +102,7 @@ static struct semid_kernel *sema; /* semaphore id pool */ static struct mtx *sema_mtx; /* semaphore id pool mutexes*/ static struct sem *sem; /* semaphore pool */ -SLIST_HEAD(, sem_undo) semu_list; /* list of active undo structures */ -static int *semu; /* undo structure pool */ +SLIST_HEAD(, sem_undo) semu_list; /* list of active undo structures */ static eventhandler_tag semexit_tag; #define SEMUNDO_MTX sem_mtx @@ -118,20 +118,6 @@ }; /* - * Undo structure (one per process) - */ -struct sem_undo { - SLIST_ENTRY(sem_undo) un_next; /* ptr to next active undo structure */ - struct proc *un_proc; /* owner of this structure */ - short un_cnt; /* # of active entries */ - struct undo { - short un_adjval; /* adjust on exit values */ - short un_num; /* semaphore # */ - int un_id; /* semid */ - } un_ent[1]; /* undo entries */ -}; - -/* * Configuration parameters */ #ifndef SEMMNI @@ -143,9 +129,6 @@ #ifndef SEMUME #define SEMUME 10 /* max # of undo entries per process */ #endif -#ifndef SEMMNU -#define SEMMNU 30 /* # of undo structures in system */ -#endif /* shouldn't need tuning */ #ifndef SEMMAP @@ -184,7 +167,6 @@ SEMMAP, /* # of entries in semaphore map */ SEMMNI, /* # of semaphore identifiers */ SEMMNS, /* # of semaphores in system */ - SEMMNU, /* # of undo structures in system */ SEMMSL, /* max # of semaphores per id */ SEMOPM, /* max # of operations per semop call */ SEMUME, /* max # of undo entries per process */ @@ -199,8 +181,6 @@ "Number of semaphore identifiers"); SYSCTL_INT(_kern_ipc, OID_AUTO, semmns, CTLFLAG_RDTUN, &seminfo.semmns, 0, "Maximum number of semaphores in the system"); -SYSCTL_INT(_kern_ipc, OID_AUTO, semmnu, CTLFLAG_RDTUN, &seminfo.semmnu, 0, - "Maximum number of undo structures in the system"); SYSCTL_INT(_kern_ipc, OID_AUTO, semmsl, CTLFLAG_RW, &seminfo.semmsl, 0, "Max semaphores per id"); SYSCTL_INT(_kern_ipc, OID_AUTO, semopm, CTLFLAG_RDTUN, &seminfo.semopm, 0, @@ -224,7 +204,6 @@ TUNABLE_INT_FETCH("kern.ipc.semmap", &seminfo.semmap); TUNABLE_INT_FETCH("kern.ipc.semmni", &seminfo.semmni); TUNABLE_INT_FETCH("kern.ipc.semmns", &seminfo.semmns); - TUNABLE_INT_FETCH("kern.ipc.semmnu", &seminfo.semmnu); TUNABLE_INT_FETCH("kern.ipc.semmsl", &seminfo.semmsl); TUNABLE_INT_FETCH("kern.ipc.semopm", &seminfo.semopm); TUNABLE_INT_FETCH("kern.ipc.semume", &seminfo.semume); @@ -237,7 +216,6 @@ M_WAITOK); sema_mtx = malloc(sizeof(struct mtx) * seminfo.semmni, M_SEM, M_WAITOK | M_ZERO); - semu = malloc(seminfo.semmnu * seminfo.semusz, M_SEM, M_WAITOK); for (i = 0; i < seminfo.semmni; i++) { sema[i].u.sem_base = 0; @@ -249,11 +227,6 @@ } for (i = 0; i < seminfo.semmni; i++) mtx_init(&sema_mtx[i], "semid", NULL, MTX_DEF); - for (i = 0; i < seminfo.semmnu; i++) { - struct sem_undo *suptr = SEMU(i); - suptr->un_proc = NULL; - } - SLIST_INIT(&semu_list); mtx_init(&sem_mtx, "sem", NULL, MTX_DEF); semexit_tag = EVENTHANDLER_REGISTER(process_exit, semexit_myhook, NULL, EVENTHANDLER_PRI_ANY); @@ -274,7 +247,6 @@ #endif free(sem, M_SEM); free(sema, M_SEM); - free(semu, M_SEM); for (i = 0; i < seminfo.semmni; i++) mtx_destroy(&sema_mtx[i]); mtx_destroy(&sem_mtx); @@ -354,66 +326,16 @@ semu_alloc(td) struct thread *td; { - int i; struct sem_undo *suptr; - struct sem_undo **supptr; - int attempt; - SEMUNDO_LOCKASSERT(MA_OWNED); - /* - * Try twice to allocate something. - * (we'll purge an empty structure after the first pass so - * two passes are always enough) - */ + suptr = malloc(seminfo.semusz, M_SEM, M_WAITOK); + refcount_init(&suptr->refcount, 1); - for (attempt = 0; attempt < 2; attempt++) { - /* - * Look for a free structure. - * Fill it in and return it if we find one. - */ + PROC_LOCK(td->td_proc); + td->td_proc->p_semundo = suptr; + PROC_UNLOCK(td->td_proc); - for (i = 0; i < seminfo.semmnu; i++) { - suptr = SEMU(i); - if (suptr->un_proc == NULL) { - SLIST_INSERT_HEAD(&semu_list, suptr, un_next); - suptr->un_cnt = 0; - suptr->un_proc = td->td_proc; - return(suptr); - } - } - - /* - * We didn't find a free one, if this is the first attempt - * then try to free a structure. - */ - - if (attempt == 0) { - /* All the structures are in use - try to free one */ - int did_something = 0; - - SLIST_FOREACH_PREVPTR(suptr, supptr, &semu_list, - un_next) { - if (suptr->un_cnt == 0) { - suptr->un_proc = NULL; - did_something = 1; - *supptr = SLIST_NEXT(suptr, un_next); - break; - } - } - - /* If we didn't free anything then just give-up */ - if (!did_something) - return(NULL); - } else { - /* - * The second pass failed even though we freed - * something after the first pass! - * This is IMPOSSIBLE! - */ - panic("semu_alloc - second attempt failed"); - } - } - return (NULL); + return (suptr); } /* @@ -427,7 +349,6 @@ int semid, semnum; int adjval; { - struct proc *p = td->td_proc; struct sem_undo *suptr; struct undo *sunptr; int i; @@ -438,18 +359,12 @@ suptr = *supptr; if (suptr == NULL) { - SLIST_FOREACH(suptr, &semu_list, un_next) { - if (suptr->un_proc == p) { - *supptr = suptr; - break; - } - } + suptr = td->td_proc->p_semundo; + if (suptr == NULL) { if (adjval == 0) return(0); suptr = semu_alloc(td); - if (suptr == NULL) - return(ENOSPC); *supptr = suptr; } } @@ -1292,18 +1207,8 @@ struct proc *p; { struct sem_undo *suptr; - struct sem_undo **supptr; - /* - * Go through the chain of undo vectors looking for one - * associated with this process. - */ - SEMUNDO_LOCK(); - SLIST_FOREACH_PREVPTR(suptr, supptr, &semu_list, un_next) { - if (suptr->un_proc == p) - break; - } - SEMUNDO_UNLOCK(); + suptr = p->p_semundo; if (suptr == NULL) return; @@ -1335,7 +1240,7 @@ DPRINTF(( "semexit: %p id=%d num=%d(adj=%d) ; sem=%d\n", - suptr->un_proc, suptr->un_ent[ix].un_id, + td->td_proc, suptr->un_ent[ix].un_id, suptr->un_ent[ix].un_num, suptr->un_ent[ix].un_adjval, semakptr->u.sem_base[semnum].semval)); @@ -1361,8 +1266,13 @@ * Deallocate the undo vector. */ DPRINTF(("removing vector\n")); - suptr->un_proc = NULL; - *supptr = SLIST_NEXT(suptr, un_next); + refcount_release(&p->p_semundo->refcount); + if (p->p_semundo->refcount == 0) + free(p->p_semundo, M_SEM); + refcount_acquire(&p->p_semundo->refcount); + PROC_LOCK(p); + p->p_semundo = SLIST_NEXT(suptr, un_next); + PROC_UNLOCK(p); } static int ==== //depot/projects/linuxolator/src/sys/sys/proc.h#2 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include /* XXX. */ #include +#include #include #include #include @@ -622,6 +623,7 @@ STAILQ_HEAD(, ktr_request) p_ktr; /* (o) KTR event queue. */ LIST_HEAD(, mqueue_notifier) p_mqnotifier; /* (c) mqueue notifiers.*/ struct auditinfo *p_au; /* (c) Process audit properties. */ + struct sem_undo *p_semundo; /* (c) Process sysv semundo struct. */ }; #define p_session p_pgrp->pg_session ==== //depot/projects/linuxolator/src/sys/sys/sem.h#2 (text+ko) ==== @@ -74,7 +74,6 @@ int semmap, /* # of entries in semaphore map */ semmni, /* # of semaphore identifiers */ semmns, /* # of semaphores in system */ - semmnu, /* # of undo structures in system */ semmsl, /* max # of semaphores per id */ semopm, /* max # of operations per semop call */ semume, /* max # of undo entries per process */ @@ -100,6 +99,21 @@ * Process sem_undo vectors at proc exit. */ void semexit(struct proc *p); + +/* + * Undo structure (one per process) + */ +struct sem_undo { + SLIST_ENTRY(sem_undo) un_next; /* ptr to next active undo structure */ + short un_cnt; /* # of active entries */ + u_int refcount; /* reference counting */ + struct undo { + short un_adjval; /* adjust on exit values */ + short un_num; /* semaphore # */ + int un_id; /* semid */ + } un_ent[1]; /* undo entries */ +}; + #endif /* _KERNEL */ #ifndef _KERNEL @@ -122,6 +136,7 @@ int semget(key_t, int, int); int semop(int, struct sembuf *, size_t); __END_DECLS + #endif /* !_KERNEL */ #endif /* !_SYS_SEM_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Oct 7 10:32: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 F2FFB16A417; Sat, 7 Oct 2006 10:32:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 94F8316A40F for ; Sat, 7 Oct 2006 10:32:13 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECE2843D49 for ; Sat, 7 Oct 2006 10:32:11 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97AWBPs060791 for ; Sat, 7 Oct 2006 10:32:11 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97AWAL8060783 for perforce@freebsd.org; Sat, 7 Oct 2006 10:32:10 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 7 Oct 2006 10:32:10 GMT Message-Id: <200610071032.k97AWAL8060783@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107408 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 10:32:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=107408 Change 107408 by rdivacky@rdivacky_witten on 2006/10/07 10:31:22 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#9 integrate .. //depot/projects/linuxolator/src/sys/arm/include/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/common/panic.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/biossmap.c#3 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/linuxolator/src/sys/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/linuxolator/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/linuxolator/src/sys/conf/Makefile.sun4v#1 branch .. //depot/projects/linuxolator/src/sys/conf/NOTES#4 integrate .. //depot/projects/linuxolator/src/sys/conf/files#4 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sun4v#1 branch .. //depot/projects/linuxolator/src/sys/conf/options#4 integrate .. //depot/projects/linuxolator/src/sys/conf/options.sun4v#1 branch .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/em/if_em.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ips/ips.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ak452x.c#2 delete .. //depot/projects/linuxolator/src/sys/dev/sound/pci/ak452x.h#2 delete .. //depot/projects/linuxolator/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24ht.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/envy24ht.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hda_reg.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac_private.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac_reg.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/spicds.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pci/spicds.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97_patch.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/mixer.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/cache/g_cache.c#1 branch .. //depot/projects/linuxolator/src/sys/geom/cache/g_cache.h#1 branch .. //depot/projects/linuxolator/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/linuxolator/src/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/label/g_label_msdosfs.h#2 integrate .. //depot/projects/linuxolator/src/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/linuxolator/src/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/bios/apm.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/clock.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/include/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/include/elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_time.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_clock.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_rtc.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.master#4 integrate .. //depot/projects/linuxolator/src/sys/kern/systrace_args.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/tty.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/linuxolator/src/sys/modules/geom/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/sound/driver/ak452x/Makefile#2 delete .. //depot/projects/linuxolator/src/sys/modules/sound/driver/envy24/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/sound/driver/envy24ht/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/sound/driver/hda/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/sound/driver/spicds/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/atm/ccatm/ng_ccatm.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/if_ether.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/nd6.c#3 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/linuxolator/src/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/powerpc/include/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_framework.h#1 branch .. //depot/projects/linuxolator/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/linuxolator/src/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/compile/.cvsignore#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/DEFAULTS#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC.hints#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/MAC#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/conf/NOTES#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/_bus.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/_inttypes.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/_limits.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/_stdint.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/_types.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/asi.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/asm.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/asmacros.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/atomic.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/bus.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/bus_common.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/bus_dma.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/bus_private.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/cache.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ccr.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/cddl/mdesc.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/cddl/mdesc_impl.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/clock.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/cpu.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/cpufunc.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/db_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/elf.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/endian.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/exec.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/float.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/floatingpoint.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/fp.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/frame.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/fsr.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/gdb_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/hv_pcivar.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/hviommu.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/hypervisor_api.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/hypervisorvar.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/idprom.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ieee.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ieeefp.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/in_cksum.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/instr.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/intr_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/iommureg.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/iommuvar.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/kdb.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/kerneldump.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ktr.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/limits.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/lsu.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/md_var.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/mdesc_bus.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/mdesc_bus_subr.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/memdev.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/metadata.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/mmu.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/mutex.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/nexusvar.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ofw_bus.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ofw_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ofw_mem.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ofw_nexus.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ofw_upa.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/param.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/pcb.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/pcpu.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/pmap.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/pmc_mdep.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/proc.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/profile.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/pstate.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ptrace.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/reg.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/reloc.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/resource.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/runq.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/sc_machdep.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/setjmp.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/sf_buf.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/sigframe.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/signal.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/smp.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/stdarg.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/sun4v_cpufunc.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/sysarch.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/tick.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/tlb.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/trap.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/tsb.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/tstate.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/tte.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/tte_hash.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ucontext.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/upa.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/utrap.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/varargs.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/ver.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/vmparam.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/watch.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/include/wstate.h#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_bus_if.m#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_bus_subr.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_diff.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_findname.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_fini.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_init.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_subr.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_vdevfindval.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/autoconf.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/bus_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/counter.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/db_disasm.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/db_hwwatch.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/db_interface.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/db_trace.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/dump_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/eeprom.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/elf_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/exception.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/fpemu.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/gdb_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/genassym.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hcall.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hv_pci.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hvcons.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hviommu.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/identcpu.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/in_cksum.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/interrupt.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/intr_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/iommu.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/locore.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mem.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mp_exception.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mp_locore.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/mp_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/nexus.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/ofw_bus.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/ofw_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/pmap.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/prof_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/rtc.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/rwindow.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/simdisk.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/support.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/swtch.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/sys_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/t1_copy.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tick.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tlb.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/trap.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/trap_trace.S#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tsb.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tte.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tte_hash.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/uio_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/vm_machdep.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/vnex.c#1 branch .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/wbuf.S#1 branch .. //depot/projects/linuxolator/src/sys/sys/_elf_solaris.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/buf.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/clock.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/elf.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/elf32.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/elf64.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/elf_common.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/kernel.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/lockmgr.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/mount.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/proc.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/signalvar.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.mk#4 integrate .. //depot/projects/linuxolator/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/systm.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/time.h#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_vnops.c#2 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.652 2006/09/07 15:03:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.654 2006/10/02 15:42:01 phk Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -630,26 +631,6 @@ load_cr0(cr0); } -static int -sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS) -{ - int error; - error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, - req); - if (!error && req->newptr) - resettodr(); - return (error); -} - -SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, - &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); - -SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set, - CTLFLAG_RW, &disable_rtc_set, 0, ""); - -SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, - CTLFLAG_RW, &wall_cmos_clock, 0, ""); - /* * Initialize amd64 and configure to run kernel */ ==== //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.465 2006/09/26 12:36:33 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.466 2006/10/05 20:31:57 simon Exp $ cpu HAMMER ident GENERIC @@ -26,7 +26,6 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -#options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking ==== //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_signal.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.14 2005/12/06 23:06:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.15 2006/10/05 01:56:10 davidxu Exp $"); #include "opt_compat.h" @@ -67,6 +67,7 @@ #include #include +#include #include #include #include @@ -298,7 +299,7 @@ freebsd4_ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe4 sf, *sfp; - struct ia32_siginfo siginfo; + struct siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; @@ -308,7 +309,7 @@ td = curthread; p = td->td_proc; - siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + siginfo_to_siginfo32(&ksi->ksi_info, &siginfo); PROC_LOCK_ASSERT(p, MA_OWNED); sig = siginfo.si_signo; @@ -407,7 +408,7 @@ ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe sf, *sfp; - struct ia32_siginfo siginfo; + struct siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; @@ -416,7 +417,7 @@ int oonstack; int sig; - siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + siginfo_to_siginfo32(&ksi->ksi_info, &siginfo); td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); @@ -741,20 +742,3 @@ pcb->pcb_flags |= PCB_FULLCTX; td->td_retval[1] = 0; } - -void -siginfo_to_ia32siginfo(siginfo_t *src, struct ia32_siginfo *dst) -{ - dst->si_signo = src->si_signo; - dst->si_errno = src->si_errno; - dst->si_code = src->si_code; - dst->si_pid = src->si_pid; - dst->si_uid = src->si_uid; - dst->si_status = src->si_status; - dst->si_addr = dst->si_addr; - dst->si_value.sigval_int = src->si_value.sival_int; - dst->si_band = src->si_band; - dst->si_trapno = src->si_trapno; - dst->si_timerid = src->si_timerid; - dst->si_overrun = src->si_overrun; -} ==== //depot/projects/linuxolator/src/sys/amd64/include/clock.h#2 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.52 2006/05/19 18:53:50 sobomax Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.53 2006/10/02 12:59:55 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -14,9 +14,7 @@ * i386 to clock driver interface. * XXX large parts of the driver and its interface are misplaced. */ -extern int adjkerntz; extern int clkintr_pending; -extern int disable_rtc_set; extern int pscnt; extern int psdiv; extern int statclock_disable; @@ -24,7 +22,6 @@ extern int timer0_max_count; extern uint64_t tsc_freq; extern int tsc_is_broken; -extern int wall_cmos_clock; extern struct mtx clock_lock; /* ==== //depot/projects/linuxolator/src/sys/amd64/include/elf.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/elf.h,v 1.18 2004/08/03 08:21:48 dfr Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.19 2006/10/04 21:37:09 jb Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -108,31 +108,6 @@ * Relocation types. */ -#define R_X86_64_NONE 0 /* No relocation. */ -#define R_X86_64_64 1 /* Add 64 bit symbol value. */ -#define R_X86_64_PC32 2 /* PC-relative 32 bit signed sym value. */ -#define R_X86_64_GOT32 3 /* PC-relative 32 bit GOT offset. */ -#define R_X86_64_PLT32 4 /* PC-relative 32 bit PLT offset. */ -#define R_X86_64_COPY 5 /* Copy data from shared object. */ -#define R_X86_64_GLOB_DAT 6 /* Set GOT entry to data address. */ -#define R_X86_64_JMP_SLOT 7 /* Set GOT entry to code address. */ -#define R_X86_64_RELATIVE 8 /* Add load address of shared object. */ -#define R_X86_64_GOTPCREL 9 /* Add 32 bit signed pcrel offset to GOT. */ -#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */ -#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */ -#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */ -#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative symbol value */ -#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */ -#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative symbol value */ -#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */ -#define R_X86_64_DTPOFF64 17 /* Offset in TLS block */ -#define R_X86_64_TPOFF64 18 /* Offset in static TLS block */ -#define R_X86_64_TLSGD 19 /* PC relative offset to GD GOT entry */ -#define R_X86_64_TLSLD 20 /* PC relative offset to LD GOT entry */ -#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */ -#define R_X86_64_GOTTPOFF 22 /* PC relative offset to IE GOT entry */ -#define R_X86_64_TPOFF32 23 /* Offset in static TLS block */ - #define R_X86_64_COUNT 24 /* Count of defined relocation types. */ /* Define "machine" characteristics */ ==== //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.224 2005/12/22 22:16:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); /* * Routines to handle clock hardware. @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -92,9 +93,7 @@ #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) -int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; -int disable_rtc_set; /* disable resettodr() if != 0 */ int pscnt = 1; int psdiv = 1; int statclock_disable; @@ -104,7 +103,6 @@ u_int timer_freq = TIMER_FREQ; int timer0_max_count; int timer0_real_max_count; -int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ struct mtx clock_lock; #define RTC_LOCK mtx_lock_spin(&clock_lock) #define RTC_UNLOCK mtx_unlock_spin(&clock_lock) @@ -664,7 +662,7 @@ /* sec now contains the number of seconds, since Jan 1 1970, in the local time zone */ - sec += tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + sec += utc_offset(); y = time_second - sec; if (y <= -2 || y >= 2) { @@ -702,7 +700,7 @@ /* Calculate local time to put in RTC */ - tm -= tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + tm -= utc_offset(); writertc(RTC_SEC, bin2bcd(tm%60)); tm /= 60; /* Write back Seconds */ writertc(RTC_MIN, bin2bcd(tm%60)); tm /= 60; /* Write back Minutes */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#9 (text+ko) ==== @@ -29,11 +29,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.17 2006/08/28 13:09:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.18 2006/10/02 12:59:55 phk Exp $"); #include #include #include +#include #include #include #include ==== //depot/projects/linuxolator/src/sys/arm/include/clock.h#2 (text+ko) ==== @@ -23,13 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/clock.h,v 1.2 2005/07/27 21:19:28 imp Exp $ + * $FreeBSD: src/sys/arm/include/clock.h,v 1.3 2006/10/02 12:59:55 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ -#define wall_cmos_clock 0 -#define adjkerntz 0 - #endif /* !_MACHINE_CLOCK_H_ */ ==== //depot/projects/linuxolator/src/sys/arm/include/elf.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/sys/arm/include/elf.h,v 1.7 2006/08/24 23:00:03 cognet Exp $ + * $FreeBSD: src/sys/arm/include/elf.h,v 1.8 2006/10/04 21:37:09 jb Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -82,40 +82,6 @@ #define AT_COUNT 15 /* Count of defined aux entry types. */ -#define R_ARM_NONE 0 /* No relocation. */ -#define R_ARM_PC24 1 -#define R_ARM_ABS32 2 -#define R_ARM_REL32 3 -#define R_ARM_PC13 4 -#define R_ARM_ABS16 5 -#define R_ARM_ABS12 6 -#define R_ARM_THM_ABS5 7 -#define R_ARM_ABS8 8 -#define R_ARM_SBREL32 9 -#define R_ARM_THM_PC22 10 -#define R_ARM_THM_PC8 11 -#define R_ARM_AMP_VCALL9 12 -#define R_ARM_SWI24 13 -#define R_ARM_THM_SWI8 14 -#define R_ARM_XPC25 15 -#define R_ARM_THM_XPC22 16 -#define R_ARM_COPY 20 /* Copy data from shared object. */ -#define R_ARM_GLOB_DAT 21 /* Set GOT entry to data address. */ -#define R_ARM_JUMP_SLOT 22 /* Set GOT entry to code address. */ -#define R_ARM_RELATIVE 23 /* Add load address of shared object. */ -#define R_ARM_GOTOFF 24 /* Add GOT-relative symbol address. */ -#define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */ -#define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */ -#define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */ -#define R_ARM_GNU_VTENTRY 100 -#define R_ARM_GNU_VTINHERIT 101 -#define R_ARM_RSBREL32 250 -#define R_ARM_THM_RPC22 251 -#define R_ARM_RREL32 252 -#define R_ARM_RABS32 253 -#define R_ARM_RPC24 254 -#define R_ARM_RBASE 255 - #define R_ARM_COUNT 33 /* Count of defined relocation types. */ ==== //depot/projects/linuxolator/src/sys/boot/common/panic.c#2 (text+ko) ==== @@ -34,11 +34,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/panic.c,v 1.7 2003/08/25 23:30:41 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/panic.c,v 1.8 2006/09/29 20:57:38 ru Exp $"); #include #include +extern void exit(int) __dead2; + void panic(const char *fmt,...) { ==== //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#2 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.111 2006/08/18 19:03:28 brueffer Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.113 2006/10/01 14:58:30 ariff Exp $ ############################################################## ### Basic configuration options ############################ @@ -309,7 +309,6 @@ sound_load="NO" # Digital sound subsystem snd_ad1816_load="NO" # ad1816 -snd_ak452x_load="NO" # ak452x snd_als4000_load="NO" # als4000 snd_atiixp_load="NO" # atiixp snd_cmi_load="NO" # cmi @@ -319,9 +318,11 @@ snd_emu10k1_load="NO" # Creative Sound Blaster Live snd_emu10kx_load="NO" # Creative SoundBlaster Live! and Audigy snd_envy24_load="NO" # VIA Envy24 +snd_envy24ht_load="NO" # VIA Envy24HT snd_es137x_load="NO" # es137x snd_ess_load="NO" # ess snd_fm801_load="NO" # fm801 +snd_hda_load="NO" # Intel High Definition Audio (Controller) snd_ich_load="NO" # Intel ICH snd_maestro_load="NO" # Maestro snd_maestro3_load="NO" # Maestro3 @@ -331,6 +332,7 @@ snd_sb8_load="NO" # Sound Blaster Pro snd_sbc_load="NO" # Sbc snd_solo_load="NO" # Solo +snd_spicds_load="NO" # SPI codecs snd_t4dwave_load="NO" # t4dwave snd_via8233_load="NO" # via8233 snd_via82c686_load="NO" # via82c686 ==== //depot/projects/linuxolator/src/sys/boot/i386/btx/btx/btx.S#3 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.42 2006/09/28 19:42:10 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.43 2006/10/05 15:30:51 jhb Exp $ */ /* @@ -443,12 +443,12 @@ movb $0x4,%cl # Update seg regs rep # in INT_V86 movsl # args -intrtn.2: movl %edx,%esi # Segment registers +intrtn.2: xchgl %edx,%esi # Segment registers leal 0x28(%ebp),%edi # Set up seg movb $0x4,%cl # regs for rep # later movsl # pop - movl %ebx,%esi # Restore exception + xchgl %ebx,%esi # Restore exception movb $0x5,%cl # frame to rep # supervisor movsl # stack @@ -620,9 +620,10 @@ */ int15_87: pushl %esi # Save pushl %edi # registers + movl 0x3C(%ebp),%edi # Load ES movzwl 0x4(%ebp),%eax # Load user's SI - movl 0x3C(%ebp),%edi # Load ES - leal (%eax,%edi,4),%edi # EDI = (ES << 4) + SI + shll $0x4,%edi # EDI = (ES << 4) + + addl %eax,%edi # SI movl 0x11(%edi),%eax # Read base of movb 0x17(%edi),%al # GDT entry ror $8,%eax # for source @@ -898,7 +899,8 @@ dump.3: lodsl # Set offset xchgl %eax,%edx # Save lodsl # Get segment - leal (%edx,%eax,4),%eax # * 0x10 + offset + shll $0x4,%eax # * 0x10 + addl %edx,%eax # + offset xchgl %eax,%esi # Set pointer dump.4: movb $2,%dl # Num lines dump.4a: movb $0x10,%cl # Bytes to dump ==== //depot/projects/linuxolator/src/sys/boot/i386/libi386/biospci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.5 2004/10/22 14:56:23 simokawa Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.6 2006/09/29 20:27:41 ru Exp $"); /* * PnP enumerator using the PCI BIOS. @@ -36,6 +36,7 @@ #include #include #include +#include "libi386.h" /* * Stupid PCI BIOS interface doesn't let you simply enumerate everything ==== //depot/projects/linuxolator/src/sys/boot/i386/libi386/biossmap.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.5 2006/09/28 19:07:13 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.6 2006/09/29 20:07:16 jhb Exp $"); /* * Obtain memory configuration information from the BIOS @@ -115,8 +115,9 @@ int i; if (smapbase == 0 || smaplen == 0) - return; + return (CMD_ERROR); for (i = 0; i < smaplen; i++) printf("SMAP type=%02x base=%016llx len=%016llx\n", smapbase[i].type, smapbase[i].base, smapbase[i].length); + return (CMD_OK); } ==== //depot/projects/linuxolator/src/sys/boot/i386/libi386/bootinfo64.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.36 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.37 2006/09/29 20:27:41 ru Exp $"); #include #include @@ -143,9 +143,7 @@ u_int64_t envp; vm_offset_t size; char *rootdevname; - int i, howto; - char *kernelname; - const char *kernelpath; + int howto; howto = bi_getboothowto(args); ==== //depot/projects/linuxolator/src/sys/boot/i386/libi386/elf64_freebsd.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/elf64_freebsd.c,v 1.15 2004/08/29 00:48:41 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/elf64_freebsd.c,v 1.16 2006/09/29 20:27:41 ru Exp $"); #define __ELF_WORD_SIZE 64 #include @@ -61,7 +61,7 @@ u_int32_t entry_hi; u_int32_t entry_lo; -extern amd64_tramp(); +extern void amd64_tramp(); /* * There is an a.out kernel and one or more a.out modules loaded. ==== //depot/projects/linuxolator/src/sys/boot/i386/libi386/libi386.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.25 2006/04/11 20:11:30 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.26 2006/09/29 20:27:41 ru Exp $ */ @@ -96,8 +96,8 @@ /* when heap is at the top of extended memory */ /* for other cases - just the same as memtop */ -int biospci_find_devclass(uint32_t class, int index); -int biospci_write_config(uint32_t locator, int offset, int width, int val); +int biospci_find_devclass(uint32_t class, int index, uint32_t *locator); +int biospci_write_config(uint32_t locator, int offset, int width, uint32_t val); int biospci_read_config(uint32_t locator, int offset, int width, uint32_t *val); void biosacpi_detect(void); ==== //depot/projects/linuxolator/src/sys/cam/cam_periph.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.62 2006/05/24 15:22:21 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.63 2006/10/01 20:23:50 mjacob Exp $"); #include #include @@ -86,6 +86,14 @@ MALLOC_DEFINE(M_CAMPERIPH, "CAM periph", "CAM peripheral buffers"); +static int periph_selto_delay = 1000; +TUNABLE_INT("kern.cam.periph_selto_delay", &periph_selto_delay); +static int periph_noresrc_delay = 500; +TUNABLE_INT("kern.cam.periph_noresrc_delay", &periph_noresrc_delay); +static int periph_busy_delay = 500; +TUNABLE_INT("kern.cam.periph_busy_delay", &periph_busy_delay); + + void periphdriver_register(void *data) { @@ -1544,7 +1552,7 @@ int error, printed = 0; int openings; u_int32_t relsim_flags; - u_int32_t timeout; + u_int32_t timeout = 0; action_string = NULL; status = ccb->ccb_h.status; @@ -1636,11 +1644,11 @@ } /* - * Wait a second to give the device + * Wait a bit to give the device * time to recover before we try again. */ relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT; - timeout = 1000; + timeout = periph_selto_delay; break; } } @@ -1699,8 +1707,16 @@ } break; case CAM_RESRC_UNAVAIL: + /* Wait a bit for the resource shortage to abate. */ + timeout = periph_noresrc_delay; + /* FALLTHROUGH */ case CAM_BUSY: - /* timeout??? */ + if (timeout == 0) { + /* Wait a bit for the busy condition to abate. */ + timeout = periph_busy_delay; + } + relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT; + /* FALLTHROUGH */ default: /* decrement the number of retries */ if (ccb->ccb_h.retry_count > 0) { ==== //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ==== @@ -25,13 +25,14 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 7 11:55:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17B5E16A417; Sat, 7 Oct 2006 11:55:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E4D9416A415 for ; Sat, 7 Oct 2006 11:55:04 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E3E543D55 for ; Sat, 7 Oct 2006 11:55:03 +0000 (GMT) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97Bt3lb094982 for ; Sat, 7 Oct 2006 11:55:03 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97BsvmM094955 for perforce@freebsd.org; Sat, 7 Oct 2006 11:54:57 GMT (envelope-from als@FreeBSD.org) Date: Sat, 7 Oct 2006 11:54:57 GMT Message-Id: <200610071154.k97BsvmM094955@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 107413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 11:55:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=107413 Change 107413 by als@als_head on 2006/10/07 11:54:37 update to HEAD Affected files ... .. //depot/projects/jail2/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/jail2/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/jail2/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/jail2/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/jail2/sys/amd64/include/clock.h#2 integrate .. //depot/projects/jail2/sys/amd64/include/elf.h#2 integrate .. //depot/projects/jail2/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/jail2/sys/arm/include/clock.h#2 integrate .. //depot/projects/jail2/sys/arm/include/elf.h#3 integrate .. //depot/projects/jail2/sys/boot/common/merge_help.awk#2 integrate .. //depot/projects/jail2/sys/boot/common/panic.c#2 integrate .. //depot/projects/jail2/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/jail2/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/jail2/sys/boot/i386/Makefile.inc#2 integrate .. //depot/projects/jail2/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/jail2/sys/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/jail2/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/jail2/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/jail2/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/jail2/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/jail2/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/jail2/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/jail2/sys/boot/pc98/boot2/inode.h#2 integrate .. //depot/projects/jail2/sys/bsm/audit_kevents.h#5 integrate .. //depot/projects/jail2/sys/cam/cam_periph.c#2 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/jail2/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/jail2/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/jail2/sys/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/jail2/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/jail2/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/jail2/sys/conf/Makefile.sun4v#1 branch .. //depot/projects/jail2/sys/conf/NOTES#7 integrate .. //depot/projects/jail2/sys/conf/files#6 integrate .. //depot/projects/jail2/sys/conf/files.sun4v#1 branch .. //depot/projects/jail2/sys/conf/options#6 integrate .. //depot/projects/jail2/sys/conf/options.sun4v#1 branch .. //depot/projects/jail2/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/jail2/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/jail2/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/jail2/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/jail2/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/jail2/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/jail2/sys/dev/digi/digi.c#3 integrate .. //depot/projects/jail2/sys/dev/em/if_em.c#6 integrate .. //depot/projects/jail2/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/jail2/sys/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/jail2/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/jail2/sys/dev/ips/ips.c#2 integrate .. //depot/projects/jail2/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/jail2/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/jail2/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/jail2/sys/dev/kbdmux/kbdmux.c#4 integrate .. //depot/projects/jail2/sys/dev/mfi/mfi.c#6 integrate .. //depot/projects/jail2/sys/dev/mfi/mfi_debug.c#1 branch .. //depot/projects/jail2/sys/dev/mfi/mfivar.h#4 integrate .. //depot/projects/jail2/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/jail2/sys/dev/smbus/smb.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/driver.c#5 integrate .. //depot/projects/jail2/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pci/ak452x.c#3 delete .. //depot/projects/jail2/sys/dev/sound/pci/ak452x.h#2 delete .. //depot/projects/jail2/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pci/envy24ht.c#1 branch .. //depot/projects/jail2/sys/dev/sound/pci/envy24ht.h#1 branch .. //depot/projects/jail2/sys/dev/sound/pci/hda/hda_reg.h#1 branch .. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac.c#1 branch .. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac.h#1 branch .. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac_private.h#1 branch .. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac_reg.h#1 branch .. //depot/projects/jail2/sys/dev/sound/pci/spicds.c#1 branch .. //depot/projects/jail2/sys/dev/sound/pci/spicds.h#1 branch .. //depot/projects/jail2/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/mixer.h#4 integrate .. //depot/projects/jail2/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/jail2/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/jail2/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/jail2/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/jail2/sys/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/jail2/sys/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/jail2/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/jail2/sys/dev/uart/uart_kbd_sun.c#3 integrate .. //depot/projects/jail2/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/jail2/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/jail2/sys/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/jail2/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/jail2/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/jail2/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/jail2/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/jail2/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/jail2/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/jail2/sys/fs/procfs/procfs_ioctl.c#2 integrate .. //depot/projects/jail2/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/jail2/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/jail2/sys/fs/umapfs/umap_vfsops.c#2 integrate .. //depot/projects/jail2/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/jail2/sys/geom/cache/g_cache.c#1 branch .. //depot/projects/jail2/sys/geom/cache/g_cache.h#1 branch .. //depot/projects/jail2/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/jail2/sys/geom/eli/g_eli_ctl.c#4 integrate .. //depot/projects/jail2/sys/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/jail2/sys/geom/label/g_label_msdosfs.h#2 integrate .. //depot/projects/jail2/sys/geom/nop/g_nop.h#3 integrate .. //depot/projects/jail2/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/jail2/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/jail2/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/jail2/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/jail2/sys/i386/bios/apm.c#2 integrate .. //depot/projects/jail2/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/jail2/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/jail2/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/jail2/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_xenix.c#4 integrate .. //depot/projects/jail2/sys/i386/include/clock.h#2 integrate .. //depot/projects/jail2/sys/i386/include/elf.h#2 integrate .. //depot/projects/jail2/sys/i386/isa/clock.c#3 integrate .. //depot/projects/jail2/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/jail2/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/jail2/sys/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/jail2/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/jail2/sys/ia64/include/clock.h#2 integrate .. //depot/projects/jail2/sys/ia64/include/elf.h#2 integrate .. //depot/projects/jail2/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/jail2/sys/kern/init_main.c#4 integrate .. //depot/projects/jail2/sys/kern/init_sysent.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_event.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_lock.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_proc.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_sig.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_time.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_umtx.c#5 integrate .. //depot/projects/jail2/sys/kern/subr_clock.c#2 integrate .. //depot/projects/jail2/sys/kern/subr_rtc.c#1 branch .. //depot/projects/jail2/sys/kern/sys_generic.c#3 integrate .. //depot/projects/jail2/sys/kern/syscalls.c#6 integrate .. //depot/projects/jail2/sys/kern/syscalls.master#6 integrate .. //depot/projects/jail2/sys/kern/systrace_args.c#5 integrate .. //depot/projects/jail2/sys/kern/tty.c#5 integrate .. //depot/projects/jail2/sys/kern/tty_pts.c#2 integrate .. //depot/projects/jail2/sys/kern/tty_pty.c#3 integrate .. //depot/projects/jail2/sys/kern/tty_tty.c#3 integrate .. //depot/projects/jail2/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/jail2/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/jail2/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/jail2/sys/kern/vfs_export.c#2 integrate .. //depot/projects/jail2/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/jail2/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/jail2/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/jail2/sys/modules/digi/digi/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/geom/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/jail2/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/kbdmux/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/libalias/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/libalias/libalias/Makefile#1 branch .. //depot/projects/jail2/sys/modules/libalias/modules/Makefile#1 branch .. //depot/projects/jail2/sys/modules/libalias/modules/Makefile.inc#1 branch .. //depot/projects/jail2/sys/modules/libalias/modules/cuseeme/Makefile#1 branch .. //depot/projects/jail2/sys/modules/libalias/modules/dummy/Makefile#1 branch .. //depot/projects/jail2/sys/modules/libalias/modules/ftp/Makefile#1 branch .. //depot/projects/jail2/sys/modules/libalias/modules/irc/Makefile#1 branch .. //depot/projects/jail2/sys/modules/libalias/modules/modules.inc#1 branch .. //depot/projects/jail2/sys/modules/libalias/modules/nbt/Makefile#1 branch .. //depot/projects/jail2/sys/modules/libalias/modules/pptp/Makefile#1 branch .. //depot/projects/jail2/sys/modules/libalias/modules/skinny/Makefile#1 branch .. //depot/projects/jail2/sys/modules/libalias/modules/smedia/Makefile#1 branch .. //depot/projects/jail2/sys/modules/mfi/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/procfs/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/sound/driver/Makefile#4 integrate .. //depot/projects/jail2/sys/modules/sound/driver/ak452x/Makefile#2 delete .. //depot/projects/jail2/sys/modules/sound/driver/envy24/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/sound/driver/envy24ht/Makefile#1 branch .. //depot/projects/jail2/sys/modules/sound/driver/hda/Makefile#1 branch .. //depot/projects/jail2/sys/modules/sound/driver/spicds/Makefile#1 branch .. //depot/projects/jail2/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/vkbd/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/jail2/sys/net/bridgestp.c#3 integrate .. //depot/projects/jail2/sys/net/if_tap.c#3 integrate .. //depot/projects/jail2/sys/net/if_tap.h#2 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/jail2/sys/netgraph/atm/ccatm/ng_ccatm.c#2 integrate .. //depot/projects/jail2/sys/netinet/if_ether.c#4 integrate .. //depot/projects/jail2/sys/netinet/in.c#2 integrate .. //depot/projects/jail2/sys/netinet/in_var.h#2 integrate .. //depot/projects/jail2/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/jail2/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/jail2/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/jail2/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/jail2/sys/netinet/ip_output.c#4 integrate .. //depot/projects/jail2/sys/netinet/ip_var.h#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_cuseeme.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_dummy.c#1 branch .. //depot/projects/jail2/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_mod.c#1 branch .. //depot/projects/jail2/sys/netinet/libalias/alias_mod.h#1 branch .. //depot/projects/jail2/sys/netinet/libalias/alias_nbt.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_old.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_pptp.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_skinny.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_smedia.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_util.c#2 integrate .. //depot/projects/jail2/sys/netinet/libalias/libalias.3#3 integrate .. //depot/projects/jail2/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/jail2/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/jail2/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/jail2/sys/netinet/tcp_timer.h#4 integrate .. //depot/projects/jail2/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/jail2/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/jail2/sys/netinet6/nd6.c#4 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/jail2/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/jail2/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/jail2/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/jail2/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/jail2/sys/pci/agp_i810.c#4 integrate .. //depot/projects/jail2/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/jail2/sys/powerpc/include/clock.h#2 integrate .. //depot/projects/jail2/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/clock.c#3 integrate .. //depot/projects/jail2/sys/security/audit/audit.c#3 integrate .. //depot/projects/jail2/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/jail2/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/jail2/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_framework.h#1 branch .. //depot/projects/jail2/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/jail2/sys/sparc64/include/clock.h#2 integrate .. //depot/projects/jail2/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/jail2/sys/sun4v/compile/.cvsignore#1 branch .. //depot/projects/jail2/sys/sun4v/conf/DEFAULTS#1 branch .. //depot/projects/jail2/sys/sun4v/conf/GENERIC#1 branch .. //depot/projects/jail2/sys/sun4v/conf/GENERIC.hints#1 branch .. //depot/projects/jail2/sys/sun4v/conf/MAC#1 branch .. //depot/projects/jail2/sys/sun4v/conf/Makefile#1 branch .. //depot/projects/jail2/sys/sun4v/conf/NOTES#1 branch .. //depot/projects/jail2/sys/sun4v/include/_bus.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/_inttypes.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/_limits.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/_stdint.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/_types.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/asi.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/asm.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/asmacros.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/atomic.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/bus.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/bus_common.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/bus_dma.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/bus_private.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/cache.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/ccr.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/cddl/mdesc.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/cddl/mdesc_impl.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/clock.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/cpu.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/cpufunc.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/db_machdep.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/elf.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/endian.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/exec.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/float.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/floatingpoint.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/fp.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/frame.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/fsr.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/gdb_machdep.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/hv_pcivar.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/hviommu.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/hypervisor_api.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/hypervisorvar.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/idprom.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/ieee.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/ieeefp.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/in_cksum.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/instr.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/intr_machdep.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/iommureg.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/iommuvar.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/kdb.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/kerneldump.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/ktr.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/limits.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/lsu.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/md_var.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/mdesc_bus.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/mdesc_bus_subr.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/memdev.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/metadata.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/mmu.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/mutex.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/nexusvar.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/ofw_bus.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/ofw_machdep.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/ofw_mem.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/ofw_nexus.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/ofw_upa.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/param.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/pcb.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/pcpu.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/pmap.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/pmc_mdep.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/proc.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/profile.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/pstate.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/ptrace.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/reg.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/reloc.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/resource.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/runq.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/sc_machdep.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/setjmp.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/sf_buf.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/sigframe.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/signal.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/smp.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/stdarg.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/sun4v_cpufunc.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/sysarch.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/tick.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/tlb.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/trap.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/tsb.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/tstate.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/tte.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/tte_hash.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/ucontext.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/upa.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/utrap.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/varargs.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/ver.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/vmparam.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/watch.h#1 branch .. //depot/projects/jail2/sys/sun4v/include/wstate.h#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_bus_if.m#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_bus_subr.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_diff.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_findname.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_findnodeprop.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_fini.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_getbinsize.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_getgen.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_getpropdata.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_getpropstr.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_getpropval.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_init.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_init_intern.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_nodecount.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_rootnode.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_scandag.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_subr.c#1 branch .. //depot/projects/jail2/sys/sun4v/mdesc/mdesc_vdevfindval.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/autoconf.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/bus_machdep.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/clock.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/counter.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/db_disasm.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/db_hwwatch.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/db_interface.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/db_trace.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/dump_machdep.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/eeprom.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/elf_machdep.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/exception.S#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/fpemu.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/gdb_machdep.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/genassym.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/hcall.S#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/hv_pci.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/hvcons.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/hviommu.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/identcpu.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/in_cksum.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/interrupt.S#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/intr_machdep.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/iommu.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/locore.S#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/machdep.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/mem.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/mp_exception.S#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/mp_locore.S#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/mp_machdep.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/nexus.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/ofw_bus.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/ofw_machdep.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/pmap.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/prof_machdep.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/rtc.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/rwindow.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/simdisk.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/support.S#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/swtch.S#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/sys_machdep.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/t1_copy.S#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/tick.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/tlb.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/trap.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/trap_trace.S#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/tsb.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/tte.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/tte_hash.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/uio_machdep.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/vm_machdep.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/vnex.c#1 branch .. //depot/projects/jail2/sys/sun4v/sun4v/wbuf.S#1 branch .. //depot/projects/jail2/sys/sys/_elf_solaris.h#1 branch .. //depot/projects/jail2/sys/sys/buf.h#2 integrate .. //depot/projects/jail2/sys/sys/clock.h#2 integrate .. //depot/projects/jail2/sys/sys/consio.h#2 integrate .. //depot/projects/jail2/sys/sys/copyright.h#2 integrate .. //depot/projects/jail2/sys/sys/digiio.h#2 integrate .. //depot/projects/jail2/sys/sys/elf.h#1 branch .. //depot/projects/jail2/sys/sys/elf32.h#2 integrate .. //depot/projects/jail2/sys/sys/elf64.h#2 integrate .. //depot/projects/jail2/sys/sys/elf_common.h#2 integrate .. //depot/projects/jail2/sys/sys/ioccom.h#2 integrate .. //depot/projects/jail2/sys/sys/kbio.h#2 integrate .. //depot/projects/jail2/sys/sys/kernel.h#4 integrate .. //depot/projects/jail2/sys/sys/lockmgr.h#3 integrate .. //depot/projects/jail2/sys/sys/mount.h#3 integrate .. //depot/projects/jail2/sys/sys/param.h#5 integrate .. //depot/projects/jail2/sys/sys/pioctl.h#2 integrate .. //depot/projects/jail2/sys/sys/proc.h#3 integrate .. //depot/projects/jail2/sys/sys/signalvar.h#2 integrate .. //depot/projects/jail2/sys/sys/syscall.h#6 integrate .. //depot/projects/jail2/sys/sys/syscall.mk#6 integrate .. //depot/projects/jail2/sys/sys/sysproto.h#6 integrate .. //depot/projects/jail2/sys/sys/systm.h#5 integrate .. //depot/projects/jail2/sys/sys/time.h#3 integrate .. //depot/projects/jail2/sys/sys/ttycom.h#2 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/jail2/sys/ufs/ufs/inode.h#2 integrate .. //depot/projects/jail2/sys/ufs/ufs/ufs_quota.c#3 integrate .. //depot/projects/jail2/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/jail2/sys/vm/vm_page.c#5 integrate Differences ... ==== //depot/projects/jail2/sys/amd64/amd64/local_apic.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.29 2006/09/11 20:12:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.31 2006/09/27 22:09:35 sobomax Exp $"); #include "opt_hwpmc_hooks.h" @@ -613,13 +613,17 @@ /* Send EOI first thing. */ lapic_eoi(); -#ifdef SMP +#if defined(SMP) && !defined(SCHED_ULE) /* * Don't do any accounting for the disabled HTT cores, since it * will provide misleading numbers for the userland. * * No locking is necessary here, since even if we loose the race * when hlt_cpus_mask changes it is not a big deal, really. + * + * Don't do that for ULE, since ULE doesn't consider hlt_cpus_mask + * and unlike other schedulers it actually schedules threads to + * those CPUs. */ if ((hlt_cpus_mask & (1 << PCPU_GET(cpuid))) != 0) return; ==== //depot/projects/jail2/sys/amd64/amd64/machdep.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.652 2006/09/07 15:03:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.654 2006/10/02 15:42:01 phk Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -630,26 +631,6 @@ load_cr0(cr0); } -static int -sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS) -{ - int error; - error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, - req); - if (!error && req->newptr) - resettodr(); - return (error); -} - -SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, - &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); - -SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set, - CTLFLAG_RW, &disable_rtc_set, 0, ""); - -SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, - CTLFLAG_RW, &wall_cmos_clock, 0, ""); - /* * Initialize amd64 and configure to run kernel */ ==== //depot/projects/jail2/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.464 2006/07/09 16:39:21 mjacob Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.466 2006/10/05 20:31:57 simon Exp $ cpu HAMMER ident GENERIC @@ -26,7 +26,6 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -#options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking @@ -49,6 +48,7 @@ options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 +options COMPAT_FREEBSD6 # Compatible with FreeBSD6 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory ==== //depot/projects/jail2/sys/amd64/ia32/ia32_signal.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.14 2005/12/06 23:06:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.15 2006/10/05 01:56:10 davidxu Exp $"); #include "opt_compat.h" @@ -67,6 +67,7 @@ #include #include +#include #include #include #include @@ -298,7 +299,7 @@ freebsd4_ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe4 sf, *sfp; - struct ia32_siginfo siginfo; + struct siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; @@ -308,7 +309,7 @@ td = curthread; p = td->td_proc; - siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + siginfo_to_siginfo32(&ksi->ksi_info, &siginfo); PROC_LOCK_ASSERT(p, MA_OWNED); sig = siginfo.si_signo; @@ -407,7 +408,7 @@ ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe sf, *sfp; - struct ia32_siginfo siginfo; + struct siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; @@ -416,7 +417,7 @@ int oonstack; int sig; - siginfo_to_ia32siginfo(&ksi->ksi_info, &siginfo); + siginfo_to_siginfo32(&ksi->ksi_info, &siginfo); td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); @@ -741,20 +742,3 @@ pcb->pcb_flags |= PCB_FULLCTX; td->td_retval[1] = 0; } - -void -siginfo_to_ia32siginfo(siginfo_t *src, struct ia32_siginfo *dst) -{ - dst->si_signo = src->si_signo; - dst->si_errno = src->si_errno; - dst->si_code = src->si_code; - dst->si_pid = src->si_pid; - dst->si_uid = src->si_uid; - dst->si_status = src->si_status; - dst->si_addr = dst->si_addr; - dst->si_value.sigval_int = src->si_value.sival_int; - dst->si_band = src->si_band; - dst->si_trapno = src->si_trapno; - dst->si_timerid = src->si_timerid; - dst->si_overrun = src->si_overrun; -} ==== //depot/projects/jail2/sys/amd64/include/clock.h#2 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.52 2006/05/19 18:53:50 sobomax Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.53 2006/10/02 12:59:55 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -14,9 +14,7 @@ * i386 to clock driver interface. * XXX large parts of the driver and its interface are misplaced. */ -extern int adjkerntz; extern int clkintr_pending; -extern int disable_rtc_set; extern int pscnt; extern int psdiv; extern int statclock_disable; @@ -24,7 +22,6 @@ extern int timer0_max_count; extern uint64_t tsc_freq; extern int tsc_is_broken; -extern int wall_cmos_clock; extern struct mtx clock_lock; /* ==== //depot/projects/jail2/sys/amd64/include/elf.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/elf.h,v 1.18 2004/08/03 08:21:48 dfr Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.19 2006/10/04 21:37:09 jb Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -108,31 +108,6 @@ * Relocation types. */ -#define R_X86_64_NONE 0 /* No relocation. */ -#define R_X86_64_64 1 /* Add 64 bit symbol value. */ -#define R_X86_64_PC32 2 /* PC-relative 32 bit signed sym value. */ -#define R_X86_64_GOT32 3 /* PC-relative 32 bit GOT offset. */ -#define R_X86_64_PLT32 4 /* PC-relative 32 bit PLT offset. */ -#define R_X86_64_COPY 5 /* Copy data from shared object. */ -#define R_X86_64_GLOB_DAT 6 /* Set GOT entry to data address. */ -#define R_X86_64_JMP_SLOT 7 /* Set GOT entry to code address. */ -#define R_X86_64_RELATIVE 8 /* Add load address of shared object. */ -#define R_X86_64_GOTPCREL 9 /* Add 32 bit signed pcrel offset to GOT. */ -#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */ -#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */ -#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */ -#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative symbol value */ -#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */ -#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative symbol value */ -#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */ -#define R_X86_64_DTPOFF64 17 /* Offset in TLS block */ -#define R_X86_64_TPOFF64 18 /* Offset in static TLS block */ -#define R_X86_64_TLSGD 19 /* PC relative offset to GD GOT entry */ -#define R_X86_64_TLSLD 20 /* PC relative offset to LD GOT entry */ -#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */ -#define R_X86_64_GOTTPOFF 22 /* PC relative offset to IE GOT entry */ -#define R_X86_64_TPOFF32 23 /* Offset in static TLS block */ - #define R_X86_64_COUNT 24 /* Count of defined relocation types. */ /* Define "machine" characteristics */ ==== //depot/projects/jail2/sys/amd64/isa/clock.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.224 2005/12/22 22:16:05 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $"); /* * Routines to handle clock hardware. @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -92,9 +93,7 @@ #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) -int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; -int disable_rtc_set; /* disable resettodr() if != 0 */ int pscnt = 1; int psdiv = 1; int statclock_disable; @@ -104,7 +103,6 @@ u_int timer_freq = TIMER_FREQ; int timer0_max_count; int timer0_real_max_count; -int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ struct mtx clock_lock; #define RTC_LOCK mtx_lock_spin(&clock_lock) #define RTC_UNLOCK mtx_unlock_spin(&clock_lock) @@ -664,7 +662,7 @@ /* sec now contains the number of seconds, since Jan 1 1970, in the local time zone */ - sec += tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + sec += utc_offset(); y = time_second - sec; if (y <= -2 || y >= 2) { @@ -702,7 +700,7 @@ /* Calculate local time to put in RTC */ - tm -= tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + tm -= utc_offset(); writertc(RTC_SEC, bin2bcd(tm%60)); tm /= 60; /* Write back Seconds */ writertc(RTC_MIN, bin2bcd(tm%60)); tm /= 60; /* Write back Minutes */ ==== //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#5 (text+ko) ==== @@ -29,11 +29,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.17 2006/08/28 13:09:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.18 2006/10/02 12:59:55 phk Exp $"); #include #include #include +#include #include #include #include ==== //depot/projects/jail2/sys/arm/include/clock.h#2 (text+ko) ==== @@ -23,13 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/clock.h,v 1.2 2005/07/27 21:19:28 imp Exp $ + * $FreeBSD: src/sys/arm/include/clock.h,v 1.3 2006/10/02 12:59:55 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ -#define wall_cmos_clock 0 -#define adjkerntz 0 - #endif /* !_MACHINE_CLOCK_H_ */ ==== //depot/projects/jail2/sys/arm/include/elf.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/elf.h,v 1.7 2006/08/24 23:00:03 cognet Exp $ + * $FreeBSD: src/sys/arm/include/elf.h,v 1.8 2006/10/04 21:37:09 jb Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -82,40 +82,6 @@ #define AT_COUNT 15 /* Count of defined aux entry types. */ -#define R_ARM_NONE 0 /* No relocation. */ -#define R_ARM_PC24 1 -#define R_ARM_ABS32 2 -#define R_ARM_REL32 3 -#define R_ARM_PC13 4 -#define R_ARM_ABS16 5 -#define R_ARM_ABS12 6 -#define R_ARM_THM_ABS5 7 -#define R_ARM_ABS8 8 -#define R_ARM_SBREL32 9 -#define R_ARM_THM_PC22 10 -#define R_ARM_THM_PC8 11 -#define R_ARM_AMP_VCALL9 12 -#define R_ARM_SWI24 13 -#define R_ARM_THM_SWI8 14 -#define R_ARM_XPC25 15 -#define R_ARM_THM_XPC22 16 -#define R_ARM_COPY 20 /* Copy data from shared object. */ -#define R_ARM_GLOB_DAT 21 /* Set GOT entry to data address. */ -#define R_ARM_JUMP_SLOT 22 /* Set GOT entry to code address. */ -#define R_ARM_RELATIVE 23 /* Add load address of shared object. */ -#define R_ARM_GOTOFF 24 /* Add GOT-relative symbol address. */ -#define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */ -#define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */ -#define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */ -#define R_ARM_GNU_VTENTRY 100 -#define R_ARM_GNU_VTINHERIT 101 -#define R_ARM_RSBREL32 250 -#define R_ARM_THM_RPC22 251 -#define R_ARM_RREL32 252 -#define R_ARM_RABS32 253 -#define R_ARM_RPC24 254 -#define R_ARM_RBASE 255 - #define R_ARM_COUNT 33 /* Count of defined relocation types. */ ==== //depot/projects/jail2/sys/boot/common/merge_help.awk#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/usr/bin/awk -f # -# $FreeBSD: src/sys/boot/common/merge_help.awk,v 1.5 2001/11/07 17:53:25 fenner Exp $ +# $FreeBSD: src/sys/boot/common/merge_help.awk,v 1.6 2006/09/28 19:06:20 jhb Exp $ # # Merge two boot loader help files for FreeBSD 3.0 # Joe Abley @@ -25,9 +25,12 @@ match($0, " T[[:graph:]]+"); T = substr($0, RSTART + 2, RLENGTH - 2); match($0, " S[[:graph:]]+"); + SSTART = RSTART S = (RLENGTH == -1) ? "" : substr($0, RSTART + 2, RLENGTH - 2); match($0, " D[[:graph:]][[:print:]]*$"); D = substr($0, RSTART + 2); + if (SSTART > RSTART) + S = ""; # find a suitable place to store this one... ind++; ==== //depot/projects/jail2/sys/boot/common/panic.c#2 (text+ko) ==== @@ -34,11 +34,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/panic.c,v 1.7 2003/08/25 23:30:41 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/panic.c,v 1.8 2006/09/29 20:57:38 ru Exp $"); #include #include +extern void exit(int) __dead2; + void panic(const char *fmt,...) { ==== //depot/projects/jail2/sys/boot/ficl/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.43 2006/05/12 04:07:42 jhb Exp $ +# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.44 2006/09/28 10:02:03 ru Exp $ # .PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/} BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ @@ -42,7 +42,7 @@ #SOFTWORDS+= oo.fr classes.fr .if ${MACHINE_ARCH} == "amd64" -CFLAGS+= -m32 -I. +CFLAGS+= -m32 -march=i386 -I. .endif CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/} \ ==== //depot/projects/jail2/sys/boot/forth/loader.conf#3 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.111 2006/08/18 19:03:28 brueffer Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.113 2006/10/01 14:58:30 ariff Exp $ ############################################################## ### Basic configuration options ############################ @@ -309,7 +309,6 @@ sound_load="NO" # Digital sound subsystem snd_ad1816_load="NO" # ad1816 -snd_ak452x_load="NO" # ak452x snd_als4000_load="NO" # als4000 snd_atiixp_load="NO" # atiixp snd_cmi_load="NO" # cmi @@ -319,9 +318,11 @@ snd_emu10k1_load="NO" # Creative Sound Blaster Live snd_emu10kx_load="NO" # Creative SoundBlaster Live! and Audigy snd_envy24_load="NO" # VIA Envy24 +snd_envy24ht_load="NO" # VIA Envy24HT snd_es137x_load="NO" # es137x snd_ess_load="NO" # ess snd_fm801_load="NO" # fm801 +snd_hda_load="NO" # Intel High Definition Audio (Controller) snd_ich_load="NO" # Intel ICH snd_maestro_load="NO" # Maestro snd_maestro3_load="NO" # Maestro3 @@ -331,6 +332,7 @@ snd_sb8_load="NO" # Sound Blaster Pro snd_sbc_load="NO" # Sbc snd_solo_load="NO" # Solo +snd_spicds_load="NO" # SPI codecs snd_t4dwave_load="NO" # t4dwave snd_via8233_load="NO" # via8233 snd_via82c686_load="NO" # via82c686 ==== //depot/projects/jail2/sys/boot/i386/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # Common defines for all of /sys/boot/i386/ # -# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.11 2005/07/15 12:22:14 ache Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile.inc,v 1.12 2006/09/28 10:02:04 ru Exp $ BINDIR?= /boot @@ -10,7 +10,7 @@ LDFLAGS+= -nostdlib .if ${MACHINE_ARCH} == "amd64" -CFLAGS+= -m32 +CFLAGS+= -m32 -march=i386 LDFLAGS+= -m elf_i386_fbsd AFLAGS+= --32 .endif ==== //depot/projects/jail2/sys/boot/i386/btx/btx/btx.S#2 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.38 2004/11/24 14:54:33 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.43 2006/10/05 15:30:51 jhb Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 7 14:51: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 03BC316A407; Sat, 7 Oct 2006 14:51:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C444616A416 for ; Sat, 7 Oct 2006 14:51:57 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F46343D66 for ; Sat, 7 Oct 2006 14:51:47 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97EplYF013213 for ; Sat, 7 Oct 2006 14:51:47 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97EplJW013201 for perforce@freebsd.org; Sat, 7 Oct 2006 14:51:47 GMT (envelope-from howardsu@FreeBSD.org) Date: Sat, 7 Oct 2006 14:51:47 GMT Message-Id: <200610071451.k97EplJW013201@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 107417 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 14:51:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=107417 Change 107417 by howardsu@su_laptop on 2006/10/07 14:51:28 Fix a compile error. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/kern/vmem.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/kern/vmem.c#4 (text+ko) ==== @@ -80,15 +80,15 @@ { struct entry *np, *np_temp, *newnp; LIST_FOREACH_SAFE(np, vmp, entries, np_temp) { - if ((void*)np->end < p) continue; + if ((void*)np->end < vaddr) continue; - if (np->start == (char*)p + 1) { + if (np->start == (char*)vaddr + 1) { np->start--; return; } else { newnp = malloc(sizeof(vmem_t), M_VMEM, M_WAITOK); - newnp->start = newnp->end = p; + newnp->start = newnp->end = vaddr; LIST_INSERT_BEFORE(np, newnp, entries); return; } From owner-p4-projects@FreeBSD.ORG Sat Oct 7 14:56: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 0BCE116A415; Sat, 7 Oct 2006 14:56:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB61F16A40F for ; Sat, 7 Oct 2006 14:56:54 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9E2B43D46 for ; Sat, 7 Oct 2006 14:56:54 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97EuskK017417 for ; Sat, 7 Oct 2006 14:56:54 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97Eusew017411 for perforce@freebsd.org; Sat, 7 Oct 2006 14:56:54 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 7 Oct 2006 14:56:54 GMT Message-Id: <200610071456.k97Eusew017411@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107418 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 14:56:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=107418 Change 107418 by rdivacky@rdivacky_witten on 2006/10/07 14:56:48 Fix SLIST handling (still untested). Affected files ... .. //depot/projects/linuxolator/src/sys/kern/sysv_sem.c#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/kern/sysv_sem.c#4 (text+ko) ==== @@ -227,6 +227,7 @@ } for (i = 0; i < seminfo.semmni; i++) mtx_init(&sema_mtx[i], "semid", NULL, MTX_DEF); + SLIST_INIT(&semu_list); mtx_init(&sem_mtx, "sem", NULL, MTX_DEF); semexit_tag = EVENTHANDLER_REGISTER(process_exit, semexit_myhook, NULL, EVENTHANDLER_PRI_ANY); @@ -331,6 +332,8 @@ suptr = malloc(seminfo.semusz, M_SEM, M_WAITOK); refcount_init(&suptr->refcount, 1); + SLIST_INSERT_HEAD(&semu_list, suptr, un_next); + PROC_LOCK(td->td_proc); td->td_proc->p_semundo = suptr; PROC_UNLOCK(td->td_proc); From owner-p4-projects@FreeBSD.ORG Sat Oct 7 15:29:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CECEA16A416; Sat, 7 Oct 2006 15:29:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E64316A415 for ; Sat, 7 Oct 2006 15:29:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 051E143D4C for ; Sat, 7 Oct 2006 15:29:37 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97FTath045136 for ; Sat, 7 Oct 2006 15:29:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97FTaMj045133 for perforce@freebsd.org; Sat, 7 Oct 2006 15:29:36 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 7 Oct 2006 15:29:36 GMT Message-Id: <200610071529.k97FTaMj045133@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107420 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 15:29:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=107420 Change 107420 by hselasky@hselasky_mini_itx on 2006/10/07 15:29:13 USB API change: Move "usbd_transfer_drain" into "usbd_transfer_unsetup". This saves some code, and makes the USB API simpler. Remove usbd_transfer_drain and all associated structures. Add some WITNESS_WARN() statements. Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#10 edit .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/README#8 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/if_auereg.h#9 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#9 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#8 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#6 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#6 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#10 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/udbp.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/ufm.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/uhub.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/urio.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#23 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#12 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#7 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#7 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#10 (text) ==== @@ -86,7 +86,6 @@ struct bbb_cbw cbw; struct bbb_csw csw; struct mtx locked_mtx; - struct usbd_memory_wait mem_wait; struct __callout watchdog; struct ata_channel *locked_ch; @@ -413,7 +412,7 @@ err = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->xfer, atausb_config, ATAUSB_T_BBB_MAX, sc, - &(sc->locked_mtx), &(sc->mem_wait)); + &(sc->locked_mtx)); /* skip reset first time */ sc->last_xfer_no = ATAUSB_T_BBB_COMMAND; @@ -501,8 +500,6 @@ usbd_transfer_unsetup(sc->xfer, ATAUSB_T_MAX); - usbd_transfer_drain(&(sc->mem_wait), &(sc->locked_mtx)); - __callout_drain(&(sc->watchdog)); mtx_destroy(&sc->locked_mtx); ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#6 (text+ko) ==== @@ -132,7 +132,6 @@ struct uaudio_chan { struct pcmchan_caps pcm_cap; /* capabilities */ - struct usbd_memory_wait mem_wait; struct snd_dbuf *pcm_buf; const struct usbd_config *usb_cfg; @@ -190,7 +189,6 @@ struct umidi_chan { struct umidi_sub_chan sub[UMIDI_CABLES_MAX]; - struct usbd_memory_wait mem_wait; struct mtx mtx; struct usbd_xfer *xfer[UMIDI_N_TRANSFER]; @@ -216,7 +214,6 @@ struct uaudio_chan sc_rec_chan; struct uaudio_chan sc_play_chan; struct umidi_chan sc_midi_chan; - struct usbd_memory_wait sc_mixer_mem; struct usbd_device * sc_udev; struct usbd_xfer * sc_mixer_xfer[1]; @@ -1434,7 +1431,7 @@ if (usbd_transfer_setup(sc->sc_udev, iface_index, ch->xfer, ch->usb_cfg, UAUDIO_NCHANBUFS, ch, - ch->pcm_mtx, &(ch->mem_wait))) { + ch->pcm_mtx)) { DPRINTF(0, "could not allocate USB transfers!\n"); goto error; } @@ -1456,10 +1453,6 @@ usbd_transfer_unsetup(ch->xfer, UAUDIO_NCHANBUFS); - if (ch->pcm_mtx) { - usbd_transfer_drain(&(ch->mem_wait), ch->pcm_mtx); - } - ch->valid = 0; return 0; @@ -3192,7 +3185,7 @@ if (usbd_transfer_setup(sc->sc_udev, sc->sc_mixer_iface_index, sc->sc_mixer_xfer, uaudio_mixer_config, 1, sc, - sc->sc_mixer_lock, &(sc->sc_mixer_mem))) { + sc->sc_mixer_lock)) { DPRINTF(0, "could not allocate USB transfer for audio mixer!\n"); return ENOMEM; } @@ -3209,9 +3202,6 @@ usbd_transfer_unsetup(sc->sc_mixer_xfer, 1); - if (sc->sc_mixer_lock) { - usbd_transfer_drain(&(sc->sc_mixer_mem), sc->sc_mixer_lock); - } return 0; } @@ -3764,7 +3754,7 @@ error = usbd_transfer_setup(uaa->device, chan->iface_index, chan->xfer, umidi_config, UMIDI_N_TRANSFER, - chan, &(chan->mtx), &(chan->mem_wait)); + chan, &(chan->mtx)); if (error) { DPRINTF(0, "error=%s\n", usbd_errstr(error)) ; goto detach; @@ -3846,8 +3836,6 @@ usbd_transfer_unsetup(chan->xfer, UMIDI_N_TRANSFER); - usbd_transfer_drain(&(chan->mem_wait), &(chan->mtx)); - mtx_destroy(&(chan->mtx)); return 0; ==== //depot/projects/usb/src/sys/dev/usb/README#8 (text+ko) ==== @@ -117,7 +117,7 @@ /*------------------------------------------------------------------------* * usbd_status * usbd_transfer_setup(udev, iface_index, pxfer, setup_start, - * n_setup, priv_sc, priv_mtx, priv_wait) + * n_setup, priv_sc, priv_mtx) *------------------------------------------------------------------------*/ - "udev" is a pointer to "struct usbd_device" @@ -139,10 +139,6 @@ - "priv_mtx" is the private mutex protecting the transfer structure and the softc. This pointer is used to initialize "xfer->priv_mtx". -- "priv_wait" is a pointer to a structure of type "struct usbd_memory_wait", - that is passed to "usbd_transfer_drain()" after "usbd_transfer_unsetup()" - to wait for the USB system to finish using the "priv_mtx" mutex. - /*------------------------------------------------------------------------* * void * usbd_transfer_unsetup(pxfer, n_setup) ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#13 (text+ko) ==== @@ -840,7 +840,7 @@ error = usbd_transfer_setup(uaa->device, AUE_IFACE_IDX, sc->sc_xfer, aue_config, AUE_ENDPT_MAX, - sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + sc, &(sc->sc_mtx)); if (error) { device_printf(dev, "allocating USB " "transfers failed!\n"); @@ -994,8 +994,6 @@ usbd_transfer_unsetup(sc->sc_xfer, AUE_ENDPT_MAX); - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); ==== //depot/projects/usb/src/sys/dev/usb/if_auereg.h#9 (text+ko) ==== @@ -199,7 +199,6 @@ struct aue_softc { struct usbd_config_td sc_config_td; - struct usbd_memory_wait sc_mem_wait; struct __callout sc_watchdog; struct mtx sc_mtx; struct aue_rxpkt sc_rxpkt; ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#12 (text+ko) ==== @@ -643,7 +643,7 @@ error = usbd_transfer_setup(uaa->device, AXE_IFACE_IDX, sc->sc_xfer, axe_config, AXE_ENDPT_MAX, - sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + sc, &(sc->sc_mtx)); if (error) { device_printf(dev, "allocating USB " "transfers failed!\n"); @@ -795,8 +795,6 @@ usbd_transfer_unsetup(sc->sc_xfer, AXE_ENDPT_MAX); - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); ==== //depot/projects/usb/src/sys/dev/usb/if_axereg.h#9 (text+ko) ==== @@ -114,7 +114,6 @@ struct axe_softc { struct usbd_config_td sc_config_td; - struct usbd_memory_wait sc_mem_wait; struct __callout sc_watchdog; struct mtx sc_mtx; ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#8 (text+ko) ==== @@ -323,7 +323,7 @@ error = usbd_transfer_setup (uaa->device, sc->sc_data_iface_index, sc->sc_xfer, cdce_config, CDCE_ENDPT_MAX, - sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + sc, &(sc->sc_mtx)); if (error == 0) { break; @@ -430,8 +430,6 @@ usbd_transfer_unsetup(sc->sc_xfer, CDCE_ENDPT_MAX); - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - mtx_destroy(&(sc->sc_mtx)); return (0); ==== //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#8 (text+ko) ==== @@ -43,7 +43,6 @@ }; struct cdce_softc { - struct usbd_memory_wait sc_mem_wait; struct ifmedia sc_ifmedia; struct mtx sc_mtx; ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#10 (text+ko) ==== @@ -517,7 +517,7 @@ error = usbd_transfer_setup(uaa->device, CUE_IFACE_IDX, sc->sc_xfer, cue_config, CUE_ENDPT_MAX, - sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + sc, &(sc->sc_mtx)); if (error) { device_printf(dev, "allocating USB " "transfers failed!\n"); @@ -628,8 +628,6 @@ usbd_transfer_unsetup(sc->sc_xfer, CUE_ENDPT_MAX); - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); ==== //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#6 (text+ko) ==== @@ -122,7 +122,6 @@ struct cue_softc { struct usbd_config_td sc_config_td; - struct usbd_memory_wait sc_mem_wait; struct __callout sc_watchdog; struct mtx sc_mtx; ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#12 (text+ko) ==== @@ -544,7 +544,7 @@ error = usbd_transfer_setup(uaa->device, KUE_IFACE_IDX, sc->sc_xfer, kue_config, KUE_ENDPT_MAX, - sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + sc, &(sc->sc_mtx)); if (error) { device_printf(dev, "allocating USB " "transfers failed!\n"); @@ -663,8 +663,6 @@ usbd_transfer_unsetup(sc->sc_xfer, KUE_ENDPT_MAX); - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); ==== //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#6 (text+ko) ==== @@ -128,7 +128,6 @@ struct kue_softc { struct usbd_config_td sc_config_td; - struct usbd_memory_wait sc_mem_wait; struct __callout sc_watchdog; struct mtx sc_mtx; struct kue_ether_desc sc_desc; ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#11 (text+ko) ==== @@ -755,7 +755,7 @@ error = usbd_transfer_setup(uaa->device, RUE_IFACE_IDX, sc->sc_xfer, rue_config, RUE_ENDPT_MAX, - sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + sc, &(sc->sc_mtx)); if (error) { device_printf(dev, "allocating USB " "transfers failed!\n"); @@ -895,8 +895,6 @@ usbd_transfer_unsetup(sc->sc_xfer, RUE_ENDPT_MAX); - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); ==== //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#7 (text+ko) ==== @@ -168,7 +168,6 @@ struct rue_softc { struct usbd_config_td sc_config_td; - struct usbd_memory_wait sc_mem_wait; struct __callout sc_watchdog; struct mtx sc_mtx; ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#11 (text+ko) ==== @@ -362,7 +362,7 @@ error = usbd_transfer_setup(uaa->device, UDAV_IFACE_INDEX, sc->sc_xfer, udav_config, UDAV_ENDPT_MAX, - sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + sc, &(sc->sc_mtx)); if (error) { device_printf(dev, "allocating USB " "transfers failed!\n"); @@ -502,8 +502,6 @@ usbd_transfer_unsetup(sc->sc_xfer, UDAV_ENDPT_MAX); - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); ==== //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#7 (text+ko) ==== @@ -138,7 +138,6 @@ struct udav_softc { struct usbd_config_td sc_config_td; - struct usbd_memory_wait sc_mem_wait; struct __callout sc_watchdog; struct mtx sc_mtx; ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#14 (text+ko) ==== @@ -554,7 +554,7 @@ error = usbd_transfer_setup(uaa->device, RAL_IFACE_INDEX, sc->sc_xfer, ural_config, URAL_N_TRANSFER, - sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + sc, &(sc->sc_mtx)); if (error) { device_printf(dev, "could not allocate USB transfers, " "err=%s\n", usbd_errstr(error)) ; @@ -616,8 +616,6 @@ usbd_transfer_unsetup(sc->sc_xfer, URAL_N_TRANSFER); - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); ==== //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#10 (text+ko) ==== @@ -116,7 +116,6 @@ struct ural_amrr sc_amrr; struct ieee80211_beacon_offsets sc_bo; struct mtx sc_mtx; - struct usbd_memory_wait sc_mem_wait; struct __callout sc_watchdog; struct ural_bbp_prom sc_bbp_prom[16]; struct usbd_xfer *sc_xfer[URAL_N_TRANSFER]; ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#11 (text+ko) ==== @@ -152,7 +152,6 @@ struct ubsa_softc { struct ucom_softc sc_ucom; - struct usbd_memory_wait sc_mem_wait; struct usbd_xfer * sc_xfer[UBSA_N_TRANSFER]; @@ -518,7 +517,7 @@ error = usbd_transfer_setup(uaa->device, sc->sc_iface_index, sc->sc_xfer, ubsa_config, UBSA_N_TRANSFER, - sc, &Giant, &(sc->sc_mem_wait)); + sc, &Giant); if (error) { DPRINTF(0, "could not allocate all pipes\n"); goto detach; @@ -556,8 +555,6 @@ usbd_transfer_unsetup(sc->sc_xfer, UBSA_N_TRANSFER); - usbd_transfer_drain(&(sc->sc_mem_wait), &Giant); - return 0; } ==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#7 (text+ko) ==== @@ -62,7 +62,6 @@ struct ucycom_softc { struct ucom_softc sc_ucom; - struct usbd_memory_wait sc_mem_wait; struct usbd_device * sc_udev; struct usbd_xfer * sc_xfer[UCYCOM_ENDPT_MAX]; @@ -333,7 +332,7 @@ error = usbd_transfer_setup(uaa->device, UCYCOM_IFACE_INDEX, sc->sc_xfer, ucycom_config, UCYCOM_ENDPT_MAX, - sc, &Giant, &(sc->sc_mem_wait)); + sc, &Giant); if (error) { device_printf(dev, "allocating USB " "transfers failed!\n"); @@ -373,8 +372,6 @@ usbd_transfer_unsetup(sc->sc_xfer, UCYCOM_ENDPT_MAX); - usbd_transfer_drain(&(sc->sc_mem_wait), &Giant); - return 0; } ==== //depot/projects/usb/src/sys/dev/usb/udbp.c#7 (text+ko) ==== @@ -101,7 +101,6 @@ struct udbp_softc { struct mtx sc_mtx; - struct usbd_memory_wait sc_mem_wait; struct ng_bt_mbufq sc_xmitq_hipri; /* hi-priority transmit queue */ struct ng_bt_mbufq sc_xmitq; /* low-priority transmit queue */ @@ -336,7 +335,7 @@ error = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer, udbp_config, UDBP_T_MAX, - sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + sc, &(sc->sc_mtx)); if (error) { DPRINTF(sc, 0, "error=%s\n", usbd_errstr(error)) ; goto detach; @@ -393,8 +392,6 @@ usbd_transfer_unsetup(sc->sc_xfer, UDBP_T_MAX); - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - mtx_destroy(&(sc->sc_mtx)); /* destroy queues */ ==== //depot/projects/usb/src/sys/dev/usb/ufm.c#9 (text+ko) ==== @@ -72,7 +72,6 @@ struct ufm_softc { struct usb_cdev sc_cdev; struct mtx sc_mtx; - struct usbd_memory_wait sc_mem_wait; struct usbd_device *sc_udev; struct usbd_xfer *sc_xfer[UFM_N_TRANSFER]; @@ -193,7 +192,7 @@ error = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer, ufm_config, UFM_N_TRANSFER, - sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + sc, &(sc->sc_mtx)); if (error) { DPRINTF(sc, 0, "error=%s\n", usbd_errstr(error)) ; goto detach; @@ -228,8 +227,6 @@ usbd_transfer_unsetup(sc->sc_xfer, UFM_N_TRANSFER); - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - mtx_destroy(&(sc->sc_mtx)); return 0; ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#9 (text+ko) ==== @@ -152,7 +152,6 @@ struct ucom_softc sc_ucom; struct usbd_config_td sc_config_td; - struct usbd_memory_wait sc_mem_wait; usb_cdc_line_state_t sc_line_state; /* current line state */ struct usbd_xfer * sc_ctrl_xfer[UFOMA_CTRL_ENDPT_MAX]; @@ -478,7 +477,7 @@ error = usbd_transfer_setup (uaa->device, sc->sc_ctrl_iface_index, sc->sc_ctrl_xfer, ufoma_ctrl_config, UFOMA_CTRL_ENDPT_MAX, - sc, &Giant, &(sc->sc_mem_wait)); + sc, &Giant); if (error) { device_printf(dev, "allocating control USB " @@ -569,8 +568,6 @@ usbd_transfer_unsetup(sc->sc_bulk_xfer, UFOMA_BULK_ENDPT_MAX); - usbd_transfer_drain(&(sc->sc_mem_wait), &Giant); - usbd_config_td_unsetup(&(sc->sc_config_td)); if (sc->sc_modetable) { @@ -1322,7 +1319,7 @@ error = usbd_transfer_setup (uaa->device, sc->sc_data_iface_index, sc->sc_bulk_xfer, ufoma_bulk_config, UFOMA_BULK_ENDPT_MAX, - sc, &Giant, &(sc->sc_mem_wait)); + sc, &Giant); if (error) { device_printf(dev, "allocating BULK USB " ==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#10 (text+ko) ==== @@ -97,7 +97,6 @@ struct uftdi_softc { struct ucom_softc sc_ucom; struct usbd_config_td sc_config_td; - struct usbd_memory_wait sc_mem_wait; struct usbd_device * sc_udev; struct usbd_xfer * sc_xfer[UFTDI_ENDPT_MAX]; @@ -447,7 +446,7 @@ error = usbd_transfer_setup(uaa->device, sc->sc_iface_index, sc->sc_xfer, uftdi_config, UFTDI_ENDPT_MAX, - sc, &Giant, &(sc->sc_mem_wait)); + sc, &Giant); if (error) { device_printf(dev, "allocating USB " "transfers failed!\n"); @@ -505,8 +504,6 @@ usbd_transfer_unsetup(sc->sc_xfer, UFTDI_ENDPT_MAX); - usbd_transfer_drain(&(sc->sc_mem_wait), &Giant); - usbd_config_td_unsetup(&(sc->sc_config_td)); return 0; ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#9 (text+ko) ==== @@ -126,7 +126,6 @@ struct ugen_endpoint sc_endpoints[USB_MAX_ENDPOINTS]; struct ugen_endpoint sc_endpoints_end[0]; struct mtx sc_mtx; - struct usbd_memory_wait sc_mem_wait; }; extern cdevsw_t ugen_cdevsw; @@ -239,9 +238,6 @@ /* destroy all devices */ ugen_destroy_devnodes(sc, 0); - /* wait for memory to get freed */ - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - mtx_destroy(&sc->sc_mtx); return 0; @@ -413,21 +409,25 @@ */ error = usbd_transfer_setup(udev, iface_index, &temp[0], setup, n_setup, - sce, &(sc->sc_mtx), &(sc->sc_mem_wait)); + sce, &(sc->sc_mtx)); mtx_lock(&sc->sc_mtx); - sce->state &= ~context_bit; - if(sce->state & UGEN_CLOSING) { - wakeup(sce); - error = USBD_CANCELLED; + mtx_unlock(&(sc->sc_mtx)); /* "usbd_transfer_unsetup()" will clear "temp[]" */ usbd_transfer_unsetup(&temp[0], n_setup); + + mtx_lock(&(sc->sc_mtx)); + + wakeup(sce); + error = USBD_CANCELLED; } + sce->state &= ~context_bit; + while(n_setup--) { pxfer[n_setup] = temp[n_setup]; @@ -512,6 +512,7 @@ { struct ugen_softc *sc = DEV2SC(dev); struct ugen_endpoint *sce = DEV2SCE(dev); + struct usbd_xfer *temp_xfer[4]; PRINTFN(5, ("flag=%d, mode=%d\n", flag, mode)); @@ -571,10 +572,22 @@ sce->state &= ~(UGEN_OPEN_DEV|UGEN_OPEN_IN|UGEN_OPEN_OUT|UGEN_CLOSING); - usbd_transfer_unsetup(&sce->xfer_in[0], 2); - usbd_transfer_unsetup(&sce->xfer_out[0], 2); + temp_xfer[0] = sce->xfer_in[0]; + temp_xfer[1] = sce->xfer_in[1]; + temp_xfer[2] = sce->xfer_out[0]; + temp_xfer[3] = sce->xfer_out[1]; + + sce->xfer_in[0] = NULL; + sce->xfer_in[1] = NULL; + sce->xfer_out[0] = NULL; + sce->xfer_out[1] = NULL; + + mtx_unlock(&sc->sc_mtx); + + usbd_transfer_unsetup(temp_xfer, 4); + } else { + mtx_unlock(&sc->sc_mtx); } - mtx_unlock(&sc->sc_mtx); return (0); } ==== //depot/projects/usb/src/sys/dev/usb/uhid.c#12 (text+ko) ==== @@ -98,7 +98,6 @@ struct uhid_softc { struct usb_cdev sc_cdev; struct mtx sc_mtx; - struct usbd_memory_wait sc_mem_wait; struct usbd_xfer * sc_xfer[UHID_N_TRANSFER]; void * sc_repdesc_ptr; @@ -652,7 +651,7 @@ error = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer, uhid_config, UHID_N_TRANSFER, - sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + sc, &(sc->sc_mtx)); if (error) { DPRINTF(0, "error=%s\n", usbd_errstr(error)) ; goto detach; @@ -796,8 +795,6 @@ } } - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - mtx_destroy(&(sc->sc_mtx)); return 0; ==== //depot/projects/usb/src/sys/dev/usb/uhub.c#7 (text+ko) ==== @@ -478,7 +478,7 @@ /* set up interrupt pipe */ err = usbd_transfer_setup(udev, 0, &sc->sc_xfer[0], - &usbd_config[0], 2, sc, NULL, NULL); + &usbd_config[0], 2, sc, NULL); if(err) { device_printf(dev, "cannot open interrupt pipe\n"); ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#13 (text+ko) ==== @@ -118,7 +118,6 @@ struct __callout sc_callout; struct ukbd_data sc_ndata; struct ukbd_data sc_odata; - struct usbd_memory_wait sc_mem_wait; struct usbd_device * sc_udev; struct usbd_interface * sc_iface; @@ -640,7 +639,7 @@ err = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer, ukbd_config, UKBD_N_TRANSFER, sc, - &Giant, &(sc->sc_mem_wait)); + &Giant); if (err) { DPRINTF(0, "error=%s\n", usbd_errstr(err)) ; goto detach; @@ -765,8 +764,6 @@ usbd_transfer_unsetup(sc->sc_xfer, UKBD_N_TRANSFER); - usbd_transfer_drain(&(sc->sc_mem_wait), &Giant); - __callout_drain(&(sc->sc_callout)); DPRINTF(0, "%s: disconnected\n", ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#16 (text+ko) ==== @@ -88,7 +88,6 @@ struct usb_cdev sc_cdev; struct __callout sc_watchdog; struct mtx sc_mtx; - struct usbd_memory_wait sc_mem_wait; device_t sc_dev; struct usbd_xfer * sc_xfer[ULPT_N_TRANSFER]; @@ -594,7 +593,7 @@ error = usbd_transfer_setup(uaa->device, iface_index, sc->sc_xfer, ulpt_config, ULPT_N_TRANSFER, - sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + sc, &(sc->sc_mtx)); if (error) { DPRINTF(0, "error=%s\n", usbd_errstr(error)) ; goto detach; @@ -698,8 +697,6 @@ usbd_transfer_unsetup(sc->sc_xfer, ULPT_N_TRANSFER); - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - __callout_drain(&(sc->sc_watchdog)); mtx_destroy(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/umass.c#6 (text+ko) ==== @@ -533,7 +533,6 @@ struct umass_softc { - struct usbd_memory_wait sc_mem_wait; struct scsi_sense cam_scsi_sense; struct scsi_test_unit_ready cam_scsi_test_unit_ready; struct mtx sc_mtx; @@ -1212,7 +1211,7 @@ err = usbd_transfer_setup (uaa->device, uaa->iface_index, sc->sc_xfer, umass_bbb_config, UMASS_T_BBB_MAX, sc, - &(sc->sc_mtx), &(sc->sc_mem_wait)); + &(sc->sc_mtx)); /* skip reset first time */ sc->sc_last_xfer_index = UMASS_T_BBB_COMMAND; @@ -1224,7 +1223,7 @@ umass_bbb_config, (sc->sc_proto & UMASS_PROTO_CBI_I) ? UMASS_T_CBI_MAX : (UMASS_T_CBI_MAX-2), sc, - &(sc->sc_mtx), &(sc->sc_mem_wait)); + &(sc->sc_mtx)); /* skip reset first time */ sc->sc_last_xfer_index = UMASS_T_CBI_COMMAND; @@ -1307,8 +1306,6 @@ usbd_transfer_unsetup(sc->sc_xfer, UMASS_T_MAX); - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - mtx_destroy(&(sc->sc_mtx)); return 0; /* success */ ==== //depot/projects/usb/src/sys/dev/usb/umct.c#7 (text+ko) ==== @@ -84,7 +84,6 @@ struct umct_softc { struct ucom_softc sc_ucom; struct usbd_config_td sc_config_td; - struct usbd_memory_wait sc_mem_wait; struct usbd_device * sc_udev; struct usbd_xfer * sc_xfer[UMCT_ENDPT_MAX]; @@ -368,7 +367,7 @@ error = usbd_transfer_setup(uaa->device, UMCT_IFACE_INDEX, sc->sc_xfer, umct_config, UMCT_ENDPT_MAX, - sc, &Giant, &(sc->sc_mem_wait)); + sc, &Giant); if (error) { device_printf(dev, "allocating USB " "transfers failed!\n"); @@ -441,8 +440,6 @@ usbd_transfer_unsetup(sc->sc_xfer, UMCT_ENDPT_MAX); - usbd_transfer_drain(&(sc->sc_mem_wait), &Giant); - usbd_config_td_unsetup(&(sc->sc_config_td)); return 0; ==== //depot/projects/usb/src/sys/dev/usb/umodem.c#11 (text+ko) ==== @@ -134,7 +134,6 @@ struct umodem_softc { struct ucom_softc sc_ucom; usb_cdc_line_state_t sc_line_state; /* current line state */ - struct usbd_memory_wait sc_mem_wait; struct usbd_xfer * sc_xfer_data[UMODEM_N_DATA_TRANSFER]; struct usbd_xfer * sc_xfer_intr[UMODEM_N_INTR_TRANSFER]; @@ -494,7 +493,7 @@ error = usbd_transfer_setup(uaa->device, sc->sc_data_iface_index, sc->sc_xfer_data, umodem_config_data, UMODEM_N_DATA_TRANSFER, - sc, &Giant, &(sc->sc_mem_wait)); + sc, &Giant); if (error) { goto detach; } @@ -502,7 +501,7 @@ error = usbd_transfer_setup(uaa->device, sc->sc_ctrl_iface_index, sc->sc_xfer_intr, umodem_config_intr, UMODEM_N_INTR_TRANSFER, - sc, &Giant, &(sc->sc_mem_wait)); + sc, &Giant); if (error) { /* ignore */ DPRINTF(0, "no interrupt pipe!\n"); @@ -1096,7 +1095,5 @@ usbd_transfer_unsetup(sc->sc_xfer_data, UMODEM_N_DATA_TRANSFER); - usbd_transfer_drain(&(sc->sc_mem_wait), &Giant); - return 0; } ==== //depot/projects/usb/src/sys/dev/usb/ums.c#15 (text+ko) ==== @@ -87,7 +87,6 @@ struct usb_cdev sc_cdev; struct mtx sc_mtx; struct __callout sc_callout; - struct usbd_memory_wait sc_mem_wait; struct hid_location sc_loc_x; struct hid_location sc_loc_y; struct hid_location sc_loc_z; @@ -392,7 +391,7 @@ err = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer, ums_config, UMS_N_TRANSFER, sc, - &(sc->sc_mtx), &(sc->sc_mem_wait)); + &(sc->sc_mtx)); if (err) { DPRINTF(0, "error=%s\n", usbd_errstr(err)) ; goto detach; @@ -562,8 +561,6 @@ usbd_transfer_unsetup(sc->sc_xfer, UMS_N_TRANSFER); - usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); - __callout_drain(&(sc->sc_callout)); mtx_destroy(&(sc->sc_mtx)); ==== //depot/projects/usb/src/sys/dev/usb/uplcom.c#10 (text+ko) ==== @@ -148,7 +148,6 @@ struct uplcom_softc { struct ucom_softc sc_ucom; usb_cdc_line_state_t sc_line_state; /* current line state */ - struct usbd_memory_wait sc_mem_wait; struct usbd_xfer * sc_xfer_intr[UPLCOM_N_INTR_TRANSFER]; struct usbd_xfer * sc_xfer_data[UPLCOM_N_DATA_TRANSFER]; @@ -527,7 +526,7 @@ error = usbd_transfer_setup(uaa->device, sc->sc_data_iface_index, sc->sc_xfer_data, uplcom_config_data, UPLCOM_N_DATA_TRANSFER, - sc, &Giant, &(sc->sc_mem_wait)); + sc, &Giant); if (error) { DPRINTF(0, "one or more missing data " "pipes, error=%s\n", usbd_errstr(error)); @@ -537,7 +536,7 @@ error = usbd_transfer_setup(uaa->device, sc->sc_ctrl_iface_index, sc->sc_xfer_intr, uplcom_config_intr, UPLCOM_N_INTR_TRANSFER, - sc, &Giant, &(sc->sc_mem_wait)); + sc, &Giant); if (error) { DPRINTF(0, "no interrupt pipe, error=%s\n", usbd_errstr(error)); @@ -596,8 +595,6 @@ usbd_transfer_unsetup(sc->sc_xfer_data, UPLCOM_N_DATA_TRANSFER); - usbd_transfer_drain(&(sc->sc_mem_wait), &Giant); - return 0; } ==== //depot/projects/usb/src/sys/dev/usb/urio.c#6 (text+ko) ==== @@ -87,7 +87,6 @@ struct urio_softc { struct usb_cdev sc_cdev; struct mtx sc_mtx; - struct usbd_memory_wait sc_mem_wait; device_t sc_dev; struct usbd_device * sc_udev; @@ -244,7 +243,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 7 15:50:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5560216A415; Sat, 7 Oct 2006 15:50:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0857016A40F for ; Sat, 7 Oct 2006 15:50:08 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59CFE43D6A for ; Sat, 7 Oct 2006 15:50:03 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97Fo3ej061917 for ; Sat, 7 Oct 2006 15:50:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97Fo2Xh061908 for perforce@freebsd.org; Sat, 7 Oct 2006 15:50:02 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 7 Oct 2006 15:50:02 GMT Message-Id: <200610071550.k97Fo2Xh061908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107421 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 15:50:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=107421 Change 107421 by hselasky@hselasky_mini_itx on 2006/10/07 15:49:59 Update documentation. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#9 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#9 (text+ko) ==== @@ -150,6 +150,8 @@ - "n_setup" is a number telling the USB system how many USB transfers should be unsetup +NOTE: This function can sleep, waiting for active mutexes to become unlocked! + /*------------------------------------------------------------------------* * void * usbd_transfer_start(xfer) @@ -172,18 +174,6 @@ "xfer->error=USBD_CANCELLED", before this function returns /*------------------------------------------------------------------------* - * void - * usbd_transfer_drain(priv_wait, priv_mtx) - *------------------------------------------------------------------------*/ - -- "priv_wait" is a pointer to a structure of type "struct usbd_memory_wait" - -- "priv_mtx" is a pointer to a mutex protecting the "priv_wait" structure - -NOTE: This function returns when the mutex "priv_mtx", is not used by the USB -system any more. - -/*------------------------------------------------------------------------* * struct usbd_config { * type, endpoint, direction, interval, timeout, frames, index * flags, bufsize, callback From owner-p4-projects@FreeBSD.ORG Sat Oct 7 16:52: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 DD10716A494; Sat, 7 Oct 2006 16:52:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE52A16A40F for ; Sat, 7 Oct 2006 16:52:25 +0000 (UTC) (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 5546A43D49 for ; Sat, 7 Oct 2006 16:52:25 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97GqPm7021107 for ; Sat, 7 Oct 2006 16:52:25 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97GqPhV021099 for perforce@freebsd.org; Sat, 7 Oct 2006 16:52:25 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Oct 2006 16:52:25 GMT Message-Id: <200610071652.k97GqPhV021099@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 107427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 16:52:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=107427 Change 107427 by imp@imp_lighthouse on 2006/10/07 16:51:55 Add stubs for disk goo. Need to fill them in. Affected files ... .. //depot/projects/arm/src/sys/dev/flash/at45d.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/dev/flash/at45d.c#6 (text+ko) ==== @@ -27,15 +27,18 @@ #include #include +#include #include #include #include #include +#include #include #include #include #include #include +#include #include #include "spibus_if.h" @@ -45,7 +48,9 @@ struct intr_config_hook config_intrhook; device_t dev; struct mtx sc_mtx; - int dummy; + struct disk *disk; + struct proc *p; + struct bio_queue_head bio_queue; }; #define AT45D_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) @@ -59,6 +64,12 @@ static void at45d_delayed_attach(void *xsc); +/* disk routines */ +static int at45d_open(struct disk *dp); +static int at45d_close(struct disk *dp); +static void at45d_strategy(struct bio *bp); +static void at45d_task(void *arg); + #define CONTINUOUS_ARRAY_READ 0xE8 #define CONTINUOUS_ARRAY_READ_HF 0x0B #define CONTINUOUS_ARRAY_READ_LF 0x03 @@ -343,9 +354,67 @@ printf("Reply is %#x %#x %#x %#x\n", buf[0], buf[1], buf[2], buf[3]); at45d_wait_for_device_ready(sc->dev); printf("Status is %#x\b", at45d_get_status(sc->dev)); + + sc->disk = disk_alloc(); + sc->disk->d_open = at45d_open; + sc->disk->d_close = at45d_close; + sc->disk->d_strategy = at45d_strategy; + sc->disk->d_name = "flash/spi"; + sc->disk->d_drv1 = sc; + sc->disk->d_maxsize = DFLTPHYS; + sc->disk->d_sectorsize = 1056; // XXX + sc->disk->d_mediasize = 8192 * 1056; // XXX + sc->disk->d_unit = device_get_unit(sc->dev); + disk_create(sc->disk, DISK_VERSION); + bioq_init(&sc->bio_queue); + kthread_create(&at45d_task, sc, &sc->p, 0, 0, "task: at45d flash"); + config_intrhook_disestablish(&sc->config_intrhook); } +static int +at45d_open(struct disk *dp) +{ + return 0; +} + +static int +at45d_close(struct disk *dp) +{ + return 0; +} + +static void +at45d_strategy(struct bio *bp) +{ + struct at45d_softc *sc; + + sc = (struct at45d_softc *)bp->bio_disk->d_drv1; + AT45D_LOCK(sc); + bioq_disksort(&sc->bio_queue, bp); + wakeup(sc); + AT45D_UNLOCK(sc); +} + +static void +at45d_task(void *arg) +{ + struct at45d_softc *sc = (struct at45d_softc*)arg; + struct bio *bp; + + for (;;) { + AT45D_LOCK(sc); + do { + bp = bioq_first(&sc->bio_queue); + if (bp == NULL) + msleep(sc, &sc->sc_mtx, PRIBIO, "jobqueue", 0); + } while (bp == NULL); + bioq_remove(&sc->bio_queue, bp); + AT45D_UNLOCK(sc); + } +} + + static devclass_t at45d_devclass; static device_method_t at45d_methods[] = { From owner-p4-projects@FreeBSD.ORG Sat Oct 7 16:54: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 6CA5E16A415; Sat, 7 Oct 2006 16:54:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 129FF16A403 for ; Sat, 7 Oct 2006 16:54:29 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90EE343D58 for ; Sat, 7 Oct 2006 16:54:28 +0000 (GMT) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97GsScl022915 for ; Sat, 7 Oct 2006 16:54:28 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97GsSM1022906 for perforce@freebsd.org; Sat, 7 Oct 2006 16:54:28 GMT (envelope-from netchild@freebsd.org) Date: Sat, 7 Oct 2006 16:54:28 GMT Message-Id: <200610071654.k97GsSM1022906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 107428 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 16:54:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=107428 Change 107428 by netchild@netchild_magellan on 2006/10/07 16:54:18 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uscanner.c#2 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/boot/i386/pxeldr/pxeboot.8#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/boot/i386/pxeldr/pxeboot.8,v 1.7 2002/12/12 17:25:59 ru Exp $ +.\" $FreeBSD: src/sys/boot/i386/pxeldr/pxeboot.8,v 1.8 2006/10/07 10:39:34 pav Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -103,7 +103,7 @@ .Pp For further information on Intel's PXE specifications and Wired for Management (WfM) systems, see -.Li http://developer.intel.com/ial/wfm/ . +.Li http://www.intel.com/design/archives/wfm/ . .Sh SEE ALSO .Xr loader 8 .Sh HISTORY ==== //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.264 2006/08/06 12:01:42 bms Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.265 2006/10/07 16:00:58 flz Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -890,6 +890,8 @@ product EPSON 1670 0x011f Perfection 1670 scanner product EPSON 1270 0x0120 Perfection 1270 scanner product EPSON 2480 0x0121 Perfection 2480 scanner +product EPSON 3590 0x0122 Perfection 3590 scanner +product EPSON 4990 0x012a Perfection 4990 Photo scanner product EPSON 3500 0x080e CX-3500/3600/3650 MFP product EPSON RX425 0x080f Stylus Photo RX425 scanner ==== //depot/projects/linuxolator/src/sys/dev/usb/uscanner.c#2 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.74 2006/09/07 00:06:42 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.75 2006/10/07 16:00:58 flz Exp $"); /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -214,6 +214,8 @@ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9300UF }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2480 }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3500 }, USC_KEEP_OPEN }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3590 }, 0 }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4990 }, 0 }, /* UMAX */ {{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U }, 0 }, From owner-p4-projects@FreeBSD.ORG Sat Oct 7 16:56: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 ADB5216A417; Sat, 7 Oct 2006 16:56:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 624C416A416 for ; Sat, 7 Oct 2006 16:56:45 +0000 (UTC) (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 34B6443D91 for ; Sat, 7 Oct 2006 16:56:32 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97GuWBd024739 for ; Sat, 7 Oct 2006 16:56:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97GuWB4024723 for perforce@freebsd.org; Sat, 7 Oct 2006 16:56:32 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Oct 2006 16:56:32 GMT Message-Id: <200610071656.k97GuWB4024723@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 107429 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 16:56:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=107429 Change 107429 by imp@imp_lighthouse on 2006/10/07 16:55:56 Kill some stuff Affected files ... .. //depot/projects/arm/src/sys/dev/flash/at45d.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/dev/flash/at45d.c#7 (text+ko) ==== @@ -78,103 +78,7 @@ #define MANUFACTURER_ID 0x9F #if 0 -/****************************************************************************** - * - * Filename: spi_flash.c - * - * Instantiation of SPI flash control routines supporting AT45DB161B - * - * Revision information: - * - * 17JAN2005 kb_admin initial creation - * adapted from external sources - * tested for basic operation only!!! - * - * BEGIN_KBDD_BLOCK - * No warranty, expressed or implied, is included with this software. It is - * provided "AS IS" and no warranty of any kind including statutory or aspects - * relating to merchantability or fitness for any purpose is provided. All - * intellectual property rights of others is maintained with the respective - * owners. This software is not copyrighted and is intended for reference - * only. - * END_BLOCK - *****************************************************************************/ - -#include "at91rm9200.h" -#include "spi_flash.h" -#include "lib.h" - -/*********************** PRIVATE FUNCTIONS/DATA ******************************/ - - -static spiCommand_t spi_command; -static char tx_commandBuffer[8], rx_commandBuffer[8]; - -/* - * .KB_C_FN_DEFINITION_START - * void SendCommand(spiCommand_t *pCommand) - * Private function sends 8-bit value to the device and returns the 8-bit - * value in response. - * .KB_C_FN_DEFINITION_END - */ -static void -SendCommand(spiCommand_t *pCommand) -{ - AT91PS_SPI pSPI = AT91C_BASE_SPI; - - pSPI->SPI_PTCR = AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS; - - pSPI->SPI_RPR = (unsigned)pCommand->rx_cmd; - pSPI->SPI_RCR = pCommand->rx_cmd_size; - pSPI->SPI_TPR = (unsigned)pCommand->tx_cmd; - pSPI->SPI_TCR = pCommand->tx_cmd_size; - pSPI->SPI_TNPR = (unsigned)pCommand->tx_data; - pSPI->SPI_TNCR = pCommand->tx_data_size; - pSPI->SPI_RNPR = (unsigned)pCommand->rx_data; - pSPI->SPI_RNCR = pCommand->rx_data_size; - - pSPI->SPI_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTEN; - - // wait for completion - while (!(pSPI->SPI_SR & AT91C_SPI_SPENDRX)) - Delay(700); -} - - -/* - * .KB_C_FN_DEFINITION_START - * char GetFlashStatus(void) - * Private function to return device status. - * .KB_C_FN_DEFINITION_END - */ -static char -GetFlashStatus(void) -{ - p_memset((char *)&spi_command, 0, sizeof(spi_command)); - p_memset(tx_commandBuffer, 0, 8); - tx_commandBuffer[0] = STATUS_REGISTER_READ; - p_memset(rx_commandBuffer, 0, 8); - spi_command.tx_cmd = tx_commandBuffer; - spi_command.rx_cmd = rx_commandBuffer; - spi_command.rx_cmd_size = 2; - spi_command.tx_cmd_size = 2; - SendCommand(&spi_command); - return (rx_commandBuffer[1]); -} - -/* - * .KB_C_FN_DEFINITION_START - * void WaitForDeviceReady(void) - * Private function to poll until the device is ready for next operation. - * .KB_C_FN_DEFINITION_END - */ -static void -WaitForDeviceReady(void) -{ - while (!(GetFlashStatus() & 0x80)) ; -} - /*************************** GLOBAL FUNCTIONS ********************************/ @@ -411,10 +315,12 @@ } while (bp == NULL); bioq_remove(&sc->bio_queue, bp); AT45D_UNLOCK(sc); + // XXX need to make the read/write request, maybe even + // XXX breaking things down into smaller blocks. + biodone(bp); } } - static devclass_t at45d_devclass; static device_method_t at45d_methods[] = { From owner-p4-projects@FreeBSD.ORG Sat Oct 7 17:14: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 BCA6516A47C; Sat, 7 Oct 2006 17:14:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9741616A415 for ; Sat, 7 Oct 2006 17:14:55 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63D2143D45 for ; Sat, 7 Oct 2006 17:14:55 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97HEtg7040757 for ; Sat, 7 Oct 2006 17:14:55 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97HEtKK040751 for perforce@freebsd.org; Sat, 7 Oct 2006 17:14:55 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 7 Oct 2006 17:14:55 GMT Message-Id: <200610071714.k97HEtKK040751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 107430 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 17:14:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=107430 Change 107430 by rdivacky@rdivacky_witten on 2006/10/07 17:14:07 Fix use-after-free. I want to refcount the new undo struct. Noticed by: netchild Affected files ... .. //depot/projects/linuxolator/src/sys/kern/sysv_sem.c#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/kern/sysv_sem.c#5 (text+ko) ==== @@ -1272,10 +1272,10 @@ refcount_release(&p->p_semundo->refcount); if (p->p_semundo->refcount == 0) free(p->p_semundo, M_SEM); - refcount_acquire(&p->p_semundo->refcount); PROC_LOCK(p); p->p_semundo = SLIST_NEXT(suptr, un_next); PROC_UNLOCK(p); + refcount_acquire(&p->p_semundo->refcount); } static int From owner-p4-projects@FreeBSD.ORG Sat Oct 7 21:30:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79F4F16A415; Sat, 7 Oct 2006 21:30:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 35A9516A403 for ; Sat, 7 Oct 2006 21:30:31 +0000 (UTC) (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 BEE9943D58 for ; Sat, 7 Oct 2006 21:30:30 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97LUU6W056955 for ; Sat, 7 Oct 2006 21:30:30 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97LUUU7056947 for perforce@freebsd.org; Sat, 7 Oct 2006 21:30:30 GMT (envelope-from soc-andrew@freebsd.org) Date: Sat, 7 Oct 2006 21:30:30 GMT Message-Id: <200610072130.k97LUUU7056947@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 107455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 21:30:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=107455 Change 107455 by soc-andrew@soc-andrew_serv on 2006/10/07 21:29:43 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#10 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#11 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#20 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#14 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.320 2006/09/02 20:58:37 marcel Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.322 2006/10/02 00:23:14 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -565,6 +565,8 @@ .. lt_LT.UTF-8 .. + mn_MN.UTF-8 + .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 @@ -693,6 +695,8 @@ .. i386 .. + powerpc + .. sparc64 .. .. @@ -728,6 +732,8 @@ .. i386 .. + powerpc + .. sparc64 .. .. @@ -802,6 +808,8 @@ .. i386 .. + powerpc + .. sparc64 .. .. @@ -1023,6 +1031,8 @@ .. lt_LT.UTF-8 .. + mn_MN.UTF-8 + .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#11 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.304 2006/07/25 05:13:52 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.306 2006/10/01 13:14:07 joel Exp $ Supported Devices @@ -686,8 +686,12 @@ &hwlist.snd.emu10k1; + &hwlist.snd.emu10kx; + &hwlist.snd.envy24; + &hwlist.snd.envy24ht; + &hwlist.snd.es137x; &hwlist.snd.ess; @@ -696,6 +700,8 @@ &hwlist.snd.gusc; + &hwlist.snd.hda; + &hwlist.snd.ich; &hwlist.snd.maestro; @@ -710,6 +716,8 @@ &hwlist.snd.solo; + &hwlist.snd.spicds; + &hwlist.snd.t4dwave; &hwlist.snd.via8233; ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#20 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.975 2006/09/16 03:58:07 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.978 2006/10/07 14:49:45 bmah Exp $ 2000 @@ -212,6 +212,17 @@ has been fixed. For more details, see security advisory FreeBSD-SA-06:20.bind. &merged; + Several programming errors have been fixed in &man.gzip.1;. + They could have the effect of causing a crash or an infinite + loop when decompressing files. More information can be found in + security advisory + FreeBSD-SA-06:21.gzip. &merged; + + Multiple errors in the OpenSSL &man.crypto.3; library have + been fixed. Potential effects are varied, and are documented in + more detail in security advisory + FreeBSD-SA-06:23.openssl. &merged; + @@ -766,17 +777,18 @@ This feature can be re-enabled by using a new sysctl variable net.inet6.ip6.mcast_pmtu. &merged; + IPv6 link-local addresses are now enabled only + if ipv6_enable is set in &man.rc.conf.5;. + &merged; + The &man.ipfw.4; IP packet filter now supports IPv6. &merged; - The &man.ipfw.4; firewall system now supports substitution of the action - argument with the value obtained from table lookup, - which allows some optimization of rulesets. - This is now applicable only to pipe, - queue, - divert, - tee, - netgraph, - and ngtee rules. &merged; + The &man.ipfw.4; firewall system now supports + a tablearg feature, which allows + values obtained from a table lookup to be used as part of a + rule. &merged; + This feature can be used to optimize some rulesets + or to implement policy-based routing inside a firewall. For example, the following rules will throw different packets to different pipes: @@ -794,7 +806,7 @@ The tag acts as an internal marker (it is not sent out over the wire) that can be used to identify these packets later on, for example, by using tagged - rule option. For more details, see &man.ipfw.8;. + rule option. For more details, see &man.ipfw.8;. &merged; The IPFIREWALL_FORWARD_EXTENDED kernel option has been removed. This option was used to permit @@ -812,6 +824,10 @@ The &man.ng.iface.4; Netgraph node now supports &man.altq.4;. &merged; + The &man.ng.tag.4; Netgraph node has been added to + support the manipulation of mbuf tags attached to data in the + kernel. &merged; + A bug has been fixed in which NFS over TCP would not reconnect when the server sent a FIN. This problem had occurred with Solaris NFS servers. &merged; @@ -1180,6 +1196,10 @@ The &man.id.1; utility now prints the effective user ID after the group ID. + The &man.id.1; utility now supports a + flag to print process audit properties, including the audit user + id. &merged; + The &man.ifconfig.8; utility now supports a flag to allow printing potentially sensitive keying material to standard output. @@ -1444,6 +1464,11 @@ flag to suppress header lines when multiple files are specified. &merged; + The version of tcpslice in the &os; base system has been + removed due to obsolescence. A more up-to-date version can be + found in the Ports Collection + as net/tcpslice. + The &man.time.1; utility now prints the time that a given command has been running if sent a SIGINFO signal. @@ -1485,6 +1510,9 @@ implemented. This function is popular in Microsoft and GNU systems. + The compiler toolchain is now capable of generating + executables for systems using the ARM processor. + <filename>/etc/rc.d</filename> Scripts @@ -1630,10 +1658,10 @@ NetBSD as of 31 August 2006. &merged; OpenSSH has been updated from - 4.2p1 to 4.3p1. + 4.2p1 to 4.4p1. &merged; OpenSSL has been updated from - 0.9.7e to 0.9.8b. + 0.9.7e to 0.9.8d. hostapd has been updated from version 0.3.9 to version 0.4.8. @@ -1653,7 +1681,7 @@ snapshot from OpenBSD as of 20060831. TrustedBSD OpenBSM, - version 1.0 alpha 10, an implementation of the documented Sun Basic + version 1.0 alpha 12, an implementation of the documented Sun Basic Security Module (BSM) Audit API and file format, as well as local extensions to support the Mac OS X and &os; operating systems has been added. This also includes command line tools for audit @@ -1825,7 +1853,7 @@ The supported version of the KDE desktop environment (x11/kde3) has been - updated from 3.4.2 to 3.5.3. &merged; + updated from 3.4.2 to 3.5.4. &merged; The supported Linux emulation now uses the libraries in the ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#14 (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.88 2006/07/31 17:04:28 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.90 2006/10/01 13:14:07 joel Exp $ # # @@ -116,11 +116,14 @@ snd_csa i386,amd64 snd_ds1 i386,amd64 snd_emu10k1 i386,amd64 +snd_emu10kx i386,amd64 snd_envy24 i386,amd64 +snd_envy24ht i386,amd64 snd_es137x i386,sparc64,amd64 snd_ess i386,amd64 snd_fm801 i386,amd64 snd_gusc i386,amd64 +snd_hda i386,amd64 snd_ich i386,amd64 snd_maestro i386,alpha,amd64 snd_maestro3 i386,alpha,amd64 @@ -128,6 +131,7 @@ snd_neomagic i386,amd64 snd_sbc i386,alpha,amd64 snd_solo i386,amd64 +snd_spicds i386,amd64 snd_t4dwave i386,amd64 snd_via8233 i386,amd64 snd_via82c686 i386,amd64 From owner-p4-projects@FreeBSD.ORG Sat Oct 7 21:40:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AAC316A417; Sat, 7 Oct 2006 21:40:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA4B316A412 for ; Sat, 7 Oct 2006 21:40:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D401143D6A for ; Sat, 7 Oct 2006 21:40:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97LejKS064142 for ; Sat, 7 Oct 2006 21:40:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97Leid2064135 for perforce@freebsd.org; Sat, 7 Oct 2006 21:40:44 GMT (envelope-from jb@freebsd.org) Date: Sat, 7 Oct 2006 21:40:44 GMT Message-Id: <200610072140.k97Leid2064135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 21:40:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=107457 Change 107457 by jb@jb_freebsd7 on 2006/10/07 21:40:24 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#25 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#13 integrate .. //depot/projects/dtrace/ports/MOVED#20 integrate .. //depot/projects/dtrace/ports/Mk/bsd.database.mk#4 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#9 integrate .. //depot/projects/dtrace/ports/Mk/bsd.tcl.mk#2 integrate .. //depot/projects/dtrace/ports/UPDATING#14 integrate .. //depot/projects/dtrace/src/Makefile.inc1#19 integrate .. //depot/projects/dtrace/src/bin/cp/utils.c#5 integrate .. //depot/projects/dtrace/src/bin/sh/jobs.c#3 integrate .. //depot/projects/dtrace/src/bin/sh/jobs.h#3 integrate .. //depot/projects/dtrace/src/bin/sh/main.c#3 integrate .. //depot/projects/dtrace/src/bin/sh/sh.1#6 integrate .. //depot/projects/dtrace/src/etc/network.subr#7 integrate .. //depot/projects/dtrace/src/etc/rc.d/Makefile#8 integrate .. //depot/projects/dtrace/src/etc/rc.d/auto_linklocal#1 branch .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#12 integrate .. //depot/projects/dtrace/src/lib/libc/sys/aio_return.2#3 integrate .. //depot/projects/dtrace/src/lib/libc/sys/lio_listio.2#3 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 integrate .. //depot/projects/dtrace/src/secure/usr.bin/sftp/Makefile#4 integrate .. //depot/projects/dtrace/src/share/man/man4/aue.4#3 integrate .. //depot/projects/dtrace/src/share/man/man4/kue.4#3 integrate .. //depot/projects/dtrace/src/share/man/man4/ural.4#3 integrate .. //depot/projects/dtrace/src/share/man/man4/uscanner.4#5 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/dtrace/src/share/timedef/da_DK.ISO8859-1.src#3 integrate .. //depot/projects/dtrace/src/share/timedef/da_DK.UTF-8.src#3 integrate .. //depot/projects/dtrace/src/sys/boot/i386/pxeldr/pxeboot.8#3 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_cdce.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_ural.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/usb/umass.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uscanner.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/dtrace/www/en/cgi/Makefile#4 integrate .. //depot/projects/dtrace/www/en/cgi/dosendpr.cgi#2 integrate .. //depot/projects/dtrace/www/en/cgi/html.pl#2 delete .. //depot/projects/dtrace/www/en/docs/books.sgml#5 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#13 integrate .. //depot/projects/dtrace/www/en/projects/c99/index.sgml#4 integrate .. //depot/projects/dtrace/www/en/releases/4.11R/errata.html#5 integrate .. //depot/projects/dtrace/www/en/releases/5.5R/errata.html#6 integrate .. //depot/projects/dtrace/www/en/releases/6.1R/errata.html#7 integrate .. //depot/projects/dtrace/www/en/send-pr.sgml#3 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#25 (text+ko) ==== @@ -1,7 +1,7 @@ Using wxWidgets If your port uses wxWidgets - cross-platform toolkit, define USE_WX=yes. - A specific version can be requested by setting + cross-platform toolkit, define USE_WX. + A specific version must be requested by setting USE_WX=2.6. Ranges (2.4-2.6) and partial ranges (-2.4, 2.6+) are also possible. @@ -6248,8 +6248,8 @@ are absolute resulting in --with-wx-config=${WX_CONFIG}, and relative resulting in - --with-wx=${X11BASE} being added to configure - script arguments. + --with-wx=${X11BASE} --with-wx-config=${WX_CONFIG} + being added to configure script arguments. Define WX_UNICODE=yes if your port needs the Unicode version of the wxWidgets libraries. @@ -10222,6 +10222,27 @@ special need. + + Rerolling distfiles + + Sometimes the authors of software change the content of + released distfiles without changing the file's name. You have + to verify that the changes are official and have been performed + by the author. It has happened in the past that the distfile + was silently altered on the download servers with the intent + to cause harm or compromise end user security. + + Put the old distfile aside, download the new one, unpack + them and compare the content with &man.diff.1;. If you see + nothing suspicious, you can update distinfo. + Be sure to summarize the differences in your PR or commit log, + so that other people know that you have taken care to ensure + that nothing bad has happened. + + You might also want to contact the authors of the software + and confirm the changes with them. + + Necessary workarounds ==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#13 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.399 2006/10/01 13:11:22 joel Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.400 2006/10/07 14:37:57 bmah Exp $ --> @@ -3495,6 +3495,7 @@ + ==== //depot/projects/dtrace/ports/MOVED#20 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1151 2006/10/06 20:48:15 joerg Exp $ +# $FreeBSD: ports/MOVED,v 1.1155 2006/10/07 20:10:33 alepulver Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2197,7 +2197,6 @@ audio/musicbrainz||2006-03-15|Remove expired port graphics/quickpics||2006-03-15|Remove expired port graphics/threeDS||2006-03-15|Remove expired port -graphics/vid||2006-03-15|Remove expired port graphics/smoke||2006-03-15|Remove expired port misc/globus2||2006-03-15|Remove expired port sysutils/prune||2006-03-15|Remove expired port @@ -2485,3 +2484,6 @@ math/ufspase|math/suitespase|2006-10-05|portname has been changed devel/avr-gcc|devel/avr-gcc-3|2006-10-05|retire AVR-GCC 3.x devel/avr-gcc-devel|devel/avr-gcc|2006-10-06|make AVR-GCC 4.x the default version +astro/gdesklets-goodweather||2006-10-07|Expired: no longer downloadable +deskutils/goats||2006-10-07|Expired: no longer downloadable +net-mgmt/arpwatch-devel|net-mgmt/arpwatch|2006-10-07|Devel port no longer needed ==== //depot/projects/dtrace/ports/Mk/bsd.database.mk#4 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.15 2006/09/30 19:25:45 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.16 2006/10/07 10:22:24 miwi Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -51,33 +51,38 @@ # - Detected PostgreSQL version. ## # USE_BDB - Add Berkeley DB library dependency. -# If no version is given (by the maintainer via the port or -# by the user via defined variable), try to find the -# currently installed version. Fall back to default if -# necessary (db41+). -# INVALID_BDB_VER - This variable can be defined when the port doesn't -# support one or more versions of Berkeley DB. -# WANT_BDB_VER - Maintainer can set a version of Berkeley DB to always -# build this port with (overrides WITH_BDB_VER). -# WITH_BDB_VER - User defined global variable to set Berkeley DB version -# _WITH_BDB_VER - User defined port specific variable to set -# Berkeley DB version -# WITH_BDB_HIGHEST - Use the highest installed version of Berkeley DB -# BDB_LIB_NAME - This variable is automatically set to the name of the -# Berkeley DB library (default: db41) -# BDB_LIB_CXX_NAME - This variable is automatically set to the name of the -# Berkeley DB c++ library (default: db41_cxx) -# BDB_INCLUDE_DIR - This variable is automatically set to the location of -# the Berkeley DB include directory. -# (default: ${LOCALBASE}/include/db41) -# BDB_LIB_DIR - This variable is automatically set to the location of -# the Berkeley DB library directory. +# If no version is given (by the maintainer via the port or +# by the user via defined variable), try to find the +# currently installed version. Fall back to default if +# necessary (db41+). +# INVALID_BDB_VER +# - This variable can be defined when the port doesn't +# support one or more versions of Berkeley DB. +# WANT_BDB_VER - Maintainer can set a version of Berkeley DB to always +# build this port with (overrides WITH_BDB_VER). +# WITH_BDB_VER - User defined global variable to set Berkeley DB version +# _WITH_BDB_VER +# - User defined port specific variable to set +# Berkeley DB version +# WITH_BDB_HIGHEST +# - Use the highest installed version of Berkeley DB +# BDB_LIB_NAME - This variable is automatically set to the name of the +# Berkeley DB library (default: db41) +# BDB_LIB_CXX_NAME +# - This variable is automatically set to the name of the +# Berkeley DB c++ library (default: db41_cxx) +# BDB_INCLUDE_DIR +# - This variable is automatically set to the location of +# the Berkeley DB include directory. +# (default: ${LOCALBASE}/include/db41) +# BDB_LIB_DIR - This variable is automatically set to the location of +# the Berkeley DB library directory. # BDB_VER - Detected Berkeley DB version. ## # USE_SQLITE - Add dependency on sqlite library. Valid values are: # 3 and 2. If version is not specified directly then # sqlite3 is used (if USE_SQLITE= yes). -# SQLITE_VER - Detected sqlite version. +# SQLITE_VER - Detected sqlite version. ## # USE_FIREBIRD - Add dependency on Firebird library. Valid values are: # 2 and 1. If no version is given by the maintainer (if @@ -85,7 +90,7 @@ # WITH_FIREBIRD_VER variable, fall back to default "2". # WITH_FIREBIRD_VER # - User defined variable to set Firebird version. -# FIREBIRD_VER - Detected Firebird version. +# FIREBIRD_VER - Detected Firebird version. .if defined(USE_MYSQL) DEFAULT_MYSQL_VER?= 50 ==== //depot/projects/dtrace/ports/Mk/bsd.sites.mk#9 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.399 2006/10/05 17:26:10 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.400 2006/10/07 17:47:05 dinoex Exp $ # # Where to put distfiles that don't have any other master site @@ -455,7 +455,7 @@ .if !defined(IGNORE_MASTER_SITE_GNUSTEP) MASTER_SITE_GNUSTEP+= \ http://downloads.planetmirror.com/pub/gnustep/gnustep/%SUBDIR%/ \ - http://public.planetmirror.com/pub/gnustep/gnustep/%SUBDIR%/ \ + ftp://ftp.planetmirror.com/pub/gnustep/gnustep/%SUBDIR%/ \ ftp://ftp.gnustep.org/pub/gnustep/%SUBDIR%/ \ ftp://ftp.easynet.nl/mirror/GNUstep/pub/gnustep/%SUBDIR%/ .endif ==== //depot/projects/dtrace/ports/Mk/bsd.tcl.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.tcl.mk,v 1.3 2006/05/01 19:49:57 sem Exp $ +# $FreeBSD: ports/Mk/bsd.tcl.mk,v 1.4 2006/10/07 10:24:57 miwi Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Tcl_Pre_Include) @@ -9,37 +9,40 @@ Tcl_Pre_Include= bsd.tcl.mk Tcl_Include_MAINTAINER= ports@FreeBSD.org -# USE_TCL: Depend on tcl to run. In case of incompatible APIs of different -# TCL versions the version can be specified directly. If version -# is not specified (USE_TCL=yes) then the latest version is -# used (8.4 currently). -# Available values are: 84, 83, 82, 81 and 80. +# USE_TCL - Depend on tcl to run. In case of incompatible APIs of +# different TCL versions the version can be specified directly. +# If version is not specified (USE_TCL=yes) then the latest +# version is used (8.4 currently). +# Available values are: 84, 83, 82, 81 and 80. # -# USE_TK: Depend on tk to run. In case of incompatible APIs of different -# TK versions the version can be specified directly. If version -# is not specified (USE_TK=yes) then the latest version is -# used (8.4 currently). -# Available values are: 84, 83, 82, 81 and 80. +# USE_TK - Depend on tk to run. In case of incompatible APIs of different +# TK versions the version can be specified directly. If version +# is not specified (USE_TK=yes) then the latest version is +# used (8.4 currently). +# Available values are: 84, 83, 82, 81 and 80. ## -# TCL_LIBDIR: Path where tcl libraries can be found +# TCL_LIBDIR - Path where tcl libraries can be found # -# TCL_INCLUDEDIR: Path where tcl C headers can be found +# TCL_INCLUDEDIR +# - Path where tcl C headers can be found ## -# TK_LIBDIR: Path where tk libraries can be found +# TK_LIBDIR - Path where tk libraries can be found # -# TK_INCLUDEDIR: Path where tk C headers can be found +# TK_INCLUDEDIR - Path where tk C headers can be found ## -# TCLSH: Path to tclsh executable respecting tcl version +# TCLSH - Path to tclsh executable respecting tcl version # -# WISH: Path to wish executable respecting tk version +# WISH - Path to wish executable respecting tk version ## -# PATCH_TCL_SCRIPTS: List of tcl scripts that need to be patched to replace -# tclsh calls with tclsh${TK_VER} calls. Also note that -# post-patch target is used. +# PATCH_TCL_SCRIPTS +# - List of tcl scripts that need to be patched to replace +# tclsh calls with tclsh${TK_VER} calls. Also note that +# post-patch target is used. # -# PATCH_TK_SCRIPTS: List of tcl scripts that need to be patched to replace -# wish calls with wish${TK_VER} calls. Also note that -# post-patch target is used. +# PATCH_TK_SCRIPTS +# - List of tcl scripts that need to be patched to replace +# wish calls with wish${TK_VER} calls. Also note that +# post-patch target is used. .if defined(USE_TCL) || defined(USE_TCL_BUILD) ==== //depot/projects/dtrace/ports/UPDATING#14 (text+ko) ==== @@ -6,6 +6,22 @@ time you update your ports collection, before attempting any port upgrades. +20061007: + AFFECTS: users of security/p5-openxpki + AUTHOR: svysh@cryptocom.ru + + Old port security/p5-openxpki has been split into 8 new ports: + p5-openxpki: core for server part + p5-openxpki-client: base class for actual clients + p5-openxpki-i18n: internationalization of the user interface + p5-openxpki-client-cli: command line interface to local OpenXPKI daemon + p5-openxpki-client-html-mason: web interface to local OpenXPKI daemon + p5-openxpki-client-scep: set of SCEP tools + p5-openxpki-client-soap-lite: set of SOAP-Lite tools + p5-openxpki-deployment: set of deployment tools + + Please see security/p5-openxpki/pkg-descr for their interdependencies. + 20060926: AFFECTS: users of security/libgpg-error and any port that depends on it AUTHOR: novel@FreeBSD.org @@ -4188,4 +4204,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.399 2006/09/26 11:19:38 novel Exp $ +$FreeBSD: ports/UPDATING,v 1.400 2006/10/07 12:34:00 rafan Exp $ ==== //depot/projects/dtrace/src/Makefile.inc1#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.561 2006/10/07 19:26:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1034,60 +1034,62 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs= lib/libelf +_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ + ${_kerberos5_lib_libroken} \ + lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \ + lib/libexpat ${_lib_libgssapi} ${_lib_libipx} \ + lib/libkiconv lib/libkvm lib/libmd \ + lib/libncurses lib/libopie lib/libpam \ + lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ + ${_lib_libypclnt} lib/libz lib/msun \ + ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ + ${_secure_lib_libssl} -_generic_libs= gnu/lib - -.if ${MK_IPX} != "no" -_prebuild_libs+= lib/libipx -.endif - -.if ${MK_KERBEROS} != "no" -_prebuild_libs+= kerberos5/lib/libasn1 -_prebuild_libs+= kerberos5/lib/libkrb5 -_prebuild_libs+= kerberos5/lib/libroken -_generic_libs+= kerberos5/lib -.endif - -_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libkiconv lib/libkvm lib/libmd \ - lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ - lib/libradius \ - lib/libsbuf lib/libtacplus lib/libutil \ - lib/libz lib/msun lib/libgssapi +_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L -_generic_libs+= lib - .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" -_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl +_secure_lib_libcrypto= secure/lib/libcrypto +_secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L .if ${MK_OPENSSH} != "no" -_prebuild_libs+= secure/lib/libssh +_secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" -secure/lib/libssh__L: lib/libgssapi__L +secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ + kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \ + kerberos5/lib/libroken__L +.endif .endif .endif +_secure_lib= secure/lib .endif -_generic_libs+= secure/lib + +.if ${MK_IPX} != "no" +_lib_libipx= lib/libipx .endif -.if ${MK_OPENSSL} == "no" -lib/libradius__L: lib/libmd__L +.if ${MK_KERBEROS} != "no" +_kerberos5_lib= kerberos5/lib +_kerberos5_lib_libasn1= kerberos5/lib/libasn1 +_kerberos5_lib_libkrb5= kerberos5/lib/libkrb5 +_kerberos5_lib_libroken= kerberos5/lib/libroken +_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" -_prebuild_libs+= lib/libypclnt +_lib_libypclnt= lib/libypclnt .endif .if ${MK_CDDL} != "no" _prebuild_libs+= cddl/lib .endif -_generic_libs+= usr.bin/lex/lib +.if ${MK_OPENSSL} == "no" +lib/libradius__L: lib/libmd__L +.endif .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY ==== //depot/projects/dtrace/src/bin/cp/utils.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.50 2006/10/06 08:30:33 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); #include #include @@ -54,17 +54,18 @@ #include #include "extern.h" -#define cp_pct(x,y) (int)(100.0 * (double)(x) / (double)(y)) + +#define cp_pct(x, y) ((y == 0) ? 0 : (int)(100.0 * (x) / (y))) int copy_file(const FTSENT *entp, int dne) { static char buf[MAXBSIZE]; struct stat *fs; - int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0; ssize_t wcount; size_t wresid; off_t wtotal; + int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0; char *bufp; #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED char *p; @@ -149,16 +150,17 @@ for (bufp = p, wresid = fs->st_size; ; bufp += wcount, wresid -= (size_t)wcount) { wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; wtotal += wcount; if (info) { info = 0; (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); } - if (wcount >= (ssize_t)wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid) break; } if (wcount != (ssize_t)wresid) { @@ -179,16 +181,17 @@ for (bufp = buf, wresid = rcount; ; bufp += wcount, wresid -= wcount) { wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; wtotal += wcount; if (info) { info = 0; (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); } - if (wcount >= (ssize_t)wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid) break; } if (wcount != (ssize_t)wresid) { ==== //depot/projects/dtrace/src/bin/sh/jobs.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.71 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.72 2006/10/07 16:51:16 stefanf Exp $"); #include #include @@ -98,7 +98,7 @@ STATIC void deljob(struct job *); STATIC struct job *getcurjob(struct job *); #endif -STATIC void showjob(struct job *, pid_t, int, int); +STATIC void showjob(struct job *, pid_t, int); /* @@ -265,18 +265,21 @@ jobscmd(int argc, char *argv[]) { char *id; - int ch, sformat, lformat; + int ch, mode; optind = optreset = 1; opterr = 0; - sformat = lformat = 0; - while ((ch = getopt(argc, argv, "ls")) != -1) { + mode = SHOWJOBS_DEFAULT; + while ((ch = getopt(argc, argv, "lps")) != -1) { switch (ch) { case 'l': - lformat = 1; + mode = SHOWJOBS_VERBOSE; + break; + case 'p': + mode = SHOWJOBS_PGIDS; break; case 's': - sformat = 1; + mode = SHOWJOBS_PIDS; break; case '?': default: @@ -287,24 +290,25 @@ argv += optind; if (argc == 0) - showjobs(0, sformat, lformat); + showjobs(0, mode); else while ((id = *argv++) != NULL) - showjob(getjob(id), 0, sformat, lformat); + showjob(getjob(id), 0, mode); return (0); } STATIC void -showjob(struct job *jp, pid_t pid, int sformat, int lformat) +showjob(struct job *jp, pid_t pid, int mode) { char s[64]; struct procstat *ps; struct job *j; int col, curr, i, jobno, prev, procno; + pid_t ppid; char c; - procno = jp->nprocs; + procno = (mode == SHOWJOBS_PGIDS) ? 1 : jp->nprocs; jobno = jp - jobtab + 1; curr = prev = 0; #if JOBS @@ -315,11 +319,13 @@ } #endif for (ps = jp->ps ; ; ps++) { /* for each process */ - if (sformat) { - out1fmt("%d\n", (int)ps->pid); + if (mode == SHOWJOBS_PIDS || mode == SHOWJOBS_PGIDS) { + ppid = (mode == SHOWJOBS_PIDS) ? ps->pid : + getpgid(ps->pid); + out1fmt("%d\n", (int)ppid); goto skip; } - if (!lformat && ps != jp->ps && pid == 0) + if (mode != SHOWJOBS_VERBOSE && ps != jp->ps && pid == 0) goto skip; if (pid != 0 && pid != ps->pid) goto skip; @@ -335,7 +341,7 @@ fmtstr(s, 64, " %c ", c); out1str(s); col = strlen(s); - if (lformat) { + if (mode == SHOWJOBS_VERBOSE) { fmtstr(s, 64, "%d ", (int)ps->pid); out1str(s); col += strlen(s); @@ -388,7 +394,7 @@ */ void -showjobs(int change, int sformat, int lformat) +showjobs(int change, int mode) { int jobno; struct job *jp; @@ -404,7 +410,7 @@ } if (change && ! jp->changed) continue; - showjob(jp, 0, sformat, lformat); + showjob(jp, 0, mode); jp->changed = 0; if (jp->state == JOBDONE) { freejob(jp); @@ -992,7 +998,7 @@ out1str(" (core dumped)"); out1c('\n'); } else - showjob(thisjob, pid, 0, 0); + showjob(thisjob, pid, SHOWJOBS_DEFAULT); } } else { TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job)); ==== //depot/projects/dtrace/src/bin/sh/jobs.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)jobs.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/jobs.h,v 1.18 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/jobs.h,v 1.19 2006/10/07 16:51:16 stefanf Exp $ */ /* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */ @@ -74,6 +74,13 @@ #endif }; +enum { + SHOWJOBS_DEFAULT, /* job number, status, command */ + SHOWJOBS_VERBOSE, /* job number, PID, status, command */ + SHOWJOBS_PIDS, /* PID only */ + SHOWJOBS_PGIDS /* PID of the group leader only */ +}; + extern pid_t backgndpid; /* pid of last background process */ extern int job_warning; /* user was warned about stopped jobs */ extern int in_waitcmd; /* are we in waitcmd()? */ @@ -84,7 +91,7 @@ int fgcmd(int, char **); int bgcmd(int, char **); int jobscmd(int, char **); -void showjobs(int, int, int); +void showjobs(int, int); int waitcmd(int, char **); int jobidcmd(int, char **); struct job *makejob(union node *, int); ==== //depot/projects/dtrace/src/bin/sh/main.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.28 2006/04/02 18:51:32 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.29 2006/10/07 16:51:16 stefanf Exp $"); #include #include @@ -211,7 +211,7 @@ inter = 0; if (iflag && top) { inter++; - showjobs(1, 0, 0); + showjobs(1, SHOWJOBS_DEFAULT); chkmail(0); flushout(&output); } ==== //depot/projects/dtrace/src/bin/sh/sh.1#6 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.123 2006/09/17 17:40:07 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.124 2006/10/07 16:51:16 stefanf Exp $ .\" -.Dd July 29, 2006 +.Dd October 7, 2006 .Dt SH 1 .Os .Sh NAME @@ -1777,7 +1777,7 @@ If the .Ar job argument is omitted, use the current job. -.It Ic jobs Oo Fl ls Oc Op Ar job ... +.It Ic jobs Oo Fl lps Oc Op Ar job ... Print information about the specified jobs, or all jobs if no .Ar job argument is given. @@ -1787,8 +1787,13 @@ .Fl l option is specified, the PID of each job is also printed. If the +.Fl p +option is specified, only the process IDs for the process group leaders +are printed, one per line. +If the .Fl s -option is specified, only the PIDs of the jobs are printed, one per line. +option is specified, only the PIDs of the job commands are printed, one per +line. .It Ic local Oo Ar variable ... Oc Op Fl See the .Sx Functions ==== //depot/projects/dtrace/src/etc/network.subr#7 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.174 2006/10/02 10:13:29 gnn Exp $ +# $FreeBSD: src/etc/network.subr,v 1.175 2006/10/07 15:45:56 ume Exp $ # # @@ -41,10 +41,6 @@ { _cfg=1 - if checkyesno ipv6_enable; then - ${SYSCTL_W} net.inet6.ip6.auto_linklocal=1 - fi - ifconfig_args=`ifconfig_getargs $1` if [ -n "${ifconfig_args}" ]; then ifconfig $1 up ==== //depot/projects/dtrace/src/etc/rc.d/Makefile#8 (text+ko) ==== @@ -1,11 +1,11 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.76 2006/09/07 22:25:08 emax Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.77 2006/10/07 15:45:56 ume Exp $ .include FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ - apm apmd archdep atm1 atm2 atm3 auditd \ + apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ ==== //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#12 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.226 2006/09/17 21:36:16 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.227 2006/10/07 08:29:20 phk Exp $ % ======================================================================= @@ -5192,6 +5192,22 @@ \ \ /___\/ \ \ \ \____\/ \__\/ % + THE + NORMAL + LAW OF ERROR + STANDS OUT IN THE + EXPERIENCE OF MANKIND + AS ONE OF THE BROADEST + GENERALIZATIONS OF NATURAL + PHILOSOPHY * IT SERVES AS THE + GUIDING INSTRUMENT IN RESEARCHES + IN THE PHYSICAL AND SOCIAL SCIENCES AND + IN MEDICINE, AGRICULTURE AND ENGINEERING * + IT IS AN INDISPENSABLE TOOL FOR THE ANALYSIS AND THE +INTERPRETATION OF THE BASIC DATA OBTAINED BY OBSERVATION AND EXPERIMENT + + -- W. J. Youden +% *** ******* ********* ==== //depot/projects/dtrace/src/lib/libc/sys/aio_return.2#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/aio_return.2,v 1.17 2003/01/13 10:37:11 tjr Exp $ +.\" $FreeBSD: src/lib/libc/sys/aio_return.2,v 1.19 2006/10/07 10:49:20 trhodes Exp $ .\" -.Dd June 2, 1999 +.Dd October 7, 2006 .Dt AIO_RETURN 2 .Os .Sh NAME @@ -47,10 +47,10 @@ .Fn aio_return system call should only be called once, to obtain the final status of an asynchronous -I/O operation once -.Xr aio_error 2 +I/O operation once it has completed +.Xr ( aio_error 2 returns something other than -.Er EINPROGRESS . +.Er EINPROGRESS ) . .Sh RETURN VALUES If the asynchronous I/O request has completed, the status is returned as described in @@ -58,12 +58,10 @@ .Xr write 2 , or .Xr fsync 2 . -On failure, +Otherwise, .Fn aio_return -returns -.Dv -1 -and sets -.Dv errno +returns \-1 and sets +.Va errno to indicate the error condition. .Sh ERRORS The @@ -74,7 +72,7 @@ The .Fa iocb argument -does not reference an outstanding asynchronous I/O request. +does not reference a completed asynchronous I/O request. .El .Sh SEE ALSO .Xr aio_cancel 2 , ==== //depot/projects/dtrace/src/lib/libc/sys/lio_listio.2#3 (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/libc/sys/lio_listio.2,v 1.5 2005/12/13 13:43:35 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.6 2006/10/07 05:13:32 trhodes Exp $ .\" .Dd January 12, 2003 .Dt LIO_LISTIO 2 @@ -112,7 +112,7 @@ .Dv LIO_NOWAIT , the .Fn lio_listio -function 0 if the operations are successfully queued, +function returns 0 if the operations are successfully queued, otherwise \-1. .Sh ERRORS The ==== //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.977 2006/09/28 15:36:59 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.978 2006/10/07 14:49:45 bmah Exp $ 2000 @@ -777,17 +777,18 @@ This feature can be re-enabled by using a new sysctl variable net.inet6.ip6.mcast_pmtu. &merged; + IPv6 link-local addresses are now enabled only + if ipv6_enable is set in &man.rc.conf.5;. + &merged; + The &man.ipfw.4; IP packet filter now supports IPv6. &merged; - The &man.ipfw.4; firewall system now supports substitution of the action - argument with the value obtained from table lookup, - which allows some optimization of rulesets. - This is now applicable only to pipe, - queue, - divert, - tee, - netgraph, - and ngtee rules. &merged; + The &man.ipfw.4; firewall system now supports + a tablearg feature, which allows + values obtained from a table lookup to be used as part of a + rule. &merged; + This feature can be used to optimize some rulesets + or to implement policy-based routing inside a firewall. For example, the following rules will throw different packets to different pipes: @@ -805,7 +806,7 @@ The tag acts as an internal marker (it is not sent out over the wire) that can be used to identify these packets later on, for example, by using tagged - rule option. For more details, see &man.ipfw.8;. + rule option. For more details, see &man.ipfw.8;. &merged; The IPFIREWALL_FORWARD_EXTENDED kernel option has been removed. This option was used to permit @@ -823,6 +824,10 @@ The &man.ng.iface.4; Netgraph node now supports &man.altq.4;. &merged; + The &man.ng.tag.4; Netgraph node has been added to + support the manipulation of mbuf tags attached to data in the + kernel. &merged; + A bug has been fixed in which NFS over TCP would not reconnect when the server sent a FIN. This problem had occurred with Solaris NFS servers. &merged; @@ -1653,10 +1658,10 @@ NetBSD as of 31 August 2006. &merged; OpenSSH has been updated from - 4.2p1 to 4.3p1. + 4.2p1 to 4.4p1. &merged; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 7 23:03: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 D5DB816A47E; Sat, 7 Oct 2006 23:03:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8DEF016A47B for ; Sat, 7 Oct 2006 23:03:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 288B643D45 for ; Sat, 7 Oct 2006 23:03:49 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97N3nJE028513 for ; Sat, 7 Oct 2006 23:03:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97N3Uk0028297 for perforce@freebsd.org; Sat, 7 Oct 2006 23:03:30 GMT (envelope-from marcel@freebsd.org) Date: Sat, 7 Oct 2006 23:03:30 GMT Message-Id: <200610072303.k97N3Uk0028297@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 107460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 23:03:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=107460 Change 107460 by marcel@marcel_nfs on 2006/10/07 23:02:31 IFC @107454 Affected files ... .. //depot/projects/busdma/Makefile#4 integrate .. //depot/projects/busdma/amd64/acpica/madt.c#2 integrate .. //depot/projects/busdma/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/busdma/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/busdma/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/busdma/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/busdma/amd64/amd64/machdep.c#4 integrate .. //depot/projects/busdma/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/busdma/amd64/amd64/nexus.c#2 integrate .. //depot/projects/busdma/amd64/amd64/pmap.c#4 integrate .. //depot/projects/busdma/amd64/amd64/support.S#2 integrate .. //depot/projects/busdma/amd64/amd64/trap.c#3 integrate .. //depot/projects/busdma/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/busdma/amd64/conf/GENERIC#5 integrate .. //depot/projects/busdma/amd64/conf/NOTES#5 integrate .. //depot/projects/busdma/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/busdma/amd64/ia32/ia32_sigtramp.S#2 integrate .. //depot/projects/busdma/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/busdma/amd64/include/clock.h#3 integrate .. //depot/projects/busdma/amd64/include/elf.h#2 integrate .. //depot/projects/busdma/amd64/include/pmap.h#2 integrate .. //depot/projects/busdma/amd64/include/specialreg.h#2 integrate .. //depot/projects/busdma/amd64/include/stdarg.h#2 integrate .. //depot/projects/busdma/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/busdma/amd64/isa/clock.c#2 integrate .. //depot/projects/busdma/amd64/linux32/linux.h#2 integrate .. //depot/projects/busdma/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/busdma/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/busdma/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/busdma/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/busdma/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/busdma/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/busdma/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/busdma/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/busdma/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/busdma/arm/arm/cpufunc.c#2 integrate .. //depot/projects/busdma/arm/arm/db_trace.c#2 integrate .. //depot/projects/busdma/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/busdma/arm/arm/fusu.S#2 integrate .. //depot/projects/busdma/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/busdma/arm/arm/identcpu.c#2 integrate .. //depot/projects/busdma/arm/arm/in_cksum.c#2 integrate .. //depot/projects/busdma/arm/arm/mem.c#2 integrate .. //depot/projects/busdma/arm/arm/pmap.c#3 integrate .. //depot/projects/busdma/arm/arm/trap.c#2 integrate .. //depot/projects/busdma/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/busdma/arm/at91/at91.c#3 integrate .. //depot/projects/busdma/arm/at91/at91_pio.c#3 integrate .. //depot/projects/busdma/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/busdma/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/busdma/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/busdma/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/busdma/arm/at91/at91_spi.c#2 integrate .. //depot/projects/busdma/arm/at91/at91_spiio.h#2 delete .. //depot/projects/busdma/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/busdma/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/busdma/arm/at91/at91_st.c#3 integrate .. //depot/projects/busdma/arm/at91/at91_twi.c#2 integrate .. //depot/projects/busdma/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/busdma/arm/at91/files.at91#3 integrate .. //depot/projects/busdma/arm/at91/if_ate.c#3 integrate .. //depot/projects/busdma/arm/at91/if_atereg.h#2 integrate .. //depot/projects/busdma/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/busdma/arm/at91/std.at91#2 integrate .. //depot/projects/busdma/arm/at91/std.kb920x#2 integrate .. //depot/projects/busdma/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/busdma/arm/conf/EP80219#1 branch .. //depot/projects/busdma/arm/conf/KB920X#3 integrate .. //depot/projects/busdma/arm/include/armreg.h#2 integrate .. //depot/projects/busdma/arm/include/asm.h#2 integrate .. //depot/projects/busdma/arm/include/clock.h#2 integrate .. //depot/projects/busdma/arm/include/cpuconf.h#3 integrate .. //depot/projects/busdma/arm/include/cpufunc.h#3 integrate .. //depot/projects/busdma/arm/include/db_machdep.h#2 integrate .. //depot/projects/busdma/arm/include/elf.h#2 integrate .. //depot/projects/busdma/arm/include/gdb_machdep.h#1 branch .. //depot/projects/busdma/arm/include/pmap.h#3 integrate .. //depot/projects/busdma/arm/include/sf_buf.h#2 integrate .. //depot/projects/busdma/arm/include/stdarg.h#2 integrate .. //depot/projects/busdma/arm/include/vmparam.h#2 integrate .. //depot/projects/busdma/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/busdma/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/busdma/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/busdma/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/busdma/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/busdma/arm/xscale/i80321/i80321_intr.h#2 integrate .. //depot/projects/busdma/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/busdma/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/busdma/arm/xscale/i80321/i80321reg.h#2 integrate .. //depot/projects/busdma/arm/xscale/i80321/i80321var.h#2 integrate .. //depot/projects/busdma/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/busdma/arm/xscale/i80321/iq80321.c#3 integrate .. //depot/projects/busdma/arm/xscale/i80321/iq80321reg.h#2 integrate .. //depot/projects/busdma/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/busdma/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/busdma/boot/Makefile#3 integrate .. //depot/projects/busdma/boot/arm/Makefile#1 branch .. //depot/projects/busdma/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/busdma/boot/arm/at91/boot0/Makefile#2 integrate .. //depot/projects/busdma/boot/arm/at91/boot0iic/Makefile#2 integrate .. //depot/projects/busdma/boot/arm/at91/boot0iic/doit.c#2 delete .. //depot/projects/busdma/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/boot0spi/Makefile#2 integrate .. //depot/projects/busdma/boot/arm/at91/boot0spi/doit.c#2 delete .. //depot/projects/busdma/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/busdma/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/busdma/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/busdma/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/busdma/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/busdma/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/busdma/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/bootspi/Makefile#2 integrate .. //depot/projects/busdma/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/busdma/boot/arm/at91/bootspi/arm_init.s#2 delete .. //depot/projects/busdma/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/busdma/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/busdma/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/busdma/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/busdma/boot/arm/at91/bootspi/main.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/busdma/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/busdma/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/busdma/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/loader_prompt.c#2 delete .. //depot/projects/busdma/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/busdma/boot/arm/at91/libat91/mci_device.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/busdma/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/busdma/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/busdma/boot/common/help.common#2 integrate .. //depot/projects/busdma/boot/common/loader.8#3 integrate .. //depot/projects/busdma/boot/common/merge_help.awk#2 integrate .. //depot/projects/busdma/boot/common/panic.c#2 integrate .. //depot/projects/busdma/boot/ficl/Makefile#3 integrate .. //depot/projects/busdma/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/busdma/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/busdma/boot/forth/loader.conf#3 integrate .. //depot/projects/busdma/boot/i386/Makefile.inc#2 integrate .. //depot/projects/busdma/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/busdma/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/busdma/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/busdma/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/busdma/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/busdma/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/busdma/boot/i386/loader/help.i386#2 integrate .. //depot/projects/busdma/boot/i386/loader/main.c#2 integrate .. //depot/projects/busdma/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/busdma/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/busdma/boot/pc98/boot2/inode.h#2 integrate .. //depot/projects/busdma/boot/pc98/loader/main.c#2 integrate .. //depot/projects/busdma/bsm/audit.h#3 integrate .. //depot/projects/busdma/bsm/audit_internal.h#2 integrate .. //depot/projects/busdma/bsm/audit_kevents.h#3 integrate .. //depot/projects/busdma/bsm/audit_record.h#4 integrate .. //depot/projects/busdma/cam/cam_periph.c#3 integrate .. //depot/projects/busdma/cam/cam_xpt.c#4 integrate .. //depot/projects/busdma/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/busdma/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/busdma/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/busdma/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/busdma/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/busdma/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/busdma/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/busdma/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/busdma/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/busdma/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/busdma/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/busdma/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/busdma/compat/linux/linux_emul.c#1 branch .. //depot/projects/busdma/compat/linux/linux_emul.h#1 branch .. //depot/projects/busdma/compat/linux/linux_file.c#3 integrate .. //depot/projects/busdma/compat/linux/linux_futex.c#1 branch .. //depot/projects/busdma/compat/linux/linux_futex.h#1 branch .. //depot/projects/busdma/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/busdma/compat/linux/linux_misc.c#4 integrate .. //depot/projects/busdma/compat/linux/linux_signal.c#3 integrate .. //depot/projects/busdma/compat/linux/linux_socket.c#3 integrate .. //depot/projects/busdma/compat/linux/linux_stats.c#4 integrate .. //depot/projects/busdma/compat/linux/linux_time.c#1 branch .. //depot/projects/busdma/compat/linux/linux_util.c#3 integrate .. //depot/projects/busdma/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/busdma/compat/svr4/svr4_ipc.c#3 integrate .. //depot/projects/busdma/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/busdma/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/busdma/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/busdma/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/busdma/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/busdma/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/busdma/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/busdma/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/busdma/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/busdma/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/busdma/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/busdma/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/busdma/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/busdma/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/busdma/compat/svr4/syscalls.master#3 integrate .. //depot/projects/busdma/conf/Makefile.arm#3 integrate .. //depot/projects/busdma/conf/Makefile.sun4v#1 branch .. //depot/projects/busdma/conf/NOTES#5 integrate .. //depot/projects/busdma/conf/files#5 integrate .. //depot/projects/busdma/conf/files.amd64#5 integrate .. //depot/projects/busdma/conf/files.arm#3 integrate .. //depot/projects/busdma/conf/files.i386#5 integrate .. //depot/projects/busdma/conf/files.ia64#3 integrate .. //depot/projects/busdma/conf/files.pc98#4 integrate .. //depot/projects/busdma/conf/files.powerpc#3 integrate .. //depot/projects/busdma/conf/files.sun4v#1 branch .. //depot/projects/busdma/conf/kern.post.mk#3 integrate .. //depot/projects/busdma/conf/kern.pre.mk#3 integrate .. //depot/projects/busdma/conf/kmod.mk#4 integrate .. //depot/projects/busdma/conf/options#5 integrate .. //depot/projects/busdma/conf/options.amd64#3 integrate .. //depot/projects/busdma/conf/options.arm#3 integrate .. //depot/projects/busdma/conf/options.i386#4 integrate .. //depot/projects/busdma/conf/options.pc98#3 integrate .. //depot/projects/busdma/conf/options.sun4v#1 branch .. //depot/projects/busdma/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/busdma/contrib/dev/ath/freebsd/ah_if.m#3 delete .. //depot/projects/busdma/contrib/dev/ath/freebsd/ah_osdep.c#3 delete .. //depot/projects/busdma/contrib/dev/ath/freebsd/ah_osdep.h#3 delete .. //depot/projects/busdma/contrib/ia64/libuwx/src.diff#2 delete .. //depot/projects/busdma/contrib/ia64/libuwx/src/Makefile#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_ttrace.c#2 delete .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_ttrace.h#2 delete .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/busdma/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/busdma/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/busdma/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/busdma/contrib/pf/net/pf.c#2 integrate .. //depot/projects/busdma/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/busdma/crypto/sha2/sha2.c#2 integrate .. //depot/projects/busdma/crypto/via/padlock.c#3 integrate .. //depot/projects/busdma/crypto/via/padlock.h#1 branch .. //depot/projects/busdma/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/busdma/crypto/via/padlock_hash.c#1 branch .. //depot/projects/busdma/ddb/db_command.c#2 integrate .. //depot/projects/busdma/ddb/db_output.c#2 integrate .. //depot/projects/busdma/ddb/db_output.h#2 integrate .. //depot/projects/busdma/ddb/db_ps.c#3 integrate .. //depot/projects/busdma/ddb/db_thread.c#2 integrate .. //depot/projects/busdma/ddb/ddb.h#2 integrate .. //depot/projects/busdma/dev/aac/aac_cam.c#2 integrate .. //depot/projects/busdma/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/busdma/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/busdma/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi.c#4 integrate .. //depot/projects/busdma/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/busdma/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/busdma/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/busdma/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/busdma/dev/acpica/acpivar.h#3 integrate .. //depot/projects/busdma/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/busdma/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/busdma/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/busdma/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/busdma/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/busdma/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/busdma/dev/amr/amr.c#2 integrate .. //depot/projects/busdma/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/busdma/dev/arl/if_arlreg.h#2 integrate .. //depot/projects/busdma/dev/asr/MAINTAINER#2 delete .. //depot/projects/busdma/dev/ata/ata-all.c#3 integrate .. //depot/projects/busdma/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/busdma/dev/ata/ata-disk.c#2 integrate .. //depot/projects/busdma/dev/ata/ata-dma.c#2 integrate .. //depot/projects/busdma/dev/ata/ata-pci.h#3 integrate .. //depot/projects/busdma/dev/ata/ata-queue.c#2 integrate .. //depot/projects/busdma/dev/ata/ata-raid.c#2 integrate .. //depot/projects/busdma/dev/ata/ata-raid.h#2 integrate .. //depot/projects/busdma/dev/ata/ata-usb.c#2 integrate .. //depot/projects/busdma/dev/ath/ah_osdep.c#1 branch .. //depot/projects/busdma/dev/ath/ah_osdep.h#1 branch .. //depot/projects/busdma/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/busdma/dev/ath/if_ath.c#5 integrate .. //depot/projects/busdma/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/busdma/dev/ath/if_athvar.h#5 integrate .. //depot/projects/busdma/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/busdma/dev/atkbdc/atkbdc.c#3 integrate .. //depot/projects/busdma/dev/bce/if_bce.c#3 integrate .. //depot/projects/busdma/dev/bge/if_bge.c#4 integrate .. //depot/projects/busdma/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/busdma/dev/bktr/CHANGELOG.TXT#3 integrate .. //depot/projects/busdma/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/busdma/dev/bktr/bktr_i2c.h#2 integrate .. //depot/projects/busdma/dev/cs/if_cs.c#2 integrate .. //depot/projects/busdma/dev/cs/if_csvar.h#2 integrate .. //depot/projects/busdma/dev/dc/dcphy.c#3 integrate .. //depot/projects/busdma/dev/dc/if_dc.c#3 integrate .. //depot/projects/busdma/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/busdma/dev/dc/pnphy.c#2 integrate .. //depot/projects/busdma/dev/de/if_de.c#3 integrate .. //depot/projects/busdma/dev/de/if_devar.h#2 integrate .. //depot/projects/busdma/dev/digi/digi.c#3 integrate .. //depot/projects/busdma/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/busdma/dev/drm/drmP.h#2 integrate .. //depot/projects/busdma/dev/drm/drm_drv.c#2 integrate .. //depot/projects/busdma/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/busdma/dev/drm/i915_dma.c#2 integrate .. //depot/projects/busdma/dev/drm/i915_drm.h#2 integrate .. //depot/projects/busdma/dev/drm/i915_drv.h#2 integrate .. //depot/projects/busdma/dev/drm/i915_irq.c#2 integrate .. //depot/projects/busdma/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/busdma/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/busdma/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/busdma/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/busdma/dev/drm/radeon_state.c#2 integrate .. //depot/projects/busdma/dev/em/README#2 integrate .. //depot/projects/busdma/dev/em/if_em.c#3 integrate .. //depot/projects/busdma/dev/em/if_em.h#2 integrate .. //depot/projects/busdma/dev/em/if_em_hw.c#3 integrate .. //depot/projects/busdma/dev/em/if_em_hw.h#2 integrate .. //depot/projects/busdma/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/busdma/dev/en/if_en_pci.c#2 integrate .. //depot/projects/busdma/dev/en/midway.c#2 integrate .. //depot/projects/busdma/dev/exca/exca.c#2 integrate .. //depot/projects/busdma/dev/exca/excareg.h#2 integrate .. //depot/projects/busdma/dev/fb/creator.c#2 integrate .. //depot/projects/busdma/dev/fdc/fdc.c#3 integrate .. //depot/projects/busdma/dev/fe/if_fe.c#2 integrate .. //depot/projects/busdma/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/busdma/dev/gem/if_gem.c#3 integrate .. //depot/projects/busdma/dev/hme/if_hme.c#3 integrate .. //depot/projects/busdma/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/busdma/dev/ic/nec765.h#3 integrate .. //depot/projects/busdma/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/busdma/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/busdma/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/busdma/dev/iicbus/iic.c#2 integrate .. //depot/projects/busdma/dev/iicbus/iic.h#2 integrate .. //depot/projects/busdma/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/busdma/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/busdma/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/busdma/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/busdma/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/busdma/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/busdma/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/busdma/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/busdma/dev/ipmi/ipmi_acpi.c#1 branch .. //depot/projects/busdma/dev/ipmi/ipmi_isa.c#1 branch .. //depot/projects/busdma/dev/ipmi/ipmi_kcs.c#1 branch .. //depot/projects/busdma/dev/ipmi/ipmi_pci.c#2 integrate .. //depot/projects/busdma/dev/ipmi/ipmi_smbios.c#2 integrate .. //depot/projects/busdma/dev/ipmi/ipmi_smbus.c#1 branch .. //depot/projects/busdma/dev/ipmi/ipmi_smic.c#1 branch .. //depot/projects/busdma/dev/ipmi/ipmi_ssif.c#1 branch .. //depot/projects/busdma/dev/ipmi/ipmivars.h#2 integrate .. //depot/projects/busdma/dev/ips/ips.c#3 integrate .. //depot/projects/busdma/dev/ips/ips.h#2 integrate .. //depot/projects/busdma/dev/ips/ipsreg.h#2 integrate .. //depot/projects/busdma/dev/isp/isp.c#3 integrate .. //depot/projects/busdma/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/busdma/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/busdma/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/busdma/dev/isp/isp_library.c#2 integrate .. //depot/projects/busdma/dev/isp/isp_pci.c#4 integrate .. //depot/projects/busdma/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/busdma/dev/isp/isp_target.c#2 integrate .. //depot/projects/busdma/dev/isp/isp_target.h#2 integrate .. //depot/projects/busdma/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/busdma/dev/isp/ispvar.h#4 integrate .. //depot/projects/busdma/dev/ispfw/asm_1040.h#2 integrate .. //depot/projects/busdma/dev/ispfw/asm_1080.h#2 integrate .. //depot/projects/busdma/dev/ispfw/asm_12160.h#2 integrate .. //depot/projects/busdma/dev/ispfw/asm_2400.h#1 branch .. //depot/projects/busdma/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/busdma/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/busdma/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/busdma/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/busdma/dev/lge/if_lge.c#3 integrate .. //depot/projects/busdma/dev/lge/if_lgereg.h#3 integrate .. //depot/projects/busdma/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/busdma/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/busdma/dev/mfi/mfi.c#4 integrate .. //depot/projects/busdma/dev/mfi/mfi_debug.c#1 branch .. //depot/projects/busdma/dev/mfi/mfireg.h#3 integrate .. //depot/projects/busdma/dev/mfi/mfivar.h#3 integrate .. //depot/projects/busdma/dev/mii/brgphy.c#4 integrate .. //depot/projects/busdma/dev/mii/gentbi.c#1 branch .. //depot/projects/busdma/dev/mii/ip1000phy.c#1 branch .. //depot/projects/busdma/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/busdma/dev/mii/miidevs#2 integrate .. //depot/projects/busdma/dev/mii/rgephy.c#4 integrate .. //depot/projects/busdma/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/busdma/dev/mpt/mpt.c#4 integrate .. //depot/projects/busdma/dev/mpt/mpt.h#5 integrate .. //depot/projects/busdma/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/busdma/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/busdma/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/busdma/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/busdma/dev/mpt/mpt_raid.h#3 integrate .. //depot/projects/busdma/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/busdma/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/busdma/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/busdma/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/busdma/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/busdma/dev/my/if_my.c#3 integrate .. //depot/projects/busdma/dev/my/if_myreg.h#2 integrate .. //depot/projects/busdma/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/busdma/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/busdma/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/busdma/dev/nge/if_nge.c#3 integrate .. //depot/projects/busdma/dev/nge/if_ngereg.h#3 integrate .. //depot/projects/busdma/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/busdma/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/busdma/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/busdma/dev/pccard/pccarddevs#3 integrate .. //depot/projects/busdma/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/busdma/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/busdma/dev/pccbb/pccbbreg.h#2 integrate .. //depot/projects/busdma/dev/pci/pci.c#3 integrate .. //depot/projects/busdma/dev/pci/pci_user.c#2 integrate .. //depot/projects/busdma/dev/pci/pcivar.h#2 integrate .. //depot/projects/busdma/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/busdma/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/busdma/dev/puc/pucdata.c#4 integrate .. //depot/projects/busdma/dev/ral/rt2560.c#3 integrate .. //depot/projects/busdma/dev/random/probe.c#2 integrate .. //depot/projects/busdma/dev/re/if_re.c#4 integrate .. //depot/projects/busdma/dev/scc/scc_core.c#2 integrate .. //depot/projects/busdma/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/busdma/dev/sio/sio.c#4 integrate .. //depot/projects/busdma/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/busdma/dev/sk/if_sk.c#4 integrate .. //depot/projects/busdma/dev/sk/if_skreg.h#3 integrate .. //depot/projects/busdma/dev/smbus/smb.c#2 integrate .. //depot/projects/busdma/dev/smbus/smb.h#2 integrate .. //depot/projects/busdma/dev/smbus/smbconf.c#2 integrate .. //depot/projects/busdma/dev/smbus/smbconf.h#2 integrate .. //depot/projects/busdma/dev/smbus/smbus.c#2 integrate .. //depot/projects/busdma/dev/smbus/smbus.h#2 integrate .. //depot/projects/busdma/dev/smbus/smbus_if.m#2 integrate .. //depot/projects/busdma/dev/sound/driver.c#3 integrate .. //depot/projects/busdma/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/busdma/dev/sound/pci/ak452x.c#2 delete .. //depot/projects/busdma/dev/sound/pci/ak452x.h#2 delete .. //depot/projects/busdma/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/busdma/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/busdma/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/busdma/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/busdma/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/busdma/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/busdma/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/busdma/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/busdma/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/busdma/dev/sound/pci/envy24ht.c#1 branch .. //depot/projects/busdma/dev/sound/pci/envy24ht.h#1 branch .. //depot/projects/busdma/dev/sound/pci/hda/hda_reg.h#1 branch .. //depot/projects/busdma/dev/sound/pci/hda/hdac.c#1 branch .. //depot/projects/busdma/dev/sound/pci/hda/hdac.h#1 branch .. //depot/projects/busdma/dev/sound/pci/hda/hdac_private.h#1 branch .. //depot/projects/busdma/dev/sound/pci/hda/hdac_reg.h#1 branch .. //depot/projects/busdma/dev/sound/pci/ich.c#3 integrate .. //depot/projects/busdma/dev/sound/pci/spicds.c#1 branch .. //depot/projects/busdma/dev/sound/pci/spicds.h#1 branch .. //depot/projects/busdma/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/busdma/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/busdma/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/busdma/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/busdma/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/busdma/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/busdma/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/busdma/dev/sound/pcm/channel_if.m#2 integrate .. //depot/projects/busdma/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/busdma/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/busdma/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/busdma/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/busdma/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/busdma/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/busdma/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/busdma/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/busdma/dev/spibus/spi.h#1 branch .. //depot/projects/busdma/dev/spibus/spibus.c#1 branch .. //depot/projects/busdma/dev/spibus/spibus_if.m#1 branch .. //depot/projects/busdma/dev/spibus/spibusvar.h#1 branch .. //depot/projects/busdma/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/busdma/dev/stge/if_stge.c#1 branch .. //depot/projects/busdma/dev/stge/if_stgereg.h#1 branch .. //depot/projects/busdma/dev/streams/streams.c#2 integrate .. //depot/projects/busdma/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/busdma/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/busdma/dev/syscons/scmouse.c#2 integrate .. //depot/projects/busdma/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/busdma/dev/syscons/syscons.c#3 integrate .. //depot/projects/busdma/dev/syscons/syscons.h#3 integrate .. //depot/projects/busdma/dev/ti/if_ti.c#2 integrate .. //depot/projects/busdma/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/busdma/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/busdma/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/busdma/dev/txp/if_txp.c#3 integrate .. //depot/projects/busdma/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/busdma/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/busdma/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/busdma/dev/uart/uart_tty.c#3 integrate .. //depot/projects/busdma/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/busdma/dev/usb/ehci.c#3 integrate .. //depot/projects/busdma/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/busdma/dev/usb/ehcivar.h#3 integrate .. //depot/projects/busdma/dev/usb/hid.c#2 integrate .. //depot/projects/busdma/dev/usb/if_aue.c#3 integrate .. //depot/projects/busdma/dev/usb/if_axe.c#3 integrate .. //depot/projects/busdma/dev/usb/if_cdce.c#2 integrate .. //depot/projects/busdma/dev/usb/if_cue.c#2 integrate .. //depot/projects/busdma/dev/usb/if_kue.c#2 integrate .. //depot/projects/busdma/dev/usb/if_rue.c#2 integrate .. //depot/projects/busdma/dev/usb/if_udav.c#2 integrate .. //depot/projects/busdma/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/busdma/dev/usb/if_ural.c#4 integrate .. //depot/projects/busdma/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/busdma/dev/usb/kue_fw.h#2 integrate .. //depot/projects/busdma/dev/usb/ohci.c#3 integrate .. //depot/projects/busdma/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/busdma/dev/usb/ohcivar.h#3 integrate .. //depot/projects/busdma/dev/usb/sl811hs.c#3 integrate .. //depot/projects/busdma/dev/usb/sl811hsvar.h#3 integrate .. //depot/projects/busdma/dev/usb/ubsa.c#2 integrate .. //depot/projects/busdma/dev/usb/ubser.c#2 integrate .. //depot/projects/busdma/dev/usb/ucom.c#2 integrate .. //depot/projects/busdma/dev/usb/ucomvar.h#2 integrate .. //depot/projects/busdma/dev/usb/udbp.c#2 integrate .. //depot/projects/busdma/dev/usb/ufm.c#2 integrate .. //depot/projects/busdma/dev/usb/ufoma.c#2 integrate .. //depot/projects/busdma/dev/usb/uftdi.c#2 integrate .. //depot/projects/busdma/dev/usb/ugen.c#3 integrate .. //depot/projects/busdma/dev/usb/uhci.c#3 integrate .. //depot/projects/busdma/dev/usb/uhcivar.h#3 integrate .. //depot/projects/busdma/dev/usb/uhid.c#3 integrate .. //depot/projects/busdma/dev/usb/uhub.c#2 integrate .. //depot/projects/busdma/dev/usb/ukbd.c#2 integrate .. //depot/projects/busdma/dev/usb/ulpt.c#2 integrate .. //depot/projects/busdma/dev/usb/umass.c#2 integrate .. //depot/projects/busdma/dev/usb/umct.c#2 integrate .. //depot/projects/busdma/dev/usb/umodem.c#3 integrate .. //depot/projects/busdma/dev/usb/ums.c#2 integrate .. //depot/projects/busdma/dev/usb/uplcom.c#4 integrate .. //depot/projects/busdma/dev/usb/urio.c#2 integrate .. //depot/projects/busdma/dev/usb/usb.c#3 integrate .. //depot/projects/busdma/dev/usb/usb.h#2 integrate .. //depot/projects/busdma/dev/usb/usb_ethersubr.c#2 integrate .. //depot/projects/busdma/dev/usb/usb_mem.c#3 integrate .. //depot/projects/busdma/dev/usb/usb_port.h#2 integrate .. //depot/projects/busdma/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/busdma/dev/usb/usb_subr.c#3 integrate .. //depot/projects/busdma/dev/usb/usbdevs#4 integrate .. //depot/projects/busdma/dev/usb/usbdi.c#3 integrate .. //depot/projects/busdma/dev/usb/usbdi.h#2 integrate .. //depot/projects/busdma/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/busdma/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/busdma/dev/usb/usbdivar.h#3 integrate .. //depot/projects/busdma/dev/usb/uscanner.c#3 integrate .. //depot/projects/busdma/dev/usb/uvisor.c#3 integrate .. //depot/projects/busdma/dev/usb/uvscom.c#2 integrate .. //depot/projects/busdma/dev/vge/if_vge.c#2 integrate .. //depot/projects/busdma/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/busdma/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/busdma/dev/wi/if_wi.c#3 integrate .. //depot/projects/busdma/dev/wi/if_wireg.h#2 integrate .. //depot/projects/busdma/doc/Doxyfile#2 delete .. //depot/projects/busdma/doc/Makefile#2 delete .. //depot/projects/busdma/doc/subsys/Dependencies#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-cam#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-crypto#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-dev_pci#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-dev_sound#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-dev_usb#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-geom#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-i4b#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-kern#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-libkern#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-linux#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-net80211#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-netgraph#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-netinet#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-netinet6#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-netipsec#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-opencrypto#2 delete .. //depot/projects/busdma/doc/subsys/Doxyfile-vm#2 delete .. //depot/projects/busdma/doc/subsys/Makefile#2 delete .. //depot/projects/busdma/doc/subsys/README#2 delete .. //depot/projects/busdma/doc/subsys/common-Doxyfile#2 delete .. //depot/projects/busdma/doc/subsys/notreviewed.dox#2 delete .. //depot/projects/busdma/fs/devfs/devfs.h#2 integrate .. //depot/projects/busdma/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/busdma/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/busdma/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/busdma/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/busdma/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/busdma/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/busdma/fs/msdosfs/denode.h#2 integrate .. //depot/projects/busdma/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/busdma/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/busdma/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/busdma/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/busdma/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/busdma/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/busdma/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/busdma/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/busdma/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/busdma/fs/procfs/procfs_ioctl.c#2 integrate .. //depot/projects/busdma/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/busdma/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/busdma/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/busdma/fs/udf/osta.h#2 integrate .. //depot/projects/busdma/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/busdma/fs/umapfs/umap_vfsops.c#2 integrate .. //depot/projects/busdma/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/busdma/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/busdma/geom/cache/g_cache.c#1 branch .. //depot/projects/busdma/geom/cache/g_cache.h#1 branch .. //depot/projects/busdma/geom/eli/g_eli.c#3 integrate .. //depot/projects/busdma/geom/eli/g_eli.h#3 integrate .. //depot/projects/busdma/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/busdma/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/busdma/geom/gate/g_gate.c#2 integrate .. //depot/projects/busdma/geom/gate/g_gate.h#2 integrate .. //depot/projects/busdma/geom/geom.h#3 integrate .. //depot/projects/busdma/geom/geom_event.c#2 integrate .. //depot/projects/busdma/geom/geom_gpt.c#4 integrate .. //depot/projects/busdma/geom/geom_subr.c#2 integrate .. //depot/projects/busdma/geom/label/g_label.c#2 integrate .. //depot/projects/busdma/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/busdma/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/busdma/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/busdma/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/busdma/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/busdma/geom/nop/g_nop.c#2 integrate .. //depot/projects/busdma/geom/nop/g_nop.h#2 integrate .. //depot/projects/busdma/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/busdma/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/busdma/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/busdma/gnu/dev/sound/pci/emu10k1-ac97.h#2 delete .. //depot/projects/busdma/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate .. //depot/projects/busdma/gnu/dev/sound/pci/emu10k1.h#2 delete .. //depot/projects/busdma/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/busdma/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/busdma/gnu/fs/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/busdma/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/busdma/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/busdma/i386/acpica/Makefile#2 integrate .. //depot/projects/busdma/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/busdma/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/busdma/i386/acpica/madt.c#2 integrate .. //depot/projects/busdma/i386/bios/apm.c#3 integrate .. //depot/projects/busdma/i386/conf/GENERIC#4 integrate .. //depot/projects/busdma/i386/conf/NOTES#5 integrate .. //depot/projects/busdma/i386/conf/PAE#4 integrate .. //depot/projects/busdma/i386/conf/XBOX#4 integrate .. //depot/projects/busdma/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/busdma/i386/i386/db_trace.c#3 integrate .. //depot/projects/busdma/i386/i386/identcpu.c#3 integrate .. //depot/projects/busdma/i386/i386/initcpu.c#3 integrate .. //depot/projects/busdma/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/busdma/i386/i386/local_apic.c#2 integrate .. //depot/projects/busdma/i386/i386/machdep.c#4 integrate .. //depot/projects/busdma/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/busdma/i386/i386/nexus.c#2 integrate .. //depot/projects/busdma/i386/i386/pmap.c#4 integrate .. //depot/projects/busdma/i386/i386/support.s#2 integrate .. //depot/projects/busdma/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/busdma/i386/i386/trap.c#3 integrate .. //depot/projects/busdma/i386/i386/tsc.c#2 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_ipc.c#2 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_isc.c#2 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_syscall.h#3 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_util.h#2 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_xenix.h#3 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_xenix_syscall.h#3 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate .. //depot/projects/busdma/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/busdma/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/busdma/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/busdma/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/busdma/i386/ibcs2/syscalls.master#3 integrate .. //depot/projects/busdma/i386/ibcs2/syscalls.xenix#3 integrate .. //depot/projects/busdma/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/busdma/i386/include/clock.h#3 integrate .. //depot/projects/busdma/i386/include/elf.h#2 integrate .. //depot/projects/busdma/i386/include/i4b_ioctl.h#2 integrate .. //depot/projects/busdma/i386/include/md_var.h#3 integrate .. //depot/projects/busdma/i386/include/pmap.h#2 integrate .. //depot/projects/busdma/i386/include/specialreg.h#3 integrate .. //depot/projects/busdma/i386/include/stdarg.h#2 integrate .. //depot/projects/busdma/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/busdma/i386/isa/clock.c#2 integrate .. //depot/projects/busdma/i386/isa/pmtimer.c#2 integrate .. //depot/projects/busdma/i386/linux/linux.h#2 integrate .. //depot/projects/busdma/i386/linux/linux_dummy.c#4 integrate .. //depot/projects/busdma/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/busdma/i386/linux/linux_proto.h#5 integrate .. //depot/projects/busdma/i386/linux/linux_syscall.h#5 integrate .. //depot/projects/busdma/i386/linux/linux_sysent.c#5 integrate .. //depot/projects/busdma/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/busdma/i386/linux/syscalls.conf#2 integrate .. //depot/projects/busdma/i386/linux/syscalls.master#5 integrate .. //depot/projects/busdma/i386/xbox/xbox.c#2 integrate .. //depot/projects/busdma/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/busdma/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/busdma/ia64/conf/GENERIC#4 integrate .. //depot/projects/busdma/ia64/conf/NOTES#3 integrate .. //depot/projects/busdma/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/busdma/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/busdma/ia64/ia64/clock.c#3 integrate .. //depot/projects/busdma/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/busdma/ia64/ia64/pmap.c#4 integrate .. //depot/projects/busdma/ia64/ia64/support.S#2 integrate .. //depot/projects/busdma/ia64/ia64/trap.c#4 integrate .. //depot/projects/busdma/ia64/include/clock.h#2 integrate .. //depot/projects/busdma/ia64/include/elf.h#2 integrate .. //depot/projects/busdma/ia64/include/pmap.h#2 integrate .. //depot/projects/busdma/ia64/include/stdarg.h#2 integrate .. //depot/projects/busdma/ia64/include/vmparam.h#2 integrate .. //depot/projects/busdma/isa/isahint.c#2 integrate .. //depot/projects/busdma/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/busdma/kern/Makefile#2 integrate .. //depot/projects/busdma/kern/bus_if.m#2 integrate .. //depot/projects/busdma/kern/init_main.c#3 integrate .. //depot/projects/busdma/kern/init_sysent.c#3 integrate .. //depot/projects/busdma/kern/kern_acct.c#3 integrate .. //depot/projects/busdma/kern/kern_descrip.c#3 integrate .. //depot/projects/busdma/kern/kern_environment.c#2 integrate .. //depot/projects/busdma/kern/kern_event.c#3 integrate .. //depot/projects/busdma/kern/kern_exec.c#4 integrate .. //depot/projects/busdma/kern/kern_exit.c#3 integrate .. //depot/projects/busdma/kern/kern_fork.c#3 integrate .. //depot/projects/busdma/kern/kern_intr.c#2 integrate .. //depot/projects/busdma/kern/kern_jail.c#2 integrate .. //depot/projects/busdma/kern/kern_ktr.c#2 integrate .. //depot/projects/busdma/kern/kern_ktrace.c#3 integrate .. //depot/projects/busdma/kern/kern_linker.c#4 integrate .. //depot/projects/busdma/kern/kern_lock.c#2 integrate .. //depot/projects/busdma/kern/kern_mac.c#2 integrate .. //depot/projects/busdma/kern/kern_malloc.c#2 integrate .. //depot/projects/busdma/kern/kern_mbuf.c#3 integrate .. //depot/projects/busdma/kern/kern_mutex.c#3 integrate .. //depot/projects/busdma/kern/kern_proc.c#2 integrate .. //depot/projects/busdma/kern/kern_prot.c#3 integrate .. //depot/projects/busdma/kern/kern_resource.c#2 integrate .. //depot/projects/busdma/kern/kern_rwlock.c#2 integrate .. //depot/projects/busdma/kern/kern_sig.c#4 integrate .. //depot/projects/busdma/kern/kern_subr.c#2 integrate .. //depot/projects/busdma/kern/kern_sx.c#2 integrate .. //depot/projects/busdma/kern/kern_syscalls.c#2 integrate .. //depot/projects/busdma/kern/kern_tc.c#3 integrate .. //depot/projects/busdma/kern/kern_thr.c#2 integrate .. //depot/projects/busdma/kern/kern_thread.c#3 integrate .. //depot/projects/busdma/kern/kern_time.c#2 integrate .. //depot/projects/busdma/kern/kern_umtx.c#4 integrate .. //depot/projects/busdma/kern/kern_uuid.c#2 integrate .. //depot/projects/busdma/kern/link_elf.c#3 integrate .. //depot/projects/busdma/kern/makesyscalls.sh#2 integrate .. //depot/projects/busdma/kern/sched_4bsd.c#4 integrate .. //depot/projects/busdma/kern/sched_core.c#3 integrate .. //depot/projects/busdma/kern/sched_ule.c#3 integrate .. //depot/projects/busdma/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/busdma/kern/subr_autoconf.c#2 integrate .. //depot/projects/busdma/kern/subr_bus.c#3 integrate .. //depot/projects/busdma/kern/subr_clock.c#3 integrate .. //depot/projects/busdma/kern/subr_hints.c#2 integrate .. //depot/projects/busdma/kern/subr_prf.c#2 integrate .. //depot/projects/busdma/kern/subr_rman.c#3 integrate .. //depot/projects/busdma/kern/subr_rtc.c#1 branch .. //depot/projects/busdma/kern/subr_turnstile.c#2 integrate .. //depot/projects/busdma/kern/subr_witness.c#2 integrate .. //depot/projects/busdma/kern/sys_generic.c#2 integrate .. //depot/projects/busdma/kern/sys_process.c#2 integrate .. //depot/projects/busdma/kern/sys_socket.c#2 integrate .. //depot/projects/busdma/kern/syscalls.c#3 integrate .. //depot/projects/busdma/kern/syscalls.master#3 integrate .. //depot/projects/busdma/kern/systrace_args.c#1 branch .. //depot/projects/busdma/kern/sysv_msg.c#3 integrate .. //depot/projects/busdma/kern/sysv_sem.c#4 integrate .. //depot/projects/busdma/kern/sysv_shm.c#3 integrate .. //depot/projects/busdma/kern/tty.c#2 integrate .. //depot/projects/busdma/kern/tty_pts.c#2 integrate .. //depot/projects/busdma/kern/tty_pty.c#2 integrate .. //depot/projects/busdma/kern/tty_tty.c#2 integrate .. //depot/projects/busdma/kern/uipc_domain.c#2 integrate .. //depot/projects/busdma/kern/uipc_mbuf.c#3 integrate .. //depot/projects/busdma/kern/uipc_mqueue.c#2 integrate .. //depot/projects/busdma/kern/uipc_proto.c#2 delete .. //depot/projects/busdma/kern/uipc_sem.c#2 integrate .. //depot/projects/busdma/kern/uipc_sockbuf.c#1 branch .. //depot/projects/busdma/kern/uipc_socket.c#3 integrate .. //depot/projects/busdma/kern/uipc_socket2.c#4 integrate .. //depot/projects/busdma/kern/uipc_syscalls.c#3 integrate .. //depot/projects/busdma/kern/uipc_usrreq.c#4 integrate .. //depot/projects/busdma/kern/vfs_aio.c#4 integrate .. //depot/projects/busdma/kern/vfs_bio.c#2 integrate .. //depot/projects/busdma/kern/vfs_cluster.c#2 integrate .. //depot/projects/busdma/kern/vfs_default.c#2 integrate .. //depot/projects/busdma/kern/vfs_export.c#2 integrate .. //depot/projects/busdma/kern/vfs_lookup.c#2 integrate .. //depot/projects/busdma/kern/vfs_mount.c#4 integrate .. //depot/projects/busdma/kern/vfs_subr.c#4 integrate .. //depot/projects/busdma/kern/vfs_syscalls.c#4 integrate .. //depot/projects/busdma/libkern/strstr.c#1 branch .. //depot/projects/busdma/modules/Makefile#5 integrate .. //depot/projects/busdma/modules/agp/Makefile#2 integrate .. //depot/projects/busdma/modules/asr/Makefile#2 integrate .. //depot/projects/busdma/modules/ath/Makefile#2 integrate .. //depot/projects/busdma/modules/ath_hal/Makefile#4 integrate .. //depot/projects/busdma/modules/ath_rate_amrr/Makefile#2 integrate .. //depot/projects/busdma/modules/ath_rate_onoe/Makefile#2 integrate .. //depot/projects/busdma/modules/ath_rate_sample/Makefile#2 integrate .. //depot/projects/busdma/modules/bridgestp/Makefile#1 branch .. //depot/projects/busdma/modules/digi/digi/Makefile#2 integrate .. //depot/projects/busdma/modules/geom/Makefile#2 integrate .. //depot/projects/busdma/modules/geom/geom_cache/Makefile#1 branch .. //depot/projects/busdma/modules/hwpmc/Makefile#2 integrate .. //depot/projects/busdma/modules/if_bridge/Makefile#3 integrate .. //depot/projects/busdma/modules/if_ef/Makefile#2 integrate .. //depot/projects/busdma/modules/if_ppp/Makefile#2 integrate .. //depot/projects/busdma/modules/if_tap/Makefile#2 integrate .. //depot/projects/busdma/modules/ipfw/Makefile#2 integrate .. //depot/projects/busdma/modules/ipmi/Makefile#2 integrate .. //depot/projects/busdma/modules/ispfw/Makefile#2 integrate .. //depot/projects/busdma/modules/ispfw/isp_1000/Makefile#1 branch .. //depot/projects/busdma/modules/ispfw/isp_1040/Makefile#1 branch .. //depot/projects/busdma/modules/ispfw/isp_1040_it/Makefile#1 branch .. //depot/projects/busdma/modules/ispfw/isp_1080/Makefile#1 branch .. //depot/projects/busdma/modules/ispfw/isp_1080_it/Makefile#1 branch .. //depot/projects/busdma/modules/ispfw/isp_12160/Makefile#1 branch .. //depot/projects/busdma/modules/ispfw/isp_12160_it/Makefile#1 branch .. //depot/projects/busdma/modules/ispfw/isp_2100/Makefile#1 branch .. //depot/projects/busdma/modules/ispfw/isp_2200/Makefile#1 branch .. //depot/projects/busdma/modules/ispfw/isp_2300/Makefile#1 branch .. //depot/projects/busdma/modules/ispfw/isp_2322/Makefile#1 branch .. //depot/projects/busdma/modules/ispfw/isp_2400/Makefile#1 branch .. //depot/projects/busdma/modules/ispfw/ispfw/Makefile#1 branch .. //depot/projects/busdma/modules/kbdmux/Makefile#2 integrate .. //depot/projects/busdma/modules/libalias/Makefile#2 integrate .. //depot/projects/busdma/modules/libalias/libalias/Makefile#1 branch .. //depot/projects/busdma/modules/libalias/modules/Makefile#1 branch .. //depot/projects/busdma/modules/libalias/modules/Makefile.inc#1 branch .. //depot/projects/busdma/modules/libalias/modules/cuseeme/Makefile#1 branch .. //depot/projects/busdma/modules/libalias/modules/dummy/Makefile#1 branch .. //depot/projects/busdma/modules/libalias/modules/ftp/Makefile#1 branch .. //depot/projects/busdma/modules/libalias/modules/irc/Makefile#1 branch .. //depot/projects/busdma/modules/libalias/modules/modules.inc#1 branch .. //depot/projects/busdma/modules/libalias/modules/nbt/Makefile#1 branch .. //depot/projects/busdma/modules/libalias/modules/pptp/Makefile#1 branch .. //depot/projects/busdma/modules/libalias/modules/skinny/Makefile#1 branch .. //depot/projects/busdma/modules/libalias/modules/smedia/Makefile#1 branch .. //depot/projects/busdma/modules/linprocfs/Makefile#2 integrate .. //depot/projects/busdma/modules/linsysfs/Makefile#2 integrate .. //depot/projects/busdma/modules/linux/Makefile#3 integrate .. //depot/projects/busdma/modules/mfi/Makefile#3 integrate .. //depot/projects/busdma/modules/mii/Makefile#2 integrate .. //depot/projects/busdma/modules/netgraph/mppc/Makefile#2 integrate .. //depot/projects/busdma/modules/osf1/Makefile#2 delete .. //depot/projects/busdma/modules/padlock/Makefile#2 integrate .. //depot/projects/busdma/modules/pf/Makefile#2 integrate .. //depot/projects/busdma/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/busdma/modules/procfs/Makefile#2 integrate .. //depot/projects/busdma/modules/sound/driver/Makefile#3 integrate .. //depot/projects/busdma/modules/sound/driver/ak452x/Makefile#2 delete .. //depot/projects/busdma/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/busdma/modules/sound/driver/envy24/Makefile#2 integrate .. //depot/projects/busdma/modules/sound/driver/envy24ht/Makefile#1 branch .. //depot/projects/busdma/modules/sound/driver/hda/Makefile#1 branch .. //depot/projects/busdma/modules/sound/driver/spicds/Makefile#1 branch .. //depot/projects/busdma/modules/sound/sound/Makefile#3 integrate .. //depot/projects/busdma/modules/stge/Makefile#1 branch .. //depot/projects/busdma/modules/ukbd/Makefile#2 integrate .. //depot/projects/busdma/modules/vkbd/Makefile#2 integrate .. //depot/projects/busdma/modules/wlan/Makefile#2 integrate .. //depot/projects/busdma/net/bpf.c#5 integrate .. //depot/projects/busdma/net/bpf.h#3 integrate .. //depot/projects/busdma/net/bridgestp.c#2 integrate .. //depot/projects/busdma/net/bridgestp.h#1 branch .. //depot/projects/busdma/net/if.c#4 integrate .. //depot/projects/busdma/net/if.h#3 integrate .. //depot/projects/busdma/net/if_bridge.c#3 integrate .. //depot/projects/busdma/net/if_bridgevar.h#2 integrate .. //depot/projects/busdma/net/if_clone.c#3 integrate .. //depot/projects/busdma/net/if_clone.h#2 integrate .. //depot/projects/busdma/net/if_disc.c#3 integrate .. //depot/projects/busdma/net/if_enc.c#2 integrate .. //depot/projects/busdma/net/if_ethersubr.c#2 integrate .. //depot/projects/busdma/net/if_faith.c#3 integrate .. //depot/projects/busdma/net/if_gif.c#4 integrate .. //depot/projects/busdma/net/if_gre.c#4 integrate .. //depot/projects/busdma/net/if_loop.c#3 integrate .. //depot/projects/busdma/net/if_ppp.c#2 integrate .. //depot/projects/busdma/net/if_spppsubr.c#2 integrate .. //depot/projects/busdma/net/if_stf.c#4 integrate .. //depot/projects/busdma/net/if_tap.c#3 integrate .. //depot/projects/busdma/net/if_tap.h#2 integrate .. //depot/projects/busdma/net/if_tun.c#4 integrate .. //depot/projects/busdma/net/if_var.h#3 integrate .. //depot/projects/busdma/net/if_vlan.c#4 integrate .. //depot/projects/busdma/net/if_vlan_var.h#2 integrate .. //depot/projects/busdma/net/net_osdep.h#3 delete .. //depot/projects/busdma/net/raw_usrreq.c#3 integrate .. //depot/projects/busdma/net/rtsock.c#3 integrate .. //depot/projects/busdma/net80211/ieee80211.c#2 integrate .. //depot/projects/busdma/net80211/ieee80211.h#2 integrate .. //depot/projects/busdma/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/busdma/net80211/ieee80211_input.c#3 integrate .. //depot/projects/busdma/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/busdma/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/busdma/net80211/ieee80211_output.c#2 integrate .. //depot/projects/busdma/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/busdma/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/busdma/net80211/ieee80211_var.h#2 integrate .. //depot/projects/busdma/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/busdma/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/busdma/netatm/atm_aal5.c#2 integrate .. //depot/projects/busdma/netatm/atm_usrreq.c#2 integrate .. //depot/projects/busdma/netgraph/atm/ccatm/ng_ccatm.c#2 integrate .. //depot/projects/busdma/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/busdma/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate .. //depot/projects/busdma/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/busdma/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/busdma/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate .. //depot/projects/busdma/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/busdma/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 7 23:15:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 148E416A47B; Sat, 7 Oct 2006 23:15:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD42216A403 for ; Sat, 7 Oct 2006 23:15:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71E1143D4C for ; Sat, 7 Oct 2006 23:15:04 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97NF4Bh035562 for ; Sat, 7 Oct 2006 23:15:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97NF3gt035541 for perforce@freebsd.org; Sat, 7 Oct 2006 23:15:03 GMT (envelope-from jb@freebsd.org) Date: Sat, 7 Oct 2006 23:15:03 GMT Message-Id: <200610072315.k97NF3gt035541@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107461 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 23:15:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=107461 Change 107461 by jb@jb_freebsd7 on 2006/10/07 23:14:39 Manually update these files to match current since perforce appears to have ignored the updates, probably because they were originally integrated from a perforce branch. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/autoconf.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/bus_machdep.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/clock.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/counter.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/db_disasm.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/db_hwwatch.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/db_interface.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/db_trace.c#4 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/dump_machdep.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/eeprom.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/elf_machdep.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/exception.S#4 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/gdb_machdep.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hcall.S#4 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hv_pci.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hviommu.c#4 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/identcpu.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/in_cksum.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/interrupt.S#7 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/intr_machdep.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/iommu.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/locore.S#4 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/machdep.c#5 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mem.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_exception.S#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_locore.S#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_machdep.c#5 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/nexus.c#4 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/ofw_bus.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/ofw_machdep.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#14 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/prof_machdep.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/rtc.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/rwindow.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/simdisk.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/support.S#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/swtch.S#5 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/sys_machdep.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/t1_copy.S#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tick.c#5 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tlb.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#9 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap_trace.S#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tsb.c#4 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tte.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/tte_hash.c#4 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/uio_machdep.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/vm_machdep.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/vnex.c#3 edit .. //depot/projects/dtrace/src/sys/sun4v/sun4v/wbuf.S#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/autoconf.c#3 (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/sparc64/sparc64/autoconf.c,v 1.13 2005/05/29 23:44:22 marcel Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/autoconf.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include "opt_isa.h" ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/bus_machdep.c#3 (text+ko) ==== @@ -97,7 +97,7 @@ * and * from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.24 2001/08/15 * - * $FreeBSD: src/sys/sparc64/sparc64/bus_machdep.c,v 1.43 2005/01/15 09:20:47 scottl Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/bus_machdep.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/clock.c#3 (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/sparc64/sparc64/clock.c,v 1.10 2003/02/03 17:53:15 jake Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/clock.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/counter.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ * 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. * - * $FreeBSD: src/sys/sparc64/sparc64/counter.c,v 1.6 2004/09/30 14:30:29 kensmith Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/counter.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/db_disasm.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * (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: NetBSD: db_disasm.c,v 1.9 2000/08/16 11:29:42 pk Exp - * $FreeBSD: src/sys/sparc64/sparc64/db_disasm.c,v 1.8 2005/01/07 02:29:23 imp Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/db_disasm.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/db_hwwatch.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/sparc64/db_hwwatch.c,v 1.6 2005/09/10 03:01:25 marcel Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/db_hwwatch.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/db_interface.c#3 (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/sparc64/sparc64/db_interface.c,v 1.10 2004/07/10 23:47:20 marcel Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/db_interface.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/db_trace.c#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/sparc64/sparc64/db_trace.c,v 1.24 2005/08/03 04:27:39 jeff Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/db_trace.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include @@ -243,6 +243,7 @@ db_addr_t pc; int trap; int user; + int quit; if (count == -1) count = 1024; @@ -250,6 +251,7 @@ trap = 0; user = 0; npc = 0; + quit = 0; while (count-- && !user && !db_pager_quit) { pc = (db_addr_t)db_get_value((db_addr_t)&fp->fr_pc, sizeof(fp->fr_pc), FALSE); ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/dump_machdep.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/sparc64/dump_machdep.c,v 1.8 2005/01/07 02:29:23 imp Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/dump_machdep.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/eeprom.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/eeprom.c,v 1.10 2005/11/30 16:13:49 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/eeprom.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); /* * clock (eeprom) attaches at EBus, FireHose or SBus ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/elf_machdep.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * from: NetBSD: mdreloc.c,v 1.5 2001/04/25 12:24:51 kleink Exp - * $FreeBSD: src/sys/sparc64/sparc64/elf_machdep.c,v 1.21 2005/12/26 21:23:55 sobomax Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/elf_machdep.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/exception.S#4 (text+ko) ==== @@ -23,14 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - - - * $ Exp $ */ #include -__FBSDID("$$") +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/exception.S,v 1.1 2006/10/05 06:14:28 kmacy Exp $") #include "opt_compat.h" #include "opt_ddb.h" @@ -1379,6 +1376,23 @@ wrpr %g0, %g5, %cleanwin ldx [%g6 + PCB_KSTACK], %g6 sub %g6, TF_SIZEOF, %g6 +#ifdef DEBUG_KSTACK + mov %o0, %g5 + mov %o3, %l0 + mov %o4, %l1 + mov %o5, %l2 + mov %o6, %l3 + mov %o7, %l4 + mov 0x10, %o0 + mov %g6, %o1 + ta TTRACE_ADDENTRY + mov %g5, %o0 + mov %l0, %o3 + mov %l1, %o4 + mov %l2, %o5 + mov %l3, %o6 + mov %l4, %o7 +#endif save %g6, 0, %sp rdpr %canrestore, %l0 @@ -1433,19 +1447,16 @@ bge,pt %xcc, 0f nop call panic -! MAGIC_EXIT 0: #endif wrpr %g0, %g4, %pil 1: wrpr %g0, %g6, %tnpc - wrpr %g0, 0, %gl stx %g7, [%l7 + TF_G7] ! save g7 before it can be overwritten by PCPU when returning from an interrupt wrpr %g0, 1, %gl - - rdpr %cwp, %l0 + rdpr %cwp, %l0 set TSTATE_KERNEL, %l1 wrpr %l1, %l0, %tstate done @@ -1475,6 +1486,7 @@ mov 1, lock_bit ; \ add addr, 8, addr ; \ sllx lock_bit, 56, lock_bit ; \ + stxa %o7, [PCPU(CALLER)]%asi ; /* XXX DEBUG */\ label1: ; \ ldxa [addr]%asi, oldval; \ or oldval, lock_bit, newval; \ @@ -1515,7 +1527,7 @@ label2: ENTRY(hash_bucket_lock) - wr %g0, ASI_N, %asi + wr %g0, ASI_N, %asi rdpr %pstate, %o1 and %o1, PSTATE_INTR_DISABLE, %o2 wrpr %o2, %pstate @@ -1588,7 +1600,6 @@ add PCPU_REG, %g1, %g1 SAVE_LOCALS_ASI(%g1) mov 0, %g1 ! cansave is 0 - ! %g1 == %cansave ! %g2 == hash scratch value ! %g3 == TWDW ASI @@ -1907,4 +1918,4 @@ sllx %g7, TRAP_CTX_SHIFT, %g7 or %g7, %g5, %g5 done -END(tl1_trap) +END(tl1_trap) ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/gdb_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/gdb_machdep.c,v 1.3 2005/01/07 02:29:23 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/gdb_machdep.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); #include #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/hcall.S#4 (text+ko) ==== @@ -30,8 +30,10 @@ * Hypervisor calls */ #define _ASM - + #include +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/hcall.S,v 1.1 2006/10/05 06:14:28 kmacy Exp $") + #include #include #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/hv_pci.c#3 (text+ko) ==== @@ -23,10 +23,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ * */ +#include +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/hv_pci.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); + /* * Support for the Hypervisor PCI bus. */ @@ -36,8 +38,6 @@ #include #include #include -#include -#include #include #include #include @@ -50,6 +50,7 @@ #include #include +#include #include #include @@ -73,8 +74,6 @@ static device_attach_t hvpci_attach; static bus_read_ivar_t hvpci_read_ivar; static bus_write_ivar_t hvpci_write_ivar; -static bus_setup_intr_t hvpci_setup_intr; -static bus_teardown_intr_t hvpci_teardown_intr; static bus_alloc_resource_t hvpci_alloc_resource; static bus_activate_resource_t hvpci_activate_resource; static bus_deactivate_resource_t hvpci_deactivate_resource; @@ -100,8 +99,8 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, hvpci_read_ivar), DEVMETHOD(bus_write_ivar, hvpci_write_ivar), - DEVMETHOD(bus_setup_intr, hvpci_setup_intr), - DEVMETHOD(bus_teardown_intr, hvpci_teardown_intr), + DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), + DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_alloc_resource, hvpci_alloc_resource), DEVMETHOD(bus_activate_resource, hvpci_activate_resource), DEVMETHOD(bus_deactivate_resource, hvpci_deactivate_resource), @@ -178,14 +177,6 @@ /* Setup the HyperVisor devhandle for this bus */ sc->hs_devhandle = nexus_get_devhandle(dev); - /* initalize intr resources */ - sc->hs_pci_intr_rman.rm_type = RMAN_ARRAY; - sc->hs_pci_intr_rman.rm_descr = "HyperVisor PCI Interrupts"; - if (rman_init(&sc->hs_pci_intr_rman) != 0 || - /* We use 1 (INTA) through 4 (INTD) */ - rman_manage_region(&sc->hs_pci_intr_rman, 1, 4) != 0) - panic("%s: failed to set up intr rman", __func__); - /* Pull in the ra addresses out of OFW */ nrange = OF_getprop_alloc(node, "ranges", sizeof *range, (void **)&range); @@ -250,6 +241,9 @@ free(dvma, M_OFWPROP); + /* Setup ofw imap */ + ofw_bus_setup_iinfo(node, &sc->hs_pci_iinfo, sizeof(ofw_pci_intr_t)); + device_add_child(dev, "pci", -1); return (bus_generic_attach(dev)); @@ -343,8 +337,24 @@ static int hvpci_route_interrupt(device_t bridge, device_t dev, int pin) { + struct hvpci_softc *sc; + struct ofw_pci_register reg; + phandle_t node; + ofw_pci_intr_t pintr, mintr; + int obli; + uint8_t maskbuf[sizeof(reg) + sizeof(pintr)]; + + sc = device_get_softc(bridge); + node = ofw_bus_get_node(dev); + pintr = pin; + obli = ofw_bus_lookup_imap(node, &sc->hs_pci_iinfo, ®, sizeof(reg), + &pintr, sizeof(pintr), &mintr, sizeof(mintr), maskbuf); + device_printf(dev, "called hvpci_route_intr: %d, got: mintr: %#x\n", + obli, mintr); + if (obli) + return (mintr); - return (pin); + panic("pin %d not found in imap of %s", pin, device_get_nameunit(bridge)); } static phandle_t @@ -421,74 +431,6 @@ return (ENOENT); } -static int -hvpci_setup_intr(device_t dev, device_t child, struct resource *ires, - int flags, driver_intr_t *intr, void *arg, void **cookiep) -{ - struct hvpci_softc *sc; - int pciintr, rid; - int error; - - - sc = device_get_softc(dev); - - rid = rman_get_start(ires); - KASSERT(rid >= 1 && rid <= 4, ("interrupt out of range")); - - pciintr = rid - 1; - if (sc->hs_intr[pciintr] == NULL) { - if ((sc->hs_intr[pciintr] = bus_alloc_resource_any(dev, - SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { - device_printf(dev, "couldn't alloc interrupt\n"); - return (ENXIO); - } - sc->hs_intrrefcnt[pciintr] = 1; - } else - sc->hs_intrrefcnt[pciintr]++; - - error = bus_setup_intr(dev, sc->hs_intr[pciintr], flags, intr, arg, - cookiep); - if (error) { - sc->hs_intrrefcnt[pciintr]--; - if (sc->hs_intrrefcnt[pciintr] == 0) { - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->hs_intr[pciintr]), - sc->hs_intr[pciintr]); - sc->hs_intr[pciintr] = NULL; - } - device_printf(dev, "bus_setup_intr: %d\n", error); - return (error); - } - return (0); -} - -static int -hvpci_teardown_intr(device_t dev, device_t child, struct resource *vec, - void *cookie) -{ - struct hvpci_softc *sc; - int pciintr; - int error; - - sc = device_get_softc(dev); - pciintr = rman_get_start(vec); - KASSERT(pciintr >= 1 && pciintr <= 4, ("interrupt out of range")); - pciintr--; - - error = bus_teardown_intr(dev, sc->hs_intr[pciintr], cookie); - if (error) - return (error); - - sc->hs_intrrefcnt[pciintr]--; - if (sc->hs_intrrefcnt[pciintr] == 0) { - bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->hs_intr[pciintr]), sc->hs_intr[pciintr]); - sc->hs_intr[pciintr] = NULL; - } - - return (0); -} - static struct resource * hvpci_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) @@ -507,11 +449,8 @@ switch (type) { case SYS_RES_IRQ: - if (end - start != 0) - return NULL; - rm = &sc->hs_pci_intr_rman; - bt = NULL; - bh = 0; + return BUS_ALLOC_RESOURCE(device_get_parent(bus), child, type, + rid, start, end, count, flags); break; case SYS_RES_MEMORY: @@ -534,12 +473,6 @@ } rv = rman_reserve_resource(rm, start, end, count, flags, child); -#ifdef DEBUG - if (type == SYS_RES_IRQ) { - printf("%s: reserve_resource: start: %ld, end: %ld, flags: %#x, rv: %p\n", - __func__, start, end, flags, rv); - } -#endif if (rv == NULL) return (NULL); ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/hviommu.c#4 (text+ko) ==== @@ -97,7 +97,7 @@ * from: @(#)sbus.c 8.1 (Berkeley) 6/11/93 * from: NetBSD: iommu.c,v 1.42 2001/08/06 22:02:58 eeh Exp * - * $FreeBSD: src/sys/sparc64/sparc64/iommu.c,v 1.43 2005/01/31 07:28:04 scottl Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/hviommu.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/identcpu.c#3 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/sparc64/sparc64/identcpu.c,v 1.15 2005/12/31 14:39:19 netchild Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/identcpu.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/in_cksum.c#3 (text+ko) ==== @@ -54,7 +54,7 @@ * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: FreeBSD: src/sys/i386/i386/in_cksum.c,v 1.22 2000/11/25 * - * $FreeBSD: src/sys/sparc64/sparc64/in_cksum.c,v 1.2 2004/04/07 05:00:01 imp Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/in_cksum.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/interrupt.S#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/interrupt.S,v 1.8 2005/04/16 15:05:56 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/interrupt.S,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); #include "opt_simulator.h" #include "opt_trap_trace.h" @@ -249,11 +249,12 @@ * %g4 queue size mask * %g6 head ptr */ - mov %o0, %g1 - mov %o5, %g6 +! mov %o0, %g1 +! mov %o5, %g6 +! PUTCHAR(0x2b) ! PUTCHAR(0x2b) - mov %g1, %o0 - mov %g6, %o5 +! mov %g1, %o0 +! mov %g6, %o5 mov DEV_MONDO_QUEUE_HEAD, %g1 ldxa [%g1]ASI_QUEUE, %g6 ! %g6 = head ptr @@ -283,7 +284,7 @@ set IV_MAX, %g4 cmp %g5, %g4 bgeu,a,pn %xcc, 1f - ldx [PCPU(DEV_Q_SIZE)], %g4 ! queue size (delay slot) + ldx [PCPU(DEV_Q_SIZE)], %g4 ! queue size (delay slot) /* * Find the function, argument and desired priority from the @@ -353,12 +354,20 @@ mov 1, %g6 sllx %g6, %g1, %g6 wr %g6, 0, %set_softint - +#if 0 + mov %o0, %g1 + mov %o5, %g6 + PUTCHAR(0x2b) + PUTCHAR(0x2b) + mov %g1, %o0 + mov %g6, %o5 +#endif /* * Done, retry the instruction */ 0: retry + /* NOTREACHED */ END(dev_mondo) #endif /* lint */ @@ -448,18 +457,6 @@ rdpr %tick, %g4 stxa %g4, [PCPU(PAD) + 8]%asi - /* pcpu->pad[3] = %tl */ - rdpr %tl, %g4 - stxa %g4, [PCPU(PAD) + 24]%asi - - /* pcpu->pad[4] = %tpc */ - rdpr %tpc, %g4 - stxa %g4, [PCPU(PAD) + 32]%asi - - /* pcpu->pad[5] = %tnpc */ - rdpr %tnpc, %g4 - stxa %g4, [PCPU(PAD) + 40]%asi - /* * Increment a counter which might help us notice if we're * stuck in a loop. pcpu->pad[2] = count ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/intr_machdep.c#3 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/intr_machdep.c,v 1.24 2005/10/25 19:48:48 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/intr_machdep.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); #include #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/iommu.c#3 (text+ko) ==== @@ -97,7 +97,7 @@ * from: @(#)sbus.c 8.1 (Berkeley) 6/11/93 * from: NetBSD: iommu.c,v 1.42 2001/08/06 22:02:58 eeh Exp * - * $FreeBSD: src/sys/sparc64/sparc64/iommu.c,v 1.43 2005/01/31 07:28:04 scottl Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/iommu.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ /* ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/locore.S#4 (text+ko) ==== @@ -24,8 +24,10 @@ * SUCH DAMAGE. */ + + #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/locore.S,v 1.22 2005/11/30 16:09:10 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/locore.S,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); #include #include @@ -40,7 +42,7 @@ .globl nwin_minus_one .set nwin_minus_one,7 - + /* * void _start(caddr_t metadata, u_long o1, u_long o2, u_long o3, * u_long ofw_vec) ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/machdep.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.126 2005/10/14 12:43:47 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/machdep.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -110,6 +110,9 @@ #include #include +/* XXX move this to a header */ +extern void mdesc_init(void); + typedef int ofw_vec_t(void *); #ifdef DDB @@ -443,6 +446,8 @@ msgbufinit(msgbufp, MSGBUF_SIZE); mutex_init(); + + mdesc_init(); OF_getprop(root, "name", sparc64_model, sizeof(sparc64_model) - 1); ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/mem.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mem.c,v 1.16 2005/11/30 16:09:10 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/mem.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); /* * Memory special file ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_exception.S#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_exception.S,v 1.12 2003/06/19 05:27:04 jake Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/mp_exception.S,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); #include #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_locore.S#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_locore.S,v 1.7 2003/04/29 00:37:41 jake Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/mp_locore.S,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); #include #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/mp_machdep.c#5 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.31 2006/02/07 21:22:02 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/mp_machdep.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); #include "opt_trap_trace.h" ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/nexus.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/nexus.c,v 1.17 2005/05/21 20:19:27 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/nexus.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); #include #include @@ -306,11 +306,17 @@ driver_intr_t *intr, void *arg, void **cookiep) { struct nexus_devinfo *ndi; + device_t ichild; uint64_t ihdl; uint64_t ino; int error, cpuid; - ndi = device_get_ivars(child); + /* we need the devinfo from the immediate child */ + ichild = child; + while (device_get_parent(ichild) != dev) + ichild = device_get_parent(ichild); + + ndi = device_get_ivars(ichild); if (res == NULL) panic("%s: NULL interrupt resource!", __func__); ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/ofw_bus.c#3 (text+ko) ==== @@ -54,7 +54,7 @@ * * from: $NetBSD: ofw_machdep.c,v 1.16 2001/07/20 00:07:14 eeh Exp $ * - * $FreeBSD: src/sys/sparc64/sparc64/ofw_bus.c,v 1.12 2005/01/07 02:29:23 imp Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/ofw_bus.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ /* ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/ofw_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/ofw_machdep.c,v 1.14 2005/05/21 20:17:01 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/ofw_machdep.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); /* * Some Open Firmware helper functions that are likely machine dependent. ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#14 (text+ko) ==== @@ -23,7 +23,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $ Exp $ */ #include @@ -1531,15 +1530,15 @@ TAILQ_INIT(&m->md.pv_list); m->md.pv_list_count = 0; } - +/* + * Lower the permission for all mappings to a given page. + */ void pmap_remove_write(vm_page_t m) { - DPRINTF("pmap_remove_write(0x%lx)\n", VM_PAGE_TO_PHYS(m)); tte_clear_phys_bit(m, VTD_SW_W); } - /* * Initialize the pmap associated with process 0. */ ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/prof_machdep.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * * from: src/sys/i386/isa/prof_machdep.c,v 1.16 2000/07/04 11:25:19 * - * $FreeBSD: src/sys/sparc64/sparc64/prof_machdep.c,v 1.1 2002/07/29 00:45:13 jake Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/prof_machdep.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #ifdef GUPROF ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/rtc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/rtc.c,v 1.5 2005/11/30 16:13:49 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/rtc.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); /* * The `rtc' device is a MC146818 compatible clock found on the ISA bus ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/rwindow.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from: BSDI: trap.c,v 1.17.2.9 1999/10/19 15:29:52 cp Exp - * $FreeBSD: src/sys/sparc64/sparc64/rwindow.c,v 1.9 2004/11/27 06:51:38 das Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/rwindow.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/simdisk.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ - /*- * Copyright (c) 2006 Kip Macy * Copyright (c) 2001 Benno Rice @@ -25,10 +24,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $ Exp $ */ #include -__FBSDID("$$"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/simdisk.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); #include #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/support.S#3 (text+ko) ==== @@ -25,8 +25,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/support.S,v 1.29 2003/11/11 06:41:54 jake Exp $"); - +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/support.S,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); + #include #include #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/swtch.S#5 (text+ko) ==== @@ -25,13 +25,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/swtch.S,v 1.33 2004/05/26 12:06:52 tmm Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/swtch.S,v 1.1 2006/10/05 06:14:28 kmacy Exp $"); #include #include #include #include -#include #include #include "assym.s" @@ -215,14 +214,15 @@ cmp %g0, %o0 be %xcc, 4f nop - call pmap_set_ctx_panic - mov %i2, %o2 + MAGIC_TRAP_ON + MAGIC_EXIT + 4: /* * install the new secondary context number in the cpu. */ - sethi %hi(FLUSH_ADDR), %l2 + SET_MMU_CONTEXT(%l6, %l5) - flush %l2 + membar #Sync /* * Done. Return and load the new process's window from the stack. */ ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/sys_machdep.c#3 (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/sparc64/sparc64/sys_machdep.c,v 1.14 2005/01/19 18:24:07 jhb Exp $ + * $FreeBSD: src/sys/sun4v/sun4v/sys_machdep.c,v 1.1 2006/10/05 06:14:28 kmacy Exp $ */ #include ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/t1_copy.S#3 (text+ko) ==== @@ -26,6 +26,8 @@ */ #include +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/t1_copy.S,v 1.1 2006/10/05 06:14:28 kmacy Exp $") >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 7 23:28: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 A8BC316A412; Sat, 7 Oct 2006 23:28:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 73D3216A407 for ; Sat, 7 Oct 2006 23:28:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBDD343D5A for ; Sat, 7 Oct 2006 23:28:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97NSK9Q043392 for ; Sat, 7 Oct 2006 23:28:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97NSKXM043386 for perforce@freebsd.org; Sat, 7 Oct 2006 23:28:20 GMT (envelope-from jb@freebsd.org) Date: Sat, 7 Oct 2006 23:28:20 GMT Message-Id: <200610072328.k97NSKXM043386@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107462 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 23:28:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=107462 Change 107462 by jb@jb_freebsd7 on 2006/10/07 23:27:52 Fix the size if the trap trace end entry function. Affected files ... .. //depot/projects/dtrace/src/sys/sun4v/sun4v/hcall.S#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/hcall.S#5 (text+ko) ==== @@ -1336,7 +1336,7 @@ ta TTRACE_ADDENTRY retl nop - SET_SIZE(hv_ttrace_freeze) + SET_SIZE(hv_ttrace_addentry) From owner-p4-projects@FreeBSD.ORG Sat Oct 7 23:32: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 3ACED16A40F; Sat, 7 Oct 2006 23:32:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F0C7A16A49E for ; Sat, 7 Oct 2006 23:32:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C19043D72 for ; Sat, 7 Oct 2006 23:32:43 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k97NWhDx045646 for ; Sat, 7 Oct 2006 23:32:43 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k97NViSh044694 for perforce@freebsd.org; Sat, 7 Oct 2006 23:31:44 GMT (envelope-from marcel@freebsd.org) Date: Sat, 7 Oct 2006 23:31:44 GMT Message-Id: <200610072331.k97NViSh044694@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 107464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 07 Oct 2006 23:32:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=107464 Change 107464 by marcel@marcel_nfs on 2006/10/07 23:30:53 IFC @107454 Affected files ... .. //depot/projects/gdb/MAINTAINERS#16 integrate .. //depot/projects/gdb/Makefile#12 integrate .. //depot/projects/gdb/Makefile.inc1#18 integrate .. //depot/projects/gdb/ObsoleteFiles.inc#4 integrate .. //depot/projects/gdb/UPDATING#27 integrate .. //depot/projects/gdb/bin/cp/cp.1#6 integrate .. //depot/projects/gdb/bin/cp/cp.c#5 integrate .. //depot/projects/gdb/bin/cp/utils.c#6 integrate .. //depot/projects/gdb/bin/df/df.c#13 integrate .. //depot/projects/gdb/bin/getfacl/getfacl.1#4 integrate .. //depot/projects/gdb/bin/ls/ls.1#8 integrate .. //depot/projects/gdb/bin/pax/pax.1#6 integrate .. //depot/projects/gdb/bin/ps/ps.1#14 integrate .. //depot/projects/gdb/bin/setfacl/setfacl.1#4 integrate .. //depot/projects/gdb/bin/sh/jobs.c#5 integrate .. //depot/projects/gdb/bin/sh/jobs.h#3 integrate .. //depot/projects/gdb/bin/sh/main.c#4 integrate .. //depot/projects/gdb/bin/sh/sh.1#7 integrate .. //depot/projects/gdb/contrib/bind9/CHANGES#2 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/gdb/contrib/bind9/version#2 integrate .. //depot/projects/gdb/contrib/com_err/compile_et.1#3 integrate .. //depot/projects/gdb/contrib/gcc/ChangeLog#4 integrate .. //depot/projects/gdb/contrib/gcc/ansidecl.h#3 integrate .. //depot/projects/gdb/contrib/gcc/builtins.c#4 integrate .. //depot/projects/gdb/contrib/gcc/c-common.c#4 integrate .. //depot/projects/gdb/contrib/gcc/c-common.h#3 integrate .. //depot/projects/gdb/contrib/gcc/c-decl.c#4 integrate .. //depot/projects/gdb/contrib/gcc/c-objc-common.c#3 integrate .. //depot/projects/gdb/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/gdb/contrib/gcc/c-typeck.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cccp.1#2 delete .. //depot/projects/gdb/contrib/gcc/cfgcleanup.c#3 integrate .. //depot/projects/gdb/contrib/gcc/combine.c#4 integrate .. //depot/projects/gdb/contrib/gcc/config.gcc#4 integrate .. //depot/projects/gdb/contrib/gcc/config.host#2 integrate .. //depot/projects/gdb/contrib/gcc/config.in#4 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/alpha.c#4 integrate .. //depot/projects/gdb/contrib/gcc/config/alpha/alpha.md#4 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/arm-protos.h#4 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/arm.c#4 integrate .. //depot/projects/gdb/contrib/gcc/config/arm/arm.md#4 integrate .. //depot/projects/gdb/contrib/gcc/config/host-linux.c#1 branch .. //depot/projects/gdb/contrib/gcc/config/host-solaris.c#1 branch .. //depot/projects/gdb/contrib/gcc/config/i386/i386.c#6 integrate .. //depot/projects/gdb/contrib/gcc/config/i386/i386.md#4 integrate .. //depot/projects/gdb/contrib/gcc/config/ia64/hpux.h#3 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/aix51.h#3 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/linux64.h#4 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/rs6000-protos.h#4 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/rs6000.c#4 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/rs6000.h#4 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/rs6000.md#4 integrate .. //depot/projects/gdb/contrib/gcc/config/rs6000/sysv4.h#4 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/gmon-sol2.c#3 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sol2-gas-bi.h#3 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sol2.h#3 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sparc.c#4 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/sparc.h#3 integrate .. //depot/projects/gdb/contrib/gcc/config/x-linux#1 branch .. //depot/projects/gdb/contrib/gcc/config/x-solaris#1 branch .. //depot/projects/gdb/contrib/gcc/configure#4 integrate .. //depot/projects/gdb/contrib/gcc/configure.ac#3 integrate .. //depot/projects/gdb/contrib/gcc/coverage.c#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/ChangeLog#4 integrate .. //depot/projects/gdb/contrib/gcc/cp/call.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cp/class.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cp/cp-tree.def#3 integrate .. //depot/projects/gdb/contrib/gcc/cp/cp-tree.h#4 integrate .. //depot/projects/gdb/contrib/gcc/cp/cvt.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cp/decl.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cp/decl2.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cp/error.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cp/init.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cp/lex.c#3 integrate .. //depot/projects/gdb/contrib/gcc/cp/method.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cp/name-lookup.c#3 integrate .. //depot/projects/gdb/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/gdb/contrib/gcc/cp/parser.c#3 integrate .. //depot/projects/gdb/contrib/gcc/cp/pt.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cp/search.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cp/semantics.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cp/typeck.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cpp.1#2 delete .. //depot/projects/gdb/contrib/gcc/cppfiles.c#4 integrate .. //depot/projects/gdb/contrib/gcc/cpphash.h#3 integrate .. //depot/projects/gdb/contrib/gcc/cppinit.c#3 integrate .. //depot/projects/gdb/contrib/gcc/cse.c#4 integrate .. //depot/projects/gdb/contrib/gcc/doc/contrib.texi#3 integrate .. //depot/projects/gdb/contrib/gcc/doc/cpp.1#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/gcc.1#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/gcov.1#2 integrate .. //depot/projects/gdb/contrib/gcc/doc/hostconfig.texi#3 integrate .. //depot/projects/gdb/contrib/gcc/doc/include/gcc-common.texi#4 integrate .. //depot/projects/gdb/contrib/gcc/doc/invoke.texi#4 integrate .. //depot/projects/gdb/contrib/gcc/expmed.c#4 integrate .. //depot/projects/gdb/contrib/gcc/f/ChangeLog#4 integrate .. //depot/projects/gdb/contrib/gcc/f/g77.texi#3 integrate .. //depot/projects/gdb/contrib/gcc/f/g77spec.c#3 integrate .. //depot/projects/gdb/contrib/gcc/flow.c#4 integrate .. //depot/projects/gdb/contrib/gcc/fold-const.c#4 integrate .. //depot/projects/gdb/contrib/gcc/gcc.1#3 delete .. //depot/projects/gdb/contrib/gcc/gcc.c#4 integrate .. //depot/projects/gdb/contrib/gcc/gcov-dump.c#2 integrate .. //depot/projects/gdb/contrib/gcc/gcov.c#3 integrate .. //depot/projects/gdb/contrib/gcc/gcse.c#4 integrate .. //depot/projects/gdb/contrib/gcc/ggc-common.c#3 integrate .. //depot/projects/gdb/contrib/gcc/global.c#3 integrate .. //depot/projects/gdb/contrib/gcc/hooks.c#4 integrate .. //depot/projects/gdb/contrib/gcc/hooks.h#4 integrate .. //depot/projects/gdb/contrib/gcc/hosthooks-def.h#2 integrate .. //depot/projects/gdb/contrib/gcc/hosthooks.h#2 integrate .. //depot/projects/gdb/contrib/gcc/local-alloc.c#3 integrate .. //depot/projects/gdb/contrib/gcc/longlong.h#3 integrate .. //depot/projects/gdb/contrib/gcc/loop.c#4 integrate .. //depot/projects/gdb/contrib/gcc/md5.c#2 integrate .. //depot/projects/gdb/contrib/gcc/md5.h#2 integrate .. //depot/projects/gdb/contrib/gcc/mips-tdump.c#3 integrate .. //depot/projects/gdb/contrib/gcc/mips-tfile.c#3 integrate .. //depot/projects/gdb/contrib/gcc/mklibgcc.in#4 integrate .. //depot/projects/gdb/contrib/gcc/optabs.c#3 integrate .. //depot/projects/gdb/contrib/gcc/pretty-print.c#2 integrate .. //depot/projects/gdb/contrib/gcc/reg-stack.c#4 integrate .. //depot/projects/gdb/contrib/gcc/regrename.c#4 integrate .. //depot/projects/gdb/contrib/gcc/regs.h#4 integrate .. //depot/projects/gdb/contrib/gcc/rtl.h#4 integrate .. //depot/projects/gdb/contrib/gcc/sched-rgn.c#3 integrate .. //depot/projects/gdb/contrib/gcc/simplify-rtx.c#4 integrate .. //depot/projects/gdb/contrib/gcc/stmt.c#3 integrate .. //depot/projects/gdb/contrib/gcc/toplev.c#4 integrate .. //depot/projects/gdb/contrib/gcc/tree.c#4 integrate .. //depot/projects/gdb/contrib/gcc/unroll.c#3 integrate .. //depot/projects/gdb/contrib/gcc/version.c#4 integrate .. //depot/projects/gdb/contrib/libf2c/ChangeLog#4 integrate .. //depot/projects/gdb/contrib/libobjc/ChangeLog#4 integrate .. //depot/projects/gdb/contrib/libobjc/README#2 integrate .. //depot/projects/gdb/contrib/libpcap/CHANGES#4 integrate .. //depot/projects/gdb/contrib/libpcap/CREDITS#4 integrate .. //depot/projects/gdb/contrib/libpcap/FREEBSD-upgrade#2 integrate .. //depot/projects/gdb/contrib/libpcap/README.dag#2 integrate .. //depot/projects/gdb/contrib/libpcap/VERSION#4 integrate .. //depot/projects/gdb/contrib/libpcap/config.h.in#4 integrate .. //depot/projects/gdb/contrib/libpcap/configure#4 integrate .. //depot/projects/gdb/contrib/libpcap/configure.in#4 integrate .. //depot/projects/gdb/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/gdb/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/gdb/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/gdb/contrib/libpcap/ethertype.h#3 integrate .. //depot/projects/gdb/contrib/libpcap/fad-win32.c#3 integrate .. //depot/projects/gdb/contrib/libpcap/gencode.c#4 integrate .. //depot/projects/gdb/contrib/libpcap/gencode.h#4 integrate .. //depot/projects/gdb/contrib/libpcap/grammar.y#4 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-bpf.c#6 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-bpf.h#3 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-dag.c#3 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-dag.h#2 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-dlpi.c#4 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-int.h#4 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-linux.c#4 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-stdinc.h#2 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-win32.c#3 integrate .. //depot/projects/gdb/contrib/libpcap/pcap.3#4 integrate .. //depot/projects/gdb/contrib/libpcap/pcap.c#4 integrate .. //depot/projects/gdb/contrib/libpcap/pcap.h#4 integrate .. //depot/projects/gdb/contrib/libpcap/savefile.c#4 integrate .. //depot/projects/gdb/contrib/libpcap/scanner.l#4 integrate .. //depot/projects/gdb/contrib/libstdc++/ChangeLog#4 integrate .. //depot/projects/gdb/contrib/libstdc++/include/bits/c++config#4 integrate .. //depot/projects/gdb/contrib/libstdc++/include/bits/fstream.tcc#4 integrate .. //depot/projects/gdb/contrib/libstdc++/include/c_std/std_cmath.h#3 integrate .. //depot/projects/gdb/contrib/libstdc++/include/ext/demangle.h#2 delete .. //depot/projects/gdb/contrib/libstdc++/include/ext/hashtable.h#2 integrate .. //depot/projects/gdb/contrib/lukemftpd/src/Makefile#3 integrate .. //depot/projects/gdb/contrib/lukemftpd/src/cmds.c#3 integrate .. //depot/projects/gdb/contrib/lukemftpd/src/conf.c#3 integrate .. //depot/projects/gdb/contrib/lukemftpd/src/extern.h#3 integrate .. //depot/projects/gdb/contrib/lukemftpd/src/ftpcmd.y#3 integrate .. //depot/projects/gdb/contrib/lukemftpd/src/ftpd.8#3 integrate .. //depot/projects/gdb/contrib/lukemftpd/src/ftpd.c#3 integrate .. //depot/projects/gdb/contrib/lukemftpd/src/ftpd.conf.5#3 integrate .. //depot/projects/gdb/contrib/lukemftpd/src/logutmp.c#3 integrate .. //depot/projects/gdb/contrib/lukemftpd/src/logwtmp.c#3 integrate .. //depot/projects/gdb/contrib/lukemftpd/src/pathnames.h#3 integrate .. //depot/projects/gdb/contrib/lukemftpd/src/popen.c#3 integrate .. //depot/projects/gdb/contrib/lukemftpd/src/version.h#3 integrate .. //depot/projects/gdb/contrib/ntp/include/ntp_stdlib.h#3 integrate .. //depot/projects/gdb/contrib/ntp/include/ntpd.h#3 integrate .. //depot/projects/gdb/contrib/openbsm/FREEBSD-upgrade#2 integrate .. //depot/projects/gdb/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/gdb/contrib/openbsm/README#2 integrate .. //depot/projects/gdb/contrib/openbsm/TODO#2 integrate .. //depot/projects/gdb/contrib/openbsm/VERSION#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditfilterd/auditfilterd.h#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/gdb/contrib/openbsm/bsm/audit.h#2 delete .. //depot/projects/gdb/contrib/openbsm/bsm/audit_filter.h#2 integrate .. //depot/projects/gdb/contrib/openbsm/bsm/audit_internal.h#2 delete .. //depot/projects/gdb/contrib/openbsm/bsm/audit_kevents.h#2 delete .. //depot/projects/gdb/contrib/openbsm/bsm/audit_record.h#2 delete .. //depot/projects/gdb/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/gdb/contrib/openbsm/compat/strlcat.h#1 branch .. //depot/projects/gdb/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/gdb/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/configure#2 integrate .. //depot/projects/gdb/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/gdb/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/gdb/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/gdb/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/gdb/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/gdb/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/gdb/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/gdb/contrib/openbsm/libbsm/bsm_control.c#2 integrate .. //depot/projects/gdb/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/gdb/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/gdb/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/gdb/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/gdb/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/gdb/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/gdb/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/gdb/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/gdb/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/gdb/contrib/openbsm/test/reference/arg32_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/arg32_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/data_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/data_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/file_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/file_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/header32_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/in_addr_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/in_addr_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/ip_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/ip_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/ipc_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/ipc_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/iport_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/iport_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/opaque_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/opaque_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/path_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/path_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/process32_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/process32_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/process32ex_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/process32ex_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/return32_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/return32_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/seq_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/seq_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/subject32_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/subject32_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/subject32ex_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/subject32ex_token-IPv4#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/subject32ex_token-IPv6#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/text_record#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/text_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/reference/trailer_token#1 branch .. //depot/projects/gdb/contrib/openbsm/test/samples/execve-long-args.trail#1 branch .. //depot/projects/gdb/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/gdb/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/gdb/contrib/pnpinfo/pnpinfo.8#3 integrate .. //depot/projects/gdb/contrib/tar/ABOUT-NLS#2 delete .. //depot/projects/gdb/contrib/tar/AUTHORS#2 delete .. //depot/projects/gdb/contrib/tar/COPYING#2 delete .. //depot/projects/gdb/contrib/tar/ChangeLog#2 delete .. //depot/projects/gdb/contrib/tar/ChangeLog.1#2 delete .. //depot/projects/gdb/contrib/tar/FREEBSD-Xlist#3 delete .. //depot/projects/gdb/contrib/tar/FREEBSD-upgrade#2 delete .. //depot/projects/gdb/contrib/tar/INSTALL#2 delete .. //depot/projects/gdb/contrib/tar/NEWS#2 delete .. //depot/projects/gdb/contrib/tar/PORTS#2 delete .. //depot/projects/gdb/contrib/tar/README#2 delete .. //depot/projects/gdb/contrib/tar/README-alpha#2 delete .. //depot/projects/gdb/contrib/tar/THANKS#2 delete .. //depot/projects/gdb/contrib/tar/TODO#2 delete .. //depot/projects/gdb/contrib/tar/doc/fdl.texi#2 delete .. //depot/projects/gdb/contrib/tar/doc/freemanuals.texi#2 delete .. //depot/projects/gdb/contrib/tar/doc/getdate.texi#2 delete .. //depot/projects/gdb/contrib/tar/doc/header.texi#2 delete .. //depot/projects/gdb/contrib/tar/doc/tar.texi#2 delete .. //depot/projects/gdb/contrib/tar/doc/version.texi#2 delete .. //depot/projects/gdb/contrib/tar/lib/addext.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/alloca.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/argmatch.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/argmatch.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/backupfile.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/backupfile.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/basename.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/dirname.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/dirname.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/error.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/error.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/exclude.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/exclude.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/fileblocks.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/fnmatch.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/fnmatch.hin#2 delete .. //depot/projects/gdb/contrib/tar/lib/ftruncate.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/full-write.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/full-write.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/getdate.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/getdate.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/getline.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/getline.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/getstr.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/getstr.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/hash.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/hash.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/human.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/human.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/lchown.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/lchown.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/malloc.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/memset.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/mktime.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/modechange.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/modechange.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/msleep.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/prepargs.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/prepargs.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/print-copyr.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/print-copyr.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/quote.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/quote.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/quotearg.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/quotearg.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/readutmp.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/realloc.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/rename.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/rmdir.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/safe-read.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/safe-read.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/save-cwd.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/save-cwd.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/savedir.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/savedir.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/stpcpy.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/strcasecmp.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/strncasecmp.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/strstr.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/strtoimax.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/strtol.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/strtoll.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/strtoul.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/strtoull.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/strtoumax.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/unicodeio.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/unicodeio.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/utime.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/waitpid.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/xalloc.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/xgetcwd.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/xmalloc.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/xstrdup.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/xstrtoimax.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/xstrtol.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/xstrtol.h#2 delete .. //depot/projects/gdb/contrib/tar/lib/xstrtoul.c#2 delete .. //depot/projects/gdb/contrib/tar/lib/xstrtoumax.c#2 delete .. //depot/projects/gdb/contrib/tar/src/arith.h#2 delete .. //depot/projects/gdb/contrib/tar/src/buffer.c#2 delete .. //depot/projects/gdb/contrib/tar/src/common.h#2 delete .. //depot/projects/gdb/contrib/tar/src/compare.c#2 delete .. //depot/projects/gdb/contrib/tar/src/create.c#2 delete .. //depot/projects/gdb/contrib/tar/src/delete.c#2 delete .. //depot/projects/gdb/contrib/tar/src/extract.c#2 delete .. //depot/projects/gdb/contrib/tar/src/incremen.c#2 delete .. //depot/projects/gdb/contrib/tar/src/list.c#2 delete .. //depot/projects/gdb/contrib/tar/src/mangle.c#2 delete .. //depot/projects/gdb/contrib/tar/src/misc.c#2 delete .. //depot/projects/gdb/contrib/tar/src/names.c#2 delete .. //depot/projects/gdb/contrib/tar/src/rmt.c#2 delete .. //depot/projects/gdb/contrib/tar/src/rmt.h#2 delete .. //depot/projects/gdb/contrib/tar/src/rtapelib.c#2 delete .. //depot/projects/gdb/contrib/tar/src/system.h#2 delete .. //depot/projects/gdb/contrib/tar/src/tar.c#2 delete .. //depot/projects/gdb/contrib/tar/src/tar.h#2 delete .. //depot/projects/gdb/contrib/tar/src/update.c#2 delete .. //depot/projects/gdb/contrib/tcpdump/CHANGES#4 integrate .. //depot/projects/gdb/contrib/tcpdump/CREDITS#4 integrate .. //depot/projects/gdb/contrib/tcpdump/FILES#4 integrate .. //depot/projects/gdb/contrib/tcpdump/INSTALL#4 integrate .. //depot/projects/gdb/contrib/tcpdump/Makefile.in#4 integrate .. //depot/projects/gdb/contrib/tcpdump/VERSION#4 integrate .. //depot/projects/gdb/contrib/tcpdump/addrtoname.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/configure#4 integrate .. //depot/projects/gdb/contrib/tcpdump/configure.in#4 integrate .. //depot/projects/gdb/contrib/tcpdump/dccp.h#1 branch .. //depot/projects/gdb/contrib/tcpdump/ethertype.h#4 integrate .. //depot/projects/gdb/contrib/tcpdump/icmp6.h#4 integrate .. //depot/projects/gdb/contrib/tcpdump/interface.h#4 integrate .. //depot/projects/gdb/contrib/tcpdump/ipproto.c#2 integrate .. //depot/projects/gdb/contrib/tcpdump/ipproto.h#3 integrate .. //depot/projects/gdb/contrib/tcpdump/llc.h#4 integrate .. //depot/projects/gdb/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/gdb/contrib/tcpdump/ospf.h#4 integrate .. //depot/projects/gdb/contrib/tcpdump/ppp.h#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-802_11.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ap1394.c#3 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ascii.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-atm.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-chdlc.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-cip.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-dccp.c#1 branch .. //depot/projects/gdb/contrib/tcpdump/print-ether.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-fddi.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-fr.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-icmp6.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ip.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ip6.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ipfc.c#3 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ipx.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-isoclns.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/gdb/contrib/tcpdump/print-lane.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ldp.c#3 integrate .. //depot/projects/gdb/contrib/tcpdump/print-llc.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-null.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ospf.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-pflog.c#3 integrate .. //depot/projects/gdb/contrib/tcpdump/print-pim.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-radius.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-rsvp.c#3 integrate .. //depot/projects/gdb/contrib/tcpdump/print-sctp.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-sll.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-slow.c#1 branch .. //depot/projects/gdb/contrib/tcpdump/print-symantec.c#2 integrate .. //depot/projects/gdb/contrib/tcpdump/print-tcp.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-token.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/tcpdump-stdinc.h#3 integrate .. //depot/projects/gdb/contrib/tcpdump/tcpdump.1#4 integrate .. //depot/projects/gdb/contrib/tcpdump/tcpdump.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/tests/.cvsignore#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/alltests.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/bgp_vpn_attrset.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/bgp_vpn_attrset.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/eapon1.gdbinit#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/eapon1.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/eapon1.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/eapon1.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/eapon2.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp-secrets.txt#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp0.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp0.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp1.gdbinit#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp1.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp1.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp2.gdbinit#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp2.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp2.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp3.gdbinit#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp3.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp4.gdbinit#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp4.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp5.gdbinit#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp5.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/esp5.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/espudp1.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/espudp1.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/espudp1.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/isakmp-delete-segfault.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/isakmp-identification-segfault.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/isakmp-pointer-loop.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/isakmp1.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/isakmp1.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/isakmp2.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/isakmp2.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/isakmp3.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/isakmp3.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/isakmp4.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/isakmp4.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/isakmp4500.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/lmp.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/lmp.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/lmp.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/mpls-ldp-hello.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/mpls-ldp-hello.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/mpls-ldp-hello.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/ospf-gmpls.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/ospf-gmpls.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/ospf-gmpls.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/print-A.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/print-AA.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/print-X.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/print-XX.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/print-capX.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/print-capXX.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/print-flags.puu#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/print-flags.sh#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/print-x.out#1 branch .. //depot/projects/gdb/contrib/tcpdump/tests/print-xx.out#1 branch .. //depot/projects/gdb/contrib/telnet/telnet/telnet.1#3 integrate .. //depot/projects/gdb/contrib/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/gdb/crypto/openssh/CREDITS#4 integrate .. //depot/projects/gdb/crypto/openssh/ChangeLog#5 integrate .. //depot/projects/gdb/crypto/openssh/FREEBSD-upgrade#5 integrate .. //depot/projects/gdb/crypto/openssh/INSTALL#4 integrate .. //depot/projects/gdb/crypto/openssh/LICENCE#4 integrate .. //depot/projects/gdb/crypto/openssh/Makefile.in#4 integrate .. //depot/projects/gdb/crypto/openssh/OVERVIEW#4 integrate .. //depot/projects/gdb/crypto/openssh/README#5 integrate .. //depot/projects/gdb/crypto/openssh/README.platform#3 integrate .. //depot/projects/gdb/crypto/openssh/README.tun#2 integrate .. //depot/projects/gdb/crypto/openssh/acss.c#3 integrate .. //depot/projects/gdb/crypto/openssh/atomicio.c#3 integrate .. //depot/projects/gdb/crypto/openssh/atomicio.h#3 integrate .. //depot/projects/gdb/crypto/openssh/audit-bsm.c#2 integrate .. //depot/projects/gdb/crypto/openssh/audit.c#2 integrate .. //depot/projects/gdb/crypto/openssh/audit.h#2 integrate .. //depot/projects/gdb/crypto/openssh/auth-bsdauth.c#3 integrate .. //depot/projects/gdb/crypto/openssh/auth-chall.c#4 integrate .. //depot/projects/gdb/crypto/openssh/auth-krb5.c#5 integrate .. //depot/projects/gdb/crypto/openssh/auth-options.c#3 integrate .. //depot/projects/gdb/crypto/openssh/auth-options.h#3 integrate .. //depot/projects/gdb/crypto/openssh/auth-pam.c#5 integrate .. //depot/projects/gdb/crypto/openssh/auth-passwd.c#5 integrate .. //depot/projects/gdb/crypto/openssh/auth-rh-rsa.c#4 integrate .. //depot/projects/gdb/crypto/openssh/auth-rhosts.c#4 integrate .. //depot/projects/gdb/crypto/openssh/auth-rsa.c#4 integrate .. //depot/projects/gdb/crypto/openssh/auth-shadow.c#3 integrate .. //depot/projects/gdb/crypto/openssh/auth-sia.c#5 integrate .. //depot/projects/gdb/crypto/openssh/auth-skey.c#4 integrate .. //depot/projects/gdb/crypto/openssh/auth.c#4 integrate .. //depot/projects/gdb/crypto/openssh/auth.h#5 integrate .. //depot/projects/gdb/crypto/openssh/auth1.c#5 integrate .. //depot/projects/gdb/crypto/openssh/auth2-chall.c#3 integrate .. //depot/projects/gdb/crypto/openssh/auth2-gss.c#4 integrate .. //depot/projects/gdb/crypto/openssh/auth2-hostbased.c#3 integrate .. //depot/projects/gdb/crypto/openssh/auth2-kbdint.c#3 integrate .. //depot/projects/gdb/crypto/openssh/auth2-none.c#3 integrate .. //depot/projects/gdb/crypto/openssh/auth2-passwd.c#4 integrate .. //depot/projects/gdb/crypto/openssh/auth2-pubkey.c#4 integrate .. //depot/projects/gdb/crypto/openssh/auth2.c#5 integrate .. //depot/projects/gdb/crypto/openssh/authfd.c#4 integrate .. //depot/projects/gdb/crypto/openssh/authfd.h#3 integrate .. //depot/projects/gdb/crypto/openssh/authfile.c#4 integrate .. //depot/projects/gdb/crypto/openssh/authfile.h#2 integrate .. //depot/projects/gdb/crypto/openssh/bufaux.c#4 integrate .. //depot/projects/gdb/crypto/openssh/bufaux.h#4 integrate .. //depot/projects/gdb/crypto/openssh/bufbn.c#1 branch .. //depot/projects/gdb/crypto/openssh/buffer.c#4 integrate .. //depot/projects/gdb/crypto/openssh/buffer.h#3 integrate .. //depot/projects/gdb/crypto/openssh/buildpkg.sh.in#2 integrate .. //depot/projects/gdb/crypto/openssh/canohost.c#5 integrate .. //depot/projects/gdb/crypto/openssh/canohost.h#3 integrate .. //depot/projects/gdb/crypto/openssh/channels.c#4 integrate .. //depot/projects/gdb/crypto/openssh/channels.h#4 integrate .. //depot/projects/gdb/crypto/openssh/cipher-3des1.c#3 integrate .. //depot/projects/gdb/crypto/openssh/cipher-acss.c#3 integrate .. //depot/projects/gdb/crypto/openssh/cipher-aes.c#4 integrate .. //depot/projects/gdb/crypto/openssh/cipher-bf1.c#2 integrate .. //depot/projects/gdb/crypto/openssh/cipher-ctr.c#4 integrate .. //depot/projects/gdb/crypto/openssh/cipher.c#4 integrate .. //depot/projects/gdb/crypto/openssh/cipher.h#4 integrate .. //depot/projects/gdb/crypto/openssh/cleanup.c#2 integrate .. //depot/projects/gdb/crypto/openssh/clientloop.c#4 integrate .. //depot/projects/gdb/crypto/openssh/clientloop.h#4 integrate .. //depot/projects/gdb/crypto/openssh/compat.c#4 integrate .. //depot/projects/gdb/crypto/openssh/compat.h#4 integrate .. //depot/projects/gdb/crypto/openssh/compress.c#3 integrate .. //depot/projects/gdb/crypto/openssh/compress.h#2 integrate .. //depot/projects/gdb/crypto/openssh/config.h#5 integrate .. //depot/projects/gdb/crypto/openssh/configure.ac#5 integrate .. //depot/projects/gdb/crypto/openssh/crc32.c#2 integrate .. //depot/projects/gdb/crypto/openssh/crc32.h#2 integrate .. //depot/projects/gdb/crypto/openssh/deattack.c#2 integrate .. //depot/projects/gdb/crypto/openssh/deattack.h#2 integrate .. //depot/projects/gdb/crypto/openssh/defines.h#5 integrate .. //depot/projects/gdb/crypto/openssh/dh.c#5 integrate .. //depot/projects/gdb/crypto/openssh/dh.h#3 integrate .. //depot/projects/gdb/crypto/openssh/dispatch.c#2 integrate .. //depot/projects/gdb/crypto/openssh/dispatch.h#2 integrate .. //depot/projects/gdb/crypto/openssh/dns.c#4 integrate .. //depot/projects/gdb/crypto/openssh/dns.h#4 integrate .. //depot/projects/gdb/crypto/openssh/entropy.c#4 integrate .. //depot/projects/gdb/crypto/openssh/fatal.c#3 integrate .. //depot/projects/gdb/crypto/openssh/getput.h#2 delete .. //depot/projects/gdb/crypto/openssh/groupaccess.c#3 integrate .. //depot/projects/gdb/crypto/openssh/groupaccess.h#2 integrate .. //depot/projects/gdb/crypto/openssh/gss-genr.c#4 integrate .. //depot/projects/gdb/crypto/openssh/gss-serv-krb5.c#5 integrate .. //depot/projects/gdb/crypto/openssh/gss-serv.c#4 integrate .. //depot/projects/gdb/crypto/openssh/hostfile.c#4 integrate .. //depot/projects/gdb/crypto/openssh/hostfile.h#4 integrate .. //depot/projects/gdb/crypto/openssh/includes.h#4 integrate .. //depot/projects/gdb/crypto/openssh/kex.c#4 integrate .. //depot/projects/gdb/crypto/openssh/kex.h#3 integrate .. //depot/projects/gdb/crypto/openssh/kexdh.c#3 integrate .. //depot/projects/gdb/crypto/openssh/kexdhc.c#3 integrate .. //depot/projects/gdb/crypto/openssh/kexdhs.c#3 integrate .. //depot/projects/gdb/crypto/openssh/kexgex.c#3 integrate .. //depot/projects/gdb/crypto/openssh/kexgexc.c#4 integrate .. //depot/projects/gdb/crypto/openssh/kexgexs.c#3 integrate .. //depot/projects/gdb/crypto/openssh/key.c#4 integrate .. //depot/projects/gdb/crypto/openssh/key.h#3 integrate .. //depot/projects/gdb/crypto/openssh/log.c#4 integrate .. //depot/projects/gdb/crypto/openssh/log.h#4 integrate .. //depot/projects/gdb/crypto/openssh/loginrec.c#5 integrate .. //depot/projects/gdb/crypto/openssh/loginrec.h#3 integrate .. //depot/projects/gdb/crypto/openssh/logintest.c#3 integrate .. //depot/projects/gdb/crypto/openssh/mac.c#4 integrate .. //depot/projects/gdb/crypto/openssh/mac.h#2 integrate .. //depot/projects/gdb/crypto/openssh/match.c#3 integrate .. //depot/projects/gdb/crypto/openssh/match.h#2 integrate .. //depot/projects/gdb/crypto/openssh/md-sha256.c#1 branch .. //depot/projects/gdb/crypto/openssh/md5crypt.c#3 integrate .. //depot/projects/gdb/crypto/openssh/misc.c#4 integrate .. //depot/projects/gdb/crypto/openssh/misc.h#3 integrate .. //depot/projects/gdb/crypto/openssh/moduli.c#4 integrate .. //depot/projects/gdb/crypto/openssh/monitor.c#5 integrate .. //depot/projects/gdb/crypto/openssh/monitor.h#4 integrate .. //depot/projects/gdb/crypto/openssh/monitor_fdpass.c#3 integrate .. //depot/projects/gdb/crypto/openssh/monitor_fdpass.h#2 integrate .. //depot/projects/gdb/crypto/openssh/monitor_mm.c#3 integrate .. //depot/projects/gdb/crypto/openssh/monitor_mm.h#2 integrate .. //depot/projects/gdb/crypto/openssh/monitor_wrap.c#5 integrate .. //depot/projects/gdb/crypto/openssh/monitor_wrap.h#5 integrate .. //depot/projects/gdb/crypto/openssh/msg.c#4 integrate .. //depot/projects/gdb/crypto/openssh/msg.h#3 integrate .. //depot/projects/gdb/crypto/openssh/myproposal.h#3 integrate .. //depot/projects/gdb/crypto/openssh/nchan.c#3 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/Makefile.in#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/basename.c#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bindresvport.c#3 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-arc4random.c#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-asprintf.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-closefrom.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-cray.c#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-getpeereid.c#3 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-misc.c#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-nextstep.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-openpty.c#3 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-snprintf.c#3 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/bsd-waitpid.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/daemon.c#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/fake-rfc2553.c#3 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/fake-rfc2553.h#6 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/getrrsetbyname.c#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/glob.c#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/glob.h#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/mktemp.c#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/openbsd-compat.h#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/port-aix.c#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/port-aix.h#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/port-irix.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/port-linux.c#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/port-linux.h#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/port-solaris.c#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/port-solaris.h#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/port-tun.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/port-tun.h#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/readpassphrase.c#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/regress/Makefile.in#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/regress/closefromtest.c#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/regress/snprintftest.c#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/regress/strduptest.c#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/regress/strtonumtest.c#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/rresvport.c#4 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/setproctitle.c#3 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/sha2.c#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/sha2.h#1 branch .. //depot/projects/gdb/crypto/openssh/openbsd-compat/strtonum.c#2 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/xcrypt.c#5 integrate .. //depot/projects/gdb/crypto/openssh/openbsd-compat/xmmap.c#3 integrate .. //depot/projects/gdb/crypto/openssh/openssh.xml.in#1 branch .. //depot/projects/gdb/crypto/openssh/packet.c#4 integrate .. //depot/projects/gdb/crypto/openssh/packet.h#3 integrate .. //depot/projects/gdb/crypto/openssh/pathnames.h#4 integrate .. //depot/projects/gdb/crypto/openssh/platform.c#1 branch .. //depot/projects/gdb/crypto/openssh/platform.h#1 branch .. //depot/projects/gdb/crypto/openssh/progressmeter.c#4 integrate .. //depot/projects/gdb/crypto/openssh/progressmeter.h#2 integrate .. //depot/projects/gdb/crypto/openssh/readconf.c#5 integrate .. //depot/projects/gdb/crypto/openssh/readconf.h#5 integrate .. //depot/projects/gdb/crypto/openssh/readpass.c#3 integrate .. //depot/projects/gdb/crypto/openssh/regress/Makefile#5 integrate .. //depot/projects/gdb/crypto/openssh/regress/agent-getpeereid.sh#3 integrate .. //depot/projects/gdb/crypto/openssh/regress/cfgmatch.sh#1 branch .. //depot/projects/gdb/crypto/openssh/regress/cipher-speed.sh#1 branch .. //depot/projects/gdb/crypto/openssh/regress/forcecommand.sh#1 branch .. //depot/projects/gdb/crypto/openssh/regress/forwarding.sh#3 integrate .. //depot/projects/gdb/crypto/openssh/rsa.c#2 integrate .. //depot/projects/gdb/crypto/openssh/rsa.h#2 integrate .. //depot/projects/gdb/crypto/openssh/scard-opensc.c#4 integrate .. //depot/projects/gdb/crypto/openssh/scard.c#3 integrate .. //depot/projects/gdb/crypto/openssh/scard.h#2 integrate .. //depot/projects/gdb/crypto/openssh/scp.1#5 integrate .. //depot/projects/gdb/crypto/openssh/scp.c#4 integrate .. //depot/projects/gdb/crypto/openssh/servconf.c#5 integrate .. //depot/projects/gdb/crypto/openssh/servconf.h#4 integrate .. //depot/projects/gdb/crypto/openssh/serverloop.c#4 integrate .. //depot/projects/gdb/crypto/openssh/serverloop.h#2 integrate .. //depot/projects/gdb/crypto/openssh/session.c#5 integrate .. //depot/projects/gdb/crypto/openssh/session.h#4 integrate .. //depot/projects/gdb/crypto/openssh/sftp-client.c#5 integrate .. //depot/projects/gdb/crypto/openssh/sftp-common.c#3 integrate .. //depot/projects/gdb/crypto/openssh/sftp-common.h#4 integrate .. //depot/projects/gdb/crypto/openssh/sftp-glob.c#3 integrate .. //depot/projects/gdb/crypto/openssh/sftp-server.8#3 integrate .. //depot/projects/gdb/crypto/openssh/sftp-server.c#4 integrate .. //depot/projects/gdb/crypto/openssh/sftp.c#5 integrate .. //depot/projects/gdb/crypto/openssh/sftp.h#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-add.c#4 integrate .. //depot/projects/gdb/crypto/openssh/ssh-agent.1#3 integrate .. //depot/projects/gdb/crypto/openssh/ssh-agent.c#5 integrate .. //depot/projects/gdb/crypto/openssh/ssh-dss.c#3 integrate .. //depot/projects/gdb/crypto/openssh/ssh-gss.h#4 integrate .. //depot/projects/gdb/crypto/openssh/ssh-keygen.c#4 integrate .. //depot/projects/gdb/crypto/openssh/ssh-keyscan.c#5 integrate .. //depot/projects/gdb/crypto/openssh/ssh-keysign.8#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh-keysign.c#4 integrate .. //depot/projects/gdb/crypto/openssh/ssh-rand-helper.c#4 integrate .. //depot/projects/gdb/crypto/openssh/ssh-rsa.c#4 integrate .. //depot/projects/gdb/crypto/openssh/ssh.1#5 integrate .. //depot/projects/gdb/crypto/openssh/ssh.c#5 integrate .. //depot/projects/gdb/crypto/openssh/ssh.h#4 integrate .. //depot/projects/gdb/crypto/openssh/ssh1.h#3 integrate .. //depot/projects/gdb/crypto/openssh/ssh2.h#2 integrate .. //depot/projects/gdb/crypto/openssh/ssh_config#5 integrate .. //depot/projects/gdb/crypto/openssh/ssh_config.5#5 integrate .. //depot/projects/gdb/crypto/openssh/ssh_namespace.h#2 integrate .. //depot/projects/gdb/crypto/openssh/sshconnect.c#4 integrate .. //depot/projects/gdb/crypto/openssh/sshconnect.h#3 integrate .. //depot/projects/gdb/crypto/openssh/sshconnect1.c#3 integrate .. //depot/projects/gdb/crypto/openssh/sshconnect2.c#5 integrate .. //depot/projects/gdb/crypto/openssh/sshd.8#4 integrate .. //depot/projects/gdb/crypto/openssh/sshd.c#5 integrate .. //depot/projects/gdb/crypto/openssh/sshd_config#7 integrate .. //depot/projects/gdb/crypto/openssh/sshd_config.5#7 integrate .. //depot/projects/gdb/crypto/openssh/sshlogin.c#4 integrate .. //depot/projects/gdb/crypto/openssh/sshlogin.h#2 integrate .. //depot/projects/gdb/crypto/openssh/sshpty.c#4 integrate .. //depot/projects/gdb/crypto/openssh/sshpty.h#3 integrate .. //depot/projects/gdb/crypto/openssh/sshtty.c#4 integrate .. //depot/projects/gdb/crypto/openssh/ttymodes.c#3 integrate .. //depot/projects/gdb/crypto/openssh/ttymodes.h#3 integrate .. //depot/projects/gdb/crypto/openssh/uidswap.c#4 integrate .. //depot/projects/gdb/crypto/openssh/uidswap.h#2 integrate .. //depot/projects/gdb/crypto/openssh/uuencode.c#3 integrate .. //depot/projects/gdb/crypto/openssh/uuencode.h#3 integrate .. //depot/projects/gdb/crypto/openssh/version.h#5 integrate .. //depot/projects/gdb/crypto/openssh/xmalloc.c#2 integrate .. //depot/projects/gdb/crypto/openssh/xmalloc.h#2 integrate .. //depot/projects/gdb/crypto/openssl/CHANGES#4 integrate .. //depot/projects/gdb/crypto/openssl/Configure#4 integrate .. //depot/projects/gdb/crypto/openssl/FAQ#4 integrate .. //depot/projects/gdb/crypto/openssl/LICENSE#4 integrate .. //depot/projects/gdb/crypto/openssl/Makefile#2 integrate .. //depot/projects/gdb/crypto/openssl/Makefile.org#4 integrate .. //depot/projects/gdb/crypto/openssl/Makefile.shared#2 integrate .. //depot/projects/gdb/crypto/openssl/NEWS#4 integrate .. //depot/projects/gdb/crypto/openssl/README#4 integrate .. //depot/projects/gdb/crypto/openssl/apps/CA.pl#4 integrate .. //depot/projects/gdb/crypto/openssl/apps/dsa.c#3 integrate .. //depot/projects/gdb/crypto/openssl/apps/enc.c#4 integrate .. //depot/projects/gdb/crypto/openssl/apps/gendsa.c#3 integrate .. //depot/projects/gdb/crypto/openssl/apps/genrsa.c#3 integrate .. //depot/projects/gdb/crypto/openssl/apps/openssl.c#3 integrate .. //depot/projects/gdb/crypto/openssl/apps/pkcs12.c#4 integrate .. //depot/projects/gdb/crypto/openssl/apps/progs.h#3 integrate .. //depot/projects/gdb/crypto/openssl/apps/progs.pl#3 integrate .. //depot/projects/gdb/crypto/openssl/apps/rsa.c#3 integrate .. //depot/projects/gdb/crypto/openssl/apps/smime.c#3 integrate .. //depot/projects/gdb/crypto/openssl/apps/speed.c#4 integrate .. //depot/projects/gdb/crypto/openssl/config#4 integrate .. //depot/projects/gdb/crypto/openssl/crypto/aes/Makefile#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/aes/aes.h#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/aes/aes_core.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/aes/aes_ige.c#1 branch .. //depot/projects/gdb/crypto/openssl/crypto/aes/asm/aes-586.pl#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/asn1/tasn_dec.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/asn1/x_req.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#4 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bn/bn_mont.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/bn/bn_prime.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/camellia/Makefile#1 branch .. //depot/projects/gdb/crypto/openssl/crypto/camellia/camellia.c#1 branch .. //depot/projects/gdb/crypto/openssl/crypto/camellia/camellia.h#1 branch .. //depot/projects/gdb/crypto/openssl/crypto/camellia/cmll_cbc.c#1 branch .. //depot/projects/gdb/crypto/openssl/crypto/camellia/cmll_cfb.c#1 branch .. //depot/projects/gdb/crypto/openssl/crypto/camellia/cmll_ctr.c#1 branch .. //depot/projects/gdb/crypto/openssl/crypto/camellia/cmll_ecb.c#1 branch .. //depot/projects/gdb/crypto/openssl/crypto/camellia/cmll_locl.h#1 branch .. //depot/projects/gdb/crypto/openssl/crypto/camellia/cmll_misc.c#1 branch .. //depot/projects/gdb/crypto/openssl/crypto/camellia/cmll_ofb.c#1 branch .. //depot/projects/gdb/crypto/openssl/crypto/dh/dh.h#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/dh/dh_err.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/dh/dh_key.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/dsa/dsa.h#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/dsa/dsa_err.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/dsa/dsa_ossl.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/ec/ec.h#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/ec/ec_asn1.c#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/ec/ec_err.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/err/err.c#4 integrate .. //depot/projects/gdb/crypto/openssl/crypto/evp/Makefile#2 integrate .. //depot/projects/gdb/crypto/openssl/crypto/evp/c_allc.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/evp/e_camellia.c#1 branch .. //depot/projects/gdb/crypto/openssl/crypto/evp/evp.h#4 integrate .. //depot/projects/gdb/crypto/openssl/crypto/evp/evp_err.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/evp/evp_test.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/evp/evptests.txt#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/objects/obj_dat.h#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/objects/obj_mac.h#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/objects/obj_mac.num#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/objects/objects.txt#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/opensslconf.h#4 integrate .. //depot/projects/gdb/crypto/openssl/crypto/opensslv.h#4 integrate .. //depot/projects/gdb/crypto/openssl/crypto/pkcs12/p12_mutl.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/pkcs7/pk7_smime.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rand/rand_unix.c#4 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rsa/rsa.h#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rsa/rsa_eay.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rsa/rsa_err.c#3 integrate .. //depot/projects/gdb/crypto/openssl/crypto/rsa/rsa_sign.c#3 integrate .. //depot/projects/gdb/crypto/openssl/doc/apps/ciphers.pod#2 integrate .. //depot/projects/gdb/crypto/openssl/doc/apps/smime.pod#3 integrate .. //depot/projects/gdb/crypto/openssl/doc/standards.txt#3 integrate .. //depot/projects/gdb/crypto/openssl/openssl.spec#4 integrate .. //depot/projects/gdb/crypto/openssl/ssl/d1_pkt.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s2_clnt.c#4 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s2_lib.c#4 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s3_lib.c#4 integrate .. //depot/projects/gdb/crypto/openssl/ssl/s3_srvr.c#4 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl.h#4 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl_algs.c#3 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl_cert.c#4 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl_ciph.c#4 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl_lib.c#4 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl_locl.h#3 integrate .. //depot/projects/gdb/crypto/openssl/ssl/t1_enc.c#3 integrate .. //depot/projects/gdb/crypto/openssl/ssl/tls1.h#3 integrate .. //depot/projects/gdb/crypto/openssl/test/Makefile#2 integrate .. //depot/projects/gdb/crypto/openssl/test/evptests.txt#3 integrate .. //depot/projects/gdb/crypto/openssl/test/igetest.c#1 branch .. //depot/projects/gdb/crypto/openssl/tools/c_rehash#4 integrate .. //depot/projects/gdb/crypto/openssl/util/libeay.num#3 integrate .. //depot/projects/gdb/crypto/openssl/util/mk1mf.pl#4 integrate .. //depot/projects/gdb/crypto/openssl/util/mkdef.pl#4 integrate .. //depot/projects/gdb/crypto/openssl/util/mkfiles.pl#3 integrate .. //depot/projects/gdb/crypto/openssl/util/pl/Mingw32.pl#3 integrate .. //depot/projects/gdb/etc/Makefile#7 integrate .. //depot/projects/gdb/etc/defaults/periodic.conf#5 integrate .. //depot/projects/gdb/etc/defaults/rc.conf#18 integrate .. //depot/projects/gdb/etc/etc.alpha/ttys#2 delete .. //depot/projects/gdb/etc/freebsd-update.conf#1 branch .. //depot/projects/gdb/etc/hosts.allow#5 integrate .. //depot/projects/gdb/etc/inetd.conf#8 integrate .. //depot/projects/gdb/etc/libalias.conf#1 branch .. //depot/projects/gdb/etc/mtree/BSD.include.dist#12 integrate .. //depot/projects/gdb/etc/mtree/BSD.local.dist#9 integrate .. //depot/projects/gdb/etc/mtree/BSD.usr.dist#10 integrate .. //depot/projects/gdb/etc/mtree/BSD.var.dist#4 integrate .. //depot/projects/gdb/etc/network.subr#5 integrate .. //depot/projects/gdb/etc/pccard_ether#7 integrate .. //depot/projects/gdb/etc/periodic/security/410.logincheck#1 branch .. //depot/projects/gdb/etc/periodic/security/Makefile#3 integrate .. //depot/projects/gdb/etc/periodic/weekly/120.clean-kvmdb#2 delete .. //depot/projects/gdb/etc/periodic/weekly/Makefile#2 integrate .. //depot/projects/gdb/etc/phones#2 integrate .. //depot/projects/gdb/etc/rc.d/Makefile#13 integrate .. //depot/projects/gdb/etc/rc.d/auditd#2 integrate .. //depot/projects/gdb/etc/rc.d/auto_linklocal#1 branch .. //depot/projects/gdb/etc/rc.d/bthidd#1 branch .. //depot/projects/gdb/etc/rc.d/devd#4 integrate .. //depot/projects/gdb/etc/rc.d/dhclient#8 integrate .. //depot/projects/gdb/etc/rc.d/mixer#4 integrate .. //depot/projects/gdb/etc/rc.d/mrouted#5 integrate .. //depot/projects/gdb/etc/rc.d/powerd#2 integrate .. //depot/projects/gdb/etc/rc.initdiskless#3 integrate .. //depot/projects/gdb/etc/rc.subr#12 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#14 integrate .. //depot/projects/gdb/games/fortune/datfiles/limerick#3 integrate .. //depot/projects/gdb/games/fortune/datfiles/startrek#3 integrate .. //depot/projects/gdb/gnu/lib/libstdc++/Makefile#5 integrate .. //depot/projects/gdb/gnu/lib/libstdc++/config.h#4 integrate .. //depot/projects/gdb/gnu/usr.bin/Makefile#9 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/Makefile.inc#3 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/as/Makefile#5 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h#1 branch .. //depot/projects/gdb/gnu/usr.bin/binutils/ld/Makefile.arm#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/ld/armelf_fbsd.sh#1 branch .. //depot/projects/gdb/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh#1 branch .. //depot/projects/gdb/gnu/usr.bin/binutils/ld/genscripts.sh#3 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.arm#3 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/config.h#5 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/Makefile.inc#2 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/Makefile.tgt#3 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc/Makefile#5 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc_int/Makefile#5 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc_int/amd64.patch#2 delete .. //depot/projects/gdb/gnu/usr.bin/cc/cc_tools/Makefile#7 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff#1 branch .. //depot/projects/gdb/gnu/usr.bin/cc/cc_tools/arm.md.diff#1 branch .. //depot/projects/gdb/gnu/usr.bin/cc/cc_tools/freebsd-native.h#4 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cpp/Makefile#3 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/arm/Makefile#1 branch .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#1 branch .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#1 branch .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/arm/config.h#1 branch .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/arm/init.c#1 branch .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#1 branch .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/arm/tm-fbsd.h#1 branch .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/arm/xm-fbsd.h#1 branch .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kthr.c#6 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_arm.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gzip/gzip.h#3 integrate .. //depot/projects/gdb/gnu/usr.bin/gzip/inflate.c#3 integrate .. //depot/projects/gdb/gnu/usr.bin/gzip/unlzh.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gzip/unpack.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/tar/Makefile#7 delete .. //depot/projects/gdb/gnu/usr.bin/tar/config.h#2 delete .. //depot/projects/gdb/gnu/usr.bin/tar/doc/Makefile#2 delete .. //depot/projects/gdb/gnu/usr.bin/tar/localedir.h#2 delete .. //depot/projects/gdb/gnu/usr.bin/tar/tar.1#4 delete .. //depot/projects/gdb/include/Makefile#13 integrate .. //depot/projects/gdb/include/elf.h#2 integrate .. //depot/projects/gdb/lib/Makefile#14 integrate .. //depot/projects/gdb/lib/libalias/Makefile#7 integrate .. //depot/projects/gdb/lib/libalias/libalias/Makefile#1 branch .. //depot/projects/gdb/lib/libalias/modules/Makefile#1 branch .. //depot/projects/gdb/lib/libalias/modules/Makefile.inc#1 branch .. //depot/projects/gdb/lib/libalias/modules/cuseeme/Makefile#1 branch .. //depot/projects/gdb/lib/libalias/modules/dummy/Makefile#1 branch .. //depot/projects/gdb/lib/libalias/modules/ftp/Makefile#1 branch .. //depot/projects/gdb/lib/libalias/modules/irc/Makefile#1 branch .. //depot/projects/gdb/lib/libalias/modules/nbt/Makefile#1 branch .. //depot/projects/gdb/lib/libalias/modules/pptp/Makefile#1 branch .. //depot/projects/gdb/lib/libalias/modules/skinny/Makefile#1 branch .. //depot/projects/gdb/lib/libalias/modules/smedia/Makefile#1 branch .. //depot/projects/gdb/lib/libarchive/Makefile#14 integrate .. //depot/projects/gdb/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_private.h#15 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.3#13 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.c#11 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#26 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_open_file.c#8 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_none.c#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#19 integrate .. //depot/projects/gdb/lib/libarchive/archive_write.c#12 integrate .. //depot/projects/gdb/lib/libarchive/tar.5#9 integrate .. //depot/projects/gdb/lib/libbsm/Makefile#2 integrate .. //depot/projects/gdb/lib/libc/gen/arc4random.c#5 integrate .. //depot/projects/gdb/lib/libc/gen/err.3#3 integrate .. //depot/projects/gdb/lib/libc/gen/getgrent.c#4 integrate .. //depot/projects/gdb/lib/libc/gen/pwcache.3#3 integrate .. //depot/projects/gdb/lib/libc/gen/tls.c#3 integrate .. //depot/projects/gdb/lib/libc/gen/vis.3#7 integrate .. //depot/projects/gdb/lib/libc/i386/gen/Makefile.inc#5 integrate .. //depot/projects/gdb/lib/libc/i386/gen/alloca.S#2 delete .. //depot/projects/gdb/lib/libc/i386/sys/i386_set_watch.3#4 integrate .. //depot/projects/gdb/lib/libc/ia64/gen/_set_tp.c#2 integrate .. //depot/projects/gdb/lib/libc/isc/eventlib_p.h#2 integrate .. //depot/projects/gdb/lib/libc/net/gai_strerror.3#2 integrate .. //depot/projects/gdb/lib/libc/net/gethostbyname.3#5 integrate .. //depot/projects/gdb/lib/libc/posix1e/mac_is_present.3#2 integrate .. //depot/projects/gdb/lib/libc/powerpc/gen/_set_tp.c#2 integrate .. //depot/projects/gdb/lib/libc/rpc/clnt_bcast.c#3 integrate .. //depot/projects/gdb/lib/libc/rpc/clnt_vc.c#4 integrate .. //depot/projects/gdb/lib/libc/rpc/getnetconfig.c#4 integrate .. //depot/projects/gdb/lib/libc/rpc/getnetpath.c#3 integrate .. //depot/projects/gdb/lib/libc/rpc/rpc_clnt_create.3#3 integrate .. //depot/projects/gdb/lib/libc/rpc/rpcb_clnt.c#3 integrate .. //depot/projects/gdb/lib/libc/rpc/rpcb_prot.c#4 integrate .. //depot/projects/gdb/lib/libc/rpc/svc_simple.c#3 integrate .. //depot/projects/gdb/lib/libc/rpc/svc_vc.c#4 integrate .. //depot/projects/gdb/lib/libc/stdio/fclose.3#3 integrate .. //depot/projects/gdb/lib/libc/stdio/vfprintf.c#8 integrate .. //depot/projects/gdb/lib/libc/stdio/vfwprintf.c#8 integrate .. //depot/projects/gdb/lib/libc/stdlib/a64l.3#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/alloca.3#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/getopt_long.c#6 integrate .. //depot/projects/gdb/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/gdb/lib/libc/stdlib/malloc.c#9 integrate .. //depot/projects/gdb/lib/libc/stdlib/posix_memalign.3#2 integrate .. //depot/projects/gdb/lib/libc/stdlib/strtonum.3#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<<