From owner-p4-projects@FreeBSD.ORG Mon May 30 00:10:36 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F49016A420; Mon, 30 May 2005 00:10:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 08B0D16A41C for ; Mon, 30 May 2005 00:10:36 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A166F43D53 for ; Mon, 30 May 2005 00:10:35 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4U0AZIL045776 for ; Mon, 30 May 2005 00:10:35 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4U0AXRq045773 for perforce@freebsd.org; Mon, 30 May 2005 00:10:33 GMT (envelope-from marcel@freebsd.org) Date: Mon, 30 May 2005 00:10:33 GMT Message-Id: <200505300010.j4U0AXRq045773@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 77689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 00:10:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=77689 Change 77689 by marcel@marcel_nfs on 2005/05/30 00:09:41 IFC @77687 Affected files ... .. //depot/projects/tty/MAINTAINERS#11 integrate .. //depot/projects/tty/UPDATING#18 integrate .. //depot/projects/tty/bin/rmdir/rmdir.1#4 integrate .. //depot/projects/tty/bin/stty/print.c#3 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate .. //depot/projects/tty/contrib/bzip2/bzlib.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipfstat.8#5 integrate .. //depot/projects/tty/contrib/libpcap/CHANGES#3 integrate .. //depot/projects/tty/contrib/libpcap/CREDITS#3 integrate .. //depot/projects/tty/contrib/libpcap/FILES#3 integrate .. //depot/projects/tty/contrib/libpcap/INSTALL.txt#3 integrate .. //depot/projects/tty/contrib/libpcap/Makefile.in#3 integrate .. //depot/projects/tty/contrib/libpcap/README#3 integrate .. //depot/projects/tty/contrib/libpcap/README.hpux#2 integrate .. //depot/projects/tty/contrib/libpcap/README.macosx#1 branch .. //depot/projects/tty/contrib/libpcap/VERSION#4 integrate .. //depot/projects/tty/contrib/libpcap/bpf/net/bpf_filter.c#3 integrate .. //depot/projects/tty/contrib/libpcap/bpf_dump.c#3 integrate .. //depot/projects/tty/contrib/libpcap/bpf_image.c#3 integrate .. //depot/projects/tty/contrib/libpcap/config.h.in#3 integrate .. //depot/projects/tty/contrib/libpcap/configure#3 integrate .. //depot/projects/tty/contrib/libpcap/configure.in#3 integrate .. //depot/projects/tty/contrib/libpcap/etherent.c#3 integrate .. //depot/projects/tty/contrib/libpcap/ethertype.h#2 integrate .. //depot/projects/tty/contrib/libpcap/fad-getad.c#2 integrate .. //depot/projects/tty/contrib/libpcap/fad-gifc.c#2 integrate .. //depot/projects/tty/contrib/libpcap/fad-glifc.c#2 integrate .. //depot/projects/tty/contrib/libpcap/fad-null.c#2 integrate .. //depot/projects/tty/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/tty/contrib/libpcap/gencode.c#5 integrate .. //depot/projects/tty/contrib/libpcap/gencode.h#3 integrate .. //depot/projects/tty/contrib/libpcap/grammar.y#3 integrate .. //depot/projects/tty/contrib/libpcap/inet.c#3 integrate .. //depot/projects/tty/contrib/libpcap/nametoaddr.c#3 integrate .. //depot/projects/tty/contrib/libpcap/optimize.c#3 integrate .. //depot/projects/tty/contrib/libpcap/pcap-bpf.c#5 integrate .. //depot/projects/tty/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-dlpi.c#3 integrate .. //depot/projects/tty/contrib/libpcap/pcap-dos.c#1 branch .. //depot/projects/tty/contrib/libpcap/pcap-dos.h#1 branch .. //depot/projects/tty/contrib/libpcap/pcap-enet.c#3 integrate .. //depot/projects/tty/contrib/libpcap/pcap-int.h#4 integrate .. //depot/projects/tty/contrib/libpcap/pcap-linux.c#3 integrate .. //depot/projects/tty/contrib/libpcap/pcap-namedb.h#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap-nit.c#3 integrate .. //depot/projects/tty/contrib/libpcap/pcap-null.c#3 integrate .. //depot/projects/tty/contrib/libpcap/pcap-pf.c#3 integrate .. //depot/projects/tty/contrib/libpcap/pcap-snit.c#3 integrate .. //depot/projects/tty/contrib/libpcap/pcap-snoop.c#3 integrate .. //depot/projects/tty/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/tty/contrib/libpcap/pcap.3#5 integrate .. //depot/projects/tty/contrib/libpcap/pcap.c#4 integrate .. //depot/projects/tty/contrib/libpcap/pcap.h#4 integrate .. //depot/projects/tty/contrib/libpcap/pcap1.h#1 branch .. //depot/projects/tty/contrib/libpcap/pf.h#2 integrate .. //depot/projects/tty/contrib/libpcap/ppp.h#2 integrate .. //depot/projects/tty/contrib/libpcap/savefile.c#3 integrate .. //depot/projects/tty/contrib/libpcap/scanner.l#4 integrate .. //depot/projects/tty/contrib/libpcap/snprintf.c#2 delete .. //depot/projects/tty/contrib/ngatm/snmp_atm/atm.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/.cvsignore#2 integrate .. //depot/projects/tty/contrib/tcpdump/CHANGES#4 integrate .. //depot/projects/tty/contrib/tcpdump/CREDITS#4 integrate .. //depot/projects/tty/contrib/tcpdump/FILES#4 integrate .. //depot/projects/tty/contrib/tcpdump/INSTALL#4 integrate .. //depot/projects/tty/contrib/tcpdump/Makefile.in#3 integrate .. //depot/projects/tty/contrib/tcpdump/README#4 integrate .. //depot/projects/tty/contrib/tcpdump/VERSION#5 integrate .. //depot/projects/tty/contrib/tcpdump/acconfig.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/addrtoname.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/appletalk.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/bgp.h#1 branch .. //depot/projects/tty/contrib/tcpdump/bpf_dump.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/config.h.in#4 integrate .. //depot/projects/tty/contrib/tcpdump/configure#4 integrate .. //depot/projects/tty/contrib/tcpdump/configure.in#4 integrate .. //depot/projects/tty/contrib/tcpdump/cpack.c#1 branch .. //depot/projects/tty/contrib/tcpdump/cpack.h#1 branch .. //depot/projects/tty/contrib/tcpdump/decode_prefix.h#1 branch .. //depot/projects/tty/contrib/tcpdump/ethertype.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/extract.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/gmpls.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/gmpls.h#2 integrate .. //depot/projects/tty/contrib/tcpdump/gmt2local.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/icmp6.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/ieee802_11_radio.h#1 branch .. //depot/projects/tty/contrib/tcpdump/interface.h#4 integrate .. //depot/projects/tty/contrib/tcpdump/ip.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/ipproto.c#1 branch .. //depot/projects/tty/contrib/tcpdump/ipproto.h#2 integrate .. //depot/projects/tty/contrib/tcpdump/l2vpn.c#1 branch .. //depot/projects/tty/contrib/tcpdump/l2vpn.h#1 branch .. //depot/projects/tty/contrib/tcpdump/llc.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/machdep.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/missing/bittypes.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/missing/datalinks.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/missing/dlnames.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/missing/getaddrinfo.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/missing/getnameinfo.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/missing/inet_aton.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/missing/inet_ntop.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/missing/inet_pton.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/missing/snprintf.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/missing/strlcat.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/missing/strlcpy.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/mpls.h#1 branch .. //depot/projects/tty/contrib/tcpdump/netdissect.h#1 branch .. //depot/projects/tty/contrib/tcpdump/nlpid.c#1 branch .. //depot/projects/tty/contrib/tcpdump/nlpid.h#1 branch .. //depot/projects/tty/contrib/tcpdump/ntp.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/ospf.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/oui.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/oui.h#2 integrate .. //depot/projects/tty/contrib/tcpdump/parsenfsfh.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/pcap-missing.h#2 integrate .. //depot/projects/tty/contrib/tcpdump/pf.h#2 integrate .. //depot/projects/tty/contrib/tcpdump/pmap_prot.h#1 branch .. //depot/projects/tty/contrib/tcpdump/ppp.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-802_11.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-ah.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-aodv.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-ap1394.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-arcnet.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-arp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-ascii.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-atalk.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-atm.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-beep.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-bfd.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-bgp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-bootp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-cdp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-chdlc.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-cip.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-cnfp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-decnet.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-dhcp6.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-domain.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-dvmrp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-eap.c#1 branch .. //depot/projects/tty/contrib/tcpdump/print-egp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-eigrp.c#1 branch .. //depot/projects/tty/contrib/tcpdump/print-enc.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-esp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-ether.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-fddi.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-fr.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-frag6.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-gre.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-hsrp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-icmp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-icmp6.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-igmp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-igrp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-ip.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-ip6.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-ip6opts.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-ipcomp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-ipx.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-isakmp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-isoclns.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-juniper.c#1 branch .. //depot/projects/tty/contrib/tcpdump/print-krb.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-l2tp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-lane.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-llc.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-lmp.c#1 branch .. //depot/projects/tty/contrib/tcpdump/print-lspping.c#1 branch .. //depot/projects/tty/contrib/tcpdump/print-lwres.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-mobile.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-mobility.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-mpls.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-msdp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-netbios.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-nfs.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-ntp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-null.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-ospf.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-ospf6.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-pim.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-ppp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-pppoe.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-pptp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-radius.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-raw.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-rip.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-ripng.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-rt6.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-rx.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-sctp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-sip.c#1 branch .. //depot/projects/tty/contrib/tcpdump/print-sl.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-sll.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-smb.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-snmp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-stp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-sunatm.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-sunrpc.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-symantec.c#1 branch .. //depot/projects/tty/contrib/tcpdump/print-syslog.c#1 branch .. //depot/projects/tty/contrib/tcpdump/print-tcp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-telnet.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-tftp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-timed.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-token.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-udp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-vjc.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-vrrp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-wb.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-zephyr.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/rpc_auth.h#1 branch .. //depot/projects/tty/contrib/tcpdump/rpc_msg.h#1 branch .. //depot/projects/tty/contrib/tcpdump/setsignal.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/smb.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/smbutil.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/strcasecmp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/tcp.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/tty/contrib/tcpdump/tcpdump.1#4 integrate .. //depot/projects/tty/contrib/tcpdump/tcpdump.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/udp.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/util.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/vfprintf.c#3 integrate .. //depot/projects/tty/etc/mtree/BSD.include.dist#13 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes#14 integrate .. //depot/projects/tty/games/random/random.c#7 integrate .. //depot/projects/tty/include/Makefile#15 integrate .. //depot/projects/tty/include/netdb.h#8 integrate .. //depot/projects/tty/lib/libc/net/name6.c#13 integrate .. //depot/projects/tty/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate .. //depot/projects/tty/lib/libc/sparc64/fpu/fpu_qp.c#3 integrate .. //depot/projects/tty/lib/libpcap/config.h#4 integrate .. //depot/projects/tty/lib/libsdp/sdp.3#5 integrate .. //depot/projects/tty/lib/libsdp/sdp.h#3 integrate .. //depot/projects/tty/lib/libsdp/util.c#4 integrate .. //depot/projects/tty/lib/libstand/Makefile#7 integrate .. //depot/projects/tty/libexec/getty/ttys.5#3 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#24 integrate .. //depot/projects/tty/sbin/Makefile#14 integrate .. //depot/projects/tty/sbin/clri/clri.c#4 integrate .. //depot/projects/tty/sbin/restore/interactive.c#4 integrate .. //depot/projects/tty/sbin/restore/main.c#6 integrate .. //depot/projects/tty/sbin/restore/restore.c#3 integrate .. //depot/projects/tty/sbin/restore/tape.c#4 integrate .. //depot/projects/tty/sbin/savecore/savecore.c#8 integrate .. //depot/projects/tty/share/doc/papers/contents/contents.ms#2 integrate .. //depot/projects/tty/share/man/man4/amr.4#9 integrate .. //depot/projects/tty/share/man/man4/em.4#6 integrate .. //depot/projects/tty/share/man/man4/iwi.4#3 integrate .. //depot/projects/tty/share/man/man4/led.4#6 integrate .. //depot/projects/tty/sys/alpha/alpha/autoconf.c#6 integrate .. //depot/projects/tty/sys/alpha/alpha/busdma_machdep.c#12 integrate .. //depot/projects/tty/sys/alpha/include/bus_memio.h#3 delete .. //depot/projects/tty/sys/alpha/include/bus_pio.h#3 delete .. //depot/projects/tty/sys/alpha/include/timerreg.h#2 integrate .. //depot/projects/tty/sys/alpha/isa/mcclock_isa.c#4 integrate .. //depot/projects/tty/sys/alpha/linux/syscalls.master#7 integrate .. //depot/projects/tty/sys/amd64/amd64/autoconf.c#7 integrate .. //depot/projects/tty/sys/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/tty/sys/amd64/include/bus.h#5 integrate .. //depot/projects/tty/sys/amd64/include/bus_memio.h#4 delete .. //depot/projects/tty/sys/amd64/include/bus_pio.h#4 delete .. //depot/projects/tty/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/tty/sys/arm/arm/autoconf.c#2 integrate .. //depot/projects/tty/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/tty/sys/arm/arm/cpufunc_asm_arm3.S#3 delete .. //depot/projects/tty/sys/arm/arm/cpufunc_asm_arm67.S#3 delete .. //depot/projects/tty/sys/arm/arm/intr.c#4 integrate .. //depot/projects/tty/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/tty/sys/arm/arm/trap.c#5 integrate .. //depot/projects/tty/sys/arm/include/bus_memio.h#3 delete .. //depot/projects/tty/sys/arm/include/bus_pio.h#3 delete .. //depot/projects/tty/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/tty/sys/arm/xscale/i80321/iq31244_7seg.c#2 integrate .. //depot/projects/tty/sys/boot/common/console.c#3 integrate .. //depot/projects/tty/sys/boot/common/loader.8#12 integrate .. //depot/projects/tty/sys/boot/i386/boot2/boot2.c#9 integrate .. //depot/projects/tty/sys/boot/i386/libi386/bootinfo.c#5 integrate .. //depot/projects/tty/sys/boot/i386/libi386/devicename.c#3 integrate .. //depot/projects/tty/sys/boot/i386/libi386/libi386.h#5 integrate .. //depot/projects/tty/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/tty/sys/boot/pc98/boot2/boot.c#5 integrate .. //depot/projects/tty/sys/boot/pc98/loader/main.c#6 integrate .. //depot/projects/tty/sys/bsm/audit.h#1 branch .. //depot/projects/tty/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/tty/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/tty/sys/compat/ndis/subr_hal.c#8 integrate .. //depot/projects/tty/sys/compat/ndis/subr_ndis.c#8 integrate .. //depot/projects/tty/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/tty/sys/conf/files.pc98#17 integrate .. //depot/projects/tty/sys/conf/options.pc98#14 integrate .. //depot/projects/tty/sys/dev/aac/aac.c#13 integrate .. //depot/projects/tty/sys/dev/aac/aac_pci.c#13 integrate .. //depot/projects/tty/sys/dev/acpica/Osd/OsdHardware.c#7 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_package.c#4 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/tty/sys/dev/advansys/adv_eisa.c#6 integrate .. //depot/projects/tty/sys/dev/advansys/adv_isa.c#6 integrate .. //depot/projects/tty/sys/dev/advansys/adv_pci.c#7 integrate .. //depot/projects/tty/sys/dev/advansys/advansys.c#6 integrate .. //depot/projects/tty/sys/dev/advansys/advlib.c#6 integrate .. //depot/projects/tty/sys/dev/advansys/adw_pci.c#7 integrate .. //depot/projects/tty/sys/dev/advansys/adwcam.c#7 integrate .. //depot/projects/tty/sys/dev/advansys/adwlib.c#5 integrate .. //depot/projects/tty/sys/dev/aha/aha.c#8 integrate .. //depot/projects/tty/sys/dev/aha/aha_isa.c#7 integrate .. //depot/projects/tty/sys/dev/ahb/ahb.c#8 integrate .. //depot/projects/tty/sys/dev/aic/aic.c#3 integrate .. //depot/projects/tty/sys/dev/aic/aic_isa.c#4 integrate .. //depot/projects/tty/sys/dev/aic/aic_pccard.c#5 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx_osm.h#6 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx_osm.h#7 integrate .. //depot/projects/tty/sys/dev/amd/amd.c#8 integrate .. //depot/projects/tty/sys/dev/amr/amr.c#11 integrate .. //depot/projects/tty/sys/dev/amr/amr_pci.c#9 integrate .. //depot/projects/tty/sys/dev/ar/if_ar.c#10 integrate .. //depot/projects/tty/sys/dev/ar/if_ar_isa.c#6 integrate .. //depot/projects/tty/sys/dev/ar/if_ar_pci.c#6 integrate .. //depot/projects/tty/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/tty/sys/dev/awi/am79c930.c#5 integrate .. //depot/projects/tty/sys/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/tty/sys/dev/bge/if_bge.c#20 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_audio.c#6 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_card.c#9 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_core.c#8 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_i2c.c#5 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_os.c#12 integrate .. //depot/projects/tty/sys/dev/bktr/bktr_tuner.c#6 integrate .. //depot/projects/tty/sys/dev/buslogic/bt.c#7 integrate .. //depot/projects/tty/sys/dev/buslogic/bt_eisa.c#7 integrate .. //depot/projects/tty/sys/dev/buslogic/bt_isa.c#6 integrate .. //depot/projects/tty/sys/dev/buslogic/bt_pci.c#5 integrate .. //depot/projects/tty/sys/dev/ciss/ciss.c#16 integrate .. //depot/projects/tty/sys/dev/cnw/if_cnw.c#7 integrate .. //depot/projects/tty/sys/dev/dpt/dpt_eisa.c#5 integrate .. //depot/projects/tty/sys/dev/dpt/dpt_isa.c#5 integrate .. //depot/projects/tty/sys/dev/dpt/dpt_pci.c#6 integrate .. //depot/projects/tty/sys/dev/dpt/dpt_scsi.c#8 integrate .. //depot/projects/tty/sys/dev/em/README#4 integrate .. //depot/projects/tty/sys/dev/em/if_em.c#13 integrate .. //depot/projects/tty/sys/dev/em/if_em.h#9 integrate .. //depot/projects/tty/sys/dev/em/if_em_hw.c#8 integrate .. //depot/projects/tty/sys/dev/em/if_em_hw.h#7 integrate .. //depot/projects/tty/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/tty/sys/dev/fb/boot_font.c#4 integrate .. //depot/projects/tty/sys/dev/fb/gfb.c#5 integrate .. //depot/projects/tty/sys/dev/fb/s3_pci.c#6 integrate .. //depot/projects/tty/sys/dev/fb/tga.c#5 integrate .. //depot/projects/tty/sys/dev/gfb/gfb_pci.c#9 integrate .. //depot/projects/tty/sys/dev/hatm/if_hatm_tx.c#4 integrate .. //depot/projects/tty/sys/dev/hfa/hfa_freebsd.c#5 integrate .. //depot/projects/tty/sys/dev/hfa/hfa_pci.c#5 integrate .. //depot/projects/tty/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/tty/sys/dev/ida/ida.c#11 integrate .. //depot/projects/tty/sys/dev/ida/ida_disk.c#8 integrate .. //depot/projects/tty/sys/dev/ida/ida_eisa.c#9 integrate .. //depot/projects/tty/sys/dev/ida/ida_pci.c#9 integrate .. //depot/projects/tty/sys/dev/idt/idt_harp.c#7 integrate .. //depot/projects/tty/sys/dev/idt/idt_pci.c#6 integrate .. //depot/projects/tty/sys/dev/ie/if_ie.c#8 integrate .. //depot/projects/tty/sys/dev/ie/if_ie_isa.c#3 integrate .. //depot/projects/tty/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/tty/sys/dev/iir/iir.c#8 integrate .. //depot/projects/tty/sys/dev/iir/iir_pci.c#7 integrate .. //depot/projects/tty/sys/dev/ips/ips.h#7 integrate .. //depot/projects/tty/sys/dev/ips/ips_disk.h#4 integrate .. //depot/projects/tty/sys/dev/isp/isp_freebsd.h#7 integrate .. //depot/projects/tty/sys/dev/isp/isp_pci.c#9 integrate .. //depot/projects/tty/sys/dev/kbd/atkbdc.c#6 integrate .. //depot/projects/tty/sys/dev/lge/if_lge.c#11 integrate .. //depot/projects/tty/sys/dev/mcd/mcd.c#10 integrate .. //depot/projects/tty/sys/dev/mcd/mcd_isa.c#5 integrate .. //depot/projects/tty/sys/dev/mii/dcphy.c#7 integrate .. //depot/projects/tty/sys/dev/mii/pnphy.c#6 integrate .. //depot/projects/tty/sys/dev/mlx/mlx.c#9 integrate .. //depot/projects/tty/sys/dev/mlx/mlx_pci.c#7 integrate .. //depot/projects/tty/sys/dev/mly/mly.c#9 integrate .. //depot/projects/tty/sys/dev/mpt/mpt_freebsd.h#4 integrate .. //depot/projects/tty/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/tty/sys/dev/my/if_my.c#10 integrate .. //depot/projects/tty/sys/dev/ncv/ncr53c500.c#6 integrate .. //depot/projects/tty/sys/dev/ncv/ncr53c500_pccard.c#8 integrate .. //depot/projects/tty/sys/dev/nge/if_nge.c#11 integrate .. //depot/projects/tty/sys/dev/nsp/nsp.c#6 integrate .. //depot/projects/tty/sys/dev/nve/if_nve.c#4 integrate .. //depot/projects/tty/sys/dev/pbio/pbio.c#3 integrate .. //depot/projects/tty/sys/dev/pdq/if_fpa.c#7 integrate .. //depot/projects/tty/sys/dev/pdq/pdq_freebsd.h#6 integrate .. //depot/projects/tty/sys/dev/pdq/pdq_ifsubr.c#6 integrate .. //depot/projects/tty/sys/dev/re/if_re.c#11 integrate .. //depot/projects/tty/sys/dev/scd/scd.c#9 integrate .. //depot/projects/tty/sys/dev/scd/scd_isa.c#5 integrate .. //depot/projects/tty/sys/dev/sio/sio.c#16 integrate .. //depot/projects/tty/sys/dev/sio/sio_isa.c#7 integrate .. //depot/projects/tty/sys/dev/sio/sio_pccard.c#7 integrate .. //depot/projects/tty/sys/dev/sio/sio_pci.c#10 integrate .. //depot/projects/tty/sys/dev/sio/sio_puc.c#4 integrate .. //depot/projects/tty/sys/dev/sound/pci/ich.c#10 integrate .. //depot/projects/tty/sys/dev/sr/if_sr.c#10 integrate .. //depot/projects/tty/sys/dev/sr/if_sr_isa.c#5 integrate .. //depot/projects/tty/sys/dev/sr/if_sr_pci.c#7 integrate .. //depot/projects/tty/sys/dev/stg/tmc18c30.c#6 integrate .. //depot/projects/tty/sys/dev/stg/tmc18c30_isa.c#5 integrate .. //depot/projects/tty/sys/dev/stg/tmc18c30_pccard.c#6 integrate .. //depot/projects/tty/sys/dev/stg/tmc18c30_pci.c#4 integrate .. //depot/projects/tty/sys/dev/stg/tmc18c30_subr.c#5 integrate .. //depot/projects/tty/sys/dev/sym/sym_hipd.c#9 integrate .. //depot/projects/tty/sys/dev/syscons/scgfbrndr.c#5 integrate .. //depot/projects/tty/sys/dev/syscons/scmouse.c#6 integrate .. //depot/projects/tty/sys/dev/syscons/scvesactl.c#4 integrate .. //depot/projects/tty/sys/dev/syscons/scvgarndr.c#5 integrate .. //depot/projects/tty/sys/dev/syscons/scvidctl.c#4 integrate .. //depot/projects/tty/sys/dev/syscons/syscons.c#15 integrate .. //depot/projects/tty/sys/dev/syscons/syscons.h#6 integrate .. //depot/projects/tty/sys/dev/tga/tga_pci.c#8 integrate .. //depot/projects/tty/sys/dev/trm/trm.c#9 integrate .. //depot/projects/tty/sys/dev/twe/twe_compat.h#9 integrate .. //depot/projects/tty/sys/dev/tx/if_tx.c#10 integrate .. //depot/projects/tty/sys/dev/txp/if_txp.c#10 integrate .. //depot/projects/tty/sys/dev/usb/ehci.c#8 integrate .. //depot/projects/tty/sys/dev/usb/ohci.c#10 integrate .. //depot/projects/tty/sys/dev/usb/uhci.c#10 integrate .. //depot/projects/tty/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/tty/sys/dev/vx/if_vx.c#11 integrate .. //depot/projects/tty/sys/dev/vx/if_vx_pci.c#10 integrate .. //depot/projects/tty/sys/geom/mirror/g_mirror.c#7 integrate .. //depot/projects/tty/sys/i386/i386/autoconf.c#8 integrate .. //depot/projects/tty/sys/i386/i386/identcpu.c#12 integrate .. //depot/projects/tty/sys/i386/include/bus.h#3 integrate .. //depot/projects/tty/sys/i386/include/bus_memio.h#3 delete .. //depot/projects/tty/sys/i386/include/bus_pio.h#3 delete .. //depot/projects/tty/sys/i386/include/timerreg.h#2 integrate .. //depot/projects/tty/sys/i386/isa/if_el.c#7 integrate .. //depot/projects/tty/sys/i4b/layer1/itjc/i4b_itjc_pci.c#6 integrate .. //depot/projects/tty/sys/ia64/ia64/autoconf.c#6 integrate .. //depot/projects/tty/sys/ia64/include/bus.h#11 integrate .. //depot/projects/tty/sys/ia64/include/bus_memio.h#3 delete .. //depot/projects/tty/sys/ia64/include/bus_pio.h#3 delete .. //depot/projects/tty/sys/isa/atkbdc_isa.c#6 integrate .. //depot/projects/tty/sys/kern/imgact_shell.c#5 integrate .. //depot/projects/tty/sys/kern/init_sysent.c#11 integrate .. //depot/projects/tty/sys/kern/kern_kse.c#5 integrate .. //depot/projects/tty/sys/kern/kern_linker.c#9 integrate .. //depot/projects/tty/sys/kern/kern_malloc.c#14 integrate .. //depot/projects/tty/sys/kern/kern_ntptime.c#6 integrate .. //depot/projects/tty/sys/kern/kern_thread.c#14 integrate .. //depot/projects/tty/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/tty/sys/kern/syscalls.c#11 integrate .. //depot/projects/tty/sys/kern/syscalls.master#12 integrate .. //depot/projects/tty/sys/kern/uipc_socket2.c#13 integrate .. //depot/projects/tty/sys/kern/vfs_aio.c#12 integrate .. //depot/projects/tty/sys/kern/vfs_syscalls.c#15 integrate .. //depot/projects/tty/sys/net/bpf.h#6 integrate .. //depot/projects/tty/sys/net/bridge.c#12 integrate .. //depot/projects/tty/sys/net/if.c#14 integrate .. //depot/projects/tty/sys/net/if_tap.c#11 integrate .. //depot/projects/tty/sys/net/if_types.h#6 integrate .. //depot/projects/tty/sys/net/if_var.h#8 integrate .. //depot/projects/tty/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#10 integrate .. //depot/projects/tty/sys/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/tty/sys/netgraph/ng_socket.c#10 integrate .. //depot/projects/tty/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/tty/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/tty/sys/netinet/tcp_sack.c#8 integrate .. //depot/projects/tty/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/tty/sys/netipx/ipx.h#4 integrate .. //depot/projects/tty/sys/pc98/cbus/scgdcrndr.c#2 integrate .. //depot/projects/tty/sys/pc98/conf/NOTES#13 integrate .. //depot/projects/tty/sys/pc98/include/bus_memio.h#2 delete .. //depot/projects/tty/sys/pc98/include/bus_pio.h#2 delete .. //depot/projects/tty/sys/pc98/include/timerreg.h#2 integrate .. //depot/projects/tty/sys/pci/alpm.c#7 integrate .. //depot/projects/tty/sys/pci/amdpm.c#6 integrate .. //depot/projects/tty/sys/pci/if_dc.c#15 integrate .. //depot/projects/tty/sys/pci/if_pcn.c#13 integrate .. //depot/projects/tty/sys/pci/if_rl.c#13 integrate .. //depot/projects/tty/sys/pci/if_sf.c#12 integrate .. //depot/projects/tty/sys/pci/if_sis.c#14 integrate .. //depot/projects/tty/sys/pci/if_sk.c#14 integrate .. //depot/projects/tty/sys/pci/if_ste.c#12 integrate .. //depot/projects/tty/sys/pci/if_ti.c#14 integrate .. //depot/projects/tty/sys/pci/if_tl.c#11 integrate .. //depot/projects/tty/sys/pci/if_vr.c#12 integrate .. //depot/projects/tty/sys/pci/if_wb.c#11 integrate .. //depot/projects/tty/sys/pci/if_xl.c#14 integrate .. //depot/projects/tty/sys/pci/intpm.c#6 integrate .. //depot/projects/tty/sys/pci/viapm.c#7 integrate .. //depot/projects/tty/sys/powerpc/include/bus_memio.h#3 delete .. //depot/projects/tty/sys/powerpc/include/bus_pio.h#3 delete .. //depot/projects/tty/sys/powerpc/powermac/uninorth.c#5 integrate .. //depot/projects/tty/sys/powerpc/powerpc/autoconf.c#4 integrate .. //depot/projects/tty/sys/powerpc/psim/sio_iobus.c#3 integrate .. //depot/projects/tty/sys/sparc64/include/bus_memio.h#3 delete .. //depot/projects/tty/sys/sparc64/include/bus_pio.h#3 delete .. //depot/projects/tty/sys/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/tty/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/tty/sys/sys/malloc.h#9 integrate .. //depot/projects/tty/sys/sys/param.h#19 integrate .. //depot/projects/tty/sys/sys/proc.h#16 integrate .. //depot/projects/tty/sys/sys/syscall.h#11 integrate .. //depot/projects/tty/sys/sys/syscall.mk#11 integrate .. //depot/projects/tty/sys/sys/sysent.h#4 integrate .. //depot/projects/tty/sys/sys/sysproto.h#12 integrate .. //depot/projects/tty/sys/vm/vm_pageq.c#8 integrate .. //depot/projects/tty/tools/tools/ministat/ministat.c#4 integrate .. //depot/projects/tty/usr.bin/calendar/calendars/calendar.freebsd#12 integrate .. //depot/projects/tty/usr.bin/lockf/lockf.1#4 integrate .. //depot/projects/tty/usr.bin/logger/logger.c#2 integrate .. //depot/projects/tty/usr.bin/make/Makefile#9 integrate .. //depot/projects/tty/usr.bin/make/cond.c#10 integrate .. //depot/projects/tty/usr.bin/systat/systat.1#6 integrate .. //depot/projects/tty/usr.bin/tail/tail.c#3 integrate .. //depot/projects/tty/usr.bin/truss/syscalls.c#9 integrate .. //depot/projects/tty/usr.bin/tset/map.c#2 integrate .. //depot/projects/tty/usr.bin/tsort/tsort.c#3 integrate .. //depot/projects/tty/usr.bin/vmstat/vmstat.8#6 integrate .. //depot/projects/tty/usr.bin/vmstat/vmstat.c#9 integrate .. //depot/projects/tty/usr.bin/who/who.c#3 integrate .. //depot/projects/tty/usr.bin/whois/whois.c#8 integrate .. //depot/projects/tty/usr.sbin/bluetooth/sdpcontrol/search.c#3 integrate .. //depot/projects/tty/usr.sbin/bsnmpd/modules/snmp_atm/Makefile#3 integrate .. //depot/projects/tty/usr.sbin/chkgrp/chkgrp.8#4 integrate .. //depot/projects/tty/usr.sbin/chkgrp/chkgrp.c#4 integrate .. //depot/projects/tty/usr.sbin/gstat/gstat.8#5 integrate .. //depot/projects/tty/usr.sbin/iostat/iostat.8#4 integrate .. //depot/projects/tty/usr.sbin/jail/jail.8#13 integrate .. //depot/projects/tty/usr.sbin/ntp/doc/Makefile#3 integrate .. //depot/projects/tty/usr.sbin/pwd_mkdb/pwd_mkdb.c#5 integrate .. //depot/projects/tty/usr.sbin/rpc.umntall/rpc.umntall.c#4 integrate .. //depot/projects/tty/usr.sbin/tcpdump/tcpdump/Makefile#7 integrate .. //depot/projects/tty/usr.sbin/tcpdump/tcpdump/config.h#3 integrate .. //depot/projects/tty/usr.sbin/vidcontrol/vidcontrol.1#4 integrate .. //depot/projects/tty/usr.sbin/vidcontrol/vidcontrol.c#5 integrate Differences ... ==== //depot/projects/tty/MAINTAINERS#11 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.105 2005/05/24 18:54:07 schweikh Exp $ +$FreeBSD: src/MAINTAINERS,v 1.106 2005/05/25 17:37:57 schweikh Exp $ subsystem login notes ----------------------------- @@ -113,7 +113,11 @@ Please also consider removing the lines from the files listed below and stating your preferences here instead. +List below generated with: +$ cd /usr/src; find */* -type f|xargs egrep 'MAINTAINER[ ]*=' + bin/dd/Makefile:MAINTAINER= green@FreeBSD.org +contrib/cvs/FREEBSD-upgrade:MAINTAINER= peter@FreeBSD.org games/fortune/datfiles/Makefile:MAINTAINER= jkh gnu/usr.bin/cvs/Makefile:MAINTAINER= peter@FreeBSD.org gnu/usr.bin/cvs/contrib/Makefile:MAINTAINER= peter@FreeBSD.org @@ -123,9 +127,13 @@ gnu/usr.bin/cvs/lib/Makefile:MAINTAINER= peter@FreeBSD.org gnu/usr.bin/cvs/libdiff/Makefile:MAINTAINER= peter@FreeBSD.org gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch +lib/libc/posix1e/Makefile.inc:MAINTAINER= rwatson@FreeBSD.org lib/libusbhid/Makefile:MAINTAINER= n_hibma@FreeBSD.ORG lib/libz/Makefile:MAINTAINER=peter@FreeBSD.org +sbin/dhclient/Makefile.inc:MAINTAINER= mbr sys/compat/svr4/Makefile:MAINTAINER= newton@freebsd.org +sys/dev/asr/MAINTAINER:MAINTAINER = obrien@freebsd, scott_long@btc.adaptec.com, mark_salyzyn@adaptec.com +sys/dev/bktr/CHANGELOG.TXT: * MAINTAINER = Roger Hardiman sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org sys/modules/bktr/bktr_mem/Makefile:MAINTAINER= roger@freebsd.org sys/modules/cam/Makefile:MAINTAINER= n_hibma@freebsd.org @@ -147,6 +155,5 @@ sys/modules/uscanner/Makefile:MAINTAINER= n_hibma@freebsd.org tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org usr.bin/locate/Makefile:MAINTAINER= wosch -usr.sbin/ntp/doc/Makefile:MAINTAINER= sheldonh usr.sbin/pppstats/Makefile:MAINTAINER= peter@freebsd.org usr.sbin/zic/Makefile:MAINTAINER= wollman@FreeBSD.org ==== //depot/projects/tty/UPDATING#18 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20050528: + Kernel parsing of extra options on '#!' first lines of shell + scripts has changed. Lines with multiple options likely will + fail after this date. For full details, please see + http://people.freebsd.org/~gad/Updating-20050528.txt + 20050503: The packet filter (pf) code has been updated to OpenBSD 3.7 Please note the changed anchor syntax and the fact that @@ -177,6 +183,14 @@ make -DALWAYS_CHECK_MAKE buildkernel KERNCONF=YOUR_KERNEL_HERE make -DALWAYS_CHECK_MAKE installkernel KERNCONF=YOUR_KERNEL_HERE + To test a kernel once + --------------------- + If you just want to boot a kernel once (because you are not sure + if it works, or if you want to boot a known bad kernel to provide + debugging information) run + make installkernel KERNCONF=YOUR_KERNEL_HERE KODIR=/boot/testkernel + nextboot -k testkernel + To just build a kernel when you know that it won't mess you up -------------------------------------------------------------- This assumes you are already running a 5.X system. Replace @@ -334,4 +348,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.404 2005/05/16 05:37:32 imp Exp $ +$FreeBSD: src/UPDATING,v 1.406 2005/05/28 22:45:31 gad Exp $ ==== //depot/projects/tty/bin/rmdir/rmdir.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.12 2005/01/10 08:39:25 imp Exp $ +.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.13 2005/05/29 08:18:48 tjr Exp $ .\" .Dd March 21, 2004 .Dt RMDIR 1 @@ -72,7 +72,7 @@ .It Fl v Be verbose, listing each directory as it is removed. .El -.Pp +.Sh DIAGNOSTICS The .Nm utility exits with one of the following values: ==== //depot/projects/tty/bin/stty/print.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/stty/print.c,v 1.19 2004/04/06 20:06:53 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/stty/print.c,v 1.20 2005/05/26 06:57:57 ache Exp $"); #include @@ -142,8 +142,8 @@ put("-onlcr", ONLCR, 1); put("-ocrnl", OCRNL, 0); put("-oxtabs", OXTABS, 1); - put("-onocr", OXTABS, 0); - put("-onlret", OXTABS, 0); + put("-onocr", ONOCR, 0); + put("-onlret", ONLRET, 0); /* control flags (hardware state) */ tmp = tp->c_cflag; ==== //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII.c#6 (text+ko) ==== @@ -444,7 +444,7 @@ for (i = 0; i < RTAX_MAX; i++) { if ((addrs & (1 << i)) != 0) { - *out = (struct sockaddr *)info; + *out = (struct sockaddr *)(void *)info; info += roundup((*out)->sa_len, sizeof(long)); } else *out = NULL; ==== //depot/projects/tty/contrib/bzip2/bzlib.c#3 (text+ko) ==== @@ -73,8 +73,12 @@ bzBuffToBuffDecompress. Fixed. --*/ +#include +__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.2 2005/05/29 21:56:37 sobomax Exp $"); + #include "bzlib_private.h" +#ifndef BZ_NO_COMPRESS /*---------------------------------------------------*/ /*--- Compression stuff ---*/ @@ -130,6 +134,7 @@ } #endif +#endif /* BZ_NO_COMPRESS */ /*---------------------------------------------------*/ static @@ -156,6 +161,7 @@ if (addr != NULL) free ( addr ); } +#ifndef BZ_NO_COMPRESS /*---------------------------------------------------*/ static @@ -528,6 +534,7 @@ return BZ_OK; } +#endif /* BZ_NO_COMPRESS */ /*---------------------------------------------------*/ /*--- Decompression stuff ---*/ @@ -921,6 +928,7 @@ return BZ_OK; } +#ifndef BZ_NO_COMPRESS #ifndef BZ_NO_STDIO /*---------------------------------------------------*/ @@ -1610,6 +1618,7 @@ } #endif +#endif /* BZ_NO_COMPRESS */ /*-------------------------------------------------------------*/ /*--- end bzlib.c ---*/ ==== //depot/projects/tty/contrib/ipfilter/man/ipfstat.8#5 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/ipfilter/man/ipfstat.8,v 1.9 2005/04/25 18:20:14 darrenr Exp $ +.\" $FreeBSD: src/contrib/ipfilter/man/ipfstat.8,v 1.10 2005/05/27 01:09:42 eivind Exp $ .TH ipfstat 8 .SH NAME ipfstat \- reports on packet filter statistics and filter list @@ -28,7 +28,7 @@ \fBipfstat\fP examines /dev/kmem using the symbols \fB_fr_flags\fP, \fB_frstats\fP, \fB_filterin\fP, and \fB_filterout\fP. To run and work, it needs to be able to read both /dev/kmem and the -kernel itself. The kernel name defaults to \fB/kernel\fP. +kernel itself. The kernel name defaults to \fB/boot/kernel/kernel\fP. .PP The default behaviour of \fBipfstat\fP is to retrieve and display the accumulated statistics which have been ==== //depot/projects/tty/contrib/libpcap/CHANGES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.56.4.3 2004/03/30 14:29:16 mcr Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59 2004/03/30 14:42:50 mcr Exp $ (LBL) Tue. March 30, 2004. mcr@sandelman.ottawa.on.ca. Summary for 3.8.3 release ==== //depot/projects/tty/contrib/libpcap/CREDITS#3 (text+ko) ==== @@ -21,12 +21,16 @@ Brian Ginsbach Charles M. Hannum Chris G. Demetriou + Chris Lightfoot Chris Pepper Darren Reed David Kaelbling David Young + Dean Gaudet Don Ebright + Dug Song Eric Anderson + Erik de Castro Lopo Franz Schaefer Gianluca Varenni Gisle Vanem @@ -54,9 +58,12 @@ Love Hörnquist-Åstrand Maciej W. Rozycki Marcus Felipe Pereira + Mark Pizzolato Martin Husemann + Matthew Luckie Mike Wiacek Monroe Williams + Nicolas Dade Octavian Cerna Olaf Kirch Onno van der Linden ==== //depot/projects/tty/contrib/libpcap/FILES#3 (text+ko) ==== @@ -1,4 +1,6 @@ CHANGES +ChmodBPF/ChmodBPF +ChmodBPF/StartupParameters.plist CREDITS FILES INSTALL.txt @@ -9,6 +11,7 @@ README.dag README.hpux README.linux +README.macosx README.tru64 README.Win32 SUNOS4/nit_if.o.sparc @@ -48,16 +51,33 @@ lbl/os-sunos4.h lbl/os-ultrix4.h llc.h +missing/snprintf.c mkdep +msdos/bin2c.c +msdos/common.dj +msdos/makefile +msdos/makefile.dj +msdos/makefile.wc +msdos/ndis2.c +msdos/ndis2.h +msdos/ndis_0.asm +msdos/pkt_rx0.asm +msdos/pkt_rx1.s +msdos/pktdrvr.c +msdos/pktdrvr.h +msdos/readme.dos nametoaddr.c nlpid.h optimize.c packaging/pcap.spec +packaging/pcap.spec.in pcap-bpf.c pcap-bpf.h pcap-dag.c pcap-dag.h pcap-dlpi.c +pcap-dos.c +pcap-dos.h pcap-enet.c pcap-int.h pcap-linux.c @@ -80,7 +100,6 @@ savefile.c scanner.l sll.h -snprintf.c sunatmpos.h Win32/Include/Gnuc.h Win32/Include/addrinfo.h ==== //depot/projects/tty/contrib/libpcap/INSTALL.txt#3 (text+ko) ==== @@ -1,4 +1,4 @@ -@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.7.2.2 2003/12/15 02:05:00 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12 2004/12/18 08:52:08 guy Exp $ (LBL) To build libpcap, run "./configure" (a shell script). The configure script will determine your system attributes and generate an @@ -295,6 +295,8 @@ FILES ----- CHANGES - description of differences between releases +ChmodBPF/* - Mac OS X startup item to set ownership and permissions + on /dev/bpf* CREDITS - people that have helped libpcap along FILES - list of files exported as part of the distribution INSTALL.txt - this file @@ -305,6 +307,7 @@ README.dag - notes on using libpcap to capture on Endace DAG devices README.hpux - notes on using libpcap on HP-UX README.linux - notes on using libpcap on Linux +README.macosx - notes on using libpcap on Mac OS X README.tru64 - notes on using libpcap on Digital/Tru64 UNIX README.Win32 - notes on using libpcap on Win32 systems (with WinPcap) SUNOS4 - pre-SunOS 4.1 replacement kernel nit modules @@ -336,7 +339,9 @@ install-sh - BSD style install script lbl/os-*.h - OS-dependent defines and prototypes llc.h - 802.2 LLC SAP definitions +missing/* - replacements for missing library functions mkdep - construct Makefile dependency list +msdos/* - drivers for MS-DOS capture support nametoaddr.c - hostname to address routines nlpid.h - OSI network layer protocol identifier definitions net - symlink to bpf/net @@ -347,6 +352,8 @@ pcap-dag.c - Endace DAG device capture support pcap-dag.h - Endace DAG device capture support pcap-dlpi.c - Data Link Provider Interface support +pcap-dos.c - MS-DOS capture support +pcap-dos.h - headers for MS-DOS capture support pcap-enet.c - enet support pcap-int.h - internal libpcap definitions pcap-linux.c - Linux packet socket support @@ -369,6 +376,5 @@ savefile.c - offline support scanner.l - filter string scanner sll.h - definitions for Linux cooked mode fake link-layer header -snprintf.c - snprintf and vsnprintf for platforms that lack them sunatmpos.h - definitions for SunATM capturing Win32 - headers and routines for building on Win32 systems ==== //depot/projects/tty/contrib/libpcap/Makefile.in#3 (text+ko) ==== @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.96.2.1 2003/12/15 01:42:23 guy Exp $ (LBL) +# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.99 2003/12/15 01:35:03 guy Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -46,6 +46,7 @@ INCLS = -I. @V_INCLS@ DEFS = @DEFS@ @V_DEFS@ LIBS = @V_LIBS@ +DYEXT = @DYEXT@ # Standard CFLAGS CFLAGS = $(CCOPT) $(INCLS) $(DEFS) @@ -103,6 +104,24 @@ ar rc $@ $(OBJ) $(LIBS) $(RANLIB) $@ +shared: libpcap.$(DYEXT) + +# +# XXX - this works with GNU ld, but won't necessarily work with native +# ld on, for example, various SVR4-flavored platforms, or Digital UNIX. +# +libpcap.so: $(OBJ) + @rm -f $@ + ld -shared -o $@.`cat VERSION` $(OBJ) + +# the following rule succeeds, but the result is untested. +libpcap.dylib: $(OBJ) + rm -f libpcap*.dylib + $(CC) -dynamiclib -undefined error -o libpcap.`cat VERSION`.dylib $(OBJ) \ + -install_name $(libdir)/libpcap.0.dylib -compatibility_version `cat VERSION` \ + -current_version `cat VERSION` + + scanner.c: $(srcdir)/scanner.l @rm -f $@ $(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@ @@ -151,7 +170,7 @@ bpf_filter.o: bpf_filter.c $(CC) $(CFLAGS) -c bpf_filter.c -install: +install: libpcap.a [ -d $(DESTDIR)$(libdir) ] || \ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a @@ -168,6 +187,13 @@ $(INSTALL_DATA) $(srcdir)/pcap.3 \ $(DESTDIR)$(mandir)/man3/pcap.3 +install-shared: install-shared-$(DYEXT) +install-shared-so: libpcap.so + $(INSTALL_PROGRAM) libpcap.so.`cat VERSION` $(DESTDIR)$(libdir)/libpcap.so.`cat VERSION` +install-shared-dylib: libpcap.dylib + $(INSTALL_PROGRAM) libpcap.`cat VERSION`.dylib $(DESTDIR)$(libdir)/libpcap.`cat VERSION`.dylib + VER=`cat VERSION`; cd $(DESTDIR)$(libdir) && ln -sf libpcap.$$VER.dylib libpcap.0.dylib; ln -sf libpcap.0.dylib libpcap.dylib + uninstall: rm -f $(DESTDIR)$(libdir)/libpcap.a rm -f $(DESTDIR)$(includedir)/pcap.h @@ -176,16 +202,21 @@ rm -f $(DESTDIR)$(mandir)/man3/pcap.3 clean: - rm -f $(CLEANFILES) + rm -f $(CLEANFILES) libpcap*.dylib libpcap.so* -distclean: - rm -f $(CLEANFILES) Makefile config.cache config.log config.status \ +distclean: clean + rm -f Makefile config.cache config.log config.status \ config.h gnuc.h os-proto.h bpf_filter.c stamp-h stamp-h.in + rm -rf autom4te.cache tags: $(TAGFILES) ctags -wtd $(TAGFILES) -tar: +packaging/pcap.spec: packaging/pcap.spec.in VERSION + RPMVERSION=`cat VERSION | sed s/-.*//g`; \ + sed -e s/@VERSION@/$$RPMVERSION/ -e s/@NAME@/libpcap-`cat VERSION`/ $< > $@ + +tar: Makefile packaging/pcap.spec >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 30 11:46:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5DB816A420; Mon, 30 May 2005 11:46:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9506416A41C for ; Mon, 30 May 2005 11:46:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5642B43D4C for ; Mon, 30 May 2005 11:46:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UBkAEA092319 for ; Mon, 30 May 2005 11:46:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UBjuAS092294 for perforce@freebsd.org; Mon, 30 May 2005 11:45:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 May 2005 11:45:56 GMT Message-Id: <200505301145.j4UBjuAS092294@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 77709 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 11:46:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=77709 Change 77709 by rwatson@rwatson_paprika on 2005/05/30 11:45:27 Integrate netperf_socket from FreeBSD CVS: Relevant to netperf: - Critical section optimizations make using critical sections to protect per-CPU data a benefit on UP as well as SMP. - Substantial work on VFS locking. - HWPMC - IPFILTER upgrade - PF upgrade - Sleepqueue cleanup and optimizations. - KDB can now use NMIs when entering the debugger - taskqueue_terminate() - MAC checks for socket_accept, socket_poll(), and socket_stat() - New m_copyup() - UNP_WANTCRED - UNP_CONNWAIT - BPF locking tweaks, BPF/PCAP upgrades - if_linktask - tapuopen - more ng_netflow - use of unit allocator in netgraph modules - IPv6 support for IPFW - More TCP SACK cleanup. Netperf-derived: - Move to socket/conditional Giant locking for MAC label retrieve/set on sockets, rather than unconditional Giant. - Malloc now uses per-cpu stats and critical sections rather than mutexes to optimize performance. - UMA now uses critical sections rather than mutexes to protect per-CPU caches to optimize performance. - Coalesce SOCK_LOCK() and SOCKBUF_LOCK() for read socket buffer in soisdisconnecting() and soisdisconnected() to avoid races between socket and buffer state. - tcp_usr_send() locking optimization -- don't lock the tcbinfo unless needed, and unlock earlier. - Reduces socket buffer locking overhead for urgent TCP data. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/autoconf.c#4 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/busdma_machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/clock.c#5 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/critical.c#2 delete .. //depot/projects/netperf_socket/sys/alpha/alpha/interrupt.c#10 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#15 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/mp_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/timerreg.h#3 delete .. //depot/projects/netperf_socket/sys/alpha/alpha/trap.c#6 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#16 integrate .. //depot/projects/netperf_socket/sys/alpha/include/_bus.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/bus.h#4 integrate .. //depot/projects/netperf_socket/sys/alpha/include/bus_memio.h#3 delete .. //depot/projects/netperf_socket/sys/alpha/include/bus_pio.h#3 delete .. //depot/projects/netperf_socket/sys/alpha/include/critical.h#5 delete .. //depot/projects/netperf_socket/sys/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/ppireg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/include/proc.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/timerreg.h#1 branch .. //depot/projects/netperf_socket/sys/alpha/isa/isa_dma.c#5 integrate .. //depot/projects/netperf_socket/sys/alpha/isa/mcclock_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#8 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/imgact_osf1.c#3 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#10 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_mount.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/acpica/madt.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/autoconf.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/critical.c#3 delete .. //depot/projects/netperf_socket/sys/amd64/amd64/db_disasm.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/exception.S#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/io_apic.c#8 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/local_apic.c#8 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#25 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#17 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mptable.c#8 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/nexus.c#9 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/prof_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/support.S#8 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/sys_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#11 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#16 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#23 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#13 integrate .. //depot/projects/netperf_socket/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/_bus.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/apicvar.h#6 integrate .. //depot/projects/netperf_socket/sys/amd64/include/asm.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/include/bus.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/bus_amd64.h#4 delete .. //depot/projects/netperf_socket/sys/amd64/include/bus_memio.h#3 delete .. //depot/projects/netperf_socket/sys/amd64/include/bus_pio.h#3 delete .. //depot/projects/netperf_socket/sys/amd64/include/cpufunc.h#9 integrate .. //depot/projects/netperf_socket/sys/amd64/include/critical.h#5 delete .. //depot/projects/netperf_socket/sys/amd64/include/floatingpoint.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/ieeefp.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/legacyvar.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/proc.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/include/smp.h#6 integrate .. //depot/projects/netperf_socket/sys/amd64/include/sysarch.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/netperf_socket/sys/amd64/include/tss.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/clock.c#9 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/isa.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/isa_dma.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/timerreg.h#3 delete .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/autoconf.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/bcopyinout.S#6 integrate .. //depot/projects/netperf_socket/sys/arm/arm/bcopyinout_xscale.S#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#10 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc.c#7 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm3.S#4 delete .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm67.S#4 delete .. //depot/projects/netperf_socket/sys/arm/arm/critical.c#3 delete .. //depot/projects/netperf_socket/sys/arm/arm/fiq.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/fusu.S#6 integrate .. //depot/projects/netperf_socket/sys/arm/arm/in_cksum.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/in_cksum_arm.S#5 integrate .. //depot/projects/netperf_socket/sys/arm/arm/intr.c#8 integrate .. //depot/projects/netperf_socket/sys/arm/arm/locore.S#7 integrate .. //depot/projects/netperf_socket/sys/arm/arm/machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/arm/arm/pmap.c#16 integrate .. //depot/projects/netperf_socket/sys/arm/arm/support.S#7 integrate .. //depot/projects/netperf_socket/sys/arm/arm/swtch.S#9 integrate .. //depot/projects/netperf_socket/sys/arm/arm/trap.c#9 integrate .. //depot/projects/netperf_socket/sys/arm/arm/undefined.c#6 integrate .. //depot/projects/netperf_socket/sys/arm/arm/vm_machdep.c#10 integrate .. //depot/projects/netperf_socket/sys/arm/conf/IQ31244#5 integrate .. //depot/projects/netperf_socket/sys/arm/include/_bus.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/asmacros.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/atomic.h#5 integrate .. //depot/projects/netperf_socket/sys/arm/include/bus.h#6 integrate .. //depot/projects/netperf_socket/sys/arm/include/bus_memio.h#3 delete .. //depot/projects/netperf_socket/sys/arm/include/bus_pio.h#3 delete .. //depot/projects/netperf_socket/sys/arm/include/cpuconf.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/critical.h#3 delete .. //depot/projects/netperf_socket/sys/arm/include/endian.h#7 integrate .. //depot/projects/netperf_socket/sys/arm/include/float.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/pmap.h#8 integrate .. //depot/projects/netperf_socket/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/proc.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_io.c#5 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/i80321.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq31244_7seg.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq31244_machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq80321.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/obio_space.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/common/boot.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/common/console.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/common/help.common#8 integrate .. //depot/projects/netperf_socket/sys/boot/common/loader.8#12 integrate .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#16 integrate .. //depot/projects/netperf_socket/sys/boot/i386/Makefile.inc#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot0/Makefile#6 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot2/Makefile#5 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot2.c#5 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biosacpi.c#4 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/bioscd.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/bootinfo.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/libi386.h#4 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/pxe.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/elf_freebsd.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_copy.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/Makefile#5 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/boot.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/boot.h#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/boot2.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/disk.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/io.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/sys.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/table.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/Makefile#5 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/btx.S#5 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/Makefile#5 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/btxldr.S#4 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/kgzldr/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/comconsole.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/gatea20.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/time.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/vidconsole.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/Makefile#6 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/netperf_socket/sys/bsm/audit.h#1 branch .. //depot/projects/netperf_socket/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ch.c#5 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#10 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_low.c#3 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/netperf_socket/sys/coda/coda_fbsd.c#8 integrate .. //depot/projects/netperf_socket/sys/coda/coda_psdev.c#5 integrate .. //depot/projects/netperf_socket/sys/coda/coda_venus.c#5 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vfsops.c#9 integrate .. //depot/projects/netperf_socket/sys/coda/coda_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/netperf_socket/sys/compat/ia32/ia32_signal.h#4 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_file.c#8 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#11 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_socket.c#9 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_stats.c#9 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/hal_var.h#5 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#22 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ndis_var.h#13 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ntoskrnl_var.h#12 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/pe_var.h#5 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_hal.c#8 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#19 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#22 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/netperf_socket/sys/compat/ndis/winx64_wrap.S#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/imgact_svr4.c#5 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_stream.c#7 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.alpha#6 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.amd64#5 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.arm#6 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.i386#5 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.ia64#5 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.pc98#5 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.powerpc#7 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.sparc64#5 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#51 integrate .. //depot/projects/netperf_socket/sys/conf/files#63 integrate .. //depot/projects/netperf_socket/sys/conf/files.alpha#10 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#22 integrate .. //depot/projects/netperf_socket/sys/conf/files.arm#3 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#35 integrate .. //depot/projects/netperf_socket/sys/conf/files.ia64#10 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#20 integrate .. //depot/projects/netperf_socket/sys/conf/files.powerpc#8 integrate .. //depot/projects/netperf_socket/sys/conf/files.sparc64#15 integrate .. //depot/projects/netperf_socket/sys/conf/kern.mk#6 integrate .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#14 integrate .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#18 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#22 integrate .. //depot/projects/netperf_socket/sys/conf/majors#10 delete .. //depot/projects/netperf_socket/sys/conf/majors.awk#2 delete .. //depot/projects/netperf_socket/sys/conf/options#38 integrate .. //depot/projects/netperf_socket/sys/conf/options.amd64#9 integrate .. //depot/projects/netperf_socket/sys/conf/options.i386#9 integrate .. //depot/projects/netperf_socket/sys/conf/options.pc98#11 integrate .. //depot/projects/netperf_socket/sys/conf/options.sparc64#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/ath/freebsd/ah_osdep.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/fil.c#7 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_compat.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil.c#9 delete .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil.h#6 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_frag.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_frag.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_htable.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_htable.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_lookup.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_lookup.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_nat.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_pool.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_pool.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_rules.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_rules.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_scan.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_scan.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_state.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_sync.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_sync.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ipl.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/mlfk_ipl.c#6 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/api/ccpriv.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/api/unisap.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ngatm/netnatm/msg/uni_ie.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#11 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#14 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#20 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_if.c#8 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#13 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_norm.c#9 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_osfp.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_table.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pfvar.h#8 integrate .. //depot/projects/netperf_socket/sys/ddb/db_print.c#4 integrate .. //depot/projects/netperf_socket/sys/ddb/db_run.c#5 integrate .. //depot/projects/netperf_socket/sys/ddb/ddb.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_disk.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_fujitsu.c#1 branch .. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_toshiba.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdHardware.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdSchedule.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#46 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_acad.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_battery.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_if.m#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_package.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_perf.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_resource.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpiio.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#27 integrate .. //depot/projects/netperf_socket/sys/dev/adlink/adlink.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_eisa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_isa.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/advlib.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adw_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adwcam.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adwlib.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aha/aha.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aha/aha_isa.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ahb/ahb.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aic/aic.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic/aic_cbus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic/aic_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic/aic_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_osm.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx_osm.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/amd/amd.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr_pci.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/arcmsr/arcmsr.c#1 branch .. //depot/projects/netperf_socket/sys/dev/arcmsr/arcmsr.h#1 branch .. //depot/projects/netperf_socket/sys/dev/asr/asr.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#24 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#15 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-card.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-cbus.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#24 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-commands.h#3 delete .. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-dma.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-isa.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#22 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.h#11 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#20 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-raid.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata_if.m#1 branch .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cam.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_ath.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_athioctl.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/awi/am79c930.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_audio.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_card.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_core.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_os.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_reg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_tuner.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt_eisa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt_isa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/cardbus/cardbus.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/cissio.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/cissreg.h#9 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/cissvar.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/cnw/if_cnw.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/cpufreq/ichss.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ct/ct_isa.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/digi/CX.bios.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/CX.fepos.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/CX_PCI.bios.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/CX_PCI.fepos.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/EPCX.bios.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/EPCX.fepos.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/EPCX_PCI.bios.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/EPCX_PCI.fepos.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/Xe.bios.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/Xe.fepos.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/Xem.bios.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/Xem.fepos.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt_eisa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt_scsi.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/ati_pcigart.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/ati_pcigart.h#3 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_agpsupport.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_agpsupport.h#3 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_atomic.h#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_auth.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_auth.h#3 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_bufs.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_bufs.h#3 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_context.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_context.h#3 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_dma.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_dma.h#3 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_drawable.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_drawable.h#3 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_drv.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_drv.h#8 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_fops.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_fops.h#4 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_ioctl.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_ioctl.h#3 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_irq.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_irq.h#4 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_lock.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_lock.h#3 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_memory.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_memory.h#3 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_memory_debug.h#3 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_os_freebsd.h#8 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_pci.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_pci.h#3 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_sarea.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_scatter.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_scatter.h#3 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_sysctl.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_sysctl.h#4 delete .. //depot/projects/netperf_socket/sys/dev/drm/drm_vm.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/drm_vm.h#5 delete .. //depot/projects/netperf_socket/sys/dev/drm/i915_dma.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/i915_drm.h#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/i915_drv.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/i915_drv.h#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/i915_irq.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/i915_mem.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/mach64_dma.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/mach64_drm.h#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/mach64_drv.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/mach64_drv.h#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/mach64_irq.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/mach64_state.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/mga.h#4 delete .. //depot/projects/netperf_socket/sys/dev/drm/mga_dma.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_drm.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_drv.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_irq.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_state.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_ucode.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/mga_warp.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128.h#4 delete .. //depot/projects/netperf_socket/sys/dev/drm/r128_cce.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_drm.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_drv.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_irq.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_state.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon.h#4 delete .. //depot/projects/netperf_socket/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_drm.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_drv.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_drv.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_mem.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/radeon_state.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/drm/savage_bci.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/savage_drm.h#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/savage_drv.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/savage_drv.h#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/savage_state.c#1 branch .. //depot/projects/netperf_socket/sys/dev/drm/sis.h#4 delete .. //depot/projects/netperf_socket/sys/dev/drm/sis_drm.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_drv.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_ds.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_ds.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/drm/sis_mm.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/drm/tdfx.h#4 delete .. //depot/projects/netperf_socket/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/drm/tdfx_drv.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ed/if_ed98.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/eisa/eisaconf.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/em/README#2 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em_hw.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em_hw.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/esp/esp_sbus.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/esp/ncr53c9x.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/esp/ncr53c9xreg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/esp/ncr53c9xvar.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/fb/boot_font.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fb/creator.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/fb/gfb.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fb/machfb.c#1 branch .. //depot/projects/netperf_socket/sys/dev/fb/machfbreg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/fb/s3_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/fb/tga.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/fb/vga.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_isa.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwdev.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci_pci.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohcireg.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#19 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxpreg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/rcvbundl.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/gfb/gfb_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/hatm/if_hatm_tx.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/hfa_freebsd.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/hfa_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme_sbus.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/entry.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/gui_lib.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/osbsd.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/hwpmc/hwpmc_amd.c#1 branch .. //depot/projects/netperf_socket/sys/dev/hwpmc/hwpmc_intel.c#1 branch .. //depot/projects/netperf_socket/sys/dev/hwpmc/hwpmc_mod.c#1 branch .. //depot/projects/netperf_socket/sys/dev/hwpmc/hwpmc_pentium.c#1 branch .. //depot/projects/netperf_socket/sys/dev/hwpmc/hwpmc_piv.c#1 branch .. //depot/projects/netperf_socket/sys/dev/hwpmc/hwpmc_ppro.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ic/i8237.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/ic/i8253reg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ida/ida.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_disk.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_eisa.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ida/idareg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ida/idavar.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/idt/idt_harp.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/idt/idt_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ie/if_ie.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ieee488/upd7210.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#23 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pccard.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndisvar.h#10 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir_ctrl.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips.h#8 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_disk.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/ipw/if_ipw.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ipw/if_ipwreg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ipw/if_ipwvar.h#1 branch .. //depot/projects/netperf_socket/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_inline.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_pci.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/isp/ispvar.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/iwi/if_iwi.c#1 branch .. //depot/projects/netperf_socket/sys/dev/iwi/if_iwireg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/iwi/if_iwivar.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb_osdep.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/kbd/atkbdc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/kbd/kbdtables.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/mc146818/mc146818.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mc146818/mc146818var.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/mcd/mcd.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/mcd/mcd_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/mii/dcphy.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/mii/miidevs#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/pnphy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mk48txx/mk48txx.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/mk48txx/mk48txxreg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/mk48txx/mk48txxvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/mly/mly.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/mpt/mpt_freebsd.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/mse/mse.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mse/mse_cbus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mse/mse_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mse/msevar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/musycc/musycc.c#7 delete .. //depot/projects/netperf_socket/sys/dev/my/if_my.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500_pccard.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/nsp/nsp.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openfirmio.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openpromio.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/pbio/pbio.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/pccard.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/pccard_cis.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/pccard_cis_quirks.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/pccarddevs#8 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/pccardvar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci_user.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pcib_if.m#3 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/pdq/if_fpa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/pdq/pdq_freebsd.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/pdq/pdq_ifsubr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/lpt.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/pps.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ppc/ppc.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ral/if_ral.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ral/if_ral_pccard.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ral/if_ral_pci.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ral/if_ralrate.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ral/if_ralrate.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ral/if_ralreg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ral/if_ralvar.h#1 branch .. //depot/projects/netperf_socket/sys/dev/random/probe.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/random/randomdev_soft.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#19 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/scd/scd.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/scd/scd_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#23 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/snp/snp.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/es137x.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ich.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/maestro3.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/sound/sbus/cs4231.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/usb/uaudio.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/usb/uaudio_pcm.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sr/if_sr.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sr/if_sr_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sr/if_sr_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_pccard.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_subr.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sym/sym_hipd.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/apm/apm_saver.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scgfbrndr.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scvesactl.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scvgarndr.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scvtb.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/snake/snake_saver.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/star/star_saver.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/tga/tga_pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/trm/trm.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/twa/tw_cl.h#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_cl_externs.h#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_cl_fwif.h#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_cl_fwimg.c#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_cl_init.c#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_cl_intr.c#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_cl_io.c#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_cl_ioctl.h#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_cl_misc.c#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_cl_share.h#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_osl.h#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_osl_cam.c#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_osl_externs.h#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_osl_freebsd.c#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_osl_includes.h#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_osl_ioctl.h#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_osl_share.h#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/tw_osl_types.h#1 branch .. //depot/projects/netperf_socket/sys/dev/twa/twa.c#4 delete .. //depot/projects/netperf_socket/sys/dev/twa/twa.h#5 delete .. //depot/projects/netperf_socket/sys/dev/twa/twa_cam.c#4 delete .. //depot/projects/netperf_socket/sys/dev/twa/twa_externs.h#3 delete .. //depot/projects/netperf_socket/sys/dev/twa/twa_freebsd.c#9 delete .. //depot/projects/netperf_socket/sys/dev/twa/twa_fwimg.c#3 delete .. //depot/projects/netperf_socket/sys/dev/twa/twa_globals.c#3 delete .. //depot/projects/netperf_socket/sys/dev/twa/twa_includes.h#4 delete .. //depot/projects/netperf_socket/sys/dev/twa/twa_ioctl.h#3 delete .. //depot/projects/netperf_socket/sys/dev/twa/twa_reg.h#4 delete .. //depot/projects/netperf_socket/sys/dev/twe/twe_compat.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_z8530.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_kbd_sun.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci_pci.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehcivar.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_aue.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_auereg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axereg.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_cdce.c#1 branch .. //depot/projects/netperf_socket/sys/dev/usb/if_cdcereg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/usb/if_cue.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_cuereg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_kue.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_kuereg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_rue.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_ruereg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_udav.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_udavreg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_ural.c#1 branch .. //depot/projects/netperf_socket/sys/dev/usb/if_uralreg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/usb/if_uralvar.h#1 branch .. //depot/projects/netperf_socket/sys/dev/usb/ohci.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ohci_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ohcivar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucom.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uftdi.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhci.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhcivar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhub.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umass.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uplcom.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_ethersubr.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_ethersubr.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#32 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uvisor.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/vkbd/vkbd.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx_pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi_pccard.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/wl/if_wl.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/wl/if_wl_i82586.h#1 branch .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_devs.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vfsops.c#9 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#15 integrate .. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vfsops.c#11 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs.h#6 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_hash.c#6 delete .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vfsops.c#11 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/denode.h#6 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_conv.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_denode.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_lookup.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#15 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfsmount.h#8 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_subr.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vfsops.c#11 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null.h#5 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_subr.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_vfsops.c#11 integrate .. //depot/projects/netperf_socket/sys/fs/nullfs/null_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_vfsops.c#8 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vfsops.c#10 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vnops.c#10 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_status.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs.h#4 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_fileno.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_internal.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vnops.c#10 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_smb.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_subr.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vfsops.c#9 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf.h#7 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vfsops.c#10 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vnops.c#11 integrate .. //depot/projects/netperf_socket/sys/fs/umapfs/umap_vfsops.c#9 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_subr.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vfsops.c#10 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vnops.c#10 integrate .. //depot/projects/netperf_socket/sys/gdb/gdb_main.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#17 integrate .. //depot/projects/netperf_socket/sys/geom/geom_bsd.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/geom_ctl.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/geom_dev.c#10 integrate .. //depot/projects/netperf_socket/sys/geom/geom_disk.c#10 integrate .. //depot/projects/netperf_socket/sys/geom/geom_disk.h#3 integrate .. //depot/projects/netperf_socket/sys/geom/geom_event.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/geom_gpt.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/geom_kern.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/geom_pc98.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/geom_pc98_enc.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_subr.c#11 integrate .. //depot/projects/netperf_socket/sys/geom/geom_sunlabel.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/geom_sunlabel_enc.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.c#19 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.h#11 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror_ctl.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.c#13 integrate .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3_ctl.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.c#16 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_drive.c#14 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_init.c#8 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_alloc.c#5 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_ihash.c#5 delete .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_inode.c#7 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_lookup.c#6 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#16 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#15 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/inode.h#6 integrate .. //depot/projects/netperf_socket/sys/gnu/reiserfs/README#1 branch .. //depot/projects/netperf_socket/sys/gnu/reiserfs/reiserfs_fs.h#1 branch .. //depot/projects/netperf_socket/sys/gnu/reiserfs/reiserfs_fs_i.h#1 branch .. //depot/projects/netperf_socket/sys/gnu/reiserfs/reiserfs_fs_sb.h#1 branch .. //depot/projects/netperf_socket/sys/gnu/reiserfs/reiserfs_hashes.c#1 branch .. //depot/projects/netperf_socket/sys/gnu/reiserfs/reiserfs_inode.c#1 branch .. //depot/projects/netperf_socket/sys/gnu/reiserfs/reiserfs_item_ops.c#1 branch .. //depot/projects/netperf_socket/sys/gnu/reiserfs/reiserfs_mount.h#1 branch .. //depot/projects/netperf_socket/sys/gnu/reiserfs/reiserfs_namei.c#1 branch .. //depot/projects/netperf_socket/sys/gnu/reiserfs/reiserfs_prints.c#1 branch .. //depot/projects/netperf_socket/sys/gnu/reiserfs/reiserfs_stree.c#1 branch .. //depot/projects/netperf_socket/sys/gnu/reiserfs/reiserfs_vfsops.c#1 branch .. //depot/projects/netperf_socket/sys/gnu/reiserfs/reiserfs_vnops.c#1 branch .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/madt.c#8 integrate .. //depot/projects/netperf_socket/sys/i386/bios/apm.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#20 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#35 integrate .. //depot/projects/netperf_socket/sys/i386/conf/PAE#7 integrate .. //depot/projects/netperf_socket/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/cpufreq/p4tcc.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/cpufreq/powernow.c#1 branch .. //depot/projects/netperf_socket/sys/i386/cpufreq/smist.c#1 branch .. //depot/projects/netperf_socket/sys/i386/i386/autoconf.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/bios.c#9 integrate .. //depot/projects/netperf_socket/sys/i386/i386/critical.c#3 delete .. //depot/projects/netperf_socket/sys/i386/i386/genassym.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/identcpu.c#11 integrate .. //depot/projects/netperf_socket/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/intr_machdep.c#10 integrate .. //depot/projects/netperf_socket/sys/i386/i386/io_apic.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/local_apic.c#8 integrate .. //depot/projects/netperf_socket/sys/i386/i386/locore.s#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#19 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mp_machdep.c#15 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mptable.c#8 integrate .. //depot/projects/netperf_socket/sys/i386/i386/nexus.c#8 integrate .. //depot/projects/netperf_socket/sys/i386/i386/support.s#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/swtch.s#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/trap.c#9 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm86bios.s#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#21 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_misc.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/imgact_coff.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/_bus.h#1 branch .. //depot/projects/netperf_socket/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/netperf_socket/sys/i386/include/apm_bios.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/bus.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/bus_at386.h#5 delete .. //depot/projects/netperf_socket/sys/i386/include/bus_memio.h#3 delete .. //depot/projects/netperf_socket/sys/i386/include/bus_pc98.h#4 delete .. //depot/projects/netperf_socket/sys/i386/include/bus_pio.h#3 delete .. //depot/projects/netperf_socket/sys/i386/include/clock.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/cpufunc.h#7 integrate .. //depot/projects/netperf_socket/sys/i386/include/critical.h#6 delete .. //depot/projects/netperf_socket/sys/i386/include/floatingpoint.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/ieeefp.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/legacyvar.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/md_var.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/npx.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/pc/display.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/pcb.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/pci_cfgreg.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/pcpu.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/pmc_mdep.h#1 branch .. //depot/projects/netperf_socket/sys/i386/include/ppireg.h#1 branch .. //depot/projects/netperf_socket/sys/i386/include/proc.h#6 integrate .. //depot/projects/netperf_socket/sys/i386/include/segments.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/smp.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/sysarch.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/timerreg.h#1 branch .. //depot/projects/netperf_socket/sys/i386/isa/atpic.c#9 integrate .. //depot/projects/netperf_socket/sys/i386/isa/clock.c#9 integrate .. //depot/projects/netperf_socket/sys/i386/isa/ic/if_wl_i82586.h#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/if_el.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/isa/isa.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/isa_dma.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/isa/lptreg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/npx.c#12 integrate .. //depot/projects/netperf_socket/sys/i386/isa/prof_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/isa/spkr.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/isa/timerreg.h#3 delete .. //depot/projects/netperf_socket/sys/i386/linux/imgact_linux.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#11 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_pir.c#8 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_isic.h#3 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/itjc/i4b_itjc_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/iwic/i4b_iwic_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/ia64/conf/GENERIC#12 integrate .. //depot/projects/netperf_socket/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/autoconf.c#4 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/clock.c#4 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/clock_if.m#3 delete .. //depot/projects/netperf_socket/sys/ia64/ia64/critical.c#2 delete .. //depot/projects/netperf_socket/sys/ia64/ia64/db_trace.c#6 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/eficlock.c#3 delete .. //depot/projects/netperf_socket/sys/ia64/ia64/interrupt.c#6 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#18 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/mp_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/nexus.c#6 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#23 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/trap.c#12 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/unwind.c#5 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/vm_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/ia64/include/_bus.h#1 branch .. //depot/projects/netperf_socket/sys/ia64/include/bus.h#4 integrate .. //depot/projects/netperf_socket/sys/ia64/include/bus_memio.h#3 delete .. //depot/projects/netperf_socket/sys/ia64/include/bus_pio.h#3 delete .. //depot/projects/netperf_socket/sys/ia64/include/clockvar.h#3 delete .. //depot/projects/netperf_socket/sys/ia64/include/critical.h#5 delete .. //depot/projects/netperf_socket/sys/ia64/include/pmc_mdep.h#1 branch .. //depot/projects/netperf_socket/sys/ia64/include/proc.h#3 integrate .. //depot/projects/netperf_socket/sys/ia64/isa/isa_dma.c#5 integrate .. //depot/projects/netperf_socket/sys/isa/atkbdc_isa.c#5 integrate .. //depot/projects/netperf_socket/sys/isa/isa_common.c#5 integrate .. //depot/projects/netperf_socket/sys/isa/isa_dmareg.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 30 16:00:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B1FA16A420; Mon, 30 May 2005 16:00:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B6C416A41C for ; Mon, 30 May 2005 16:00:21 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBF7B43D49 for ; Mon, 30 May 2005 16:00:20 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UG0KtO011331 for ; Mon, 30 May 2005 16:00:20 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UG0KFa011328 for perforce@freebsd.org; Mon, 30 May 2005 16:00:20 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 30 May 2005 16:00:20 GMT Message-Id: <200505301600.j4UG0KFa011328@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 77720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 16:00:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=77720 Change 77720 by trhodes@trhodes_local on 2005/05/30 16:00:03 If no options are passed to auditreduce, print the usage message instead of silently failing and returning to the shell prompt. I would like to rework this usage message, but not right now. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#2 (text+ko) ==== @@ -682,6 +682,9 @@ } } + if (optind + 2 != argc) + usage("Unknown option"); + /* For each of the files passed as arguments dump the contents */ if(optind == argc) { // XXX should look in the default directory for audit trail files From owner-p4-projects@FreeBSD.ORG Mon May 30 16:49:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C7B616A420; Mon, 30 May 2005 16:49:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F0A7416A41C for ; Mon, 30 May 2005 16:49:20 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C244143D1D for ; Mon, 30 May 2005 16:49:20 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UGnKoS024026 for ; Mon, 30 May 2005 16:49:20 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UGnKqE024023 for perforce@freebsd.org; Mon, 30 May 2005 16:49:20 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 30 May 2005 16:49:20 GMT Message-Id: <200505301649.j4UGnKqE024023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 77722 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 16:49:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=77722 Change 77722 by trhodes@trhodes_local on 2005/05/30 16:49:16 Kill hard sentence breaks and add some missing mark up to auditreduce.1. Use C99 keywords in auditreduce.c. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#2 (text+ko) ==== @@ -29,7 +29,7 @@ .Os .Sh NAME .Nm auditreduce -.Nd select records from audit trail files +.Nd "select records from audit trail files" .Sh SYNOPSIS .Nm auditreduce .Op Fl A @@ -50,11 +50,15 @@ The .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 +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 .Nm praudit -utility to print the selected audit records in human-readable form. See +utility to print the selected audit records in human-readable form. +See .Xr praudit 1 for more information. .Pp @@ -68,12 +72,13 @@ Select records that occurred before the given datetime. .It Fl c Ar flags Select records matching the given audit classes specified as a comma -separated list of audit flags. See +separated list of audit flags. +See .Xr audit_control 5 for a description of audit flags. .It Fl d Ar YYYYMMDD -Select records that occurred on a given date. This option cannot be used -with +Select records that occurred on a given date. +This option cannot be used with .Fl a or .Fl b @@ -90,14 +95,19 @@ .It Fl j Ar id Select records having a subject token with matching ID. .It Fl m Ar event -Select records with the given event name or number. See +Select records with the given event name or number. +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 -Select records containing the given path name. file="/usr" matches paths -starting with usr. file="~/usr" matches paths not starting with usr. +Select records containing the given path name. +file="/usr" matches paths +starting with +.Pa usr . +file="~/usr" matches paths not starting with +.Pa usr . .It Nm msgqid Select records containing the given message queue id. .It Nm pid @@ -116,7 +126,9 @@ .Nm -e root /var/audit/20031016184719.20031017122634 .Pp -To select all setlogin(2) events from that log: +To select all +.Xr setlogin 2 +events from that log: .Pp .Nm -m AUE_SETLOGIN /var/audit/20031016184719.20031017122634 ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#3 (text+ko) ==== @@ -28,11 +28,7 @@ /* * Tool used to merge and select audit records from audit trail files - */ - -/* - * auditreaduce [options] [audit-trail-file...] - */ + */ /* * XXX Currently we do not support merging of records from multiple @@ -59,7 +55,7 @@ au_mask_t maskp; /* Used while selecting based on class */ time_t p_atime;/* select records created after this time */ time_t p_btime;/* select records created before this time */ -u_int16_t p_evtype; /* The event that we are searching for */ +uint16_t p_evtype; /* The event that we are searching for */ int p_auid; /* audit id */ int p_euid; /* effective user id */ int p_egid; /* effective group id */ @@ -76,7 +72,7 @@ char *p_sockobj = NULL; -u_int32_t opttochk = 0; +uint32_t opttochk = 0; static void usage(const char *msg) @@ -193,7 +189,7 @@ /* * Check if object's pid maches the given pid */ -static int select_pidobj(u_int32_t pid) +static int select_pidobj(uint32_t pid) { if(ISOPTSET(opttochk, OPT_op)) { if(pid != strtol(p_pidobj, (char **)NULL, 10)) { @@ -207,7 +203,7 @@ * Check if the given ipc object with the given type matches the * selection criteria */ -static int select_ipcobj(u_char type, u_int32_t id, u_int32_t *optchkd) +static int select_ipcobj(u_char type, uint32_t id, uint32_t *optchkd) { if(type == AT_IPC_MSG) { SETOPT((*optchkd), OPT_om); @@ -251,7 +247,7 @@ /* * Check if the file name matches selection criteria */ -static int select_filepath(char *path, u_int32_t *optchkd) +static int select_filepath(char *path, uint32_t *optchkd) { char *loc; @@ -286,7 +282,7 @@ * class, * event */ -static int select_hdr32(tokenstr_t tok, u_int32_t *optchkd) +static int select_hdr32(tokenstr_t tok, uint32_t *optchkd) { SETOPT((*optchkd), (OPT_A | OPT_a | OPT_b | OPT_c | OPT_m)); @@ -335,7 +331,7 @@ * ruid, * process id */ -static int select_proc32(tokenstr_t tok, u_int32_t *optchkd) +static int select_proc32(tokenstr_t tok, uint32_t *optchkd) { SETOPT((*optchkd), (OPT_u | OPT_e | OPT_f | OPT_g | OPT_r | OPT_op)); @@ -371,7 +367,7 @@ * ruid, * subject id */ -static int select_subj32(tokenstr_t tok, u_int32_t *optchkd) +static int select_subj32(tokenstr_t tok, uint32_t *optchkd) { SETOPT((*optchkd), (OPT_u | OPT_e | OPT_f | OPT_g | OPT_r | OPT_j)); @@ -407,7 +403,7 @@ int reclen; int bytesread; int selected; - u_int32_t optchkd; + uint32_t optchkd; int err = 0; From owner-p4-projects@FreeBSD.ORG Mon May 30 18:51:36 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5305016A420; Mon, 30 May 2005 18:51:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C1A416A41C for ; Mon, 30 May 2005 18:51:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1D0B43D1D for ; Mon, 30 May 2005 18:51:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UIpZnl028817 for ; Mon, 30 May 2005 18:51:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UIpIB3028625 for perforce@freebsd.org; Mon, 30 May 2005 18:51:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 May 2005 18:51:18 GMT Message-Id: <200505301851.j4UIpIB3028625@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 77726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 18:51:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=77726 Change 77726 by rwatson@rwatson_tislabs on 2005/05/30 18:50:34 Integrate TrustedBSD base branch from FreeBSD CVS. Vendor imports/updates: - BSNMP update - bzip2 update - libz update - ipfilter update - libcap update - lukemftp update - one-true-awk update - tcpdump update - texinfo update - GNU libregex update - ACPI update Other changes: - No more NI_WITHSCOPEID - Top reformatted - libarchive portability work - ttyname_r - Many armisms, ppcisms - More VFS-related locking, system calls MPSAFE, and so on. - HWPMC on amd64 - Linux and other ABIs now wrap the FreeBSD implementations of things like stat better, and reduced use of the stack gap. - netgraph_nat - Kernel libalias - reiserfs - sparc64 framebuffer and other console magic - ral, ural drivers - Kernel malloc, UMA per-cpu optimizations and critical section changes - close/read socket/socket buffer race fix - if_purgeaddrs() - TCP SACK fixes - More VM locking work - More make Looped back TrustedBSD changes: - bsm/audit.h, bsm/audit_kevents.h stubs - syscalls.master format changed to take audit event ID for all and sundry ABIs. - remove unused ACL types to prevent confusion Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#29 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#61 integrate .. //depot/projects/trustedbsd/base/UPDATING#55 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#8 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.c#8 integrate .. //depot/projects/trustedbsd/base/bin/csh/config.h#5 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.c#14 integrate .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.1#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/options.c#9 integrate .. //depot/projects/trustedbsd/base/bin/stty/print.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/VERSION#8 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmpclient.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpclient.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpclient.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/oid-list#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_ip.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_route.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_tcp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_udp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/CHANGES#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/base/contrib/bzip2/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/LICENSE#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/Makefile-libbz2_so#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/README.COMPILATION.PROBLEMS#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/blocksort.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzip2.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzip2.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzip2recover.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzlib.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzlib.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzlib_private.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/compress.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/crctable.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/decompress.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/huffman.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/randtable.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/sample1.bz2.uu#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/sample1.ref.gz.uu#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/sample2.bz2.uu#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/sample2.ref.gz.uu#2 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/sample3.bz2.uu#3 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/sample3.ref.gz.uu#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipfstat.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/pcap-bpf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/CHANGES#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/CREDITS#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/FILES#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/INSTALL.txt#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/README.hpux#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/README.macosx#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/VERSION#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/bpf/net/bpf_filter.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/bpf_dump.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/bpf_image.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/config.h.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/configure.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/etherent.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/ethertype.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-getad.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-gifc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-glifc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-null.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-win32.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/grammar.y#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/inet.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/nametoaddr.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/optimize.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dag.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dlpi.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dos.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dos.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-enet.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-int.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-linux.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-namedb.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-nit.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-null.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-pf.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-snit.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-snoop.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-win32.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap1.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/pf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/ppp.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/savefile.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/scanner.l#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/snprintf.c#3 delete .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/cmds.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/cmdtab.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/extern.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/fetch.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.1#10 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp_var.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/main.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/progressbar.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/util.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/version.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/libngatm.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/uniaddr.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/unifunc.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/unimsg.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/unisap.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/unistruct.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/snmp_atm/atm.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/snmp_atm/snmp_atm.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/snmp_atm/snmp_atm.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/sscop/common.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/sscop/common.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/sscop/sscop_main.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/FIXES#8 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/README#6 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/awk.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/b.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/lex.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/lib.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/main.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/makefile#6 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/proctab.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/run.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/tran.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/ctx.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcp_wrappers/hosts_access.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcp_wrappers/socket.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/.cvsignore#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/CHANGES#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/CREDITS#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/FILES#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/INSTALL#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/README#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/VERSION#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/acconfig.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/addrtoname.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/appletalk.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/bgp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/bpf_dump.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/config.h.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/cpack.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/cpack.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/decode_prefix.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/ethertype.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/extract.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/gmpls.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/gmpls.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/gmt2local.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/icmp6.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ieee802_11_radio.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/interface.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ip.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipproto.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipproto.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/l2vpn.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/l2vpn.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/llc.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/machdep.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/bittypes.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/datalinks.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/dlnames.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/getaddrinfo.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/getnameinfo.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/inet_aton.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/inet_ntop.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/inet_pton.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/snprintf.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/strlcat.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/strlcpy.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/mpls.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/netdissect.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/nlpid.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/nlpid.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/ntp.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ospf.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/oui.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/oui.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/parsenfsfh.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/pcap-missing.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/pf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/pmap_prot.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/ppp.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-802_11.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ah.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-aodv.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ap1394.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-arcnet.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-arp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ascii.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-atalk.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-atm.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-beep.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bfd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bgp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bootp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-cdp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-chdlc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-cip.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-cnfp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-decnet.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-dhcp6.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-domain.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-dvmrp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-eap.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-egp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-eigrp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-enc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-esp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ether.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fddi.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fr.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-frag6.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-gre.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-hsrp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-icmp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-icmp6.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-igmp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-igrp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip6.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip6opts.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipcomp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipfc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipx.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isakmp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isoclns.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-juniper.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-krb.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-l2tp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lane.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ldp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-llc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lmp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lspping.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lwres.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-mobile.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-mobility.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-mpls.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-msdp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-netbios.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-nfs.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ntp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-null.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ospf.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ospf6.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pflog.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pim.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ppp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pppoe.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pptp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-radius.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-raw.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rip.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ripng.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rsvp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rt6.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rx.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sctp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sip.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sl.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sll.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-smb.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-snmp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-stp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sunatm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sunrpc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-symantec.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-syslog.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-tcp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-telnet.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-tftp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-timed.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-token.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-udp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-vjc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-vrrp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-wb.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-zephyr.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/rpc_auth.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/rpc_msg.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/setsignal.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/smb.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/smbutil.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/strcasecmp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcp.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump-stdinc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.1#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/udp.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/util.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/vfprintf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/telnet/telnetd/telnetd.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/AUTHORS#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/ChangeLog.46#1 branch .. //depot/projects/trustedbsd/base/contrib/texinfo/FREEBSD-Xlist#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/FREEBSD-upgrade#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/INSTALL#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/INTRODUCTION#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/NEWS#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/README.dev#1 branch .. //depot/projects/trustedbsd/base/contrib/texinfo/TODO#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/config.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/config.h.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/help2man#4 delete .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/info-stnd.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/info.1#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/info.5#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/info.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/infokey.1#1 branch .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/install-info.1#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/makeinfo.1#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/texindex.1#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/texinfo.5#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/texinfo.txi#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/version-stnd.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/version.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/dir.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/display.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/display.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/doc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/doc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/dribble.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/dribble.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/echo-area.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/echo-area.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/filesys.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/filesys.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/footnotes.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/footnotes.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/funs.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/gc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/gc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/indices.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/indices.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info-utils.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info-utils.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infodoc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infokey.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infokey.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infomap.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infomap.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/key.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/m-x.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/man.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/man.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/nodemenu.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/nodes.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/nodes.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/search.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/search.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/session.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/session.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/signals.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/signals.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/termdep.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/terminal.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/terminal.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/tilde.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/tilde.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/variables.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/variables.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/window.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/window.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/gettext.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/substring.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/system.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/xalloc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/xexit.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/xmalloc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/xstrdup.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/README#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/cmds.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/cmds.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/defun.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/defun.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/files.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/files.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/float.c#1 branch .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/float.h#1 branch .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/footnote.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/footnote.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/html.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/html.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/index.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/index.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/insertion.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/insertion.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/lang.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/lang.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/macro.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/macro.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/makeinfo.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/makeinfo.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/multi.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/multi.h#1 branch .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/node.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/node.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/sectioning.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/sectioning.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/texinfo.dtd#4 delete .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/texinfo.xsl#4 delete .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/toc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/toc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/xml.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/xml.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/xref.c#1 branch .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/xref.h#1 branch .. //depot/projects/trustedbsd/base/contrib/texinfo/util/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/util/install-info.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/util/texindex.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/top/commands.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/top/display.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/top/machine.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.c#7 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#15 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#29 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#29 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/named#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#20 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#40 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/limerick#5 integrate .. //depot/projects/trustedbsd/base/games/random/random.c#7 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libregex/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libregex/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libregex/config.h#1 branch .. //depot/projects/trustedbsd/base/gnu/lib/libregex/posix/regex.h#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libregex/regcomp.c#1 branch .. //depot/projects/trustedbsd/base/gnu/lib/libregex/regex.c#5 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libregex/regex_internal.c#1 branch .. //depot/projects/trustedbsd/base/gnu/lib/libregex/regex_internal.h#1 branch .. //depot/projects/trustedbsd/base/gnu/lib/libregex/regexec.c#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/dfa.c#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/dfa.h#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/grep.c#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/grep.h#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/mbcache.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/search.c#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/texinfo/infokey/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/texinfo/makeinfo/Makefile#5 integrate .. //depot/projects/trustedbsd/base/include/Makefile#45 integrate .. //depot/projects/trustedbsd/base/include/netdb.h#9 integrate .. //depot/projects/trustedbsd/base/include/runefile.h#2 delete .. //depot/projects/trustedbsd/base/include/unistd.h#23 integrate .. //depot/projects/trustedbsd/base/lib/csu/i386-elf/crt1.c#9 integrate .. //depot/projects/trustedbsd/base/lib/csu/i386-elf/crti.S#3 integrate .. //depot/projects/trustedbsd/base/lib/csu/i386-elf/crtn.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libalias/HISTORY#2 delete .. //depot/projects/trustedbsd/base/lib/libalias/Makefile#11 integrate .. //depot/projects/trustedbsd/base/lib/libalias/alias.c#12 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias.h#7 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias_cuseeme.c#5 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias_db.c#8 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias_ftp.c#5 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias_irc.c#5 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias_local.h#8 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias_nbt.c#7 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias_old.c#4 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias_pptp.c#7 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias_proxy.c#6 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias_skinny.c#6 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias_smedia.c#5 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias_util.c#7 delete .. //depot/projects/trustedbsd/base/lib/libalias/libalias.3#8 delete .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/configure.ac.in#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/Makefile.inc#25 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ttyname.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ttyname.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gmon/mcount.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/rune.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/runefile.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetbydns.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetbyht.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetbynis.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetnamadr.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/name6.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/netdb_private.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/rcmd.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_send.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_explode.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_qp.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/glue.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/accept.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/uuid/uuid_is_nil.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/pthread_private.h#18 integrate .. //depot/projects/trustedbsd/base/lib/libdevinfo/devinfo.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libgeom/geom_xml2tree.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_unix/pam_unix.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libpcap/config.h#6 integrate .. //depot/projects/trustedbsd/base/lib/libsdp/sdp.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libsdp/sdp.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libsdp/util.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libstand/Makefile#15 integrate .. //depot/projects/trustedbsd/base/lib/libstand/bzipfs.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libstand/bzlib.c.diff#3 delete .. //depot/projects/trustedbsd/base/lib/libstand/bzlib.h.diff#2 delete .. //depot/projects/trustedbsd/base/lib/libstand/bzlib_private.h.diff#3 delete .. //depot/projects/trustedbsd/base/lib/libstand/splitfs.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libstand/stand.h#13 integrate .. //depot/projects/trustedbsd/base/lib/libstand/zutil.h.diff#2 delete .. //depot/projects/trustedbsd/base/lib/libthread_db/libpthread_db.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libthr_db.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libutil/logwtmp.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libutil/realhostname.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/base/lib/libz/adler32.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/compress.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/crc32.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/deflate.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/deflate.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/example.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/infback.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libz/inffast.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/inflate.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/inftrees.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/trees.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/uncompr.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/zlib.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/zutil.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/zutil.h#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/i387/s_ceilf.S#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/i387/s_floorf.S#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/i387/s_truncf.S#2 integrate .. //depot/projects/trustedbsd/base/libexec/Makefile#18 integrate .. //depot/projects/trustedbsd/base/libexec/ftp-proxy/Makefile#2 integrate .. //depot/projects/trustedbsd/base/libexec/getty/ttys.5#3 integrate .. //depot/projects/trustedbsd/base/libexec/rlogind/rlogind.c#6 integrate .. //depot/projects/trustedbsd/base/libexec/rshd/rshd.c#11 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/i386/rtld_start.S#2 integrate .. //depot/projects/trustedbsd/base/libexec/talkd/process.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/tftpd/tftpd.c#12 integrate .. //depot/projects/trustedbsd/base/release/Makefile#65 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#59 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#91 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.dsl#7 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/login/pico-login.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#30 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.8#13 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.c#17 integrate .. //depot/projects/trustedbsd/base/sbin/clri/clri.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.cc#12 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/af_inet6.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#25 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/ipf/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#37 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#31 integrate .. //depot/projects/trustedbsd/base/sbin/kldstat/kldstat.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/kldstat/kldstat.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/mount_reiserfs/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/mount_reiserfs/mount_reiserfs.8#1 branch .. //depot/projects/trustedbsd/base/sbin/mount_reiserfs/mount_reiserfs.c#1 branch .. //depot/projects/trustedbsd/base/sbin/restore/interactive.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/restore/main.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/restore/restore.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/restore/tape.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/route/route.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/savecore/savecore.c#13 integrate .. //depot/projects/trustedbsd/base/share/dict/freebsd#5 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/contents/contents.ms#2 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#35 integrate .. //depot/projects/trustedbsd/base/share/examples/mdoc/example.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/Makefile#12 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread.3#9 integrate .. //depot/projects/trustedbsd/base/share/man/man3/pthread_atfork.3#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#56 integrate .. //depot/projects/trustedbsd/base/share/man/man4/amr.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/bge.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/carp.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/em.4#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ichsmb.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/iwi.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/led.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_bsdextended.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/Makefile#18 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_asus.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_ibm.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/ep.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/miibus.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mn.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ng_nat.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ng_netflow.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/nve.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/pcm.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sk.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_ad1816.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_als4000.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_cmi.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_cs4281.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_csa.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_ds1.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_emu10k1.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_es137x.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_ess.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_gusc.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_sbc.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_solo.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/twe.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#15 integrate .. //depot/projects/trustedbsd/base/share/man/man5/devfs.conf.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/devfs.rules.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man7/release.7#26 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_IOCTL.9#9 integrate .. //depot/projects/trustedbsd/base/share/man/man9/devclass_get_devices.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/devclass_get_drivers.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/style.9#25 integrate .. //depot/projects/trustedbsd/base/share/man/man9/taskqueue.9#13 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#23 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#21 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/autoconf.c#11 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/busdma_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/clock.c#13 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/timerreg.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/bus_memio.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/bus_pio.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ppireg.h#1 branch .. //depot/projects/trustedbsd/base/sys/alpha/include/timerreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/alpha/isa/isa_dma.c#10 integrate .. //depot/projects/trustedbsd/base/sys/alpha/isa/mcclock_isa.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_proto.h#13 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_syscall.h#12 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysent.c#12 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/syscalls.master#12 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_mount.c#12 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_proto.h#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_syscall.h#6 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_sysent.c#6 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/syscalls.master#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/autoconf.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/exception.S#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/identcpu.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/local_apic.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#19 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#17 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/bus.h#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/bus_memio.h#4 delete .. //depot/projects/trustedbsd/base/sys/amd64/include/bus_pio.h#4 delete .. //depot/projects/trustedbsd/base/sys/amd64/include/cpufunc.h#11 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/isa/clock.c#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/isa.h#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/isa_dma.c#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/timerreg.h#5 delete .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/autoconf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/bcopyinout.S#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/bcopyinout_xscale.S#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_arm3.S#4 delete .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_arm67.S#4 delete .. //depot/projects/trustedbsd/base/sys/arm/arm/in_cksum.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/in_cksum_arm.S#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/intr.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/swtch.S#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/trap.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/atomic.h#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/bus_memio.h#3 delete .. //depot/projects/trustedbsd/base/sys/arm/include/bus_pio.h#3 delete .. //depot/projects/trustedbsd/base/sys/arm/include/cpuconf.h#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/endian.h#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq31244_7seg.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/boot.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/console.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/help.common#13 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/loader.8#28 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#25 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/boot2.c#21 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/bioscd.c#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/bootinfo.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/devicename.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/libi386.h#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/main.c#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/elf_freebsd.c#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/ofw_copy.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/boot.c#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/boot.h#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/boot2.S#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/disk.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/io.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/sys.c#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/table.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/btx/btx/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/btx/btx/btx.S#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/btx/btxldr/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/btx/btxldr/btxldr.S#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/kgzldr/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/kgzldr/crt.s#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/biosdisk.c#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/biosmem.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/comconsole.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/gatea20.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/time.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/vidconsole.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/main.c#5 integrate .. //depot/projects/trustedbsd/base/sys/bsm/audit.h#1 branch .. //depot/projects/trustedbsd/base/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#21 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#49 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/kern_windrv.c#4 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/ndis_var.h#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/ntoskrnl_var.h#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_hal.c#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ndis.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ntoskrnl.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_usbd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_proto.h#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscall.h#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscallnames.c#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sysent.c#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/syscalls.master#5 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#60 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#86 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#52 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#46 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#40 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#60 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#28 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#30 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.sparc64#12 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_compat.h#13 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ngatm/netnatm/api/ccpriv.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ngatm/netnatm/api/unisap.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ngatm/netnatm/msg/uni_ie.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf.c#13 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_table.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdHardware.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdSchedule.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_acad.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_ec.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_package.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpivar.h#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adv_eisa.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adv_isa.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adv_pci.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/advansys.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/advlib.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adw_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adwcam.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adwlib.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/aha/aha.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/aha/aha_isa.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ahb/ahb.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic/aic.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic/aic_isa.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic/aic_pccard.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.h#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/amd/amd.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_pci.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ar/if_ar.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/ar/if_ar_isa.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ar/if_ar_pci.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#45 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-commands.h#5 delete .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-lowlevel.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-queue.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-tape.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/awi/am79c930.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfe.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_audio.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_card.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_core.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_i2c.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_os.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_reg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_tuner.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/buslogic/bt.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/buslogic/bt_eisa.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/buslogic/bt_isa.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/buslogic/bt_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/cissio.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/cnw/if_cnw.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ct/ct_isa.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/CX.bios.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/CX.fepos.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/CX_PCI.bios.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/CX_PCI.fepos.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/EPCX.bios.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/EPCX.fepos.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/EPCX_PCI.bios.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/EPCX_PCI.fepos.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/Xe.bios.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/Xe.fepos.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/Xem.bios.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/Xem.fepos.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/dpt/dpt_eisa.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/dpt/dpt_isa.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/dpt/dpt_pci.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/dpt/dpt_scsi.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/README#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.h#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_osdep.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/esp/esp_sbus.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/esp/ncr53c9x.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/esp/ncr53c9xreg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/esp/ncr53c9xvar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/boot_font.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/creator.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/gfb.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/machfb.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/fb/machfbreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/fb/s3_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/tga.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci_pci.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohcireg.h#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/gfb/gfb_pci.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatm_tx.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/hfa/hfa_freebsd.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/hfa/hfa_pci.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/hme/if_hme.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/hptmv/osbsd.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_amd.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ic/i8237.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ic/i8253reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ida/ida.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/ida/ida_disk.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ida/ida_eisa.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ida/ida_pci.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/idt/idt_harp.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/idt/idt_pci.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ie/if_ie.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ie/if_ie_isa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndisvar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir_ctrl.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir_pci.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ips/ips.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ips/ips_disk.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_inline.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgb/if_ixgb.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgb/if_ixgb.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/kbd/atkbdc.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/kbd/kbdtables.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lge.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mcd/mcd.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/mcd/mcd_isa.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/dcphy.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/miidevs#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/pnphy.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/mk48txx/mk48txx.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mk48txx/mk48txxreg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mk48txx/mk48txxvar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mlx/mlx.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mlx/mlx_pci.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/mly/mly.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_freebsd.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#13 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 30 19:42:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DCE916A420; Mon, 30 May 2005 19:42:11 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1456516A41C for ; Mon, 30 May 2005 19:42:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7E0443D1D for ; Mon, 30 May 2005 19:42:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UJgA8h044675 for ; Mon, 30 May 2005 19:42:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UJfuFa044667 for perforce@freebsd.org; Mon, 30 May 2005 19:41:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 May 2005 19:41:56 GMT Message-Id: <200505301941.j4UJfuFa044667@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 77732 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 19:42:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=77732 Change 77732 by rwatson@rwatson_tislabs on 2005/05/30 19:41:31 Integrate TrustedBSD MAC branch from TrustedBSD base. Vendor imports/updates: - BSNMP update - bzip2 update - libz update - ipfilter update - libcap update - lukemftp update - one-true-awk update - tcpdump update - texinfo update - GNU libregex update - ACPI update Other changes: - No more NI_WITHSCOPEID - Top reformatted - libarchive portability work - ttyname_r - Many armisms, ppcisms - More VFS-related locking, system calls MPSAFE, and so on. - HWPMC on amd64 - Linux and other ABIs now wrap the FreeBSD implementations of things like stat better, and reduced use of the stack gap. - netgraph_nat - Kernel libalias - reiserfs - sparc64 framebuffer and other console magic - ral, ural drivers - Kernel malloc, UMA per-cpu optimizations and critical section changes - close/read socket/socket buffer race fix - if_purgeaddrs() - TCP SACK fixes - More VM locking work - More make Looped back TrustedBSD changes: - bsm/audit.h, bsm/audit_kevents.h stubs - syscalls.master format changed to take audit event ID for all and sundry ABIs. - remove unused ACL types to prevent confusion Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#26 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#56 integrate .. //depot/projects/trustedbsd/mac/UPDATING#47 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/csh/config.h#6 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.c#14 integrate .. //depot/projects/trustedbsd/mac/bin/rmdir/rmdir.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/options.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/stty/print.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/NEWS#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/VERSION#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/bsnmpclient.3#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpclient.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpclient.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/oid-list#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_ip.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_route.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_tcp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_udp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/snmp_mibII.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/main.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.3#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/CHANGES#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/mac/contrib/bzip2/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/LICENSE#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/Makefile-libbz2_so#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/README.COMPILATION.PROBLEMS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/blocksort.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzip2.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzip2.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzip2recover.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzlib.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzlib.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzlib_private.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/compress.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/crctable.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/decompress.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/huffman.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/randtable.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/sample1.bz2.uu#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/sample1.ref.gz.uu#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/sample2.bz2.uu#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/sample2.ref.gz.uu#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/sample3.bz2.uu#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/sample3.ref.gz.uu#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipfstat.8#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/pcap-bpf.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/CHANGES#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/CREDITS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/FILES#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/INSTALL.txt#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/README.hpux#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/README.macosx#1 branch .. //depot/projects/trustedbsd/mac/contrib/libpcap/VERSION#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/bpf/net/bpf_filter.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/bpf_dump.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/bpf_image.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/config.h.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/configure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/etherent.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/ethertype.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-getad.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-gifc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-glifc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-null.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/gencode.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/gencode.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/grammar.y#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/inet.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/nametoaddr.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/optimize.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-bpf.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-dlpi.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-dos.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-dos.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-enet.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-int.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-linux.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-namedb.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-nit.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-null.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-pf.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-snit.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-snoop.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap1.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libpcap/pf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/ppp.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/savefile.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/scanner.l#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/snprintf.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/cmds.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/cmdtab.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/extern.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/fetch.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp.1#10 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp_var.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/main.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/progressbar.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/util.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/version.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/libngatm.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/uniaddr.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/unifunc.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/unimsg.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/unisap.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/unistruct.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/snmp_atm/atm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/snmp_atm/snmp_atm.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/snmp_atm/snmp_atm.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/sscop/common.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/sscop/common.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/sscop/sscop_main.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/FIXES#8 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/README#6 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/awk.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/b.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/lex.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/lib.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/main.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/makefile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/proctab.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/run.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/tran.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/ctx.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/tcp_wrappers/hosts_access.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcp_wrappers/socket.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/.cvsignore#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/CHANGES#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/CREDITS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/FILES#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/INSTALL#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/VERSION#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/acconfig.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/addrtoname.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/appletalk.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/bgp.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/bpf_dump.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/config.h.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/configure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/cpack.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/cpack.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/decode_prefix.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/ethertype.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/extract.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/gmpls.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/gmpls.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/gmt2local.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/icmp6.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/ieee802_11_radio.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/interface.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/ip.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/ipproto.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/ipproto.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/l2vpn.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/l2vpn.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/llc.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/machdep.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/bittypes.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/datalinks.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/dlnames.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/getaddrinfo.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/getnameinfo.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/inet_aton.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/inet_ntop.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/inet_pton.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/snprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/strlcat.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/missing/strlcpy.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/mpls.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/netdissect.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/nlpid.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/nlpid.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/ntp.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/ospf.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/oui.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/oui.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/parsenfsfh.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/pcap-missing.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/pf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/pmap_prot.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/ppp.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-802_11.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ah.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-aodv.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ap1394.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-arcnet.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-arp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ascii.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-atalk.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-atm.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-beep.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-bfd.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-bgp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-bootp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-cdp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-chdlc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-cip.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-cnfp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-decnet.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-dhcp6.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-domain.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-dvmrp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-eap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-egp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-eigrp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-enc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-esp.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ether.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-fddi.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-fr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-frag6.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-gre.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-hsrp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-icmp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-icmp6.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-igmp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-igrp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ip.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ip6.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ip6opts.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ipcomp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ipx.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-isakmp.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-isoclns.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-juniper.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-krb.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-l2tp.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-lane.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-llc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-lmp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-lspping.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-lwres.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-mobile.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-mobility.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-mpls.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-msdp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-netbios.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-nfs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ntp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-null.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ospf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ospf6.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-pim.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ppp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-pppoe.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-pptp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-radius.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-raw.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-rip.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ripng.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-rt6.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-rx.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sctp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sip.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sl.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sll.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-smb.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-snmp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-stp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sunatm.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sunrpc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-symantec.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-syslog.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-tcp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-telnet.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-tftp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-timed.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-token.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-udp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-vjc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-vrrp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-wb.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-zephyr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/rpc_auth.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/rpc_msg.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcpdump/setsignal.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/smb.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/smbutil.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/strcasecmp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcp.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcpdump.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcpdump.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/udp.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/util.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/vfprintf.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/telnet/telnetd/telnetd.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/AUTHORS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/ChangeLog#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/ChangeLog.46#1 branch .. //depot/projects/trustedbsd/mac/contrib/texinfo/FREEBSD-Xlist#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/FREEBSD-upgrade#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/INSTALL#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/INTRODUCTION#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/NEWS#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/README.dev#1 branch .. //depot/projects/trustedbsd/mac/contrib/texinfo/TODO#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/config.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/config.h.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/help2man#4 delete .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info-stnd.texi#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info.1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info.5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/infokey.1#1 branch .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/install-info.1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/makeinfo.1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/texindex.1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/texinfo.5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/texinfo.txi#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/version-stnd.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/version.texi#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/dir.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/display.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/display.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/doc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/doc.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/dribble.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/dribble.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/echo-area.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/echo-area.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/filesys.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/filesys.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/footnotes.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/footnotes.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/funs.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/gc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/gc.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/indices.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/indices.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info-utils.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info-utils.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infodoc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infokey.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infokey.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infomap.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infomap.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/key.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/m-x.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/man.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/man.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/nodemenu.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/nodes.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/nodes.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/search.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/search.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/session.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/session.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/signals.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/signals.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/termdep.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/terminal.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/terminal.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/tilde.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/tilde.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/variables.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/variables.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/window.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/window.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/gettext.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/substring.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/system.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/xalloc.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/xexit.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/xmalloc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/xstrdup.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/cmds.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/cmds.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/defun.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/defun.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/files.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/files.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/float.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/float.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/footnote.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/footnote.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/html.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/html.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/index.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/index.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/insertion.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/insertion.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/lang.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/lang.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/macro.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/macro.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/makeinfo.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/makeinfo.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/multi.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/multi.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/node.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/node.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/sectioning.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/sectioning.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/texinfo.dtd#4 delete .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/texinfo.xsl#4 delete .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/toc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/toc.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/xml.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/xml.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/xref.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/xref.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/texinfo/util/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/util/install-info.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/util/texindex.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/top/commands.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/top/display.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/top/machine.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/top/top.c#6 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#13 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#35 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#25 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/named#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#19 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#36 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/limerick#5 integrate .. //depot/projects/trustedbsd/mac/games/random/random.c#7 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libregex/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libregex/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libregex/config.h#1 branch .. //depot/projects/trustedbsd/mac/gnu/lib/libregex/posix/regex.h#3 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libregex/regcomp.c#1 branch .. //depot/projects/trustedbsd/mac/gnu/lib/libregex/regex.c#5 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libregex/regex_internal.c#1 branch .. //depot/projects/trustedbsd/mac/gnu/lib/libregex/regex_internal.h#1 branch .. //depot/projects/trustedbsd/mac/gnu/lib/libregex/regexec.c#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/dfa.c#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/dfa.h#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/grep.c#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/grep.h#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/mbcache.h#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/search.c#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/infokey/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/makeinfo/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#48 integrate .. //depot/projects/trustedbsd/mac/include/netdb.h#9 integrate .. //depot/projects/trustedbsd/mac/include/runefile.h#2 delete .. //depot/projects/trustedbsd/mac/include/unistd.h#20 integrate .. //depot/projects/trustedbsd/mac/lib/csu/i386-elf/crt1.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/csu/i386-elf/crti.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/csu/i386-elf/crtn.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/HISTORY#2 delete .. //depot/projects/trustedbsd/mac/lib/libalias/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/alias.c#10 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias.h#7 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias_cuseeme.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias_db.c#8 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias_ftp.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias_irc.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias_local.h#7 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias_nbt.c#7 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias_old.c#4 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias_pptp.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias_proxy.c#6 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias_skinny.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias_smedia.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias_util.c#6 delete .. //depot/projects/trustedbsd/mac/lib/libalias/libalias.3#7 delete .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_platform.h#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_extract.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/configure.ac.in#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/Makefile.inc#21 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/ttyname.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/ttyname.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gmon/mcount.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/rune.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/runefile.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#19 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnetbydns.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnetbyht.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnetbynis.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnetnamadr.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/name6.c#18 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/netdb_private.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/rcmd.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_send.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/fpu_explode.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/fpu_qp.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/glue.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/accept.2#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/uuid/uuid_is_nil.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/pthread_private.h#18 integrate .. //depot/projects/trustedbsd/mac/lib/libdevinfo/devinfo.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libgeom/geom_xml2tree.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_unix/pam_unix.c#16 integrate .. //depot/projects/trustedbsd/mac/lib/libpcap/config.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libsdp/sdp.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libsdp/sdp.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libsdp/util.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libstand/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/lib/libstand/bzipfs.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libstand/bzlib.c.diff#3 delete .. //depot/projects/trustedbsd/mac/lib/libstand/bzlib.h.diff#2 delete .. //depot/projects/trustedbsd/mac/lib/libstand/bzlib_private.h.diff#3 delete .. //depot/projects/trustedbsd/mac/lib/libstand/splitfs.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libstand/stand.h#13 integrate .. //depot/projects/trustedbsd/mac/lib/libstand/zutil.h.diff#2 delete .. //depot/projects/trustedbsd/mac/lib/libthread_db/libpthread_db.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthread_db/libthr_db.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/logwtmp.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/realhostname.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/mac/lib/libz/adler32.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/compress.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/crc32.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/deflate.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/deflate.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/example.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/infback.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libz/inffast.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/inflate.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/inftrees.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/trees.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/uncompr.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/zlib.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/zutil.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/zutil.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/msun/i387/s_ceilf.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/i387/s_floorf.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/i387/s_truncf.S#2 integrate .. //depot/projects/trustedbsd/mac/libexec/Makefile#16 integrate .. //depot/projects/trustedbsd/mac/libexec/ftp-proxy/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/libexec/getty/ttys.5#3 integrate .. //depot/projects/trustedbsd/mac/libexec/rlogind/rlogind.c#6 integrate .. //depot/projects/trustedbsd/mac/libexec/rshd/rshd.c#10 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/i386/rtld_start.S#2 integrate .. //depot/projects/trustedbsd/mac/libexec/talkd/process.c#3 integrate .. //depot/projects/trustedbsd/mac/libexec/tftpd/tftpd.c#11 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#62 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#52 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#78 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/sgml/release.dsl#7 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/login/pico-login.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile#31 integrate .. //depot/projects/trustedbsd/mac/sbin/atacontrol/atacontrol.8#13 integrate .. //depot/projects/trustedbsd/mac/sbin/atacontrol/atacontrol.c#15 integrate .. //depot/projects/trustedbsd/mac/sbin/clri/clri.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/devd/devd.cc#9 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/af_inet6.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#25 integrate .. //depot/projects/trustedbsd/mac/sbin/ipf/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/sbin/ipf/ipf/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#32 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#26 integrate .. //depot/projects/trustedbsd/mac/sbin/kldstat/kldstat.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/kldstat/kldstat.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_reiserfs/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/mount_reiserfs/mount_reiserfs.8#1 branch .. //depot/projects/trustedbsd/mac/sbin/mount_reiserfs/mount_reiserfs.c#1 branch .. //depot/projects/trustedbsd/mac/sbin/restore/interactive.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/main.c#12 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/restore.c#9 integrate .. //depot/projects/trustedbsd/mac/sbin/restore/tape.c#13 integrate .. //depot/projects/trustedbsd/mac/sbin/route/route.c#12 integrate .. //depot/projects/trustedbsd/mac/sbin/savecore/savecore.c#13 integrate .. //depot/projects/trustedbsd/mac/share/dict/freebsd#5 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/contents/contents.ms#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#32 integrate .. //depot/projects/trustedbsd/mac/share/examples/mdoc/example.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/pthread.3#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/pthread_atfork.3#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#51 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/amr.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/bge.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/carp.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/em.4#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ichsmb.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/iwi.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/led.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mac_bsdextended.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/Makefile#16 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_asus.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/acpi_ibm.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/ep.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/miibus.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mn.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ng_nat.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ng_netflow.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/nve.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/pcm.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sk.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_ad1816.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_als4000.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_cmi.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_cs4281.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_csa.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_ds1.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_emu10k1.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_es137x.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_ess.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_gusc.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_sbc.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snd_solo.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/twe.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/devfs.conf.5#1 branch .. //depot/projects/trustedbsd/mac/share/man/man5/devfs.rules.5#1 branch .. //depot/projects/trustedbsd/mac/share/man/man7/release.7#23 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/VOP_IOCTL.9#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/devclass_get_devices.9#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/devclass_get_drivers.9#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/style.9#25 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/taskqueue.9#12 integrate .. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#21 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.cpu.mk#19 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/autoconf.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/busdma_machdep.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/clock.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/timerreg.h#4 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/bus_memio.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/bus_pio.h#3 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/ppireg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/alpha/include/timerreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/alpha/isa/isa_dma.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/isa/mcclock_isa.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_proto.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_syscall.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysent.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/syscalls.master#10 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_mount.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_proto.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_syscall.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_sysent.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/syscalls.master#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/autoconf.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/exception.S#11 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/identcpu.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/machdep.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/GENERIC#15 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/bus.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/bus_memio.h#4 delete .. //depot/projects/trustedbsd/mac/sys/amd64/include/bus_pio.h#4 delete .. //depot/projects/trustedbsd/mac/sys/amd64/include/cpufunc.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/amd64/isa/clock.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/isa/isa.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/isa/isa_dma.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/isa/timerreg.h#4 delete .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/autoconf.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/bcopyinout.S#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/bcopyinout_xscale.S#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_arm3.S#4 delete .. //depot/projects/trustedbsd/mac/sys/arm/arm/cpufunc_asm_arm67.S#4 delete .. //depot/projects/trustedbsd/mac/sys/arm/arm/in_cksum.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/in_cksum_arm.S#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/intr.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/swtch.S#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/atomic.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/bus_memio.h#3 delete .. //depot/projects/trustedbsd/mac/sys/arm/include/bus_pio.h#3 delete .. //depot/projects/trustedbsd/mac/sys/arm/include/cpuconf.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/endian.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/iq31244_7seg.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/boot.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/console.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/help.common#14 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/loader.8#26 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#28 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/boot2/boot2.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/bioscd.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/bootinfo.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/devicename.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/libi386.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/loader/main.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ofw/libofw/elf_freebsd.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ofw/libofw/ofw_copy.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/boot2/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/boot2/boot.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/boot2/boot.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/boot2/boot2.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/boot2/disk.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/boot2/io.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/boot2/sys.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/boot2/table.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/btx/btx/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/btx/btx/btx.S#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/btx/btxldr/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/btx/btxldr/btxldr.S#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/kgzldr/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/kgzldr/crt.s#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/biosdisk.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/biosmem.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/comconsole.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/gatea20.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/time.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/vidconsole.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/main.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/bsm/audit.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_xpt.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_misc.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/kern_ndis.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/kern_windrv.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/ndis_var.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/ntoskrnl_var.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_hal.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_ndis.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_usbd.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_proto.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_syscall.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_syscallnames.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_sysent.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/syscalls.master#5 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#62 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#117 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#46 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#39 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#34 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#74 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.i386#26 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.pc98#27 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.sparc64#10 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_compat.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ngatm/netnatm/api/ccpriv.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ngatm/netnatm/api/unisap.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ngatm/netnatm/msg/uni_ie.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf_table.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac_pci.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdHardware.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdSchedule.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_acad.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_ec.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_package.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpivar.h#29 integrate .. //depot/projects/trustedbsd/mac/sys/dev/advansys/adv_eisa.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/advansys/adv_isa.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/advansys/adv_pci.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/advansys/advansys.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/advansys/advlib.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/advansys/adw_pci.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/advansys/adwcam.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/advansys/adwlib.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aha/aha.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aha/aha_isa.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ahb/ahb.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic/aic.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic/aic_isa.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic/aic_pccard.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic79xx_osm.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_osm.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amd/amd.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amr/amr.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amr/amr_pci.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ar/if_ar.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ar/if_ar_isa.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ar/if_ar_pci.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-chipset.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-commands.h#4 delete .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-disk.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-lowlevel.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-queue.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cam.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cd.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-fd.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-tape.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/awi/am79c930.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfe.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bgereg.h#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bktr/bktr_audio.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bktr/bktr_card.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bktr/bktr_core.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bktr/bktr_i2c.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bktr/bktr_os.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bktr/bktr_reg.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bktr/bktr_tuner.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/buslogic/bt.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/buslogic/bt_eisa.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/buslogic/bt_isa.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/buslogic/bt_pci.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ciss/ciss.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ciss/cissio.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cnw/if_cnw.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ct/ct_isa.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/CX.bios.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/CX.fepos.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/CX_PCI.bios.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/CX_PCI.fepos.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/EPCX.bios.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/EPCX.fepos.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/EPCX_PCI.bios.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/EPCX_PCI.fepos.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/Xe.bios.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/Xe.fepos.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/Xem.bios.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/Xem.fepos.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dpt/dpt_eisa.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dpt/dpt_isa.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dpt/dpt_pci.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dpt/dpt_scsi.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/README#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#25 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_hw.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_hw.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_osdep.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/esp/esp_sbus.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/esp/ncr53c9x.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/esp/ncr53c9xreg.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/esp/ncr53c9xvar.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/boot_font.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/creator.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/gfb.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/machfb.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/fb/machfbreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/fb/s3_pci.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/tga.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwohci_pci.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwohcireg.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gfb/gfb_pci.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hatm/if_hatm_tx.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hfa/hfa_freebsd.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hfa/hfa_pci.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hme/if_hme.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hptmv/osbsd.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_amd.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ic/i8237.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ic/i8253reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ida/ida.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ida/ida_disk.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ida/ida_eisa.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ida/ida_pci.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/idt/idt_harp.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/idt/idt_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ie/if_ie.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ie/if_ie_isa.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/if_ndis/if_ndis_pci.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/if_ndis/if_ndisvar.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iir/iir.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iir/iir_ctrl.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iir/iir_pci.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ips/ips.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ips/ips_disk.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_inline.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_pci.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispvar.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ixgb/if_ixgb.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/kbd/atkbdc.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/kbd/kbdtables.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/lge/if_lge.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mcd/mcd.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mcd/mcd_isa.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mii/brgphy.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mii/dcphy.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mii/miidevs#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mii/pnphy.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mk48txx/mk48txx.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mk48txx/mk48txxreg.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mk48txx/mk48txxvar.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mlx/mlx.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mlx/mlx_pci.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mly/mly.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_freebsd.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_pci.c#11 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 30 20:09:45 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF32616A420; Mon, 30 May 2005 20:09:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9350816A41C for ; Mon, 30 May 2005 20:09:44 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5620443D48 for ; Mon, 30 May 2005 20:09:44 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UK9iwU057298 for ; Mon, 30 May 2005 20:09:44 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UK9ina057295 for perforce@freebsd.org; Mon, 30 May 2005 20:09:44 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 30 May 2005 20:09:44 GMT Message-Id: <200505302009.j4UK9ina057295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 77733 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 20:09:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=77733 Change 77733 by trhodes@trhodes_local on 2005/05/30 20:08:55 Kill hard sentence breaks, remove extra spaces, add mark up, fix a grammar bogon. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#2 (text+ko) ==== @@ -29,7 +29,7 @@ .Os .Sh NAME .Nm praudit -.Nd print the contents of audit trail files +.Nd "print the contents of audit trail files" .Sh SYNOPSIS .Nm praudit .Op Fl lrs @@ -38,29 +38,38 @@ .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 +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 by default. .Pp The options are as follows: .Bl -tag -width Ds .It Fl l -Prints the entire record on the same line. If this option is not specified, +Prints the entire record on the same line. +If this option is not specified, every token is displayed on a different line. .It Fl r -Prints the records in their raw, numeric form. This option is exclusive from +Prints the records in their raw, numeric form. +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 +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 delimeter. The default delimeter is the comma. +Specifies the delimeter. +The default delimeter is the comma. .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 -/etc/security/audit_event; uids and gids are expanded to their names; and dates and times are displayed in human-readible format. +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; +dates and times are displayed in human-readible format. .Sh FILES .Bl -tag -width "/etc/security/audit_control" -compact .It Pa /etc/security/audit_class From owner-p4-projects@FreeBSD.ORG Mon May 30 20:19:58 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DBC316A420; Mon, 30 May 2005 20:19:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 61F3016A41C for ; Mon, 30 May 2005 20:19:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F0BB43D48 for ; Mon, 30 May 2005 20:19:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UKJvYR058332 for ; Mon, 30 May 2005 20:19:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UKJuHX058329 for perforce@freebsd.org; Mon, 30 May 2005 20:19:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 May 2005 20:19:56 GMT Message-Id: <200505302019.j4UKJuHX058329@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 77734 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 20:19:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=77734 Change 77734 by rwatson@rwatson_paprika on 2005/05/30 20:19:27 Integrate the OpenBSM distribution into trustedbsd_audit3 as contrib/openbsm, its eventual resting place in the FreeBSD source repository, so that we can start putting things in place with that location in mind. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/CHANGELOG#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/LICENSE#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_internal.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_record.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_uevents.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/compat/endian.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_control#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_user#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_warn#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_class.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_control.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_event.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_free_token.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_io.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_mask.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_token.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/au_user.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_audit.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_class.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_flags.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_notify.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_token.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_user.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_wrappers.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/libbsm.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.2#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_class.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_control.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_event.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_user.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit_warn.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditctl.2#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/auditon.2#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/event_code.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getaudit.2#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/getauid.2#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setaudit.2#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/setauid.2#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon May 30 20:44:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9D3916A420; Mon, 30 May 2005 20:44:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C48416A41C for ; Mon, 30 May 2005 20:44:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24C3643D48 for ; Mon, 30 May 2005 20:44:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UKiRmc059515 for ; Mon, 30 May 2005 20:44:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UKiQEm059512 for perforce@freebsd.org; Mon, 30 May 2005 20:44:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 May 2005 20:44:26 GMT Message-Id: <200505302044.j4UKiQEm059512@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 77735 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 20:44:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=77735 Change 77735 by rwatson@rwatson_paprika on 2005/05/30 20:43:48 Revised libbsm build Makefile to use OpenBSM tree. It would be desirable to .include the Makefile from OpenBSM, but we're not quite there yet. Affected files ... .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#7 (text+ko) ==== @@ -2,28 +2,121 @@ # $FreeBSD$ # -BSMDIR= ${.CURDIR}/../../contrib/bsm -BSMMANDIR= ${.CURDIR}/../../contrib/bsm/man +OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm LIB= bsm SHLIB_MAJOR= 1 -.PATH: ${BSMDIR}/lib -SRCS= bsm_audit.c bsm_class.c bsm_control.c bsm_event.c \ - bsm_flags.c bsm_io.c bsm_mask.c \ - bsm_token.c bsm_user.c lib_wrappers.c +.PATH: ${OPENBSMDIR}/libbsm + +SRCS= bsm_audit.c \ + bsm_class.c \ + bsm_control.c \ + bsm_event.c \ + bsm_flags.c \ + bsm_io.c \ + bsm_mask.c \ + bsm_notify.c \ + bsm_token.c \ + bsm_user.c \ + bsm_wrappers.c # # Must use BSM include files from within the contrib area, not the system. # -CFLAGS+= -I${BSMDIR}/lib -I${.CURDIR}/../../sys +CFLAGS+= -I${OPENBSMDIR} ${.PATH}-I ${.CURDIR}/../../sys + +INCS= libbsm.h -INCS= audit_uevents.h libbsm.h -INCSDIR= ${INCLUDEDIR}/bsm +MAN= libbsm.3 \ + au_class.3 \ + au_control.3 \ + au_event.3 \ + au_free_token.3 \ + au_io.3 \ + au_mask.3 \ + au_token.3 \ + au_user.3 -MAN= ${BSMMANDIR}/audit_class.5 ${BSMMANDIR}/audit_control.5 \ - ${BSMMANDIR}/audit_event.5 ${BSMMANDIR}/audit_user.5 \ - ${BSMMANDIR}/audit_warn.5 ${BSMMANDIR}/auditreduce.1 \ - ${BSMMANDIR}/praudit.1 +MLINKS= libbsm.3 bsm.3 \ + au_class.3 free_au_class_ent.3 \ + au_class.3 getauclassent.3 \ + au_class.3 getauclassnam.3 \ + au_class.3 setauclass.3 \ + au_class.3 endauclass.3 \ + au_control.3 setac.3 \ + au_control.3 endac.3 \ + au_control.3 getacdir.3 \ + au_control.3 getacmin.3 \ + au_control.3 getacflg.3 \ + au_control.3 getacna.3 \ + au_event.3 free_au_event_ent.3 \ + au_event.3 setauevent.3 \ + au_event.3 endauevent.3 \ + au_event.3 getauevent.3 \ + au_event.3 getauevnam.3 \ + au_event.3 getauevnum.3 \ + au_event.3 getauevnonam.3 \ + au_event.3 free_au_event.3 \ + au_io.3 au_fetch_tok.3 \ + au_io.3 au_print_tok.3 \ + au_io.3 au_read_rec.3 \ + au_mask.3 au_preselect.3 \ + au_mask.3 getauditflagsbin.3 \ + au_mask.3 getauditflagschar.3 \ + au_user.3 free_au_user_ent.3 \ + au_user.3 setauuser.3 \ + au_user.3 endauuser.3 \ + au_user.3 getauuserent.3 \ + au_user.3 getauusernam.3 \ + au_user.3 au_user_mask.3 \ + au_user.3 getfauditflags.3 \ + au_token.3 au_to_arg32.3 \ + au_token.3 au_to_arg64.3 \ + au_token.3 au_to_arg.3 \ + au_token.3 au_to_attr64.3 \ + au_token.3 au_to_data.3 \ + au_token.3 au_to_exit.3 \ + au_token.3 au_to_groups.3 \ + au_token.3 au_to_newgroups.3 \ + au_token.3 au_to_in_addr.3 \ + au_token.3 au_to_in_addr_ex.3 \ + au_token.3 au_to_ip.3 \ + au_token.3 au_to_ipc.3 \ + au_token.3 au_to_ipc_perm.3 \ + au_token.3 au_to_iport.3 \ + au_token.3 au_to_opaque.3 \ + au_token.3 au_to_file.3 \ + au_token.3 au_to_text.3 \ + au_token.3 au_to_path.3 \ + au_token.3 au_to_process32.3 \ + au_token.3 au_to_process64.3 \ + au_token.3 au_to_process.3 \ + au_token.3 au_to_process32_ex.3 \ + au_token.3 au_to_process64_ex.3 \ + au_token.3 au_to_process_ex.3 \ + au_token.3 au_to_return32.3 \ + au_token.3 au_to_return64.3 \ + au_token.3 au_to_return.3 \ + au_token.3 au_to_seq.3 \ + au_token.3 au_to_socket.3 \ + au_token.3 au_to_socket_ex_32.3 \ + au_token.3 au_to_socket_ex_128.3 \ + au_token.3 au_to_sock_inet32.3 \ + au_token.3 au_to_sock_inet128.3 \ + au_token.3 au_to_sock_inet.3 \ + au_token.3 au_to_subject32.3 \ + au_token.3 au_to_subject64.3 \ + au_token.3 au_to_subject.3 \ + au_token.3 au_to_subject32_ex.3 \ + au_token.3 au_to_subject64_ex.3 \ + au_token.3 au_to_subject_ex.3 \ + au_token.3 au_to_me.3 \ + au_token.3 au_to_exec_args.3 \ + au_token.3 au_to_exec_env.3 \ + au_token.3 au_to_header.3 \ + au_token.3 au_to_header32.3 \ + au_token.3 au_to_header64.3 \ + au_token.3 au_to_trailer.3 .include From owner-p4-projects@FreeBSD.ORG Mon May 30 20:46:31 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0D0916A421; Mon, 30 May 2005 20:46:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 80C7716A420 for ; Mon, 30 May 2005 20:46:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2431D43D49 for ; Mon, 30 May 2005 20:46:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UKkUli059663 for ; Mon, 30 May 2005 20:46:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UKkTot059660 for perforce@freebsd.org; Mon, 30 May 2005 20:46:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 May 2005 20:46:29 GMT Message-Id: <200505302046.j4UKkTot059660@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 77736 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 20:46:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=77736 Change 77736 by rwatson@rwatson_paprika on 2005/05/30 20:46:10 Update to use contrib/openbsm. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/auditreduce/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.sbin/auditreduce/Makefile#2 (text+ko) ==== @@ -2,9 +2,8 @@ # $FreeBSD$ # -BSMDIR=${.CURDIR}/../../contrib/bsm -.PATH: ${BSMDIR}/bin -.PATH: ${BSMDIR}/man +OPENBSMDIR=${.CURDIR}/../../contrib/openbsm +.PATH: ${OPENBSMDIR}/bin/auditreduce PROG= auditreduce MAN= auditreduce.1 From owner-p4-projects@FreeBSD.ORG Mon May 30 20:47:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B11516A420; Mon, 30 May 2005 20:47:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 555F416A41C for ; Mon, 30 May 2005 20:47:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5A6943D53 for ; Mon, 30 May 2005 20:47:31 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UKlVOY066458 for ; Mon, 30 May 2005 20:47:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UKlV1t066455 for perforce@freebsd.org; Mon, 30 May 2005 20:47:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 May 2005 20:47:31 GMT Message-Id: <200505302047.j4UKlV1t066455@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 77737 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 20:47:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=77737 Change 77737 by rwatson@rwatson_paprika on 2005/05/30 20:46:51 Use contrib/openbsm. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/praudit/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.sbin/praudit/Makefile#2 (text+ko) ==== @@ -2,9 +2,8 @@ # $FreeBSD$ # -BSMDIR=${.CURDIR}/../../contrib/bsm -.PATH: ${BSMDIR}/bin -.PATH: ${BSMDIR}/man +OPENBSMDIR=${.CURDIR}/../../contrib/openbsm +.PATH: ${OPENBSMDIR}/bin/praudit PROG= praudit MAN= praudit.1 From owner-p4-projects@FreeBSD.ORG Mon May 30 20:49:35 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 303CE16A420; Mon, 30 May 2005 20:49:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E6B1C16A41C for ; Mon, 30 May 2005 20:49:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C023D43D4C for ; Mon, 30 May 2005 20:49:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UKnYqe066631 for ; Mon, 30 May 2005 20:49:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UKnYsa066628 for perforce@freebsd.org; Mon, 30 May 2005 20:49:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 May 2005 20:49:34 GMT Message-Id: <200505302049.j4UKnYsa066628@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 77738 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 20:49:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=77738 Change 77738 by rwatson@rwatson_paprika on 2005/05/30 20:48:40 Install from contrib/openbsm. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/Makefile#5 (text+ko) ==== @@ -20,11 +20,12 @@ ${.CURDIR}/../usr.bin/mail/misc/mail.rc \ ${.CURDIR}/../usr.bin/locate/locate/locate.rc -BSM_ETC_OPEN_FILES= ${.CURDIR}/../contrib/bsm/etc/audit_class \ - ${.CURDIR}/../contrib/bsm/etc/audit_event -BSM_ETC_RESTRICTED_FILES= ${.CURDIR}/../contrib/bsm/etc/audit_control \ - ${.CURDIR}/../contrib/bsm/etc/audit_user -BSM_ETC_EXEC_FILES= ${.CURDIR}/../contrib/bsm/etc/audit_warn +OPENBSMDIR= ${.CURDIR}/../contrib/openbsm +BSM_ETC_OPEN_FILES= ${OPENBSMDIR}/etc/audit_class \ + ${OPENBSMDIR}/etc/audit_event +BSM_ETC_RESTRICTED_FILES= ${OPENBSMDIR}/etc/audit_control \ + ${OPENBSMDIR}/etc/audit_user +BSM_ETC_EXEC_FILES= ${OPENBSMDIR}/etc/audit_warn BSM_ETC_DIR= ${DESTDIR}/etc/security .if !defined(NO_LPR) From owner-p4-projects@FreeBSD.ORG Mon May 30 20:53:41 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0593B16A420; Mon, 30 May 2005 20:53:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD76216A41C for ; Mon, 30 May 2005 20:53:40 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66BA843D53 for ; Mon, 30 May 2005 20:53:40 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UKrehK066909 for ; Mon, 30 May 2005 20:53:40 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UKrdTG066906 for perforce@freebsd.org; Mon, 30 May 2005 20:53:39 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 30 May 2005 20:53:39 GMT Message-Id: <200505302053.j4UKrdTG066906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 77739 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 20:53:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=77739 Change 77739 by trhodes@trhodes_local on 2005/05/30 20:52:53 Fix various mark up nits, adding some additional mark up and killing hard sentence breaks. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#5 edit .. //depot/projects/trustedbsd/openbsm/man/audit_class.5#2 edit .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#2 edit .. //depot/projects/trustedbsd/openbsm/man/audit_event.5#2 edit .. //depot/projects/trustedbsd/openbsm/man/audit_user.5#2 edit .. //depot/projects/trustedbsd/openbsm/man/audit_warn.5#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#5 (text+ko) ==== @@ -60,8 +60,7 @@ however, some variation may occur depending on the operating system in use, what system options, such as mandatory access control, are present. .Pp -.Pp -This man page documents the common token types and their binary format, and +This manual page documents the common token types and their binary format, and is intended for reference purposes only. It is recommended that application programmers use the .Xr libbsm 3 @@ -539,7 +538,7 @@ The .Dv seq token contains a unique and monotonically increasing audit event sequence ID. -Due to the limited range (32 bits), serial number arithmetic (and caution) +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 ==== //depot/projects/trustedbsd/openbsm/man/audit_class.5#2 (text+ko) ==== @@ -29,14 +29,16 @@ .Os "Mac OS X" .Sh NAME .Nm audit_class -.Nd contains audit event class descriptions +.Nd "contains audit event class descriptions" .Sh DESCRIPTION The .Nm -file contains descriptions of the auditable event classes on the system. Each -auditable event is a member of an event class. Each line maps an audit event -mask (bitmap) to a class and a description. Entries are of the form -classmask:eventclass:description. +file contains descriptions of the auditable event classes on the system. +Each auditable event is a member of an event class. +Each line maps an audit event +mask (bitmap) to a class and a description. +Entries are of the form +.Dl classmask:eventclass:description. .Pp Example entries in this file are: .Bd -literal -offset indent ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#2 (text+ko) ==== @@ -29,37 +29,44 @@ .Os "Mac OS X" .Sh NAME .Nm audit_control -.Nd contains audit system parameters +.Nd "contains audit system parameters" .Sh DESCRIPTION The .Nm -file contains several audit system parameters. Each line of this file is of -the form parameter:value. The parameters are: +file contains several audit system parameters. +Each line of this file is of the form: +.Dl parameter:value. +The parameters are: .Bl -tag -width Ds -.It Nm 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 -audit system. See +.It Pa 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 +audit system. +See .Xr audit 1 for a description of how to restart the audit system. -.It Nm flags +.It Va flags Specifies which audit event classes are audited for all users. .Xr audit_user 5 -describes how to audit events for individual users. See the -information below for the format of the audit flags. -.It Nm naflags +describes how to audit events for individual users. +See the information below for the format of the audit flags. +.It Va naflags Contains the audit flags that define what classes of events are audited when an action cannot be attributed to a specific user. -.It Nm minfree -The minimum free space required on the file system audit logs are being written to. When the free space falls below this limit a warning will be issued. Not -currently used as the value of 20 percent is chosen by the kernel. +.It Va minfree +The minimum free space required on the file system audit logs are being written to. +When the free space falls below this limit a warning will be issued. +Not currently used as the value of 20 percent is chosen by the kernel. .El .Sh AUDIT FLAGS Audit flags are a comma delimited list of audit classes as defined in the -audit_class file. (See +audit_class 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: +for details. +Event classes may be preceded by a prefix which changes their interpretation. +The following prefixes may be used for each class: .Bl -tag -width Ds -compact -offset indent .It + Record successful events @@ -84,7 +91,7 @@ .Ed .Pp The -.Nm flags +.Va flags parameter above specifies the system-wide mask corresponding to login/logout events, administrative events, and all failures except for failures in creating or closing files. ==== //depot/projects/trustedbsd/openbsm/man/audit_event.5#2 (text+ko) ==== @@ -29,14 +29,18 @@ .Os "Mac OS X" .Sh NAME .Nm audit_event -.Nd contains audit event descriptions +.Nd "contains audit event descriptions" .Sh DESCRIPTION The .Nm -file contains descriptions of the auditable events on the system. Each line -maps an audit event number to a name, a description, and a class. Entries -are of the form eventnum:eventname:description:eventclass. Each eventclass -should have a corresponding entry in the audit_class file. See +file contains descriptions of the auditable events on the system. +Each line maps an audit event number to a name, a description, and a class. +Entries are of the form +.Dl eventnum:eventname:description:eventclass . +Each +.Vt eventclass +should have a corresponding entry in the audit_class file. +See .Xr audit_class 5 for details. .Pp ==== //depot/projects/trustedbsd/openbsm/man/audit_user.5#2 (text+ko) ==== @@ -29,21 +29,29 @@ .Os "Mac OS X" .Sh NAME .Nm audit_user -.Nd specifies events to be audited for the given users +.Nd "specifies events to be audited for the 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 -audit_control file to determine which classes of events to audit for that user. +.Pa audit_control +file to determine which classes of events to audit for that user. These settings take effect when the user logs in. .Pp -Each line maps a user name to a list of classes that should be audited and a list of classes that should not be audited. -Entries are of the form username:alwaysaudit:neveraudit, where alwaysaudit -is a set of event classes that are always audited, and neveraudit -is a set of event classes that should not be audited. These sets can indicate +Each line maps a user name to a list of classes that should be audited and a +list of classes that should not be audited. +Entries are of the form of +.Dl username:alwaysaudit:neveraudit , +where +.Vt alwaysaudit +is a set of event classes that are always audited, and +.Vt 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 -or failed events. See +or failed events. +See .Xr audit_control 5 for more information about audit flags. .Pp @@ -54,8 +62,11 @@ .Ed .Pp These settings would cause login and administrative events that succeed on -behalf of user root to be audited. No failure events are audited. For the -user jdoe, failed file creation events are audited, administrative events are +behalf of user root to be audited. +No failure events are audited. +For the user +.Em 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 ==== //depot/projects/trustedbsd/openbsm/man/audit_warn.5#2 (text+ko) ==== @@ -29,7 +29,7 @@ .Os "Mac OS X" .Sh NAME .Nm audit_warn -.Nd alert when audit daemon issues warnings +.Nd "alert when audit daemon issues warnings" .Sh DESCRIPTION .Nm runs when @@ -42,8 +42,9 @@ appends its arguments to .Pa /etc/security/audit_messages . Administrators may replace this script: a more comprehensive one would take -different actions based on the type of warning. For example, a low-space -warning could result in an email message being sent to the administrator. +different actions based on the type of warning. +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 .It Pa /etc/security/audit_warn From owner-p4-projects@FreeBSD.ORG Mon May 30 21:41:40 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6F9516A420; Mon, 30 May 2005 21:41:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8859616A41C for ; Mon, 30 May 2005 21:41:39 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6419943D1F for ; Mon, 30 May 2005 21:41:39 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4ULfd6q069085 for ; Mon, 30 May 2005 21:41:39 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4ULfdUK069082 for perforce@freebsd.org; Mon, 30 May 2005 21:41:39 GMT (envelope-from trhodes@freebsd.org) Date: Mon, 30 May 2005 21:41:39 GMT Message-Id: <200505302141.j4ULfdUK069082@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 77742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 21:41:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=77742 Change 77742 by trhodes@trhodes_local on 2005/05/30 21:40:44 Fix two spelling errors noticed by brueffer, and another caught by aspell. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#3 (text+ko) ==== @@ -60,8 +60,8 @@ This option is exclusive from .Fl r .It Fl d Ar del -Specifies the delimeter. -The default delimeter is the comma. +Specifies the delimiter. +The default delimiter is the comma. .El .Pp If the raw or short forms are not specified, the default is to print the tokens @@ -69,7 +69,7 @@ Events are displayed as per their descriptions given in .Pa /etc/security/audit_event ; uids and gids are expanded to their names; -dates and times are displayed in human-readible format. +dates and times are displayed in human-readable format. .Sh FILES .Bl -tag -width "/etc/security/audit_control" -compact .It Pa /etc/security/audit_class From owner-p4-projects@FreeBSD.ORG Mon May 30 22:15:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7988F16A422; Mon, 30 May 2005 22:15:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B0FB16A41C for ; Mon, 30 May 2005 22:15:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBC6643D53 for ; Mon, 30 May 2005 22:15:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UMFKP3071131 for ; Mon, 30 May 2005 22:15:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UMFKvf071128 for perforce@freebsd.org; Mon, 30 May 2005 22:15:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 May 2005 22:15:20 GMT Message-Id: <200505302215.j4UMFKvf071128@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 77744 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 22:15:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=77744 Change 77744 by rwatson@rwatson_paprika on 2005/05/30 22:14:42 Converge on BSD style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#12 (text+ko) ==== @@ -40,20 +40,19 @@ #include /* array of used descriptors */ -static au_record_t* open_desc_table[MAX_AUDIT_RECORDS]; +static au_record_t *open_desc_table[MAX_AUDIT_RECORDS]; /* The current number of active record descriptors */ -static int bsm_rec_count = 0; +static int bsm_rec_count = 0; + /* - * Records that can be recycled are maintained in the list given below - * The maximum number of elements that can be present in this list is - * bounded by MAX_AUDIT_RECORDS. Memory allocated for these records are never - * freed + * Records that can be recycled are maintained in the list given below. The + * maximum number of elements that can be present in this list is bounded by + * MAX_AUDIT_RECORDS. Memory allocated for these records are never freed. */ +static LIST_HEAD(, au_record) bsm_free_q; -static LIST_HEAD(, au_record) bsm_free_q; - -static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; /* * This call frees a token_t and its internal data. @@ -70,27 +69,25 @@ } /* - * This call reserves memory for the audit record. - * Memory must be guaranteed before any auditable event can be - * generated. - * The au_record_t structure maintains a reference to the - * memory allocated above and also the list of tokens associated - * with this record - * Descriptors are recyled once the records are added to the audit - * trail following au_close(). + * This call reserves memory for the audit record. Memory must be guaranteed + * before any auditable event can be generated. The au_record_t structure + * maintains a reference to the memory allocated above and also the list of + * tokens associated with this record. Descriptors are recyled once the + * records are added to the audit trail following au_close(). */ -int au_open(void) +int +au_open(void) { au_record_t *rec = NULL; pthread_mutex_lock(&mutex); - if(bsm_rec_count == 0) { + if (bsm_rec_count == 0) LIST_INIT(&bsm_free_q); - } /* - * Find an unused descriptor, remove it from the free list, mark as used + * Find an unused descriptor, remove it from the free list, mark as + * used. */ if (!LIST_EMPTY(&bsm_free_q)) { rec = LIST_FIRST(&bsm_free_q); @@ -100,31 +97,31 @@ pthread_mutex_unlock(&mutex); - if(rec == NULL) { + if (rec == NULL) { /* - * Create a new au_record_t if no descriptors are available + * Create a new au_record_t if no descriptors are available. */ - rec = (au_record_t *) malloc (sizeof(au_record_t)); - if(rec == NULL) { - return -1; /* Failed */ - } - rec->data = (u_char *) malloc (MAX_AUDIT_RECORD_SIZE * sizeof(u_char)); - if(rec->data == NULL) { + rec = malloc (sizeof(au_record_t)); + if (rec == NULL) + return (-1); + + rec->data = malloc (MAX_AUDIT_RECORD_SIZE * sizeof(u_char)); + if (rec->data == NULL) { free(rec); errno = ENOMEM; - return -1; + return (-1); } pthread_mutex_lock(&mutex); - if(bsm_rec_count == MAX_AUDIT_RECORDS) { + if (bsm_rec_count == MAX_AUDIT_RECORDS) { pthread_mutex_unlock(&mutex); free(rec->data); free(rec); /* XXX We need to increase size of MAX_AUDIT_RECORDS */ errno = ENOMEM; - return -1; + return (-1); } rec->desc = bsm_rec_count; open_desc_table[bsm_rec_count] = rec; @@ -140,29 +137,30 @@ rec->len = 0; rec->used = 1; - return rec->desc; + return (rec->desc); } /* - * Store the token with the record descriptor + * Store the token with the record descriptor. * * Don't permit writing more to the buffer than would let the trailer be * appended later. */ -int au_write(int d, token_t *tok) +int +au_write(int d, token_t *tok) { au_record_t *rec; - if(tok == NULL) { + if (tok == NULL) { errno = EINVAL; - return -1; /* Invalid Token */ + return (-1); /* Invalid Token */ } /* Write the token to the record descriptor */ rec = open_desc_table[d]; - if((rec == NULL) || (rec->used == 0)) { + if ((rec == NULL) || (rec->used == 0)) { errno = EINVAL; - return -1; /* Invalid descriptor */ + return (-1); /* Invalid descriptor */ } if (rec->len + tok->len + BSM_TRAILER_SIZE > MAX_AUDIT_RECORD_SIZE) { @@ -181,13 +179,13 @@ /* Token should not be available after this call */ tok = NULL; - return 0; /* Success */ + return (0); /* Success */ } /* - * Assemble an audit record out of its tokens, including allocating header - * and trailer tokens. Does not free the token chain, which must be done by - * the caller if desirable. + * Assemble an audit record out of its tokens, including allocating header and + * trailer tokens. Does not free the token chain, which must be done by the + * caller if desirable. * * XXX: Assumes there is sufficient space for the header and trailer. */ @@ -227,8 +225,8 @@ } /* - * Given a record that is no longer of interest, tear it down and convert to - * a free record. + * Given a record that is no longer of interest, tear it down and convert to a + * free record. */ static void au_teardown(au_record_t *rec) @@ -254,9 +252,8 @@ } /* - * Add the header token, identify any missing tokens - * Write out the tokens to the record memory and finally, - * call audit + * Add the header token, identify any missing tokens. Write out the tokens to + * the record memory and finally, call audit. */ int au_close(int d, int keep, short event) { @@ -265,9 +262,9 @@ int retval = 0; rec = open_desc_table[d]; - if((rec == NULL) || (rec->used == 0)) { + if ((rec == NULL) || (rec->used == 0)) { errno = EINVAL; - return -1; /* Invalid descriptor */ + return (-1); /* Invalid descriptor */ } if (!keep) { @@ -291,8 +288,8 @@ if (au_assemble(rec, event) < 0) { /* - * XXXRW: This is also not supposed to happen, but might if - * we are unable to allocate header and trailer memory. + * XXXRW: This is also not supposed to happen, but might if we + * are unable to allocate header and trailer memory. */ retval = -1; goto cleanup; @@ -304,7 +301,7 @@ cleanup: /* CLEANUP */ au_teardown(rec); - return retval; + return (retval); } /* @@ -338,15 +335,14 @@ } if (au_assemble(rec, event) < 0) { - /* - * XXXRW: See au_close() comment. - */ + /* XXXRW: See au_close() comment. */ retval = -1; goto cleanup; } memcpy(buffer, rec->data, rec->len); *buflen = rec->len; + cleanup: au_teardown(rec); return (retval); From owner-p4-projects@FreeBSD.ORG Mon May 30 22:15:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 474B016A42A; Mon, 30 May 2005 22:15:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9928416A42D for ; Mon, 30 May 2005 22:15:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DE6E43D53 for ; Mon, 30 May 2005 22:15:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UMFLWc071138 for ; Mon, 30 May 2005 22:15:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UMFKMW071134 for perforce@freebsd.org; Mon, 30 May 2005 22:15:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 May 2005 22:15:20 GMT Message-Id: <200505302215.j4UMFKMW071134@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 77745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 22:15:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=77745 Change 77745 by rwatson@rwatson_paprika on 2005/05/30 22:15:07 Converge on BSD style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#3 (text+ko) ==== @@ -34,238 +34,216 @@ #include /* - * Parse the contents of the audit_class file to return - * struct au_class_ent entries + * Parse the contents of the audit_class file to return struct au_class_ent + * entries. */ -static FILE *fp = NULL; -static char linestr[AU_LINE_MAX]; -static char *delim = ":"; +static FILE *fp = NULL; +static char linestr[AU_LINE_MAX]; +static char *delim = ":"; -static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; - /* * XXX The reentrant versions of the following functions is TBD * XXX struct au_class_ent *getclassent_r(au_class_ent_t *class_int); * XXX struct au_class_ent *getclassnam_r(au_class_ent_t *class_int, const char *name); */ - - /* - * Allocate a au_class_ent structure + * Allocate a au_class_ent structure. */ -static struct au_class_ent *get_class_area() +static struct au_class_ent * +get_class_area(void) { struct au_class_ent *c; - c = (struct au_class_ent *) malloc (sizeof(struct au_class_ent)); - if(c == NULL) { - return NULL; - } - c->ac_name = (char *)malloc(AU_CLASS_NAME_MAX * sizeof(char)); - if(c->ac_name == NULL) { + c = malloc(sizeof(struct au_class_ent)); + if (c == NULL) + return (NULL); + c->ac_name = malloc(AU_CLASS_NAME_MAX * sizeof(char)); + if (c->ac_name == NULL) { free(c); - return NULL; + return (NULL); } - c->ac_desc = (char *)malloc(AU_CLASS_DESC_MAX * sizeof(char)); - if(c->ac_desc == NULL) { + c->ac_desc = malloc(AU_CLASS_DESC_MAX * sizeof(char)); + if (c->ac_desc == NULL) { free(c->ac_name); free(c); - return NULL; + return (NULL); } - return c; + return (c); } /* - * Free the au_class_ent structure + * Free the au_class_ent structure. */ -void free_au_class_ent(struct au_class_ent *c) +void +free_au_class_ent(struct au_class_ent *c) { - if (c) - { - if (c->ac_name) - free(c->ac_name); - if (c->ac_desc) - free(c->ac_desc); - free(c); - } + + if (c) { + if (c->ac_name) + free(c->ac_name); + if (c->ac_desc) + free(c->ac_desc); + free(c); + } } /* - * Parse a single line from the audit_class file passed in str - * to the struct au_class_ent elements; store the result in c + * Parse a single line from the audit_class file passed in str to the struct + * au_class_ent elements; store the result in c. */ -static struct au_class_ent *classfromstr(char *str, char *delim, struct au_class_ent *c) +static struct au_class_ent * +classfromstr(char *str, char *delim, struct au_class_ent *c) { char *classname, *classdesc, *classflag; char *last; - /* each line contains flag:name:desc */ + /* Each line contains flag:name:desc. */ classflag = strtok_r(str, delim, &last); classname = strtok_r(NULL, delim, &last); classdesc = strtok_r(NULL, delim, &last); - if((classflag == NULL) - || (classname == NULL) - || (classdesc == NULL)) { - - return NULL; - } + if ((classflag == NULL) || (classname == NULL) || (classdesc == NULL)) + return (NULL); /* - * Check for very large classnames + * Check for very large classnames. */ - if(strlen(classname) >= AU_CLASS_NAME_MAX) { - return NULL; - } + if (strlen(classname) >= AU_CLASS_NAME_MAX) + return (NULL); strcpy(c->ac_name, classname); /* - * Check for very large class description + * Check for very large class description. */ - if(strlen(classdesc) >= AU_CLASS_DESC_MAX) { - return NULL; - } + if (strlen(classdesc) >= AU_CLASS_DESC_MAX) + return (NULL); strcpy(c->ac_desc, classdesc); - c->ac_class = strtoul(classflag, (char **) NULL, 0); - return c; + return (c); } /* - * Return the next au_class_ent structure from the file - * setauclass should be called before invoking this function - * for the first time + * Return the next au_class_ent structure from the file setauclass should be + * called before invoking this function for the first time. */ -struct au_class_ent *getauclassent() +struct au_class_ent * +getauclassent(void) { struct au_class_ent *c; char *tokptr, *nl; pthread_mutex_lock(&mutex); - if((fp == NULL) - && ((fp = fopen(AUDIT_CLASS_FILE, "r")) == NULL)) { - + if ((fp == NULL) && ((fp = fopen(AUDIT_CLASS_FILE, "r")) == NULL)) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } - if(fgets(linestr, AU_LINE_MAX, fp) == NULL) { - + if (fgets(linestr, AU_LINE_MAX, fp) == NULL) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } - /* Remove trailing new line character */ - if((nl = strrchr(linestr, '\n')) != NULL) { + /* Remove trailing new line character. */ + if ((nl = strrchr(linestr, '\n')) != NULL) *nl = '\0'; - } tokptr = linestr; c = get_class_area(); /* allocate */ - if(c == NULL) { - + if (c == NULL) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } - /* parse tokptr to au_class_ent components */ - if(classfromstr(tokptr, delim, c) == NULL) { - + /* Parse tokptr to au_class_ent components. */ + if (classfromstr(tokptr, delim, c) == NULL) { free_au_class_ent(c); - pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } pthread_mutex_unlock(&mutex); - return c; + return (c); } /* - * Return the next au_class_entry having the given class name + * Return the next au_class_entry having the given class name. */ -struct au_class_ent *getauclassnam(const char *name) +struct au_class_ent * +getauclassnam(const char *name) { struct au_class_ent *c; char *nl; - if(name == NULL) { - return NULL; - } + if (name == NULL) + return (NULL); - /* Rewind to beginning of file */ + /* Rewind to beginning of file. */ setauclass(); pthread_mutex_lock(&mutex); - if((fp == NULL) - && ((fp = fopen(AUDIT_CLASS_FILE, "r")) == NULL)) { - + if ((fp == NULL) && ((fp = fopen(AUDIT_CLASS_FILE, "r")) == NULL)) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } c = get_class_area(); /* allocate */ - if(c == NULL) { - + if (c == NULL) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } + while(fgets(linestr, AU_LINE_MAX, fp) != NULL) { /* Remove trailing new line character */ - if((nl = strrchr(linestr, '\n')) != NULL) { + if ((nl = strrchr(linestr, '\n')) != NULL) *nl = '\0'; - } /* parse tokptr to au_class_ent components */ - if(classfromstr(linestr, delim, c) != NULL) { - if(!strcmp(name, c->ac_name)) { - + if (classfromstr(linestr, delim, c) != NULL) { + if (!strcmp(name, c->ac_name)) { pthread_mutex_unlock(&mutex); - return c; + return (c); } } } free_au_class_ent(c); - pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } /* - * Rewind to the beginning of the enumeration + * Rewind to the beginning of the enumeration. */ -void setauclass() +void +setauclass(void) { + pthread_mutex_lock(&mutex); - - if(fp != NULL) { + if (fp != NULL) fseek(fp, 0, SEEK_SET); - } - pthread_mutex_unlock(&mutex); } /* - * audit_class processing is complete; close any open files + * audit_class processing is complete; close any open files. */ -void endauclass() +void endauclass(void) { + pthread_mutex_lock(&mutex); - - if(fp != NULL) { + if (fp != NULL) { fclose(fp); fp = NULL; } - pthread_mutex_unlock(&mutex); } From owner-p4-projects@FreeBSD.ORG Mon May 30 22:16:24 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AD9916A420; Mon, 30 May 2005 22:16:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 64F3816A41C for ; Mon, 30 May 2005 22:16:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3434243D54 for ; Mon, 30 May 2005 22:16:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UMGNFE071205 for ; Mon, 30 May 2005 22:16:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UMGMU9071202 for perforce@freebsd.org; Mon, 30 May 2005 22:16:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 May 2005 22:16:22 GMT Message-Id: <200505302216.j4UMGMU9071202@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 77746 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 22:16:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=77746 Change 77746 by rwatson@rwatson_paprika on 2005/05/30 22:15:30 Converge on BSD style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#4 (text+ko) ==== @@ -31,122 +31,111 @@ #include -static const char *delim = ","; +static const char *delim = ","; /* - * Convert the character representation of audit values - * into the au_mask_t field + * Convert the character representation of audit values into the au_mask_t + * field. */ -int getauditflagsbin(char *auditstr, au_mask_t *masks) +int +getauditflagsbin(char *auditstr, au_mask_t *masks) { char *tok; char sel, sub; struct au_class_ent *c; char *last; - if((auditstr == NULL) || (masks == NULL)) { - return -1; - } + if ((auditstr == NULL) || (masks == NULL)) + return (-1); masks->am_success = 0; masks->am_failure = 0; tok = strtok_r(auditstr, delim, &last); - while(tok != NULL) { - - /* check for the events that should not be audited */ - if(tok[0] == '^') { + while (tok != NULL) { + /* Check for the events that should not be audited. */ + if (tok[0] == '^') { sub = 1; tok++; - } - else { + } else sub = 0; - } - /* check for the events to be audited for success */ - if(tok[0] == '+') { + /* Check for the events to be audited for success. */ + if (tok[0] == '+') { sel = AU_PRS_SUCCESS; tok++; - } - else if(tok[0] == '-') { + } else if (tok[0] == '-') { sel = AU_PRS_FAILURE; tok++; - } - else { + } else sel = AU_PRS_BOTH; - } - if((c = getauclassnam(tok)) != NULL) { - if(sub) { + if ((c = getauclassnam(tok)) != NULL) { + if (sub) SUB_FROM_MASK(masks, c->ac_class, sel); - } - else { + else ADD_TO_MASK(masks, c->ac_class, sel); - } free_au_class_ent(c); - } else { - return -1; - } + } else + return (-1); - /* Get the next class */ + /* Get the next class. */ tok = strtok_r(NULL, delim, &last); } - return 0; + return (0); } /* - * Convert the au_mask_t fields into a string value - * If verbose is non-zero the long flag names are used - * else the short (2-character)flag names are used + * Convert the au_mask_t fields into a string value. If verbose is non-zero + * the long flag names are used else the short (2-character)flag names are + * used. */ -int getauditflagschar(char *auditstr, au_mask_t *masks, int verbose) +int +getauditflagschar(char *auditstr, au_mask_t *masks, int verbose) { struct au_class_ent *c; char *strptr = auditstr; u_char sel; - if((auditstr == NULL) || (masks == NULL)) { - return -1; - } + if ((auditstr == NULL) || (masks == NULL)) + return (-1); /* - * Enumerate the class entries, check if each is selected - * in either the success or failure masks + * Enumerate the class entries, check if each is selected in either + * the success or failure masks. */ - - for (setauclass(); (c = getauclassent()) != NULL; free_au_class_ent(c)) { - + for (setauclass(); (c = getauclassent()) != NULL; + free_au_class_ent(c)) { sel = 0; - /* Dont do anything for class = no */ - if(c->ac_class == 0) { + /* Dont do anything for class = no. */ + if (c->ac_class == 0) continue; - } - sel |= ((c->ac_class & masks->am_success) == c->ac_class) ? AU_PRS_SUCCESS : 0; - sel |= ((c->ac_class & masks->am_failure) == c->ac_class) ? AU_PRS_FAILURE : 0; + sel |= ((c->ac_class & masks->am_success) == c->ac_class) ? + AU_PRS_SUCCESS : 0; + sel |= ((c->ac_class & masks->am_failure) == c->ac_class) ? + AU_PRS_FAILURE : 0; /* - * No prefix should be attached if both - * success and failure are selected + * No prefix should be attached if both success and failure + * are selected. */ - if((sel & AU_PRS_BOTH) == 0) { - if((sel & AU_PRS_SUCCESS) != 0) { + if ((sel & AU_PRS_BOTH) == 0) { + if ((sel & AU_PRS_SUCCESS) != 0) { *strptr = '+'; strptr = strptr + 1; - } - else if((sel & AU_PRS_FAILURE) != 0) { + } else if ((sel & AU_PRS_FAILURE) != 0) { *strptr = '-'; strptr = strptr + 1; } } - if(sel != 0) { - if(verbose) { + if (sel != 0) { + if (verbose) { strcpy(strptr, c->ac_desc); strptr += strlen(c->ac_desc); - } - else { + } else { strcpy(strptr, c->ac_name); strptr += strlen(c->ac_name); } @@ -155,10 +144,9 @@ } } - /* Overwrite the last delimiter with the string terminator */ - if(strptr != auditstr) { + /* Overwrite the last delimiter with the string terminator. */ + if (strptr != auditstr) *(strptr-1) = '\0'; - } - return 0; + return (0); } From owner-p4-projects@FreeBSD.ORG Mon May 30 22:16:25 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37FCE16A44F; Mon, 30 May 2005 22:16:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D3E7C16A43C for ; Mon, 30 May 2005 22:16:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C01543D54 for ; Mon, 30 May 2005 22:16:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UMGNCm071212 for ; Mon, 30 May 2005 22:16:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UMGNdu071208 for perforce@freebsd.org; Mon, 30 May 2005 22:16:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 May 2005 22:16:23 GMT Message-Id: <200505302216.j4UMGNdu071208@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 77747 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 22:16:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=77747 Change 77747 by rwatson@rwatson_paprika on 2005/05/30 22:15:44 Converge on BSD style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#4 (text+ko) ==== @@ -35,23 +35,24 @@ #include /* - * Parse the contents of the audit_control file to return - * the audit control parameters + * Parse the contents of the audit_control file to return the audit control + * parameters. */ -static FILE *fp = NULL; -static char linestr[AU_LINE_MAX]; -static char *delim = ":"; +static FILE *fp = NULL; +static char linestr[AU_LINE_MAX]; +static char *delim = ":"; -static char inacdir = 0; -static char ptrmoved = 0; +static char inacdir = 0; +static char ptrmoved = 0; -static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; /* - * Returns the string value corresponding to the given label - * from the configuration file + * Returns the string value corresponding to the given label from the + * configuration file. */ -static int getstrfromtype(char *name, char **str) +static int +getstrfromtype(char *name, char **str) { char *type, *nl; char *tokptr; @@ -61,84 +62,77 @@ pthread_mutex_lock(&mutex); - if((fp == NULL) - && ((fp = fopen(AUDIT_CONTROL_FILE, "r")) == NULL)) { - + if ((fp == NULL) && ((fp = fopen(AUDIT_CONTROL_FILE, "r")) == + NULL)) { pthread_mutex_unlock(&mutex); - return 0; /* Error */ + return (0); /* Error */ } - /* Search for the line beginning with the given name */ - while(fgets(linestr, AU_LINE_MAX, fp) != NULL) { - - /* Remove trailing new line character */ - if((nl = strrchr(linestr, '\n')) != NULL) { + /* Search for the line beginning with the given name. */ + while (fgets(linestr, AU_LINE_MAX, fp) != NULL) { + /* Remove trailing new line character. */ + if ((nl = strrchr(linestr, '\n')) != NULL) *nl = '\0'; - } tokptr = linestr; - if((type = strtok_r(tokptr, delim, &last)) != NULL) { - if(!strcmp(name, type)) { - - /* Found matching name */ + if ((type = strtok_r(tokptr, delim, &last)) != NULL) { + if (!strcmp(name, type)) { + /* Found matching name. */ *str = strtok_r(NULL, delim, &last); - pthread_mutex_unlock(&mutex); - - if(*str == NULL) { - return 1; /* Parse error in file */ - } - return 0; /* Success */ + if (*str == NULL) + return (1); /* Parse error in file */ + return (0); /* Success */ } } } pthread_mutex_unlock(&mutex); - return 0; /* EOF */ + return (0); /* EOF */ } /* - * Rewind the file pointer to beginning + * Rewind the file pointer to beginning. */ -void setac() +void +setac(void) { + pthread_mutex_lock(&mutex); - ptrmoved = 1; - if(fp != NULL) { + if (fp != NULL) fseek(fp, 0, SEEK_SET); - } - pthread_mutex_unlock(&mutex); } /* * Close the audit_control file */ -void endac() +void +endac(void) { + pthread_mutex_lock(&mutex); - ptrmoved = 1; - if(fp != NULL) { + if (fp != NULL) { fclose(fp); fp = NULL; } - pthread_mutex_unlock(&mutex); } /* - * Return audit directory information from the audit control file + * Return audit directory information from the audit control file. */ -int getacdir(char *name, int len) +int +getacdir(char *name, int len) { char *dir; int ret = 0; - if(name == NULL) { + if (name == NULL) { errno = EINVAL; - return -2; + return (-2); } pthread_mutex_lock(&mutex); @@ -147,120 +141,109 @@ * Check if another function was called between * successive calls to getacdir */ - if(inacdir && ptrmoved) { + if (inacdir && ptrmoved) { ptrmoved = 0; - if(fp != NULL) { + if (fp != NULL) fseek(fp, 0, SEEK_SET); - } - ret = 2; } pthread_mutex_unlock(&mutex); - if(getstrfromtype(DIR_CONTROL_ENTRY, &dir) == 1) { - return -3; - } + if (getstrfromtype(DIR_CONTROL_ENTRY, &dir) == 1) + return (-3); - if(dir == NULL){ + if (dir == NULL) + return (-1); - return -1; - } - - if(strlen(dir) >= len) { - return -3; - } + if (strlen(dir) >= len) + return (-3); strcpy(name, dir); - return ret; + return (ret); } /* * Return the minimum free diskspace value from the audit control file */ -int getacmin(int *min_val) +int +getacmin(int *min_val) { char *min; setac(); - if(min_val == NULL) { + if (min_val == NULL) { errno = EINVAL; - return -2; + return (-2); } - if(getstrfromtype(MINFREE_CONTROL_ENTRY, &min) == 1) { - return -3; - } + if (getstrfromtype(MINFREE_CONTROL_ENTRY, &min) == 1) + return (-3); - if(min == NULL) { - return 1; - } + if (min == NULL) + return (1); *min_val = atoi(min); - return 0; + return (0); } /* - * Return the system audit value from the audit contol file + * Return the system audit value from the audit contol file. */ -int getacflg(char *auditstr, int len) +int +getacflg(char *auditstr, int len) { char *str; setac(); - if(auditstr == NULL) { + if (auditstr == NULL) { errno = EINVAL; - return -2; + return (-2); } - if(getstrfromtype(FLAGS_CONTROL_ENTRY, &str) == 1) { - return -3; - } + if (getstrfromtype(FLAGS_CONTROL_ENTRY, &str) == 1) + return (-3); - if(str == NULL) { - return 1; - } + if (str == NULL) + return (1); - if(strlen(str) >= len) { - return -3; - } + if (strlen(str) >= len) + return (-3); strcpy(auditstr, str); - return 0; + return (0); } /* - * Return the non attributable flags from the audit contol file + * Return the non attributable flags from the audit contol file. */ -int getacna(char *auditstr, int len) +int +getacna(char *auditstr, int len) { char *str; setac(); - if(auditstr == NULL) { + if (auditstr == NULL) { errno = EINVAL; - return -2; + return (-2); } - if(getstrfromtype(NA_CONTROL_ENTRY, &str) == 1) { - return -3; - } + if (getstrfromtype(NA_CONTROL_ENTRY, &str) == 1) + return (-3); - if(str == NULL) { - return 1; - } + if (str == NULL) + return (1); - if(strlen(str) >= len) { - return -3; - } + if (strlen(str) >= len) + return (-3); strcpy(auditstr, str); - return 0; + return (0); } From owner-p4-projects@FreeBSD.ORG Mon May 30 22:16:26 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9E2216A46F; Mon, 30 May 2005 22:16:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 483A316A44E for ; Mon, 30 May 2005 22:16:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D74643D54 for ; Mon, 30 May 2005 22:16:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4UMGNvC071218 for ; Mon, 30 May 2005 22:16:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4UMGNmd071215 for perforce@freebsd.org; Mon, 30 May 2005 22:16:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 30 May 2005 22:16:23 GMT Message-Id: <200505302216.j4UMGNmd071215@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 77748 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2005 22:16:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=77748 Change 77748 by rwatson@rwatson_paprika on 2005/05/30 22:16:00 Converge on BSD style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#3 (text+ko) ==== @@ -37,11 +37,11 @@ * Parse the contents of the audit_event file to return * au_event_ent entries */ -static FILE *fp = NULL; -static char linestr[AU_LINE_MAX]; -static char *delim = ":"; +static FILE *fp = NULL; +static char linestr[AU_LINE_MAX]; +static char *delim = ":"; -static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; /* * XXX The reentrant versions of the following functions is TBD @@ -50,53 +50,53 @@ * XXX struct au_event_ent *getauevnum_r(au_event_ent_t *e, au_event_t event_number); */ - /* - * Allocate an au_event_ent structure + * Allocate an au_event_ent structure. */ -static struct au_event_ent *get_event_area() +static struct au_event_ent * +get_event_area(void) { struct au_event_ent *e; e = (struct au_event_ent *) malloc (sizeof(struct au_event_ent)); - if(e == NULL) { - return NULL; - } + if (e == NULL) + return (NULL); e->ae_name = (char *)malloc(AU_EVENT_NAME_MAX * sizeof(char)); - if(e->ae_name == NULL) { + if (e->ae_name == NULL) { free(e); - return NULL; + return (NULL); } e->ae_desc = (char *)malloc(AU_EVENT_DESC_MAX * sizeof(char)); - if(e->ae_desc == NULL) { + if (e->ae_desc == NULL) { free(e->ae_name); free(e); - return NULL; + return (NULL); } - return e; + return (e); } /* - * Free the au_event_ent structure + * Free the au_event_ent structure. */ -void free_au_event_ent(struct au_event_ent *e) +void +free_au_event_ent(struct au_event_ent *e) { - if (e) - { - if (e->ae_name) - free(e->ae_name); - if (e->ae_desc) - free(e->ae_desc); - free(e); - } + + if (e) { + if (e->ae_name) + free(e->ae_name); + if (e->ae_desc) + free(e->ae_desc); + free(e); + } } /* - * Parse one line from the audit_event file into - * the au_event_ent structure + * Parse one line from the audit_event file into the au_event_ent structure. */ -static struct au_event_ent *eventfromstr(char *str, char *delim, struct au_event_ent *e) +static struct au_event_ent * +eventfromstr(char *str, char *delim, struct au_event_ent *e) { char *evno, *evname, *evdesc, *evclass; struct au_mask evmask; @@ -107,240 +107,213 @@ evdesc = strtok_r(NULL, delim, &last); evclass = strtok_r(NULL, delim, &last); - if((evno == NULL) - || (evname == NULL) - || (evdesc == NULL) - || (evclass == NULL)) { + if ((evno == NULL) || (evname == NULL) || (evdesc == NULL) || + (evclass == NULL)) + return (NULL); - return NULL; - } + if (strlen(evname) >= AU_EVENT_NAME_MAX) + return (NULL); - if(strlen(evname) >= AU_EVENT_NAME_MAX) { - return NULL; - } strcpy(e->ae_name, evname); - - if(strlen(evdesc) >= AU_EVENT_DESC_MAX) { - return NULL; - } + if (strlen(evdesc) >= AU_EVENT_DESC_MAX) + return (NULL); strcpy(e->ae_desc, evdesc); e->ae_number = atoi(evno); /* - * find out the mask that corresponds - * to the given list of classes. + * Find out the mask that corresponds to the given list of classes. */ - if(getauditflagsbin(evclass, &evmask) != 0) + if (getauditflagsbin(evclass, &evmask) != 0) e->ae_class = AU_NULL; else e->ae_class = evmask.am_success; - return e; + return (e); } /* - * Rewind the audit_event file + * Rewind the audit_event file. */ -void setauevent() +void +setauevent(void) { + pthread_mutex_lock(&mutex); - - if(fp != NULL) { + if (fp != NULL) fseek(fp, 0, SEEK_SET); - } - pthread_mutex_unlock(&mutex); } /* - * Close the open file pointers + * Close the open file pointers. */ -void endauevent() +void +endauevent(void) { + pthread_mutex_lock(&mutex); - - if(fp != NULL) { + if (fp != NULL) { fclose(fp); fp = NULL; } - pthread_mutex_unlock(&mutex); } /* - * Enumerate the au_event_ent entries + * Enumerate the au_event_ent entries. */ -struct au_event_ent *getauevent() +struct au_event_ent * +getauevent(void) { struct au_event_ent *e; char *nl; pthread_mutex_lock(&mutex); - if((fp == NULL) - && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) { - + if ((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } - if(fgets(linestr, AU_LINE_MAX, fp) == NULL) { - + if (fgets(linestr, AU_LINE_MAX, fp) == NULL) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } - /* Remove new lines */ - if((nl = strrchr(linestr, '\n')) != NULL) { + /* Remove new lines. */ + if ((nl = strrchr(linestr, '\n')) != NULL) *nl = '\0'; - } e = get_event_area(); - if(e == NULL) { - + if (e == NULL) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } - /* Get the next event structure */ - if(eventfromstr(linestr, delim, e) == NULL) { - + /* Get the next event structure. */ + if (eventfromstr(linestr, delim, e) == NULL) { free_au_event_ent(e); - pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } pthread_mutex_unlock(&mutex); - return e; + return (e); } /* * Search for an audit event structure having the given event name */ -struct au_event_ent *getauevnam(char *name) +struct au_event_ent * +getauevnam(char *name) { struct au_event_ent *e; char *nl; - if(name == NULL) { - return NULL; - } + if (name == NULL) + return (NULL); - /* Rewind to beginning of the file */ + /* Rewind to beginning of the file. */ setauevent(); pthread_mutex_lock(&mutex); - if((fp == NULL) - && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) { - + if ((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } e = get_event_area(); - if(e == NULL) { - + if (e == NULL) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } - while(fgets(linestr, AU_LINE_MAX, fp) != NULL) { - /* Remove new lines */ - if((nl = strrchr(linestr, '\n')) != NULL) { + while (fgets(linestr, AU_LINE_MAX, fp) != NULL) { + /* Remove new lines. */ + if ((nl = strrchr(linestr, '\n')) != NULL) *nl = '\0'; - } - if(eventfromstr(linestr, delim, e) != NULL) { - if(!strcmp(name, e->ae_name)) { - + if (eventfromstr(linestr, delim, e) != NULL) { + if (!strcmp(name, e->ae_name)) { pthread_mutex_unlock(&mutex); - return e; + return (e); } } } free_au_event_ent(e); - pthread_mutex_unlock(&mutex); - return NULL; - + return (NULL); } - /* - * Search for an audit event structure having the given event number + * Search for an audit event structure having the given event number. */ struct au_event_ent *getauevnum(au_event_t event_number) { struct au_event_ent *e; char *nl; - /* Rewind to beginning of the file */ + /* Rewind to beginning of the file. */ setauevent(); pthread_mutex_lock(&mutex); - if((fp == NULL) - && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) { - + if ((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } e = get_event_area(); - if(e == NULL) { - + if (e == NULL) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } - while(fgets(linestr, AU_LINE_MAX, fp) != NULL) { - /* Remove new lines */ - if((nl = strrchr(linestr, '\n')) != NULL) { + while (fgets(linestr, AU_LINE_MAX, fp) != NULL) { + /* Remove new lines. */ + if ((nl = strrchr(linestr, '\n')) != NULL) *nl = '\0'; - } - if(eventfromstr(linestr, delim, e) != NULL) { - if(event_number == e->ae_number) { - + if (eventfromstr(linestr, delim, e) != NULL) { + if (event_number == e->ae_number) { pthread_mutex_unlock(&mutex); - return e; + return (e); } } } free_au_event_ent(e); - pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } /* - * Search for an audit_event entry with a given event_name - * and returns the corresponding event number + * Search for an audit_event entry with a given event_name and returns the + * corresponding event number. */ -au_event_t *getauevnonam(char *event_name) +au_event_t * +getauevnonam(char *event_name) { struct au_event_ent *e; au_event_t *n = NULL; e = getauevnam(event_name); - if(e != NULL) { - n = (au_event_t *) malloc (sizeof(au_event_t)); - if(n != NULL) { + if (e != NULL) { + n = malloc (sizeof(au_event_t)); + if (n != NULL) *n = e->ae_number; - } free_au_event_ent(e); } - return n; + return (n); } -void free_au_event(au_event_t *e) +void +free_au_event(au_event_t *e) { - if (e) - free(e); + if (e) + free(e); } From owner-p4-projects@FreeBSD.ORG Tue May 31 02:31:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7924516A421; Tue, 31 May 2005 02:31:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D084416A41F for ; Tue, 31 May 2005 02:31:31 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A355B43D53 for ; Tue, 31 May 2005 02:31:31 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4V2VV9v087032 for ; Tue, 31 May 2005 02:31:31 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4V2VVjp087029 for perforce@freebsd.org; Tue, 31 May 2005 02:31:31 GMT (envelope-from trhodes@freebsd.org) Date: Tue, 31 May 2005 02:31:31 GMT Message-Id: <200505310231.j4V2VVjp087029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Cc: Subject: PERFORCE change 77752 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 02:31:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=77752 Change 77752 by trhodes@trhodes_local on 2005/05/31 02:31:01 Fix a spelling error, use C99 keywords. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#11 (text+ko) ==== @@ -155,7 +155,7 @@ /* * The values for the following token ids are not defined by BSM. * - * XXXRW: Not sure how to andle these in OpenBSM yet, but I'll give them + * XXXRW: Not sure how to handle these in OpenBSM yet, but I'll give them * names more consistent with Sun's BSM. These originally came from Apple's * BSM. */ @@ -180,8 +180,8 @@ /* ... and their sizes */ #define AUR_BYTE_SIZE sizeof(u_char) -#define AUR_SHORT_SIZE sizeof(u_int16_t) -#define AUR_LONG_SIZE sizeof(u_int32_t) +#define AUR_SHORT_SIZE sizeof(uint16_t) +#define AUR_LONG_SIZE sizeof(uint32_t) /* Modifiers for the header token */ #define PAD_NOTATTR 0x4000 /* nonattributable event */ @@ -239,9 +239,9 @@ au_emod_t e_mod); token_t *au_to_me(void); -token_t *au_to_arg(char n, char *text, u_int32_t v); -token_t *au_to_arg32(char n, char *text, u_int32_t v); -token_t *au_to_arg64(char n, char *text, u_int64_t v); +token_t *au_to_arg(char n, char *text, uint32_t v); +token_t *au_to_arg32(char n, char *text, uint32_t v); +token_t *au_to_arg64(char n, char *text, uint64_t v); #if defined(_KERNEL) || defined(KERNEL) token_t *au_to_attr(struct vnode_au_info *vni); token_t *au_to_attr32(struct vnode_au_info *vni); @@ -251,14 +251,14 @@ char unit_count, char *p); token_t *au_to_exit(int retval, int err); token_t *au_to_groups(int *groups); -token_t *au_to_newgroups(u_int16_t n, gid_t *groups); +token_t *au_to_newgroups(uint16_t n, gid_t *groups); token_t *au_to_in_addr(struct in_addr *internet_addr); token_t *au_to_in_addr_ex(struct in6_addr *internet_addr); token_t *au_to_ip(struct ip *ip); token_t *au_to_ipc(char type, int id); token_t *au_to_ipc_perm(struct ipc_perm *perm); -token_t *au_to_iport(u_int16_t iport); -token_t *au_to_opaque(char *data, u_int16_t bytes); +token_t *au_to_iport(uint16_t iport); +token_t *au_to_opaque(char *data, uint16_t bytes); token_t *au_to_path(char *path); token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, @@ -278,15 +278,15 @@ token_t *au_to_process64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid); -token_t *au_to_return(char status, u_int32_t ret); -token_t *au_to_return32(char status, u_int32_t ret); -token_t *au_to_return64(char status, u_int64_t ret); +token_t *au_to_return(char status, uint32_t ret); +token_t *au_to_return32(char status, uint32_t ret); +token_t *au_to_return64(char status, uint64_t ret); token_t *au_to_seq(long audit_count); #if defined(_KERNEL) || defined(KERNEL) token_t *au_to_socket(struct socket *so); -token_t *au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, +token_t *au_to_socket_ex_32(uint16_t lp, uint16_t rp, struct sockaddr *la, struct sockaddr *ta); -token_t *au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, +token_t *au_to_socket_ex_128(uint16_t lp, uint16_t rp, struct sockaddr *la, struct sockaddr *ta); #endif token_t *au_to_sock_inet(struct sockaddr_in *so); From owner-p4-projects@FreeBSD.ORG Tue May 31 10:44:27 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E09AD16A420; Tue, 31 May 2005 10:44:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B91EE16A41C for ; Tue, 31 May 2005 10:44:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AA9943D48 for ; Tue, 31 May 2005 10:44:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4VAiQ55019559 for ; Tue, 31 May 2005 10:44:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4VAiQsk019556 for perforce@freebsd.org; Tue, 31 May 2005 10:44:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 May 2005 10:44:26 GMT Message-Id: <200505311044.j4VAiQsk019556@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 77760 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 10:44:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=77760 Change 77760 by rwatson@rwatson_paprika on 2005/05/31 10:44:06 Converge on BSD style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#13 (text+ko) ==== @@ -53,16 +53,14 @@ #include -#define READ_TOKEN_BYTES(buf, len, dest, size, bytesread, err) \ - do {\ - if(bytesread + size > len) {\ - err = 1;\ - }\ - else {\ - memcpy(dest, buf + bytesread, size);\ - bytesread += size;\ - }\ - } while(0) +#define READ_TOKEN_BYTES(buf, len, dest, size, bytesread, err) do { \ + if (bytesread + size > len) { \ + err = 1; \ + } else { \ + memcpy(dest, buf + bytesread, size); \ + bytesread += size; \ + } \ +} while (0) #define READ_TOKEN_U_CHAR(buf, len, dest, bytesread, err) do { \ if (bytesread + sizeof(u_char) <= len) { \ @@ -96,199 +94,197 @@ err = 1; \ } while (0) -#define SET_PTR(buf, len, ptr, size, bytesread, err) \ - do {\ - if(bytesread + size > len) {\ - err = 1;\ - }\ - else {\ - ptr = buf + bytesread;\ - bytesread += size;\ - }\ - } while(0) +#define SET_PTR(buf, len, ptr, size, bytesread, err) do { \ + if (bytesread + size > len) \ + err = 1; \ + else { \ + ptr = buf + bytesread; \ + bytesread += size; \ + } \ +} while (0) /* - * Prints the delimiter string + * Prints the delimiter string. */ -static void print_delim(FILE *fp, char *del) +static void +print_delim(FILE *fp, char *del) { + fprintf(fp, "%s", del); } /* - * Prints a single byte in the given format + * Prints a single byte in the given format. */ -static void print_1_byte(FILE *fp, u_char val, const char *format) +static void +print_1_byte(FILE *fp, u_char val, const char *format) { + fprintf(fp, format, val); } /* - * Print 2 bytes in the given format + * Print 2 bytes in the given format. */ -static void print_2_bytes(FILE *fp, u_int16_t val, const char *format) +static void +print_2_bytes(FILE *fp, u_int16_t val, const char *format) { + fprintf(fp, format, val); } - /* - * Prints 4 bytes in the given format + * Prints 4 bytes in the given format. */ -static void print_4_bytes(FILE *fp, u_int32_t val, const char *format) +static void +print_4_bytes(FILE *fp, u_int32_t val, const char *format) { + fprintf(fp, format, val); } /* - * Prints 8 bytes in the given format + * Prints 8 bytes in the given format. */ -static void print_8_bytes(FILE *fp, u_int64_t val, const char *format) +static void +print_8_bytes(FILE *fp, u_int64_t val, const char *format) { + fprintf(fp, format, val); } - /* - * Prints the given size of data bytes in hex + * Prints the given size of data bytes in hex. */ -static void print_mem(FILE *fp, u_char *data, size_t len) +static void +print_mem(FILE *fp, u_char *data, size_t len) { int i; - if(len > 0) { + if (len > 0) { fprintf(fp, "0x"); - for(i = 0; i < len; i++) { - fprintf(fp, "%x", data[i]); - } + for (i = 0; i < len; i++) + fprintf(fp, "%x", data[i]); } } - /* - * Prints the given data bytes as a string + * Prints the given data bytes as a string. */ -static void print_string(FILE *fp, u_char *str, size_t len) +static void +print_string(FILE *fp, u_char *str, size_t len) { int i; - if(len > 0) { - for(i = 0; i < len; i++) { - if(str[i] != '\0') + + if (len > 0) { + for (i = 0; i < len; i++) { + if (str[i] != '\0') fprintf(fp, "%c", str[i]); } } } +/* + * Prints the token type in either the raw or the default form. + */ +static void +print_tok_type(FILE *fp, u_char type, const char *tokname, char raw) +{ - -/* Prints the token type in either the raw or the default form */ -static void print_tok_type(FILE *fp, u_char type, const char *tokname, char raw) -{ - if(raw) { + if (raw) fprintf(fp, "%u", type); - } - else { + else fprintf(fp, "%s", tokname); - } } - /* - * Prints a user value + * Prints a user value. */ -static void print_user(FILE *fp, u_int32_t usr, char raw) +static void +print_user(FILE *fp, u_int32_t usr, char raw) { struct passwd *pwent; - if(raw) { + + if (raw) fprintf(fp, "%d", usr); - } else { pwent = getpwuid(usr); - if(pwent != NULL) { + if (pwent != NULL) fprintf(fp, "%s", pwent->pw_name); - } - else { + else fprintf(fp, "%d", usr); - } } } /* - * Prints a group value + * Prints a group value. */ -static void print_group(FILE *fp, u_int32_t grp, char raw) +static void +print_group(FILE *fp, u_int32_t grp, char raw) { struct group *grpent; - if(raw) { + if (raw) fprintf(fp, "%d", grp); - } else { grpent = getgrgid(grp); - if(grpent != NULL) { + if (grpent != NULL) fprintf(fp, "%s", grpent->gr_name); - } - else { + else fprintf(fp, "%d", grp); - } } } - /* - * Prints the event from the header token in either - * the short, default or raw form + * Prints the event from the header token in either the short, default or raw + * form. */ -static void print_event(FILE *fp, u_int16_t ev, char raw, char sfrm) +static void +print_event(FILE *fp, u_int16_t ev, char raw, char sfrm) { struct au_event_ent *e; e = getauevnum(ev); - if(e == NULL) { + if (e == NULL) { fprintf(fp, "%u", ev); return; } - if(raw) { + if (raw) fprintf(fp, "%u", ev); - } - else if(sfrm) { + else if (sfrm) fprintf(fp, "%s", e->ae_name); - } - else { + else fprintf(fp, "%s", e->ae_desc); - } free_au_event_ent(e); } /* - * Prints the event modifier from the header token in either - * the default or raw form + * Prints the event modifier from the header token in either the default or + * raw form. */ -static void print_evmod(FILE *fp, u_int16_t evmod, char raw) +static void +print_evmod(FILE *fp, u_int16_t evmod, char raw) { - if(raw) { + if (raw) fprintf(fp, "%u", evmod); - } - else { + else fprintf(fp, "%u", evmod); - } } - /* - * Prints seconds in the ctime format + * Prints seconds in the ctime format. */ -static void print_sec32(FILE *fp, u_int32_t sec, char raw) +static void +print_sec32(FILE *fp, u_int32_t sec, char raw) { time_t time; char timestr[26]; - if(raw) { + if (raw) fprintf(fp, "%u", sec); - } else { time = (time_t)sec; ctime_r(&time, timestr); @@ -301,14 +297,14 @@ * XXXRW: 64-bit token streams make use of 64-bit time stamps; since we * assume a 32-bit time_t, we simply truncate for now. */ -static void print_sec64(FILE *fp, u_int64_t sec, char raw) +static void +print_sec64(FILE *fp, u_int64_t sec, char raw) { time_t time; char timestr[26]; - if(raw) { + if (raw) fprintf(fp, "%u", (u_int32_t)sec); - } else { time = (time_t)sec; ctime_r(&time, timestr); @@ -318,37 +314,37 @@ } /* - * Prints the excess milliseconds + * Prints the excess milliseconds. */ -static void print_msec32(FILE *fp, u_int32_t msec, char raw) +static void +print_msec32(FILE *fp, u_int32_t msec, char raw) { - if(raw) { + if (raw) fprintf(fp, "%u", msec); - } - else { + else fprintf(fp, " + %u msec", msec); - } } /* - * XXXRW: 64-bit token streams make use of 64-bit time stamps; since we - * assume a 32-bit msec, we simply truncate for now. + * XXXRW: 64-bit token streams make use of 64-bit time stamps; since we assume + * a 32-bit msec, we simply truncate for now. */ -static void print_msec64(FILE *fp, u_int64_t msec, char raw) +static void +print_msec64(FILE *fp, u_int64_t msec, char raw) { msec &= 0xffffffff; - if(raw) { + if (raw) fprintf(fp, "%u", (u_int32_t)msec); - } - else { + else fprintf(fp, " + %u msec", (u_int32_t)msec); - } } - -/* prints a dotted form for the IP addres */ -static void print_ip_address(FILE *fp, u_int32_t ip) +/* + * Prints a dotted form for the IP address. + */ +static void +print_ip_address(FILE *fp, u_int32_t ip) { struct in_addr ipaddr; @@ -356,19 +352,21 @@ fprintf(fp, "%s", inet_ntoa(ipaddr)); } -/* prints a string value for the given ip address */ -static void print_ip_ex_address(FILE *fp, u_int32_t type, u_int32_t *ipaddr) +/* + * Prints a string value for the given ip address. + */ +static void +print_ip_ex_address(FILE *fp, u_int32_t type, u_int32_t *ipaddr) { struct in_addr ipv4; struct in6_addr ipv6; char dst[INET6_ADDRSTRLEN]; const char *ret = NULL; - if(type == AF_INET) { + if (type == AF_INET) { ipv4.s_addr = (in_addr_t)(ipaddr[0]); ret = inet_ntop(type, &ipv4, dst, INET6_ADDRSTRLEN); - } - else if(type == AF_INET6) { + } else if (type == AF_INET6) { ipv6.__u6_addr.__u6_addr32[0] = ipaddr[0]; ipv6.__u6_addr.__u6_addr32[1] = ipaddr[1]; ipv6.__u6_addr.__u6_addr32[2] = ipaddr[2]; @@ -376,53 +374,55 @@ ret = inet_ntop(type, &ipv6, dst, INET6_ADDRSTRLEN); } - if(ret != NULL) { + if (ret != NULL) { fprintf(fp, "%s", ret); /* XXX Is ret heap memory? Leaked if so */ } } -/* Prints return value as success or failure */ -static void print_retval(FILE *fp, u_char status, char raw) +/* + * Prints return value as success or failure. + */ +static void +print_retval(FILE *fp, u_char status, char raw) { - if(raw) { + if (raw) fprintf(fp, "%u", status); - } else { - if(status == 0) { + if (status == 0) fprintf(fp, "success"); - } - else { + else fprintf(fp, "failure : %s", strerror(status)); - } } } -/* Prints the exit value */ -static void print_errval(FILE *fp, u_int32_t val) +/* + * Prints the exit value. + */ +static void +print_errval(FILE *fp, u_int32_t val) { + fprintf(fp, "Error %u", val); } -/*prints IPC type */ -static void print_ipctype(FILE *fp, u_char type, char raw) +/* + * Prints IPC type. + */ +static void +print_ipctype(FILE *fp, u_char type, char raw) { - if(raw) { + if (raw) fprintf(fp, "%u", type); - } else { - if(type == AT_IPC_MSG) { + if (type == AT_IPC_MSG) fprintf(fp, "Message IPC"); - } - else if(type == AT_IPC_SEM) { + else if (type == AT_IPC_SEM) fprintf(fp, "Semaphore IPC"); - } - else if(type == AT_IPC_SHM) { + else if (type == AT_IPC_SHM) fprintf(fp, "Shared Memory IPC"); - } - else { + else fprintf(fp, "%u", type); - } } } @@ -434,46 +434,42 @@ * seconds of time 4 bytes/8 bytes (32-bit/64-bit value) * milliseconds of time 4 bytes/8 bytes (32-bit/64-bit value) */ -static int fetch_header32_tok(tokenstr_t *tok, char *buf, int len) +static int +fetch_header32_tok(tokenstr_t *tok, char *buf, int len) { int err = 0; READ_TOKEN_U_INT32(buf, len, tok->tt.hdr32.size, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_CHAR(buf, len, tok->tt.hdr32.version, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_INT16(buf, len, tok->tt.hdr32.e_type, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_INT16(buf, len, tok->tt.hdr32.e_mod, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_INT32(buf, len, tok->tt.hdr32.s, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_INT32(buf, len, tok->tt.hdr32.ms, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); - return 0; + return (0); } -static void print_header32_tok(FILE *fp, tokenstr_t *tok, char *del, - char raw, char sfrm) +static void +print_header32_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, char sfrm) { + print_tok_type(fp, tok->id, "header", raw); print_delim(fp, del); print_4_bytes(fp, tok->tt.hdr32.size, "%u"); @@ -497,46 +493,42 @@ * milliseconds of time 4 bytes/8 bytes (32-bit/64-bit value) * version # */ -static int fetch_header64_tok(tokenstr_t *tok, char *buf, int len) +static int +fetch_header64_tok(tokenstr_t *tok, char *buf, int len) { int err = 0; READ_TOKEN_U_INT32(buf, len, tok->tt.hdr64.size, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_CHAR(buf, len, tok->tt.hdr64.version, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_INT16(buf, len, tok->tt.hdr64.e_type, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_INT16(buf, len, tok->tt.hdr64.e_mod, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_INT64(buf, len, tok->tt.hdr64.s, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_INT64(buf, len, tok->tt.hdr64.ms, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); - return 0; + return (0); } -static void print_header64_tok(FILE *fp, tokenstr_t *tok, char *del, - char raw, char sfrm) +static void +print_header64_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, char sfrm) { + print_tok_type(fp, tok->id, "header", raw); print_delim(fp, del); print_4_bytes(fp, tok->tt.hdr64.size, "%u"); @@ -556,26 +548,26 @@ * trailer magic 2 bytes * record size 4 bytes */ -static int fetch_trailer_tok(tokenstr_t *tok, char *buf, int len) +static int +fetch_trailer_tok(tokenstr_t *tok, char *buf, int len) { int err = 0; READ_TOKEN_U_INT16(buf, len, tok->tt.trail.magic, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_INT32(buf, len, tok->tt.trail.count, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); - return 0; + return (0); } -static void print_trailer_tok(FILE *fp, tokenstr_t *tok, char *del, - char raw, char sfrm) +static void +print_trailer_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, char sfrm) { + print_tok_type(fp, tok->id, "trailer", raw); print_delim(fp, del); print_4_bytes(fp, tok->tt.trail.count, "%u"); @@ -587,37 +579,35 @@ * text length 2 bytes * text N bytes + 1 terminating NULL byte */ -static int fetch_arg32_tok(tokenstr_t *tok, char *buf, int len) +static int +fetch_arg32_tok(tokenstr_t *tok, char *buf, int len) { int err = 0; READ_TOKEN_U_CHAR(buf, len, tok->tt.arg32.no, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_INT32(buf, len, tok->tt.arg32.val, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_INT16(buf, len, tok->tt.arg32.len, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); - SET_PTR(buf, len, tok->tt.arg32.text, tok->tt.arg32.len, tok->len, err); - if(err) { - return -1; - } + SET_PTR(buf, len, tok->tt.arg32.text, tok->tt.arg32.len, tok->len, + err); + if (err) + return (-1); - return 0; + return (0); } +static void +print_arg32_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, char sfrm) +{ -static void print_arg32_tok(FILE *fp, tokenstr_t *tok, char *del, - char raw, char sfrm) -{ print_tok_type(fp, tok->id, "argument", raw); print_delim(fp, del); print_1_byte(fp, tok->tt.arg32.no, "%u"); @@ -627,37 +617,35 @@ print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len); } -static int fetch_arg64_tok(tokenstr_t *tok, char *buf, int len) +static int +fetch_arg64_tok(tokenstr_t *tok, char *buf, int len) { int err = 0; READ_TOKEN_U_CHAR(buf, len, tok->tt.arg64.no, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_INT64(buf, len, tok->tt.arg64.val, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); READ_TOKEN_U_INT16(buf, len, tok->tt.arg64.len, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); - SET_PTR(buf, len, tok->tt.arg64.text, tok->tt.arg64.len, tok->len, err); - if(err) { - return -1; - } + SET_PTR(buf, len, tok->tt.arg64.text, tok->tt.arg64.len, tok->len, + err); + if (err) + return (-1); - return 0; + return (0); } +static void +print_arg64_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, char sfrm) +{ -static void print_arg64_tok(FILE *fp, tokenstr_t *tok, char *del, - char raw, char sfrm) -{ print_tok_type(fp, tok->id, "argument", raw); print_delim(fp, del); print_1_byte(fp, tok->tt.arg64.no, "%u"); @@ -673,49 +661,54 @@ * unit count 1 byte * data items (depends on basic unit) */ -static int fetch_arb_tok(tokenstr_t *tok, char *buf, int len) +static int +fetch_arb_tok(tokenstr_t *tok, char *buf, int len) { int err = 0; int datasize; READ_TOKEN_U_CHAR(buf, len, tok->tt.arb.howtopr, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); + READ_TOKEN_U_CHAR(buf, len, tok->tt.arb.bu, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); + READ_TOKEN_U_CHAR(buf, len, tok->tt.arb.uc, tok->len, err); - if(err) { - return -1; - } + if (err) + return (-1); - /* Determine the size of the basic unit */ + /* + * Determine the size of the basic unit. + */ switch(tok->tt.arb.bu) { - case AUR_BYTE: datasize = AUR_BYTE_SIZE; - break; + case AUR_BYTE: + datasize = AUR_BYTE_SIZE; + break; - case AUR_SHORT: datasize = AUR_SHORT_SIZE; - break; + case AUR_SHORT: + datasize = AUR_SHORT_SIZE; + break; - case AUR_LONG: datasize = AUR_LONG_SIZE; - break; + case AUR_LONG: + datasize = AUR_LONG_SIZE; + break; - default: return -1; + default: + return (-1); } - SET_PTR(buf, len, tok->tt.arb.data, - datasize * tok->tt.arb.uc , tok->len, err); - if(err) { - return -1; - } + SET_PTR(buf, len, tok->tt.arb.data, datasize * tok->tt.arb.uc, + tok->len, err); + if (err) + return (-1); - return 0; + return (0); } -static void print_arb_tok(FILE *fp, tokenstr_t *tok, char *del, - char raw, char sfrm) +static void +print_arb_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, char sfrm) { char *str; char *format; @@ -724,78 +717,78 @@ print_tok_type(fp, tok->id, "arbitrary", raw); print_delim(fp, del); + switch(tok->tt.arb.howtopr) { - case AUP_BINARY: - str = "binary"; - format = " %c"; - break; + case AUP_BINARY: + str = "binary"; + format = " %c"; + break; - case AUP_OCTAL: - str = "octal"; - format = " %o"; - break; + case AUP_OCTAL: + str = "octal"; + format = " %o"; + break; - case AUP_DECIMAL: - str = "decimal"; - format = " %d"; - break; + case AUP_DECIMAL: + str = "decimal"; + format = " %d"; + break; - case AUP_HEX: - str = "hex"; - format = " %x"; - break; + case AUP_HEX: + str = "hex"; + format = " %x"; + break; - case AUP_STRING: - str = "string"; - format = "%c"; - break; + case AUP_STRING: + str = "string"; + format = "%c"; + break; - default: - return; + default: + return; } + print_string(fp, str, strlen(str)); print_delim(fp, del); switch(tok->tt.arb.bu) { - case AUR_BYTE: - str = "byte"; - size = AUR_BYTE_SIZE; - print_string(fp, str, strlen(str)); - print_delim(fp, del); - print_1_byte(fp, tok->tt.arb.uc, "%u"); - print_delim(fp, del); - for(i = 0; itt.arb.uc; i++) { - fprintf(fp, format, *(tok->tt.arb.data + (size * i))); - } - break; + case AUR_BYTE: + str = "byte"; + size = AUR_BYTE_SIZE; + print_string(fp, str, strlen(str)); + print_delim(fp, del); + print_1_byte(fp, tok->tt.arb.uc, "%u"); + print_delim(fp, del); + for (i = 0; itt.arb.uc; i++) + fprintf(fp, format, *(tok->tt.arb.data + (size * i))); + break; - case AUR_SHORT: - str = "short"; - size = AUR_SHORT_SIZE; - print_string(fp, str, strlen(str)); - print_delim(fp, del); - print_1_byte(fp, tok->tt.arb.uc, "%u"); - print_delim(fp, del); - for(i = 0; itt.arb.uc; i++) { - fprintf(fp, format, *((u_int16_t *)(tok->tt.arb.data + (size * i)))); - } - break; + case AUR_SHORT: + str = "short"; + size = AUR_SHORT_SIZE; + print_string(fp, str, strlen(str)); + print_delim(fp, del); + print_1_byte(fp, tok->tt.arb.uc, "%u"); + print_delim(fp, del); + for (i = 0; itt.arb.uc; i++) + fprintf(fp, format, *((u_int16_t *)(tok->tt.arb.data + + (size * i)))); + break; - case AUR_LONG: - str = "int"; - size = AUR_LONG_SIZE; - print_string(fp, str, strlen(str)); - print_delim(fp, del); - print_1_byte(fp, tok->tt.arb.uc, "%u"); - print_delim(fp, del); - for(i = 0; itt.arb.uc; i++) { - fprintf(fp, format, *((u_int32_t *)(tok->tt.arb.data + (size * i)))); - } - break; + case AUR_LONG: + str = "int"; + size = AUR_LONG_SIZE; + print_string(fp, str, strlen(str)); + print_delim(fp, del); + print_1_byte(fp, tok->tt.arb.uc, "%u"); + print_delim(fp, del); + for (i = 0; itt.arb.uc; i++) + fprintf(fp, format, *((u_int32_t *)(tok->tt.arb.data + + (size * i)))); + break; - default: - return; + default: + return; } - } /* @@ -806,46 +799,42 @@ * node ID 8 bytes * device 4 bytes/8 bytes (32-bit/64-bit) */ -static int fetch_attr32_tok(tokenstr_t *tok, char *buf, int len) +static int +fetch_attr32_tok(tokenstr_t *tok, char *buf, int len) { int err = 0; READ_TOKEN_U_INT32(buf, len, tok->tt.attr32.mode, tok->len, err); - if(err) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 31 10:51:42 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B344716A421; Tue, 31 May 2005 10:51:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F87A16A41C for ; Tue, 31 May 2005 10:51:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2263643D49 for ; Tue, 31 May 2005 10:51:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4VApfZn019910 for ; Tue, 31 May 2005 10:51:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4VApeDv019907 for perforce@freebsd.org; Tue, 31 May 2005 10:51:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 May 2005 10:51:40 GMT Message-Id: <200505311051.j4VApeDv019907@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 77761 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 10:51:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=77761 Change 77761 by rwatson@rwatson_paprika on 2005/05/31 10:50:40 Converge on BSD style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#4 (text+ko) ==== @@ -34,17 +34,18 @@ #include /* MT-Safe */ -static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -static int firsttime = 1; +static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +static int firsttime = 1; /* - * XXX ev_cache, once created, sticks around until the calling program - * exits. This may or may not be a problem as far as absolute memory usage - * goes, but at least there don't appear to be any leaks in using the cache. + * XXX ev_cache, once created, sticks around until the calling program exits. + * This may or may not be a problem as far as absolute memory usage goes, but + * at least there don't appear to be any leaks in using the cache. */ -static LIST_HEAD(, audit_event_map) ev_cache; +static LIST_HEAD(, audit_event_map) ev_cache; -static int load_event_table() +static int +load_event_table(VOID) { struct au_event_ent *ev; struct audit_event_map *elem; @@ -53,31 +54,33 @@ LIST_INIT(&ev_cache); - setauevent(); /* rewind to beginning of entries */ + setauevent(); /* Rewind to beginning of entries. */ /* - * loading of the cache happens only once; - * dont check if cache is already loaded + * Loading of the cache happens only once; dont check if cache is + * already loaded. */ - /* Enumerate the events */ - while((ev = getauevent()) != NULL) { - elem = (struct audit_event_map *) - malloc (sizeof (struct audit_event_map)); - if(elem == NULL) { + /* Enumerate the events. */ + while ((ev = getauevent()) != NULL) { + elem = malloc (sizeof (struct audit_event_map)); + if (elem == NULL) { free_au_event_ent(ev); pthread_mutex_unlock(&mutex); - return -1; + return (-1); } elem->ev = ev; LIST_INSERT_HEAD(&ev_cache, elem, ev_list); } pthread_mutex_unlock(&mutex); - return 1; + return (1); } -/* Add a new event to the cache */ -static int add_to_cache(struct au_event_ent *ev) +/* + * Add a new event to the cache. + */ +static int +add_to_cache(struct au_event_ent *ev) { struct au_event_ent *oldev; struct audit_event_map *elem; @@ -85,97 +88,90 @@ pthread_mutex_lock(&mutex); LIST_FOREACH(elem, &ev_cache, ev_list) { - if(elem->ev->ae_number == ev->ae_number) { + if (elem->ev->ae_number == ev->ae_number) { /* Swap old with the new */ oldev = elem->ev; elem->ev = ev; free_au_event_ent(oldev); pthread_mutex_unlock(&mutex); - return 1; + return (1); } } - /* Add this event as a new entry in the list */ - elem = (struct audit_event_map *) - malloc (sizeof (struct audit_event_map)); - if(elem == NULL) { - /* XXX Do we need to clean up ? */ + /* Add this event as a new entry in the list. */ + elem = malloc (sizeof (struct audit_event_map)); + if (elem == NULL) { + /* XXX Do we need to clean up? */ pthread_mutex_unlock(&mutex); - return -1; + return (-1); } elem->ev = ev; LIST_INSERT_HEAD(&ev_cache, elem, ev_list); pthread_mutex_unlock(&mutex); - return 1; + return (1); } -/* Read the event with the matching event number from the cache */ -static struct au_event_ent *read_from_cache(au_event_t event) +/* + * Read the event with the matching event number from the cache. + */ +static struct au_event_ent * +read_from_cache(au_event_t event) { struct audit_event_map *elem; pthread_mutex_lock(&mutex); - LIST_FOREACH(elem, &ev_cache, ev_list) { - if(elem->ev->ae_number == event) { + if (elem->ev->ae_number == event) { pthread_mutex_unlock(&mutex); return elem->ev; } } + pthread_mutex_unlock(&mutex); - pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } /* * Check if the audit event is preselected against the preselction mask */ -int au_preselect(au_event_t event, au_mask_t *mask_p, int sorf, int flag) +int +au_preselect(au_event_t event, au_mask_t *mask_p, int sorf, int flag) { struct au_event_ent *ev = NULL; au_class_t effmask = 0; - if(mask_p == NULL) { - return -1; - } + if (mask_p == NULL) + return (-1); - /* If we are here for the first time, load the event database */ - if(firsttime) { + /* If we are here for the first time, load the event database. */ + if (firsttime) { firsttime = 0; - if( -1 == load_event_table()) { - return -1; - } + if ( -1 == load_event_table()) + return (-1); } - if(flag == AU_PRS_REREAD) { - /* get the event structure from the event number */ + if (flag == AU_PRS_REREAD) { + /* get the event structure from the event number. */ ev = getauevnum(event); - if(ev != NULL) { + if (ev != NULL) add_to_cache(ev); - } - } - else if(flag == AU_PRS_USECACHE) { + } else if (flag == AU_PRS_USECACHE) ev = read_from_cache(event); - } - if(ev == NULL) { - return -1; - } + if (ev == NULL) + return (-1); - if(sorf & AU_PRS_SUCCESS) { + if (sorf & AU_PRS_SUCCESS) effmask |= (mask_p->am_success & ev->ae_class); - } - if(sorf & AU_PRS_FAILURE) { + if (sorf & AU_PRS_FAILURE) effmask |= (mask_p->am_failure & ev->ae_class); - } - if(effmask != 0) { - return 1; - } + if (effmask != 0) + return (1); - return 0; + return (0); } From owner-p4-projects@FreeBSD.ORG Tue May 31 10:58:51 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCEC816A420; Tue, 31 May 2005 10:58:50 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 90A9C16A41C for ; Tue, 31 May 2005 10:58:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60B9643D1D for ; Tue, 31 May 2005 10:58:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4VAwouP020144 for ; Tue, 31 May 2005 10:58:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4VAwofW020141 for perforce@freebsd.org; Tue, 31 May 2005 10:58:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 May 2005 10:58:50 GMT Message-Id: <200505311058.j4VAwofW020141@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 77762 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 10:58:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=77762 Change 77762 by rwatson@rwatson_paprika on 2005/05/31 10:58:33 Convert on BSD style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ #ifdef __APPLE__ /* - * Based on sample code from Marc Majka + * Based on sample code from Marc Majka. */ #include #include /* strerror() */ @@ -39,111 +39,108 @@ #include /* syslog() */ #include -/* if 1, assumes a kernel that sends the right notification */ -#define AUDIT_NOTIFICATION_ENABLED 1 +/* If 1, assumes a kernel that sends the right notification. */ +#define AUDIT_NOTIFICATION_ENABLED 1 #if AUDIT_NOTIFICATION_ENABLED -static int token = 0; +static int token = 0; #endif /* AUDIT_NOTIFICATION_ENABLED */ -static long au_cond = AUC_UNSET; /* */ +static long au_cond = AUC_UNSET; /* */ uint32_t au_notify_initialize(void) { #if AUDIT_NOTIFICATION_ENABLED - uint32_t status, ignore_first; + uint32_t status, ignore_first; - status = notify_register_check(__BSM_INTERNAL_NOTIFY_KEY, &token); - if (status != NOTIFY_STATUS_OK) return status; - - status = notify_check(token, &ignore_first); - if (status != NOTIFY_STATUS_OK) return status; + status = notify_register_check(__BSM_INTERNAL_NOTIFY_KEY, &token); + if (status != NOTIFY_STATUS_OK) + return (status); + status = notify_check(token, &ignore_first); + if (status != NOTIFY_STATUS_OK) + return (status); #endif - if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) - { - syslog(LOG_ERR, "Initial audit status check failed (%s)", - strerror(errno)); - if (errno == ENOSYS) /* auditon() unimplemented */ - return AU_UNIMPL; - return NOTIFY_STATUS_FAILED; /* is there a better code? */ - } - return NOTIFY_STATUS_OK; + if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { + syslog(LOG_ERR, "Initial audit status check failed (%s)", + strerror(errno)); + if (errno == ENOSYS) /* auditon() unimplemented. */ + return (AU_UNIMPL); + return (NOTIFY_STATUS_FAILED); /* Is there a better code? */ + } + return (NOTIFY_STATUS_OK); } int au_notify_terminate(void) { + #if AUDIT_NOTIFICATION_ENABLED - return (notify_cancel(token) == NOTIFY_STATUS_OK) ? 0 : -1; + return ((notify_cancel(token) == NOTIFY_STATUS_OK) ? 0 : -1); #else - return 0; + return (0); #endif } /* * On error of any notify(3) call, reset 'au_cond' to ensure we re-run - * au_notify_initialize() next time 'round--but assume auditing is on. - * This is a slight performance hit if auditing is off, but at least the - * system will behave correctly. The notification calls are unlikely to - * fail, anyway. + * au_notify_initialize() next time 'round--but assume auditing is on. This + * is a slight performance hit if auditing is off, but at least the system + * will behave correctly. The notification calls are unlikely to fail, + * anyway. */ int au_get_state(void) { #if AUDIT_NOTIFICATION_ENABLED - uint32_t did_notify; + uint32_t did_notify; #endif - int status; + int status; - /* - * Don't make the client initialize this set of routines, but - * take the slight performance hit by checking ourselves every - * time. - */ - if (au_cond == AUC_UNSET) - { - status = au_notify_initialize(); - if (status != NOTIFY_STATUS_OK) - { - if (status == AU_UNIMPL) - return AU_UNIMPL; - return AUC_AUDITING; + /* + * Don't make the client initialize this set of routines, but take the + * slight performance hit by checking ourselves every time. + */ + if (au_cond == AUC_UNSET) { + status = au_notify_initialize(); + if (status != NOTIFY_STATUS_OK) { + if (status == AU_UNIMPL) + return (AU_UNIMPL); + return (AUC_AUDITING); + } else + return (au_cond); } - else - return au_cond; - } #if AUDIT_NOTIFICATION_ENABLED - status = notify_check(token, &did_notify); - if (status != NOTIFY_STATUS_OK) - { - au_cond = AUC_UNSET; - return AUC_AUDITING; - } + status = notify_check(token, &did_notify); + if (status != NOTIFY_STATUS_OK) { + au_cond = AUC_UNSET; + return (AUC_AUDITING); + } - if (did_notify == 0) return au_cond; + if (did_notify == 0) + return (au_cond); #endif - if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) - { - /* XXX reset au_cond to AUC_UNSET? */ - syslog(LOG_ERR, "Audit status check failed (%s)", - strerror(errno)); - if (errno == ENOSYS) /* function unimplemented */ - return AU_UNIMPL; - return errno; - } - switch (au_cond) - { - case AUC_NOAUDIT: /* auditing suspended */ - case AUC_DISABLED: /* auditing shut off */ - return AUC_NOAUDIT; - case AUC_UNSET: /* uninitialized; shouldn't get here */ - case AUC_AUDITING: /* audit on */ + if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { + /* XXX Reset au_cond to AUC_UNSET? */ + syslog(LOG_ERR, "Audit status check failed (%s)", + strerror(errno)); + if (errno == ENOSYS) /* Function unimplemented. */ + return (AU_UNIMPL); + return (errno); + } + + switch (au_cond) { + case AUC_NOAUDIT: /* Auditing suspended. */ + case AUC_DISABLED: /* Auditing shut off. */ + return (AUC_NOAUDIT); + + case AUC_UNSET: /* Uninitialized; shouldn't get here. */ + case AUC_AUDITING: /* Audit on. */ default: - return AUC_AUDITING; - } + return (AUC_AUDITING); + } } #endif /* !__APPLE__ */ From owner-p4-projects@FreeBSD.ORG Tue May 31 11:29:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22A9016A420; Tue, 31 May 2005 11:29:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D263016A41C for ; Tue, 31 May 2005 11:29:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9565243D54 for ; Tue, 31 May 2005 11:29:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4VBTRd5021294 for ; Tue, 31 May 2005 11:29:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4VBTRir021291 for perforce@freebsd.org; Tue, 31 May 2005 11:29:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 May 2005 11:29:27 GMT Message-Id: <200505311129.j4VBTRir021291@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 77763 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 11:29:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=77763 Change 77763 by rwatson@rwatson_paprika on 2005/05/31 11:28:56 Converge on BSD style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#16 (text+ko) ==== @@ -54,26 +54,18 @@ #include -#define GET_TOKEN_AREA(t, dptr, length) \ - do {\ - t = (token_t *) malloc (sizeof(token_t));\ - if(t != NULL)\ - {\ - t->len = length;\ - t->t_data = (u_char *) malloc (length * sizeof(u_char));\ - if((dptr = t->t_data) == NULL)\ - {\ - free(t);\ - t = NULL;\ - }\ - else\ - {\ - memset(dptr, 0, length);\ - }\ - }\ - }while(0) - - +#define GET_TOKEN_AREA(t, dptr, length) do { \ + t = malloc (sizeof(token_t)); \ + if (t != NULL) { \ + t->len = length; \ + t->t_data = malloc (length * sizeof(u_char)); \ + if ((dptr = t->t_data) == NULL) { \ + free(t); \ + t = NULL; \ + } else \ + memset(dptr, 0, length); \ + } \ +} while (0) /* * token ID 1 byte @@ -82,22 +74,22 @@ * text length 2 bytes * text N bytes + 1 terminating NULL byte */ -token_t *au_to_arg32(char n, char *text, u_int32_t v) +token_t * +au_to_arg32(char n, char *text, u_int32_t v) { token_t *t; u_char *dptr = NULL; u_int16_t textlen; - if(text == NULL) { + if (text == NULL) { errno = EINVAL; - return NULL; + return (NULL); } textlen = strlen(text); GET_TOKEN_AREA(t, dptr, 9 + textlen); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); textlen += 1; @@ -107,26 +99,26 @@ ADD_U_INT16(dptr, textlen); ADD_STRING(dptr, text, textlen); - return t; + return (t); } -token_t *au_to_arg64(char n, char *text, u_int64_t v) +token_t * +au_to_arg64(char n, char *text, u_int64_t v) { token_t *t; u_char *dptr = NULL; u_int16_t textlen; - if(text == NULL) { + if (text == NULL) { errno = EINVAL; - return NULL; + return (NULL); } textlen = strlen(text); GET_TOKEN_AREA(t, dptr, 13 + textlen); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); textlen += 1; @@ -136,13 +128,15 @@ ADD_U_INT16(dptr, textlen); ADD_STRING(dptr, text, textlen); - return t; + return (t); } -token_t *au_to_arg(char n, char *text, u_int32_t v) +token_t * +au_to_arg(char n, char *text, u_int32_t v) { - return au_to_arg32(n, text, v); + + return (au_to_arg32(n, text, v)); } #if defined(_KERNEL) || defined(KERNEL) @@ -155,23 +149,23 @@ * node ID 8 bytes * device 4 bytes/8 bytes (32-bit/64-bit) */ -token_t *au_to_attr32(struct vnode_au_info *vni) +token_t * +au_to_attr32(struct vnode_au_info *vni) { token_t *t; u_char *dptr = NULL; u_int16_t pad0_16 = 0; u_int16_t pad0_32 = 0; - if(vni == NULL) { + if (vni == NULL) { errno = EINVAL; - return NULL; + return (NULL); } GET_TOKEN_AREA(t, dptr, 29); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_ATTR32); @@ -195,26 +189,29 @@ if (sizeof(vni->vn_fileid) == sizeof(uint32_t)) { ADD_U_INT32(dptr, pad0_32); ADD_U_INT32(dptr, vni->vn_fileid); - } else if (sizeof(vni->vn_fileid) == sizeof(uint64_t)) { + } else if (sizeof(vni->vn_fileid) == sizeof(uint64_t)) ADD_U_INT64(dptr, vni->vn_fileid); - } else { + else ADD_U_INT64(dptr, 0LL); - } ADD_U_INT32(dptr, vni->vn_dev); - return t; + return (t); } -token_t *au_to_attr64(struct vnode_au_info *vni) +token_t * +au_to_attr64(struct vnode_au_info *vni) { + errno = ENOTSUP; - return NULL; + return (NULL); } -token_t *au_to_attr(struct vnode_au_info *vni) +token_t * +au_to_attr(struct vnode_au_info *vni) { - return au_to_attr32(vni); + + return (au_to_attr32(vni)); } #endif /* !(defined(_KERNEL) || defined(KERNEL) */ @@ -226,40 +223,42 @@ * unit count 1 byte * data items (depends on basic unit) */ -token_t *au_to_data(char unit_print, char unit_type, - char unit_count, char *p) +token_t * +au_to_data(char unit_print, char unit_type, char unit_count, char *p) { token_t *t; u_char *dptr = NULL; size_t datasize, totdata; - if(p == NULL) { + if (p == NULL) { errno = EINVAL; - return NULL; + return (NULL); } - /* Determine the size of the basic unit */ + /* Determine the size of the basic unit. */ switch(unit_type) { - case AUR_BYTE: datasize = AUR_BYTE_SIZE; - break; + case AUR_BYTE: + datasize = AUR_BYTE_SIZE; + break; - case AUR_SHORT: datasize = AUR_SHORT_SIZE; - break; + case AUR_SHORT: + datasize = AUR_SHORT_SIZE; + break; - case AUR_LONG: datasize = AUR_LONG_SIZE; - break; + case AUR_LONG: + datasize = AUR_LONG_SIZE; + break; - default: - errno = EINVAL; - return NULL; + default: + errno = EINVAL; + return (NULL); } totdata = datasize * unit_count; GET_TOKEN_AREA(t, dptr, totdata + 4); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_DATA); ADD_U_CHAR(dptr, unit_print); @@ -267,7 +266,7 @@ ADD_U_CHAR(dptr, unit_count); ADD_MEM(dptr, p, totdata); - return t; + return (t); } @@ -276,28 +275,30 @@ * status 4 bytes * return value 4 bytes */ -token_t *au_to_exit(int retval, int err) +token_t * +au_to_exit(int retval, int err) { token_t *t; u_char *dptr = NULL; GET_TOKEN_AREA(t, dptr, 9); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_EXIT); ADD_U_INT32(dptr, err); ADD_U_INT32(dptr, retval); - return t; + return (t); } /* */ -token_t *au_to_groups(int *groups) +token_t * +au_to_groups(int *groups) { - return au_to_newgroups(BSM_MAX_GROUPS, groups); + + return (au_to_newgroups(BSM_MAX_GROUPS, groups)); } /* @@ -305,57 +306,53 @@ * number groups 2 bytes * group list count * 4 bytes */ -token_t *au_to_newgroups(u_int16_t n, gid_t *groups) +token_t * +au_to_newgroups(u_int16_t n, gid_t *groups) { token_t *t; u_char *dptr = NULL; int i; - if(groups == NULL) { + if (groups == NULL) { errno = EINVAL; - return NULL; + return (NULL); } GET_TOKEN_AREA(t, dptr, n * 4 + 3); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_NEWGROUPS); ADD_U_INT16(dptr, n); - for(i = 0; i < n; i++) { - ADD_U_INT32(dptr, groups[i]); - } + for (i = 0; i < n; i++) + ADD_U_INT32(dptr, groups[i]); - return t; + return (t); } - - - /* * token ID 1 byte * internet address 4 bytes */ -token_t *au_to_in_addr(struct in_addr *internet_addr) +token_t * +au_to_in_addr(struct in_addr *internet_addr) { token_t *t; u_char *dptr = NULL; - if(internet_addr == NULL) { + if (internet_addr == NULL) { errno = EINVAL; - return NULL; + return (NULL); } GET_TOKEN_AREA(t, dptr, 5); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_IN_ADDR); ADD_U_INT32(dptr, internet_addr->s_addr); - return t; + return (t); } /* @@ -363,21 +360,21 @@ * address type/length 4 bytes * Address 16 bytes */ -token_t *au_to_in_addr_ex(struct in6_addr *internet_addr) +token_t * +au_to_in_addr_ex(struct in6_addr *internet_addr) { token_t *t; u_char *dptr = NULL; u_int32_t type = AF_INET6; - if(internet_addr == NULL) { + if (internet_addr == NULL) { errno = EINVAL; - return NULL; + return (NULL); } GET_TOKEN_AREA(t, dptr, 21); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_IN_ADDR_EX); ADD_U_INT32(dptr, type); @@ -386,7 +383,7 @@ ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[2]); ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[3]); - return t; + return (t); } /* @@ -398,15 +395,14 @@ token_t *t; u_char *dptr = NULL; - if(ip == NULL) { + if (ip == NULL) { errno = EINVAL; - return NULL; + return (NULL); } GET_TOKEN_AREA(t, dptr, 21); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_IP); /* @@ -414,7 +410,7 @@ */ ADD_MEM(dptr, ip, sizeof(struct ip)); - return t; + return (t); } /* @@ -422,22 +418,22 @@ * object ID type 1 byte * object ID 4 bytes */ -token_t *au_to_ipc(char type, int id) +token_t * +au_to_ipc(char type, int id) { token_t *t; u_char *dptr = NULL; GET_TOKEN_AREA(t, dptr, 6); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_IPC); ADD_U_CHAR(dptr, type); ADD_U_INT32(dptr, id); - return t; + return (t); } /* @@ -450,26 +446,25 @@ * slot sequence # 4 bytes * key 4 bytes */ -token_t *au_to_ipc_perm(struct ipc_perm *perm) +token_t * +au_to_ipc_perm(struct ipc_perm *perm) { token_t *t; u_char *dptr = NULL; u_int16_t pad0 = 0; - if(perm == NULL) { + if (perm == NULL) { errno = EINVAL; - return NULL; + return (NULL); } GET_TOKEN_AREA(t, dptr, 29); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_IPC_PERM); - /* * Darwin defines the sizes for ipc_perm members * as 2 bytes; BSM defines 4 so pad with 0 @@ -494,7 +489,7 @@ ADD_U_INT32(dptr, perm->key); - return t; + return (t); } @@ -502,62 +497,63 @@ * token ID 1 byte * port IP address 2 bytes */ -token_t *au_to_iport(u_int16_t iport) +token_t * +au_to_iport(u_int16_t iport) { token_t *t; u_char *dptr = NULL; GET_TOKEN_AREA(t, dptr, 3); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_IPORT); ADD_U_INT16(dptr, iport); - return t; + return (t); } /* * token ID 1 byte - * size 2 bytes + * size 2 bytes * data size bytes */ -token_t *au_to_opaque(char *data, u_int16_t bytes) +token_t * +au_to_opaque(char *data, u_int16_t bytes) { token_t *t; u_char *dptr = NULL; - if((data == NULL) || (bytes <= 0)) { + if ((data == NULL) || (bytes <= 0)) { errno = EINVAL; - return NULL; + return (NULL); } GET_TOKEN_AREA(t, dptr, bytes + 3); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_OPAQUE); ADD_U_INT16(dptr, bytes); ADD_MEM(dptr, data, bytes); - return t; + return (t); } /* - * token ID 1 byte - * seconds of time 4 bytes - * milliseconds of time 4 bytes - * file name len 2 bytes - * file pathname N bytes + 1 terminating NULL byte + * token ID 1 byte + * seconds of time 4 bytes + * milliseconds of time 4 bytes + * file name len 2 bytes + * file pathname N bytes + 1 terminating NULL byte */ +token_t * #if defined(KERNEL) || defined(_KERNEL) -token_t *au_to_file(char *file, struct timeval tm) +au_to_file(char *file, struct timeval tm) #else -token_t *au_to_file(char *file) +au_to_file(char *file) #endif { token_t *t; @@ -568,55 +564,51 @@ struct timeval tm; struct timezone tzp; - if(gettimeofday(&tm, &tzp) == -1) { - return NULL; - } + if (gettimeofday(&tm, &tzp) == -1) + return (NULL); #endif - if(file == NULL) { + if (file == NULL) { errno = EINVAL; - return NULL; + return (NULL); } filelen = strlen(file); GET_TOKEN_AREA(t, dptr, filelen + 12); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); filelen += 1; timems = tm.tv_usec/1000; ADD_U_CHAR(dptr, AUT_OTHER_FILE32); ADD_U_INT32(dptr, tm.tv_sec); - ADD_U_INT32(dptr, timems); /* We need time in ms */ + ADD_U_INT32(dptr, timems); /* We need time in ms. */ ADD_U_INT16(dptr, filelen); ADD_STRING(dptr, file, filelen); - return t; - + return (t); } - /* * token ID 1 byte * text length 2 bytes * text N bytes + 1 terminating NULL byte */ -token_t *au_to_text(char *text) +token_t * +au_to_text(char *text) { token_t *t; u_char *dptr = NULL; u_int16_t textlen; - if(text == NULL) { + if (text == NULL) { errno = EINVAL; - return NULL; + return (NULL); } textlen = strlen(text); GET_TOKEN_AREA(t, dptr, textlen + 4); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); textlen += 1; @@ -624,7 +616,7 @@ ADD_U_INT16(dptr, textlen); ADD_STRING(dptr, text, textlen); - return t; + return (t); } /* @@ -632,21 +624,21 @@ * path length 2 bytes * path N bytes + 1 terminating NULL byte */ -token_t *au_to_path(char *text) +token_t * +au_to_path(char *text) { token_t *t; u_char *dptr = NULL; u_int16_t textlen; - if(text == NULL) { + if (text == NULL) { errno = EINVAL; - return NULL; + return (NULL); } textlen = strlen(text); GET_TOKEN_AREA(t, dptr, textlen + 4); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); textlen += 1; @@ -654,7 +646,7 @@ ADD_U_INT16(dptr, textlen); ADD_STRING(dptr, text, textlen); - return t; + return (t); } /* @@ -670,22 +662,21 @@ * port ID 4 bytes/8 bytes (32-bit/64-bit value) * machine address 4 bytes */ -token_t *au_to_process32(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid) +token_t * +au_to_process32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, + pid_t pid, au_asid_t sid, au_tid_t *tid) { token_t *t; u_char *dptr = NULL; - if(tid == NULL) { + if (tid == NULL) { errno = EINVAL; - return NULL; + return (NULL); } GET_TOKEN_AREA(t, dptr, 37); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_PROCESS32); ADD_U_INT32(dptr, auid); @@ -698,24 +689,24 @@ ADD_U_INT32(dptr, tid->port); ADD_U_INT32(dptr, tid->machine); - return t; + return (t); } -token_t *au_to_process64(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid) +token_t * +au_to_process64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, + pid_t pid, au_asid_t sid, au_tid_t *tid) { errno = ENOTSUP; - return NULL; + return (NULL); } -token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_t *tid) +token_t * +au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, + pid_t pid, au_asid_t sid, au_tid_t *tid) { - return au_to_process32(auid, euid, egid, ruid, rgid, pid, - sid, tid); + + return (au_to_process32(auid, euid, egid, ruid, rgid, pid, sid, tid)); } /* @@ -732,22 +723,21 @@ * address type-len 4 bytes * machine address 16 bytes */ -token_t *au_to_process32_ex(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid) +token_t * +au_to_process32_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid) { token_t *t; u_char *dptr = NULL; - if(tid == NULL) { + if (tid == NULL) { errno = EINVAL; - return NULL; + return (NULL); } GET_TOKEN_AREA(t, dptr, 53); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_PROCESS32_EX); ADD_U_INT32(dptr, auid); @@ -764,24 +754,25 @@ ADD_U_INT32(dptr, tid->at_addr[2]); ADD_U_INT32(dptr, tid->at_addr[3]); - return t; + return (t); } -token_t *au_to_process64_ex(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid) +token_t * +au_to_process64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid) { errno = ENOTSUP; - return NULL; + return (NULL); } -token_t *au_to_process_ex(au_id_t auid, uid_t euid, gid_t egid, - uid_t ruid, gid_t rgid, pid_t pid, - au_asid_t sid, au_tid_addr_t *tid) +token_t * +au_to_process_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, + pid_t pid, au_asid_t sid, au_tid_addr_t *tid) { - return au_to_process32_ex(auid, euid, egid, ruid, rgid, - pid, sid, tid); + + return (au_to_process32_ex(auid, euid, egid, ruid, rgid, pid, sid, + tid)); } /* @@ -789,66 +780,65 @@ * error status 1 byte * return value 4 bytes/8 bytes (32-bit/64-bit value) */ -token_t *au_to_return32(char status, u_int32_t ret) +token_t * +au_to_return32(char status, u_int32_t ret) { token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, 6); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_RETURN32); ADD_U_CHAR(dptr, status); ADD_U_INT32(dptr, ret); - return t; + return (t); } -token_t *au_to_return64(char status, u_int64_t ret) +token_t * +au_to_return64(char status, u_int64_t ret) { token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, 10); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_RETURN64); ADD_U_CHAR(dptr, status); ADD_U_INT64(dptr, ret); - return t; + return (t); } -token_t *au_to_return(char status, u_int32_t ret) +token_t * +au_to_return(char status, u_int32_t ret) { - return au_to_return32(status, ret); + + return (au_to_return32(status, ret)); } /* * token ID 1 byte * sequence number 4 bytes */ -token_t *au_to_seq(long audit_count) +token_t * +au_to_seq(long audit_count) { token_t *t; u_char *dptr = NULL; - GET_TOKEN_AREA(t, dptr, 5); - if(t == NULL) { - return NULL; - } + if (t == NULL) + return (NULL); ADD_U_CHAR(dptr, AUT_SEQ); ADD_U_INT32(dptr, audit_count); - return t; + return (t); } /* @@ -859,10 +849,12 @@ * remote port 2 bytes * remote Internet address 4 bytes */ -token_t *au_to_socket(struct socket *so) { +token_t * +au_to_socket(struct socket *so) +{ errno = ENOTSUP; - return NULL; + return (NULL); } /* @@ -875,20 +867,22 @@ * address type/length 4 bytes * remote Internet address 4 bytes/16 bytes (IPv4/IPv6 address) */ -token_t *au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, - struct sockaddr *la, struct sockaddr *ra) +token_t * +au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, struct sockaddr *la, +struct sockaddr *ra) { errno = ENOTSUP; - return NULL; + return (NULL); } -token_t *au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, - struct sockaddr *la, struct sockaddr *ra) +token_t * +au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, struct sockaddr *la, + struct sockaddr *ra) { errno = ENOTSUP; - return NULL; + return (NULL); } /* @@ -896,19 +890,18 @@ * socket family 2 bytes * path 104 bytes */ -token_t *au_to_sock_unix(struct sockaddr_un *so) +token_t * +au_to_sock_unix(struct sockaddr_un *so) { token_t *t; u_char *dptr; - if(so == NULL) { - return NULL; - } + if (so == NULL) + return (NULL); GET_TOKEN_AREA(t, dptr, 107); - if(t == NULL) { - return NULL; - } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 31 11:38:40 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFD3716A420; Tue, 31 May 2005 11:38:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 80EDA16A41C for ; Tue, 31 May 2005 11:38:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49EF943D1D for ; Tue, 31 May 2005 11:38:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4VBcdAA021681 for ; Tue, 31 May 2005 11:38:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4VBccAe021678 for perforce@freebsd.org; Tue, 31 May 2005 11:38:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 May 2005 11:38:38 GMT Message-Id: <200505311138.j4VBccAe021678@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 77764 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 11:38:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=77764 Change 77764 by rwatson@rwatson_paprika on 2005/05/31 11:38:17 Converge on style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#4 (text+ko) ==== @@ -34,14 +34,14 @@ #include /* - * Parse the contents of the audit_user file into au_user_ent structures + * Parse the contents of the audit_user file into au_user_ent structures. */ -static FILE *fp = NULL; -static char linestr[AU_LINE_MAX]; -static char *delim = ":"; +static FILE *fp = NULL; +static char linestr[AU_LINE_MAX]; +static char *delim = ":"; -static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; /* * XXX The reentrant versions of the following functions is TBD @@ -50,39 +50,41 @@ */ /* - * Allocate a user area structure + * Allocate a user area structure. */ -static struct au_user_ent *get_user_area() +static struct au_user_ent * +get_user_area(void) { struct au_user_ent *u; u = (struct au_user_ent *) malloc (sizeof(struct au_user_ent)); - if(u == NULL) { - return NULL; - } + if (u == NULL) + return (NULL); u->au_name = (char *)malloc(AU_USER_NAME_MAX * sizeof(char)); - if(u->au_name == NULL) { + if (u->au_name == NULL) { free(u); - return NULL; + return (NULL); } - return u; + return (u); } /* * Destroy a user area structure */ -static void destroy_user_area(struct au_user_ent *u) +static void +destroy_user_area(struct au_user_ent *u) { + free(u->au_name); free(u); } - /* - * Parse one line from the audit_user file into the au_user_ent structure + * Parse one line from the audit_user file into the au_user_ent structure. */ -static struct au_user_ent *userfromstr(char *str, char *delim, struct au_user_ent *u) +static struct au_user_ent * +userfromstr(char *str, char *delim, struct au_user_ent *u) { char *username, *always, *never; char *last; @@ -91,217 +93,189 @@ always = strtok_r(NULL, delim, &last); never = strtok_r(NULL, delim, &last); - if((username == NULL) - || (always == NULL) - || (never == NULL)) { + if ((username == NULL) || (always == NULL) || (never == NULL)) + return (NULL); - return NULL; - } + if (strlen(username) >= AU_USER_NAME_MAX) + return (NULL); - if(strlen(username) >= AU_USER_NAME_MAX) { - return NULL; - } - strcpy(u->au_name, username); - if(getauditflagsbin(always, &(u->au_always)) == -1) { - return NULL; - } + if (getauditflagsbin(always, &(u->au_always)) == -1) + return (NULL); - if(getauditflagsbin(never, &(u->au_never)) == -1) { - return NULL; - } + if (getauditflagsbin(never, &(u->au_never)) == -1) + return (NULL); - return u; + return (u); } /* * Rewind to beginning of the file */ -void setauuser() +void +setauuser(void) { + pthread_mutex_lock(&mutex); - - if(fp != NULL) { + if (fp != NULL) fseek(fp, 0, SEEK_SET); - } - pthread_mutex_unlock(&mutex); } /* * Close the file descriptor */ -void endauuser() +void +endauuser(void) { + pthread_mutex_lock(&mutex); - - if(fp != NULL) { + if (fp != NULL) { fclose(fp); fp = NULL; } - pthread_mutex_unlock(&mutex); } /* * Enumerate the au_user_ent structures from the file */ -struct au_user_ent *getauuserent() +struct au_user_ent * +getauuserent(void) { struct au_user_ent *u; char *nl; pthread_mutex_lock(&mutex); - if((fp == NULL) - && ((fp = fopen(AUDIT_USER_FILE, "r")) == NULL)) { - + if ((fp == NULL) && ((fp = fopen(AUDIT_USER_FILE, "r")) == NULL)) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } - if(fgets(linestr, AU_LINE_MAX, fp) == NULL) { - + if (fgets(linestr, AU_LINE_MAX, fp) == NULL) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } - /* Remove new lines */ - if((nl = strrchr(linestr, '\n')) != NULL) { + + /* Remove new lines. */ + if ((nl = strrchr(linestr, '\n')) != NULL) *nl = '\0'; - } u = get_user_area(); - if(u == NULL) { - + if (u == NULL) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } - /* Get the next structure */ - if(userfromstr(linestr, delim, u) == NULL) { - + /* Get the next structure. */ + if (userfromstr(linestr, delim, u) == NULL) { destroy_user_area(u); - pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } pthread_mutex_unlock(&mutex); - return u; + return (u); } /* - * Find a au_user_ent structure matching the given user name + * Find a au_user_ent structure matching the given user name. */ -struct au_user_ent *getauusernam(const char *name) +struct au_user_ent * +getauusernam(const char *name) { struct au_user_ent *u; char *nl; - if(name == NULL) { - return NULL; - } + if (name == NULL) + return (NULL); setauuser(); pthread_mutex_lock(&mutex); - if((fp == NULL) - && ((fp = fopen(AUDIT_USER_FILE, "r")) == NULL)) { - + if ((fp == NULL) && ((fp = fopen(AUDIT_USER_FILE, "r")) == NULL)) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } u = get_user_area(); - if(u == NULL) { - + if (u == NULL) { pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } - while(fgets(linestr, AU_LINE_MAX, fp) != NULL) { - /* Remove new lines */ - if((nl = strrchr(linestr, '\n')) != NULL) { + while (fgets(linestr, AU_LINE_MAX, fp) != NULL) { + /* Remove new lines. */ + if ((nl = strrchr(linestr, '\n')) != NULL) *nl = '\0'; - } - if(userfromstr(linestr, delim, u) != NULL) { - if(!strcmp(name, u->au_name)) { - + if (userfromstr(linestr, delim, u) != NULL) { + if (!strcmp(name, u->au_name)) { pthread_mutex_unlock(&mutex); - return u; + return (u); } } } destroy_user_area(u); - pthread_mutex_unlock(&mutex); - return NULL; + return (NULL); } /* - * Read the default system wide audit classes from audit_control, - * combine with the per-user audit class and update the - * binary preselection mask + * Read the default system wide audit classes from audit_control, combine with + * the per-user audit class and update the binary preselection mask. */ -int au_user_mask(char *username, au_mask_t *mask_p) +int +au_user_mask(char *username, au_mask_t *mask_p) { struct au_user_ent *u; char auditstring[MAX_AUDITSTRING_LEN + 1]; - /* get user mask */ - if((u = getauusernam(username)) != NULL) { - - if(-1 == getfauditflags(&u->au_always, &u->au_never, mask_p)) { - return -1; - } - - return 0; + /* Get user mask. */ + if ((u = getauusernam(username)) != NULL) { + if (-1 == getfauditflags(&u->au_always, &u->au_never, mask_p)) + return (-1); + return (0); } - /* read the default system mask */ - if(getacflg(auditstring, MAX_AUDITSTRING_LEN) == 0) { - if(-1 == getauditflagsbin(auditstring, mask_p)) { - return -1; - } - return 0; + /* Read the default system mask. */ + if (getacflg(auditstring, MAX_AUDITSTRING_LEN) == 0) { + if (-1 == getauditflagsbin(auditstring, mask_p)) + return (-1); + return (0); } - /* No masks defined */ - return -1; + /* No masks defined. */ + return (-1); } /* - * Generate the process audit state by combining the audit maks - * passed as parameters with the sustem audit masks + * Generate the process audit state by combining the audit maks passed as + * parameters with the sustem audit masks. */ -int getfauditflags(au_mask_t *usremask, au_mask_t *usrdmask, - au_mask_t *lastmask) +int +getfauditflags(au_mask_t *usremask, au_mask_t *usrdmask, au_mask_t *lastmask) { char auditstring[MAX_AUDITSTRING_LEN + 1]; - if((usremask == NULL) - || (usrdmask == NULL) - || (lastmask == NULL)) { + if ((usremask == NULL) || (usrdmask == NULL) || (lastmask == NULL)) + return (-1); - return -1; - } - lastmask->am_success = 0; lastmask->am_failure = 0; /* get the system mask */ - if(getacflg(auditstring, MAX_AUDITSTRING_LEN) == 0) { + if (getacflg(auditstring, MAX_AUDITSTRING_LEN) == 0) getauditflagsbin(auditstring, lastmask); - } ADDMASK(lastmask, usremask); SUBMASK(lastmask, usrdmask); - return 0; + return (0); } /* From owner-p4-projects@FreeBSD.ORG Tue May 31 12:04:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6556916A438; Tue, 31 May 2005 12:04:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A387316A456 for ; Tue, 31 May 2005 12:04:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F398B43D54 for ; Tue, 31 May 2005 12:04:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4VC4Aws022654 for ; Tue, 31 May 2005 12:04:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4VC4AI1022651 for perforce@freebsd.org; Tue, 31 May 2005 12:04:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 May 2005 12:04:10 GMT Message-Id: <200505311204.j4VC4AI1022651@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 77766 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 12:04:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=77766 Change 77766 by rwatson@rwatson_paprika on 2005/05/31 12:03:53 Converge on BSD style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#8 (text+ko) ==== @@ -46,26 +46,25 @@ struct stat st; if (p == NULL) - return kAUBadParamErr; + return (kAUBadParamErr); *p = NODEV; /* for /usr/bin/login, try fstat() first */ - if (fstat(STDIN_FILENO, &st) != 0) - { - if (errno != EBADF) - { - syslog(LOG_ERR, "fstat() failed (%s)", strerror(errno)); - return kAUStatErr; + if (fstat(STDIN_FILENO, &st) != 0) { + if (errno != EBADF) { + syslog(LOG_ERR, "fstat() failed (%s)", + strerror(errno)); + return (kAUStatErr); } - if (stat("/dev/console", &st) != 0) - { - syslog(LOG_ERR, "stat() failed (%s)", strerror(errno)); - return kAUStatErr; + if (stat("/dev/console", &st) != 0) { + syslog(LOG_ERR, "stat() failed (%s)", + strerror(errno)); + return (kAUStatErr); } } *p = st.st_rdev; - return kAUNoErr; + return (kAUNoErr); } int @@ -75,15 +74,14 @@ size_t len; if (m == NULL) - return kAUBadParamErr; + return (kAUBadParamErr); *m = 0; len = sizeof(*m); - if (sysctl(name, 2, m, &len, NULL, 0) != 0) - { + if (sysctl(name, 2, m, &len, NULL, 0) != 0) { syslog(LOG_ERR, "sysctl() failed (%s)", strerror(errno)); - return kAUSysctlErr; + return (kAUSysctlErr); } - return kAUNoErr; + return (kAUNoErr); } int @@ -92,17 +90,16 @@ int ret; if (tid == NULL) - return kAUBadParamErr; + return (kAUBadParamErr); if ((ret = audit_set_terminal_port(&tid->port)) != kAUNoErr) - return ret; - return audit_set_terminal_host(&tid->machine); + return (ret); + return (audit_set_terminal_host(&tid->machine)); } - /* - * This is OK for those callers who have only one token to write. If you - * have multiple tokens that logically form part of the same audit record, - * you need to use the existing au_open()/au_write()/au_close() API: + * This is OK for those callers who have only one token to write. If you have + * multiple tokens that logically form part of the same audit record, you need + * to use the existing au_open()/au_write()/au_close() API: * * aufd = au_open(); * tok = au_to_random_token_1(...); @@ -115,65 +112,65 @@ * Assumes, like all wrapper calls, that the caller has previously checked * that auditing is enabled via the audit_get_state() call. * - * XXX Should be more robust against bad arguments + * XXX: Should be more robust against bad arguments. */ int -audit_write(short event_code, token_t *subject, token_t *misctok, char - retval, int errcode) +audit_write(short event_code, token_t *subject, token_t *misctok, char retval, + int errcode) { - int aufd; - char *func = "audit_write()"; - token_t *rettok; + int aufd; + char *func = "audit_write()"; + token_t *rettok; - if ((aufd = au_open()) == -1) - { + if ((aufd = au_open()) == -1) { au_free_token(subject); au_free_token(misctok); syslog(LOG_ERR, "%s: au_open() failed", func); - return kAUOpenErr; - } - /* save subject */ - if (subject && au_write(aufd, subject) == -1) - { + return (kAUOpenErr); + } + + /* Save subject. */ + if (subject && au_write(aufd, subject) == -1) { au_free_token(subject); au_free_token(misctok); (void)au_close(aufd, 0, event_code); syslog(LOG_ERR, "%s: write of subject failed", func); - return kAUWriteSubjectTokErr; - } - /* save the event-specific token */ - if (misctok && au_write(aufd, misctok) == -1) - { + return (kAUWriteSubjectTokErr); + } + + /* Save the event-specific token. */ + if (misctok && au_write(aufd, misctok) == -1) { au_free_token(misctok); (void)au_close(aufd, 0, event_code); syslog(LOG_ERR, "%s: write of caller token failed", func); - return kAUWriteCallerTokErr; - } - /* tokenize and save the return value */ - if ((rettok = au_to_return32(retval, errcode)) == NULL) - { + return (kAUWriteCallerTokErr); + } + + /* Tokenize and save the return value. */ + if ((rettok = au_to_return32(retval, errcode)) == NULL) { (void)au_close(aufd, 0, event_code); syslog(LOG_ERR, "%s: au_to_return32() failed", func); - return kAUMakeReturnTokErr; - } - if (au_write(aufd, rettok) == -1) - { + return (kAUMakeReturnTokErr); + } + + if (au_write(aufd, rettok) == -1) { au_free_token(rettok); (void)au_close(aufd, 0, event_code); syslog(LOG_ERR, "%s: write of return code failed", func); - return kAUWriteReturnTokErr; - } - /* - * au_close()'s second argument is "keep": if keep == 0, the record is - * discarded. We assume the caller wouldn't have bothered with this - * function if it hadn't already decided to keep the record. - */ - if (au_close(aufd, 1, event_code) < 0) - { + return (kAUWriteReturnTokErr); + } + + /* + * au_close()'s second argument is "keep": if keep == 0, the record is + * discarded. We assume the caller wouldn't have bothered with this + * function if it hadn't already decided to keep the record. + */ + if (au_close(aufd, 1, event_code) < 0) { syslog(LOG_ERR, "%s: au_close() failed", func); - return kAUCloseErr; - } - return kAUNoErr; + return (kAUCloseErr); + } + + return (kAUNoErr); } /* @@ -181,21 +178,22 @@ * assumes success; use audit_write_failure() on error. */ int -audit_write_success(short event_code, token_t *tok, au_id_t auid, - uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, - pid_t pid, au_asid_t sid, au_tid_t *tid) +audit_write_success(short event_code, token_t *tok, au_id_t auid, uid_t euid, + gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, + au_tid_t *tid) { - char *func = "audit_write_success()"; - token_t *subject = NULL; + char *func = "audit_write_success()"; + token_t *subject = NULL; + + /* Tokenize and save subject. */ + subject = au_to_subject32(auid, euid, egid, ruid, rgid, pid, sid, + tid); + if (subject == NULL) { + syslog(LOG_ERR, "%s: au_to_subject32() failed", func); + return kAUMakeSubjectTokErr; + } - /* tokenize and save subject */ - subject = au_to_subject32(auid, euid, egid, ruid, rgid, pid, sid, tid); - if (subject == NULL) - { - syslog(LOG_ERR, "%s: au_to_subject32() failed", func); - return kAUMakeSubjectTokErr; - } - return audit_write(event_code, subject, tok, 0, 0); + return (audit_write(event_code, subject, tok, 0, 0)); } /* @@ -205,15 +203,15 @@ int audit_write_success_self(short event_code, token_t *tok) { - token_t *subject; - char *func = "audit_write_success_self()"; + token_t *subject; + char *func = "audit_write_success_self()"; + + if ((subject = au_to_me()) == NULL) { + syslog(LOG_ERR, "%s: au_to_me() failed", func); + return (kAUMakeSubjectTokErr); + } - if ((subject = au_to_me()) == NULL) - { - syslog(LOG_ERR, "%s: au_to_me() failed", func); - return kAUMakeSubjectTokErr; - } - return audit_write(event_code, subject, tok, 0, 0); + return (audit_write(event_code, subject, tok, 0, 0)); } /* @@ -224,26 +222,26 @@ * hard-coding -1. */ int -audit_write_failure(short event_code, char *errmsg, int errcode, - au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, - gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid) +audit_write_failure(short event_code, char *errmsg, int errcode, au_id_t auid, + uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, + au_tid_t *tid) { - char *func = "audit_write_failure()"; - token_t *subject, *errtok; + char *func = "audit_write_failure()"; + token_t *subject, *errtok; + + subject = au_to_subject32(auid, euid, egid, ruid, rgid, pid, sid, tid); + if (subject == NULL) { + syslog(LOG_ERR, "%s: au_to_subject32() failed", func); + return (kAUMakeSubjectTokErr); + } + + /* tokenize and save the error message */ + if ((errtok = au_to_text(errmsg)) == NULL) { + syslog(LOG_ERR, "%s: au_to_text() failed", func); + return (kAUMakeTextTokErr); + } - subject = au_to_subject32(auid, euid, egid, ruid, rgid, pid, sid, tid); - if (subject == NULL) - { - syslog(LOG_ERR, "%s: au_to_subject32() failed", func); - return kAUMakeSubjectTokErr; - } - /* tokenize and save the error message */ - if ((errtok = au_to_text(errmsg)) == NULL) - { - syslog(LOG_ERR, "%s: au_to_text() failed", func); - return kAUMakeTextTokErr; - } - return audit_write(event_code, subject, errtok, -1, errcode); + return (audit_write(event_code, subject, errtok, -1, errcode)); } /* @@ -256,21 +254,19 @@ int audit_write_failure_self(short event_code, char *errmsg, int errret) { - char *func = "audit_write_failure_self()"; - token_t *subject, *errtok; + char *func = "audit_write_failure_self()"; + token_t *subject, *errtok; - if ((subject = au_to_me()) == NULL) - { - syslog(LOG_ERR, "%s: au_to_me() failed", func); - return kAUMakeSubjectTokErr; - } - /* tokenize and save the error message */ - if ((errtok = au_to_text(errmsg)) == NULL) - { - syslog(LOG_ERR, "%s: au_to_text() failed", func); - return kAUMakeTextTokErr; - } - return audit_write(event_code, subject, errtok, -1, errret); + if ((subject = au_to_me()) == NULL) { + syslog(LOG_ERR, "%s: au_to_me() failed", func); + return (kAUMakeSubjectTokErr); + } + /* tokenize and save the error message */ + if ((errtok = au_to_text(errmsg)) == NULL) { + syslog(LOG_ERR, "%s: au_to_text() failed", func); + return (kAUMakeTextTokErr); + } + return (audit_write(event_code, subject, errtok, -1, errret)); } /* @@ -281,29 +277,23 @@ * that auditing is enabled via the audit_get_state() call. */ int -audit_write_failure_na(short event_code, char *errmsg, int errret, - uid_t euid, uid_t egid, pid_t pid, au_tid_t *tid) +audit_write_failure_na(short event_code, char *errmsg, int errret, uid_t euid, + uid_t egid, pid_t pid, au_tid_t *tid) { - return audit_write_failure(event_code, errmsg, errret, -1, euid, - egid, -1, -1, pid, -1, tid); + + return (audit_write_failure(event_code, errmsg, errret, -1, euid, + egid, -1, -1, pid, -1, tid)); } - /* END OF au_write() WRAPPERS */ #ifdef __APPLE__ void -audit_token_to_au32( - audit_token_t atoken, - uid_t *auidp, - uid_t *euidp, - gid_t *egidp, - uid_t *ruidp, - gid_t *rgidp, - pid_t *pidp, - au_asid_t *asidp, - au_tid_t *tidp) +audit_token_to_au32(audit_token_t atoken, uid_t *auidp, uid_t *euidp, + gid_t *egidp, uid_t *ruidp, gid_t *rgidp, pid_t *pidp, au_asid_t *asidp, + au_tid_t *tidp) { + if (auidp != NULL) *auidp = (uid_t)atoken.val[0]; if (euidp != NULL) From owner-p4-projects@FreeBSD.ORG Tue May 31 19:00:40 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90E9B16A420; Tue, 31 May 2005 19:00:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E77B16A41C for ; Tue, 31 May 2005 19:00:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28AEC43D1F for ; Tue, 31 May 2005 19:00:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4VJ0dE5058806 for ; Tue, 31 May 2005 19:00:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4VJ0ckq058803 for perforce@freebsd.org; Tue, 31 May 2005 19:00:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 May 2005 19:00:38 GMT Message-Id: <200505311900.j4VJ0ckq058803@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 77777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 19:00:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=77777 Change 77777 by rwatson@rwatson_tislabs on 2005/05/31 19:00:28 Spell Panther more accurately. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/bootstrap_instructions.txt#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/bootstrap_instructions.txt#7 (text+ko) ==== @@ -1,7 +1,7 @@ These are still draft install instructions, and known to be potentially flakey. Caution advised, especially near the end. -Step 1: Mac OS X Jaguar 10.3.3 +Step 1: Mac OS X Panther 10.3.3 Install Panther from your installation medium. In our environment, we typically install 10.3.0 (the Black Panther CDs), then use From owner-p4-projects@FreeBSD.ORG Tue May 31 19:32:18 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D592C16A420; Tue, 31 May 2005 19:32:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B06ED16A41C for ; Tue, 31 May 2005 19:32:17 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D55343D48 for ; Tue, 31 May 2005 19:32:17 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4VJWHZc060379 for ; Tue, 31 May 2005 19:32:17 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4VJWHuw060376 for perforce@freebsd.org; Tue, 31 May 2005 19:32:17 GMT (envelope-from areisse@nailabs.com) Date: Tue, 31 May 2005 19:32:17 GMT Message-Id: <200505311932.j4VJWHuw060376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 77778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 19:32:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=77778 Change 77778 by areisse@areisse_ibook on 2005/05/31 19:31:22 Makefile changes for libsepol (config, don't build shared libraries, install in export directory). You must have a manually installed sys/endian.h to build this currently. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/src/Makefile#2 (text+ko) ==== @@ -1,3 +1,5 @@ +include ../../../Makeconfig + # Installation directories. PREFIX ?= $(DESTDIR)/usr LIBDIR ?= $(PREFIX)/lib @@ -8,21 +10,15 @@ # Set to y for MLS MLS=n -.if $(MLS) == "y" -OPTIONS = -DCONFIG_SECURITY_SELINUX_MLS -.else -OPTIONS = -.endif - LIBA=libsepol.a -TARGET=libsepol.so -LIBSO=$(TARGET).$(LIBVERSION) +#TARGET=libsepol.so +#LIBSO=$(TARGET).$(LIBVERSION) OBJS= $(patsubst %.c,%.o,$(wildcard *.c)) -LOBJS= $(patsubst %.c,%.lo,$(wildcard *.c)) +#LOBJS= $(patsubst %.c,%.lo,$(wildcard *.c)) CFLAGS = -Wall $(OPTIONS) override CFLAGS += -I. -I../include -all: $(LIBA) $(LIBSO) +all: $(LIBA) $(LIBA): $(OBJS) $(AR) rcs $@ $^ @@ -41,9 +37,9 @@ install: all test -d $(LIBDIR) || install -m 755 -d $(LIBDIR) install -m 644 $(LIBA) $(LIBDIR) - test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) - install -m 755 $(LIBSO) $(SHLIBDIR) - cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) +# test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) +# install -m 755 $(LIBSO) $(SHLIBDIR) +# cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) clean: rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(TARGET) From owner-p4-projects@FreeBSD.ORG Tue May 31 21:10:18 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79D9A16A420; Tue, 31 May 2005 21:10:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C59816A41C for ; Tue, 31 May 2005 21:10:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27A7443D54 for ; Tue, 31 May 2005 21:10:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4VLAHMp072622 for ; Tue, 31 May 2005 21:10:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4VLAG3T072610 for perforce@freebsd.org; Tue, 31 May 2005 21:10:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 May 2005 21:10:16 GMT Message-Id: <200505312110.j4VLAG3T072610@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 77782 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 21:10:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=77782 Change 77782 by rwatson@rwatson_tislabs on 2005/05/31 21:09:27 Add some of the dsep-20050331 drop documentation, such as building, installing, and debugging instructions. These were not imported in earlier DSEP imports. Affected files ... .. //depot/projects/trustedbsd/dsep/docs/build-instructions.txt#1 add .. //depot/projects/trustedbsd/dsep/docs/debugging-xnu.txt#1 add .. //depot/projects/trustedbsd/dsep/docs/ipctrace.txt#1 add .. //depot/projects/trustedbsd/dsep/docs/macmls.txt#1 add .. //depot/projects/trustedbsd/dsep/docs/sedarwin.txt#1 add .. //depot/projects/trustedbsd/dsep/docs/system-setup.txt#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 31 21:24:39 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2AAA16A420; Tue, 31 May 2005 21:24:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5FDD916A41C for ; Tue, 31 May 2005 21:24:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B02943D58 for ; Tue, 31 May 2005 21:24:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4VLOcJt073458 for ; Tue, 31 May 2005 21:24:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4VLObdd073439 for perforce@freebsd.org; Tue, 31 May 2005 21:24:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 31 May 2005 21:24:37 GMT Message-Id: <200505312124.j4VLObdd073439@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 77785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 21:24:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=77785 Change 77785 by rwatson@rwatson_tislabs on 2005/05/31 21:23:42 Integrate documentation addition from vendor DSEP branch (dsep 20050331 drop) to the SEDarwin7 branch using trustedbsd_dsep. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/docs/build-instructions.txt#1 branch .. //depot/projects/trustedbsd/sedarwin7/docs/debugging-xnu.txt#1 branch .. //depot/projects/trustedbsd/sedarwin7/docs/ipctrace.txt#1 branch .. //depot/projects/trustedbsd/sedarwin7/docs/macmls.txt#1 branch .. //depot/projects/trustedbsd/sedarwin7/docs/sedarwin.txt#1 branch .. //depot/projects/trustedbsd/sedarwin7/docs/system-setup.txt#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 31 21:57:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 853DB16A422; Tue, 31 May 2005 21:57:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C2DE16A41C for ; Tue, 31 May 2005 21:57:20 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38D5D43D1D for ; Tue, 31 May 2005 21:57:20 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4VLvK1x075327 for ; Tue, 31 May 2005 21:57:20 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4VLvJSe075324 for perforce@freebsd.org; Tue, 31 May 2005 21:57:19 GMT (envelope-from areisse@nailabs.com) Date: Tue, 31 May 2005 21:57:19 GMT Message-Id: <200505312157.j4VLvJSe075324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 77791 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 21:57:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=77791 Change 77791 by areisse@areisse_ibook on 2005/05/31 21:57:18 Merge checkpolicy changes from selinux version 2004081908. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.8#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.c#2 integrate .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.h#2 integrate .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_parse.y#2 integrate .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_scan.l#2 integrate .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/queue.c#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/queue.h#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/write.c#2 delete Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_parse.y#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_scan.l#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jun 1 08:49:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9422316A420; Wed, 1 Jun 2005 08:49:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62F9216A41C for ; Wed, 1 Jun 2005 08:49:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 262AA43D4C for ; Wed, 1 Jun 2005 08:49:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j518nAw1021777 for ; Wed, 1 Jun 2005 08:49:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j518n9vB021774 for perforce@freebsd.org; Wed, 1 Jun 2005 08:49:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 Jun 2005 08:49:09 GMT Message-Id: <200506010849.j518n9vB021774@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 77803 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2005 08:49:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=77803 Change 77803 by rwatson@rwatson_tislabs on 2005/06/01 08:49:02 Integrate netperf_socket from FreeBSD CVS HEAD: - System call table format now contain an audit event field. - PCI tweakage. - VA_EXECVE_ATIME. - Some initial AIO locking. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/linux/linux_proto.h#8 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_syscall.h#8 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_sysent.c#8 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#9 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_proto.h#5 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_syscall.h#5 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_sysent.c#5 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/syscalls.master#5 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/netperf_socket/sys/boot/alpha/common/main.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/devicename.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/libalpha.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/srmdisk.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/common/loader.8#13 integrate .. //depot/projects/netperf_socket/sys/boot/ficl/Makefile#6 integrate .. //depot/projects/netperf_socket/sys/boot/i386/loader/Makefile#5 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#13 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#13 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscalls.c#13 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_sysent.c#13 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.master#12 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_proto.h#4 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_syscall.h#4 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_syscallnames.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sysent.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/syscalls.master#4 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#36 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#21 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aacreg.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#19 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scvgarndr.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#16 integrate .. //depot/projects/netperf_socket/sys/i386/i386/ptrace_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_proto.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_syscall.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_sysent.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/syscalls.master#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/ptrace.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/reg.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_proto.h#8 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_syscall.h#8 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_sysent.c#8 integrate .. //depot/projects/netperf_socket/sys/i386/linux/syscalls.master#8 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#19 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exec.c#24 integrate .. //depot/projects/netperf_socket/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#19 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#19 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_aio.c#14 integrate .. //depot/projects/netperf_socket/sys/sys/_pthreadtypes.h#1 branch .. //depot/projects/netperf_socket/sys/sys/proc.h#35 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#18 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#18 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#18 integrate .. //depot/projects/netperf_socket/sys/sys/types.h#9 integrate .. //depot/projects/netperf_socket/sys/sys/vnode.h#20 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#18 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/linux/linux_proto.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.20 2005/03/07 00:23:58 sobomax Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.60 2005/03/07 00:18:06 sobomax Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.21 2005/05/30 15:20:17 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.62 2005/05/30 15:09:16 rwatson Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/netperf_socket/sys/alpha/linux/linux_syscall.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.18 2005/03/07 00:23:58 sobomax Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.60 2005/03/07 00:18:06 sobomax Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.19 2005/05/30 15:20:17 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.62 2005/05/30 15:09:16 rwatson Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/netperf_socket/sys/alpha/linux/linux_sysent.c#8 (text+ko) ==== @@ -2,10 +2,11 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.18 2005/03/07 00:23:58 sobomax Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.60 2005/03/07 00:18:06 sobomax Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.19 2005/05/30 15:20:17 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.62 2005/05/30 15:09:16 rwatson Exp */ +#include #include "opt_compat.h" #include #include @@ -19,382 +20,382 @@ /* The casts are bogus but will do for now. */ struct sysent linux_sysent[] = { #define nosys linux_nosys - { 0, (sy_call_t *)nosys }, /* 0 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork }, /* 2 = linux_fork */ - { SYF_MPSAFE | AS(read_args), (sy_call_t *)read }, /* 3 = read */ - { SYF_MPSAFE | AS(write_args), (sy_call_t *)write }, /* 4 = write */ - { 0, (sy_call_t *)nosys }, /* 5 = */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */ - { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */ - { 0, (sy_call_t *)nosys }, /* 8 = */ - { AS(linux_link_args), (sy_call_t *)linux_link }, /* 9 = linux_link */ - { AS(linux_unlink_args), (sy_call_t *)linux_unlink }, /* 10 = linux_unlink */ - { 0, (sy_call_t *)nosys }, /* 11 = */ - { AS(linux_chdir_args), (sy_call_t *)linux_chdir }, /* 12 = linux_chdir */ - { AS(fchdir_args), (sy_call_t *)fchdir }, /* 13 = fchdir */ - { AS(linux_mknod_args), (sy_call_t *)linux_mknod }, /* 14 = linux_mknod */ - { AS(linux_chmod_args), (sy_call_t *)linux_chmod }, /* 15 = linux_chmod */ - { AS(linux_chown_args), (sy_call_t *)linux_chown }, /* 16 = linux_chown */ - { AS(linux_brk_args), (sy_call_t *)linux_brk }, /* 17 = linux_brk */ - { 0, (sy_call_t *)nosys }, /* 18 = */ - { AS(linux_lseek_args), (sy_call_t *)linux_lseek }, /* 19 = linux_lseek */ - { 0, (sy_call_t *)getpid }, /* 20 = getpid */ - { 0, (sy_call_t *)nosys }, /* 21 = osf1_mount */ - { AS(linux_umount_args), (sy_call_t *)linux_umount }, /* 22 = linux_umount */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid }, /* 23 = setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid }, /* 24 = getuid */ - { 0, (sy_call_t *)nosys }, /* 25 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace }, /* 26 = linux_ptrace */ - { 0, (sy_call_t *)nosys }, /* 27 = */ - { 0, (sy_call_t *)nosys }, /* 28 = */ - { 0, (sy_call_t *)nosys }, /* 29 = */ - { 0, (sy_call_t *)nosys }, /* 30 = */ - { 0, (sy_call_t *)nosys }, /* 31 = */ - { 0, (sy_call_t *)nosys }, /* 32 = */ - { AS(linux_access_args), (sy_call_t *)linux_access }, /* 33 = linux_access */ - { 0, (sy_call_t *)nosys }, /* 34 = */ - { 0, (sy_call_t *)nosys }, /* 35 = */ - { 0, (sy_call_t *)sync }, /* 36 = sync */ - { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill }, /* 37 = linux_kill */ - { 0, (sy_call_t *)nosys }, /* 38 = */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid }, /* 39 = setpgid */ - { 0, (sy_call_t *)nosys }, /* 40 = */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup }, /* 41 = dup */ - { SYF_MPSAFE | 0, (sy_call_t *)pipe }, /* 42 = pipe */ - { 0, (sy_call_t *)nosys }, /* 43 = osf_set_program_attributes */ - { 0, (sy_call_t *)nosys }, /* 44 = */ - { AS(linux_open_args), (sy_call_t *)linux_open }, /* 45 = linux_open */ - { 0, (sy_call_t *)nosys }, /* 46 = */ - { SYF_MPSAFE | 0, (sy_call_t *)getgid }, /* 47 = getgid */ - { SYF_MPSAFE | AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask }, /* 48 = osf1_sigprocmask */ - { 0, (sy_call_t *)nosys }, /* 49 = */ - { 0, (sy_call_t *)nosys }, /* 50 = */ - { AS(acct_args), (sy_call_t *)acct }, /* 51 = acct */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sigpending }, /* 52 = linux_sigpending */ - { 0, (sy_call_t *)nosys }, /* 53 = */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl }, /* 54 = linux_ioctl */ - { 0, (sy_call_t *)nosys }, /* 55 = */ - { 0, (sy_call_t *)nosys }, /* 56 = */ - { AS(linux_symlink_args), (sy_call_t *)linux_symlink }, /* 57 = linux_symlink */ - { AS(linux_readlink_args), (sy_call_t *)linux_readlink }, /* 58 = linux_readlink */ - { AS(linux_execve_args), (sy_call_t *)linux_execve }, /* 59 = linux_execve */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot }, /* 61 = chroot */ - { 0, (sy_call_t *)nosys }, /* 62 = */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp }, /* 63 = getpgrp */ - { 0, (sy_call_t *)linux_getpagesize }, /* 64 = linux_getpagesize */ - { 0, (sy_call_t *)nosys }, /* 65 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork }, /* 66 = linux_vfork */ - { AS(linux_newstat_args), (sy_call_t *)linux_newstat }, /* 67 = linux_newstat */ - { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat }, /* 68 = linux_newlstat */ - { 0, (sy_call_t *)nosys }, /* 69 = */ - { 0, (sy_call_t *)nosys }, /* 70 = */ - { AS(linux_mmap_args), (sy_call_t *)linux_mmap }, /* 71 = linux_mmap */ - { 0, (sy_call_t *)nosys }, /* 72 = */ - { AS(linux_munmap_args), (sy_call_t *)linux_munmap }, /* 73 = linux_munmap */ - { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect }, /* 74 = linux_mprotect */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise }, /* 75 = madvise */ - { 0, (sy_call_t *)linux_vhangup }, /* 76 = linux_vhangup */ - { 0, (sy_call_t *)nosys }, /* 77 = */ - { 0, (sy_call_t *)nosys }, /* 78 = */ - { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups }, /* 79 = linux_setgroups */ - { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups }, /* 80 = linux_getgroups */ - { 0, (sy_call_t *)nosys }, /* 81 = */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid }, /* 82 = setpgid */ - { AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer }, /* 83 = osf1_setitimer */ - { 0, (sy_call_t *)nosys }, /* 84 = */ - { 0, (sy_call_t *)nosys }, /* 85 = */ - { 0, (sy_call_t *)nosys }, /* 86 = osf_getitimer */ - { 0, (sy_call_t *)linux_gethostname }, /* 87 = linux_gethostname */ - { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname }, /* 88 = osethostname */ - { 0, (sy_call_t *)linux_getdtablesize }, /* 89 = linux_getdtablesize */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2 }, /* 90 = dup2 */ - { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat }, /* 91 = linux_newfstat */ - { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl }, /* 92 = linux_fcntl */ - { AS(osf1_select_args), (sy_call_t *)osf1_select }, /* 93 = osf1_select */ - { AS(poll_args), (sy_call_t *)poll }, /* 94 = poll */ - { AS(fsync_args), (sy_call_t *)fsync }, /* 95 = fsync */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority }, /* 96 = setpriority */ - { AS(osf1_socket_args), (sy_call_t *)osf1_socket }, /* 97 = osf1_socket */ - { AS(linux_connect_args), (sy_call_t *)linux_connect }, /* 98 = linux_connect */ - { AS(accept_args), (sy_call_t *)oaccept }, /* 99 = accept */ - { 0, (sy_call_t *)nosys }, /* 100 = osf_getpriority */ - { AS(osend_args), (sy_call_t *)osend }, /* 101 = osend */ - { AS(orecv_args), (sy_call_t *)orecv }, /* 102 = orecv */ - { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn }, /* 103 = osf1_sigreturn */ - { AS(bind_args), (sy_call_t *)bind }, /* 104 = bind */ - { AS(setsockopt_args), (sy_call_t *)setsockopt }, /* 105 = setsockopt */ - { AS(listen_args), (sy_call_t *)listen }, /* 106 = listen */ - { 0, (sy_call_t *)nosys }, /* 107 = */ - { 0, (sy_call_t *)nosys }, /* 108 = */ - { 0, (sy_call_t *)nosys }, /* 109 = */ - { 0, (sy_call_t *)nosys }, /* 110 = */ - { SYF_MPSAFE | AS(osf1_sigsuspend_args), (sy_call_t *)osf1_sigsuspend }, /* 111 = osf1_sigsuspend */ - { 0, (sy_call_t *)nosys }, /* 112 = osf_sigstack */ - { 0, (sy_call_t *)linux_recvmsg }, /* 113 = linux_recvmsg */ - { 0, (sy_call_t *)linux_sendmsg }, /* 114 = linux_sendmsg */ - { 0, (sy_call_t *)nosys }, /* 115 = */ - { SYF_MPSAFE | AS(osf1_gettimeofday_args), (sy_call_t *)osf1_gettimeofday }, /* 116 = osf1_gettimeofday */ - { AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage }, /* 117 = osf1_getrusage */ - { AS(getsockopt_args), (sy_call_t *)getsockopt }, /* 118 = getsockopt */ - { 0, (sy_call_t *)nosys }, /* 119 = */ - { AS(readv_args), (sy_call_t *)readv }, /* 120 = readv */ - { AS(writev_args), (sy_call_t *)writev }, /* 121 = writev */ - { 0, (sy_call_t *)nosys }, /* 122 = osf_settimeofday */ - { AS(fchown_args), (sy_call_t *)fchown }, /* 123 = fchown */ - { AS(fchmod_args), (sy_call_t *)fchmod }, /* 124 = fchmod */ - { AS(recvfrom_args), (sy_call_t *)orecvfrom }, /* 125 = recvfrom */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid }, /* 126 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid }, /* 127 = setregid */ - { AS(linux_rename_args), (sy_call_t *)linux_rename }, /* 128 = linux_rename */ - { AS(linux_truncate_args), (sy_call_t *)linux_truncate }, /* 129 = linux_truncate */ - { AS(oftruncate_args), (sy_call_t *)oftruncate }, /* 130 = oftruncate */ - { AS(flock_args), (sy_call_t *)flock }, /* 131 = flock */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid }, /* 132 = setgid */ - { AS(osf1_sendto_args), (sy_call_t *)osf1_sendto }, /* 133 = osf1_sendto */ - { AS(shutdown_args), (sy_call_t *)shutdown }, /* 134 = shutdown */ - { 0, (sy_call_t *)linux_socketpair }, /* 135 = linux_socketpair */ - { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir }, /* 136 = linux_mkdir */ - { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir }, /* 137 = linux_rmdir */ - { AS(utimes_args), (sy_call_t *)utimes }, /* 138 = utimes */ - { 0, (sy_call_t *)nosys }, /* 139 = */ - { 0, (sy_call_t *)nosys }, /* 140 = */ - { AS(ogetpeername_args), (sy_call_t *)ogetpeername }, /* 141 = ogetpeername */ - { 0, (sy_call_t *)nosys }, /* 142 = */ - { 0, (sy_call_t *)nosys }, /* 143 = */ - { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit }, /* 144 = linux_getrlimit */ - { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit }, /* 145 = linux_setrlimit */ - { 0, (sy_call_t *)nosys }, /* 146 = */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid }, /* 147 = setsid */ - { 0, (sy_call_t *)linux_quotactl }, /* 148 = linux_quotactl */ - { 0, (sy_call_t *)nosys }, /* 149 = */ - { AS(getsockname_args), (sy_call_t *)ogetsockname }, /* 150 = getsockname */ - { 0, (sy_call_t *)nosys }, /* 151 = */ - { 0, (sy_call_t *)nosys }, /* 152 = */ - { 0, (sy_call_t *)nosys }, /* 153 = */ - { 0, (sy_call_t *)nosys }, /* 154 = */ - { 0, (sy_call_t *)nosys }, /* 155 = */ - { SYF_MPSAFE | AS(osf1_sigaction_args), (sy_call_t *)osf1_sigaction }, /* 156 = osf1_sigaction */ - { 0, (sy_call_t *)nosys }, /* 157 = */ - { 0, (sy_call_t *)nosys }, /* 158 = */ - { 0, (sy_call_t *)nosys }, /* 159 = osf_getdirentries */ - { 0, (sy_call_t *)nosys }, /* 160 = osf_statfs */ - { 0, (sy_call_t *)nosys }, /* 161 = osf_fstatfs */ - { 0, (sy_call_t *)nosys }, /* 162 = */ - { 0, (sy_call_t *)nosys }, /* 163 = */ - { 0, (sy_call_t *)nosys }, /* 164 = */ - { 0, (sy_call_t *)nosys }, /* 165 = osf_getdomainname */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname }, /* 166 = setdomainname */ - { 0, (sy_call_t *)nosys }, /* 167 = */ - { 0, (sy_call_t *)nosys }, /* 168 = */ - { 0, (sy_call_t *)nosys }, /* 169 = */ - { 0, (sy_call_t *)nosys }, /* 170 = */ - { 0, (sy_call_t *)nosys }, /* 171 = */ - { 0, (sy_call_t *)nosys }, /* 172 = */ - { 0, (sy_call_t *)nosys }, /* 173 = */ - { 0, (sy_call_t *)nosys }, /* 174 = */ - { 0, (sy_call_t *)nosys }, /* 175 = */ - { 0, (sy_call_t *)nosys }, /* 176 = */ - { 0, (sy_call_t *)nosys }, /* 177 = */ - { 0, (sy_call_t *)nosys }, /* 178 = */ - { 0, (sy_call_t *)nosys }, /* 179 = */ - { 0, (sy_call_t *)nosys }, /* 180 = */ - { 0, (sy_call_t *)nosys }, /* 181 = */ - { 0, (sy_call_t *)nosys }, /* 182 = */ - { 0, (sy_call_t *)nosys }, /* 183 = */ - { 0, (sy_call_t *)nosys }, /* 184 = */ - { 0, (sy_call_t *)nosys }, /* 185 = */ - { 0, (sy_call_t *)nosys }, /* 186 = */ - { 0, (sy_call_t *)nosys }, /* 187 = */ - { 0, (sy_call_t *)nosys }, /* 188 = */ - { 0, (sy_call_t *)nosys }, /* 189 = */ - { 0, (sy_call_t *)nosys }, /* 190 = */ - { 0, (sy_call_t *)nosys }, /* 191 = */ - { 0, (sy_call_t *)nosys }, /* 192 = */ - { 0, (sy_call_t *)nosys }, /* 193 = */ - { 0, (sy_call_t *)nosys }, /* 194 = */ - { 0, (sy_call_t *)nosys }, /* 195 = */ - { 0, (sy_call_t *)nosys }, /* 196 = */ - { 0, (sy_call_t *)nosys }, /* 197 = */ - { 0, (sy_call_t *)nosys }, /* 198 = */ - { 0, (sy_call_t *)nosys }, /* 199 = osf_swapon */ - { AS(linux_msgctl_args), (sy_call_t *)linux_msgctl }, /* 200 = linux_msgctl */ - { AS(linux_msgget_args), (sy_call_t *)linux_msgget }, /* 201 = linux_msgget */ - { AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv }, /* 202 = linux_msgrcv */ - { AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd }, /* 203 = linux_msgsnd */ - { AS(linux_semctl_args), (sy_call_t *)linux_semctl }, /* 204 = linux_semctl */ - { AS(linux_semget_args), (sy_call_t *)linux_semget }, /* 205 = linux_semget */ - { AS(linux_semop_args), (sy_call_t *)linux_semop }, /* 206 = linux_semop */ - { 0, (sy_call_t *)nosys }, /* 207 = osf_utsname */ - { AS(linux_lchown_args), (sy_call_t *)linux_lchown }, /* 208 = linux_lchown */ - { AS(linux_shmat_args), (sy_call_t *)linux_shmat }, /* 209 = linux_shmat */ - { AS(linux_shmctl_args), (sy_call_t *)linux_shmctl }, /* 210 = linux_shmctl */ - { AS(linux_shmdt_args), (sy_call_t *)linux_shmdt }, /* 211 = linux_shmdt */ - { AS(linux_shmget_args), (sy_call_t *)linux_shmget }, /* 212 = linux_shmget */ - { 0, (sy_call_t *)nosys }, /* 213 = */ - { 0, (sy_call_t *)nosys }, /* 214 = */ - { 0, (sy_call_t *)nosys }, /* 215 = */ - { 0, (sy_call_t *)nosys }, /* 216 = */ - { AS(linux_msync_args), (sy_call_t *)linux_msync }, /* 217 = linux_msync */ - { 0, (sy_call_t *)nosys }, /* 218 = */ - { 0, (sy_call_t *)nosys }, /* 219 = */ - { 0, (sy_call_t *)nosys }, /* 220 = */ - { 0, (sy_call_t *)nosys }, /* 221 = */ - { 0, (sy_call_t *)nosys }, /* 222 = */ - { 0, (sy_call_t *)nosys }, /* 223 = */ - { 0, (sy_call_t *)nosys }, /* 224 = */ - { 0, (sy_call_t *)nosys }, /* 225 = */ - { 0, (sy_call_t *)nosys }, /* 226 = */ - { 0, (sy_call_t *)nosys }, /* 227 = */ - { 0, (sy_call_t *)nosys }, /* 228 = */ - { 0, (sy_call_t *)nosys }, /* 229 = */ - { 0, (sy_call_t *)nosys }, /* 230 = */ - { 0, (sy_call_t *)nosys }, /* 231 = */ - { 0, (sy_call_t *)nosys }, /* 232 = */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid }, /* 233 = getpgid */ - { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid }, /* 234 = linux_getsid */ - { 0, (sy_call_t *)linux_sigaltstack }, /* 235 = linux_sigaltstack */ - { 0, (sy_call_t *)nosys }, /* 236 = */ - { 0, (sy_call_t *)nosys }, /* 237 = */ - { 0, (sy_call_t *)nosys }, /* 238 = */ - { 0, (sy_call_t *)nosys }, /* 239 = */ - { 0, (sy_call_t *)nosys }, /* 240 = */ - { SYF_MPSAFE | AS(osf1_sysinfo_args), (sy_call_t *)osf1_sysinfo }, /* 241 = osf1_sysinfo */ - { 0, (sy_call_t *)nosys }, /* 242 = */ - { 0, (sy_call_t *)nosys }, /* 243 = */ - { 0, (sy_call_t *)nosys }, /* 244 = osf_proplist_syscall */ - { 0, (sy_call_t *)nosys }, /* 245 = */ - { 0, (sy_call_t *)nosys }, /* 246 = */ - { 0, (sy_call_t *)nosys }, /* 247 = */ - { 0, (sy_call_t *)nosys }, /* 248 = */ - { 0, (sy_call_t *)nosys }, /* 249 = */ - { 0, (sy_call_t *)nosys }, /* 250 = */ - { 0, (sy_call_t *)nosys }, /* 251 = osf_usleep_thread */ - { 0, (sy_call_t *)nosys }, /* 252 = */ - { 0, (sy_call_t *)nosys }, /* 253 = */ - { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs }, /* 254 = linux_sysfs */ - { 0, (sy_call_t *)nosys }, /* 255 = */ - { AS(osf1_getsysinfo_args), (sy_call_t *)osf1_getsysinfo }, /* 256 = osf1_getsysinfo */ - { AS(osf1_setsysinfo_args), (sy_call_t *)osf1_setsysinfo }, /* 257 = osf1_setsysinfo */ - { 0, (sy_call_t *)nosys }, /* 258 = */ - { 0, (sy_call_t *)nosys }, /* 259 = */ - { 0, (sy_call_t *)nosys }, /* 260 = */ - { 0, (sy_call_t *)nosys }, /* 261 = */ - { 0, (sy_call_t *)nosys }, /* 262 = */ - { 0, (sy_call_t *)nosys }, /* 263 = */ - { 0, (sy_call_t *)nosys }, /* 264 = */ - { 0, (sy_call_t *)nosys }, /* 265 = */ - { 0, (sy_call_t *)nosys }, /* 266 = */ - { 0, (sy_call_t *)nosys }, /* 267 = */ - { 0, (sy_call_t *)nosys }, /* 268 = */ - { 0, (sy_call_t *)nosys }, /* 269 = */ - { 0, (sy_call_t *)nosys }, /* 270 = */ - { 0, (sy_call_t *)nosys }, /* 271 = */ - { 0, (sy_call_t *)nosys }, /* 272 = */ - { 0, (sy_call_t *)nosys }, /* 273 = */ - { 0, (sy_call_t *)nosys }, /* 274 = */ - { 0, (sy_call_t *)nosys }, /* 275 = */ - { 0, (sy_call_t *)nosys }, /* 276 = */ - { 0, (sy_call_t *)nosys }, /* 277 = */ - { 0, (sy_call_t *)nosys }, /* 278 = */ - { 0, (sy_call_t *)nosys }, /* 279 = */ - { 0, (sy_call_t *)nosys }, /* 280 = */ - { 0, (sy_call_t *)nosys }, /* 281 = */ - { 0, (sy_call_t *)nosys }, /* 282 = */ - { 0, (sy_call_t *)nosys }, /* 283 = */ - { 0, (sy_call_t *)nosys }, /* 284 = */ - { 0, (sy_call_t *)nosys }, /* 285 = */ - { 0, (sy_call_t *)nosys }, /* 286 = */ - { 0, (sy_call_t *)nosys }, /* 287 = */ - { 0, (sy_call_t *)nosys }, /* 288 = */ - { 0, (sy_call_t *)nosys }, /* 289 = */ - { 0, (sy_call_t *)nosys }, /* 290 = */ - { 0, (sy_call_t *)nosys }, /* 291 = */ - { 0, (sy_call_t *)nosys }, /* 292 = */ - { 0, (sy_call_t *)nosys }, /* 293 = */ - { 0, (sy_call_t *)nosys }, /* 294 = */ - { 0, (sy_call_t *)nosys }, /* 295 = */ - { 0, (sy_call_t *)nosys }, /* 296 = */ - { 0, (sy_call_t *)nosys }, /* 297 = */ - { 0, (sy_call_t *)nosys }, /* 298 = */ - { 0, (sy_call_t *)nosys }, /* 299 = */ - { 0, (sy_call_t *)linux_bdflush }, /* 300 = linux_bdflush */ - { 0, (sy_call_t *)linux_sethae }, /* 301 = linux_sethae */ - { AS(linux_mount_args), (sy_call_t *)linux_mount }, /* 302 = linux_mount */ - { 0, (sy_call_t *)linux_old_adjtimex }, /* 303 = linux_old_adjtimex */ - { 0, (sy_call_t *)linux_swapoff }, /* 304 = linux_swapoff */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents }, /* 305 = linux_getdents */ - { 0, (sy_call_t *)linux_create_module }, /* 306 = linux_create_module */ - { 0, (sy_call_t *)linux_init_module }, /* 307 = linux_init_module */ - { 0, (sy_call_t *)linux_delete_module }, /* 308 = linux_delete_module */ - { 0, (sy_call_t *)linux_get_kernel_syms }, /* 309 = linux_get_kernel_syms */ - { AS(linux_syslog_args), (sy_call_t *)linux_syslog }, /* 310 = linux_syslog */ - { AS(linux_reboot_args), (sy_call_t *)linux_reboot }, /* 311 = linux_reboot */ - { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone }, /* 312 = linux_clone */ - { AS(linux_uselib_args), (sy_call_t *)linux_uselib }, /* 313 = linux_uselib */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock }, /* 314 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock }, /* 315 = munlock */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall }, /* 316 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall }, /* 317 = munlockall */ - { 0, (sy_call_t *)linux_sysinfo }, /* 318 = linux_sysinfo */ - { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl }, /* 319 = linux_sysctl */ - { 0, (sy_call_t *)nosys }, /* 320 = sys_idle */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount }, /* 321 = linux_oldumount */ - { AS(swapon_args), (sy_call_t *)swapon }, /* 322 = swapon */ - { AS(linux_times_args), (sy_call_t *)linux_times }, /* 323 = linux_times */ - { AS(linux_personality_args), (sy_call_t *)linux_personality }, /* 324 = linux_personality */ - { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid }, /* 325 = linux_setfsuid */ - { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid }, /* 326 = linux_setfsgid */ - { AS(linux_ustat_args), (sy_call_t *)linux_ustat }, /* 327 = linux_ustat */ - { AS(linux_statfs_args), (sy_call_t *)linux_statfs }, /* 328 = linux_statfs */ - { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs }, /* 329 = linux_fstatfs */ - { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam }, /* 330 = sched_setparam */ - { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam }, /* 331 = sched_getparam */ - { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler }, /* 332 = linux_sched_setscheduler */ - { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler }, /* 333 = linux_sched_getscheduler */ - { SYF_MPSAFE | 0, (sy_call_t *)sched_yield }, /* 334 = sched_yield */ - { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max }, /* 335 = linux_sched_get_priority_max */ - { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min }, /* 336 = linux_sched_get_priority_min */ - { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval }, /* 337 = sched_rr_get_interval */ - { 0, (sy_call_t *)nosys }, /* 338 = sys_afs_syscall */ - { AS(linux_newuname_args), (sy_call_t *)linux_newuname }, /* 339 = linux_newuname */ - { SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep }, /* 340 = nanosleep */ - { AS(linux_mremap_args), (sy_call_t *)linux_mremap }, /* 341 = linux_mremap */ - { 0, (sy_call_t *)linux_nfsservctl }, /* 342 = linux_nfsservctl */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid }, /* 343 = setresuid */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid }, /* 344 = getresuid */ - { 0, (sy_call_t *)linux_pciconfig_read }, /* 345 = linux_pciconfig_read */ - { 0, (sy_call_t *)linux_pciconfig_write }, /* 346 = linux_pciconfig_write */ - { 0, (sy_call_t *)linux_query_module }, /* 347 = linux_query_module */ - { 0, (sy_call_t *)linux_prctl }, /* 348 = linux_prctl */ - { AS(linux_pread_args), (sy_call_t *)linux_pread }, /* 349 = linux_pread */ - { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite }, /* 350 = linux_pwrite */ - { 0, (sy_call_t *)linux_rt_sigreturn }, /* 351 = linux_rt_sigreturn */ - { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction }, /* 352 = linux_rt_sigaction */ - { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask }, /* 353 = linux_rt_sigprocmask */ - { 0, (sy_call_t *)linux_rt_sigpending }, /* 354 = linux_rt_sigpending */ - { 0, (sy_call_t *)linux_rt_sigtimedwait }, /* 355 = linux_rt_sigtimedwait */ - { 0, (sy_call_t *)linux_rt_sigqueueinfo }, /* 356 = linux_rt_sigqueueinfo */ - { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend }, /* 357 = linux_rt_sigsuspend */ - { AS(linux_select_args), (sy_call_t *)linux_select }, /* 358 = linux_select */ - { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday }, /* 359 = gettimeofday */ - { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday }, /* 360 = settimeofday */ - { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer }, /* 361 = linux_getitimer */ - { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer }, /* 362 = linux_setitimer */ - { AS(linux_utimes_args), (sy_call_t *)linux_utimes }, /* 363 = linux_utimes */ - { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage }, /* 364 = getrusage */ - { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4 }, /* 365 = linux_wait4 */ - { 0, (sy_call_t *)linux_adjtimex }, /* 366 = linux_adjtimex */ - { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd }, /* 367 = linux_getcwd */ - { 0, (sy_call_t *)linux_capget }, /* 368 = linux_capget */ - { 0, (sy_call_t *)linux_capset }, /* 369 = linux_capset */ - { 0, (sy_call_t *)linux_sendfile }, /* 370 = linux_sendfile */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid }, /* 371 = setresgid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid }, /* 372 = getresgid */ - { 0, (sy_call_t *)nosys }, /* 373 = sys_dipc */ - { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root }, /* 374 = linux_pivot_root */ - { AS(linux_mincore_args), (sy_call_t *)linux_mincore }, /* 375 = linux_mincore */ - { 0, (sy_call_t *)linux_pciconfig_iobase }, /* 376 = linux_pciconfig_iobase */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64 }, /* 377 = linux_getdents64 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_NULL }, /* 2 = linux_fork */ + { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ + { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 5 = */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_NULL }, /* 7 = osf1_wait4 */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = */ + { AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ + { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = */ + { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 13 = fchdir */ + { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ + { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ + { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 16 = linux_chown */ + { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 17 = linux_brk */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 18 = */ + { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ + { 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 21 = osf1_mount */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_NULL }, /* 22 = linux_umount */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 23 = setuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_NULL }, /* 24 = getuid */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 25 = */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace, AUE_NULL }, /* 26 = linux_ptrace */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 27 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 29 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 30 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = */ + { AS(linux_access_args), (sy_call_t *)linux_access, AUE_NULL }, /* 33 = linux_access */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 34 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = */ + { 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ + { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_NULL }, /* 37 = linux_kill */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 38 = */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 39 = setpgid */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 40 = */ + { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ + { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_NULL }, /* 42 = pipe */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 43 = osf_set_program_attributes */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = */ + { AS(linux_open_args), (sy_call_t *)linux_open, AUE_NULL }, /* 45 = linux_open */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 46 = */ + { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ + { SYF_MPSAFE | AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask, AUE_NULL }, /* 48 = osf1_sigprocmask */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 49 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 50 = */ + { AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sigpending, AUE_NULL }, /* 52 = linux_sigpending */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_NULL }, /* 54 = linux_ioctl */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 55 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = */ + { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 57 = linux_symlink */ + { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 58 = linux_readlink */ + { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 59 = linux_execve */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ + { AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 62 = */ + { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_NULL }, /* 63 = getpgrp */ + { 0, (sy_call_t *)linux_getpagesize, AUE_NULL }, /* 64 = linux_getpagesize */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 65 = */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_NULL }, /* 66 = linux_vfork */ + { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_NULL }, /* 67 = linux_newstat */ + { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_NULL }, /* 68 = linux_newlstat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 69 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 70 = */ + { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 71 = linux_mmap */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 72 = */ + { AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_NULL }, /* 73 = linux_munmap */ + { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_NULL }, /* 74 = linux_mprotect */ + { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_NULL }, /* 75 = madvise */ + { 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 76 = linux_vhangup */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 78 = */ + { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_NULL }, /* 79 = linux_setgroups */ + { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_NULL }, /* 80 = linux_getgroups */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 81 = */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 82 = setpgid */ + { AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer, AUE_NULL }, /* 83 = osf1_setitimer */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = osf_getitimer */ + { 0, (sy_call_t *)linux_gethostname, AUE_NULL }, /* 87 = linux_gethostname */ + { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_NULL }, /* 88 = osethostname */ + { 0, (sy_call_t *)linux_getdtablesize, AUE_NULL }, /* 89 = linux_getdtablesize */ + { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_NULL }, /* 90 = dup2 */ + { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_NULL }, /* 91 = linux_newfstat */ + { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_NULL }, /* 92 = linux_fcntl */ + { AS(osf1_select_args), (sy_call_t *)osf1_select, AUE_NULL }, /* 93 = osf1_select */ + { AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 94 = poll */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 95 = fsync */ + { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_NULL }, /* 96 = setpriority */ + { AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_NULL }, /* 97 = osf1_socket */ + { AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_NULL }, /* 98 = linux_connect */ + { AS(accept_args), (sy_call_t *)oaccept, AUE_NULL }, /* 99 = accept */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 100 = osf_getpriority */ + { AS(osend_args), (sy_call_t *)osend, AUE_NULL }, /* 101 = osend */ + { AS(orecv_args), (sy_call_t *)orecv, AUE_NULL }, /* 102 = orecv */ + { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_NULL }, /* 103 = osf1_sigreturn */ + { AS(bind_args), (sy_call_t *)bind, AUE_NULL }, /* 104 = bind */ + { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_NULL }, /* 105 = setsockopt */ + { AS(listen_args), (sy_call_t *)listen, AUE_NULL }, /* 106 = listen */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 108 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 109 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = */ + { SYF_MPSAFE | AS(osf1_sigsuspend_args), (sy_call_t *)osf1_sigsuspend, AUE_NULL }, /* 111 = osf1_sigsuspend */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = osf_sigstack */ + { 0, (sy_call_t *)linux_recvmsg, AUE_NULL }, /* 113 = linux_recvmsg */ + { 0, (sy_call_t *)linux_sendmsg, AUE_NULL }, /* 114 = linux_sendmsg */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = */ + { SYF_MPSAFE | AS(osf1_gettimeofday_args), (sy_call_t *)osf1_gettimeofday, AUE_NULL }, /* 116 = osf1_gettimeofday */ + { AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_NULL }, /* 117 = osf1_getrusage */ + { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_NULL }, /* 118 = getsockopt */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = */ + { AS(readv_args), (sy_call_t *)readv, AUE_NULL }, /* 120 = readv */ + { AS(writev_args), (sy_call_t *)writev, AUE_NULL }, /* 121 = writev */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 122 = osf_settimeofday */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 123 = fchown */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 124 = fchmod */ + { AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_NULL }, /* 125 = recvfrom */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_NULL }, /* 126 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_NULL }, /* 127 = setregid */ + { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_NULL }, /* 128 = linux_rename */ + { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 129 = linux_truncate */ + { AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_NULL }, /* 130 = oftruncate */ + { AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 131 = flock */ + { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 132 = setgid */ + { AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_NULL }, /* 133 = osf1_sendto */ + { AS(shutdown_args), (sy_call_t *)shutdown, AUE_NULL }, /* 134 = shutdown */ + { 0, (sy_call_t *)linux_socketpair, AUE_NULL }, /* 135 = linux_socketpair */ + { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_NULL }, /* 136 = linux_mkdir */ + { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_NULL }, /* 137 = linux_rmdir */ + { AS(utimes_args), (sy_call_t *)utimes, AUE_NULL }, /* 138 = utimes */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 140 = */ + { AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_NULL }, /* 141 = ogetpeername */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 142 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 143 = */ + { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_NULL }, /* 144 = linux_getrlimit */ + { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL }, /* 145 = linux_setrlimit */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 146 = */ + { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL }, /* 147 = setsid */ + { 0, (sy_call_t *)linux_quotactl, AUE_NULL }, /* 148 = linux_quotactl */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 149 = */ + { AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_NULL }, /* 150 = getsockname */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 155 = */ + { SYF_MPSAFE | AS(osf1_sigaction_args), (sy_call_t *)osf1_sigaction, AUE_NULL }, /* 156 = osf1_sigaction */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 157 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 158 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 159 = osf_getdirentries */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 160 = osf_statfs */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 161 = osf_fstatfs */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 162 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 163 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 164 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 165 = osf_getdomainname */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_NULL }, /* 166 = setdomainname */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 167 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 168 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 169 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 170 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 171 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 172 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 173 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 174 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 175 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 176 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 177 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 178 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 179 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 180 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 181 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 182 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 183 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 184 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 185 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 186 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 187 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 188 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 189 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 190 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 191 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 192 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 193 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 194 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 195 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 196 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 197 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 198 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 199 = osf_swapon */ + { AS(linux_msgctl_args), (sy_call_t *)linux_msgctl, AUE_NULL }, /* 200 = linux_msgctl */ + { AS(linux_msgget_args), (sy_call_t *)linux_msgget, AUE_NULL }, /* 201 = linux_msgget */ + { AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv, AUE_NULL }, /* 202 = linux_msgrcv */ + { AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd, AUE_NULL }, /* 203 = linux_msgsnd */ + { AS(linux_semctl_args), (sy_call_t *)linux_semctl, AUE_NULL }, /* 204 = linux_semctl */ + { AS(linux_semget_args), (sy_call_t *)linux_semget, AUE_NULL }, /* 205 = linux_semget */ + { AS(linux_semop_args), (sy_call_t *)linux_semop, AUE_NULL }, /* 206 = linux_semop */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 207 = osf_utsname */ + { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_NULL }, /* 208 = linux_lchown */ + { AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_NULL }, /* 209 = linux_shmat */ + { AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_NULL }, /* 210 = linux_shmctl */ + { AS(linux_shmdt_args), (sy_call_t *)linux_shmdt, AUE_NULL }, /* 211 = linux_shmdt */ + { AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_NULL }, /* 212 = linux_shmget */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 213 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 214 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 215 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 216 = */ + { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_NULL }, /* 217 = linux_msync */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 218 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 219 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 220 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 221 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 224 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 225 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 226 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 227 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 228 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 229 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 230 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 231 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 232 = */ + { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_NULL }, /* 233 = getpgid */ + { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_NULL }, /* 234 = linux_getsid */ + { 0, (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 235 = linux_sigaltstack */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 236 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 237 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 238 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 239 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 240 = */ + { SYF_MPSAFE | AS(osf1_sysinfo_args), (sy_call_t *)osf1_sysinfo, AUE_NULL }, /* 241 = osf1_sysinfo */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 242 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 243 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 244 = osf_proplist_syscall */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 245 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 246 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 247 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 248 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 250 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = osf_usleep_thread */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 252 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 253 = */ + { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 254 = linux_sysfs */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 255 = */ + { AS(osf1_getsysinfo_args), (sy_call_t *)osf1_getsysinfo, AUE_NULL }, /* 256 = osf1_getsysinfo */ + { AS(osf1_setsysinfo_args), (sy_call_t *)osf1_setsysinfo, AUE_NULL }, /* 257 = osf1_setsysinfo */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 258 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 259 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 260 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 261 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 262 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 263 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 264 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 265 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 266 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 267 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 268 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 269 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 270 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 271 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 272 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 274 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 275 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 276 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 277 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 278 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 279 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 280 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 284 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 286 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 287 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 288 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 289 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 290 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 291 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 292 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 293 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = */ + { 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 300 = linux_bdflush */ + { 0, (sy_call_t *)linux_sethae, AUE_NULL }, /* 301 = linux_sethae */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_NULL }, /* 302 = linux_mount */ + { 0, (sy_call_t *)linux_old_adjtimex, AUE_NULL }, /* 303 = linux_old_adjtimex */ + { 0, (sy_call_t *)linux_swapoff, AUE_NULL }, /* 304 = linux_swapoff */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_NULL }, /* 305 = linux_getdents */ + { 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 306 = linux_create_module */ + { 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 307 = linux_init_module */ + { 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 308 = linux_delete_module */ + { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 309 = linux_get_kernel_syms */ + { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 310 = linux_syslog */ + { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_NULL }, /* 311 = linux_reboot */ + { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_NULL }, /* 312 = linux_clone */ + { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_NULL }, /* 313 = linux_uselib */ + { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_NULL }, /* 314 = mlock */ + { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_NULL }, /* 315 = munlock */ + { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_NULL }, /* 316 = mlockall */ + { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_NULL }, /* 317 = munlockall */ + { 0, (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 318 = linux_sysinfo */ + { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_NULL }, /* 319 = linux_sysctl */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 320 = sys_idle */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_NULL }, /* 321 = linux_oldumount */ + { AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 322 = swapon */ + { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 323 = linux_times */ + { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_NULL }, /* 324 = linux_personality */ + { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_NULL }, /* 325 = linux_setfsuid */ + { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_NULL }, /* 326 = linux_setfsgid */ + { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 327 = linux_ustat */ + { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_NULL }, /* 328 = linux_statfs */ + { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NULL }, /* 329 = linux_fstatfs */ + { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 330 = sched_setparam */ + { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 331 = sched_getparam */ + { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_NULL }, /* 332 = linux_sched_setscheduler */ + { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_NULL }, /* 333 = linux_sched_getscheduler */ + { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 334 = sched_yield */ + { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_NULL }, /* 335 = linux_sched_get_priority_max */ + { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_NULL }, /* 336 = linux_sched_get_priority_min */ + { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 337 = sched_rr_get_interval */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 338 = sys_afs_syscall */ + { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 339 = linux_newuname */ + { SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL }, /* 340 = nanosleep */ + { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 341 = linux_mremap */ + { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 342 = linux_nfsservctl */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 343 = setresuid */ + { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 344 = getresuid */ + { 0, (sy_call_t *)linux_pciconfig_read, AUE_NULL }, /* 345 = linux_pciconfig_read */ + { 0, (sy_call_t *)linux_pciconfig_write, AUE_NULL }, /* 346 = linux_pciconfig_write */ + { 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 347 = linux_query_module */ + { 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 348 = linux_prctl */ + { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_NULL }, /* 349 = linux_pread */ + { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_NULL }, /* 350 = linux_pwrite */ + { 0, (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 351 = linux_rt_sigreturn */ + { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 352 = linux_rt_sigaction */ + { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 353 = linux_rt_sigprocmask */ + { 0, (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 354 = linux_rt_sigpending */ + { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 355 = linux_rt_sigtimedwait */ + { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 356 = linux_rt_sigqueueinfo */ + { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 357 = linux_rt_sigsuspend */ + { AS(linux_select_args), (sy_call_t *)linux_select, AUE_NULL }, /* 358 = linux_select */ + { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_NULL }, /* 359 = gettimeofday */ + { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_NULL }, /* 360 = settimeofday */ + { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_NULL }, /* 361 = linux_getitimer */ + { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_NULL }, /* 362 = linux_setitimer */ + { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_NULL }, /* 363 = linux_utimes */ + { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_NULL }, /* 364 = getrusage */ + { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_NULL }, /* 365 = linux_wait4 */ + { 0, (sy_call_t *)linux_adjtimex, AUE_NULL }, /* 366 = linux_adjtimex */ + { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_NULL }, /* 367 = linux_getcwd */ + { 0, (sy_call_t *)linux_capget, AUE_NULL }, /* 368 = linux_capget */ + { 0, (sy_call_t *)linux_capset, AUE_NULL }, /* 369 = linux_capset */ + { 0, (sy_call_t *)linux_sendfile, AUE_NULL }, /* 370 = linux_sendfile */ + { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_NULL }, /* 371 = setresgid */ + { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 372 = getresgid */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 373 = sys_dipc */ + { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL }, /* 374 = linux_pivot_root */ + { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_NULL }, /* 375 = linux_mincore */ + { 0, (sy_call_t *)linux_pciconfig_iobase, AUE_NULL }, /* 376 = linux_pciconfig_iobase */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_NULL }, /* 377 = linux_getdents64 */ }; ==== //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#9 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.61 2005/05/29 21:06:56 rwatson Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.62 2005/05/30 15:09:16 rwatson Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -6,6 +6,11 @@ ; Columns: number type nargs name alt{name,tag,rtyp}/comments ; number system call number, must be in order +; audit the audit event associated with the system call +; A value of AUE_NULL means no auditing, but it also means that +; there is no audit event for the call at this time. For the +; case where the event exists, but we don't want auditing, the +; event should be #defined to AUE_NULL in audit_kevents.h. ; type one of STD, OBSOL, UNIMPL, COMPAT, CPT_NOA, LIBCOMPAT, ; NODEF, NOARGS, NOPROTO ; name psuedo-prototype of syscall routine @@ -40,426 +45,514 @@ ; #ifdef's, etc. may be included, and are copied to the output files. -0 UNIMPL -1 MNOPROTO { void sys_exit(int rval); } exit sys_exit_args void -2 MSTD { int linux_fork(void); } -3 MNOPROTO { int read(int fd, char *buf, u_int nbyte); } -4 MNOPROTO { int write(int fd, char *buf, u_int nbyte); } -5 UNIMPL -6 MNOPROTO { int close(int fd); } -7 MSTD { int osf1_wait4(int pid, int *status, int options, \ - struct osf1_rusage *rusage); } -8 UNIMPL -9 STD { int linux_link(char *path, char *to); } -10 STD { int linux_unlink(char *path); } -11 UNIMPL -12 STD { int linux_chdir(char *path); } -13 NOPROTO { int fchdir(int fd); } -14 STD { int linux_mknod(char *path, l_int mode, l_dev_t dev); } -15 STD { int linux_chmod(char *path, l_mode_t mode); } -16 STD { int linux_chown(char *path, l_uid_t uid, l_gid_t gid); } -17 STD { int linux_brk(l_ulong dsend); } -18 UNIMPL -19 STD { int linux_lseek(l_uint fdes, l_off_t off, l_int whence); } -20 NOPROTO { int getpid(void); } -21 UNIMPL osf1_mount -22 STD { int linux_umount(char *path, l_int flags); } -23 MNOPROTO { int setuid(uid_t uid); } -24 MNOPROTO { int getuid(void); } -25 UNIMPL -26 MSTD { int linux_ptrace(void); } -27 UNIMPL -28 UNIMPL -29 UNIMPL -30 UNIMPL -31 UNIMPL -32 UNIMPL -33 STD { int linux_access(char *path, l_int flags); } -34 UNIMPL -35 UNIMPL -36 NOPROTO { int sync(void); } -37 MSTD { int linux_kill(l_int pid, l_int signum); } -38 UNIMPL -39 MNOPROTO { int setpgid(int pid, int pgid); } -40 UNIMPL -41 MNOPROTO { int dup(u_int fd); } -42 MNOPROTO { int pipe(void); } -43 UNIMPL osf_set_program_attributes -44 UNIMPL -45 STD { int linux_open(char *path, l_int flags, l_int mode); } -46 UNIMPL -47 MNOPROTO { int getgid(void); } -48 MSTD { int osf1_sigprocmask(int how, u_long mask); } -49 UNIMPL -50 UNIMPL -51 NOPROTO { int acct(char *path); } -52 MSTD { int linux_sigpending(void); } -53 UNIMPL -54 STD { int linux_ioctl(l_uint fd, l_uint cmd, l_ulong arg); } -55 UNIMPL -56 UNIMPL -57 STD { int linux_symlink(char *path, char *to); } -58 STD { int linux_readlink(char *name, char *buf, l_int count); } -59 STD { int linux_execve(char *path, char **argp, char **envp); } -60 MNOPROTO { int umask(int newmask); } -61 NOPROTO { int chroot(char *path); } -62 UNIMPL -63 MNOPROTO { int getpgrp(void); } -64 STD { int linux_getpagesize(void); } -65 UNIMPL -66 MSTD { int linux_vfork(void); } -67 STD { int linux_newstat(char *path, struct l_newstat *buf); } -68 STD { int linux_newlstat(char *path, struct l_newstat *buf); } -69 UNIMPL -70 UNIMPL -71 STD { int linux_mmap(l_ulong addr, l_ulong len, l_ulong prot, \ - l_ulong flags, l_ulong fd, l_ulong pos); } -72 UNIMPL -73 STD { int linux_munmap(l_ulong addr, l_size_t len); } -74 STD { int linux_mprotect(l_ulong addr, l_size_t len, \ - l_ulong prot); } -75 MNOPROTO { int madvise(void *addr, size_t len, int behav); } -76 STD { int linux_vhangup(void); } -77 UNIMPL -78 UNIMPL -79 MSTD { int linux_setgroups(l_int gidsetsize, l_gid_t *grouplist); } -80 MSTD { int linux_getgroups(l_int gidsetsize, l_gid_t *grouplist); } -81 UNIMPL -82 MNODEF setpgid setpgid setpgid_args int -83 STD { int osf1_setitimer(u_int which, struct itimerval *itv, \ - struct itimerval *oitv); } -84 UNIMPL -85 UNIMPL -86 UNIMPL osf_getitimer -87 STD { int linux_gethostname(void); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 1 13:48:42 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC3D516A420; Wed, 1 Jun 2005 13:48:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E9A616A41C for ; Wed, 1 Jun 2005 13:48:41 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5145B43D1D for ; Wed, 1 Jun 2005 13:48:41 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j51Dmfim040812 for ; Wed, 1 Jun 2005 13:48:41 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j51DmfKl040809 for perforce@freebsd.org; Wed, 1 Jun 2005 13:48:41 GMT (envelope-from areisse@nailabs.com) Date: Wed, 1 Jun 2005 13:48:41 GMT Message-Id: <200506011348.j51DmfKl040809@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 77821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2005 13:48:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=77821 Change 77821 by areisse@areisse_ibook on 2005/06/01 13:48:40 Delete the darwin checkpolicy sources, because we don't need to track changes from the nsa version any more. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.8#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.c#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.h#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_parse.y#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_scan.l#3 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/queue.c#2 delete .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/queue.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 1 14:14:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B5AA16A420; Wed, 1 Jun 2005 14:14:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28EA316A41C for ; Wed, 1 Jun 2005 14:14:13 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0993843D49 for ; Wed, 1 Jun 2005 14:14:13 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j51EECAp042206 for ; Wed, 1 Jun 2005 14:14:12 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j51EECg4042203 for perforce@freebsd.org; Wed, 1 Jun 2005 14:14:12 GMT (envelope-from areisse@nailabs.com) Date: Wed, 1 Jun 2005 14:14:12 GMT Message-Id: <200506011414.j51EECg4042203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 77823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2005 14:14:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=77823 Change 77823 by areisse@areisse_ibook on 2005/06/01 14:13:45 Branch checkpolicy directly from the nsa version 1.16, so that old changes made for sedarwin are no longer tracked. (New changes should be minimal). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/COPYING#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/ChangeLog#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/VERSION#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.8#3 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.c#4 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/checkpolicy.h#4 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/genpolusers.c#1 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_parse.y#4 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_scan.l#4 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/queue.c#3 branch .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/queue.h#3 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 1 15:25:41 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B30D16A420; Wed, 1 Jun 2005 15:25:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 33F4916A41C for ; Wed, 1 Jun 2005 15:25:41 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1343343D4C for ; Wed, 1 Jun 2005 15:25:41 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j51FPeqr045473 for ; Wed, 1 Jun 2005 15:25:40 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j51FPeNA045470 for perforce@freebsd.org; Wed, 1 Jun 2005 15:25:40 GMT (envelope-from areisse@nailabs.com) Date: Wed, 1 Jun 2005 15:25:40 GMT Message-Id: <200506011525.j51FPeNA045470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 77828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2005 15:25:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=77828 Change 77828 by areisse@areisse_ibook on 2005/06/01 15:25:38 Checkpolicy changes for building on Darwin: -Use our makefile infrastructure -ipv6 structure fields Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_parse.y#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/Makefile#3 (text+ko) ==== @@ -1,16 +1,13 @@ include ../../../Makeconfig -vpath %.c $(SOURCE_ROOT)/sedarwin/sedarwin/ss - PROG= checkpolicy -OBJS = checkpolicy.o write.o policy_parse.o policy_scan.o services.o \ - hashtab.o avtab.o ebitmap.o queue.o sidtab.o symtab.o policydb.o +OBJS = checkpolicy.o y.tab.o policy_scan.o queue.o -CFLAGS+= -I$(SOURCE_ROOT)/sedarwin/sedarwin/ss -CFLAGS+= -I$(SOURCE_ROOT)/sedarwin -LDADD+= -L$(SOURCE_ROOT)/sedarwin/libsedarwin -LDADD+= -lsebsd -lfl +CFLAGS+= -I$(SOURCE_ROOT)/sedarwin/libsepol/include +CFLAGS+= -I$(SOURCE_ROOT)/sedarwin/libselinux/include +LDADD+= -L$(SOURCE_ROOT)/sedarwin/libselinux/src -L$(SOURCE_ROOT)/sedarwin/libsepol/src +LDADD+= -lselinux -lsepol -lfl all: $(PROG) @@ -21,7 +18,7 @@ install -m 555 $(PROG) $(DESTDIR)/usr/bin clean: - rm -f $(OBJS) $(PROG) policy_parse.c policy_scan.c policy_parse.h + rm -f $(OBJS) $(PROG) y.tab.* policy_scan.c -policy_parse.c policy_parse.h: policy_parse.y - $(YACC) $(YFLAGS) -d -o policy_parse.c policy_parse.y +y.tab.c y.tab.h: policy_parse.y + $(YACC) $(YFLAGS) -d policy_parse.y ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_parse.y#5 (text+ko) ==== @@ -4438,6 +4438,8 @@ return 0; } +#define s6_addr32 __u6_addr.__u6_addr32 + static int define_ipv6_node_context(void) { char *id; From owner-p4-projects@FreeBSD.ORG Thu Jun 2 15:59:33 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5F4916A420; Thu, 2 Jun 2005 15:59:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9121616A41C for ; Thu, 2 Jun 2005 15:59:32 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5608143D1F for ; Thu, 2 Jun 2005 15:59:32 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j52FxWre055753 for ; Thu, 2 Jun 2005 15:59:32 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j52FxTuX055750 for perforce@freebsd.org; Thu, 2 Jun 2005 15:59:29 GMT (envelope-from peter@freebsd.org) Date: Thu, 2 Jun 2005 15:59:29 GMT Message-Id: <200506021559.j52FxTuX055750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 77882 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2005 15:59:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=77882 Change 77882 by peter@peter_daintree on 2005/06/02 15:59:22 IFC @77880 Affected files ... .. //depot/projects/hammer/MAINTAINERS#33 integrate .. //depot/projects/hammer/Makefile.inc1#93 integrate .. //depot/projects/hammer/UPDATING#77 integrate .. //depot/projects/hammer/bin/rmdir/rmdir.1#5 integrate .. //depot/projects/hammer/bin/stty/print.c#3 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII.c#7 integrate .. //depot/projects/hammer/contrib/bzip2/bzlib.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipfstat.8#5 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipmon.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/CHANGES#3 integrate .. //depot/projects/hammer/contrib/libpcap/CREDITS#3 integrate .. //depot/projects/hammer/contrib/libpcap/FILES#3 integrate .. //depot/projects/hammer/contrib/libpcap/INSTALL.txt#3 integrate .. //depot/projects/hammer/contrib/libpcap/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/libpcap/README#3 integrate .. //depot/projects/hammer/contrib/libpcap/README.hpux#2 integrate .. //depot/projects/hammer/contrib/libpcap/README.macosx#1 branch .. //depot/projects/hammer/contrib/libpcap/VERSION#4 integrate .. //depot/projects/hammer/contrib/libpcap/bpf/net/bpf_filter.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/bpf_dump.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/bpf_image.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/config.h.in#3 integrate .. //depot/projects/hammer/contrib/libpcap/configure#3 integrate .. //depot/projects/hammer/contrib/libpcap/configure.in#3 integrate .. //depot/projects/hammer/contrib/libpcap/etherent.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/ethertype.h#2 integrate .. //depot/projects/hammer/contrib/libpcap/fad-getad.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/fad-gifc.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/fad-glifc.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/fad-null.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/gencode.c#5 integrate .. //depot/projects/hammer/contrib/libpcap/gencode.h#3 integrate .. //depot/projects/hammer/contrib/libpcap/grammar.y#3 integrate .. //depot/projects/hammer/contrib/libpcap/inet.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/nametoaddr.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/optimize.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-bpf.c#6 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dlpi.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dos.c#1 branch .. //depot/projects/hammer/contrib/libpcap/pcap-dos.h#1 branch .. //depot/projects/hammer/contrib/libpcap/pcap-enet.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-int.h#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-linux.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-namedb.h#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-nit.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-null.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-pf.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-snit.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-snoop.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.3#5 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.h#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap1.h#1 branch .. //depot/projects/hammer/contrib/libpcap/pf.h#2 integrate .. //depot/projects/hammer/contrib/libpcap/ppp.h#2 integrate .. //depot/projects/hammer/contrib/libpcap/savefile.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/scanner.l#4 integrate .. //depot/projects/hammer/contrib/libpcap/snprintf.c#2 delete .. //depot/projects/hammer/contrib/ngatm/snmp_atm/atm.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/.cvsignore#2 integrate .. //depot/projects/hammer/contrib/tcpdump/CHANGES#4 integrate .. //depot/projects/hammer/contrib/tcpdump/CREDITS#4 integrate .. //depot/projects/hammer/contrib/tcpdump/FILES#4 integrate .. //depot/projects/hammer/contrib/tcpdump/INSTALL#4 integrate .. //depot/projects/hammer/contrib/tcpdump/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/tcpdump/README#4 integrate .. //depot/projects/hammer/contrib/tcpdump/VERSION#4 integrate .. //depot/projects/hammer/contrib/tcpdump/acconfig.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/addrtoname.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/appletalk.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/bgp.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/bpf_dump.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/config.h.in#4 integrate .. //depot/projects/hammer/contrib/tcpdump/configure#4 integrate .. //depot/projects/hammer/contrib/tcpdump/configure.in#4 integrate .. //depot/projects/hammer/contrib/tcpdump/cpack.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/cpack.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/decode_prefix.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/ethertype.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/extract.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/gmpls.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/gmpls.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/gmt2local.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/icmp6.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/ieee802_11_radio.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/interface.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/ip.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/ipproto.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/ipproto.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/l2vpn.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/l2vpn.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/llc.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/machdep.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/bittypes.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/datalinks.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/dlnames.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/getaddrinfo.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/getnameinfo.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/inet_aton.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/inet_ntop.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/inet_pton.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/snprintf.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/strlcat.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/missing/strlcpy.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/mpls.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/netdissect.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/nlpid.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/nlpid.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/ntp.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/ospf.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/oui.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/oui.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/parsenfsfh.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/pcap-missing.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/pf.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/pmap_prot.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/ppp.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-802_11.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ah.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-aodv.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ap1394.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-arcnet.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-arp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ascii.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-atalk.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-atm.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-beep.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bfd.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bgp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bootp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-cdp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-chdlc.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-cip.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-cnfp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-decnet.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-dhcp6.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-domain.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-dvmrp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-eap.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-egp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-eigrp.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-enc.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-esp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ether.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-fddi.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-fr.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-frag6.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-gre.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-hsrp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-icmp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-icmp6.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-igmp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-igrp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip6.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip6opts.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ipcomp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ipx.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-isakmp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-isoclns.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-juniper.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-krb.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-l2tp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-lane.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-llc.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-lmp.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-lspping.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-lwres.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-mobile.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-mobility.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-mpls.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-msdp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-netbios.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-nfs.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ntp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-null.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ospf.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ospf6.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pim.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ppp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pppoe.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pptp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-radius.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-raw.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rip.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ripng.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rt6.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rx.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sctp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sip.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-sl.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sll.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-smb.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-snmp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-stp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sunatm.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sunrpc.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-symantec.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-syslog.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-tcp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-telnet.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-tftp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-timed.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-token.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-udp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-vjc.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-vrrp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-wb.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-zephyr.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/rpc_auth.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/rpc_msg.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/setsignal.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/smb.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/smbutil.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/strcasecmp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/tcp.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump.1#4 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/udp.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/util.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/vfprintf.c#3 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#32 integrate .. //depot/projects/hammer/etc/mtree/BSD.root.dist#14 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#45 integrate .. //depot/projects/hammer/games/random/random.c#6 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/config.h#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#9 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/search.c#7 integrate .. //depot/projects/hammer/include/Makefile#43 integrate .. //depot/projects/hammer/include/netdb.h#10 integrate .. //depot/projects/hammer/include/proc_service.h#3 integrate .. //depot/projects/hammer/include/pthread.h#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#17 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#17 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#19 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#18 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/fpu_qp.c#5 integrate .. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#16 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_exit.c#4 integrate .. //depot/projects/hammer/lib/libpcap/config.h#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/alpha/alpha/enter_uts.S#3 integrate .. //depot/projects/hammer/lib/librpcsvc/xcrypt.c#2 integrate .. //depot/projects/hammer/lib/libsdp/sdp.3#6 integrate .. //depot/projects/hammer/lib/libsdp/sdp.h#3 integrate .. //depot/projects/hammer/lib/libsdp/util.c#5 integrate .. //depot/projects/hammer/lib/libstand/Makefile#14 integrate .. //depot/projects/hammer/lib/libstand/net.c#2 integrate .. //depot/projects/hammer/lib/libstand/udp.c#2 integrate .. //depot/projects/hammer/lib/libstand/zalloc_defs.h#5 integrate .. //depot/projects/hammer/lib/libthread_db/arch/i386/libpthread_md.c#2 integrate .. //depot/projects/hammer/lib/libthread_db/libc_r_db.c#3 integrate .. //depot/projects/hammer/lib/libthread_db/libpthread_db.c#6 integrate .. //depot/projects/hammer/lib/libthread_db/libpthread_db.h#3 integrate .. //depot/projects/hammer/lib/libthread_db/libthr_db.c#6 integrate .. //depot/projects/hammer/lib/libthread_db/thread_db.c#3 integrate .. //depot/projects/hammer/lib/libthread_db/thread_db.h#4 integrate .. //depot/projects/hammer/lib/libthread_db/thread_db_int.h#3 integrate .. //depot/projects/hammer/libexec/getty/ttys.5#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/alpha/reloc.c#5 integrate .. //depot/projects/hammer/libexec/tftpd/tftpd.c#11 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#97 integrate .. //depot/projects/hammer/sbin/Makefile#35 integrate .. //depot/projects/hammer/sbin/clri/clri.c#6 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#10 integrate .. //depot/projects/hammer/sbin/mount/mntopts.h#7 integrate .. //depot/projects/hammer/sbin/mount/mount_ufs.c#3 integrate .. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.c#9 integrate .. //depot/projects/hammer/sbin/mount_ext2fs/mount_ext2fs.c#6 integrate .. //depot/projects/hammer/sbin/mount_hpfs/mount_hpfs.c#3 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#8 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#9 integrate .. //depot/projects/hammer/sbin/mount_nfs4/mount_nfs4.c#5 integrate .. //depot/projects/hammer/sbin/mount_ntfs/mount_ntfs.c#6 integrate .. //depot/projects/hammer/sbin/mount_nullfs/mount_nullfs.c#5 integrate .. //depot/projects/hammer/sbin/mount_reiserfs/mount_reiserfs.c#2 integrate .. //depot/projects/hammer/sbin/mount_std/mount_std.c#5 integrate .. //depot/projects/hammer/sbin/mount_udf/mount_udf.c#7 integrate .. //depot/projects/hammer/sbin/mount_ufs/mount_ufs.c#3 integrate .. //depot/projects/hammer/sbin/mount_umapfs/mount_umapfs.c#4 integrate .. //depot/projects/hammer/sbin/mount_unionfs/mount_unionfs.c#5 integrate .. //depot/projects/hammer/sbin/restore/interactive.c#7 integrate .. //depot/projects/hammer/sbin/restore/main.c#9 integrate .. //depot/projects/hammer/sbin/restore/restore.c#5 integrate .. //depot/projects/hammer/sbin/restore/tape.c#6 integrate .. //depot/projects/hammer/sbin/routed/if.c#6 integrate .. //depot/projects/hammer/sbin/routed/input.c#4 integrate .. //depot/projects/hammer/sbin/routed/main.c#5 integrate .. //depot/projects/hammer/sbin/routed/output.c#5 integrate .. //depot/projects/hammer/sbin/routed/parms.c#4 integrate .. //depot/projects/hammer/sbin/routed/radix.c#4 integrate .. //depot/projects/hammer/sbin/routed/rdisc.c#4 integrate .. //depot/projects/hammer/sbin/routed/table.c#6 integrate .. //depot/projects/hammer/sbin/routed/trace.c#6 integrate .. //depot/projects/hammer/sbin/savecore/savecore.c#10 integrate .. //depot/projects/hammer/share/doc/papers/contents/contents.ms#2 integrate .. //depot/projects/hammer/share/man/man4/amr.4#13 integrate .. //depot/projects/hammer/share/man/man4/em.4#10 integrate .. //depot/projects/hammer/share/man/man4/ipw.4#2 integrate .. //depot/projects/hammer/share/man/man4/iwi.4#3 integrate .. //depot/projects/hammer/share/man/man4/led.4#9 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#28 integrate .. //depot/projects/hammer/share/mk/bsd.subdir.mk#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/autoconf.c#9 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#19 integrate .. //depot/projects/hammer/sys/alpha/include/bus_memio.h#3 delete .. //depot/projects/hammer/sys/alpha/include/bus_pio.h#3 delete .. //depot/projects/hammer/sys/alpha/include/timerreg.h#2 integrate .. //depot/projects/hammer/sys/alpha/isa/mcclock_isa.c#5 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#11 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#11 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#11 integrate .. //depot/projects/hammer/sys/alpha/linux/syscalls.master#11 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_proto.h#7 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_syscall.h#7 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_sysent.c#7 integrate .. //depot/projects/hammer/sys/alpha/osf1/syscalls.master#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#40 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#61 integrate .. //depot/projects/hammer/sys/amd64/include/bus.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/hammer/sys/arm/arm/autoconf.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/bcopyinout.S#6 integrate .. //depot/projects/hammer/sys/arm/arm/bcopyinout_xscale.S#4 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#14 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#8 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm3.S#4 delete .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm67.S#4 delete .. //depot/projects/hammer/sys/arm/arm/in_cksum.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/in_cksum_arm.S#5 integrate .. //depot/projects/hammer/sys/arm/arm/intr.c#8 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#20 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#14 integrate .. //depot/projects/hammer/sys/arm/arm/trap.c#11 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#13 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#7 integrate .. //depot/projects/hammer/sys/arm/include/atomic.h#7 integrate .. //depot/projects/hammer/sys/arm/include/bus_memio.h#3 delete .. //depot/projects/hammer/sys/arm/include/bus_pio.h#3 delete .. //depot/projects/hammer/sys/arm/include/cpuconf.h#4 integrate .. //depot/projects/hammer/sys/arm/include/endian.h#9 integrate .. //depot/projects/hammer/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_7seg.c#3 integrate .. //depot/projects/hammer/sys/boot/alpha/common/main.c#3 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/devicename.c#3 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/libalpha.h#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/srmdisk.c#4 integrate .. //depot/projects/hammer/sys/boot/common/console.c#3 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#20 integrate .. //depot/projects/hammer/sys/boot/ficl/Makefile#11 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#13 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#9 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/devicename.c#3 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#8 integrate .. //depot/projects/hammer/sys/boot/i386/loader/Makefile#11 integrate .. //depot/projects/hammer/sys/boot/i386/loader/main.c#8 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/elf_freebsd.c#7 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/boot.c#7 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/main.c#6 integrate .. //depot/projects/hammer/sys/bsm/audit.h#1 branch .. //depot/projects/hammer/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#28 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#26 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#26 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#26 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#30 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#20 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#14 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#31 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#31 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_proto.h#5 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_syscall.h#5 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_syscallnames.c#5 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysent.c#5 integrate .. //depot/projects/hammer/sys/compat/svr4/syscalls.master#5 integrate .. //depot/projects/hammer/sys/conf/files.i386#59 integrate .. //depot/projects/hammer/sys/conf/files.pc98#45 integrate .. //depot/projects/hammer/sys/conf/options.pc98#31 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#30 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#21 integrate .. //depot/projects/hammer/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/hammer/sys/dev/aac/aacreg.h#9 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#12 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_package.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_perf.c#8 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_eisa.c#8 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_isa.c#9 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/advansys/advansys.c#10 integrate .. //depot/projects/hammer/sys/dev/advansys/advlib.c#5 integrate .. //depot/projects/hammer/sys/dev/advansys/adw_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/advansys/adwcam.c#11 integrate .. //depot/projects/hammer/sys/dev/advansys/adwlib.c#5 integrate .. //depot/projects/hammer/sys/dev/aha/aha.c#13 integrate .. //depot/projects/hammer/sys/dev/aha/aha_isa.c#13 integrate .. //depot/projects/hammer/sys/dev/ahb/ahb.c#11 integrate .. //depot/projects/hammer/sys/dev/aic/aic.c#5 integrate .. //depot/projects/hammer/sys/dev/aic/aic_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/aic/aic_pccard.c#7 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.h#11 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.h#14 integrate .. //depot/projects/hammer/sys/dev/amd/amd.c#13 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#21 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#15 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar_isa.c#7 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#31 integrate .. //depot/projects/hammer/sys/dev/awi/am79c930.c#5 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#16 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#46 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_audio.c#6 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_card.c#11 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_core.c#13 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_i2c.c#5 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#16 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_reg.h#6 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.c#8 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt.c#11 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_eisa.c#9 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_isa.c#8 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#34 integrate .. //depot/projects/hammer/sys/dev/cnw/if_cnw.c#10 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_eisa.c#7 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_isa.c#7 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_scsi.c#13 integrate .. //depot/projects/hammer/sys/dev/em/README#8 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#41 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#21 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.c#14 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.h#13 integrate .. //depot/projects/hammer/sys/dev/em/if_em_osdep.h#9 integrate .. //depot/projects/hammer/sys/dev/fb/boot_font.c#4 integrate .. //depot/projects/hammer/sys/dev/fb/gfb.c#5 integrate .. //depot/projects/hammer/sys/dev/fb/s3_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/fb/tga.c#5 integrate .. //depot/projects/hammer/sys/dev/gfb/gfb_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm_tx.c#7 integrate .. //depot/projects/hammer/sys/dev/hfa/hfa_freebsd.c#6 integrate .. //depot/projects/hammer/sys/dev/hfa/hfa_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/hptmv/osbsd.h#4 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate .. //depot/projects/hammer/sys/dev/ida/ida.c#14 integrate .. //depot/projects/hammer/sys/dev/ida/ida_disk.c#9 integrate .. //depot/projects/hammer/sys/dev/ida/ida_eisa.c#11 integrate .. //depot/projects/hammer/sys/dev/ida/ida_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/idt/idt_harp.c#7 integrate .. //depot/projects/hammer/sys/dev/idt/idt_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie.c#12 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie_isa.c#3 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#34 integrate .. //depot/projects/hammer/sys/dev/iir/iir.c#11 integrate .. //depot/projects/hammer/sys/dev/iir/iir_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/ips/ips.h#12 integrate .. //depot/projects/hammer/sys/dev/ips/ips_disk.h#4 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#10 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#16 integrate .. //depot/projects/hammer/sys/dev/kbd/atkbdc.c#9 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#22 integrate .. //depot/projects/hammer/sys/dev/mcd/mcd.c#14 integrate .. //depot/projects/hammer/sys/dev/mcd/mcd_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/mii/dcphy.c#10 integrate .. //depot/projects/hammer/sys/dev/mii/pnphy.c#8 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx.c#11 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#13 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_freebsd.h#6 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#17 integrate .. //depot/projects/hammer/sys/dev/ncv/ncr53c500.c#7 integrate .. //depot/projects/hammer/sys/dev/ncv/ncr53c500_pccard.c#13 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#27 integrate .. //depot/projects/hammer/sys/dev/nsp/nsp.c#8 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#5 integrate .. //depot/projects/hammer/sys/dev/pbio/pbio.c#5 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#41 integrate .. //depot/projects/hammer/sys/dev/pdq/if_fpa.c#7 integrate .. //depot/projects/hammer/sys/dev/pdq/pdq_freebsd.h#6 integrate .. //depot/projects/hammer/sys/dev/pdq/pdq_ifsubr.c#7 integrate .. //depot/projects/hammer/sys/dev/random/probe.c#3 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#25 integrate .. //depot/projects/hammer/sys/dev/scd/scd.c#12 integrate .. //depot/projects/hammer/sys/dev/scd/scd_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#46 integrate .. //depot/projects/hammer/sys/dev/sio/sio_isa.c#8 integrate .. //depot/projects/hammer/sys/dev/sio/sio_pccard.c#7 integrate .. //depot/projects/hammer/sys/dev/sio/sio_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/sio/sio_puc.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#21 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr.c#16 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/stg/tmc18c30.c#8 integrate .. //depot/projects/hammer/sys/dev/stg/tmc18c30_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/stg/tmc18c30_pccard.c#11 integrate .. //depot/projects/hammer/sys/dev/stg/tmc18c30_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/stg/tmc18c30_subr.c#5 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#17 integrate .. //depot/projects/hammer/sys/dev/syscons/scgfbrndr.c#5 integrate .. //depot/projects/hammer/sys/dev/syscons/scmouse.c#7 integrate .. //depot/projects/hammer/sys/dev/syscons/scvesactl.c#4 integrate .. //depot/projects/hammer/sys/dev/syscons/scvgarndr.c#5 integrate .. //depot/projects/hammer/sys/dev/syscons/scvidctl.c#5 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#31 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.h#8 integrate .. //depot/projects/hammer/sys/dev/tga/tga_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#18 integrate .. //depot/projects/hammer/sys/dev/twe/twe_compat.h#9 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#19 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#19 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#6 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#17 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#36 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#34 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#24 integrate .. //depot/projects/hammer/sys/i386/i386/autoconf.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#21 integrate .. //depot/projects/hammer/sys/i386/i386/ptrace_machdep.c#1 branch .. //depot/projects/hammer/sys/i386/i386/trap.c#32 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_proto.h#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_syscall.h#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysent.c#8 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.master#6 integrate .. //depot/projects/hammer/sys/i386/include/bus.h#4 integrate .. //depot/projects/hammer/sys/i386/include/bus_memio.h#3 delete .. //depot/projects/hammer/sys/i386/include/bus_pio.h#3 delete .. //depot/projects/hammer/sys/i386/include/ptrace.h#4 integrate .. //depot/projects/hammer/sys/i386/include/reg.h#6 integrate .. //depot/projects/hammer/sys/i386/include/timerreg.h#2 integrate .. //depot/projects/hammer/sys/i386/isa/if_el.c#10 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#11 integrate .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#14 integrate .. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#14 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#15 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.master#14 integrate .. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_pci.c#12 integrate .. //depot/projects/hammer/sys/ia64/ia64/autoconf.c#6 integrate .. //depot/projects/hammer/sys/ia64/include/bus.h#17 integrate .. //depot/projects/hammer/sys/ia64/include/bus_memio.h#3 delete .. //depot/projects/hammer/sys/ia64/include/bus_pio.h#3 delete .. //depot/projects/hammer/sys/isa/atkbdc_isa.c#8 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#29 integrate .. //depot/projects/hammer/sys/kern/imgact_shell.c#9 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#44 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#48 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_linker.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_ntptime.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#78 integrate .. //depot/projects/hammer/sys/kern/makesyscalls.sh#6 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#15 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#43 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#43 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#35 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#30 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#54 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#47 integrate .. //depot/projects/hammer/sys/net/bpf.h#12 integrate .. //depot/projects/hammer/sys/net/bridge.c#24 integrate .. //depot/projects/hammer/sys/net/if.c#46 integrate .. //depot/projects/hammer/sys/net/if_tap.c#24 integrate .. //depot/projects/hammer/sys/net/if_types.h#7 integrate .. //depot/projects/hammer/sys/net/if_var.h#30 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#16 integrate .. //depot/projects/hammer/sys/netinet/in.c#15 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#35 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#56 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#34 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#49 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#17 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#44 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#31 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#30 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#32 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#15 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#18 integrate .. //depot/projects/hammer/sys/netipx/ipx.h#4 integrate .. //depot/projects/hammer/sys/opencrypto/deflate.c#4 integrate .. //depot/projects/hammer/sys/pc98/cbus/scgdcrndr.c#2 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#44 integrate .. //depot/projects/hammer/sys/pc98/include/bus_memio.h#3 delete .. //depot/projects/hammer/sys/pc98/include/bus_pio.h#3 delete .. //depot/projects/hammer/sys/pc98/include/timerreg.h#2 integrate .. //depot/projects/hammer/sys/pci/alpm.c#8 integrate .. //depot/projects/hammer/sys/pci/amdpm.c#9 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#44 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#27 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#43 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#29 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#34 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#38 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#31 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#29 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#21 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#30 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#24 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#50 integrate .. //depot/projects/hammer/sys/pci/intpm.c#8 integrate .. //depot/projects/hammer/sys/pci/viapm.c#9 integrate .. //depot/projects/hammer/sys/powerpc/include/bus_memio.h#3 delete .. //depot/projects/hammer/sys/powerpc/include/bus_pio.h#3 delete .. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#11 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/autoconf.c#6 integrate .. //depot/projects/hammer/sys/powerpc/psim/sio_iobus.c#3 integrate .. //depot/projects/hammer/sys/sparc64/include/bus_memio.h#3 delete .. //depot/projects/hammer/sys/sparc64/include/bus_pio.h#3 delete .. //depot/projects/hammer/sys/sparc64/sparc64/autoconf.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#34 integrate .. //depot/projects/hammer/sys/sys/_pthreadtypes.h#1 branch .. //depot/projects/hammer/sys/sys/bufobj.h#5 integrate .. //depot/projects/hammer/sys/sys/malloc.h#10 integrate .. //depot/projects/hammer/sys/sys/param.h#60 integrate .. //depot/projects/hammer/sys/sys/pmc.h#3 integrate .. //depot/projects/hammer/sys/sys/pmckern.h#2 integrate .. //depot/projects/hammer/sys/sys/proc.h#82 integrate .. //depot/projects/hammer/sys/sys/syscall.h#42 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#42 integrate .. //depot/projects/hammer/sys/sys/sysent.h#6 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#42 integrate .. //depot/projects/hammer/sys/sys/types.h#20 integrate .. //depot/projects/hammer/sys/sys/vnode.h#54 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#49 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#36 integrate .. //depot/projects/hammer/sys/vm/vm_pageq.c#10 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/README#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/libtest.a#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/libtest.a#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/libtest.a#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t0/Makefile#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t0/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t0/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t0/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t0/libtest.a#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t0/test.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t1/Makefile#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t1/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t1/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t1/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t1/libtest.a#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t1/test.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t2/Makefile#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t2/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t2/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t2/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t2/libtest.a#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/archives/t2/test.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t0/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t0/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t0/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t0/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t0/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t0/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t0/test.t#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t1/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t1/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t1/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t1/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t1/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t1/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t1/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t1/test.t#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t2/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t2/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t2/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t2/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t2/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t2/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t2/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t2/test.t#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t3/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t3/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t3/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t3/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t3/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t3/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/basic/t3/test.t#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/common.sh#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/builtin/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/builtin/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/builtin/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/builtin/expected.status.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/builtin/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/builtin/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/builtin/sh#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/builtin/sh.sh#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/builtin/test.t#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/meta/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/meta/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/meta/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/meta/expected.status.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/meta/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/meta/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/meta/expected.stderr.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/meta/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/meta/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/meta/expected.stdout.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/meta/sh#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/meta/sh.sh#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/meta/test.t#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/expected.status.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/expected.stderr.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/expected.stdout.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/sh#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/sh.sh#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path/test.t#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/expected.status.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/sh.sh#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/shell#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/path_select/test.t#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/replace/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/replace/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/replace/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/replace/expected.status.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/replace/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/replace/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/replace/expected.stderr.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/replace/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/replace/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/replace/expected.stdout.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/replace/sh.sh#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/replace/shell#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/replace/test.t#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/expected.status.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/expected.stderr.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/expected.stdout.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/shell/select/test.t#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/basic/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/basic/TEST1.a#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/basic/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/basic/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/basic/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/basic/test.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild1/TEST1.a#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild1/TEST2.a#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild1/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild1/test.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild2/TEST1.a#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild2/TEST2.a#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild2/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/src_wild2/test.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t0/Makefile#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t0/TEST1.a#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t0/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t0/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t0/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t0/test.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t1/Makefile#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t1/TEST1.a#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t1/TEST2.a#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t1/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t1/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t1/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t1/test.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t2/Makefile#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t2/TEST1.a#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t2/TEST2.a#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t2/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t2/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t2/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/suffixes/t2/test.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/syntax/enl/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/syntax/enl/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/syntax/enl/expected.status.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/syntax/enl/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/syntax/enl/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/syntax/enl/test.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/modifier_M/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/modifier_M/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/modifier_M/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/modifier_M/test.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/t0/Makefile#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/t0/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/t0/expected.status.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/t0/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/t0/expected.stderr.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/t0/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/t0/expected.stdout.1#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/t0/test.t#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/t1/expected.status#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/t1/expected.stderr#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/t1/expected.stdout#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/variables/t1/test.t#2 delete .. //depot/projects/hammer/tools/tools/ministat/ministat.c#4 integrate .. //depot/projects/hammer/usr.bin/bzip2/doc/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/bzip2/doc/manual.texi.diff#2 delete .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#36 integrate .. //depot/projects/hammer/usr.bin/ipcs/ipcs.c#8 integrate .. //depot/projects/hammer/usr.bin/lockf/lockf.1#4 integrate .. //depot/projects/hammer/usr.bin/logger/logger.c#3 integrate .. //depot/projects/hammer/usr.bin/login/login.c#7 integrate .. //depot/projects/hammer/usr.bin/make/Makefile#20 integrate .. //depot/projects/hammer/usr.bin/make/cond.c#22 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_clntout.c#2 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_cout.c#2 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_hout.c#2 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_main.c#6 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_parse.c#2 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_scan.c#2 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_svcout.c#3 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_tblout.c#4 integrate .. //depot/projects/hammer/usr.bin/rpcgen/rpc_util.c#2 integrate .. //depot/projects/hammer/usr.bin/systat/systat.1#6 integrate .. //depot/projects/hammer/usr.bin/tail/tail.c#3 integrate .. //depot/projects/hammer/usr.bin/truss/syscalls.c#17 integrate .. //depot/projects/hammer/usr.bin/tset/map.c#2 integrate .. //depot/projects/hammer/usr.bin/tsort/tsort.c#4 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.8#9 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#18 integrate .. //depot/projects/hammer/usr.bin/who/who.c#5 integrate .. //depot/projects/hammer/usr.bin/whois/whois.c#11 integrate .. //depot/projects/hammer/usr.sbin/apm/apm.8#10 integrate .. //depot/projects/hammer/usr.sbin/apm/apm.c#11 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpcontrol/search.c#4 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_atm/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/chkgrp/chkgrp.8#4 integrate .. //depot/projects/hammer/usr.sbin/chkgrp/chkgrp.c#4 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.8#7 integrate .. //depot/projects/hammer/usr.sbin/iostat/iostat.8#5 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#21 integrate .. //depot/projects/hammer/usr.sbin/ntp/doc/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/pcvt/kbdio/kbdio.y#3 integrate .. //depot/projects/hammer/usr.sbin/pcvt/kbdio/lex.l#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/vgaio/lex.l#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/vgaio/vgaio.y#3 integrate .. //depot/projects/hammer/usr.sbin/pwd_mkdb/pwd_mkdb.c#9 integrate .. //depot/projects/hammer/usr.sbin/rpc.umntall/rpc.umntall.c#4 integrate .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#9 integrate .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/config.h#4 integrate .. //depot/projects/hammer/usr.sbin/vidcontrol/vidcontrol.1#4 integrate .. //depot/projects/hammer/usr.sbin/vidcontrol/vidcontrol.c#6 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#33 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.104 2005/05/24 08:23:01 krion Exp $ +$FreeBSD: src/MAINTAINERS,v 1.107 2005/05/31 20:12:59 obrien Exp $ subsystem login notes ----------------------------- @@ -92,6 +92,10 @@ changes pre-commit review requested. contrib/pf mlaier Pre-commit review requested. binutils obrien Insists on BU blocked from unapproved commits +file obrien Insists to keep file blocked from other's unapproved + commits +contrib/bzip2 obrien Pre-commit review required. +lukemftpd obrien Pre-commit review required. geom_concat pjd Pre-commit review preferred. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 2 16:29:59 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A4ED16A420; Thu, 2 Jun 2005 16:29:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D009516A41C for ; Thu, 2 Jun 2005 16:29:58 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD31743D48 for ; Thu, 2 Jun 2005 16:29:58 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j52GTwuf057591 for ; Thu, 2 Jun 2005 16:29:58 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j52GTwOC057588 for perforce@freebsd.org; Thu, 2 Jun 2005 16:29:58 GMT (envelope-from peter@freebsd.org) Date: Thu, 2 Jun 2005 16:29:58 GMT Message-Id: <200506021629.j52GTwOC057588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 77885 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2005 16:30:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=77885 Change 77885 by peter@peter_daintree on 2005/06/02 16:28:57 integ -b i386_hammer. Ignore xmmreg thing for now since we already use it (the fxsave/restore format) as the native fpreg format already. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#21 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#41 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#62 integrate .. //depot/projects/hammer/sys/amd64/include/bus.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/bus_memio.h#8 delete .. //depot/projects/hammer/sys/amd64/include/bus_pio.h#8 delete .. //depot/projects/hammer/sys/amd64/include/ptrace.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/reg.h#12 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#21 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#41 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#62 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus.h#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/ptrace.h#9 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/reg.h#12 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jun 2 20:48:12 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81DFB16A420; Thu, 2 Jun 2005 20:48:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B57F16A41C for ; Thu, 2 Jun 2005 20:48:12 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 386B843D1D for ; Thu, 2 Jun 2005 20:48:12 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j52KmCTC082265 for ; Thu, 2 Jun 2005 20:48:12 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j52KmBqn082262 for perforce@freebsd.org; Thu, 2 Jun 2005 20:48:11 GMT (envelope-from areisse@nailabs.com) Date: Thu, 2 Jun 2005 20:48:11 GMT Message-Id: <200506022048.j52KmBqn082262@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 77892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2005 20:48:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=77892 Change 77892 by areisse@areisse_tislabs on 2005/06/02 20:47:59 Small policy fixes: -Ordinary user roles should be able to change passwords, which requires running pwd_mkdb. -Checkpolicy creates fds. -loadpolicy is installed in /usr/sbin, not /sbin. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#22 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/checkpolicy.te#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/passwd.te#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#22 (text+ko) ==== @@ -18,7 +18,7 @@ FLASKDIR = flask/ PREFIX = /usr -LOADPOLICY = $(DESTDIR)/sbin/sebsd_loadpolicy +LOADPOLICY = $(DESTDIR)/usr/sbin/sebsd_loadpolicy CHECKPOLICY = $(DESTDIR)/sbin/sebsd_checkpolicy SETFILES = $(DESTDIR)/sbin/sebsd_setfiles .if (POLICYVERCOMPAT) ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/checkpolicy.te#3 (text+ko) ==== @@ -63,3 +63,4 @@ allow checkpolicy_t console_device_t:chr_file { read write }; allow checkpolicy_t init_t:fd { use }; allow checkpolicy_t selinux_config_t:dir { search }; +allow checkpolicy_t self:fd create; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/passwd.te#6 (text+ko) ==== @@ -149,6 +149,7 @@ role system_r types pwdmkdb_t; role sysadm_r types pwdmkdb_t; +in_user_role(pwdmkdb_t); general_domain_access(pwdmkdb_t); uses_shlib(pwdmkdb_t); From owner-p4-projects@FreeBSD.ORG Fri Jun 3 06:03:33 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44D3716A420; Fri, 3 Jun 2005 06:03:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 05BB616A41C for ; Fri, 3 Jun 2005 06:03:33 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE88843D48 for ; Fri, 3 Jun 2005 06:03:32 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5363WCh023622 for ; Fri, 3 Jun 2005 06:03:32 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5363WgQ023619 for perforce@freebsd.org; Fri, 3 Jun 2005 06:03:32 GMT (envelope-from peter@freebsd.org) Date: Fri, 3 Jun 2005 06:03:32 GMT Message-Id: <200506030603.j5363WgQ023619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 77909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jun 2005 06:03:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=77909 Change 77909 by peter@peter_daintree on 2005/06/03 06:03:20 Grab ps's kqueue WIP for testing Affected files ... .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#25 edit .. //depot/projects/hammer/sys/kern/kern_event.c#33 edit .. //depot/projects/hammer/sys/sys/event.h#8 edit .. //depot/projects/hammer/sys/sys/syscallsubr.h#19 edit Differences ... ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#25 (text+ko) ==== @@ -52,6 +52,7 @@ #include #include #include +#include /* Must come after sys/selinfo.h */ #include /* Must come after sys/selinfo.h */ #include #include @@ -552,16 +553,75 @@ }; CTASSERT(sizeof(struct kevent32) == 20); +static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count); +static int freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count); + +/* + * Copy 'count' items into the destination list pointed to by uap->eventlist. + */ +static int +freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count) +{ + struct freebsd32_kevent_args *uap; + struct kevent32 ks32[KQ_NEVENTS]; + int i, error = 0; + + KASSERT(count <= KQ_NEVENTS, "count > KQ_NEVENTS"); + uap = (struct freebsd32_kevent_args *)arg; + + for (i = 0; i < count; i++) { + CP(kevp[i], ks32[i], ident); + CP(kevp[i], ks32[i], filter); + CP(kevp[i], ks32[i], flags); + CP(kevp[i], ks32[i], fflags); + CP(kevp[i], ks32[i], data); + PTROUT_CP(kevp[i], ks32[i], udata); + } + error = copyout(ks32, uap->eventlist, count * sizeof *ks32); + if (error == 0) + uap->eventlist += count; + return (error); +} +/* + * Copy 'count' items from the list pointed to by uap->changelist. + */ +static int +freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count) +{ + struct freebsd32_kevent_args *uap; + struct kevent32 ks32[KQ_NEVENTS]; + int i, error = 0; + + KASSERT(count <= KQ_NEVENTS, "count > KQ_NEVENTS"); + uap = (struct freebsd32_kevent_args *)arg; + + error = copyin(uap->changelist, ks32, count * sizeof *ks32); + if (error) + goto done; + uap->changelist += count; + + for (i = 0; i < count; i++) { + CP(ks32[i], kevp[i], ident); + CP(ks32[i], kevp[i], filter); + CP(ks32[i], kevp[i], flags); + CP(ks32[i], kevp[i], fflags); + CP(ks32[i], kevp[i], data); + PTRIN_CP(ks32[i], kevp[i], udata); + } +done: + return (error); +} + int freebsd32_kevent(struct thread *td, struct freebsd32_kevent_args *uap) { struct timespec32 ts32; struct timespec ts, *tsp; - struct kevent *ks; - struct kevent32 ks32; - struct kevent *changes, *events; - int error, i; + struct kevent_copyops k_ops = { uap, + freebsd32_kevent_copyout, + freebsd32_kevent_copyin}; + int error; if (uap->timeout) { @@ -573,51 +633,8 @@ tsp = &ts; } else tsp = NULL; - if (uap->changelist && uap->nchanges > 0) { - changes = malloc(sizeof(struct kevent) * uap->nchanges, M_TEMP, - M_WAITOK); - for (i = 0; i < uap->nchanges; i++) { - error = copyin(&uap->changelist[i], &ks32, - sizeof(ks32)); - if (error) { - free(changes, M_TEMP); - return (error); - } - ks = &changes[i]; - CP(ks32, *ks, ident); - CP(ks32, *ks, filter); - CP(ks32, *ks, flags); - CP(ks32, *ks, fflags); - CP(ks32, *ks, data); - PTRIN_CP(ks32, *ks, udata); - } - } else - changes = NULL; - if (uap->eventlist && uap->nevents > 0) - events = malloc(sizeof(struct kevent) * uap->nevents, M_TEMP, - M_WAITOK); - else - events = NULL; - error = kern_kevent(td, uap->fd, changes, uap->nchanges, UIO_SYSSPACE, - events, uap->nevents, UIO_SYSSPACE, tsp); - free(changes, M_TEMP); - if (uap->eventlist && events && td->td_retval[0] > 0) { - for (i = 0; i < td->td_retval[0]; i++) { - ks = &events[i]; - CP(*ks, ks32, ident); - CP(*ks, ks32, filter); - CP(*ks, ks32, flags); - CP(*ks, ks32, fflags); - CP(*ks, ks32, data); - PTROUT_CP(*ks, ks32, udata); - error = copyout(&ks32, &uap->eventlist[i], - sizeof(ks32)); - if (error) - break; - } - } - if (events) - free(events, M_TEMP); + error = kern_kevent(td, uap->fd, uap->nchanges, uap->nevents, + &k_ops, tsp); return (error); } ==== //depot/projects/hammer/sys/kern/kern_event.c#33 (text+ko) ==== @@ -81,17 +81,17 @@ TASKQUEUE_DEFINE_THREAD(kqueue); -static int kevent_copyout(struct kevent **eventlist, enum uio_seg eventseg, - struct kevent *kevp, int count); +static int kevent_copyout(void *arg, struct kevent *kevp, int count); +static int kevent_copyin(void *arg, struct kevent *kevp, int count); static int kqueue_aquire(struct file *fp, struct kqueue **kqp); static void kqueue_release(struct kqueue *kq, int locked); static int kqueue_expand(struct kqueue *kq, struct filterops *fops, uintptr_t ident, int waitok); static void kqueue_task(void *arg, int pending); static int kqueue_scan(struct kqueue *kq, int maxevents, - struct kevent *eventlist, enum uio_seg eventseg, - const struct timespec *timeout, struct kevent *keva, - struct thread *td); + struct kevent_copyops *k_ops, + const struct timespec *timeout, + struct kevent *keva, struct thread *td); static void kqueue_wakeup(struct kqueue *kq); static struct filterops *kqueue_fo_find(int filt); static void kqueue_fo_release(int filt); @@ -536,6 +536,9 @@ kevent(struct thread *td, struct kevent_args *uap) { struct timespec ts, *tsp; + struct kevent_copyops k_ops = { uap, + kevent_copyout, + kevent_copyin}; int error; if (uap->timeout != NULL) { @@ -546,36 +549,49 @@ } else tsp = NULL; - return (kern_kevent(td, uap->fd, uap->changelist, uap->nchanges, - UIO_USERSPACE, uap->eventlist, uap->nevents, UIO_USERSPACE, tsp)); + return (kern_kevent(td, uap->fd, uap->nchanges, uap->nevents, + &k_ops, tsp)); +} + +/* + * Copy 'count' items into the destination list pointed to by uap->eventlist. + */ +static int +kevent_copyout(void *arg, struct kevent *kevp, int count) +{ + struct kevent_args *uap; + int error; + + KASSERT(count <= KQ_NEVENTS, "count > KQ_NEVENTS"); + uap = (struct kevent_args *)arg; + + error = copyout(kevp, uap->eventlist, count * sizeof *kevp); + if (error == 0) + uap->eventlist += count; + return (error); } /* - * Copy 'count' items into the destination list pointd to by *eventlist. The - * eventlist and nevents values are updated to point after the copied out - * item(s) upon return. + * Copy 'count' items from the list pointed to by uap->changelist. */ static int -kevent_copyout(struct kevent **eventlist, enum uio_seg eventseg, - struct kevent *kevp, int count) +kevent_copyin(void *arg, struct kevent *kevp, int count) { + struct kevent_args *uap; int error; - if (eventseg == UIO_USERSPACE) - error = copyout(kevp, *eventlist, - sizeof(struct kevent) * count); - else { - bcopy(kevp, *eventlist, sizeof(struct kevent) * count); - error = 0; - } - *eventlist += count; + KASSERT(count <= KQ_NEVENTS, "count > KQ_NEVENTS"); + uap = (struct kevent_args *)arg; + + error = copyin(uap->changelist, kevp, count * sizeof *kevp); + if (error == 0) + uap->changelist += count; return (error); } int -kern_kevent(struct thread *td, int fd, struct kevent *changelist, int nchanges, - enum uio_seg changeseg, struct kevent *eventlist, int nevents, - enum uio_seg eventseg, const struct timespec *timeout) +kern_kevent(struct thread *td, int fd, int nchanges, int nevents, + struct kevent_copyops *k_ops, const struct timespec *timeout) { struct kevent keva[KQ_NEVENTS]; struct kevent *kevp, *changes; @@ -591,16 +607,11 @@ nerrors = 0; while (nchanges > 0) { - if (changeseg == UIO_USERSPACE) { - n = nchanges > KQ_NEVENTS ? KQ_NEVENTS : nchanges; - error = copyin(changelist, keva, n * sizeof *keva); - if (error) - goto done; - changes = keva; - } else { - changes = changelist; - n = nchanges; - } + n = nchanges > KQ_NEVENTS ? KQ_NEVENTS : nchanges; + error = k_ops->k_copyin(k_ops->arg, keva, n); + if (error) + goto done; + changes = keva; for (i = 0; i < n; i++) { kevp = &changes[i]; kevp->flags &= ~EV_SYSFLAGS; @@ -609,8 +620,8 @@ if (nevents != 0) { kevp->flags = EV_ERROR; kevp->data = error; - (void) kevent_copyout(&eventlist, - eventseg, kevp, 1); + (void) k_ops->k_copyout(k_ops->arg, + kevp, 1); nevents--; nerrors++; } else { @@ -619,7 +630,6 @@ } } nchanges -= n; - changelist += n; } if (nerrors) { td->td_retval[0] = nerrors; @@ -627,8 +637,7 @@ goto done; } - error = kqueue_scan(kq, nevents, eventlist, eventseg, timeout, - keva, td); + error = kqueue_scan(kq, nevents, k_ops, timeout, keva, td); done: kqueue_release(kq, 0); done_norel: @@ -1087,9 +1096,8 @@ * We treat KN_MARKER knotes as if they are INFLUX. */ static int -kqueue_scan(struct kqueue *kq, int maxevents, struct kevent *eventlist, - enum uio_seg eventseg, const struct timespec *tsp, struct kevent *keva, - struct thread *td) +kqueue_scan(struct kqueue *kq, int maxevents, struct kevent_copyops *k_ops, + const struct timespec *tsp, struct kevent *keva, struct thread *td) { struct kevent *kevp; struct timeval atv, rtv, ttv; @@ -1242,8 +1250,7 @@ if (nkev == KQ_NEVENTS) { KQ_UNLOCK_FLUX(kq); - error = kevent_copyout(&eventlist, eventseg, keva, - nkev); + error = k_ops->k_copyout(k_ops->arg, keva, nkev); nkev = 0; kevp = keva; KQ_LOCK(kq); @@ -1260,7 +1267,7 @@ done_nl: KQ_NOTOWNED(kq); if (nkev != 0) - error = kevent_copyout(&eventlist, eventseg, keva, nkev); + error = k_ops->k_copyout(k_ops->arg, keva, nkev); td->td_retval[0] = maxevents - count; return (error); } ==== //depot/projects/hammer/sys/sys/event.h#8 (text+ko) ==== @@ -192,6 +192,11 @@ #define kn_data kn_kevent.data #define kn_fp kn_ptr.p_fp }; +struct kevent_copyops { + void *arg; + int (*k_copyout)(void *arg, struct kevent *kevp, int count); + int (*k_copyin)(void *arg, struct kevent *kevp, int count); +}; struct thread; struct proc; ==== //depot/projects/hammer/sys/sys/syscallsubr.h#19 (text+ko) ==== @@ -44,6 +44,7 @@ struct sockaddr; struct stat; struct kevent; +struct kevent_copyops; int kern___getcwd(struct thread *td, u_char *buf, enum uio_seg bufseg, u_int buflen); @@ -72,9 +73,8 @@ int kern_getrusage(struct thread *td, int who, struct rusage *rup); int kern_getsockopt(struct thread *td, int s, int level, int name, void *optval, enum uio_seg valseg, socklen_t *valsize); -int kern_kevent(struct thread *td, int fd, struct kevent *changelist, - int nchanges, enum uio_seg changeseg, struct kevent *eventlist, - int nevents, enum uio_seg eventseg, const struct timespec *timeout); +int kern_kevent(struct thread *td, int fd, int nchanges, int nevents, + struct kevent_copyops *k_ops, const struct timespec *timeout); int kern_lchown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid); int kern_link(struct thread *td, char *path, char *link, From owner-p4-projects@FreeBSD.ORG Fri Jun 3 06:42:43 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C72DC16A422; Fri, 3 Jun 2005 06:42:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C7E516A41F for ; Fri, 3 Jun 2005 06:42:42 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4387243D49 for ; Fri, 3 Jun 2005 06:42:42 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j536ggvs025040 for ; Fri, 3 Jun 2005 06:42:42 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j536gfmn025037 for perforce@freebsd.org; Fri, 3 Jun 2005 06:42:41 GMT (envelope-from peter@freebsd.org) Date: Fri, 3 Jun 2005 06:42:41 GMT Message-Id: <200506030642.j536gfmn025037@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 77914 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jun 2005 06:42:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=77914 Change 77914 by peter@peter_daintree on 2005/06/03 06:42:15 On second thoughts, lets see if I can get the kernel to boot at all first! Affected files ... .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#26 edit .. //depot/projects/hammer/sys/kern/kern_event.c#34 edit .. //depot/projects/hammer/sys/sys/event.h#9 edit .. //depot/projects/hammer/sys/sys/syscallsubr.h#20 edit Differences ... ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#26 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include #include -#include /* Must come after sys/selinfo.h */ #include /* Must come after sys/selinfo.h */ #include #include @@ -553,75 +552,16 @@ }; CTASSERT(sizeof(struct kevent32) == 20); -static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count); -static int freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count); - -/* - * Copy 'count' items into the destination list pointed to by uap->eventlist. - */ -static int -freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count) -{ - struct freebsd32_kevent_args *uap; - struct kevent32 ks32[KQ_NEVENTS]; - int i, error = 0; - - KASSERT(count <= KQ_NEVENTS, "count > KQ_NEVENTS"); - uap = (struct freebsd32_kevent_args *)arg; - - for (i = 0; i < count; i++) { - CP(kevp[i], ks32[i], ident); - CP(kevp[i], ks32[i], filter); - CP(kevp[i], ks32[i], flags); - CP(kevp[i], ks32[i], fflags); - CP(kevp[i], ks32[i], data); - PTROUT_CP(kevp[i], ks32[i], udata); - } - error = copyout(ks32, uap->eventlist, count * sizeof *ks32); - if (error == 0) - uap->eventlist += count; - return (error); -} -/* - * Copy 'count' items from the list pointed to by uap->changelist. - */ -static int -freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count) -{ - struct freebsd32_kevent_args *uap; - struct kevent32 ks32[KQ_NEVENTS]; - int i, error = 0; - - KASSERT(count <= KQ_NEVENTS, "count > KQ_NEVENTS"); - uap = (struct freebsd32_kevent_args *)arg; - - error = copyin(uap->changelist, ks32, count * sizeof *ks32); - if (error) - goto done; - uap->changelist += count; - - for (i = 0; i < count; i++) { - CP(ks32[i], kevp[i], ident); - CP(ks32[i], kevp[i], filter); - CP(ks32[i], kevp[i], flags); - CP(ks32[i], kevp[i], fflags); - CP(ks32[i], kevp[i], data); - PTRIN_CP(ks32[i], kevp[i], udata); - } -done: - return (error); -} - int freebsd32_kevent(struct thread *td, struct freebsd32_kevent_args *uap) { struct timespec32 ts32; struct timespec ts, *tsp; - struct kevent_copyops k_ops = { uap, - freebsd32_kevent_copyout, - freebsd32_kevent_copyin}; - int error; + struct kevent *ks; + struct kevent32 ks32; + struct kevent *changes, *events; + int error, i; if (uap->timeout) { @@ -633,8 +573,51 @@ tsp = &ts; } else tsp = NULL; - error = kern_kevent(td, uap->fd, uap->nchanges, uap->nevents, - &k_ops, tsp); + if (uap->changelist && uap->nchanges > 0) { + changes = malloc(sizeof(struct kevent) * uap->nchanges, M_TEMP, + M_WAITOK); + for (i = 0; i < uap->nchanges; i++) { + error = copyin(&uap->changelist[i], &ks32, + sizeof(ks32)); + if (error) { + free(changes, M_TEMP); + return (error); + } + ks = &changes[i]; + CP(ks32, *ks, ident); + CP(ks32, *ks, filter); + CP(ks32, *ks, flags); + CP(ks32, *ks, fflags); + CP(ks32, *ks, data); + PTRIN_CP(ks32, *ks, udata); + } + } else + changes = NULL; + if (uap->eventlist && uap->nevents > 0) + events = malloc(sizeof(struct kevent) * uap->nevents, M_TEMP, + M_WAITOK); + else + events = NULL; + error = kern_kevent(td, uap->fd, changes, uap->nchanges, UIO_SYSSPACE, + events, uap->nevents, UIO_SYSSPACE, tsp); + free(changes, M_TEMP); + if (uap->eventlist && events && td->td_retval[0] > 0) { + for (i = 0; i < td->td_retval[0]; i++) { + ks = &events[i]; + CP(*ks, ks32, ident); + CP(*ks, ks32, filter); + CP(*ks, ks32, flags); + CP(*ks, ks32, fflags); + CP(*ks, ks32, data); + PTROUT_CP(*ks, ks32, udata); + error = copyout(&ks32, &uap->eventlist[i], + sizeof(ks32)); + if (error) + break; + } + } + if (events) + free(events, M_TEMP); return (error); } ==== //depot/projects/hammer/sys/kern/kern_event.c#34 (text+ko) ==== @@ -81,17 +81,17 @@ TASKQUEUE_DEFINE_THREAD(kqueue); -static int kevent_copyout(void *arg, struct kevent *kevp, int count); -static int kevent_copyin(void *arg, struct kevent *kevp, int count); +static int kevent_copyout(struct kevent **eventlist, enum uio_seg eventseg, + struct kevent *kevp, int count); static int kqueue_aquire(struct file *fp, struct kqueue **kqp); static void kqueue_release(struct kqueue *kq, int locked); static int kqueue_expand(struct kqueue *kq, struct filterops *fops, uintptr_t ident, int waitok); static void kqueue_task(void *arg, int pending); static int kqueue_scan(struct kqueue *kq, int maxevents, - struct kevent_copyops *k_ops, - const struct timespec *timeout, - struct kevent *keva, struct thread *td); + struct kevent *eventlist, enum uio_seg eventseg, + const struct timespec *timeout, struct kevent *keva, + struct thread *td); static void kqueue_wakeup(struct kqueue *kq); static struct filterops *kqueue_fo_find(int filt); static void kqueue_fo_release(int filt); @@ -536,9 +536,6 @@ kevent(struct thread *td, struct kevent_args *uap) { struct timespec ts, *tsp; - struct kevent_copyops k_ops = { uap, - kevent_copyout, - kevent_copyin}; int error; if (uap->timeout != NULL) { @@ -549,49 +546,36 @@ } else tsp = NULL; - return (kern_kevent(td, uap->fd, uap->nchanges, uap->nevents, - &k_ops, tsp)); + return (kern_kevent(td, uap->fd, uap->changelist, uap->nchanges, + UIO_USERSPACE, uap->eventlist, uap->nevents, UIO_USERSPACE, tsp)); } /* - * Copy 'count' items into the destination list pointed to by uap->eventlist. + * Copy 'count' items into the destination list pointd to by *eventlist. The + * eventlist and nevents values are updated to point after the copied out + * item(s) upon return. */ static int -kevent_copyout(void *arg, struct kevent *kevp, int count) +kevent_copyout(struct kevent **eventlist, enum uio_seg eventseg, + struct kevent *kevp, int count) { - struct kevent_args *uap; int error; - KASSERT(count <= KQ_NEVENTS, "count > KQ_NEVENTS"); - uap = (struct kevent_args *)arg; - - error = copyout(kevp, uap->eventlist, count * sizeof *kevp); - if (error == 0) - uap->eventlist += count; + if (eventseg == UIO_USERSPACE) + error = copyout(kevp, *eventlist, + sizeof(struct kevent) * count); + else { + bcopy(kevp, *eventlist, sizeof(struct kevent) * count); + error = 0; + } + *eventlist += count; return (error); } -/* - * Copy 'count' items from the list pointed to by uap->changelist. - */ -static int -kevent_copyin(void *arg, struct kevent *kevp, int count) -{ - struct kevent_args *uap; - int error; - - KASSERT(count <= KQ_NEVENTS, "count > KQ_NEVENTS"); - uap = (struct kevent_args *)arg; - - error = copyin(uap->changelist, kevp, count * sizeof *kevp); - if (error == 0) - uap->changelist += count; - return (error); -} - int -kern_kevent(struct thread *td, int fd, int nchanges, int nevents, - struct kevent_copyops *k_ops, const struct timespec *timeout) +kern_kevent(struct thread *td, int fd, struct kevent *changelist, int nchanges, + enum uio_seg changeseg, struct kevent *eventlist, int nevents, + enum uio_seg eventseg, const struct timespec *timeout) { struct kevent keva[KQ_NEVENTS]; struct kevent *kevp, *changes; @@ -607,11 +591,16 @@ nerrors = 0; while (nchanges > 0) { - n = nchanges > KQ_NEVENTS ? KQ_NEVENTS : nchanges; - error = k_ops->k_copyin(k_ops->arg, keva, n); - if (error) - goto done; - changes = keva; + if (changeseg == UIO_USERSPACE) { + n = nchanges > KQ_NEVENTS ? KQ_NEVENTS : nchanges; + error = copyin(changelist, keva, n * sizeof *keva); + if (error) + goto done; + changes = keva; + } else { + changes = changelist; + n = nchanges; + } for (i = 0; i < n; i++) { kevp = &changes[i]; kevp->flags &= ~EV_SYSFLAGS; @@ -620,8 +609,8 @@ if (nevents != 0) { kevp->flags = EV_ERROR; kevp->data = error; - (void) k_ops->k_copyout(k_ops->arg, - kevp, 1); + (void) kevent_copyout(&eventlist, + eventseg, kevp, 1); nevents--; nerrors++; } else { @@ -630,6 +619,7 @@ } } nchanges -= n; + changelist += n; } if (nerrors) { td->td_retval[0] = nerrors; @@ -637,7 +627,8 @@ goto done; } - error = kqueue_scan(kq, nevents, k_ops, timeout, keva, td); + error = kqueue_scan(kq, nevents, eventlist, eventseg, timeout, + keva, td); done: kqueue_release(kq, 0); done_norel: @@ -1096,8 +1087,9 @@ * We treat KN_MARKER knotes as if they are INFLUX. */ static int -kqueue_scan(struct kqueue *kq, int maxevents, struct kevent_copyops *k_ops, - const struct timespec *tsp, struct kevent *keva, struct thread *td) +kqueue_scan(struct kqueue *kq, int maxevents, struct kevent *eventlist, + enum uio_seg eventseg, const struct timespec *tsp, struct kevent *keva, + struct thread *td) { struct kevent *kevp; struct timeval atv, rtv, ttv; @@ -1250,7 +1242,8 @@ if (nkev == KQ_NEVENTS) { KQ_UNLOCK_FLUX(kq); - error = k_ops->k_copyout(k_ops->arg, keva, nkev); + error = kevent_copyout(&eventlist, eventseg, keva, + nkev); nkev = 0; kevp = keva; KQ_LOCK(kq); @@ -1267,7 +1260,7 @@ done_nl: KQ_NOTOWNED(kq); if (nkev != 0) - error = k_ops->k_copyout(k_ops->arg, keva, nkev); + error = kevent_copyout(&eventlist, eventseg, keva, nkev); td->td_retval[0] = maxevents - count; return (error); } ==== //depot/projects/hammer/sys/sys/event.h#9 (text+ko) ==== @@ -192,11 +192,6 @@ #define kn_data kn_kevent.data #define kn_fp kn_ptr.p_fp }; -struct kevent_copyops { - void *arg; - int (*k_copyout)(void *arg, struct kevent *kevp, int count); - int (*k_copyin)(void *arg, struct kevent *kevp, int count); -}; struct thread; struct proc; ==== //depot/projects/hammer/sys/sys/syscallsubr.h#20 (text+ko) ==== @@ -44,7 +44,6 @@ struct sockaddr; struct stat; struct kevent; -struct kevent_copyops; int kern___getcwd(struct thread *td, u_char *buf, enum uio_seg bufseg, u_int buflen); @@ -73,8 +72,9 @@ int kern_getrusage(struct thread *td, int who, struct rusage *rup); int kern_getsockopt(struct thread *td, int s, int level, int name, void *optval, enum uio_seg valseg, socklen_t *valsize); -int kern_kevent(struct thread *td, int fd, int nchanges, int nevents, - struct kevent_copyops *k_ops, const struct timespec *timeout); +int kern_kevent(struct thread *td, int fd, struct kevent *changelist, + int nchanges, enum uio_seg changeseg, struct kevent *eventlist, + int nevents, enum uio_seg eventseg, const struct timespec *timeout); int kern_lchown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid); int kern_link(struct thread *td, char *path, char *link, From owner-p4-projects@FreeBSD.ORG Fri Jun 3 14:22:00 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21FDF16A420; Fri, 3 Jun 2005 14:22:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E6D4316A41C for ; Fri, 3 Jun 2005 14:21:59 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C652F43D49 for ; Fri, 3 Jun 2005 14:21:59 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j53ELxUr056167 for ; Fri, 3 Jun 2005 14:21:59 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j53ELxtw056164 for perforce@freebsd.org; Fri, 3 Jun 2005 14:21:59 GMT (envelope-from areisse@nailabs.com) Date: Fri, 3 Jun 2005 14:21:59 GMT Message-Id: <200506031421.j53ELxtw056164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 77927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jun 2005 14:22:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=77927 Change 77927 by areisse@areisse_tislabs on 2005/06/03 14:21:39 passwd and yppasswd are hard links, and so should have the same label. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/passwd.fc#7 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/passwd.fc#7 (text+ko) ==== @@ -1,5 +1,6 @@ # spasswd /usr/bin/passwd -- system_u:object_r:passwd_exec_t +/usr/bin/yppasswd -- system_u:object_r:passwd_exec_t /usr/bin/chsh -- system_u:object_r:chfn_exec_t /usr/bin/chfn -- system_u:object_r:chfn_exec_t /usr/sbin/vipw -- system_u:object_r:admin_passwd_exec_t From owner-p4-projects@FreeBSD.ORG Fri Jun 3 15:08:57 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEE5E16A420; Fri, 3 Jun 2005 15:08:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7FB4F16A41C for ; Fri, 3 Jun 2005 15:08:56 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CD4243D49 for ; Fri, 3 Jun 2005 15:08:56 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j53F8uVP057942 for ; Fri, 3 Jun 2005 15:08:56 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j53F8uCX057938 for perforce@freebsd.org; Fri, 3 Jun 2005 15:08:56 GMT (envelope-from areisse@nailabs.com) Date: Fri, 3 Jun 2005 15:08:56 GMT Message-Id: <200506031508.j53F8uCX057938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 77928 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jun 2005 15:08:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=77928 Change 77928 by areisse@areisse_tislabs on 2005/06/03 15:08:40 SEBSD documentation updates: Version numbers and path names. Affected files ... .. //depot/projects/trustedbsd/sebsd/SEBSD-Installation.txt#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/SEBSD-Installation.txt#3 (text+ko) ==== @@ -72,10 +72,12 @@ 4. Inspect the SEBSD policy. The system comes pre-installed with a sample policy, but local changes might be required. The policy source is located in /etc/security/sebsd/policy and the compiled - (binary) version is installed in /etc/security/sebsd/policy.bin by + (binary) version is installed in /etc/security/sebsd/policy/policy.bin by default. Only the binary version is loaded by the SEBSD module at boot time. An alternate location for the binary policy file may be - specified at the boot loader or in /boot/loader.conf. + specified at the boot loader or in /boot/loader.conf. The boot loader + uses a symbolic link "policy.bin" in the same directory as policy.17, + in case a different policy file version is necessary. Since SEBSD uses the same policy language as SELinux, the SELinux report titled, "Configuring the SELinux Policy", (available at the @@ -89,7 +91,7 @@ loaded into the kernel. The /sbin/sebsd_loadpolicy program can be used instead of a reboot: - /sbin/sebsd_loadpolicy /etc/security/sebsd/policy.bin + /sbin/sebsd_loadpolicy /etc/security/sebsd/policy/policy.bin Note that policy.bin is installed by default as a symlink to another file. If you plan to generate your own policy file then you might From owner-p4-projects@FreeBSD.ORG Fri Jun 3 18:37:10 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2504016A421; Fri, 3 Jun 2005 18:37:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E460F16A41C for ; Fri, 3 Jun 2005 18:37:09 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A64F243D4C for ; Fri, 3 Jun 2005 18:37:09 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j53Ib9dK073916 for ; Fri, 3 Jun 2005 18:37:09 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j53Ib9NS073913 for perforce@freebsd.org; Fri, 3 Jun 2005 18:37:09 GMT (envelope-from areisse@nailabs.com) Date: Fri, 3 Jun 2005 18:37:09 GMT Message-Id: <200506031837.j53Ib9NS073913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 77936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jun 2005 18:37:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=77936 Change 77936 by areisse@areisse_ibook on 2005/06/03 18:36:36 copyinstr wants a size on darwin. Fix a couple of build/warning issues related to the new selinux pieces. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/security_classes#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscalls.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/security_classes#3 (text+ko) ==== @@ -42,11 +42,6 @@ class mach_port -class port_methods1 -class port_methods2 -class port_methods3 -class port_methods4 - #classes only used by name class mach_task ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.h#3 (text+ko) ==== @@ -40,6 +40,7 @@ #include #define SELINUX_MAGIC 0xf97cff8c +#define SEBSD_ID_STRING "sebsd" #define SEBSD_MAC_EXTATTR_NAME "sebsd" #define SEBSD_MAC_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#4 (text+ko) ==== @@ -209,7 +209,7 @@ }; static int -sebsd_get_bools(struct thread *td, struct sebsd_get_bools *gb) +sebsd_get_bools(struct proc *td, struct sebsd_get_bools *gb) { char *out = NULL; if (gb->out) @@ -314,7 +314,8 @@ { char str[128]; int active, pending; - err = copyinstr(args,str, 128, NULL); + size_t dummy; + err = copyinstr(args,str, 128, &dummy); if (err) return (err); security_get_bool(str, &active, &pending); ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscalls.h#3 (text+ko) ==== @@ -1,6 +1,8 @@ #ifndef _SEBSD_SYSCALLS_H_ #define _SEBSD_SYSCALLS_H_ +#include + /* * TBD: Should we really try to line up with SELinux? */ ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Jun 4 00:25:35 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0815016A420; Sat, 4 Jun 2005 00:25:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ACD6816A41C for ; Sat, 4 Jun 2005 00:25:34 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7091943D1F for ; Sat, 4 Jun 2005 00:25:34 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j540PYNg095231 for ; Sat, 4 Jun 2005 00:25:34 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j540PI7A095202 for perforce@freebsd.org; Sat, 4 Jun 2005 00:25:18 GMT (envelope-from marcel@freebsd.org) Date: Sat, 4 Jun 2005 00:25:18 GMT Message-Id: <200506040025.j540PI7A095202@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 77946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2005 00:25:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=77946 Change 77946 by marcel@marcel_nfs on 2005/06/04 00:25:11 IFC @77944 Affected files ... .. //depot/projects/tty/LOCKS#1 branch .. //depot/projects/tty/MAINTAINERS#12 integrate .. //depot/projects/tty/Makefile.inc1#20 integrate .. //depot/projects/tty/UPDATING#19 integrate .. //depot/projects/tty/bin/ls/cmp.c#6 integrate .. //depot/projects/tty/bin/ls/extern.h#5 integrate .. //depot/projects/tty/bin/ls/ls.1#10 integrate .. //depot/projects/tty/bin/ls/ls.c#8 integrate .. //depot/projects/tty/bin/ls/util.c#8 integrate .. //depot/projects/tty/bin/rmdir/rmdir.1#5 integrate .. //depot/projects/tty/contrib/diff/diff.c#2 integrate .. //depot/projects/tty/contrib/gcc/ChangeLog#6 integrate .. //depot/projects/tty/contrib/gcc/Makefile.in#6 integrate .. //depot/projects/tty/contrib/gcc/attribs.c#4 integrate .. //depot/projects/tty/contrib/gcc/builtins.c#6 integrate .. //depot/projects/tty/contrib/gcc/c-common.c#5 integrate .. //depot/projects/tty/contrib/gcc/c-decl.c#6 integrate .. //depot/projects/tty/contrib/gcc/c-format.c#5 integrate .. //depot/projects/tty/contrib/gcc/c-opts.c#3 integrate .. //depot/projects/tty/contrib/gcc/c-parse.in#5 integrate .. //depot/projects/tty/contrib/gcc/c-ppoutput.c#3 integrate .. //depot/projects/tty/contrib/gcc/c-semantics.c#5 integrate .. //depot/projects/tty/contrib/gcc/c-typeck.c#6 integrate .. //depot/projects/tty/contrib/gcc/c.opt#2 integrate .. //depot/projects/tty/contrib/gcc/calls.c#6 integrate .. //depot/projects/tty/contrib/gcc/cfglayout.c#4 integrate .. //depot/projects/tty/contrib/gcc/cfgrtl.c#5 integrate .. //depot/projects/tty/contrib/gcc/collect2.c#5 integrate .. //depot/projects/tty/contrib/gcc/combine.c#6 integrate .. //depot/projects/tty/contrib/gcc/common.opt#2 integrate .. //depot/projects/tty/contrib/gcc/config.gcc#6 integrate .. //depot/projects/tty/contrib/gcc/config.in#5 integrate .. //depot/projects/tty/contrib/gcc/config/alpha/alpha.c#5 integrate .. //depot/projects/tty/contrib/gcc/config/alpha/alpha.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/alpha/alpha.md#5 integrate .. //depot/projects/tty/contrib/gcc/config/alpha/qrnnd.asm#2 integrate .. //depot/projects/tty/contrib/gcc/config/alpha/t-osf4#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/arm-protos.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/arm.c#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/arm.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/arm.md#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/t-netbsd#4 integrate .. //depot/projects/tty/contrib/gcc/config/arm/t-rtems#1 branch .. //depot/projects/tty/contrib/gcc/config/darwin-protos.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/darwin.c#4 integrate .. //depot/projects/tty/contrib/gcc/config/darwin.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/freebsd-spec.h#7 integrate .. //depot/projects/tty/contrib/gcc/config/freebsd.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/cygwin1.c#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/darwin.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/emmintrin.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/freebsd.h#7 integrate .. //depot/projects/tty/contrib/gcc/config/i386/gthr-win32.c#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386-modes.def#3 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386-protos.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386.c#6 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386.h#7 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386.md#5 integrate .. //depot/projects/tty/contrib/gcc/config/i386/t-rtems-i386#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/xmmintrin.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/ia64.c#5 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/t-glibc#2 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch .. //depot/projects/tty/contrib/gcc/config/ia64/t-hpux#4 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/unwind-ia64.c#5 integrate .. //depot/projects/tty/contrib/gcc/config/ia64/unwind-ia64.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/aix.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/aix41.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/aix43.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/aix52.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/altivec.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/altivec.md#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/beos.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/darwin.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/eabi.asm#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/linux-unwind.h#1 branch .. //depot/projects/tty/contrib/gcc/config/rs6000/linux.h#6 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/linux64.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000-c.c#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000-protos.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000.c#6 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000.h#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rs6000.md#6 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/rtems.h#5 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/spe.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/spe.md#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/sysv4.h#7 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-aix43#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-aix52#2 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-linux64#4 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-newas#3 integrate .. //depot/projects/tty/contrib/gcc/config/rs6000/t-rtems#2 integrate .. //depot/projects/tty/contrib/gcc/config/s390/s390.md#4 integrate .. //depot/projects/tty/contrib/gcc/config/s390/tpf.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sparc.c#5 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/sparc.md#5 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/t-elf#2 integrate .. //depot/projects/tty/contrib/gcc/config/t-libunwind#3 integrate .. //depot/projects/tty/contrib/gcc/config/t-libunwind-elf#1 branch .. //depot/projects/tty/contrib/gcc/config/t-slibgcc-darwin#2 integrate .. //depot/projects/tty/contrib/gcc/config/t-slibgcc-elf-ver#4 integrate .. //depot/projects/tty/contrib/gcc/config/t-slibgcc-sld#3 integrate .. //depot/projects/tty/contrib/gcc/configure#6 integrate .. //depot/projects/tty/contrib/gcc/configure.ac#2 integrate .. //depot/projects/tty/contrib/gcc/cp-demangle.c#4 integrate .. //depot/projects/tty/contrib/gcc/cp/ChangeLog#6 integrate .. //depot/projects/tty/contrib/gcc/cp/Make-lang.in#5 integrate .. //depot/projects/tty/contrib/gcc/cp/call.c#5 integrate .. //depot/projects/tty/contrib/gcc/cp/class.c#5 integrate .. //depot/projects/tty/contrib/gcc/cp/cp-tree.h#6 integrate .. //depot/projects/tty/contrib/gcc/cp/cvt.c#5 integrate .. //depot/projects/tty/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/tty/contrib/gcc/cp/decl.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/decl2.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/error.c#5 integrate .. //depot/projects/tty/contrib/gcc/cp/except.c#5 integrate .. //depot/projects/tty/contrib/gcc/cp/g++spec.c#4 integrate .. //depot/projects/tty/contrib/gcc/cp/init.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/mangle.c#4 integrate .. //depot/projects/tty/contrib/gcc/cp/method.c#4 integrate .. //depot/projects/tty/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/tty/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/tty/contrib/gcc/cp/pt.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/search.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/semantics.c#5 integrate .. //depot/projects/tty/contrib/gcc/cp/tree.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/typeck.c#6 integrate .. //depot/projects/tty/contrib/gcc/cp/typeck2.c#5 integrate .. //depot/projects/tty/contrib/gcc/cppfiles.c#4 integrate .. //depot/projects/tty/contrib/gcc/cpplib.c#6 integrate .. //depot/projects/tty/contrib/gcc/cppmacro.c#4 integrate .. //depot/projects/tty/contrib/gcc/crtstuff.c#4 integrate .. //depot/projects/tty/contrib/gcc/cse.c#5 integrate .. //depot/projects/tty/contrib/gcc/cselib.c#4 integrate .. //depot/projects/tty/contrib/gcc/cselib.h#4 integrate .. //depot/projects/tty/contrib/gcc/dbxout.c#6 integrate .. //depot/projects/tty/contrib/gcc/defaults.h#4 integrate .. //depot/projects/tty/contrib/gcc/doc/extend.texi#5 integrate .. //depot/projects/tty/contrib/gcc/doc/include/gcc-common.texi#6 integrate .. //depot/projects/tty/contrib/gcc/doc/invoke.texi#6 integrate .. //depot/projects/tty/contrib/gcc/doc/md.texi#4 integrate .. //depot/projects/tty/contrib/gcc/doc/tm.texi#6 integrate .. //depot/projects/tty/contrib/gcc/doc/trouble.texi#4 integrate .. //depot/projects/tty/contrib/gcc/dojump.c#2 integrate .. //depot/projects/tty/contrib/gcc/dwarf2out.c#5 integrate .. //depot/projects/tty/contrib/gcc/emit-rtl.c#5 integrate .. //depot/projects/tty/contrib/gcc/explow.c#4 integrate .. //depot/projects/tty/contrib/gcc/expmed.c#4 integrate .. //depot/projects/tty/contrib/gcc/expr.c#6 integrate .. //depot/projects/tty/contrib/gcc/expr.h#5 integrate .. //depot/projects/tty/contrib/gcc/f/ChangeLog#6 integrate .. //depot/projects/tty/contrib/gcc/f/bld.c#4 integrate .. //depot/projects/tty/contrib/gcc/f/malloc.c#3 integrate .. //depot/projects/tty/contrib/gcc/f/news.texi#4 integrate .. //depot/projects/tty/contrib/gcc/flow.c#4 integrate .. //depot/projects/tty/contrib/gcc/fold-const.c#5 integrate .. //depot/projects/tty/contrib/gcc/function.c#7 integrate .. //depot/projects/tty/contrib/gcc/gcc.c#6 integrate .. //depot/projects/tty/contrib/gcc/gcov-io.h#4 integrate .. //depot/projects/tty/contrib/gcc/gcse.c#4 integrate .. //depot/projects/tty/contrib/gcc/ginclude/stddef.h#4 integrate .. //depot/projects/tty/contrib/gcc/gthr-win32.h#4 integrate .. //depot/projects/tty/contrib/gcc/hooks.c#4 integrate .. //depot/projects/tty/contrib/gcc/hooks.h#4 integrate .. //depot/projects/tty/contrib/gcc/ifcvt.c#4 integrate .. //depot/projects/tty/contrib/gcc/jump.c#5 integrate .. //depot/projects/tty/contrib/gcc/libgcc-darwin.ver#2 integrate .. //depot/projects/tty/contrib/gcc/libgcc-std.ver#5 integrate .. //depot/projects/tty/contrib/gcc/libgcc2.c#4 integrate .. //depot/projects/tty/contrib/gcc/libgcc2.h#4 integrate .. //depot/projects/tty/contrib/gcc/loop-unroll.c#2 integrate .. //depot/projects/tty/contrib/gcc/loop.c#6 integrate .. //depot/projects/tty/contrib/gcc/mkheaders.in#3 integrate .. //depot/projects/tty/contrib/gcc/mklibgcc.in#6 integrate .. //depot/projects/tty/contrib/gcc/objc/objc-act.c#4 integrate .. //depot/projects/tty/contrib/gcc/params.def#4 integrate .. //depot/projects/tty/contrib/gcc/params.h#4 integrate .. //depot/projects/tty/contrib/gcc/postreload.c#2 integrate .. //depot/projects/tty/contrib/gcc/predict.c#4 integrate .. //depot/projects/tty/contrib/gcc/real.c#5 integrate .. //depot/projects/tty/contrib/gcc/reg-stack.c#5 integrate .. //depot/projects/tty/contrib/gcc/regclass.c#4 integrate .. //depot/projects/tty/contrib/gcc/regrename.c#4 integrate .. //depot/projects/tty/contrib/gcc/regs.h#4 integrate .. //depot/projects/tty/contrib/gcc/reload.c#4 integrate .. //depot/projects/tty/contrib/gcc/reload1.c#4 integrate .. //depot/projects/tty/contrib/gcc/rtl.h#4 integrate .. //depot/projects/tty/contrib/gcc/sibcall.c#4 integrate .. //depot/projects/tty/contrib/gcc/simplify-rtx.c#4 integrate .. //depot/projects/tty/contrib/gcc/target-def.h#4 integrate .. //depot/projects/tty/contrib/gcc/target.h#4 integrate .. //depot/projects/tty/contrib/gcc/toplev.c#5 integrate .. //depot/projects/tty/contrib/gcc/tree-inline.c#4 integrate .. //depot/projects/tty/contrib/gcc/tree.c#6 integrate .. //depot/projects/tty/contrib/gcc/tree.h#6 integrate .. //depot/projects/tty/contrib/gcc/unwind-compat.c#1 branch .. //depot/projects/tty/contrib/gcc/unwind-compat.h#1 branch .. //depot/projects/tty/contrib/gcc/unwind-dw2-fde-compat.c#1 branch .. //depot/projects/tty/contrib/gcc/unwind-dw2-fde-glibc.c#4 integrate .. //depot/projects/tty/contrib/gcc/unwind-dw2.c#6 integrate .. //depot/projects/tty/contrib/gcc/varasm.c#5 integrate .. //depot/projects/tty/contrib/gcc/version.c#6 integrate .. //depot/projects/tty/contrib/libf2c/ChangeLog#6 integrate .. //depot/projects/tty/contrib/libf2c/libI77/err.c#3 integrate .. //depot/projects/tty/contrib/libobjc/ChangeLog#6 integrate .. //depot/projects/tty/contrib/libobjc/gc.c#4 integrate .. //depot/projects/tty/contrib/libstdc++/ChangeLog#6 integrate .. //depot/projects/tty/contrib/libstdc++/ChangeLog-2004#1 branch .. //depot/projects/tty/contrib/libstdc++/README#3 integrate .. //depot/projects/tty/contrib/libstdc++/acconfig.h#5 integrate .. //depot/projects/tty/contrib/libstdc++/acinclude.m4#6 integrate .. //depot/projects/tty/contrib/libstdc++/aclocal.m4#6 integrate .. //depot/projects/tty/contrib/libstdc++/config.h.in#5 integrate .. //depot/projects/tty/contrib/libstdc++/config/abi/alpha-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/tty/contrib/libstdc++/config/abi/arm-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/tty/contrib/libstdc++/config/abi/hppa-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/tty/contrib/libstdc++/config/abi/i386-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/tty/contrib/libstdc++/config/abi/i486-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/tty/contrib/libstdc++/config/abi/ia64-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/tty/contrib/libstdc++/config/abi/m68k-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/tty/contrib/libstdc++/config/abi/mips-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/tty/contrib/libstdc++/config/abi/powerpc-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/tty/contrib/libstdc++/config/abi/s390-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/tty/contrib/libstdc++/config/abi/s390x-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/tty/contrib/libstdc++/config/abi/sparc-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/tty/contrib/libstdc++/config/abi/x86_64-linux-gnu/32/baseline_symbols.txt#1 branch .. //depot/projects/tty/contrib/libstdc++/config/abi/x86_64-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/tty/contrib/libstdc++/config/io/basic_file_stdio.cc#4 integrate .. //depot/projects/tty/contrib/libstdc++/config/io/c_io_stdio.h#3 integrate .. //depot/projects/tty/contrib/libstdc++/config/linker-map.gnu#5 integrate .. //depot/projects/tty/contrib/libstdc++/config/locale/generic/c_locale.cc#4 integrate .. //depot/projects/tty/contrib/libstdc++/config/locale/generic/c_locale.h#4 integrate .. //depot/projects/tty/contrib/libstdc++/config/locale/generic/time_members.cc#4 integrate .. //depot/projects/tty/contrib/libstdc++/config/locale/gnu/c_locale.h#4 integrate .. //depot/projects/tty/contrib/libstdc++/config/locale/gnu/monetary_members.cc#4 integrate .. //depot/projects/tty/contrib/libstdc++/config/locale/gnu/time_members.cc#4 integrate .. //depot/projects/tty/contrib/libstdc++/config/locale/ieee_1003.1-2001/codecvt_specializations.h#4 integrate .. //depot/projects/tty/contrib/libstdc++/configure#6 integrate .. //depot/projects/tty/contrib/libstdc++/configure.ac#2 integrate .. //depot/projects/tty/contrib/libstdc++/configure.host#4 integrate .. //depot/projects/tty/contrib/libstdc++/crossconfig.m4#2 integrate .. //depot/projects/tty/contrib/libstdc++/include/Makefile.am#6 integrate .. //depot/projects/tty/contrib/libstdc++/include/Makefile.in#6 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/basic_string.h#4 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/basic_string.tcc#4 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/boost_concept_check.h#4 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/c++config#6 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/fstream.tcc#5 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/ios_base.h#4 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/istream.tcc#5 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/locale_facets.h#5 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/locale_facets.tcc#6 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/sstream.tcc#3 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/stl_algo.h#4 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/stl_algobase.h#3 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/stl_list.h#4 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/stl_tree.h#4 integrate .. //depot/projects/tty/contrib/libstdc++/include/bits/vector.tcc#3 integrate .. //depot/projects/tty/contrib/libstdc++/include/debug/map.h#2 integrate .. //depot/projects/tty/contrib/libstdc++/include/ext/pool_allocator.h#2 integrate .. //depot/projects/tty/contrib/libstdc++/include/ext/rope#3 integrate .. //depot/projects/tty/contrib/libstdc++/include/ext/ropeimpl.h#3 integrate .. //depot/projects/tty/contrib/libstdc++/include/std/std_complex.h#4 integrate .. //depot/projects/tty/contrib/libstdc++/include/std/std_fstream.h#5 integrate .. //depot/projects/tty/contrib/libstdc++/include/std/std_memory.h#4 integrate .. //depot/projects/tty/contrib/libstdc++/include/std/std_sstream.h#4 integrate .. //depot/projects/tty/contrib/libstdc++/libsupc++/eh_globals.cc#3 integrate .. //depot/projects/tty/contrib/libstdc++/linkage.m4#2 integrate .. //depot/projects/tty/contrib/libstdc++/src/allocator.cc#2 integrate .. //depot/projects/tty/contrib/libstdc++/src/debug.cc#2 integrate .. //depot/projects/tty/contrib/libstdc++/src/ios.cc#5 integrate .. //depot/projects/tty/contrib/libstdc++/src/ios_init.cc#2 integrate .. //depot/projects/tty/contrib/libstdc++/src/locale_init.cc#2 integrate .. //depot/projects/tty/contrib/libstdc++/src/localename.cc#5 integrate .. //depot/projects/tty/etc/mtree/BSD.root.dist#10 integrate .. //depot/projects/tty/gnu/usr.bin/cc/cc_tools/Makefile#6 integrate .. //depot/projects/tty/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/cvs/contrib/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/cvs/cvs/Makefile#6 integrate .. //depot/projects/tty/gnu/usr.bin/cvs/cvsbug/Makefile#4 integrate .. //depot/projects/tty/gnu/usr.bin/cvs/doc/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/cvs/lib/Makefile#5 integrate .. //depot/projects/tty/gnu/usr.bin/cvs/libdiff/Makefile#4 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/arch/i386/config.h#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#5 integrate .. //depot/projects/tty/gnu/usr.bin/grep/search.c#5 integrate .. //depot/projects/tty/include/Makefile#16 integrate .. //depot/projects/tty/include/netdb.h#9 integrate .. //depot/projects/tty/include/proc_service.h#2 integrate .. //depot/projects/tty/include/pthread.h#8 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.h#4 integrate .. //depot/projects/tty/lib/libarchive/archive_private.h#5 integrate .. //depot/projects/tty/lib/libarchive/archive_read.c#5 integrate .. //depot/projects/tty/lib/libarchive/archive_read_data_into_fd.c#3 integrate .. //depot/projects/tty/lib/libarchive/archive_write.c#5 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_compression_bzip2.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_compression_none.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_format_pax.c#5 integrate .. //depot/projects/tty/lib/libc/net/getnetbydns.c#5 integrate .. //depot/projects/tty/lib/libc/net/getnetbyht.c#6 integrate .. //depot/projects/tty/lib/libc/net/getnetbynis.c#4 integrate .. //depot/projects/tty/lib/libc/net/getnetent.3#4 integrate .. //depot/projects/tty/lib/libc/net/getnetnamadr.c#6 integrate .. //depot/projects/tty/lib/libc/posix1e/Makefile.inc#4 integrate .. //depot/projects/tty/lib/libc_r/uthread/pthread_private.h#8 integrate .. //depot/projects/tty/lib/libc_r/uthread/uthread_exit.c#2 integrate .. //depot/projects/tty/lib/libpcap/Makefile#5 integrate .. //depot/projects/tty/lib/libpthread/arch/alpha/alpha/enter_uts.S#3 integrate .. //depot/projects/tty/lib/librpcsvc/xcrypt.c#2 integrate .. //depot/projects/tty/lib/libstand/Makefile#8 integrate .. //depot/projects/tty/lib/libstand/net.c#2 integrate .. //depot/projects/tty/lib/libstand/udp.c#2 integrate .. //depot/projects/tty/lib/libstand/zalloc_defs.h#4 integrate .. //depot/projects/tty/lib/libthread_db/arch/i386/libpthread_md.c#2 integrate .. //depot/projects/tty/lib/libthread_db/libc_r_db.c#3 integrate .. //depot/projects/tty/lib/libthread_db/libpthread_db.c#4 integrate .. //depot/projects/tty/lib/libthread_db/libpthread_db.h#2 integrate .. //depot/projects/tty/lib/libthread_db/libthr_db.c#4 integrate .. //depot/projects/tty/lib/libthread_db/thread_db.c#2 integrate .. //depot/projects/tty/lib/libthread_db/thread_db.h#3 integrate .. //depot/projects/tty/lib/libthread_db/thread_db_int.h#2 integrate .. //depot/projects/tty/lib/libz/Makefile#4 integrate .. //depot/projects/tty/libexec/rtld-elf/alpha/reloc.c#4 integrate .. //depot/projects/tty/libexec/tftpd/tftpd.c#8 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#25 integrate .. //depot/projects/tty/sbin/Makefile#15 integrate .. //depot/projects/tty/sbin/ifconfig/ifieee80211.c#6 integrate .. //depot/projects/tty/sbin/ipfw/ipfw.8#15 integrate .. //depot/projects/tty/sbin/ipfw/ipfw2.c#14 integrate .. //depot/projects/tty/sbin/mount/mntopts.h#4 integrate .. //depot/projects/tty/sbin/mount/mount_ufs.c#3 integrate .. //depot/projects/tty/sbin/mount_cd9660/mount_cd9660.c#6 integrate .. //depot/projects/tty/sbin/mount_ext2fs/mount_ext2fs.c#4 integrate .. //depot/projects/tty/sbin/mount_hpfs/mount_hpfs.c#3 integrate .. //depot/projects/tty/sbin/mount_msdosfs/mount_msdosfs.c#6 integrate .. //depot/projects/tty/sbin/mount_nfs/mount_nfs.c#6 integrate .. //depot/projects/tty/sbin/mount_nfs4/mount_nfs4.c#4 integrate .. //depot/projects/tty/sbin/mount_ntfs/mount_ntfs.c#5 integrate .. //depot/projects/tty/sbin/mount_nullfs/mount_nullfs.c#4 integrate .. //depot/projects/tty/sbin/mount_reiserfs/mount_reiserfs.c#2 integrate .. //depot/projects/tty/sbin/mount_std/mount_std.c#3 integrate .. //depot/projects/tty/sbin/mount_udf/mount_udf.c#5 integrate .. //depot/projects/tty/sbin/mount_ufs/mount_ufs.c#3 integrate .. //depot/projects/tty/sbin/mount_umapfs/mount_umapfs.c#4 integrate .. //depot/projects/tty/sbin/mount_unionfs/mount_unionfs.c#4 integrate .. //depot/projects/tty/sbin/routed/if.c#4 integrate .. //depot/projects/tty/sbin/routed/input.c#3 integrate .. //depot/projects/tty/sbin/routed/main.c#4 integrate .. //depot/projects/tty/sbin/routed/output.c#3 integrate .. //depot/projects/tty/sbin/routed/parms.c#3 integrate .. //depot/projects/tty/sbin/routed/radix.c#3 integrate .. //depot/projects/tty/sbin/routed/rdisc.c#3 integrate .. //depot/projects/tty/sbin/routed/table.c#4 integrate .. //depot/projects/tty/sbin/routed/trace.c#4 integrate .. //depot/projects/tty/share/man/man4/amr.4#10 integrate .. //depot/projects/tty/share/man/man4/ipw.4#2 integrate .. //depot/projects/tty/share/mk/bsd.subdir.mk#5 integrate .. //depot/projects/tty/sys/alpha/linux/linux_proto.h#7 integrate .. //depot/projects/tty/sys/alpha/linux/linux_syscall.h#7 integrate .. //depot/projects/tty/sys/alpha/linux/linux_sysent.c#7 integrate .. //depot/projects/tty/sys/alpha/linux/syscalls.master#8 integrate .. //depot/projects/tty/sys/alpha/osf1/osf1_proto.h#5 integrate .. //depot/projects/tty/sys/alpha/osf1/osf1_syscall.h#5 integrate .. //depot/projects/tty/sys/alpha/osf1/osf1_sysent.c#5 integrate .. //depot/projects/tty/sys/alpha/osf1/syscalls.master#5 integrate .. //depot/projects/tty/sys/amd64/amd64/trap.c#12 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/tty/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/tty/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/tty/sys/arm/xscale/i80321/iq80321.c#3 integrate .. //depot/projects/tty/sys/boot/alpha/common/main.c#3 integrate .. //depot/projects/tty/sys/boot/alpha/libalpha/devicename.c#3 integrate .. //depot/projects/tty/sys/boot/alpha/libalpha/libalpha.h#2 integrate .. //depot/projects/tty/sys/boot/alpha/libalpha/srmdisk.c#4 integrate .. //depot/projects/tty/sys/boot/common/loader.8#13 integrate .. //depot/projects/tty/sys/boot/ficl/Makefile#6 integrate .. //depot/projects/tty/sys/boot/i386/loader/Makefile#6 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/tty/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_proto.h#4 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_syscall.h#4 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_syscallnames.c#4 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_sysent.c#4 integrate .. //depot/projects/tty/sys/compat/svr4/syscalls.master#4 integrate .. //depot/projects/tty/sys/conf/files.i386#22 integrate .. //depot/projects/tty/sys/conf/files.pc98#18 integrate .. //depot/projects/tty/sys/dev/aac/aac.c#14 integrate .. //depot/projects/tty/sys/dev/aac/aac_tables.h#2 integrate .. //depot/projects/tty/sys/dev/aac/aacreg.h#6 integrate .. //depot/projects/tty/sys/dev/acpica/acpi.c#15 integrate .. //depot/projects/tty/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_amd.c#4 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate .. //depot/projects/tty/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/tty/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/tty/sys/dev/pci/pci.c#13 integrate .. //depot/projects/tty/sys/dev/random/probe.c#3 integrate .. //depot/projects/tty/sys/dev/syscons/scvgarndr.c#6 integrate .. //depot/projects/tty/sys/dev/syscons/scvidctl.c#5 integrate .. //depot/projects/tty/sys/dev/wi/if_wi.c#13 integrate .. //depot/projects/tty/sys/fs/devfs/devfs_vnops.c#12 integrate .. //depot/projects/tty/sys/i386/i386/ptrace_machdep.c#1 branch .. //depot/projects/tty/sys/i386/i386/trap.c#15 integrate .. //depot/projects/tty/sys/i386/ibcs2/ibcs2_proto.h#4 integrate .. //depot/projects/tty/sys/i386/ibcs2/ibcs2_syscall.h#4 integrate .. //depot/projects/tty/sys/i386/ibcs2/ibcs2_sysent.c#5 integrate .. //depot/projects/tty/sys/i386/ibcs2/syscalls.master#4 integrate .. //depot/projects/tty/sys/i386/include/ptrace.h#4 integrate .. //depot/projects/tty/sys/i386/include/reg.h#3 integrate .. //depot/projects/tty/sys/i386/isa/vesa.c#7 integrate .. //depot/projects/tty/sys/i386/linux/linux_proto.h#8 integrate .. //depot/projects/tty/sys/i386/linux/linux_syscall.h#8 integrate .. //depot/projects/tty/sys/i386/linux/linux_sysent.c#9 integrate .. //depot/projects/tty/sys/i386/linux/syscalls.master#8 integrate .. //depot/projects/tty/sys/kern/init_sysent.c#12 integrate .. //depot/projects/tty/sys/kern/kern_clock.c#11 integrate .. //depot/projects/tty/sys/kern/kern_event.c#13 integrate .. //depot/projects/tty/sys/kern/kern_exec.c#17 integrate .. //depot/projects/tty/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/tty/sys/kern/kern_resource.c#13 integrate .. //depot/projects/tty/sys/kern/makesyscalls.sh#4 integrate .. //depot/projects/tty/sys/kern/syscalls.c#12 integrate .. //depot/projects/tty/sys/kern/syscalls.master#13 integrate .. //depot/projects/tty/sys/kern/vfs_aio.c#13 integrate .. //depot/projects/tty/sys/kern/vfs_bio.c#16 integrate .. //depot/projects/tty/sys/modules/ipfilter/Makefile#7 integrate .. //depot/projects/tty/sys/modules/osf1/Makefile#4 integrate .. //depot/projects/tty/sys/modules/pecoff/Makefile#3 integrate .. //depot/projects/tty/sys/netgraph/ng_mppc.c#5 integrate .. //depot/projects/tty/sys/netinet/in.c#8 integrate .. //depot/projects/tty/sys/netinet/in_pcb.c#14 integrate .. //depot/projects/tty/sys/netinet/ip_fw.h#10 integrate .. //depot/projects/tty/sys/netinet/ip_fw2.c#15 integrate .. //depot/projects/tty/sys/netinet/raw_ip.c#12 integrate .. //depot/projects/tty/sys/netinet/tcp_input.c#19 integrate .. //depot/projects/tty/sys/netinet/tcp_subr.c#16 integrate .. //depot/projects/tty/sys/netinet/tcp_usrreq.c#12 integrate .. //depot/projects/tty/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/tty/sys/netinet6/in6.c#9 integrate .. //depot/projects/tty/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/tty/sys/netipsec/ipsec.c#8 integrate .. //depot/projects/tty/sys/opencrypto/deflate.c#4 integrate .. //depot/projects/tty/sys/sys/_pthreadtypes.h#1 branch .. //depot/projects/tty/sys/sys/bufobj.h#3 integrate .. //depot/projects/tty/sys/sys/cdefs.h#10 integrate .. //depot/projects/tty/sys/sys/event.h#5 integrate .. //depot/projects/tty/sys/sys/pmc.h#4 integrate .. //depot/projects/tty/sys/sys/pmckern.h#2 integrate .. //depot/projects/tty/sys/sys/proc.h#17 integrate .. //depot/projects/tty/sys/sys/syscall.h#12 integrate .. //depot/projects/tty/sys/sys/syscall.mk#12 integrate .. //depot/projects/tty/sys/sys/syscallsubr.h#9 integrate .. //depot/projects/tty/sys/sys/sysproto.h#13 integrate .. //depot/projects/tty/sys/sys/types.h#8 integrate .. //depot/projects/tty/sys/sys/vnode.h#14 integrate .. //depot/projects/tty/sys/ufs/ffs/ffs_vfsops.c#14 integrate .. //depot/projects/tty/sys/ufs/ufs/ufs_vnops.c#12 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/README#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/libtest.a#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/libtest.a#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.3#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.4#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.5#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.6#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.status.7#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/libtest.a#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t0/Makefile#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t0/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t0/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t0/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t0/libtest.a#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t0/test.t#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t1/Makefile#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t1/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t1/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t1/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t1/libtest.a#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t1/test.t#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t2/Makefile#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t2/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t2/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t2/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t2/libtest.a#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/archives/t2/test.t#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t0/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t0/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t0/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t0/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t0/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t0/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t0/test.t#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t1/Makefile#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t1/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t1/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t1/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t1/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t1/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t1/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t1/test.t#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t2/Makefile#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t2/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t2/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t2/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t2/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t2/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t2/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t2/test.t#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t3/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t3/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t3/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t3/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t3/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t3/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/basic/t3/test.t#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/common.sh#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/shell/builtin/Makefile#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/shell/builtin/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/builtin/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/builtin/expected.status.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/builtin/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/builtin/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/builtin/expected.stderr.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/builtin/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/builtin/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/builtin/expected.stdout.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/builtin/sh#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/builtin/sh.sh#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/builtin/test.t#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/shell/meta/Makefile#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/shell/meta/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/meta/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/meta/expected.status.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/meta/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/meta/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/meta/expected.stderr.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/meta/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/meta/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/meta/expected.stdout.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/meta/sh#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/meta/sh.sh#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/meta/test.t#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path/Makefile#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path/expected.status.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path/expected.stderr.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path/expected.stdout.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path/sh#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path/sh.sh#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path/test.t#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path_select/Makefile#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path_select/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path_select/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path_select/expected.status.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path_select/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path_select/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path_select/expected.stderr.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path_select/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path_select/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path_select/expected.stdout.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path_select/sh.sh#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path_select/shell#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/path_select/test.t#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/shell/replace/Makefile#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/shell/replace/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/replace/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/replace/expected.status.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/replace/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/replace/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/replace/expected.stderr.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/replace/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/replace/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/replace/expected.stdout.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/replace/sh.sh#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/replace/shell#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/replace/test.t#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/shell/select/Makefile#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/shell/select/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/select/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/select/expected.status.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/select/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/select/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/select/expected.stderr.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/select/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/shell/select/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/select/expected.stdout.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/shell/select/test.t#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/basic/Makefile#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/basic/TEST1.a#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/basic/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/basic/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/basic/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/basic/test.t#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild1/Makefile#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild1/TEST1.a#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild1/TEST2.a#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild1/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild1/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild1/test.t#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild2/Makefile#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild2/TEST1.a#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild2/TEST2.a#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild2/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild2/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/src_wild2/test.t#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t0/Makefile#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t0/TEST1.a#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t0/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t0/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t0/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t0/test.t#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/Makefile#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/TEST1.a#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/TEST2.a#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/test.t#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/Makefile#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/TEST1.a#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/TEST2.a#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/test.t#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/syntax/enl/Makefile#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/syntax/enl/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/syntax/enl/expected.status.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/syntax/enl/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/syntax/enl/expected.stderr.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/syntax/enl/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/syntax/enl/expected.stdout.2#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/syntax/enl/test.t#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/variables/modifier_M/Makefile#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/variables/modifier_M/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/variables/modifier_M/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/variables/modifier_M/test.t#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/variables/t0/Makefile#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/variables/t0/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/variables/t0/expected.status.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/variables/t0/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/variables/t0/expected.stderr.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/variables/t0/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/variables/t0/expected.stdout.1#1 branch .. //depot/projects/tty/tools/regression/usr.bin/make/variables/t0/test.t#2 integrate .. //depot/projects/tty/tools/regression/usr.bin/make/variables/t1/expected.status#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/variables/t1/expected.stderr#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/variables/t1/expected.stdout#2 delete .. //depot/projects/tty/tools/regression/usr.bin/make/variables/t1/test.t#2 delete .. //depot/projects/tty/usr.bin/bzip2/doc/Makefile#2 integrate .. //depot/projects/tty/usr.bin/bzip2/doc/manual.texi.diff#2 delete .. //depot/projects/tty/usr.bin/calendar/calendars/calendar.freebsd#13 integrate .. //depot/projects/tty/usr.bin/login/login.c#6 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_clntout.c#2 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_cout.c#2 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_hout.c#2 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_main.c#5 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_parse.c#2 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_scan.c#2 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_svcout.c#2 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_tblout.c#3 integrate .. //depot/projects/tty/usr.bin/rpcgen/rpc_util.c#2 integrate .. //depot/projects/tty/usr.bin/tail/tail.c#4 integrate .. //depot/projects/tty/usr.sbin/apm/apm.8#8 integrate .. //depot/projects/tty/usr.sbin/apm/apm.c#7 integrate .. //depot/projects/tty/usr.sbin/pcvt/kbdio/kbdio.y#2 integrate .. //depot/projects/tty/usr.sbin/pcvt/kbdio/lex.l#2 integrate .. //depot/projects/tty/usr.sbin/pcvt/vgaio/lex.l#2 integrate .. //depot/projects/tty/usr.sbin/pcvt/vgaio/vgaio.y#2 integrate .. //depot/projects/tty/usr.sbin/pppstats/Makefile#2 integrate .. //depot/projects/tty/usr.sbin/rwhod/rwhod.c#6 integrate Differences ... ==== //depot/projects/tty/MAINTAINERS#12 (text+ko) ==== @@ -1,4 +1,22 @@ -$FreeBSD: src/MAINTAINERS,v 1.106 2005/05/25 17:37:57 schweikh Exp $ +$FreeBSD: src/MAINTAINERS,v 1.119 2005/06/03 18:42:49 jmallett Exp $ + +Please note that the content of this file is strictly advisory. +No locks listed here are valid. The only strict review requirements +are granted by core. These are documented in src/LOCKS and enforced +by CVSROOT/approvers. + +The source tree is a community effort. However, some folks go to the +trouble of looking after particular areas of the tree. In return for +their active caretaking of the code it is polite to coordinate changes +with them. This is a list of people who have expressed an interest in +part of the code or listed their active caretaking role so that other +committers can easily find somebody who is familiar with it. The notes +should specify if there is a 3rd party source tree involved or other +things that should be kept in mind. + +However, this is not a 'big stick', it is an offer to help and a source +of guidance. It does not override the communal nature of the tree. +It is not a registry of 'turf' or private property. subsystem login notes ----------------------------- @@ -13,11 +31,9 @@ ahd(4) gibbs Pre-commit review requested. NEWCARD imp Pre-commit review requested. OLDCARD imp Pre-commit review requested. -wi imp Pre-commit review requested. -telnet markm please ensure that a security-aware person - sanity-checks your work. -secure/* markm please ensure that a security-aware person - sanity-checks your work. +pci bus imp,jhb Pre-commit review requested. +telnet markm Heads-up appreciated. Try not to break it. +secure/* markm Heads-up appreciated. Try not to break it. kerberos5 nectar Pre-commit review requested. heimdal nectar Pre-commit review requested. cdboot jhb Pre-commit review requested. @@ -53,8 +69,6 @@ Keep in sync with -STABLE. dhcp mbr Needs to pre-approve commits to contrib/isc-dhcp, so changes can be made to the isc.org CVS repository. -RELENG_4_* security-officer Requires Security Officer approval. -RELENG_5_* security-officer Requires Security Officer approval. libfetch des Advance notification requested. fetch des Advance notification requested. libpam des Pre-commit review requested. @@ -74,10 +88,10 @@ libz peter Try not to break it. pppd/chat peter Try not to break it. groff ru Recommends pre-commit review. -share/mk ru Recommends pre-commit review. +share/mk ru This is a vital component of the build system, so I + offer a pre-commit review for anything non-trivial. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org drm anholt Just keep me informed of changes, try not to break it. -regression jmallett Will help write new tests, etc. libufs jmallett Willing to handle problems, help with work. fdc(4) joerg Just keep me informed of changes, try not to break it. sppp(4) joerg Just keep me informed of changes, try not to break it. @@ -92,6 +106,10 @@ changes pre-commit review requested. contrib/pf mlaier Pre-commit review requested. binutils obrien Insists on BU blocked from unapproved commits +file obrien Insists to keep file blocked from other's unapproved + commits +contrib/bzip2 obrien Pre-commit review required. +lukemftpd obrien Pre-commit review required. geom_concat pjd Pre-commit review preferred. geom_gate pjd Pre-commit review preferred. geom_label pjd Pre-commit review preferred. @@ -117,19 +135,9 @@ $ cd /usr/src; find */* -type f|xargs egrep 'MAINTAINER[ ]*=' bin/dd/Makefile:MAINTAINER= green@FreeBSD.org -contrib/cvs/FREEBSD-upgrade:MAINTAINER= peter@FreeBSD.org games/fortune/datfiles/Makefile:MAINTAINER= jkh -gnu/usr.bin/cvs/Makefile:MAINTAINER= peter@FreeBSD.org -gnu/usr.bin/cvs/contrib/Makefile:MAINTAINER= peter@FreeBSD.org -gnu/usr.bin/cvs/cvs/Makefile:MAINTAINER= peter@FreeBSD.org -gnu/usr.bin/cvs/cvsbug/Makefile:MAINTAINER= peter@FreeBSD.org -gnu/usr.bin/cvs/doc/Makefile:MAINTAINER= peter@FreeBSD.org -gnu/usr.bin/cvs/lib/Makefile:MAINTAINER= peter@FreeBSD.org -gnu/usr.bin/cvs/libdiff/Makefile:MAINTAINER= peter@FreeBSD.org gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch -lib/libc/posix1e/Makefile.inc:MAINTAINER= rwatson@FreeBSD.org lib/libusbhid/Makefile:MAINTAINER= n_hibma@FreeBSD.ORG -lib/libz/Makefile:MAINTAINER=peter@FreeBSD.org sbin/dhclient/Makefile.inc:MAINTAINER= mbr sys/compat/svr4/Makefile:MAINTAINER= newton@freebsd.org sys/dev/asr/MAINTAINER:MAINTAINER = obrien@freebsd, scott_long@btc.adaptec.com, mark_salyzyn@adaptec.com @@ -138,8 +146,6 @@ sys/modules/bktr/bktr_mem/Makefile:MAINTAINER= roger@freebsd.org sys/modules/cam/Makefile:MAINTAINER= n_hibma@freebsd.org sys/modules/linux/Makefile:MAINTAINER= emulation@FreeBSD.org -sys/modules/osf1/Makefile:MAINTAINER= gallatin@FreeBSD.org -sys/modules/pecoff/Makefile:MAINTAINER= takawata@FreeBSD.org sys/modules/streams/Makefile:MAINTAINER= newton@atdot.dotat.org sys/modules/svr4/Makefile:MAINTAINER= newton@FreeBSD.org sys/modules/udbp/Makefile:MAINTAINER= n_hibma@freebsd.org @@ -155,5 +161,4 @@ sys/modules/uscanner/Makefile:MAINTAINER= n_hibma@freebsd.org tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org usr.bin/locate/Makefile:MAINTAINER= wosch -usr.sbin/pppstats/Makefile:MAINTAINER= peter@freebsd.org usr.sbin/zic/Makefile:MAINTAINER= wollman@FreeBSD.org ==== //depot/projects/tty/Makefile.inc1#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.495 2005/05/23 11:15:16 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.496 2005/05/31 04:45:47 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -516,7 +516,7 @@ distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} for prog in [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep \ + date echo egrep find grep install-info \ ln make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc zic; do \ cp `which $$prog` ${INSTALLTMP}; \ ==== //depot/projects/tty/UPDATING#19 (text+ko) ==== @@ -21,6 +21,15 @@ developers choose to disable these features on build machines to maximize performance. +20050603: + The n_net of a struct netent was changed to an uint32_t, and + 1st argument of getnetbyaddr() was changed to an uint32_t, to + conform to POSIX-2001. These changes broke an ABI + compatibility on 64 bit architecture. With these changes, + shlib major of libpcap was bumped. You have to recompile + userland programs that use getnetbyaddr(3), getnetbyname(3), + getnetent(3) and/or libpcap on 64 bit architecture. + 20050528: Kernel parsing of extra options on '#!' first lines of shell scripts has changed. Lines with multiple options likely will @@ -348,4 +357,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.406 2005/05/28 22:45:31 gad Exp $ +$FreeBSD: src/UPDATING,v 1.409 2005/06/03 10:19:26 ume Exp $ ==== //depot/projects/tty/bin/ls/cmp.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.16 2005/01/10 08:39:23 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.17 2005/06/03 11:05:58 dd Exp $"); #include @@ -139,3 +139,21 @@ return (statcmp(b, a)); } + +int +sizecmp(const FTSENT *a, const FTSENT *b) +{ + + if (b->fts_statp->st_size > a->fts_statp->st_size) + return (1); + if (b->fts_statp->st_size < a->fts_statp->st_size) + return (-1); + return (strcoll(a->fts_name, b->fts_name)); +} + +int +revsizecmp(const FTSENT *a, const FTSENT *b) +{ + + return (sizecmp(b, a)); +} ==== //depot/projects/tty/bin/ls/extern.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/extern.h,v 1.23 2004/05/02 11:25:37 tjr Exp $ + * $FreeBSD: src/bin/ls/extern.h,v 1.24 2005/06/03 11:05:58 dd Exp $ */ int acccmp(const FTSENT *, const FTSENT *); @@ -38,6 +38,8 @@ int revnamecmp(const FTSENT *, const FTSENT *); int statcmp(const FTSENT *, const FTSENT *); int revstatcmp(const FTSENT *, const FTSENT *); +int sizecmp(const FTSENT *, const FTSENT *); +int revsizecmp(const FTSENT *, const FTSENT *); void printcol(const DISPLAY *); void printlong(const DISPLAY *); ==== //depot/projects/tty/bin/ls/ls.1#10 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.86 2005/02/13 22:25:09 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.89 2005/06/03 11:38:35 dd Exp $ .\" -.Dd January 11, 2005 +.Dd June 2, 2005 .Dt LS 1 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ABCFGHLPRTWZabcdfghiklmnopqrstuwx1 +.Op Fl ABCFGHLPRSTWZabcdfghiklmnopqrstuwx1 .Op Ar .Sh DESCRIPTION For each operand that names a @@ -133,6 +133,9 @@ options. .It Fl R Recursively list subdirectories encountered. +.It Fl S >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 4 00:32:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C02D316A420; Sat, 4 Jun 2005 00:32:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9BF1D16A41C for ; Sat, 4 Jun 2005 00:32:43 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7705643D1D for ; Sat, 4 Jun 2005 00: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.1/8.13.1) with ESMTP id j540Whru095521 for ; Sat, 4 Jun 2005 00:32:43 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j540WhDE095518 for perforce@freebsd.org; Sat, 4 Jun 2005 00:32:43 GMT (envelope-from marcel@freebsd.org) Date: Sat, 4 Jun 2005 00:32:43 GMT Message-Id: <200506040032.j540WhDE095518@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 77947 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2005 00:32:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=77947 Change 77947 by marcel@marcel_nfs on 2005/06/04 00:31:52 o Also match the i815 GMCH o Allocate the resources Affected files ... .. //depot/projects/tty/sys/dev/vtc/hw/gmch/gmch.h#3 edit .. //depot/projects/tty/sys/dev/vtc/hw/gmch/gmch_bus_pci.c#3 edit Differences ... ==== //depot/projects/tty/sys/dev/vtc/hw/gmch/gmch.h#3 (text+ko) ==== @@ -35,6 +35,12 @@ { device_t gmch_dev; dev_t gmch_node; + + bus_space_handle_t gmch_fb_bsh; + bus_space_tag_t gmch_fb_bst; + + bus_space_handle_t gmch_reg_bsh; + bus_space_tag_t gmch_reg_bst; }; extern devclass_t gmch_devclass; ==== //depot/projects/tty/sys/dev/vtc/hw/gmch/gmch_bus_pci.c#3 (text+ko) ==== @@ -42,6 +42,7 @@ #include #define PCI_VENDOR_INTEL 0x8086 +#define PCI_DEVICE_I815 0x1132 #define PCI_DEVICE_I830M 0x3577 static int gmch_pci_attach(device_t dev); @@ -63,7 +64,26 @@ static int gmch_pci_attach(device_t dev) { + struct gmch_softc *sc; + struct resource *res; + int rid; + + sc = device_get_softc(dev); + rid = 0x10; + res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); + if (res == NULL) + return (ENXIO); + sc->gmch_fb_bsh = rman_get_bushandle(res); + sc->gmch_fb_bst = rman_get_bustag(res); + + rid = 0x14; + res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); + if (res == NULL) + return (ENXIO); + sc->gmch_reg_bsh = rman_get_bushandle(res); + sc->gmch_reg_bst = rman_get_bustag(res); + return (gmch_attach(dev)); } @@ -77,6 +97,9 @@ return (ENXIO); switch (pci_get_device(dev)) { + case PCI_DEVICE_I815: + device_set_desc(dev, "82815/EM/EP/P Internal GUI Accelerator"); + break; case PCI_DEVICE_I830M: device_set_desc(dev, "82830M/MG Integrated Graphics Device"); break; From owner-p4-projects@FreeBSD.ORG Sat Jun 4 05:26:38 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31A4416A420; Sat, 4 Jun 2005 05:26:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE92E16A41C for ; Sat, 4 Jun 2005 05:26:37 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A47E343D1F for ; Sat, 4 Jun 2005 05:26:37 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j545Qb2O020148 for ; Sat, 4 Jun 2005 05:26:37 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j545Qb4H020145 for perforce@freebsd.org; Sat, 4 Jun 2005 05:26:37 GMT (envelope-from marcel@freebsd.org) Date: Sat, 4 Jun 2005 05:26:37 GMT Message-Id: <200506040526.j545Qb4H020145@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 77951 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2005 05:26:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=77951 Change 77951 by marcel@marcel_nfs on 2005/06/04 05:26:03 Submit some large changes before something happens: o Add logic to handle device preemption. If the VGA driver is the low-level console, we need to tell the accelerated driver for the hardware about it. Otherwise it'll initialize the hardware and render the low-level console useless. If the accel driver knows that the hardware is used for the low- level console, it can delay initializing the hardware until the virtual consoles are ready for use. o Have the GMCH driver save the device_t of the DRAM controller so that it can figure out the refresh rate of the local memory. This is needed to properly program the hardware. o If the VGA driver attaches during bus enumeration, register it with VTC. This will trigger the creation of a virtual terminal with terminal emulator. o Prevent the VGA driver from probing the ISA bus when we have found PCI based hardware. o Express the display depth in bits, not colors. o Implement the bulk of the VTC TTY layer. Needs a more work. o Implement TE support functions. A single TE can drive more than one graphics card and they don't have to have the same resolution. To deal with this, TEs operate with a character- based resolution (80x24 for VT100). Based on this and the resolution of the graphics device, a matching font is found by the TE support layer. To support double-width and double- height modes, a scaling factor is passed down to the support functions so that a bigger font can be selected. Note: The initial configuration of VTC maps all graphics cards and keyboards (not yet dealt with) to a single virtual terminal. Once in multi-user mode, this should be reconfigurable so that there's a TE per graphics card. Affected files ... .. //depot/projects/tty/sys/dev/vtc/hw/gmch/gmch.c#3 edit .. //depot/projects/tty/sys/dev/vtc/hw/gmch/gmch_bus_pci.c#4 edit .. //depot/projects/tty/sys/dev/vtc/hw/vga/vga.c#3 edit .. //depot/projects/tty/sys/dev/vtc/hw/vga/vga.h#3 edit .. //depot/projects/tty/sys/dev/vtc/hw/vga/vga_bus_isa.c#3 edit .. //depot/projects/tty/sys/dev/vtc/hw/vga/vga_bus_pci.c#3 edit .. //depot/projects/tty/sys/dev/vtc/hw/vga/vga_con.c#3 edit .. //depot/projects/tty/sys/dev/vtc/vtc_con.c#9 edit .. //depot/projects/tty/sys/dev/vtc/vtc_con.h#3 edit .. //depot/projects/tty/sys/dev/vtc/vtc_core.c#5 edit .. //depot/projects/tty/sys/dev/vtc/vtc_font.c#5 edit .. //depot/projects/tty/sys/dev/vtc/vtc_logo.c#3 edit .. //depot/projects/tty/sys/dev/vtc/vtc_te.c#2 edit .. //depot/projects/tty/sys/dev/vtc/vtc_te.h#3 edit .. //depot/projects/tty/sys/dev/vtc/vtc_te_if.m#3 edit .. //depot/projects/tty/sys/dev/vtc/vtc_te_vt102.c#3 edit .. //depot/projects/tty/sys/dev/vtc/vtc_tty.c#2 edit Differences ... ==== //depot/projects/tty/sys/dev/vtc/hw/gmch/gmch.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include +#include #include devclass_t gmch_devclass; @@ -44,6 +45,9 @@ { struct gmch_softc *sc; + if (vtc_vtout_console(dev)) + device_printf(dev, "console!\n"); + sc = device_get_softc(dev); sc->gmch_dev = dev; return (0); ==== //depot/projects/tty/sys/dev/vtc/hw/gmch/gmch_bus_pci.c#4 (text+ko) ==== @@ -42,9 +42,12 @@ #include #define PCI_VENDOR_INTEL 0x8086 -#define PCI_DEVICE_I815 0x1132 +#define PCI_DEVICE_I815_DRAM 0x1130 +#define PCI_DEVICE_I815_GUI 0x1132 #define PCI_DEVICE_I830M 0x3577 +static device_t gmch_dram_controller; + static int gmch_pci_attach(device_t dev); static int gmch_pci_probe(device_t dev); @@ -91,13 +94,23 @@ gmch_pci_probe(device_t dev) { + if (pci_get_vendor(dev) != PCI_VENDOR_INTEL) + return (ENXIO); + + /* + * Save the device_t of the DRAM controller of the i815 chipset. + * We need it in case we do get to attach to the GUI accel. + */ + if (pci_get_device(dev) == PCI_DEVICE_I815_DRAM) { + gmch_dram_controller = dev; + return (ENXIO); + } + if (pci_get_class(dev) != PCIC_DISPLAY) return (ENXIO); - if (pci_get_vendor(dev) != PCI_VENDOR_INTEL) - return (ENXIO); switch (pci_get_device(dev)) { - case PCI_DEVICE_I815: + case PCI_DEVICE_I815_GUI: device_set_desc(dev, "82815/EM/EP/P Internal GUI Accelerator"); break; case PCI_DEVICE_I830M: ==== //depot/projects/tty/sys/dev/vtc/hw/vga/vga.c#3 (text+ko) ==== @@ -34,9 +34,11 @@ #include #include +#include +#include + #include #include -#include /* Convenience macros. */ #define MEM_READ(sc, ofs) \ @@ -441,6 +443,20 @@ return (error); } +static int +vga_bitblt(void *cookie, int op, uintptr_t src, uintptr_t dst, int width, + int height, ...) +{ + struct vga_softc *sc = (struct vga_softc *)cookie; + va_list ap; + int error; + + va_start(ap, height); + error = vga_vbitblt(sc, op, src, dst, width, height, ap); + va_end(ap); + return (error); +} + int vga_attach(device_t dev) { @@ -460,5 +476,5 @@ 640 * (480 - vtc_logo4_height) / 2 + (640 - vtc_logo4_width) / 2, vtc_logo4_width, vtc_logo4_height); - return (0); + return (vtc_vtout_attach(sc, vga_bitblt, 640, 480)); } ==== //depot/projects/tty/sys/dev/vtc/hw/vga/vga.h#3 (text+ko) ==== @@ -41,6 +41,7 @@ { device_t vga_dev; dev_t vga_node; + struct vtc_conout *vga_conout; /* Device flags and state. */ int vga_bustype:2; ==== //depot/projects/tty/sys/dev/vtc/hw/vga/vga_bus_isa.c#3 (text+ko) ==== @@ -39,6 +39,8 @@ #include #include +#include + #include #include @@ -69,6 +71,14 @@ vga_isa_probe(device_t dev) { + /* + * We can get called even when there's a PCI VGA device. It happens + * when an accelerated driver for the hardware exists that preempts + * the VGA driver. We check for this and bail out right away. + */ + if (vga_console.vga_conout->vtc_busdev != NULL) + return (ENXIO); + printf("ISA VGA is being probed!\n"); return (ENXIO); } ==== //depot/projects/tty/sys/dev/vtc/hw/vga/vga_bus_pci.c#3 (text+ko) ==== @@ -39,6 +39,8 @@ #include #include +#include + #include #include @@ -132,6 +134,20 @@ if ((cfg & PCIM_CMD_PORTEN) == 0) return (ENXIO); + /* + * Handle preemption in case we're the VTC console. We typically + * don't get to attach when there's an accelerated driver for the + * hardware. The problem is that we like to continue to use the + * hardware for the low-level console until we're ready to switch + * to the virtual terminal, at which time the accelerated driver + * can take control. We handshake by letting VTC know what the + * device_t for the hardware is so that accelerated drivers can + * check whether they're attaching to the low-level console device + * or not and take appropriate action. + */ + if (vga_console.vga_console) + vga_console.vga_conout->vtc_busdev = dev; + return (BUS_PROBE_GENERIC); } ==== //depot/projects/tty/sys/dev/vtc/hw/vga/vga_con.c#3 (text+ko) ==== @@ -65,7 +65,7 @@ co->vtc_con_cookie = &vga_console; co->vtc_con_width = 640; co->vtc_con_height = 480; - co->vtc_con_depth = 16; + co->vtc_con_depth = 4; return (0); } @@ -74,8 +74,10 @@ { struct vga_softc *sc = co->vtc_con_cookie; - if (vga_init(sc) == 0) + if (vga_init(sc) == 0) { + sc->vga_conout = co; sc->vga_console = 1; + } } static void ==== //depot/projects/tty/sys/dev/vtc/vtc_con.c#9 (text+ko) ==== @@ -52,8 +52,6 @@ CONS_DRIVER(vtc, vtc_cnprobe, vtc_cninit, vtc_cnterm, vtc_cngetc, vtc_cncheckc, vtc_cnputc, NULL); -SET_DECLARE(vtc_conout_set, struct vtc_conout); - static void vtc_cnprobe(struct consdev *cp) { @@ -80,6 +78,7 @@ { struct vtc_conout *vc = cp->cn_arg; + vc->vtc_consdev = cp; vc->vtc_con_init(vc); } ==== //depot/projects/tty/sys/dev/vtc/vtc_con.h#3 (text+ko) ==== @@ -37,11 +37,13 @@ typedef int vtc_con_probe_f(struct vtc_conout *); struct vtc_conout { + struct consdev *vtc_consdev; + device_t vtc_busdev; const char *vtc_con_name; vtc_con_probe_f *vtc_con_probe; vtc_con_init_f *vtc_con_init; vtc_con_bitblt_f *vtc_con_bitblt; - void * vtc_con_cookie; + void *vtc_con_cookie; int vtc_con_width; int vtc_con_height; int vtc_con_depth; @@ -53,11 +55,9 @@ .vtc_con_probe = probe, \ .vtc_con_init = init, \ .vtc_con_bitblt = bitblt, \ - .vtc_con_cookie = NULL, \ - .vtc_con_width = -1, \ - .vtc_con_height = -1, \ - .vtc_con_depth = -1 \ }; \ DATA_SET(vtc_conout_set, name##_vtc_conout) +SET_DECLARE(vtc_conout_set, struct vtc_conout); + #endif /* !_DEV_VTC_CON_H_ */ ==== //depot/projects/tty/sys/dev/vtc/vtc_core.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2003-2005 Marcel Moolenaar * All rights reserved. * @@ -29,14 +29,161 @@ #include #include +#include #include #include +#include +#include #include +#include #include +#include +#include +#include +#include "vtc_te_if.h" + char vtc_device_name[] = "vtc"; +TAILQ_HEAD(, vtc_te_softc) vtc_te_devs = + TAILQ_HEAD_INITIALIZER(vtc_te_devs); +TAILQ_HEAD(, vtc_vtout_softc) vtc_vtout_devs = + TAILQ_HEAD_INITIALIZER(vtc_vtout_devs); + +MALLOC_DEFINE(M_VTC, "VTC", "VTC driver"); + +extern struct vtc_te_class vt102_class; + +static int +vtc_tty_open(struct tty *tp, struct cdev *dev) +{ + struct vtc_te_softc *te; + + te = tp->t_sc; + /* XXX notify the TE that we're opened? */ + return (0); +} + +static void +vtc_tty_close(struct tty *tp) +{ + struct vtc_te_softc *te; + + te = tp->t_sc; + if (te == NULL) + return; + + wakeup(te); +} + +static void +vtc_tty_oproc(struct tty *tp) +{ + struct vtc_te_softc *te; + + te = tp->t_sc; + if (te == NULL) + return; + + if (tp->t_state & (TS_TTSTOP | TS_BUSY)) + return; + + if (tp->t_outq.c_cc > 0) { + tp->t_state |= TS_BUSY; + /* XXX loop to display all characters in the buffer. */ + tp->t_state &= ~TS_BUSY; + } + + ttwwakeup(tp); +} + +static int +vtc_tty_param(struct tty *tp, struct termios *t) +{ + struct vtc_te_softc *te; + + te = tp->t_sc; + if (te == NULL) + return (ENODEV); + + ttsetwater(tp); + return (0); +} + +static int +vtc_tty_modem(struct tty *tp, int biton, int bitoff) +{ + + return (0); +} + +static void +vtc_tty_break(struct tty *tp, int state) +{ +} + +static void +vtc_tty_stop(struct tty *tp, int rw) +{ +} + +int +vtc_vtout_attach(void *cookie, vtout_bitblt_f bitblt, int width, int height) +{ + struct vtc_te_softc *te; + struct tty *tp; + struct vtc_vtout_softc *vo; + + vo = malloc(sizeof(*vo), M_VTC, M_WAITOK|M_ZERO); + TAILQ_INSERT_TAIL(&vtc_vtout_devs, vo, vo_alldevs); + vo->vo_cookie = cookie; + vo->vo_bitblt = bitblt; + vo->vo_width = width; + vo->vo_height = height; + + te = malloc(vt102_class.size, M_VTC, M_WAITOK|M_ZERO); + TAILQ_INSERT_TAIL(&vtc_te_devs, te, te_alldevs); + TAILQ_INIT(&te->te_vodevs); + TAILQ_INSERT_TAIL(&te->te_vodevs, vo, vo_tedevs); + + VTC_TE_RESET(te); + + tp = ttyalloc(); + te->te_tty = tp; + tp->t_sc = te; + + tp->t_oproc = vtc_tty_oproc; + tp->t_param = vtc_tty_param; + tp->t_stop = vtc_tty_stop; + tp->t_modem = vtc_tty_modem; + tp->t_break = vtc_tty_break; + tp->t_open = vtc_tty_open; + tp->t_close = vtc_tty_close; + +/* + sprintf(((struct consdev *)sc->sc_sysdev->cookie)->cn_name, "ttyv%r", + unit); +*/ + ttyconsolemode(tp, 0); + + ttycreate(tp, NULL, 0, MINOR_CALLOUT, "v%r", 0); + return (0); +} + +int +vtc_vtout_console(device_t dev) +{ + struct vtc_conout *vc, **iter; + + SET_FOREACH(iter, vtc_conout_set) { + vc = *iter; + if (vc->vtc_busdev == dev) + return (1); + } + return (0); +} + static int vtc_modevent(module_t mod, int type, void *data) { ==== //depot/projects/tty/sys/dev/vtc/vtc_font.c#5 (text+ko) ==== @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD$"); +#include + #include unsigned char vtc_font_8x16[95 * 16] = { ==== //depot/projects/tty/sys/dev/vtc/vtc_logo.c#3 (text+ko) ==== @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD$"); +#include + #include #define __ 0 ==== //depot/projects/tty/sys/dev/vtc/vtc_te.c#2 (text+ko) ==== @@ -31,11 +31,70 @@ #include #include +#include #include +#include + +int +vtc_te_bell(struct vtc_te_softc *te) +{ + + return (ENXIO); +} int -vtc_te_bell(struct vtc_te_softc *sc) +vtc_te_putc(struct vtc_te_softc *te, int row, int col, int ws, int hs, int fl, + __wchar_t wc) +{ + struct vtc_vtout_softc *vo; + uint8_t *glyph; + + KASSERT(wc >= 0x20, ("Unexpected control character")); + + TAILQ_FOREACH(vo, &te->te_vodevs, vo_tedevs) { + if (vo->vo_ws != ws || vo->vo_hs != hs) { + vo->vo_cw = (vo->vo_width / te->te_maxcol) * ws; + vo->vo_ch = (vo->vo_height / te->te_maxrow) * hs; + /* + * Lookup matching font, with glyphs no wider than + * vtout->vo_cw and no higher than vtout->vo_ch. + */ + vo->vo_font = vtc_font_8x16; + } + + glyph = vo->vo_font + (wc - 0x20) * 16; + vo->vo_bitblt(vo->vo_cookie, BITBLT_H1TOFB, (uintptr_t)glyph, + vo->vo_width * row * vo->vo_ch + col * vo->vo_cw, + 8, 16, 0, 7); + } + return (0); +} + +int +vtc_te_repos(struct vtc_te_softc *te, int row, int col) { return (ENXIO); } + +int +vtc_te_scroll(struct vtc_te_softc *te, int ulr, int ulc, int lrr, int lrc, + int hs) +{ + struct vtc_vtout_softc *vo; + int ch, cw; + + TAILQ_FOREACH(vo, &te->te_vodevs, vo_tedevs) { + ch = vo->vo_height / te->te_maxrow; + cw = vo->vo_width / te->te_maxcol; + + vo->vo_bitblt(vo->vo_cookie, BITBLT_FBTOFB, + vo->vo_width * (ulr + hs) * ch + ulc * cw, + vo->vo_width * ulr * ch + ulc * cw, + (lrc - ulc) * cw, (lrr - ulr - hs) * ch); + + vo->vo_bitblt(vo->vo_cookie, BITBLT_CTOFB, 0, + (lrr - hs) * ch, (lrc - ulc) * cw, hs * ch); + } + return (0); +} ==== //depot/projects/tty/sys/dev/vtc/vtc_te.h#3 (text+ko) ==== @@ -38,12 +38,20 @@ struct vtc_te_softc { KOBJ_FIELDS; - struct vtc_te_class *sc_class; + struct vtc_te_class *te_class; + TAILQ_ENTRY(vtc_te_softc) te_alldevs; + TAILQ_HEAD(, vtc_vtout_softc) te_vodevs; + struct tty *te_tty; + int te_maxcol; + int te_maxrow; }; /* * TE support functions. */ int vtc_te_bell(struct vtc_te_softc *); +int vtc_te_putc(struct vtc_te_softc *, int, int, int, int, int, __wchar_t); +int vtc_te_repos(struct vtc_te_softc *, int, int); +int vtc_te_scroll(struct vtc_te_softc *, int, int, int, int, int); #endif /* !_DEV_VTC_TE_H_ */ ==== //depot/projects/tty/sys/dev/vtc/vtc_te_if.m#3 (text+ko) ==== @@ -35,6 +35,11 @@ INTERFACE vtc_te; +# reset() - initialize/reset +METHOD int reset { + struct vtc_te_softc *this; +}; + # write() - write to the terminal METHOD int write { struct vtc_te_softc *this; ==== //depot/projects/tty/sys/dev/vtc/vtc_te_vt102.c#3 (text+ko) ==== @@ -45,11 +45,22 @@ int state; int count; char cbuf[16]; + int col, row; + int maxcol, maxrow; + + int autowrap:1; + int dh:1; + int dw:1; + int underline:1; + + int wrap:1; }; +static int vt102_reset(struct vtc_te_softc *); static int vt102_write(struct vtc_te_softc *, __wchar_t); static kobj_method_t vt102_methods[] = { + KOBJMETHOD(vtc_te_reset, vt102_reset), KOBJMETHOD(vtc_te_write, vt102_write), { 0, 0 } }; @@ -60,15 +71,58 @@ sizeof(struct vt102_softc), }; +static __inline int +vt102_putc(struct vt102_softc *vt102, __wchar_t wc) +{ + + return (vtc_te_putc(&vt102->base, vt102->row << vt102->dh, + vt102->col << vt102->dw, 1 << vt102->dw, 1 << vt102->dh, + vt102->underline, wc)); +} + +static __inline int +vt102_repos(struct vt102_softc *vt102) +{ + + vt102->wrap = 0; + return (vtc_te_repos(&vt102->base, vt102->row << vt102->dh, + vt102->col << vt102->dw)); +} + +static __inline int +vt102_newline(struct vt102_softc *vt102) +{ + + if (vt102->row == vt102->maxrow) + return (vtc_te_scroll(&vt102->base, 0, 0, + vt102->maxrow << vt102->dh, vt102->maxcol << vt102->dw, + 1 << vt102->dh)); + vt102->row++; + return (vt102_repos(vt102)); +} + static int vt102_answerback(struct vt102_softc *vt102) { return (0); } -static int +static __inline int vt102_print(struct vt102_softc *vt102, __wchar_t wc) { + + if (vt102->autowrap && vt102->wrap) { + vt102->col = 0; + vt102_newline(vt102); + } + vt102_putc(vt102, wc); + vt102->col++; + if (vt102->col > vt102->maxcol) { + vt102->col = vt102->maxcol; + if (vt102->autowrap) + vt102->wrap = 1; + } else + vt102_repos(vt102); return (0); } @@ -85,18 +139,42 @@ error = vtc_te_bell(&vt102->base); break; case 0x08: /* BS */ + if (vt102->col > 0) { + vt102->col--; + vt102_putc(vt102, ' '); + vt102_repos(vt102); + } break; case 0x09: /* HT */ + if (vt102->col < vt102->maxcol) { + vt102->col = (vt102->col + 8) & ~7; + if (vt102->col > vt102->maxcol) + vt102->col = vt102->maxcol; + vt102_repos(vt102); + } break; case 0x0A: /* LF */ case 0x0B: /* VT (processed as LF) */ case 0x0C: /* FF (processed as LF) */ + vt102_newline(vt102); break; case 0x0D: /* CR */ + if (vt102->col > 0) { + vt102->col = 0; + vt102_repos(vt102); + } break; case 0x0E: /* SO */ + /* + * Select G1 character set. We're Unicode, hence no character + * set switching. + */ break; case 0x0F: /* SI */ + /* + * Select G0 character set. We're Unicode, hence no character + * set switching. + */ break; case 0x18: /* CAN */ case 0x1A: /* SUB (processed as CAN) */ @@ -127,9 +205,24 @@ } static int -vt102_write(struct vtc_te_softc *sc, __wchar_t wc) +vt102_reset(struct vtc_te_softc *te) +{ + struct vt102_softc *vt102 = (struct vt102_softc *)te; + + te->te_maxcol = 80; + te->te_maxrow = 24; + + vt102->maxcol = 80; + vt102->maxrow = 24; + + vt102->autowrap = 1; + return (0); +} + +static int +vt102_write(struct vtc_te_softc *te, __wchar_t wc) { - struct vt102_softc *vt102 = (struct vt102_softc *)sc; + struct vt102_softc *vt102 = (struct vt102_softc *)te; int error; KASSERT(wc >= 0, ("Negative UTF-32 characters don't exist!")); ==== //depot/projects/tty/sys/dev/vtc/vtc_tty.c#2 (text+ko) ==== @@ -27,6 +27,122 @@ #include __FBSDID("$FreeBSD$"); -vtc_tty_write(struct vtc_tty_softc *sc, wchar_t wc) +#include + +static int +vtc_tty_open(struct tty *tp, struct cdev *dev) +{ + struct vtc_te_softc *sc; + + sc = tp->t_sc; + /* XXX notify the TE that we're opened? */ + return (0); +} + +static void +vtc_tty_close(struct tty *tp) +{ + struct vtc_te_softc *sc; + + sc = tp->t_sc; + if (sc == NULL) + return; + + wakeup(sc); + return; +} + +static void +vtc_tty_oproc(struct tty *tp) +{ + struct vtc_te_softc *sc; + + sc = tp->t_sc; + if (sc == NULL) + return; + + if (tp->t_state & (TS_TTSTOP | TS_BUSY)) + return; + + if (tp->t_outq.c_cc > 0) { + tp->t_state |= TS_BUSY; + /* XXX loop to display all characters in the buffer. */ + tp->t_state &= ~TS_BUSY; + } + + ttwwakeup(tp); +} + +static int +vtc_tty_param(struct tty *tp, struct termios *t) +{ + struct vtc_te_softc *sc; + + sc = tp->t_sc; + if (sc == NULL) + return (ENODEV); + + ttsetwater(tp); + return (0); +} + +static int +vtc_tty_modem(struct tty *tp, int biton, int bitoff) +{ + + return (0); +} + +static void +vtc_tty_break(struct tty *tp, int state) +{ +} + +static void +vtc_tty_stop(struct tty *tp, int rw) +{ +} + +int +vtc_tty_attach(struct vtc_te_softc *sc) +{ + struct tty *tp; + int unit; + + tp = ttyalloc(); + sc->sc_u.u_tty.tp = tp; + tp->t_sc = sc; + + unit = device_get_unit(sc->sc_dev); + + tp->t_oproc = uart_tty_oproc; + tp->t_param = uart_tty_param; + tp->t_stop = uart_tty_stop; + tp->t_modem = uart_tty_modem; + tp->t_break = uart_tty_break; + tp->t_open = uart_tty_open; + tp->t_close = uart_tty_close; + + tp->t_pps = &sc->sc_pps; + + if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) { + sprintf(((struct consdev *)sc->sc_sysdev->cookie)->cn_name, + "ttyu%r", unit); + ttyconsolemode(tp, 0); + } + + ttycreate(tp, NULL, 0, MINOR_CALLOUT, "v%r", unit); + + return (0); +} + +int vtc_tty_detach(struct vtc_te_softc *sc) { + struct tty *tp; + + tp = sc->sc_u.u_tty.tp; + ttygone(tp); + ttyfree(tp); + + return (0); } From owner-p4-projects@FreeBSD.ORG Sat Jun 4 18:35:53 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4562316A420; Sat, 4 Jun 2005 18:35:53 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F112416A41C for ; Sat, 4 Jun 2005 18:35:52 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDEF643D4C for ; Sat, 4 Jun 2005 18:35:52 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j54IZqxc080731 for ; Sat, 4 Jun 2005 18:35:52 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j54IZqaI080728 for perforce@freebsd.org; Sat, 4 Jun 2005 18:35:52 GMT (envelope-from csjp@freebsd.org) Date: Sat, 4 Jun 2005 18:35:52 GMT Message-Id: <200506041835.j54IZqaI080728@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 77976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2005 18:35:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=77976 Change 77976 by csjp@csjp_xor on 2005/06/04 18:35:17 -kill reference to -r in the SYNOPSIS, this option is only relevant in setfhash(8). -Add documentation for the -W option. Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/getfhash/getfhash.8#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/getfhash/getfhash.8#2 (text+ko) ==== @@ -32,7 +32,7 @@ .Nd "retrieve object hash information" .Sh SYNOPSIS .Nm -.Op Fl dr +.Op Fl dW .Ar file .Sh DESCRIPTION The @@ -48,6 +48,11 @@ .Bl -tag -width indent .It Fl d List all hash dependencies +.It Fl W +Produce a warning if the checksum registered with the object +conflicts with the object's current checksum. This option may +be useful when trying to figure out which object in a dependency +chain resulted in an execution failure. .El .Sh EXAMPLES To get the hash on