From owner-p4-projects@FreeBSD.ORG Sun Apr 24 04:19:27 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE20416A4D1; Sun, 24 Apr 2005 04:19:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4851816A4CF for ; Sun, 24 Apr 2005 04:19:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F8D543D39 for ; Sun, 24 Apr 2005 04:19:23 +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 j3O4JNTX037370 for ; Sun, 24 Apr 2005 04:19:23 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3O4Iq6f037348 for perforce@freebsd.org; Sun, 24 Apr 2005 04:18:52 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Apr 2005 04:18:52 GMT Message-Id: <200504240418.j3O4Iq6f037348@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 Subject: PERFORCE change 75852 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 04:19:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=75852 Change 75852 by marcel@marcel_nfs on 2005/04/24 04:18:01 IFC @75839 Affected files ... .. //depot/projects/tty/MAINTAINERS#9 integrate .. //depot/projects/tty/Makefile#11 integrate .. //depot/projects/tty/Makefile.inc1#16 integrate .. //depot/projects/tty/UPDATING#14 integrate .. //depot/projects/tty/bin/Makefile#4 integrate .. //depot/projects/tty/bin/chflags/chflags.1#7 integrate .. //depot/projects/tty/bin/chmod/chmod.1#4 integrate .. //depot/projects/tty/bin/cp/cp.1#7 integrate .. //depot/projects/tty/bin/cp/utils.c#6 integrate .. //depot/projects/tty/bin/csh/config.h#3 integrate .. //depot/projects/tty/bin/date/date.1#6 integrate .. //depot/projects/tty/bin/dd/dd.1#5 integrate .. //depot/projects/tty/bin/ed/main.c#4 integrate .. //depot/projects/tty/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/tty/bin/hostname/hostname.1#5 integrate .. //depot/projects/tty/bin/ln/ln.c#5 integrate .. //depot/projects/tty/bin/ln/symlink.7#5 integrate .. //depot/projects/tty/bin/ls/ls.1#9 integrate .. //depot/projects/tty/bin/ls/util.c#7 integrate .. //depot/projects/tty/bin/mkdir/mkdir.c#5 integrate .. //depot/projects/tty/bin/pax/ar_io.c#5 integrate .. //depot/projects/tty/bin/pax/cpio.1#3 integrate .. //depot/projects/tty/bin/pax/tar.1#4 integrate .. //depot/projects/tty/bin/ps/keyword.c#7 integrate .. //depot/projects/tty/bin/ps/ps.1#7 integrate .. //depot/projects/tty/bin/ps/ps.c#7 integrate .. //depot/projects/tty/bin/pwd/pwd.c#6 integrate .. //depot/projects/tty/bin/rcp/rcp.1#5 integrate .. //depot/projects/tty/bin/rcp/rcp.c#5 integrate .. //depot/projects/tty/bin/rm/rm.1#6 integrate .. //depot/projects/tty/bin/setfacl/setfacl.1#5 integrate .. //depot/projects/tty/bin/setfacl/setfacl.c#4 integrate .. //depot/projects/tty/bin/sh/options.c#3 integrate .. //depot/projects/tty/bin/sh/parser.c#4 integrate .. //depot/projects/tty/bin/sh/sh.1#9 integrate .. //depot/projects/tty/bin/stty/stty.1#5 integrate .. //depot/projects/tty/bin/stty/stty.c#4 integrate .. //depot/projects/tty/contrib/amd/fixmount/fixmount.8#4 integrate .. //depot/projects/tty/contrib/amd/hlfsd/hlfsd.8#4 integrate .. //depot/projects/tty/contrib/bind9/CHANGES#3 integrate .. //depot/projects/tty/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/tty/contrib/bind9/FAQ#2 integrate .. //depot/projects/tty/contrib/bind9/FREEBSD-Upgrade#3 integrate .. //depot/projects/tty/contrib/bind9/FREEBSD-Xlist#2 integrate .. //depot/projects/tty/contrib/bind9/KNOWN_DEFECTS#2 delete .. //depot/projects/tty/contrib/bind9/README#2 integrate .. //depot/projects/tty/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/include/named/control.h#3 integrate .. //depot/projects/tty/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/tty/contrib/bind9/config.guess#2 integrate .. //depot/projects/tty/contrib/bind9/config.sub#2 integrate .. //depot/projects/tty/contrib/bind9/configure.in#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/tty/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/aclocal.m4#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/dns_nw.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/gen.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/getpwent_r.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/libtool.m4#2 delete .. //depot/projects/tty/contrib/bind9/lib/bind/ltmain.sh#2 delete .. //depot/projects/tty/contrib/bind9/lib/bind/make/rules.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/nameser/ns_print.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/dst_api.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/dst_internal.h#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/dst_lib.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/dst_openssl.h#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/dst_parse.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/dst_parse.h#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/dst_result.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/gssapi_link.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/gssapictx.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/hmac_link.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dst/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/include/dst/dst.h#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/include/dst/gssapi.h#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/include/dst/lib.h#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/include/dst/result.h#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/key.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/openssl_link.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/openssldh_link.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/openssldsa_link.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/opensslrsa_link.c#1 branch .. //depot/projects/tty/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/sec/Makefile.in#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/Makefile.in#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/dst_api.c#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/dst_internal.h#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/dst_lib.c#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/dst_openssl.h#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/dst_parse.c#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/dst_parse.h#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/dst_result.c#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/gssapi_link.c#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/gssapictx.c#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/hmac_link.c#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/include/Makefile.in#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/include/dst/Makefile.in#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/include/dst/dst.h#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/include/dst/gssapi.h#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/include/dst/lib.h#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/include/dst/result.h#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/key.c#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/openssl_link.c#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/openssldh_link.c#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/openssldsa_link.c#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/sec/dst/opensslrsa_link.c#2 delete .. //depot/projects/tty/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/pthreads/thread.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/string.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/task.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/print.c#2 integrate .. //depot/projects/tty/contrib/bind9/libtool.m4#2 integrate .. //depot/projects/tty/contrib/bind9/ltmain.sh#2 integrate .. //depot/projects/tty/contrib/bind9/make/includes.in#2 integrate .. //depot/projects/tty/contrib/bind9/version#3 integrate .. //depot/projects/tty/contrib/bsnmp/FREEBSD-Xlist#3 integrate .. //depot/projects/tty/contrib/bsnmp/NEWS#4 integrate .. //depot/projects/tty/contrib/bsnmp/VERSION#4 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmpdef/gensnmpdef.1#3 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.1#4 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.c#4 integrate .. //depot/projects/tty/contrib/bsnmp/lib/asn1.3#4 integrate .. //depot/projects/tty/contrib/bsnmp/lib/bsnmpagent.3#4 integrate .. //depot/projects/tty/contrib/bsnmp/lib/bsnmpclient.3#4 integrate .. //depot/projects/tty/contrib/bsnmp/lib/bsnmplib.3#4 integrate .. //depot/projects/tty/contrib/bsnmp/lib/snmpagent.c#4 integrate .. //depot/projects/tty/contrib/bsnmp/oid-list#1 branch .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII.c#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/snmp_mibII.3#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_mibII/snmp_mibII.h#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/bsnmpd.1#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/main.c#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/snmpd.config#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/snmpmod.3#4 integrate .. //depot/projects/tty/contrib/bsnmp/snmpd/trans_lsock.c#3 integrate .. //depot/projects/tty/contrib/cvs/src/login.c#3 integrate .. //depot/projects/tty/contrib/cvs/src/patch.c#3 integrate .. //depot/projects/tty/contrib/cvs/src/rcs.c#4 integrate .. //depot/projects/tty/contrib/lukemftp/src/Makefile#2 integrate .. //depot/projects/tty/contrib/lukemftp/src/cmds.c#4 integrate .. //depot/projects/tty/contrib/lukemftp/src/cmdtab.c#4 integrate .. //depot/projects/tty/contrib/lukemftp/src/extern.h#4 integrate .. //depot/projects/tty/contrib/lukemftp/src/fetch.c#5 integrate .. //depot/projects/tty/contrib/lukemftp/src/ftp.1#5 integrate .. //depot/projects/tty/contrib/lukemftp/src/ftp.c#5 integrate .. //depot/projects/tty/contrib/lukemftp/src/ftp_var.h#4 integrate .. //depot/projects/tty/contrib/lukemftp/src/main.c#4 integrate .. //depot/projects/tty/contrib/lukemftp/src/progressbar.c#4 integrate .. //depot/projects/tty/contrib/lukemftp/src/progressbar.h#3 integrate .. //depot/projects/tty/contrib/lukemftp/src/util.c#5 integrate .. //depot/projects/tty/contrib/lukemftp/src/version.h#5 integrate .. //depot/projects/tty/contrib/netcat/FREEBSD-Xlist#1 branch .. //depot/projects/tty/contrib/netcat/FREEBSD-upgrade#1 branch .. //depot/projects/tty/contrib/netcat/atomicio.c#1 branch .. //depot/projects/tty/contrib/netcat/nc.1#1 branch .. //depot/projects/tty/contrib/netcat/netcat.c#1 branch .. //depot/projects/tty/contrib/netcat/socks.c#1 branch .. //depot/projects/tty/contrib/openpam/HISTORY#6 integrate .. //depot/projects/tty/contrib/openpam/MANIFEST#4 integrate .. //depot/projects/tty/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/tty/contrib/openpam/Makefile.in#3 integrate .. //depot/projects/tty/contrib/openpam/RELNOTES#6 integrate .. //depot/projects/tty/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/tty/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openpam/config.h.in#2 integrate .. //depot/projects/tty/contrib/openpam/configure#3 integrate .. //depot/projects/tty/contrib/openpam/configure.ac#1 branch .. //depot/projects/tty/contrib/openpam/depcomp#2 integrate .. //depot/projects/tty/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam.man#3 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_borrow_cred.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_free_data.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_free_envlist.3#1 branch .. //depot/projects/tty/contrib/openpam/doc/man/openpam_get_option.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_log.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_nullconv.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_readline.3#4 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_restore_cred.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_set_option.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_ttyconv.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam.man#4 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_acct_mgmt.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_authenticate.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_chauthtok.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_close_session.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_end.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_error.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_authtok.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_data.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_item.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_user.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_getenv.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_getenvlist.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_info.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_open_session.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_prompt.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_putenv.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_set_data.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_set_item.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_setcred.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_setenv.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_authenticate.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_chauthtok.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_close_session.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_open_session.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_setcred.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_start.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_strerror.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_verror.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_vinfo.3#6 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_vprompt.3#6 integrate .. //depot/projects/tty/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openpam/include/security/openpam.h#5 integrate .. //depot/projects/tty/contrib/openpam/include/security/openpam_version.h#6 integrate .. //depot/projects/tty/contrib/openpam/install-sh#2 integrate .. //depot/projects/tty/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/tty/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_borrow_cred.c#6 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_free_data.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_free_envlist.c#1 branch .. //depot/projects/tty/contrib/openpam/lib/openpam_log.c#4 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_nullconv.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_restore_cred.c#6 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_ttyconv.c#6 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_get_authtok.c#6 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_get_data.c#5 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_get_user.c#6 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_open_session.c#4 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_strerror.c#3 integrate .. //depot/projects/tty/contrib/openpam/ltmain.sh#3 integrate .. //depot/projects/tty/contrib/openpam/misc/gendoc.pl#4 integrate .. //depot/projects/tty/contrib/openpam/missing#2 integrate .. //depot/projects/tty/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/tty/contrib/pf/man/pf.4#4 integrate .. //depot/projects/tty/contrib/pf/man/pf.conf.5#4 integrate .. //depot/projects/tty/contrib/pf/man/pfsync.4#3 integrate .. //depot/projects/tty/contrib/sendmail/FREEBSD-upgrade#8 integrate .. //depot/projects/tty/contrib/sendmail/KNOWNBUGS#4 integrate .. //depot/projects/tty/contrib/sendmail/PGPKEYS#5 integrate .. //depot/projects/tty/contrib/sendmail/RELEASE_NOTES#8 integrate .. //depot/projects/tty/contrib/sendmail/cf/cf/Makefile#3 integrate .. //depot/projects/tty/contrib/sendmail/cf/cf/submit.cf#8 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/proto.m4#7 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/version.m4#8 integrate .. //depot/projects/tty/contrib/sendmail/cf/mailer/local.m4#2 integrate .. //depot/projects/tty/contrib/sendmail/cf/ostype/dragonfly.m4#1 branch .. //depot/projects/tty/contrib/sendmail/editmap/editmap.c#2 integrate .. //depot/projects/tty/contrib/sendmail/include/libmilter/mfapi.h#5 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/clock.h#2 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/conf.h#7 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/config.h#3 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/os/sm_os_dragonfly.h#1 branch .. //depot/projects/tty/contrib/sendmail/libmilter/comm.c#5 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/engine.c#6 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/listener.c#7 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/signal.c#6 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/sm_gethost.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/smfi.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/Makefile.m4#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/b-strcmp.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/clock.c#5 integrate .. //depot/projects/tty/contrib/sendmail/libsm/debug.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/fclose.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/fopen.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/fpos.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/fseek.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/heap.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/ldap.c#5 integrate .. //depot/projects/tty/contrib/sendmail/libsm/rpool.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/smstdio.c#4 integrate .. //depot/projects/tty/contrib/sendmail/libsm/stdio.c#6 integrate .. //depot/projects/tty/contrib/sendmail/libsm/strio.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/t-event.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/t-shm.c#3 integrate .. //depot/projects/tty/contrib/sendmail/libsm/ungetc.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/vfprintf.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/vfscanf.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/vsscanf.c#2 delete .. //depot/projects/tty/contrib/sendmail/libsmdb/smdb.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsmdb/smdb1.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsmutil/safefile.c#3 integrate .. //depot/projects/tty/contrib/sendmail/mail.local/Makefile.m4#3 integrate .. //depot/projects/tty/contrib/sendmail/mail.local/mail.local.c#7 integrate .. //depot/projects/tty/contrib/sendmail/makemap/makemap.c#4 integrate .. //depot/projects/tty/contrib/sendmail/smrsh/smrsh.8#5 integrate .. //depot/projects/tty/contrib/sendmail/smrsh/smrsh.c#7 integrate .. //depot/projects/tty/contrib/sendmail/src/README#8 integrate .. //depot/projects/tty/contrib/sendmail/src/bf.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/collect.c#6 integrate .. //depot/projects/tty/contrib/sendmail/src/conf.c#10 integrate .. //depot/projects/tty/contrib/sendmail/src/control.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/daemon.c#7 integrate .. //depot/projects/tty/contrib/sendmail/src/deliver.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/domain.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/headers.c#10 integrate .. //depot/projects/tty/contrib/sendmail/src/helpfile#2 integrate .. //depot/projects/tty/contrib/sendmail/src/map.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/mci.c#7 integrate .. //depot/projects/tty/contrib/sendmail/src/milter.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/mime.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/parseaddr.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/queue.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/readcf.c#7 integrate .. //depot/projects/tty/contrib/sendmail/src/recipient.c#6 integrate .. //depot/projects/tty/contrib/sendmail/src/sasl.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/savemail.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/sendmail.h#8 integrate .. //depot/projects/tty/contrib/sendmail/src/sfsasl.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/sm_resolve.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/srvrsmtp.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/tls.c#7 integrate .. //depot/projects/tty/contrib/sendmail/src/usersmtp.c#6 integrate .. //depot/projects/tty/contrib/sendmail/src/util.c#6 integrate .. //depot/projects/tty/contrib/sendmail/src/version.c#8 integrate .. //depot/projects/tty/contrib/sendmail/vacation/vacation.c#4 integrate .. //depot/projects/tty/contrib/telnet/telnet/commands.c#4 integrate .. //depot/projects/tty/contrib/telnet/telnet/telnet.1#3 integrate .. //depot/projects/tty/contrib/telnet/telnet/telnet.c#2 integrate .. //depot/projects/tty/contrib/top/commands.c#4 integrate .. //depot/projects/tty/contrib/top/top.X#4 integrate .. //depot/projects/tty/contrib/top/top.c#4 integrate .. //depot/projects/tty/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/tty/crypto/heimdal/ChangeLog#4 integrate .. //depot/projects/tty/crypto/heimdal/FREEBSD-Xlist#2 integrate .. //depot/projects/tty/crypto/heimdal/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/NEWS#4 integrate .. //depot/projects/tty/crypto/heimdal/aclocal.m4#4 integrate .. //depot/projects/tty/crypto/heimdal/admin/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/admin/get.c#3 integrate .. //depot/projects/tty/crypto/heimdal/appl/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/afsutil/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ChangeLog#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/common/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftp/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftp/ftp.c#3 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftpd/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftpd/extern.h#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftpd/ftpcmd.y#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftpd/ftpd.8#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftpd/ftpd.c#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/ftp/ftpd/ftpd_locl.h#3 integrate .. //depot/projects/tty/crypto/heimdal/appl/kf/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/login/ChangeLog#3 integrate .. //depot/projects/tty/crypto/heimdal/appl/login/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/login/login.c#3 integrate .. //depot/projects/tty/crypto/heimdal/appl/push/ChangeLog#3 integrate .. //depot/projects/tty/crypto/heimdal/appl/push/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/push/push.c#3 integrate .. //depot/projects/tty/crypto/heimdal/appl/rcp/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/rsh/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/su/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/ChangeLog#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#3 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/telnet/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/telnet/network.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/telnetd/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/appl/telnet/telnetd/state.c#2 integrate .. //depot/projects/tty/crypto/heimdal/appl/test/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/compile#2 integrate .. //depot/projects/tty/crypto/heimdal/config.guess#3 integrate .. //depot/projects/tty/crypto/heimdal/config.sub#3 integrate .. //depot/projects/tty/crypto/heimdal/configure#4 integrate .. //depot/projects/tty/crypto/heimdal/configure.in#4 integrate .. //depot/projects/tty/crypto/heimdal/doc/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/include/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/include/kadm5/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/install-sh#3 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/ChangeLog#3 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/kadmind.c#3 integrate .. //depot/projects/tty/crypto/heimdal/kadmin/version4.c#3 integrate .. //depot/projects/tty/crypto/heimdal/kdc/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/kdc/connect.c#4 integrate .. //depot/projects/tty/crypto/heimdal/kdc/kerberos5.c#4 integrate .. //depot/projects/tty/crypto/heimdal/kpasswd/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/kuser/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/kuser/kinit.c#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/45/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/asn1/Makefile.am#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/asn1/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/asn1/k5.asn1#3 integrate .. //depot/projects/tty/crypto/heimdal/lib/auth/ChangeLog#3 integrate .. //depot/projects/tty/crypto/heimdal/lib/auth/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/auth/afskauthlib/verify.c#2 integrate .. //depot/projects/tty/crypto/heimdal/lib/auth/pam/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/auth/sia/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/com_err/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/gssapi/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/hdb/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/kadm5/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/ChangeLog#3 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/kafs/afssys.c#3 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/Makefile.am#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/changepw.c#3 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/context.c#3 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/init_creds_pw.c#3 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5-protos.h#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5.h#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/krb5/krb5_set_password.3#1 branch .. //depot/projects/tty/crypto/heimdal/lib/roken/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/sl/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/lib/vers/Makefile.in#4 integrate .. //depot/projects/tty/crypto/heimdal/missing#3 integrate .. //depot/projects/tty/crypto/heimdal/mkinstalldirs#3 integrate .. //depot/projects/tty/crypto/heimdal/tools/Makefile.in#4 integrate .. //depot/projects/tty/crypto/openssl/CHANGES#6 integrate .. //depot/projects/tty/crypto/openssl/Configure#6 integrate .. //depot/projects/tty/crypto/openssl/FAQ#6 integrate .. //depot/projects/tty/crypto/openssl/FREEBSD-Xlist#3 integrate .. //depot/projects/tty/crypto/openssl/INSTALL#4 integrate .. //depot/projects/tty/crypto/openssl/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/Makefile.org#6 integrate .. //depot/projects/tty/crypto/openssl/Makefile.ssl#6 delete .. //depot/projects/tty/crypto/openssl/NEWS#6 integrate .. //depot/projects/tty/crypto/openssl/PROBLEMS#5 integrate .. //depot/projects/tty/crypto/openssl/README#6 integrate .. //depot/projects/tty/crypto/openssl/apps/CA.pl#5 integrate .. //depot/projects/tty/crypto/openssl/apps/CA.pl.in#3 integrate .. //depot/projects/tty/crypto/openssl/apps/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/apps/Makefile.ssl#6 delete .. //depot/projects/tty/crypto/openssl/apps/apps.c#6 integrate .. //depot/projects/tty/crypto/openssl/apps/apps.h#5 integrate .. //depot/projects/tty/crypto/openssl/apps/asn1pars.c#4 integrate .. //depot/projects/tty/crypto/openssl/apps/ca.c#6 integrate .. //depot/projects/tty/crypto/openssl/apps/der_chop#4 integrate .. //depot/projects/tty/crypto/openssl/apps/dgst.c#5 integrate .. //depot/projects/tty/crypto/openssl/apps/enc.c#5 integrate .. //depot/projects/tty/crypto/openssl/apps/openssl.c#5 integrate .. //depot/projects/tty/crypto/openssl/apps/openssl.cnf#4 integrate .. //depot/projects/tty/crypto/openssl/apps/pkcs8.c#5 integrate .. //depot/projects/tty/crypto/openssl/apps/prime.c#1 branch .. //depot/projects/tty/crypto/openssl/apps/progs.h#4 integrate .. //depot/projects/tty/crypto/openssl/apps/req.c#5 integrate .. //depot/projects/tty/crypto/openssl/apps/speed.c#5 integrate .. //depot/projects/tty/crypto/openssl/apps/x509.c#6 integrate .. //depot/projects/tty/crypto/openssl/certs/eng1.pem#1 branch .. //depot/projects/tty/crypto/openssl/certs/eng2.pem#1 branch .. //depot/projects/tty/crypto/openssl/certs/eng3.pem#1 branch .. //depot/projects/tty/crypto/openssl/certs/eng4.pem#1 branch .. //depot/projects/tty/crypto/openssl/certs/eng5.pem#1 branch .. //depot/projects/tty/crypto/openssl/comm.txt#1 branch .. //depot/projects/tty/crypto/openssl/comms.txt#1 branch .. //depot/projects/tty/crypto/openssl/config#6 integrate .. //depot/projects/tty/crypto/openssl/crypto/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/aes/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/aes/Makefile.ssl#3 delete .. //depot/projects/tty/crypto/openssl/crypto/aes/aes.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/aes/aes_cfb.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/aes/aes_core.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/aes/aes_ctr.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/aes/aes_locl.h#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/asn1/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/asn1/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/asn1/a_int.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/asn1/a_strex.c#5 integrate .. //depot/projects/tty/crypto/openssl/crypto/asn1/f.c#2 delete .. //depot/projects/tty/crypto/openssl/crypto/asn1/p5_pbev2.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/asn1/x_cinf.c#2 delete .. //depot/projects/tty/crypto/openssl/crypto/asn1/x_crl.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bf/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/bf/Makefile.ssl#5 delete .. //depot/projects/tty/crypto/openssl/crypto/bio/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/bio/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/bio/b_print.c#5 integrate .. //depot/projects/tty/crypto/openssl/crypto/bio/bio.h#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/bio/bss_file.c#5 integrate .. //depot/projects/tty/crypto/openssl/crypto/bn/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/bn/Makefile.ssl#6 delete .. //depot/projects/tty/crypto/openssl/crypto/bn/asm/ia64.S#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bn/bntest.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/buffer/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/buffer/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/cast/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/cast/Makefile.ssl#5 delete .. //depot/projects/tty/crypto/openssl/crypto/comp/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/comp/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/comp/c_zlib.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/conf/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/conf/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/conf/conf_def.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/cryptlib.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/crypto.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/FILES0#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/des/Makefile.ssl#5 delete .. //depot/projects/tty/crypto/openssl/crypto/des/cfb64ede.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/des.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/des_enc.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/des_old.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/destest.c#5 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/ecb3_enc.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/set_key.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dh/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/dh/Makefile.ssl#5 delete .. //depot/projects/tty/crypto/openssl/crypto/dh/dh_check.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dh/dh_err.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dh/dh_gen.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/dh/dh_key.c#5 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/dsa/Makefile.ssl#5 delete .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsa.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsa_gen.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsa_key.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsa_ossl.c#5 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsa_sign.c#5 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsa_vrf.c#5 integrate .. //depot/projects/tty/crypto/openssl/crypto/dso/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/dso/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/ec/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/ec/Makefile.ssl#3 delete .. //depot/projects/tty/crypto/openssl/crypto/engine/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/engine/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/engine/hw_cryptodev.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/err/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/err/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/err/err.c#6 integrate .. //depot/projects/tty/crypto/openssl/crypto/err/err.h#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/err/err_all.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/err/openssl.ec#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/evp/Makefile.ssl#5 delete .. //depot/projects/tty/crypto/openssl/crypto/evp/bio_md.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/c_allc.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/e_aes.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/e_des.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/e_des3.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/e_old.c#1 branch .. //depot/projects/tty/crypto/openssl/crypto/evp/evp.h#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/evp_err.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/evp_lib.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/evp_locl.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/evp_test.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/evptests.txt#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/hmac/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/hmac/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/idea/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/idea/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/krb5/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/krb5/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/lhash/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/lhash/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/md2/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/md2/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/md32_common.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/md4/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/md4/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/md5/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/md5/Makefile.ssl#6 delete .. //depot/projects/tty/crypto/openssl/crypto/mdc2/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/mdc2/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/o_str.c#1 branch .. //depot/projects/tty/crypto/openssl/crypto/o_str.h#1 branch .. //depot/projects/tty/crypto/openssl/crypto/o_time.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/objects/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/objects/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/objects/obj_dat.h#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/objects/obj_mac.h#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/objects/obj_mac.num#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/objects/objects.txt#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/ocsp/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/ocsp/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/opensslv.h#6 integrate .. //depot/projects/tty/crypto/openssl/crypto/pem/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/pem/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/pem/pem_all.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/pem/pem_pkey.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/pkcs12/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/pkcs12/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/pkcs7/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/pkcs7/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/pkcs7/pk7_attr.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/rand/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/rand/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/rand/md_rand.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rand/rand.h#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/rand/rand_egd.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/rand/rand_err.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rand/rand_lib.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/rand/rand_win.c#5 integrate .. //depot/projects/tty/crypto/openssl/crypto/rand/randfile.c#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/rc2/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/rc2/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/rc4/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/rc4/Makefile.ssl#5 delete .. //depot/projects/tty/crypto/openssl/crypto/rc5/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/rc5/Makefile.ssl#5 delete .. //depot/projects/tty/crypto/openssl/crypto/ripemd/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/ripemd/Makefile.ssl#5 delete .. //depot/projects/tty/crypto/openssl/crypto/rsa/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/rsa/Makefile.ssl#5 delete .. //depot/projects/tty/crypto/openssl/crypto/rsa/rsa.h#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/rsa/rsa_eay.c#6 integrate .. //depot/projects/tty/crypto/openssl/crypto/rsa/rsa_gen.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/sha/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/sha/Makefile.ssl#5 delete .. //depot/projects/tty/crypto/openssl/crypto/sha/sha.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/sha/sha1dgst.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/stack/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/stack/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/stack/safestack.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/stack/stack.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/stack/stack.h#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/txt_db/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/txt_db/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/ui/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/ui/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/x509/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/x509/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/x509/x509.h#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509/x509_req.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509/x509_vfy.c#5 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509v3/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/crypto/x509v3/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/crypto/x509v3/ext_dat.h#4 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509v3/v3_int.c#3 integrate .. //depot/projects/tty/crypto/openssl/demos/engines/rsaref/Makefile#2 delete .. //depot/projects/tty/crypto/openssl/demos/engines/rsaref/README#2 delete .. //depot/projects/tty/crypto/openssl/demos/engines/rsaref/build.com#2 delete .. //depot/projects/tty/crypto/openssl/demos/engines/rsaref/rsaref.c#2 delete .. //depot/projects/tty/crypto/openssl/demos/engines/rsaref/rsaref.ec#2 delete .. //depot/projects/tty/crypto/openssl/demos/engines/rsaref/rsaref_err.c#2 delete .. //depot/projects/tty/crypto/openssl/demos/engines/rsaref/rsaref_err.h#2 delete .. //depot/projects/tty/crypto/openssl/doc/apps/enc.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/crypto/BN_num_bytes.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/crypto/RSA_public_encrypt.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/crypto/pem.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod#2 integrate .. //depot/projects/tty/crypto/openssl/e_os.h#4 integrate .. //depot/projects/tty/crypto/openssl/e_os2.h#3 integrate .. //depot/projects/tty/crypto/openssl/openssl.spec#6 integrate .. //depot/projects/tty/crypto/openssl/os2/OS2-EMX.cmd#2 delete .. //depot/projects/tty/crypto/openssl/ssl/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/ssl/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/ssl/s23_clnt.c#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/s2_clnt.c#5 integrate .. //depot/projects/tty/crypto/openssl/ssl/s2_srvr.c#4 integrate .. //depot/projects/tty/crypto/openssl/ssl/s3_clnt.c#5 integrate .. //depot/projects/tty/crypto/openssl/ssl/s3_lib.c#4 integrate .. //depot/projects/tty/crypto/openssl/ssl/s3_pkt.c#5 integrate .. //depot/projects/tty/crypto/openssl/ssl/s3_srvr.c#6 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl.h#5 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl_cert.c#5 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl_ciph.c#5 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl_lib.c#6 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl_locl.h#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl_sess.c#5 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssltest.c#6 integrate .. //depot/projects/tty/crypto/openssl/ssl/t1_enc.c#3 integrate .. //depot/projects/tty/crypto/openssl/test/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/test/Makefile.ssl#6 delete .. //depot/projects/tty/crypto/openssl/test/bctest#2 integrate .. //depot/projects/tty/crypto/openssl/test/evptests.txt#2 integrate .. //depot/projects/tty/crypto/openssl/test/testenc#2 integrate .. //depot/projects/tty/crypto/openssl/test/testfipsssl#1 branch .. //depot/projects/tty/crypto/openssl/tools/Makefile#1 branch .. //depot/projects/tty/crypto/openssl/tools/Makefile.ssl#4 delete .. //depot/projects/tty/crypto/openssl/tools/c_issuer#2 integrate .. //depot/projects/tty/crypto/openssl/tools/c_rehash#5 integrate .. //depot/projects/tty/crypto/openssl/util/domd#3 integrate .. //depot/projects/tty/crypto/openssl/util/extract-names.pl#4 integrate .. //depot/projects/tty/crypto/openssl/util/fixNT.sh#2 integrate .. //depot/projects/tty/crypto/openssl/util/libeay.num#5 integrate .. //depot/projects/tty/crypto/openssl/util/mk1mf.pl#6 integrate .. //depot/projects/tty/crypto/openssl/util/mkdef.pl#6 integrate .. //depot/projects/tty/crypto/openssl/util/mkerr.pl#4 integrate .. //depot/projects/tty/crypto/openssl/util/mkfiles.pl#3 integrate .. //depot/projects/tty/crypto/openssl/util/mkstack.pl#3 integrate .. //depot/projects/tty/crypto/openssl/util/pl/BC-16.pl#3 integrate .. //depot/projects/tty/crypto/openssl/util/pl/BC-32.pl#3 integrate .. //depot/projects/tty/crypto/openssl/util/pl/Mingw32.pl#4 integrate .. //depot/projects/tty/crypto/openssl/util/pl/OS2-EMX.pl#3 integrate .. //depot/projects/tty/crypto/openssl/util/pl/VC-16.pl#3 integrate .. //depot/projects/tty/crypto/openssl/util/pl/VC-32.pl#3 integrate .. //depot/projects/tty/crypto/openssl/util/pl/VC-CE.pl#2 integrate .. //depot/projects/tty/crypto/openssl/util/pl/linux.pl#2 integrate .. //depot/projects/tty/crypto/openssl/util/pl/ultrix.pl#2 integrate .. //depot/projects/tty/crypto/openssl/util/pl/unix.pl#2 integrate .. //depot/projects/tty/crypto/openssl/util/pod2mantest#3 integrate .. //depot/projects/tty/crypto/openssl/util/selftest.pl#3 integrate .. //depot/projects/tty/etc/Makefile#12 integrate .. //depot/projects/tty/etc/defaults/rc.conf#12 integrate .. //depot/projects/tty/etc/etc.sparc64/ttys#6 integrate .. //depot/projects/tty/etc/mtree/BSD.include.dist#12 integrate .. //depot/projects/tty/etc/mtree/BSD.local.dist#9 integrate .. //depot/projects/tty/etc/mtree/BSD.usr.dist#13 integrate .. //depot/projects/tty/etc/mtree/BSD.x11-4.dist#5 integrate .. //depot/projects/tty/etc/netstart#5 integrate .. //depot/projects/tty/etc/newsyslog.conf#7 integrate .. //depot/projects/tty/etc/periodic/security/500.ipfwdenied#3 integrate .. //depot/projects/tty/etc/periodic/security/550.ipfwlimit#3 integrate .. //depot/projects/tty/etc/periodic/weekly/330.catman#2 integrate .. //depot/projects/tty/etc/protocols#3 integrate .. //depot/projects/tty/etc/rc.d/Makefile#9 integrate .. //depot/projects/tty/etc/rc.d/bsnmpd#1 branch .. //depot/projects/tty/etc/rc.d/cleanvar#7 integrate .. //depot/projects/tty/etc/rc.d/dumpon#5 integrate .. //depot/projects/tty/etc/rc.d/initrandom#4 integrate .. //depot/projects/tty/etc/rc.d/ipfw#6 integrate .. //depot/projects/tty/etc/rc.d/lomac#4 delete .. //depot/projects/tty/etc/rc.d/lpd#4 integrate .. //depot/projects/tty/etc/rc.d/mixer#3 integrate .. //depot/projects/tty/etc/rc.d/newsyslog#2 integrate .. //depot/projects/tty/etc/rc.d/pf#4 integrate .. //depot/projects/tty/etc/rc.d/power_profile#3 integrate .. //depot/projects/tty/etc/rc.d/powerd#1 branch .. //depot/projects/tty/etc/rc.d/random#5 integrate .. //depot/projects/tty/etc/rc.d/resolv#3 integrate .. //depot/projects/tty/etc/rc.d/ugidfw#2 integrate .. //depot/projects/tty/etc/rc.d/var#4 integrate .. //depot/projects/tty/etc/rc.initdiskless#1 branch .. //depot/projects/tty/etc/snmpd.config#1 branch .. //depot/projects/tty/etc/syslog.conf#3 integrate .. //depot/projects/tty/games/factor/Makefile#6 integrate .. //depot/projects/tty/games/fortune/datfiles/Makefile#3 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes#12 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes2#10 delete .. //depot/projects/tty/games/fortune/datfiles/fortunes2-o#6 integrate .. //depot/projects/tty/games/fortune/datfiles/freebsd-tips#7 integrate .. //depot/projects/tty/games/fortune/datfiles/limerick#3 integrate .. //depot/projects/tty/games/fortune/datfiles/murphy#4 integrate .. //depot/projects/tty/games/fortune/datfiles/zippy#2 integrate .. //depot/projects/tty/games/fortune/fortune/Makefile#3 integrate .. //depot/projects/tty/games/fortune/fortune/fortune.6#3 integrate .. //depot/projects/tty/games/fortune/fortune/fortune.c#5 integrate .. //depot/projects/tty/games/fortune/strfile/Makefile#4 integrate .. //depot/projects/tty/games/fortune/strfile/strfile.8#4 integrate .. //depot/projects/tty/games/fortune/strfile/strfile.c#6 integrate .. //depot/projects/tty/games/fortune/strfile/strfile.h#2 integrate .. //depot/projects/tty/games/fortune/tools/do_sort#2 integrate .. //depot/projects/tty/games/fortune/tools/do_uniq.py#1 branch .. //depot/projects/tty/games/fortune/unstr/Makefile#3 integrate .. //depot/projects/tty/games/fortune/unstr/unstr.c#3 integrate .. //depot/projects/tty/games/number/number.6#2 integrate .. //depot/projects/tty/games/number/number.c#3 integrate .. //depot/projects/tty/games/random/random.c#6 integrate .. //depot/projects/tty/gnu/lib/libdialog/Makefile#4 integrate .. //depot/projects/tty/gnu/lib/libdialog/dialog.3#5 integrate .. //depot/projects/tty/gnu/lib/libobjc/Makefile#7 integrate .. //depot/projects/tty/gnu/lib/libstdc++/Makefile#8 integrate .. //depot/projects/tty/gnu/lib/libstdc++/config.h#7 integrate .. //depot/projects/tty/gnu/usr.bin/Makefile#8 integrate .. //depot/projects/tty/gnu/usr.bin/binutils/libiberty/Makefile#6 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/gdb/Makefile#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/gdb/gdb.1#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/gdbtui/Makefile#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/Makefile#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/kgdb.1#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/libgdb/Makefile#3 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#3 integrate .. //depot/projects/tty/gnu/usr.bin/grep/grep.c#4 integrate .. //depot/projects/tty/gnu/usr.bin/groff/tmac/mdoc.local#8 integrate .. //depot/projects/tty/gnu/usr.bin/man/man/man.man#3 integrate .. //depot/projects/tty/gnu/usr.bin/man/manpath/manpath.man#2 integrate .. //depot/projects/tty/gnu/usr.bin/tar/Makefile#5 integrate .. //depot/projects/tty/gnu/usr.bin/tar/tar.1#4 integrate .. //depot/projects/tty/include/Makefile#12 integrate .. //depot/projects/tty/include/netdb.h#5 integrate .. //depot/projects/tty/include/nl_types.h#2 integrate .. //depot/projects/tty/include/pthread.h#7 integrate .. //depot/projects/tty/include/runefile.h#1 branch .. //depot/projects/tty/include/stdbool.h#2 integrate .. //depot/projects/tty/include/time.h#3 integrate .. //depot/projects/tty/include/unistd.h#5 integrate .. //depot/projects/tty/kerberos5/Makefile.inc#8 integrate .. //depot/projects/tty/kerberos5/include/config.h#5 integrate .. //depot/projects/tty/kerberos5/include/version.h#5 integrate .. //depot/projects/tty/kerberos5/lib/libasn1/Makefile#5 integrate .. //depot/projects/tty/kerberos5/usr.bin/krb5-config/Makefile#5 integrate .. //depot/projects/tty/lib/Makefile#16 integrate .. //depot/projects/tty/lib/bind/config.h#2 integrate .. //depot/projects/tty/lib/bind/config.mk#3 integrate .. //depot/projects/tty/lib/bind/dns/Makefile#3 integrate .. //depot/projects/tty/lib/bind/dns/code.h#2 integrate .. //depot/projects/tty/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/tty/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/tty/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/tty/lib/libalias/alias.c#6 integrate .. //depot/projects/tty/lib/libalias/alias_skinny.c#4 integrate .. //depot/projects/tty/lib/libarchive/Makefile#4 integrate .. //depot/projects/tty/lib/libarchive/README#3 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/tty/lib/libarchive/archive_platform.h#4 integrate .. //depot/projects/tty/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read.3#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read_extract.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read_open_file.c#3 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/tty/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/tty/lib/libarchive/archive_write.3#4 integrate .. //depot/projects/tty/lib/libarchive/archive_write.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_write_open_file.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/tty/lib/libarchive/configure.ac.in#3 integrate .. //depot/projects/tty/lib/libarchive/libarchive-formats.5#4 integrate .. //depot/projects/tty/lib/libarchive/tar.5#4 integrate .. //depot/projects/tty/lib/libatm/Makefile#5 integrate .. //depot/projects/tty/lib/libbluetooth/bluetooth.h#2 integrate .. //depot/projects/tty/lib/libbsnmp/Makefile#3 integrate .. //depot/projects/tty/lib/libbsnmp/modules/Makefile#4 delete .. //depot/projects/tty/lib/libbsnmp/modules/Makefile.inc#4 delete .. //depot/projects/tty/lib/libbsnmp/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt#2 delete .. //depot/projects/tty/lib/libbsnmp/modules/snmp_atm/Makefile#2 delete .. //depot/projects/tty/lib/libbsnmp/modules/snmp_atm/atm_freebsd.def#2 delete .. //depot/projects/tty/lib/libbsnmp/modules/snmp_atm/atm_sys.c#2 delete .. //depot/projects/tty/lib/libbsnmp/modules/snmp_mibII/Makefile#3 delete .. //depot/projects/tty/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#3 delete .. //depot/projects/tty/lib/libbsnmp/modules/snmp_netgraph/Makefile#3 delete .. //depot/projects/tty/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.def#2 delete .. //depot/projects/tty/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#6 delete .. //depot/projects/tty/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#4 delete .. //depot/projects/tty/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.h#2 delete .. //depot/projects/tty/lib/libc/alpha/_fpmath.h#4 integrate .. //depot/projects/tty/lib/libc/alpha/gen/Makefile.inc#4 integrate .. //depot/projects/tty/lib/libc/alpha/gen/fpsetsticky.c#3 delete .. //depot/projects/tty/lib/libc/amd64/_fpmath.h#4 integrate .. //depot/projects/tty/lib/libc/amd64/gen/Makefile.inc#7 integrate .. //depot/projects/tty/lib/libc/amd64/gen/fpsetsticky.c#2 delete .. //depot/projects/tty/lib/libc/amd64/string/Makefile.inc#1 branch .. //depot/projects/tty/lib/libc/amd64/string/bcmp.S#1 branch .. //depot/projects/tty/lib/libc/amd64/string/bcopy.S#1 branch .. //depot/projects/tty/lib/libc/amd64/string/bzero.S#1 branch .. //depot/projects/tty/lib/libc/amd64/string/memcmp.S#1 branch .. //depot/projects/tty/lib/libc/amd64/string/memcpy.S#1 branch .. //depot/projects/tty/lib/libc/amd64/string/memmove.S#1 branch .. //depot/projects/tty/lib/libc/amd64/string/memset.S#1 branch .. //depot/projects/tty/lib/libc/amd64/string/strcat.S#1 branch .. //depot/projects/tty/lib/libc/amd64/string/strcmp.S#1 branch .. //depot/projects/tty/lib/libc/amd64/string/strcpy.S#1 branch .. //depot/projects/tty/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/tty/lib/libc/arm/Makefile.inc#2 integrate .. //depot/projects/tty/lib/libc/arm/_fpmath.h#2 integrate .. //depot/projects/tty/lib/libc/compat-43/getwd.c#2 integrate .. //depot/projects/tty/lib/libc/db/man/dbopen.3#4 integrate .. //depot/projects/tty/lib/libc/db/man/mpool.3#4 integrate .. //depot/projects/tty/lib/libc/gen/Makefile.inc#10 integrate .. //depot/projects/tty/lib/libc/gen/devname.3#3 integrate .. //depot/projects/tty/lib/libc/gen/errlst.c#2 integrate .. //depot/projects/tty/lib/libc/gen/exec.3#4 integrate .. //depot/projects/tty/lib/libc/gen/fmtcheck.c#4 integrate .. //depot/projects/tty/lib/libc/gen/fnmatch.c#3 integrate .. //depot/projects/tty/lib/libc/gen/fpclassify.c#2 integrate .. //depot/projects/tty/lib/libc/gen/frexp.3#3 integrate .. //depot/projects/tty/lib/libc/gen/getcap.3#3 integrate .. //depot/projects/tty/lib/libc/gen/getgrent.3#7 integrate .. //depot/projects/tty/lib/libc/gen/getpwent.3#8 integrate .. //depot/projects/tty/lib/libc/gen/getusershell.3#2 integrate .. //depot/projects/tty/lib/libc/gen/isgreater.3#3 integrate .. //depot/projects/tty/lib/libc/gen/ldexp.3#3 integrate .. //depot/projects/tty/lib/libc/gen/setmode.c#3 integrate .. //depot/projects/tty/lib/libc/gen/stringlist.3#3 integrate .. //depot/projects/tty/lib/libc/gen/sysctl.3#6 integrate .. //depot/projects/tty/lib/libc/gen/syslog.c#5 integrate .. //depot/projects/tty/lib/libc/gen/times.c#2 integrate .. //depot/projects/tty/lib/libc/gen/tls.c#3 integrate .. //depot/projects/tty/lib/libc/gen/ttyname.3#2 integrate .. //depot/projects/tty/lib/libc/gen/ttyname.c#4 integrate .. //depot/projects/tty/lib/libc/i386/_fpmath.h#4 integrate .. //depot/projects/tty/lib/libc/i386/gen/_set_tp.c#3 integrate .. //depot/projects/tty/lib/libc/i386/string/bcmp.S#2 integrate .. //depot/projects/tty/lib/libc/i386/sys/Makefile.inc#4 integrate .. //depot/projects/tty/lib/libc/i386/sys/_amd64_get_fsbase.c#2 integrate .. //depot/projects/tty/lib/libc/i386/sys/_amd64_get_gsbase.c#2 integrate .. //depot/projects/tty/lib/libc/i386/sys/i386_get_fsbase.c#1 branch .. //depot/projects/tty/lib/libc/i386/sys/i386_get_gsbase.c#1 branch .. //depot/projects/tty/lib/libc/i386/sys/i386_set_fsbase.c#1 branch .. //depot/projects/tty/lib/libc/i386/sys/i386_set_gsbase.c#1 branch .. //depot/projects/tty/lib/libc/ia64/_fpmath.h#5 integrate .. //depot/projects/tty/lib/libc/include/fpmath.h#3 integrate .. //depot/projects/tty/lib/libc/locale/big5.c#4 integrate .. //depot/projects/tty/lib/libc/locale/collate.c#3 integrate .. //depot/projects/tty/lib/libc/locale/collate.h#2 integrate .. //depot/projects/tty/lib/libc/locale/collcmp.c#3 integrate .. //depot/projects/tty/lib/libc/locale/euc.c#5 integrate .. //depot/projects/tty/lib/libc/locale/gb18030.c#3 integrate .. //depot/projects/tty/lib/libc/locale/gb2312.c#3 integrate .. //depot/projects/tty/lib/libc/locale/gbk.c#4 integrate .. //depot/projects/tty/lib/libc/locale/mblocal.h#4 integrate .. //depot/projects/tty/lib/libc/locale/mskanji.c#4 integrate .. //depot/projects/tty/lib/libc/locale/none.c#5 integrate .. //depot/projects/tty/lib/libc/locale/rune.c#3 integrate .. //depot/projects/tty/lib/libc/locale/runetype.c#4 integrate .. //depot/projects/tty/lib/libc/locale/setrunelocale.c#8 integrate .. //depot/projects/tty/lib/libc/locale/table.c#7 integrate .. //depot/projects/tty/lib/libc/locale/utf8.c#6 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 24 04:48:20 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F8B016A4D2; Sun, 24 Apr 2005 04:48:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E99F516A4CF for ; Sun, 24 Apr 2005 04:48:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF87043D5A for ; Sun, 24 Apr 2005 04:48:17 +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 j3O4mHUb045621 for ; Sun, 24 Apr 2005 04:48:17 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3O4mHRZ045618 for perforce@freebsd.org; Sun, 24 Apr 2005 04:48:17 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Apr 2005 04:48:17 GMT Message-Id: <200504240448.j3O4mHRZ045618@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 Subject: PERFORCE change 75854 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 04:48:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=75854 Change 75854 by marcel@marcel_nfs on 2005/04/24 04:48:12 Diff reduction. Affected files ... .. //depot/projects/tty/sys/conf/files.amd64#12 edit Differences ... ==== //depot/projects/tty/sys/conf/files.amd64#12 (text+ko) ==== @@ -136,11 +136,11 @@ dev/if_ndis/if_ndis_pccard.c optional ndis pccard dev/if_ndis/if_ndis_pci.c optional ndis cardbus dev/if_ndis/if_ndis_pci.c optional ndis pci +dev/io/iodev.c optional io dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa dev/fdc/fdc_pccard.c optional fdc pccard -dev/io/iodev.c optional io dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd From owner-p4-projects@FreeBSD.ORG Sun Apr 24 04:50:33 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B6F416A4D1; Sun, 24 Apr 2005 04:50:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE35516A4CF for ; Sun, 24 Apr 2005 04:50:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B079043D48 for ; Sun, 24 Apr 2005 04:50:20 +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 j3O4oKJw045758 for ; Sun, 24 Apr 2005 04:50:20 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3O4oKIw045755 for perforce@freebsd.org; Sun, 24 Apr 2005 04:50:20 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Apr 2005 04:50:20 GMT Message-Id: <200504240450.j3O4oKIw045755@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 Subject: PERFORCE change 75855 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 04:50:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=75855 Change 75855 by marcel@marcel_nfs on 2005/04/24 04:50:03 Diff reduction. Affected files ... .. //depot/projects/tty/sys/conf/options#16 edit Differences ... ==== //depot/projects/tty/sys/conf/options#16 (text+ko) ==== @@ -152,9 +152,6 @@ WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h -# KGI options -KGI_DBG_LEVEL opt_kgi.h - # POSIX kernel options P1003_1B_SEMAPHORES opt_posix.h _KPOSIX_PRIORITY_SCHEDULING opt_posix.h From owner-p4-projects@FreeBSD.ORG Sun Apr 24 04:52:24 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 419E016A4D0; Sun, 24 Apr 2005 04:52:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F045716A4CE for ; Sun, 24 Apr 2005 04:52:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C409443D54 for ; Sun, 24 Apr 2005 04:52:23 +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 j3O4qND9045828 for ; Sun, 24 Apr 2005 04:52:23 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3O4qNWG045825 for perforce@freebsd.org; Sun, 24 Apr 2005 04:52:23 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Apr 2005 04:52:23 GMT Message-Id: <200504240452.j3O4qNWG045825@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 Subject: PERFORCE change 75856 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 04:52:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=75856 Change 75856 by marcel@marcel_nfs on 2005/04/24 04:52:21 Diff reduction. Affected files ... .. //depot/projects/tty/sys/dev/kgi/COPYRIGHT#2 delete .. //depot/projects/tty/sys/dev/kgi/COPYRIGHT.GPL#2 delete .. //depot/projects/tty/sys/dev/kgi/COPYRIGHT.MIT#2 delete .. //depot/projects/tty/sys/dev/kgi/README#2 delete .. //depot/projects/tty/sys/dev/kgi/compiler.h#2 delete .. //depot/projects/tty/sys/dev/kgi/config.h#2 delete .. //depot/projects/tty/sys/dev/kgi/debug.h#2 delete .. //depot/projects/tty/sys/dev/kgi/dpy-null.c#2 delete .. //depot/projects/tty/sys/dev/kgi/graphic.c#2 delete .. //depot/projects/tty/sys/dev/kgi/graphic.h#2 delete .. //depot/projects/tty/sys/dev/kgi/i386-compiler.h#2 delete .. //depot/projects/tty/sys/dev/kgi/i386-types.h#2 delete .. //depot/projects/tty/sys/dev/kgi/io.h#2 delete .. //depot/projects/tty/sys/dev/kgi/kgi.c#2 delete .. //depot/projects/tty/sys/dev/kgi/kgi.h#2 delete .. //depot/projects/tty/sys/dev/kgi/kgicmd.h#2 delete .. //depot/projects/tty/sys/dev/kgi/kgierr.h#2 delete .. //depot/projects/tty/sys/dev/kgi/kgii.h#2 delete .. //depot/projects/tty/sys/dev/kgi/maintainers.h#2 delete .. //depot/projects/tty/sys/dev/kgi/pci.h#2 delete .. //depot/projects/tty/sys/dev/kgi/system.c#2 delete .. //depot/projects/tty/sys/dev/kgi/system.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 24 04:55:28 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3653116A4D0; Sun, 24 Apr 2005 04:55:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 136DE16A4CE for ; Sun, 24 Apr 2005 04:55:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E651B43D31 for ; Sun, 24 Apr 2005 04:55:27 +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 j3O4tR4h045992 for ; Sun, 24 Apr 2005 04:55:27 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3O4tRY9045989 for perforce@freebsd.org; Sun, 24 Apr 2005 04:55:27 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Apr 2005 04:55:27 GMT Message-Id: <200504240455.j3O4tRY9045989@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 Subject: PERFORCE change 75857 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 04:55:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=75857 Change 75857 by marcel@marcel_nfs on 2005/04/24 04:55:18 Diff reduction. Affected files ... .. //depot/projects/tty/libexec/rtld-aout/support.c#3 edit .. //depot/projects/tty/libexec/rtld-aout/support.h#3 edit Differences ... ==== //depot/projects/tty/libexec/rtld-aout/support.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. *- - * $FreeBSD: src/libexec/rtld-aout/support.c,v 1.5 1999/08/28 00:10:06 peter Exp $ + * $FreeBSD: src/libexec/rtld-aout/support.c,v 1.7 2005/01/11 16:40:29 trhodes Exp $ */ #include #include ==== //depot/projects/tty/libexec/rtld-aout/support.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. *- - * $FreeBSD: src/libexec/rtld-aout/support.h,v 1.4 1999/08/28 00:10:06 peter Exp $ + * $FreeBSD: src/libexec/rtld-aout/support.h,v 1.6 2005/01/11 16:40:29 trhodes Exp $ */ /* From owner-p4-projects@FreeBSD.ORG Sun Apr 24 04:57:31 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7110E16A4D0; Sun, 24 Apr 2005 04:57:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B90A16A4CF for ; Sun, 24 Apr 2005 04:57:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBEAC43D41 for ; Sun, 24 Apr 2005 04:57:30 +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 j3O4vUGR046073 for ; Sun, 24 Apr 2005 04:57:30 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3O4vUcw046070 for perforce@freebsd.org; Sun, 24 Apr 2005 04:57:30 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Apr 2005 04:57:30 GMT Message-Id: <200504240457.j3O4vUcw046070@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 Subject: PERFORCE change 75858 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 04:57:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=75858 Change 75858 by marcel@marcel_nfs on 2005/04/24 04:57:13 Diff reduction. Affected files ... .. //depot/projects/tty/sys/dev/kii/COPYRIGHT#2 delete .. //depot/projects/tty/sys/dev/kii/COPYRIGHT.GPL#2 delete .. //depot/projects/tty/sys/dev/kii/COPYRIGHT.MIT#2 delete .. //depot/projects/tty/sys/dev/kii/atkiidrv.c#2 delete .. //depot/projects/tty/sys/dev/kii/default-keymap-de#2 delete .. //depot/projects/tty/sys/dev/kii/default-keymap-us#2 delete .. //depot/projects/tty/sys/dev/kii/kii.c#2 delete .. //depot/projects/tty/sys/dev/kii/kii.h#2 delete .. //depot/projects/tty/sys/dev/kii/kiicmd.h#2 delete .. //depot/projects/tty/sys/dev/kii/kiidflt.c#2 delete .. //depot/projects/tty/sys/dev/kii/kiidrv.c#2 delete .. //depot/projects/tty/sys/dev/kii/kiidrv.h#2 delete .. //depot/projects/tty/sys/dev/kii/kiierr.h#2 delete .. //depot/projects/tty/sys/dev/kii/kiievt.c#2 delete .. //depot/projects/tty/sys/dev/kii/kiievt.h#2 delete .. //depot/projects/tty/sys/dev/kii/kiikbd.c#2 delete .. //depot/projects/tty/sys/dev/kii/kiireg.h#2 delete .. //depot/projects/tty/sys/dev/kii/kiisyms.c#2 delete .. //depot/projects/tty/sys/dev/kii/kiisyms.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 24 05:02:38 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD8AF16A4D0; Sun, 24 Apr 2005 05:02:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA01E16A4CE for ; Sun, 24 Apr 2005 05:02:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D08043D3F for ; Sun, 24 Apr 2005 05:02: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 j3O52b3a046361 for ; Sun, 24 Apr 2005 05:02:37 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3O52bpr046358 for perforce@freebsd.org; Sun, 24 Apr 2005 05:02:37 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Apr 2005 05:02:37 GMT Message-Id: <200504240502.j3O52bpr046358@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 Subject: PERFORCE change 75859 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 05:02:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=75859 Change 75859 by marcel@marcel_nfs on 2005/04/24 05:02:03 Diff reduction. Affected files ... .. //depot/projects/tty/sys/i386/conf/NOTES#17 edit Differences ... ==== //depot/projects/tty/sys/i386/conf/NOTES#17 (text+ko) ==== @@ -342,10 +342,6 @@ # HARDWARE DEVICE CONFIGURATION # -# Mandatory devices: -# - -# # The Numeric Processing eXtension driver. This is non-optional. device npx hint.npx.0.flags="0x0" From owner-p4-projects@FreeBSD.ORG Sun Apr 24 05:03:39 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DECA16A4D0; Sun, 24 Apr 2005 05:03:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 69CDE16A4CE for ; Sun, 24 Apr 2005 05:03:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CDE243D58 for ; Sun, 24 Apr 2005 05:03:39 +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 j3O53d5o046404 for ; Sun, 24 Apr 2005 05:03:39 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3O53cOw046401 for perforce@freebsd.org; Sun, 24 Apr 2005 05:03:38 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Apr 2005 05:03:38 GMT Message-Id: <200504240503.j3O53cOw046401@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 Subject: PERFORCE change 75860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 05:03:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=75860 Change 75860 by marcel@marcel_nfs on 2005/04/24 05:03:10 Diff reduction. Affected files ... .. //depot/projects/tty/sys/sys/conf.h#12 edit Differences ... ==== //depot/projects/tty/sys/sys/conf.h#12 (text+ko) ==== @@ -170,7 +170,6 @@ #define D_MMAP_ANON 0x00100000 /* special treatment in vm_mmap.c */ #define D_PSEUDO 0x00200000 /* make_dev() can return NULL */ #define D_NEEDGIANT 0x00400000 /* driver want Giant */ -#define D_KGI_PAGING 0x00800000 /* is a KGI pager backend */ /* * Version numbers. From owner-p4-projects@FreeBSD.ORG Sun Apr 24 05:04:41 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BD3116A4D0; Sun, 24 Apr 2005 05:04:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 286E416A4CE for ; Sun, 24 Apr 2005 05:04:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF29E43D4C for ; Sun, 24 Apr 2005 05:04:40 +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 j3O54eM3046431 for ; Sun, 24 Apr 2005 05:04:40 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3O54evk046428 for perforce@freebsd.org; Sun, 24 Apr 2005 05:04:40 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Apr 2005 05:04:40 GMT Message-Id: <200504240504.j3O54evk046428@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 Subject: PERFORCE change 75861 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 05:04:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=75861 Change 75861 by marcel@marcel_nfs on 2005/04/24 05:04:15 Diff reduction. Affected files ... .. //depot/projects/tty/sys/sys/kernel.h#10 edit Differences ... ==== //depot/projects/tty/sys/sys/kernel.h#10 (text+ko) ==== @@ -116,7 +116,6 @@ SI_SUB_MTX_POOL_DYNAMIC = 0x1AC0000, /* dynamic mutex pool */ SI_SUB_LOCK = 0x1B00000, /* various locks */ SI_SUB_EVENTHANDLER = 0x1C00000, /* eventhandler init */ - SI_SUB_KGI = 0x1D00000, /* KGI */ SI_SUB_KLD = 0x2000000, /* KLD and module setup */ SI_SUB_CPU = 0x2100000, /* CPU resource(s)*/ SI_SUB_MAC = 0x2180000, /* TrustedBSD MAC subsystem */ From owner-p4-projects@FreeBSD.ORG Sun Apr 24 05:06:44 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 580E716A4D0; Sun, 24 Apr 2005 05:06:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32C8F16A4CF for ; Sun, 24 Apr 2005 05:06:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E316B43D39 for ; Sun, 24 Apr 2005 05:06: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 j3O56hf7046671 for ; Sun, 24 Apr 2005 05:06:43 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3O56hqF046668 for perforce@freebsd.org; Sun, 24 Apr 2005 05:06:43 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Apr 2005 05:06:43 GMT Message-Id: <200504240506.j3O56hqF046668@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 Subject: PERFORCE change 75862 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 05:06:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=75862 Change 75862 by marcel@marcel_nfs on 2005/04/24 05:05:46 Diff reduction. Affected files ... .. //depot/projects/tty/sys/vm/vm_object.h#13 edit Differences ... ==== //depot/projects/tty/sys/vm/vm_object.h#13 (text+ko) ==== @@ -130,15 +130,6 @@ struct { int swp_bcount; } swp; - - /* - * KGI pager - * - * kgip_pglist - list of allocated pages. - */ - struct { - TAILQ_HEAD(, vm_page) kgip_pglist; - } kgip; } un_pager; }; From owner-p4-projects@FreeBSD.ORG Sun Apr 24 05:07:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE51616A4D0; Sun, 24 Apr 2005 05:07:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB43316A4CE for ; Sun, 24 Apr 2005 05:07:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3B1543D41 for ; Sun, 24 Apr 2005 05:07:45 +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 j3O57j3Z046743 for ; Sun, 24 Apr 2005 05:07:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3O57jBg046740 for perforce@freebsd.org; Sun, 24 Apr 2005 05:07:45 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Apr 2005 05:07:45 GMT Message-Id: <200504240507.j3O57jBg046740@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 Subject: PERFORCE change 75863 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 05:07:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=75863 Change 75863 by marcel@marcel_nfs on 2005/04/24 05:07:40 Diff reduction. Affected files ... .. //depot/projects/tty/sys/vm/vm_pager.c#11 edit .. //depot/projects/tty/sys/vm/vm_pager.h#7 edit Differences ... ==== //depot/projects/tty/sys/vm/vm_pager.c#11 (text+ko) ==== @@ -163,7 +163,6 @@ &vnodepagerops, /* OBJT_VNODE */ &devicepagerops, /* OBJT_DEVICE */ &physpagerops, /* OBJT_PHYS */ - &kgipagerops, /* OBJT_KGI */ &deadpagerops /* OBJT_DEAD */ }; ==== //depot/projects/tty/sys/vm/vm_pager.h#7 (text+ko) ==== @@ -71,7 +71,6 @@ extern struct pagerops vnodepagerops; extern struct pagerops devicepagerops; extern struct pagerops physpagerops; -extern struct pagerops kgipagerops; /* * get/put return values From owner-p4-projects@FreeBSD.ORG Sun Apr 24 06:22:17 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8485316A4D0; Sun, 24 Apr 2005 06:22:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 408DA16A4CE for ; Sun, 24 Apr 2005 06:22:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CD6243D2D for ; Sun, 24 Apr 2005 06:22:16 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3O6MGhe050680 for ; Sun, 24 Apr 2005 06:22:16 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3O6MFP7050677 for perforce@freebsd.org; Sun, 24 Apr 2005 06:22:16 GMT (envelope-from marcel@freebsd.org) Date: Sun, 24 Apr 2005 06:22:16 GMT Message-Id: <200504240622.j3O6MFP7050677@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 Subject: PERFORCE change 75866 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 06:22:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=75866 Change 75866 by marcel@marcel_nfs on 2005/04/24 06:21:22 Submit various changes I made over the time. Affected files ... .. //depot/projects/tty/sys/conf/files#20 edit .. //depot/projects/tty/sys/conf/files.amd64#13 edit .. //depot/projects/tty/sys/conf/files.i386#17 edit .. //depot/projects/tty/sys/conf/files.ia64#15 edit .. //depot/projects/tty/sys/conf/files.pc98#14 edit .. //depot/projects/tty/sys/conf/files.powerpc#8 edit .. //depot/projects/tty/sys/conf/files.sparc64#12 edit .. //depot/projects/tty/sys/conf/options#17 edit .. //depot/projects/tty/sys/conf/options.i386#12 edit .. //depot/projects/tty/sys/conf/options.powerpc#6 edit .. //depot/projects/tty/sys/conf/options.sparc64#5 edit .. //depot/projects/tty/sys/dev/vga/vga.c#2 edit .. //depot/projects/tty/sys/dev/vga/vga.h#3 edit .. //depot/projects/tty/sys/dev/vga/vga_bus_isa.c#1 add .. //depot/projects/tty/sys/dev/vga/vga_bus_pci.c#1 add .. //depot/projects/tty/sys/dev/vga/vga_cons.c#5 edit .. //depot/projects/tty/sys/dev/vga/vga_cpu_alpha.c#2 edit .. //depot/projects/tty/sys/dev/vga/vga_cpu_amd64.c#1 add .. //depot/projects/tty/sys/dev/vga/vga_cpu_i386.c#2 edit .. //depot/projects/tty/sys/dev/vga/vga_cpu_ia64.c#2 edit .. //depot/projects/tty/sys/dev/vga/vga_cpu_sparc64.c#1 add .. //depot/projects/tty/sys/dev/vga/vga_isa.c#2 delete .. //depot/projects/tty/sys/dev/vga/vga_pci.c#3 delete .. //depot/projects/tty/sys/dev/vga/vga_vid.c#2 edit Differences ... ==== //depot/projects/tty/sys/conf/files#20 (text+ko) ==== @@ -832,18 +832,6 @@ dev/sx/sx_pci.c optional sx pci dev/sym/sym_hipd.c optional sym \ dependency "$S/dev/sym/sym_{conf,defs}.h" -dev/syscons/blank/blank_saver.c optional blank_saver -dev/syscons/daemon/daemon_saver.c optional daemon_saver -dev/syscons/dragon/dragon_saver.c optional dragon_saver -dev/syscons/fade/fade_saver.c optional fade_saver -dev/syscons/fire/fire_saver.c optional fire_saver -dev/syscons/green/green_saver.c optional green_saver -dev/syscons/logo/logo.c optional logo_saver -dev/syscons/logo/logo_saver.c optional logo_saver -dev/syscons/rain/rain_saver.c optional rain_saver -dev/syscons/snake/snake_saver.c optional snake_saver -dev/syscons/star/star_saver.c optional star_saver -dev/syscons/warp/warp_saver.c optional warp_saver dev/tdfx/tdfx_pci.c optional tdfx pci dev/trm/trm.c optional trm dev/twa/tw_cl_fwimg.c optional twa @@ -923,9 +911,9 @@ dev/utopia/suni.c optional utopia dev/utopia/utopia.c optional utopia dev/vga/vga.c optional vga +dev/vga/vga_bus_isa.c optional vga isa +dev/vga/vga_bus_pci.c optional vga pci dev/vga/vga_cons.c optional vga -dev/vga/vga_isa.c optional vga -dev/vga/vga_pci.c optional vga dev/vge/if_vge.c optional vge dev/vkbd/vkbd.c optional vkbd dev/vtc/vtc_core.c optional vtc ==== //depot/projects/tty/sys/conf/files.amd64#13 (text+ko) ==== @@ -32,11 +32,6 @@ no-obj no-implicit-rule before-depend \ clean "ia32_assym.h" # -font.h optional sc_dflt_font \ - compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ - no-obj no-implicit-rule before-depend \ - clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" -# atkbdmap.h optional atkbd_dflt_keymap \ compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h" \ no-obj no-implicit-rule before-depend \ @@ -151,6 +146,7 @@ dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/uart/uart_cpu_amd64.c optional uart +dev/vga/vga_cpu_amd64.c optional vga geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_mbr.c standard ==== //depot/projects/tty/sys/conf/files.i386#17 (text+ko) ==== @@ -154,10 +154,6 @@ dev/ed/if_ed_wd80x3.c optional ed isa dev/ed/if_ed_hpp.c optional ed isa ed_hpp dev/ed/if_ed_sic.c optional ed isa ed_sic -dev/fb/fb.c optional fb -dev/fb/fb.c optional vga -dev/fb/splash.c optional splash -dev/fb/vga.c optional vga dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa ==== //depot/projects/tty/sys/conf/files.ia64#15 (text+ko) ==== @@ -13,11 +13,6 @@ no-obj no-implicit-rule before-depend \ clean "atkbdmap.h" # -font.h optional sc_dflt_font \ - compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ - no-obj no-implicit-rule before-depend \ - clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" -# ukbdmap.h optional ukbd_dflt_keymap \ compile-with "/usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h" \ no-obj no-implicit-rule before-depend \ ==== //depot/projects/tty/sys/conf/files.pc98#14 (text+ko) ==== @@ -112,14 +112,10 @@ dev/ed/if_ed_wd80x3.c optional ed isa dev/ep/if_ep_pccard.c optional ep card dev/ex/if_ex_pccard.c optional ex card -dev/fb/fb.c optional fb -dev/fb/fb.c optional gdc -dev/fb/splash.c optional splash dev/fe/if_fe_cbus.c optional fe isa dev/fe/if_fe_pccard.c optional fe card dev/io/iodev.c optional io dev/kbd/kbd.c optional pckbd -dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/lnc/if_lnc_cbus.c optional lnc isa dev/mem/memutil.c optional mem @@ -139,14 +135,6 @@ dev/snc/if_snc_cbus.c optional snc isa dev/snc/if_snc_pccard.c optional snc card dev/stg/tmc18c30_pccard.c optional stg card -dev/syscons/apm/apm_saver.c optional apm_saver apm -dev/syscons/schistory.c optional sc -dev/syscons/scmouse.c optional sc -dev/syscons/scterm.c optional sc -dev/syscons/scterm-dumb.c optional sc -dev/syscons/scvidctl.c optional sc -dev/syscons/syscons.c optional sc -dev/syscons/sysmouse.c optional sc dev/uart/uart_cpu_pc98.c optional uart dev/wi/if_wi_pccard.c optional wi card dev/xe/if_xe_pccard.c optional xe card @@ -364,12 +352,8 @@ pc98/pc98/pc98kbd.c optional pckbd pc98/pc98/pmc.c optional pmc pc98/pc98/ppc.c optional ppc -pc98/pc98/scgdcrndr.c optional sc gdc -pc98/pc98/scterm-sck.c optional sc -pc98/pc98/scvtbpc98.c optional sc pc98/pc98/sio.c optional sio pc98/pc98/sio_cbus.c optional sio isa -pc98/pc98/syscons_pc98.c optional sc pccard/pccard.c optional card pccard/pccard_beep.c optional card pccard/pccard_nbk.c optional card ==== //depot/projects/tty/sys/conf/files.powerpc#8 (text+ko) ==== @@ -9,23 +9,6 @@ # # -font.h optional sc \ - compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ - no-obj no-implicit-rule before-depend \ - clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" - -dev/fb/fb.c optional sc -dev/kbd/kbd.c optional sc -dev/syscons/scgfbrndr.c optional sc -dev/syscons/schistory.c optional sc -dev/syscons/scmouse.c optional sc -dev/syscons/scterm.c optional sc -dev/syscons/scterm-dumb.c optional sc -dev/syscons/scterm-sc.c optional sc -dev/syscons/scvidctl.c optional sc -dev/syscons/scvtb.c optional sc -dev/syscons/syscons.c optional sc -dev/syscons/sysmouse.c optional sc geom/geom_apple.c standard kern/syscalls.c optional ktr powerpc/powerpc/atomic.S standard @@ -50,7 +33,6 @@ powerpc/powerpc/openpic.c standard powerpc/powerpc/pic_if.m standard powerpc/powerpc/pmap.c standard -powerpc/powerpc/sc_machdep.c optional sc powerpc/powerpc/setjmp.S standard powerpc/powerpc/sigcode.S standard powerpc/powerpc/suswintr.c standard @@ -95,7 +77,6 @@ powerpc/ofw/ofw_pci.c optional pci powerpc/ofw/ofw_pcib_pci.c optional pci -powerpc/ofw/ofw_syscons.c optional sc powerpc/powermac/ata_kauai.c optional powermac ata powerpc/powermac/ata_macio.c optional powermac ata ==== //depot/projects/tty/sys/conf/files.sparc64#12 (text+ko) ==== @@ -15,10 +15,6 @@ dev/auxio/auxio.c optional auxio sbus dev/auxio/auxio.c optional auxio ebus dev/esp/esp_sbus.c optional esp sbus -dev/fb/creator.c optional creator sc -dev/fb/fb.c optional sc -dev/fb/splash.c optional splash -dev/kbd/kbd.c optional sc dev/ofw/ofw_bus_if.m standard dev/ofw/ofw_console.c optional ofw_console dev/ofw/openfirm.c standard @@ -26,18 +22,9 @@ dev/ofw/openpromio.c standard dev/sound/sbus/cs4231.c optional snd_audiocs ebus dev/sound/sbus/cs4231.c optional snd_audiocs sbus -dev/syscons/scgfbrndr.c optional sc -dev/syscons/schistory.c optional sc -dev/syscons/scmouse.c optional sc -dev/syscons/scterm.c optional sc -dev/syscons/scterm-dumb.c optional sc -dev/syscons/scterm-sc.c optional sc -dev/syscons/scvidctl.c optional sc -dev/syscons/scvtb.c optional sc -dev/syscons/syscons.c optional sc -dev/syscons/sysmouse.c optional sc dev/uart/uart_cpu_sparc64.c optional uart -dev/uart/uart_kbd_sun.c optional uart sc +#dev/uart/uart_kbd_sun.c optional uart sc +dev/vga/vga_cpu_sparc64.c optional vga geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_sunlabel.c standard @@ -48,7 +35,6 @@ libkern/fls.c standard libkern/flsl.c standard sparc64/central/central.c optional central -sparc64/creator/creator_upa.c optional creator sc sparc64/ebus/ebus.c optional ebus sparc64/fhc/clkbrd.c optional clkbrd fhc sparc64/fhc/fhc.c optional fhc @@ -104,7 +90,6 @@ sparc64/sparc64/rtc.c optional rtc ebus sparc64/sparc64/rtc.c optional rtc isa sparc64/sparc64/rwindow.c standard -sparc64/sparc64/sc_machdep.c optional sc sparc64/sparc64/spitfire.c standard sparc64/sparc64/support.S standard sparc64/sparc64/sys_machdep.c standard ==== //depot/projects/tty/sys/conf/options#17 (text+ko) ==== @@ -470,10 +470,6 @@ SI_DEBUG opt_debug_si.h SX_DEBUG opt_debug_sx.h -# Fb options -FB_DEBUG opt_fb.h -FB_INSTALL_CDEV opt_fb.h - # ppbus related options PERIPH_1284 opt_ppb_1284.h DONTPROBE_1284 opt_ppb_1284.h @@ -640,30 +636,6 @@ SAFE_NO_RNG opt_safe.h SAFE_RNDTEST opt_safe.h -# syscons options -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_KDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h - # kbd options KBD_DISABLE_KEYMAP_LOAD opt_kbd.h KBD_INSTALL_CDEV opt_kbd.h ==== //depot/projects/tty/sys/conf/options.i386#12 (text+ko) ==== @@ -80,30 +80,6 @@ ATKBD_DFLT_KEYMAP opt_atkbd.h -# pcvt(4) has a bunch of options -FAT_CURSOR opt_pcvt.h -PCVT_123GENERIC opt_pcvt.h -PCVT_24LINESDEF opt_pcvt.h -PCVT_CTRL_ALT_DEL opt_pcvt.h -PCVT_GREENSAVER opt_pcvt.h -PCVT_INHIBIT_NUMLOCK opt_pcvt.h -PCVT_META_ESC opt_pcvt.h -PCVT_NO_LED_UPDATE opt_pcvt.h -PCVT_NSCREENS opt_pcvt.h -PCVT_NULLCHARS opt_pcvt.h -PCVT_PRETTYSCRNS opt_pcvt.h -PCVT_SCANSET opt_pcvt.h -PCVT_SCREENSAVER opt_pcvt.h -PCVT_SETCOLOR opt_pcvt.h -PCVT_SHOWKEYS opt_pcvt.h -PCVT_SLOW_INTERRUPT opt_pcvt.h -PCVT_SYSBEEPF opt_pcvt.h -PCVT_UPDATEFAST opt_pcvt.h -PCVT_UPDATESLOW opt_pcvt.h -PCVT_USEKBDSEC opt_pcvt.h -PCVT_VT220KEYB opt_pcvt.h -XSERVER opt_pcvt.h - # Video spigot SPIGOT_UNSECURE opt_spigot.h ==== //depot/projects/tty/sys/conf/options.powerpc#6 (text+ko) ==== @@ -4,13 +4,7 @@ OEA opt_global.h IPKDB -GFB_DEBUG opt_gfb.h -GFB_NO_FONT_LOADING opt_gfb.h -GFB_NO_MODE_CHANGE opt_gfb.h - POWERMAC opt_platform.h PSIM -SC_OFWFB opt_ofwfb.h - OFWCONS_POLL_HZ opt_ofw.h ==== //depot/projects/tty/sys/conf/options.sparc64#5 (text+ko) ==== @@ -2,10 +2,6 @@ SUN4U opt_global.h -GFB_DEBUG opt_gfb.h -GFB_NO_FONT_LOADING opt_gfb.h -GFB_NO_MODE_CHANGE opt_gfb.h - PSYCHO_DEBUG opt_psycho.h DEBUGGER_ON_POWERFAIL opt_psycho.h OFW_PCI_DEBUG opt_ofw_pci.h ==== //depot/projects/tty/sys/dev/vga/vga.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 2002, 2003 Marcel Moolenaar +/*- + * Copyright (c) 2002-2005 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include @@ -39,11 +40,14 @@ devclass_t vga_devclass; char vga_device_name[] = "vga"; +int vga_curcol; +int vga_currow; + static void -vga_write(struct vga_softc *sc, int x, int y, int ascii, int color) +vga_write(struct vga_softc *sc, int y, int x, int ascii, int color) { - u_int32_t ofs; - u_int16_t w; + uint32_t ofs; + uint16_t w; ofs = y * 160 + x * 2; w = color * 256 + ascii; @@ -53,8 +57,8 @@ static void vga_scrollup(struct vga_softc *sc) { - u_int32_t count, ofs; - u_int16_t w; + uint32_t count, ofs; + uint16_t w; ofs = 0; @@ -79,44 +83,73 @@ } void +vga_setpos(struct vga_softc *sc, int row, int col) +{ + uint16_t ofs; + + ofs = row * 80 + col; + bus_space_write_1(sc->vga_crtc.bst, sc->vga_crtc.bsh, 0, 14); + bus_space_write_1(sc->vga_crtc.bst, sc->vga_crtc.bsh, 1, ofs >> 8); + bus_space_write_1(sc->vga_crtc.bst, sc->vga_crtc.bsh, 0, 15); + bus_space_write_1(sc->vga_crtc.bst, sc->vga_crtc.bsh, 1, ofs & 0xff); +} + +void +vga_getpos(struct vga_softc *sc, int *row, int *col) +{ + uint16_t ofs; + + bus_space_write_1(sc->vga_crtc.bst, sc->vga_crtc.bsh, 0, 14); + ofs = bus_space_read_1(sc->vga_crtc.bst, sc->vga_crtc.bsh, 1) << 8; + bus_space_write_1(sc->vga_crtc.bst, sc->vga_crtc.bsh, 0, 15); + ofs |= bus_space_read_1(sc->vga_crtc.bst, sc->vga_crtc.bsh, 1) & 0xff; + *row = ofs / 80; + *col = ofs % 80; +} + +void vga_putc(struct vga_softc *sc, int c) { - static uint32_t x = 0, y = 24; - int d = 1; + int d; + d = 1; switch (c) { case 0x07: /* bell */ return; case 0x08: /* backspace */ c = ' '; - if (x) - x--; + if (vga_curcol) + vga_curcol--; d = 0; break; case 0x09: /* tab */ - x = (x + 8) & ~7; - if (x < 80) + vga_curcol = (vga_curcol + 8) & ~7; + if (vga_curcol < 80) { + vga_setpos(sc, vga_currow, vga_curcol); return; + } /* FALLTHOUGH */ case 0x0a: /* linefeed */ - if (y == 24) + if (vga_currow == 24) vga_scrollup(sc); else - y++; + vga_currow++; /* FALLTHROUGH */ case 0x0d: /* carriage return */ - x = 0; + vga_curcol = 0; + vga_setpos(sc, vga_currow, vga_curcol); return; } - vga_write(sc, x, y, c, 0x0f); - x += d; - if (x == 80) { - x = 0; - if (y == 24) + vga_write(sc, vga_currow, vga_curcol, c, 0x0f); + vga_curcol += d; + if (vga_curcol >= 80) { + vga_curcol = 0; + if (vga_currow == 24) vga_scrollup(sc); else - y++; + vga_currow++; } + vga_setpos(sc, vga_currow, vga_curcol); } void @@ -127,11 +160,12 @@ vga_putc(sc, *s++); } -int vga_attach(device_t dev) +int +vga_attach(device_t dev) { struct vga_softc *sc; int error; - u_int32_t x, y; + uint32_t x, y; sc = device_get_softc(dev); @@ -148,12 +182,10 @@ for (y = 0; y < 24; y++) for (x = 0; x < 80; x++) - vga_write(sc, x, y, ' ', 7); + vga_write(sc, y, x, ' ', 7); - vga_write(sc, 0, 0, '\\', 7); - vga_write(sc, 79, 0, '/', 7); - vga_write(sc, 0, 24, '/', 7); - vga_write(sc, 79, 24, '\\', 7); + vga_currow = vga_curcol = 0; + vga_puts(sc, "Please wait...\r"); return (0); } ==== //depot/projects/tty/sys/dev/vga/vga.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 2002, 2003 Marcel Moolenaar +/*- + * Copyright (c) 2002-2005 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,6 +26,9 @@ * $FreeBSD$ */ +#ifndef _DEV_VGA_VGA_H_ +#define _DEV_VGA_VGA_H_ + #define VGA_REG_MISC 0x1c /* 0x3CC */ struct vga_space @@ -41,12 +44,12 @@ dev_t vga_node; /* Device flags and state. */ - u_int32_t vga_bustype:2; + int vga_bustype:2; #define VGA_BUSTYPE_ISA 1 #define VGA_BUSTYPE_PCI 2 - u_int32_t vga_console:1; - u_int32_t vga_enable:1; - u_int32_t vga_mono:1; + int vga_console:1; + int vga_enable:1; + int vga_mono:1; /* Bus spaces */ struct vga_space vga_space[4]; @@ -73,7 +76,14 @@ extern devclass_t vga_devclass; extern char vga_device_name[]; +extern int vga_curcol; +extern int vga_currow; + int vga_attach(device_t); +void vga_getpos(struct vga_softc *, int *, int *); void vga_putc(struct vga_softc *, int); void vga_puts(struct vga_softc *, const char *); +void vga_setpos(struct vga_softc *, int, int); + +#endif /* _DEV_VGA_VGA_H_ */ ==== //depot/projects/tty/sys/dev/vga/vga_cons.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 2002, 2003 Marcel Moolenaar +/*- + * Copyright (c) 2002-2005 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include @@ -35,7 +36,6 @@ #include #include -#include #include @@ -59,6 +59,7 @@ bzero(&vga_console, sizeof(vga_console)); cp->cn_pri = CN_DEAD; + cp->cn_arg = &vga_console; if (vga_get_console(&cd) != 0) return; @@ -79,39 +80,35 @@ if (error) return; - vga_puts(&vga_console, "VGA probe successful\n"); - cp->cn_pri = CN_INTERNAL; } static void vga_cninit(struct consdev *cp) { + struct vga_softc *sc = cp->cn_arg; - vga_console.vga_console = 1; - vga_console.vga_enable = 1; + sc->vga_console = 1; + sc->vga_enable = 1; - vga_puts(&vga_console, "VGA is the system console\n"); + vga_getpos(sc, &vga_currow, &vga_curcol); + vga_putc(sc, '\n'); /* It's official... */ - vga_console.vga_consdev = cp; + sc->vga_consdev = cp; } static void vga_cnterm(struct consdev *cp) { - - /* XXX what to do here? */ } static void vga_cnputc(struct consdev *cp, int c) { - int s; + struct vga_softc *sc = cp->cn_arg; - s = spltty(); - vga_putc(&vga_console, c); - splx(s); + vga_putc(sc, c); } static int ==== //depot/projects/tty/sys/dev/vga/vga_cpu_alpha.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 2002, 2003 Marcel Moolenaar +/*- + * Copyright (c) 2002-2005 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include @@ -33,10 +34,11 @@ #include -int vga_get_console(struct vga_consdata *cd) +int +vga_get_console(struct vga_consdata *cd) { int mono; - u_char misc; + uint8_t misc; cd->fb.bst = busspace_isa_mem; cd->fb.bsh = 0xA0000; ==== //depot/projects/tty/sys/dev/vga/vga_cpu_i386.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 2002, 2003 Marcel Moolenaar +/*- + * Copyright (c) 2002-2005 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include @@ -34,13 +35,14 @@ #include -int vga_get_console(struct vga_consdata *cd) +int +vga_get_console(struct vga_consdata *cd) { int mono; - u_char misc; + uint8_t misc; cd->fb.bst = I386_BUS_SPACE_MEM; - cd->fb.bsh = atdevbase; /* Virtual address of 0xA0000 */ + cd->fb.bsh = 0xA0000 + KERNBASE; cd->reg.bst = I386_BUS_SPACE_IO; cd->reg.bsh = 0x3c0; ==== //depot/projects/tty/sys/dev/vga/vga_cpu_ia64.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 2002, 2003, 2004 Marcel Moolenaar +/*- + * Copyright (c) 2002-2005 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include @@ -33,10 +34,11 @@ #include -int vga_get_console(struct vga_consdata *cd) +int +vga_get_console(struct vga_consdata *cd) { int mono; - u_char misc; + uint8_t misc; cd->fb.bst = IA64_BUS_SPACE_MEM; cd->fb.bsh = IA64_PHYS_TO_RR6(0xA0000); /* XXX */ ==== //depot/projects/tty/sys/dev/vga/vga_vid.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* - * Copyright (c) 2002 Marcel Moolenaar +/*- + * Copyright (c) 2002-2005 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include @@ -152,7 +153,7 @@ (void)bus_space_subregion(sc->vga_fb.bst, sc->vga_fb.bsh, (sc->vga_mono) ? 0x10000 : 0x18000, 4096, &sc->vga_screen.bsh); - sc->vga_console = 1; + sc->vga_enable = 1; vga_adapter.va_flags |= V_ADP_PROBED; init_adapter: @@ -310,17 +311,14 @@ static int vga_vid_read_hw_cursor(video_adapter_t *adp, int *col, int *row) { - int s; uint16_t ofs; - s = spltty(); outb(adp->va_crtc_addr + 0, 14); ofs = inb(adp->va_crtc_addr + 1) << 8; outb(adp->va_crtc_addr + 0, 15); ofs |= inb(adp->va_crtc_addr + 1) & 0xff; *row = ofs / adp->va_info.vi_width; *col = ofs % adp->va_info.vi_width; - splx(s); return (0); } @@ -352,40 +350,37 @@ static int vga_vid_set_border(video_adapter_t *adp, int color) { + return (ENODEV); +#if 0 static int called = 0; return (vga_vid_todo(__func__, ++called)); +#endif } static int vga_vid_set_hw_cursor_shape(video_adapter_t *adp, int base, int height, int celsize, int blink) { - int s; - s = spltty(); outb(adp->va_crtc_addr + 0, 10); outb(adp->va_crtc_addr + 1, (height > 0) ? (celsize - base - height) & 0x1f : 0x20); outb(adp->va_crtc_addr + 0, 11); outb(adp->va_crtc_addr + 1, (height > 0) ? (celsize - base - 1) & 0x1f : 0); - splx(s); return (0); } static int vga_vid_set_hw_cursor(video_adapter_t *adp, int col, int row) { - int s; uint16_t ofs; - s = spltty(); ofs = (col != -1 || row != -1) ? row*adp->va_info.vi_width + col : -1; outb(adp->va_crtc_addr + 0, 14); outb(adp->va_crtc_addr + 1, ofs >> 8); outb(adp->va_crtc_addr + 0, 15); outb(adp->va_crtc_addr + 1, ofs & 0xff); - splx(s); return (0); } From owner-p4-projects@FreeBSD.ORG Sun Apr 24 12:13:22 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91FE116A4D0; Sun, 24 Apr 2005 12:13:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5177516A4CE for ; Sun, 24 Apr 2005 12:13:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2417A43D3F for ; Sun, 24 Apr 2005 12:13: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 j3OCDKnf073800 for ; Sun, 24 Apr 2005 12:13: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 j3OCDKKu073797 for perforce@freebsd.org; Sun, 24 Apr 2005 12:13:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 12:13:20 GMT Message-Id: <200504241213.j3OCDKKu073797@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 Subject: PERFORCE change 75872 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 12:13:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=75872 Change 75872 by rwatson@rwatson_paprika on 2005/04/24 12:13:00 Add additional API man pages for OpenBSM. Some are not quite complete, such as au_user.3 and the auditctl.2/auditon.2 pages. Affected files ... .. //depot/projects/trustedbsd/openbsm/LICENSE#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.1#1 add .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.1#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/au_class.3#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/au_free_token.3#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/au_mask.3#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/au_token.3#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/au_user.3#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#1 add .. //depot/projects/trustedbsd/openbsm/man/audit.2#1 add .. //depot/projects/trustedbsd/openbsm/man/auditctl.2#1 add .. //depot/projects/trustedbsd/openbsm/man/auditon.2#1 add .. //depot/projects/trustedbsd/openbsm/man/getaudit.2#1 add .. //depot/projects/trustedbsd/openbsm/man/getauid.2#1 add .. //depot/projects/trustedbsd/openbsm/man/setaudit.2#1 add .. //depot/projects/trustedbsd/openbsm/man/setauid.2#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 24 12:47:02 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82D8D16A4D0; Sun, 24 Apr 2005 12:47:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F9C516A4CE for ; Sun, 24 Apr 2005 12:47:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10AEE43D39 for ; Sun, 24 Apr 2005 12:47:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OCl1ow075708 for ; Sun, 24 Apr 2005 12:47:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OCl1k3075491 for perforce@freebsd.org; Sun, 24 Apr 2005 12:47:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 12:47:01 GMT Message-Id: <200504241247.j3OCl1k3075491@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 Subject: PERFORCE change 75874 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 12:47:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=75874 Change 75874 by rwatson@rwatson_paprika on 2005/04/24 12:46:30 To prevent confusion, 1.0-PRERELEASE since 1.0 isn't ready yet. Affected files ... .. //depot/projects/trustedbsd/openbsm/VERSION#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.0 +1.0-PRERELEASE From owner-p4-projects@FreeBSD.ORG Sun Apr 24 14:12:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F21816A4D0; Sun, 24 Apr 2005 14:12:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE72016A4CE for ; Sun, 24 Apr 2005 14:12:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A631C43D5A for ; Sun, 24 Apr 2005 14:12:45 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OECj54085910 for ; Sun, 24 Apr 2005 14:12:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OECjMV085907 for perforce@freebsd.org; Sun, 24 Apr 2005 14:12:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 14:12:45 GMT Message-Id: <200504241412.j3OECjMV085907@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 Subject: PERFORCE change 75876 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 14:12:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=75876 Change 75876 by rwatson@rwatson_paprika on 2005/04/24 14:12:08 We have an Open Basic Security Module, not an Open Bruce M Simpson. Submitted by: arr Affected files ... .. //depot/projects/trustedbsd/openbsm/README#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#3 (text+ko) ==== @@ -19,7 +19,7 @@ libbsm/ Implementation of BSM library interfaces and man pages man/ System call and configuration file man pages -OpenBMS currently builds on FreeBSD and Darwin. With Makefile adjustment +OpenBSM currently builds on FreeBSD and Darwin. With Makefile adjustment and minor tweaks, it should build without problems on a broad range of POSIX-like systems. From owner-p4-projects@FreeBSD.ORG Sun Apr 24 14:26:03 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA0DF16A4D0; Sun, 24 Apr 2005 14:26:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 744A416A4CE for ; Sun, 24 Apr 2005 14:26:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CB5543D4C for ; Sun, 24 Apr 2005 14:26:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OEQ2k4086488 for ; Sun, 24 Apr 2005 14:26:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OEQ1eh086485 for perforce@freebsd.org; Sun, 24 Apr 2005 14:26:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 14:26:01 GMT Message-Id: <200504241426.j3OEQ1eh086485@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 Subject: PERFORCE change 75877 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 14:26:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=75877 Change 75877 by rwatson@rwatson_paprika on 2005/04/24 14:25:15 Merge in additional man page contents from the version of audit.2 found in the trustedbsd_audit3 tree. Pointed out by: wsalamon Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.2#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.2#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\"- +.\" Copyright (c) 2005 Tom Rhodes .\" Copyright (c) 2005 Robert N. M. Watson .\" All rights reserved. .\" @@ -10,7 +10,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -37,19 +37,32 @@ .Fn audit "const char *record" "u_int length" .Sh DESCRIPTION .Nm -submits a completed BSM audit record, -pointed to by -.Va record -and of -.Va length -bytes, to the system audit log. +submits a completed BSM audit record to the system audit log. .Pp -This system call required appropriate privilege to complete. +.Fa record +is a pointer to the the specific event to be recorded and +.Vt length +is the size in bytes of the data to be written. .Sh RETURN VALUES -.Nm -returns 0 on success, or returns -1 on failure, providing additional error -information via -.Va errno . +.Rv -std +.Sh ERRORS +The +.Fn audit +system call will fail and the data never written if: +.Bl -tag -width Er +.It Bq Er EFAULT +The +.Fa record +argument is beyond the allocated address space of the process. +.It Bq Er EINVAL +The token ID is invalid or +.Vt length +is larger than +.Vt MAXAUDITDATA . +.It Bq Er EPERM +The process does not have sufficient permission to complete +the operation. +.El .Sh SEE ALSO .Xr auditon 2 , .Xr getauid 2 , @@ -66,11 +79,19 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. +.Pp +This manual page was written by +.An Tom Rhodes Aq trhodes@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 1994. It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. +.Pp +The +.Fn audit +function first appeared in +.Fx .Sh BUGS The .Fx From owner-p4-projects@FreeBSD.ORG Sun Apr 24 14:27:04 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CBD316A4D0; Sun, 24 Apr 2005 14:27:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 09C3316A4CE for ; Sun, 24 Apr 2005 14:27:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D131843D41 for ; Sun, 24 Apr 2005 14:27:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OER3KJ086519 for ; Sun, 24 Apr 2005 14:27:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OER33X086516 for perforce@freebsd.org; Sun, 24 Apr 2005 14:27:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 14:27:03 GMT Message-Id: <200504241427.j3OER33X086516@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 Subject: PERFORCE change 75878 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 14:27:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=75878 Change 75878 by rwatson@rwatson_paprika on 2005/04/24 14:26:04 Restore formatting line to header of license, missing in Tom's version. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.2#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.2#3 (text+ko) ==== @@ -1,3 +1,4 @@ +.\"- .\" Copyright (c) 2005 Tom Rhodes .\" Copyright (c) 2005 Robert N. M. Watson .\" All rights reserved. From owner-p4-projects@FreeBSD.ORG Sun Apr 24 14:34:14 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97D7B16A4D2; Sun, 24 Apr 2005 14:34:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67A3416A4CE for ; Sun, 24 Apr 2005 14:34:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0985843D46 for ; Sun, 24 Apr 2005 14:34:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OEYCao086857 for ; Sun, 24 Apr 2005 14:34:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OEYCQH086854 for perforce@freebsd.org; Sun, 24 Apr 2005 14:34:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 14:34:12 GMT Message-Id: <200504241434.j3OEYCQH086854@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 Subject: PERFORCE change 75879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 14:34:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=75879 Change 75879 by rwatson@rwatson_paprika on 2005/04/24 14:34:05 Merge trhode's auditon.2 man page into mine (or maybe vice versa). Pointed out by: wsalamon Affected files ... .. //depot/projects/trustedbsd/openbsm/man/auditon.2#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/auditon.2#2 (text+ko) ==== @@ -1,5 +1,6 @@ .\"- .\" Copyright (c) 2005 Robert N. M. Watson +.\" Copyright (c) 2005 Tom Rhodes .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -10,7 +11,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -36,14 +37,127 @@ .Ft int .Fn auditon "int cmd" "void *data" "u_int length" .Sh DESCRIPTION - -XXXXXXXXXXXXXXXX - +The +.Nm +system call is used to manipulate various audit control operations. +.Ft *data +should point to a structure whose type depends on the command. +.Ft length +specifies the size of the +.Em data +in bytes. +.Ft cmd +may be any of the following: +.Bl -tag -width ".It Dv A_GETPINFO_ADDR" +.It Dv A_SETPOLICY +Set audit policy flags. +Currently, only +.Dv AUDIT_CNT +and +.Dv AUDIT_AHLT +are implemented. +In the +.Dv AUDIT_CNT +case, the action will continue regardless if +an event will not be audited. +In the +.Dv AUDIT_AHLT +case, a +.Xr panic 9 +will result if an event will not be written to the +audit log file. +.It Dv A_SETKAUDIT +Return +.Er ENOSYS . +.It Dv A_SETKMASK +Set the kernel preselection mask to the data stored in the class mask. +This mask is used for non-attributable audit event preselection. +.It Dv A_SETQCTRL +Set the kernel audit queue control parameters to their minimum or +maximum values in +.Va high water , +.Va low water , +.Va output buffer size , +and +.Em delay . +.It Dv A_SETSTAT +Return +.Er ENOSYS . +.It Dv A_SETUMASK +Return +.Er ENOSYS . +.It Dv A_SETSMASK +Return +.Er ENOSYS . +.It Dv A_SETCOND +Toggle audit record generation to on or off values. +.It Dv A_SETCLASS +Set the event class preselection mask for the designated audit event. +.It Dv A_SETPMASK +Set the given process's audit selection masks for both +success and failure. +.It Dv A_SETFSIZE +Set the maximum size of the audit log file. +.It Dv A_SETKAUDIT +Return +.Er ENOSYS . +.It Dv A_GETCLASS +Return the event to class mapping for the designated audit event. +.It Dv A_GETKAUDIT +Return +.Er ENOSYS . +.It Dv A_GETPINFO +Return the audit ID, preselection mask, terminal ID, and audit session +ID of the specified process. +.It Dv A_GETPINFO_ADDR +Return +.Er ENOSYS . +.It Dv A_GETKMASK +Return the current kernel preselection mask for non-attributable mask. +.It Dv A_GETPOLICY +Get the current audit policy flags. +.It Dv A_GETQCTRL +Return the kernel audit queue control parameters. +.It Dv A_SETQCTRL +Set the kernel audit queue control parameters. +.It Dv A_GETCWD +.\" [COMMENTED OUT]: Valid description, not yet implemented. +.\" Return the current working directory as stored in the audit subsystem. +Return +.Er ENOSYS . +.It Dv A_GETCAR +.\" [COMMENTED OUT]: Valid description, not yet implemented. +.\"Stores and returns the current active root as stored in the audit +.\"subsystem. +Return +.Er ENOSYS . +.It Dv A_GETSTAT +.\" [COMMENTED OUT]: Valid description, not yet implemented. +.\"Return the statistics stored in the audit system. +Return +.Er ENOSYS . +.It Dv A_GETCOND +Return +.Er ENOSYS . +.El .Sh RETURN VALUES -.Nm -returns 0 on success, or returns -1 on failure, providing additional error -information via -.Va errno . +.Rv -std +.Sh ERRORS +The +.Fn auditon +function will fail if: +.Bl -tag -width Er +.It Bq Er ENOSYS +Returned by options not yet implemented. +.It Bq Er EFAULT +A failure occurred while data transferred to or from +the kernel failed. +.It Bq Er EINVAL +Illegal argument was passed by a system call. +.It Bq Er EPERM +The process does not have sufficient permission to complete +the operation. +.El .Sh SEE ALSO .Xr audit 2 , .Xr auditctl 2 , @@ -61,9 +175,16 @@ .Pp The Basic Security Module (BSM) interface to audit records and audit event stream format were defined by Sun Microsystems. +.Pp +This manual page was written by +.An Tom Rhodes Aq trhodes@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc. in 1994. It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. -.Sh BUGS +.Pp +The +.Fn audit +function first appeared in +.Fx 6.0 . From owner-p4-projects@FreeBSD.ORG Sun Apr 24 14:58:44 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEAC816A4D0; Sun, 24 Apr 2005 14:58:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B5BD16A4CE for ; Sun, 24 Apr 2005 14:58:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D4B443D2F for ; Sun, 24 Apr 2005 14:58:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OEwhhB088792 for ; Sun, 24 Apr 2005 14:58:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OEwh4k088789 for perforce@freebsd.org; Sun, 24 Apr 2005 14:58:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 14:58:43 GMT Message-Id: <200504241458.j3OEwh4k088789@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 Subject: PERFORCE change 75882 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 14:58:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=75882 Change 75882 by rwatson@rwatson_paprika on 2005/04/24 14:57:49 Try to avoid including system includes when not necessary, as system BSM include files may interfere with local OpenBSM includes. This might not be quite the right way to do it, but helps with building on Darwin. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#2 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#2 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile#2 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD$ # -CFLAGS+= -I ../.. -I ../../libbsm +CFLAGS+= -I- -I ../.. -I ../../libbsm -I. PROG= auditreduce MAN= auditreduce.1 DPADD= /usr/lib/libbsm.a ==== //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile#2 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD$ # -CFLAGS+= -I ../.. -I ../../libbsm +CFLAGS+= -I- -I ../.. -I ../../libbsm -I. PROG= praudit MAN= praudit.1 DPADD= /usr/lib/libbsm.a ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile#3 (text+ko) ==== @@ -7,7 +7,7 @@ LIB= bsm SHLIB_MAJOR= 1 -CFLAGS+= \ +CFLAGS+=-I- \ -I .. \ -I . From owner-p4-projects@FreeBSD.ORG Sun Apr 24 15:55:54 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C04BD16A4D1; Sun, 24 Apr 2005 15:55:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 90AF616A4CE for ; Sun, 24 Apr 2005 15:55:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A27E43D3F for ; Sun, 24 Apr 2005 15:55:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OFtrGE091029 for ; Sun, 24 Apr 2005 15:55:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OFtqbJ091026 for perforce@freebsd.org; Sun, 24 Apr 2005 15:55:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 15:55:52 GMT Message-Id: <200504241555.j3OFtqbJ091026@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 Subject: PERFORCE change 75884 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 15:55:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=75884 Change 75884 by rwatson@rwatson_paprika on 2005/04/24 15:55:08 Don't expose bsm_free_q to the world. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ * freed */ -LIST_HEAD(, au_record) bsm_free_q; +static LIST_HEAD(, au_record) bsm_free_q; static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; From owner-p4-projects@FreeBSD.ORG Sun Apr 24 15:55:55 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D15B16A4F2; Sun, 24 Apr 2005 15:55:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A003A16A4CF for ; Sun, 24 Apr 2005 15:55:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 865AA43D41 for ; Sun, 24 Apr 2005 15:55:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OFtroH091035 for ; Sun, 24 Apr 2005 15:55:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OFtr2J091032 for perforce@freebsd.org; Sun, 24 Apr 2005 15:55:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 15:55:53 GMT Message-Id: <200504241555.j3OFtr2J091032@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 Subject: PERFORCE change 75885 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 15:55:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=75885 Change 75885 by rwatson@rwatson_paprika on 2005/04/24 15:55:30 Don't expose ev_cache to the world. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ * 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. */ -LIST_HEAD(, audit_event_map) ev_cache; +static LIST_HEAD(, audit_event_map) ev_cache; static int load_event_table() { From owner-p4-projects@FreeBSD.ORG Sun Apr 24 15:58:58 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61B5516A4D0; Sun, 24 Apr 2005 15:58:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 202DC16A4CE for ; Sun, 24 Apr 2005 15:58:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7C0343D41 for ; Sun, 24 Apr 2005 15:58: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 j3OFwvS6091209 for ; Sun, 24 Apr 2005 15:58: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 j3OFwvlW091206 for perforce@freebsd.org; Sun, 24 Apr 2005 15:58:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 15:58:57 GMT Message-Id: <200504241558.j3OFwvlW091206@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 Subject: PERFORCE change 75886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 15:58:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=75886 Change 75886 by rwatson@rwatson_paprika on 2005/04/24 15:58:48 Try to clean up the state of nested includes a bit: - #ifdef KERNEL interfaces related to struct vattr, which is kernel-only. - Avoid nested includes from include files where possible, and instead rely on forward declarations of structures. Include in .c files only where necessary. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#4 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_kernel.h#4 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#4 (text+ko) ==== @@ -24,13 +24,6 @@ #ifndef _BSM_AUDIT_H #define _BSM_AUDIT_H -#include -#include -#include -#include -#include -#include - #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 #define MAX_AUDIT_RECORD_SIZE 4096 ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kernel.h#4 (text+ko) ==== @@ -26,12 +26,6 @@ #if defined(_KERNEL) || defined(KERNEL) -#include - -#include -#include -#include - /* * Audit subsystem condition flags. The audit_enabled flag is set and * removed automatically as a result of configuring log files, and ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#3 (text+ko) ==== @@ -24,15 +24,6 @@ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ -#include -#include -#include -#include -#include -#include -#include -#include - /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. @@ -228,6 +219,18 @@ __BEGIN_DECLS +struct in_addr; +struct in6_addr; +struct ip; +struct ipc_perm; +struct kevent; +struct sockaddr_in; +struct sockaddr_in6; +struct sockaddr_un; +#if defined(_KERNEL) || defined(KERNEL) +struct vattr; +#endif + int au_open(void); int au_write(int d, token_t *m); int au_close(int d, int keep, short event); @@ -243,9 +246,11 @@ 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); +#if defined(_KERNEL) || defined(KERNEL) token_t *au_to_attr(struct vattr *attr); token_t *au_to_attr32(struct vattr *attr); token_t *au_to_attr64(struct vattr *attr); +#endif token_t *au_to_data(char unit_print, char unit_type, char unit_count, char *p); token_t *au_to_exit(int retval, int err); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#4 (text+ko) ==== @@ -27,8 +27,15 @@ */ #include +#include #include +#include + +#include +#include +#include + #include #include #include @@ -125,6 +132,7 @@ return au_to_arg32(n, text, v); } +#if defined(_KERNEL) || defined(_KERNEL) /* * token ID 1 byte * file access mode 4 bytes @@ -186,7 +194,7 @@ return au_to_attr32(attr); } - +#endif /* !(defined(_KERNEL) || defined(KERNEL) */ /* * token ID 1 byte ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#4 (text+ko) ==== @@ -29,12 +29,12 @@ /* * XXX lib_wrappers.c is a provisional name */ -#include /* [f]stat(), sysctl(), gete[ug]id(), getpid() */ -#include /* [f]stat() */ -#include /* sysctl() */ -#include /* STDIN_FILENO, gete[ug]id(), getpid() */ -#include /* syslog() */ -#include /* syslog() */ +#include +#include +#include +#include +#include +#include #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#5 (text+ko) ==== @@ -38,13 +38,15 @@ #define MAX_ARGS 10 #define MAX_ENV 10 -#include #include +#include #include -#include /* __{BEGIN,END}_DECLS */ #include #include + +#include + #ifdef __APPLE__ #include /* audit_token_t */ #endif From owner-p4-projects@FreeBSD.ORG Sun Apr 24 16:03:03 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AE1616A4D0; Sun, 24 Apr 2005 16:03:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5FEBD16A4CE for ; Sun, 24 Apr 2005 16:03:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F04B43D53 for ; Sun, 24 Apr 2005 16:03:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OG33r4091450 for ; Sun, 24 Apr 2005 16:03:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OG32Dj091447 for perforce@freebsd.org; Sun, 24 Apr 2005 16:03:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 16:03:02 GMT Message-Id: <200504241603.j3OG32Dj091447@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 Subject: PERFORCE change 75887 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 16:03:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=75887 Change 75887 by rwatson@rwatson_paprika on 2005/04/24 16:02:29 Build instructions. Note also Darwin problem with a nested include of the older sys/audit.h from sys/proc.h, which can result in build problems due to conflicts with newer bsm/audit.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#4 (text+ko) ==== @@ -23,6 +23,29 @@ and minor tweaks, it should build without problems on a broad range of POSIX-like systems. + Building + +OpenBSM is currently built using a series of BSD make files which should +work on both FreeBSD and Darwin. One known issue is that versions of +Darwin prior to 10.3.8 have a nested include of "sys/audit.h" from +"sys/proc.h", which can result in type definition conflicts. If running +with include files from an earlier version of Darwin, the nested include +must be manually removed in order that libbsm can be built, due to +potentially conflicting types resulting from an include of "sys/sysctl.h" +by that file. On Dariwn, the use of BSD make must be specified explicitly +by using "bsdmake" rather than "make", which on Darwin refers to GNU make. +Typical invocations from the OpenBSM tree root: + +FreeBSD + + % make + # make install + +Darwin + + % bsdmake + # bsdmake install + Credits The following organizations and individuals have contributed substantially From owner-p4-projects@FreeBSD.ORG Sun Apr 24 16:05:06 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B4BD16A4D0; Sun, 24 Apr 2005 16:05:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F38A16A4CE for ; Sun, 24 Apr 2005 16:05:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3585643D5F for ; Sun, 24 Apr 2005 16:05:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OG56jm091576 for ; Sun, 24 Apr 2005 16:05:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OG55mC091573 for perforce@freebsd.org; Sun, 24 Apr 2005 16:05:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 16:05:05 GMT Message-Id: <200504241605.j3OG55mC091573@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 Subject: PERFORCE change 75888 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 16:05:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=75888 Change 75888 by rwatson@rwatson_paprika on 2005/04/24 16:04:05 Fix typo. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#5 (text+ko) ==== @@ -32,7 +32,7 @@ with include files from an earlier version of Darwin, the nested include must be manually removed in order that libbsm can be built, due to potentially conflicting types resulting from an include of "sys/sysctl.h" -by that file. On Dariwn, the use of BSD make must be specified explicitly +by that file. On Darwin, the use of BSD make must be specified explicitly by using "bsdmake" rather than "make", which on Darwin refers to GNU make. Typical invocations from the OpenBSM tree root: From owner-p4-projects@FreeBSD.ORG Sun Apr 24 16:17:22 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2807516A4D0; Sun, 24 Apr 2005 16:17:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C2AE916A4CE for ; Sun, 24 Apr 2005 16:17:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C17E43D46 for ; Sun, 24 Apr 2005 16:17: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 j3OGHLhb092215 for ; Sun, 24 Apr 2005 16:17:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OGHLqB092212 for perforce@freebsd.org; Sun, 24 Apr 2005 16:17:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 16:17:21 GMT Message-Id: <200504241617.j3OGHLqB092212@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 Subject: PERFORCE change 75889 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 16:17:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=75889 Change 75889 by rwatson@rwatson_paprika on 2005/04/24 16:16:45 Fix au_write() to set 'errno' in the event the arguments are invalid. Check to see if the call to au_write() would cause more data to be written to the audit record than is available, including checking to make sure we don't use room reserved for the header and trailer. Break out the logic in au_close()that flattens out the audit record tokens into a buffer, as well as the logic to prepend a the audit header and append the audit trailer. The new function, au_assemble(), places the contents of the tokens, ready to commit, in the buffer attached to the record. It does not free the tokens, which will be done by the caller. Break out the logic used to free all memory associated with freeing an audit record, including all tokens, into au_teardown(). Implement au_close() in terms of these calls. Comment on some failure cases we need to look at carefully and that can maybe now be eliminated by virtue of space reservations for the header and trailer by au_write(). Implement au_close_buffer(), which writes the record to a memory buffer rather than the system audit trail, which is useful for writing test cases, as well as directly maintaining audit trails in user space. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#4 (text+ko) ==== @@ -234,6 +234,8 @@ int au_open(void); int au_write(int d, token_t *m); int au_close(int d, int keep, short event); +int au_close_buffer(int d, short event, u_char *buffer, + size_t *buflen); token_t *au_to_file(char *file); token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#3 (text+ko) ==== @@ -1,5 +1,7 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2005 Robert N. M. Watson + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -28,12 +30,13 @@ #include #include + +#include +#include #include #include #include -#include - /* array of used descriptors */ static au_record_t* open_desc_table[MAX_AUDIT_RECORDS]; @@ -139,21 +142,31 @@ /* * 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) { au_record_t *rec; if(tok == NULL) { + errno = EINVAL; return -1; /* Invalid Token */ } /* Write the token to the record descriptor */ rec = open_desc_table[d]; if((rec == NULL) || (rec->used == 0)) { + errno = EINVAL; return -1; /* Invalid descriptor */ } + if (rec->len + tok->len + TRAILER_SIZE > MAX_AUDIT_RECORD_SIZE) { + errno = ENOMEM; + return (-1); + } + /* Add the token to the tail */ /* * XXX Not locking here -- we should not be writing to @@ -169,54 +182,55 @@ } /* - * Add the header token, identify any missing tokens - * Write out the tokens to the record memory and finally, - * call audit + * 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. */ -int au_close(int d, int keep, short event) +static int +au_assemble(au_record_t *rec, short event) { - au_record_t *rec; + token_t *header, *tok, *trailer; + size_t tot_rec_size; u_char *dptr; - size_t tot_rec_size; - token_t *tok, *hdr, *trail; - int retval = 0; - - rec = open_desc_table[d]; - if((rec == NULL) || (rec->used == 0)) { - return -1; /* Invalid descriptor */ - } - + int error; + tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE; - if(keep && (tot_rec_size <= MAX_AUDIT_RECORD_SIZE)) { - /* Create the header token */ - /* No modifier for libbsm records */ - hdr = au_to_header32(tot_rec_size, event, 0); - - if(hdr != NULL) { - /* Add to head of list */ - TAILQ_INSERT_HEAD(&rec->token_q, hdr, tokens); + header = au_to_header32(tot_rec_size, event, 0); + if (header == NULL) + return (-1); - trail = au_to_trailer(tot_rec_size); - if(trail != NULL) { - /* Add to tail of list */ - TAILQ_INSERT_TAIL(&rec->token_q, trail, tokens); - } - } - /* Serialize token data to the record */ + trailer = au_to_trailer(tot_rec_size); + if (trailer == NULL) { + error = errno; + au_free_token(header); + errno = error; + return (-1); + } - rec->len = tot_rec_size; - dptr = rec->data; + TAILQ_INSERT_HEAD(&rec->token_q, header, tokens); + TAILQ_INSERT_TAIL(&rec->token_q, trailer, tokens); - TAILQ_FOREACH(tok, &rec->token_q, tokens) { - memcpy(dptr, tok->t_data, tok->len); - dptr += tok->len; - } + rec->len = tot_rec_size; + dptr = rec->data; - /* Call the kernel interface to audit */ - retval = audit(rec->data, rec->len); + TAILQ_FOREACH(tok, &rec->token_q, tokens) { + memcpy(dptr, tok->t_data, tok->len); + dptr += tok->len; } - /* CLEANUP */ + return (0); +} + +/* + * 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) +{ + token_t *tok; /* Free the token list */ while ((tok = TAILQ_FIRST(&rec->token_q))) { @@ -234,7 +248,102 @@ LIST_INSERT_HEAD(&bsm_free_q, rec, au_rec_q); pthread_mutex_unlock(&mutex); +} +/* + * 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) +{ + au_record_t *rec; + u_char *dptr; + size_t tot_rec_size; + int retval = 0; + + rec = open_desc_table[d]; + if((rec == NULL) || (rec->used == 0)) { + return -1; /* Invalid descriptor */ + } + + if (!keep) { + retval = 0; + goto cleanup; + } + + + tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE; + + if (tot_rec_size > MAX_AUDIT_RECORD_SIZE) { + /* + * XXXRW: Since au_write() is supposed to prevent this, spew + * an error here. + */ + fprintf(stderr, "au_close failed"); + errno = ENOMEM; + retval = -1; + goto cleanup; + } + + 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. + */ + retval = -1; + goto cleanup; + } + + /* Call the kernel interface to audit */ + retval = audit(rec->data, rec->len); + +cleanup: + /* CLEANUP */ + au_teardown(rec); return retval; } - + +/* + * au_close(), except onto an in-memory buffer. Buffer size as an argument, + * record size returned via same argument on success. + */ +int +au_close_buffer(int d, short event, u_char *buffer, size_t *buflen) +{ + size_t tot_rec_size; + au_record_t *rec; + int retval; + + rec = open_desc_table[d]; + if ((rec == NULL) || (rec->used == 0)) { + errno = EINVAL; + return (-1); + } + + tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE; + if ((tot_rec_size > MAX_AUDIT_RECORD_SIZE) || + (tot_rec_size > *buflen)) { + /* + * XXXRW: See au_close() comment. + */ + fprintf(stderr, "au_close_buffer failed %d", tot_rec_size); + errno = ENOMEM; + retval = -1; + goto cleanup; + } + + if (au_assemble(rec, event) < 0) { + /* + * 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 Sun Apr 24 16:21:45 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C00B16A4D0; Sun, 24 Apr 2005 16:21:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3517D16A4CE for ; Sun, 24 Apr 2005 16:21:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E522643D1D for ; Sun, 24 Apr 2005 16:21:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OGLiYc092443 for ; Sun, 24 Apr 2005 16:21:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OGLiHT092440 for perforce@freebsd.org; Sun, 24 Apr 2005 16:21:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 16:21:44 GMT Message-Id: <200504241621.j3OGLiHT092440@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 Subject: PERFORCE change 75890 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 16:21:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=75890 Change 75890 by rwatson@rwatson_paprika on 2005/04/24 16:20:44 Answer the question in the comment as to whether au_free_token() should be a macro -- answer is no, because it's a defined part of the API/ABI as a symbol, and in order to keep the contents of the token structure out of the ABI, it has to be a function. Minor reformatting. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#4 (text+ko) ==== @@ -55,17 +55,16 @@ /* * This call frees a token_t and its internal data. - * - * XXX Should it be a macro for speed? */ -void au_free_token(token_t *tok) +void +au_free_token(token_t *tok) { - if (tok) - { + + if (tok != NULL) { if (tok->t_data) free(tok->t_data); free(tok); - } + } } /* From owner-p4-projects@FreeBSD.ORG Sun Apr 24 16:26:52 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 044CD16A4D0; Sun, 24 Apr 2005 16:26:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A429116A4CE for ; Sun, 24 Apr 2005 16:26:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8826B43D1F for ; Sun, 24 Apr 2005 16:26:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OGQpvl092640 for ; Sun, 24 Apr 2005 16:26:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OGQpxu092637 for perforce@freebsd.org; Sun, 24 Apr 2005 16:26:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 16:26:51 GMT Message-Id: <200504241626.j3OGQpxu092637@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 Subject: PERFORCE change 75891 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 16:26:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=75891 Change 75891 by rwatson@rwatson_paprika on 2005/04/24 16:26:04 Rename MAX_GROUPS to BSM_MAX_GROUPS to avoid name space pollution. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#5 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#5 edit .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#5 (text+ko) ==== @@ -211,7 +211,7 @@ #define PAD_FAILURE 0x8000 /* fail audit event */ -#define MAX_GROUPS 16 +#define BSM_MAX_GROUPS 16 #define HEADER_VERSION 1 #define TRAILER_PAD_MAGIC 0xB105 ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#5 (text+ko) ==== @@ -271,7 +271,7 @@ */ token_t *au_to_groups(int *groups) { - return au_to_newgroups(MAX_GROUPS, groups); + return au_to_newgroups(BSM_MAX_GROUPS, groups); } /* ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#6 (text+ko) ==== @@ -308,7 +308,7 @@ typedef struct { u_int16_t no; - u_int32_t list[MAX_GROUPS]; + u_int32_t list[BSM_MAX_GROUPS]; } au_groups_t; From owner-p4-projects@FreeBSD.ORG Sun Apr 24 16:29:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 445CF16A4D0; Sun, 24 Apr 2005 16:29:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 09EAD16A4CE for ; Sun, 24 Apr 2005 16:29:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5FAB43D2F for ; Sun, 24 Apr 2005 16:29:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OGTtZn092749 for ; Sun, 24 Apr 2005 16:29:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OGTto1092746 for perforce@freebsd.org; Sun, 24 Apr 2005 16:29:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 16:29:55 GMT Message-Id: <200504241629.j3OGTto1092746@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 Subject: PERFORCE change 75892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 16:29:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=75892 Change 75892 by rwatson@rwatson_paprika on 2005/04/24 16:29:44 Rename HEADER_SIZE to BSM_HEADER_SIZE for API reasons. Rename TRAILER_SIZE to BSM_TRAILER_SIZE for API reasons. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#5 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#6 (text+ko) ==== @@ -31,8 +31,8 @@ * contain pointers of whose contents we dont know the size * (e.g text tokens) */ -#define HEADER_SIZE 18 -#define TRAILER_SIZE 7 +#define BSM_HEADER_SIZE 18 +#define BSM_TRAILER_SIZE 7 #define ADD_U_CHAR(loc, val) \ do {\ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#5 (text+ko) ==== @@ -161,7 +161,7 @@ return -1; /* Invalid descriptor */ } - if (rec->len + tok->len + TRAILER_SIZE > MAX_AUDIT_RECORD_SIZE) { + if (rec->len + tok->len + BSM_TRAILER_SIZE > MAX_AUDIT_RECORD_SIZE) { errno = ENOMEM; return (-1); } @@ -195,7 +195,7 @@ u_char *dptr; int error; - tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE; + tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; header = au_to_header32(tot_rec_size, event, 0); if (header == NULL) return (-1); @@ -272,7 +272,7 @@ } - tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE; + tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; if (tot_rec_size > MAX_AUDIT_RECORD_SIZE) { /* @@ -320,7 +320,7 @@ return (-1); } - tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE; + tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; if ((tot_rec_size > MAX_AUDIT_RECORD_SIZE) || (tot_rec_size > *buflen)) { /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#2 (text+ko) ==== @@ -2057,7 +2057,7 @@ int err = 0; int recoversize; - recoversize = len - tok->len - TRAILER_SIZE; + recoversize = len - tok->len - BSM_TRAILER_SIZE; if(recoversize <= 0) { return -1; } From owner-p4-projects@FreeBSD.ORG Sun Apr 24 16:37:05 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67A9B16A4D0; Sun, 24 Apr 2005 16:37:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BABC16A4CE for ; Sun, 24 Apr 2005 16:37:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D820543D41 for ; Sun, 24 Apr 2005 16:37:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OGb4Jl093122 for ; Sun, 24 Apr 2005 16:37:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OGb44V093119 for perforce@freebsd.org; Sun, 24 Apr 2005 16:37:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 16:37:04 GMT Message-Id: <200504241637.j3OGb44V093119@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 Subject: PERFORCE change 75893 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 16:37:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=75893 Change 75893 by rwatson@rwatson_paprika on 2005/04/24 16:36:26 Move libbsm-internal macros and defines associated with token assembly and record assembly from public audit_record.h to a new private libbsm_internal.h to avoid leaking them into applications or building external dependencies. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#7 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm_internal.h#1 add Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#7 (text+ko) ==== @@ -24,50 +24,6 @@ #ifndef _BSM_AUDIT_RECORD_H_ #define _BSM_AUDIT_RECORD_H_ -/* We could determined the header and trailer sizes by - * defining appropriate structures. We hold off that approach - * till we have a consistant way of using structures for all tokens. - * This is not straightforward since these token structures may - * contain pointers of whose contents we dont know the size - * (e.g text tokens) - */ -#define BSM_HEADER_SIZE 18 -#define BSM_TRAILER_SIZE 7 - -#define ADD_U_CHAR(loc, val) \ - do {\ - *loc = val;\ - loc += sizeof(u_char);\ - }while(0) - - -#define ADD_U_INT16(loc, val) \ - do { \ - memcpy(loc, (u_char *)&val, sizeof(u_int16_t));\ - loc += sizeof(u_int16_t); \ - }while(0) - -#define ADD_U_INT32(loc, val) \ - do { \ - memcpy(loc, (u_char *)&val, sizeof(u_int32_t));\ - loc += sizeof(u_int32_t); \ - }while(0) - -#define ADD_U_INT64(loc, val)\ - do {\ - memcpy(loc, (u_char *)&val, sizeof(u_int64_t));\ - loc += sizeof(u_int64_t); \ - }while(0) - -#define ADD_MEM(loc, data, size) \ - do { \ - memcpy(loc, data, size);\ - loc += size;\ - }while(0) - -#define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size) - - /* Various token id types */ /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#6 (text+ko) ==== @@ -37,6 +37,8 @@ #include #include +#include "libbsm_internal.h" + /* array of used descriptors */ static au_record_t* open_desc_table[MAX_AUDIT_RECORDS]; ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#3 (text+ko) ==== @@ -42,6 +42,8 @@ #include +#include "libbsm_internal.h" + #define READ_TOKEN_BYTES(buf, len, dest, size, bytesread, err) \ do {\ if(bytesread + size > len) {\ From owner-p4-projects@FreeBSD.ORG Sun Apr 24 16:47:18 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0320016A4D0; Sun, 24 Apr 2005 16:47:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCC0616A4CE for ; Sun, 24 Apr 2005 16:47:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9647043D2D for ; Sun, 24 Apr 2005 16:47:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OGlHFa000605 for ; Sun, 24 Apr 2005 16:47:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OGlH5p000602 for perforce@freebsd.org; Sun, 24 Apr 2005 16:47:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 16:47:17 GMT Message-Id: <200504241647.j3OGlH5p000602@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 Subject: PERFORCE change 75895 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 16:47:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=75895 Change 75895 by rwatson@rwatson_paprika on 2005/04/24 16:46:18 Rename libbsm_internal.h to audit_internal.h so that the kernel can also use it to assemble BSM records. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/Makefile#3 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#1 branch .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#7 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm_internal.h#2 delete Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/Makefile#3 (text+ko) ==== @@ -3,6 +3,7 @@ # INCS= audit.h \ + audit_internal.h \ audit_kernel.h \ audit_kevents.h \ audit_record.h \ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#7 (text+ko) ==== @@ -31,14 +31,14 @@ #include #include +#include + #include #include #include #include #include -#include "libbsm_internal.h" - /* array of used descriptors */ static au_record_t* open_desc_table[MAX_AUDIT_RECORDS]; ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#4 (text+ko) ==== @@ -40,10 +40,10 @@ #include #include +#include + #include -#include "libbsm_internal.h" - #define READ_TOKEN_BYTES(buf, len, dest, size, bytesread, err) \ do {\ if(bytesread + size > len) {\ From owner-p4-projects@FreeBSD.ORG Sun Apr 24 16:49:21 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0214F16A4D0; Sun, 24 Apr 2005 16:49:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B8EA816A4CE for ; Sun, 24 Apr 2005 16:49:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BC3B43D2F for ; Sun, 24 Apr 2005 16:49: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 j3OGnKZv000672 for ; Sun, 24 Apr 2005 16:49: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 j3OGnKQ4000669 for perforce@freebsd.org; Sun, 24 Apr 2005 16:49:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 16:49:20 GMT Message-Id: <200504241649.j3OGnKQ4000669@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 Subject: PERFORCE change 75896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 16:49:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=75896 Change 75896 by rwatson@rwatson_paprika on 2005/04/24 16:48:55 Document that including audit_internal.h in applications is a bad idea, as it relies on internal knowledge of audit representation. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#2 (text+ko) ==== @@ -24,6 +24,14 @@ #ifndef _LIBBSM_INTERNAL_H #define _LIBBSM_INTERNAL_H +/* + * audit_internal.h contains private interfaces that are shared by user space + * and the kernel for the purposes of assembling audit records. Applications + * should not include this file or use the APIs found within, or it may be + * broken with future releases of OpenBSM, which may delete, modify, or + * otherwise break these interfaces or the assumptions they rely on. + */ + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens. From owner-p4-projects@FreeBSD.ORG Sun Apr 24 16:57:32 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9C5F16A4D0; Sun, 24 Apr 2005 16:57:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BB3116A4CE for ; Sun, 24 Apr 2005 16:57:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4ED5C43D58 for ; Sun, 24 Apr 2005 16:57: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 j3OGvVLQ001106 for ; Sun, 24 Apr 2005 16:57: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 j3OGvVZU001103 for perforce@freebsd.org; Sun, 24 Apr 2005 16:57:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 16:57:31 GMT Message-Id: <200504241657.j3OGvVZU001103@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 Subject: PERFORCE change 75898 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 16:57:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=75898 Change 75898 by rwatson@rwatson_paprika on 2005/04/24 16:57:23 Fix missing include of audit_internal.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#6 (text+ko) ==== @@ -41,6 +41,8 @@ #include #include +#include + #include #define GET_TOKEN_AREA(t, dptr, length) \ From owner-p4-projects@FreeBSD.ORG Sun Apr 24 17:01:37 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11B3416A4D0; Sun, 24 Apr 2005 17:01:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C93FC16A4CE for ; Sun, 24 Apr 2005 17:01:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADEB443D39 for ; Sun, 24 Apr 2005 17:01:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3OH1ajT001347 for ; Sun, 24 Apr 2005 17:01:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3OH1aVv001344 for perforce@freebsd.org; Sun, 24 Apr 2005 17:01:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Apr 2005 17:01:36 GMT Message-Id: <200504241701.j3OH1aVv001344@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 Subject: PERFORCE change 75899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2005 17:01:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=75899 Change 75899 by rwatson@rwatson_paprika on 2005/04/24 17:01:31 Hook up bsm_notify.c to the build, but only compile the contents if running on Darwin. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile#4 (text+ko) ==== @@ -18,6 +18,7 @@ bsm_flags.c \ bsm_io.c \ bsm_mask.c \ + bsm_notify.c \ bsm_token.c \ bsm_user.c \ bsm_wrappers.c ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#3 (text+ko) ==== @@ -26,6 +26,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifdef __APPLE__ + /* * Based on sample code from Marc Majka */ @@ -144,3 +146,4 @@ } } +#endif /* !__APPLE__ */ From owner-p4-projects@FreeBSD.ORG Mon Apr 25 04:59:33 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B36716A4D0; Mon, 25 Apr 2005 04:59:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3BC016A4CE for ; Mon, 25 Apr 2005 04:59:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D73CD43D54 for ; Mon, 25 Apr 2005 04:59:32 +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 j3P4xWcb057686 for ; Mon, 25 Apr 2005 04:59:32 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3P4xWxs057683 for perforce@freebsd.org; Mon, 25 Apr 2005 04:59:32 GMT (envelope-from marcel@freebsd.org) Date: Mon, 25 Apr 2005 04:59:32 GMT Message-Id: <200504250459.j3P4xWxs057683@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 Subject: PERFORCE change 75921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 04:59:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=75921 Change 75921 by marcel@marcel_nfs on 2005/04/25 04:59:01 Allow VGA resources across PCI-PCI bridges. Required to support a PCI based VGA driver with the VGA hardware behind a PCI-PCI bridge. Affected files ... .. //depot/projects/tty/sys/dev/pci/pci_pci.c#8 edit Differences ... ==== //depot/projects/tty/sys/dev/pci/pci_pci.c#8 (text+ko) ==== @@ -293,6 +293,23 @@ return (sc->iobase > 0 && sc->iobase < sc->iolimit); } +static __inline int +is_vga_resource(int type, u_long start, u_long end) +{ + switch (type) { + case SYS_RES_IOPORT: + if ((start >= 0x3b0 && end < 0x3bc) || + (start >= 0x3c0 && end < 0x3dc)) + return (1); + break; + case SYS_RES_MEMORY: + if (start >= 0xa0000 && end < 0xc0000) + return (1); + break; + } + return (0); +} + /* * We have to trap resource allocation requests and ensure that the bridge * is set up to, or capable of handling them. @@ -313,6 +330,11 @@ if (!pcib_is_io_open(sc)) break; ok = (start >= sc->iobase && end <= sc->iolimit); + + /* Make sure we allow access to VGA ports. */ + if (!ok) + ok = is_vga_resource(type, start, end); + if ((sc->flags & PCIB_SUBTRACTIVE) == 0) { if (!ok) { if (start < sc->iobase) @@ -357,6 +379,11 @@ ok = ok || (start >= sc->membase && end <= sc->memlimit); if (pcib_is_prefetch_open(sc)) ok = ok || (start >= sc->pmembase && end <= sc->pmemlimit); + + /* Make sure we allow access to VGA memory. */ + if (!ok) + ok = is_vga_resource(type, start, end); + if ((sc->flags & PCIB_SUBTRACTIVE) == 0) { if (!ok) { ok = 1; From owner-p4-projects@FreeBSD.ORG Mon Apr 25 05:01:36 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 134AD16A4D0; Mon, 25 Apr 2005 05:01:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E291616A4CE for ; Mon, 25 Apr 2005 05:01:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C808643D41 for ; Mon, 25 Apr 2005 05:01: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 j3P51ZmN057815 for ; Mon, 25 Apr 2005 05:01:35 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3P51Zap057812 for perforce@freebsd.org; Mon, 25 Apr 2005 05:01:35 GMT (envelope-from marcel@freebsd.org) Date: Mon, 25 Apr 2005 05:01:35 GMT Message-Id: <200504250501.j3P51Zap057812@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 Subject: PERFORCE change 75922 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 05:01:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=75922 Change 75922 by marcel@marcel_nfs on 2005/04/25 05:01:29 Don't build libvgl. It depends on consio.h, which is a header declared non grata on this branch. Affected files ... .. //depot/projects/tty/lib/Makefile#17 edit Differences ... ==== //depot/projects/tty/lib/Makefile#17 (text+ko) ==== @@ -33,7 +33,7 @@ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ libpmc ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ - libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} + libugidfw ${_libusbhid} libwrap liby libz ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -60,7 +60,6 @@ .if ${MACHINE_ARCH} == "i386" _libncp= libncp _libsmb= libsmb -_libvgl= libvgl .endif .if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \ From owner-p4-projects@FreeBSD.ORG Mon Apr 25 05:02:38 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9A6F16A4D1; Mon, 25 Apr 2005 05:02:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B4EC716A4CE for ; Mon, 25 Apr 2005 05:02:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7060243D3F for ; Mon, 25 Apr 2005 05:02: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 j3P52baC057851 for ; Mon, 25 Apr 2005 05:02:37 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3P52bh6057848 for perforce@freebsd.org; Mon, 25 Apr 2005 05:02:37 GMT (envelope-from marcel@freebsd.org) Date: Mon, 25 Apr 2005 05:02:37 GMT Message-Id: <200504250502.j3P52bh6057848@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 Subject: PERFORCE change 75923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 05:02:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=75923 Change 75923 by marcel@marcel_nfs on 2005/04/25 05:02:17 Don't build sysinstall. It depends on consio.h, which is a header declared non grata on this branch. Affected files ... .. //depot/projects/tty/usr.sbin/Makefile#17 edit Differences ... ==== //depot/projects/tty/usr.sbin/Makefile#17 (text+ko) ==== @@ -185,10 +185,6 @@ zic \ ${_zzz} -.if ${MACHINE_ARCH} != "arm" -_sysinstall= sysinstall -.endif - .if !defined(NO_ATM) _atm= atm .endif From owner-p4-projects@FreeBSD.ORG Mon Apr 25 05:05:42 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14EB816A4D1; Mon, 25 Apr 2005 05:05:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBAF616A4CE for ; Mon, 25 Apr 2005 05:05:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B90943D45 for ; Mon, 25 Apr 2005 05:05:41 +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 j3P55fnq058146 for ; Mon, 25 Apr 2005 05:05:41 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3P55ffW058143 for perforce@freebsd.org; Mon, 25 Apr 2005 05:05:41 GMT (envelope-from marcel@freebsd.org) Date: Mon, 25 Apr 2005 05:05:41 GMT Message-Id: <200504250505.j3P55ffW058143@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 Subject: PERFORCE change 75924 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 05:05:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=75924 Change 75924 by marcel@marcel_nfs on 2005/04/25 05:05:26 Clear all 25 lines. This piece of code has a high probability of being changed anyway, but having it right (as intended) avoids stupid cut-n-paste bugs. Affected files ... .. //depot/projects/tty/sys/dev/vga/vga.c#3 edit Differences ... ==== //depot/projects/tty/sys/dev/vga/vga.c#3 (text+ko) ==== @@ -180,7 +180,7 @@ if (sc->vga_console) return (0); - for (y = 0; y < 24; y++) + for (y = 0; y < 25; y++) for (x = 0; x < 80; x++) vga_write(sc, y, x, ' ', 7); From owner-p4-projects@FreeBSD.ORG Mon Apr 25 05:08:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 159C816A4D0; Mon, 25 Apr 2005 05:08:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5DBE16A4CE for ; Mon, 25 Apr 2005 05:08:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C501143D49 for ; Mon, 25 Apr 2005 05:08:45 +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 j3P58j95058220 for ; Mon, 25 Apr 2005 05:08:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3P58jEX058217 for perforce@freebsd.org; Mon, 25 Apr 2005 05:08:45 GMT (envelope-from marcel@freebsd.org) Date: Mon, 25 Apr 2005 05:08:45 GMT Message-Id: <200504250508.j3P58jEX058217@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 Subject: PERFORCE change 75925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 05:08:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=75925 Change 75925 by marcel@marcel_nfs on 2005/04/25 05:08:02 Include all the necessary headers in order to have KERNBASE defined, so that we can construct the KVA of the VGA frame buffer. Not tested on: i386 Affected files ... .. //depot/projects/tty/sys/dev/vga/vga_cpu_amd64.c#2 edit .. //depot/projects/tty/sys/dev/vga/vga_cpu_i386.c#3 edit Differences ... ==== //depot/projects/tty/sys/dev/vga/vga_cpu_amd64.c#2 (text+ko) ==== @@ -30,8 +30,13 @@ #include #include +#include +#include + #include #include +#include +#include #include ==== //depot/projects/tty/sys/dev/vga/vga_cpu_i386.c#3 (text+ko) ==== @@ -30,8 +30,13 @@ #include #include +#include +#include + #include #include +#include +#include #include From owner-p4-projects@FreeBSD.ORG Mon Apr 25 05:49:40 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F059416A4D0; Mon, 25 Apr 2005 05:49:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3C2116A4CE; Mon, 25 Apr 2005 05:49:39 +0000 (GMT) Received: from schizoid.village.org (schizoid.village.org [168.103.84.176]) by mx1.FreeBSD.org (Postfix) with ESMTP id C954343D48; Mon, 25 Apr 2005 05:49:38 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (duck-pond.village.org [10.200.4.2]) j3P5ncVY010200; Sun, 24 Apr 2005 23:49:38 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Sun, 24 Apr 2005 23:49:15 -0600 (MDT) Message-Id: <20050424.234915.41699183.imp@bsdimp.com> To: marcel@freebsd.org From: "M. Warner Losh" In-Reply-To: <200504250459.j3P4xWxs057683@repoman.freebsd.org> References: <200504250459.j3P4xWxs057683@repoman.freebsd.org> X-Mailer: Mew version 2.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 75921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 05:49:40 -0000 In message: <200504250459.j3P4xWxs057683@repoman.freebsd.org> Marcel Moolenaar writes: : http://perforce.freebsd.org/chv.cgi?CH=75921 : : Change 75921 by marcel@marcel_nfs on 2005/04/25 04:59:01 : : Allow VGA resources across PCI-PCI bridges. Required to : support a PCI based VGA driver with the VGA hardware : behind a PCI-PCI bridge. WE need to make sure that the ISA bit and VGA bits are set properly on those bridges with vga children and peers of bridges with vga children before allowing this... Warner From owner-p4-projects@FreeBSD.ORG Mon Apr 25 06:17:35 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CEF716A4CE; Mon, 25 Apr 2005 06:17:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6793F16A4CE; Mon, 25 Apr 2005 06:17:35 +0000 (GMT) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1AD143D4C; Mon, 25 Apr 2005 06:17:34 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from [192.168.4.250] (dhcp50.pn.xcllnt.net [192.168.4.250]) by ns1.xcllnt.net (8.13.3/8.13.3) with ESMTP id j3P6GBJd057422; Sun, 24 Apr 2005 23:16:11 -0700 (PDT) (envelope-from marcel@xcllnt.net) In-Reply-To: <20050424.234915.41699183.imp@bsdimp.com> References: <200504250459.j3P4xWxs057683@repoman.freebsd.org> <20050424.234915.41699183.imp@bsdimp.com> Mime-Version: 1.0 (Apple Message framework v622) Content-Type: text/plain; charset=US-ASCII; format=flowed Message-Id: Content-Transfer-Encoding: 7bit From: Marcel Moolenaar Date: Sun, 24 Apr 2005 23:16:11 -0700 To: "M. Warner Losh" X-Mailer: Apple Mail (2.622) cc: marcel@freebsd.org cc: perforce@freebsd.org Subject: Re: PERFORCE change 75921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 06:17:36 -0000 On Apr 24, 2005, at 10:49 PM, M. Warner Losh wrote: > In message: <200504250459.j3P4xWxs057683@repoman.freebsd.org> > Marcel Moolenaar writes: > : http://perforce.freebsd.org/chv.cgi?CH=75921 > : > : Change 75921 by marcel@marcel_nfs on 2005/04/25 04:59:01 > : > : Allow VGA resources across PCI-PCI bridges. Required to > : support a PCI based VGA driver with the VGA hardware > : behind a PCI-PCI bridge. > > WE need to make sure that the ISA bit and VGA bits are set properly on > those bridges with vga children and peers of bridges with vga > children before allowing this... Ideally, yes. But since only one PCI device of class display and subclass VGA can have the legacy VGA addresses enabled and we're not mucking with the system configuration in that respect, we're not really doing anything dangerous by allowing the VGA addresses without such scrutiny provided we don't try to allocate those addresses for any ol' VGA display device that we find on the PCI busses in the system. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Mon Apr 25 06:38:22 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E20D16A4D0; Mon, 25 Apr 2005 06:38:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A582D16A4CE; Mon, 25 Apr 2005 06:38:21 +0000 (GMT) Received: from schizoid.village.org (schizoid.village.org [168.103.84.176]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B3A343D2F; Mon, 25 Apr 2005 06:38:21 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (duck-pond.village.org [10.200.4.2]) j3P6cKVY010498; Mon, 25 Apr 2005 00:38:20 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Mon, 25 Apr 2005 00:37:57 -0600 (MDT) Message-Id: <20050425.003757.74682881.imp@bsdimp.com> To: marcel@xcllnt.net From: "M. Warner Losh" In-Reply-To: References: <200504250459.j3P4xWxs057683@repoman.freebsd.org> <20050424.234915.41699183.imp@bsdimp.com> X-Mailer: Mew version 2.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: marcel@freebsd.org cc: perforce@freebsd.org Subject: Re: PERFORCE change 75921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 06:38:22 -0000 In message: Marcel Moolenaar writes: : : On Apr 24, 2005, at 10:49 PM, M. Warner Losh wrote: : : > In message: <200504250459.j3P4xWxs057683@repoman.freebsd.org> : > Marcel Moolenaar writes: : > : http://perforce.freebsd.org/chv.cgi?CH=75921 : > : : > : Change 75921 by marcel@marcel_nfs on 2005/04/25 04:59:01 : > : : > : Allow VGA resources across PCI-PCI bridges. Required to : > : support a PCI based VGA driver with the VGA hardware : > : behind a PCI-PCI bridge. : > : > WE need to make sure that the ISA bit and VGA bits are set properly on : > those bridges with vga children and peers of bridges with vga : > children before allowing this... : : Ideally, yes. But since only one PCI device of class display and : subclass VGA can have the legacy VGA addresses enabled and we're : not mucking with the system configuration in that respect, we're : not really doing anything dangerous by allowing the VGA addresses : without such scrutiny provided we don't try to allocate those : addresses for any ol' VGA display device that we find on the PCI : busses in the system. Actually yes, really, we need to do this. Most system BIOSes will get it right, but not all. We'll likely need to cope with them when we turn this on. MS has an excellent paper on this topic. That paper seems to imply that one can have multiple VGA devices in a system behind different bridges. I guess what I'm saying here is that we'll need to be careful and chances are good we'll have some people that have issues which didn't before. Warner From owner-p4-projects@FreeBSD.ORG Mon Apr 25 06:50:27 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC57316A4D0; Mon, 25 Apr 2005 06:50:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9976C16A4CE for ; Mon, 25 Apr 2005 06:50:26 +0000 (GMT) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AA6C43D39 for ; Mon, 25 Apr 2005 06:50:26 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from [192.168.4.250] (dhcp50.pn.xcllnt.net [192.168.4.250]) by ns1.xcllnt.net (8.13.3/8.13.3) with ESMTP id j3P6n9VO057583; Sun, 24 Apr 2005 23:49:09 -0700 (PDT) (envelope-from marcel@xcllnt.net) In-Reply-To: <20050425.003757.74682881.imp@bsdimp.com> References: <200504250459.j3P4xWxs057683@repoman.freebsd.org> <20050424.234915.41699183.imp@bsdimp.com> <20050425.003757.74682881.imp@bsdimp.com> Mime-Version: 1.0 (Apple Message framework v622) Content-Type: text/plain; charset=US-ASCII; format=flowed Message-Id: <0ed61916398fb3960649890399e2345b@xcllnt.net> Content-Transfer-Encoding: 7bit From: Marcel Moolenaar Date: Sun, 24 Apr 2005 23:49:08 -0700 To: "M. Warner Losh" X-Mailer: Apple Mail (2.622) cc: Perforce Change Reviews Subject: Re: PERFORCE change 75921 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 06:50:27 -0000 On Apr 24, 2005, at 11:37 PM, M. Warner Losh wrote: > In message: > Marcel Moolenaar writes: > : > : On Apr 24, 2005, at 10:49 PM, M. Warner Losh wrote: > : > : > In message: <200504250459.j3P4xWxs057683@repoman.freebsd.org> > : > Marcel Moolenaar writes: > : > : http://perforce.freebsd.org/chv.cgi?CH=75921 > : > : > : > : Change 75921 by marcel@marcel_nfs on 2005/04/25 04:59:01 > : > : > : > : Allow VGA resources across PCI-PCI bridges. Required to > : > : support a PCI based VGA driver with the VGA hardware > : > : behind a PCI-PCI bridge. > : > > : > WE need to make sure that the ISA bit and VGA bits are set > properly on > : > those bridges with vga children and peers of bridges with vga > : > children before allowing this... > : > : Ideally, yes. But since only one PCI device of class display and > : subclass VGA can have the legacy VGA addresses enabled and we're > : not mucking with the system configuration in that respect, we're > : not really doing anything dangerous by allowing the VGA addresses > : without such scrutiny provided we don't try to allocate those > : addresses for any ol' VGA display device that we find on the PCI > : busses in the system. > > Actually yes, really, we need to do this. Most system BIOSes will get > it right, but not all. I think that means we already have problems with syscons(4) then on those machines, right? I mean, syscons just peeks and pokes at the addresses and if it gets something it expects, then there's a VGA device. Allowing VGA addresses across PCI-PCI bridge devices yields exactly the same: some newbusified driver starts to peek and poke at the VGA addresses and if it gets something it expects, then the device can attach. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Mon Apr 25 14:39:28 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD3C116A4D0; Mon, 25 Apr 2005 14:39:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6BD0B16A4CE for ; Mon, 25 Apr 2005 14:39:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 388C843D39 for ; Mon, 25 Apr 2005 14:39:27 +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 j3PEdRxv002271 for ; Mon, 25 Apr 2005 14:39:27 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3PEdQ0n002268 for perforce@freebsd.org; Mon, 25 Apr 2005 14:39:26 GMT (envelope-from areisse@nailabs.com) Date: Mon, 25 Apr 2005 14:39:26 GMT Message-Id: <200504251439.j3PEdQ0n002268@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 Subject: PERFORCE change 75946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 14:39:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=75946 Change 75946 by areisse@areisse_ibook on 2005/04/25 14:38:32 Support for automatic enforcement of protections (as specified in a msgh_av trailer) in the server stubs. To use this feature, put "checkaccess" between the routine name and argument list. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/lexxer.l#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/parser.y#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.h#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/server.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/lexxer.l#3 (text+ko) ==== @@ -125,6 +125,7 @@ [Rr][Oo][Uu][Tt][Ii][Nn][Ee] RETURN(syRoutine); [Ss][Ii][Mm][Pp][Ll][Ee][Rr][Oo][Uu][Tt][Ii][Nn][Ee] RETURN(sySimpleRoutine); +[Cc][Hh][Ee][Cc][Kk][Aa][Cc][Cc][Ee][Ss][Ss] RETURN(syCheckAccess); [Ss][Uu][Bb][Ss][Yy][Ss][Tt][Ee][Mm] RETURN(sySubsystem); [Mm][Ss][Gg][Oo][Pp][Tt][Ii][Oo][Nn] RETURN(syMsgOption); [Mm][Ss][Gg][Ss][Ee][Qq][Nn][Oo] RETURN(syMsgSeqno); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/parser.y#3 (text+ko) ==== @@ -50,6 +50,7 @@ %token sySkip %token syRoutine %token sySimpleRoutine +%token syCheckAccess %token sySubsystem %token syKernelUser @@ -154,6 +155,7 @@ %type Direction TrImplKeyword %type Argument Trailer Arguments ArgumentList %type IPCFlags +%type RoutineFlags %{ @@ -613,12 +615,18 @@ | SimpleRoutine { $$ = $1; } ; -Routine : syRoutine syIdentifier Arguments - { $$ = rtMakeRoutine($2, $3); } +Routine : syRoutine syIdentifier RoutineFlags Arguments + { $$ = rtMakeRoutine($2, $4, $3); } + ; + +SimpleRoutine : sySimpleRoutine syIdentifier RoutineFlags Arguments + { $$ = rtMakeSimpleRoutine($2, $4); } ; -SimpleRoutine : sySimpleRoutine syIdentifier Arguments - { $$ = rtMakeSimpleRoutine($2, $3); } +RoutineFlags : syCheckAccess + { $$ = 1; } + | + { $$ = 0; } ; Arguments : syLParen syRParen ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.c#3 (text+ko) ==== @@ -76,6 +76,7 @@ new->rtErrorName = strNULL; new->rtUserName = strNULL; new->rtServerName = strNULL; + new->rtCheckAccess = FALSE; return new; } @@ -135,15 +136,17 @@ } routine_t * -rtMakeRoutine(name, args) +rtMakeRoutine(name, args, flags) identifier_t name; argument_t *args; + int flags; { register routine_t *rt = rtAlloc(); rt->rtName = name; rt->rtKind = rkRoutine; rt->rtArgs = args; + rt->rtCheckAccess = flags; return rt; } @@ -1495,7 +1498,7 @@ boolean_t sectoken = FALSE; boolean_t audittoken = FALSE; boolean_t msglabels = FALSE; - boolean_t msgav = FALSE; + boolean_t msgav = rt->rtCheckAccess; for (arg = rt->rtArgs; arg != argNULL; arg = arg->argNext) if (akCheckAll(arg->argKind, akbReturn|akbUserImplicit)) { ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.h#3 (text+ko) ==== @@ -416,6 +416,7 @@ boolean_t rtSimpleRequest; boolean_t rtSimpleReply; + boolean_t rtCheckAccess; u_int rtNumRequestVar; /* number of variable/inline args in request */ u_int rtNumReplyVar; /* number of variable/inline args in reply */ ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/server.c#3 (text+ko) ==== @@ -1484,6 +1484,12 @@ ipc_type_t *it = arg->argType; boolean_t NeedClose = FALSE; + if (rt->rtCheckAccess) { + unsigned int ave = rt->rtNumber; + fprintf(file, "\tif (TrailerP->msgh_av.av[%d] & %d) {\n", + ave >> 5, 1 << (ave & 0x1f)); + } + fprintf(file, "\t"); if (akCheck(arg->argKind, akbVarNeeded)) fprintf(file, "%s = ", arg->argMsgField); @@ -1498,6 +1504,9 @@ if (NeedClose) fprintf(file, ")"); fprintf(file, ");\n"); + + if (rt->rtCheckAccess) + fprintf(file, "\t} else\n\t OutP->%s = KERN_NO_ACCESS;\n", arg->argMsgField); } static void From owner-p4-projects@FreeBSD.ORG Mon Apr 25 20:07:13 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA04616A4D0; Mon, 25 Apr 2005 20:07:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A21816A4CE for ; Mon, 25 Apr 2005 20:07:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D01F43D58 for ; Mon, 25 Apr 2005 20:07: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 j3PK7CIU028687 for ; Mon, 25 Apr 2005 20:07:12 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3PK7CVN028684 for perforce@freebsd.org; Mon, 25 Apr 2005 20:07:12 GMT (envelope-from areisse@nailabs.com) Date: Mon, 25 Apr 2005 20:07:12 GMT Message-Id: <200504252007.j3PK7CVN028684@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 Subject: PERFORCE change 75966 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 20:07:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=75966 Change 75966 by areisse@areisse_ibook on 2005/04/25 20:06:16 A routine with the checkaccess flag needs a trailer. The return code isn't always in the out structure. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/server.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/routine.c#4 (text+ko) ==== @@ -1819,7 +1819,8 @@ if (mig_errors > 0) fatal("%d errors found. Abort.\n", mig_errors); - rt->rtServerImpl = rtCountMask(rt->rtArgs, akbServerImplicit); + rt->rtServerImpl = rtCountMask(rt->rtArgs, akbServerImplicit) + + rt->rtCheckAccess; rt->rtUserImpl = rtCountMask(rt->rtArgs, akbUserImplicit); /* * ASSUMPTION: ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/server.c#4 (text+ko) ==== @@ -1506,7 +1506,9 @@ fprintf(file, ");\n"); if (rt->rtCheckAccess) - fprintf(file, "\t} else\n\t OutP->%s = KERN_NO_ACCESS;\n", arg->argMsgField); + fprintf(file, "\t} else\n\t %s%s = KERN_NO_ACCESS;\n", + akCheck(arg->argKind, akbVarNeeded) ? "" : "OutP->", + arg->argMsgField); } static void From owner-p4-projects@FreeBSD.ORG Mon Apr 25 22:51:32 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 681E416A4D0; Mon, 25 Apr 2005 22:51:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 282DF16A4CE for ; Mon, 25 Apr 2005 22:51:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E19F343D1F for ; Mon, 25 Apr 2005 22:51:31 +0000 (GMT) (envelope-from davidxu@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 j3PMpVqH042970 for ; Mon, 25 Apr 2005 22:51:31 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3PMpVYp042967 for perforce@freebsd.org; Mon, 25 Apr 2005 22:51:31 GMT (envelope-from davidxu@freebsd.org) Date: Mon, 25 Apr 2005 22:51:31 GMT Message-Id: <200504252251.j3PMpVYp042967@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75974 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 22:51:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=75974 Change 75974 by davidxu@davidxu_tiger on 2005/04/25 22:50:52 pickup sysenter work. Affected files ... .. //depot/projects/davidxu_thread/src/sys/i386/i386/genassym.c#4 edit .. //depot/projects/davidxu_thread/src/sys/i386/i386/swtch.s#3 edit .. //depot/projects/davidxu_thread/src/sys/i386/include/pcpu.h#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/i386/i386/genassym.c#4 (text+ko) ==== @@ -71,6 +71,7 @@ #endif #include #include +#include #include #include #include @@ -133,6 +134,7 @@ ASSYM(PCB_PSL, offsetof(struct pcb, pcb_psl)); ASSYM(PCB_DBREGS, PCB_DBREGS); ASSYM(PCB_EXT, offsetof(struct pcb, pcb_ext)); +ASSYM(PCB_EXT_TSS_ESP0, offsetof(struct pcb_ext, ext_tss.tss_esp0)); ASSYM(PCB_FSD, offsetof(struct pcb, pcb_fsd)); ASSYM(PCB_VM86, offsetof(struct pcb, pcb_vm86)); @@ -198,6 +200,7 @@ ASSYM(PC_CURRENTLDT, offsetof(struct pcpu, pc_currentldt)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); +ASSYM(PC_SYSENTER_TSS_ESP0, offsetof(struct pcpu, pc_sysenter_tss_esp0)); #ifdef DEV_APIC ASSYM(LA_VER, offsetof(struct LAPIC, version)); ==== //depot/projects/davidxu_thread/src/sys/i386/i386/swtch.s#3 (text+ko) ==== @@ -199,6 +199,8 @@ je 1f /* If not, use the default */ btsl %esi, private_tss /* mark use of private tss */ movl PCB_EXT(%edx), %edi /* new tss descriptor */ + movl PCB_EXT_TSS_ESP0(%edi), %ebx + movl %ebx, PCPU(SYSENTER_TSS_ESP0) jmp 2f /* Load it up */ 1: /* @@ -208,6 +210,7 @@ */ leal -16(%edx), %ebx /* leave space for vm86 */ movl %ebx, PCPU(COMMON_TSS) + TSS_ESP0 + movl %ebx, PCPU(SYSENTER_TSS_ESP0) /* * Test this CPU's bit in the bitmap to see if this ==== //depot/projects/davidxu_thread/src/sys/i386/include/pcpu.h#5 (text+ko) ==== @@ -54,7 +54,8 @@ struct segment_descriptor *pc_fsgs_gdt; \ int pc_currentldt; \ u_int pc_acpi_id; \ - u_int pc_apic_id + u_int pc_apic_id; \ + u_int pc_sysenter_tss_esp0 #if defined(lint) From owner-p4-projects@FreeBSD.ORG Mon Apr 25 23:58:55 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 426D016A4D0; Mon, 25 Apr 2005 23:58:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D976816A4CE for ; Mon, 25 Apr 2005 23:58:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC2A143D39 for ; Mon, 25 Apr 2005 23:58:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3PNwsUr045480 for ; Mon, 25 Apr 2005 23:58:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3PNwsrP045475 for perforce@freebsd.org; Mon, 25 Apr 2005 23:58:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Apr 2005 23:58:54 GMT Message-Id: <200504252358.j3PNwsrP045475@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 Subject: PERFORCE change 75979 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 23:58:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=75979 Change 75979 by rwatson@rwatson_paprika on 2005/04/25 23:57:55 Prefer -Wall. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile#5 (text+ko) ==== @@ -9,7 +9,8 @@ CFLAGS+=-I- \ -I .. \ - -I . + -I . \ + -Wall SRCS= bsm_audit.c \ bsm_class.c \ From owner-p4-projects@FreeBSD.ORG Tue Apr 26 00:01:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DBFE16A4D0; Tue, 26 Apr 2005 00:01:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A42816A4CE for ; Tue, 26 Apr 2005 00:01:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD82843D48 for ; Tue, 26 Apr 2005 00:01:58 +0000 (GMT) (envelope-from davidxu@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 j3Q01wJY045642 for ; Tue, 26 Apr 2005 00:01:58 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3Q01wqM045639 for perforce@freebsd.org; Tue, 26 Apr 2005 00:01:58 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 26 Apr 2005 00:01:58 GMT Message-Id: <200504260001.j3Q01wqM045639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 75980 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 00:01:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=75980 Change 75980 by davidxu@davidxu_tiger on 2005/04/26 00:01:10 add descriptor id UCSEL, UDSEL. Affected files ... .. //depot/projects/davidxu_thread/src/sys/i386/i386/genassym.c#5 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/i386/i386/genassym.c#5 (text+ko) ==== @@ -215,6 +215,8 @@ ASSYM(KCSEL, GSEL(GCODE_SEL, SEL_KPL)); ASSYM(KDSEL, GSEL(GDATA_SEL, SEL_KPL)); ASSYM(KPSEL, GSEL(GPRIV_SEL, SEL_KPL)); +ASSYM(UCSEL, GSEL(GUCODE_SEL, SEL_UPL)); +ASSYM(UDSEL, GSEL(GUDATA_SEL, SEL_UPL)); ASSYM(BC32SEL, GSEL(GBIOSCODE32_SEL, SEL_KPL)); ASSYM(GPROC0_SEL, GPROC0_SEL); From owner-p4-projects@FreeBSD.ORG Tue Apr 26 00:54:03 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF63916A4D1; Tue, 26 Apr 2005 00:54:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9FB2216A4CE for ; Tue, 26 Apr 2005 00:54:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 254FD43D5F for ; Tue, 26 Apr 2005 00:54:02 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3Q0s2QK054355 for ; Tue, 26 Apr 2005 00:54:02 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3Q0s1cn054352 for perforce@freebsd.org; Tue, 26 Apr 2005 00:54:01 GMT (envelope-from wsalamon@computer.org) Date: Tue, 26 Apr 2005 00:54:01 GMT Message-Id: <200504260054.j3Q0s1cn054352@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 75983 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 00:54:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=75983 Change 75983 by wsalamon@rickenbacker on 2005/04/26 00:53:35 Update the auditon man page with info on the types of data that are passed for each command. Fix a few other nits. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/auditon.2#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/auditon.2#3 (text+ko) ==== @@ -1,6 +1,7 @@ .\"- .\" Copyright (c) 2005 Robert N. M. Watson .\" Copyright (c) 2005 Tom Rhodes +.\" Copyright (c) 2005 Wayne J. Salamon .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -51,6 +52,9 @@ .Bl -tag -width ".It Dv A_GETPINFO_ADDR" .It Dv A_SETPOLICY Set audit policy flags. +.Ft *data +must point to an long value set to one of the audit +policy control values defined in audit.h. Currently, only .Dv AUDIT_CNT and @@ -70,16 +74,26 @@ Return .Er ENOSYS . .It Dv A_SETKMASK -Set the kernel preselection mask to the data stored in the class mask. -This mask is used for non-attributable audit event preselection. +Set the kernel preselection masks (success and failure). +.Ft *data +must point to a +.Ft au_mask_t +structure containing the mask values. +These masks are used for non-attributable audit event preselection. .It Dv A_SETQCTRL -Set the kernel audit queue control parameters to their minimum or -maximum values in +Set kernel audit queue parameters. +.Ft *data +must point to a +.Ft au_qctrl_t +structure containing the +kernel audit queue control settings: .Va high water , .Va low water , .Va output buffer size , +.Va percent min free disk space , and -.Em delay . +.Em delay +(not currently used). .It Dv A_SETSTAT Return .Er ENOSYS . @@ -90,36 +104,95 @@ Return .Er ENOSYS . .It Dv A_SETCOND -Toggle audit record generation to on or off values. +Set the current auditing condition. +.Ft *data +must point to an long value containing the new +audit condition, one of +.Dv AUC_AUDITING , +.Dv AUC_NOAUDIT , +or +.Dv AUC_DISABLED . .It Dv A_SETCLASS -Set the event class preselection mask for the designated audit event. +Set the event class preselection mask for an audit event. +.Ft *data +must point to a +.Ft au_evclass_map_t +structure containing the audit event and mask. .It Dv A_SETPMASK -Set the given process's audit selection masks for both -success and failure. +Set the preselection masks for a process. +.Ft *data +must point to a +.Ft auditpinfo_t +structure that contains the given process's audit +preselection masks for both success and failure. .It Dv A_SETFSIZE Set the maximum size of the audit log file. +.Ft *data +must point to a +.Ft au_fstat_t +structure with the +.Ft af_filesz +field set to the maximum audit log file size. A value of 0 +indicates no limit to the size. .It Dv A_SETKAUDIT Return .Er ENOSYS . .It Dv A_GETCLASS Return the event to class mapping for the designated audit event. +.Ft *data +must point to a +.Ft au_evclass_map_t +structure. .It Dv A_GETKAUDIT Return .Er ENOSYS . .It Dv A_GETPINFO -Return the audit ID, preselection mask, terminal ID, and audit session -ID of the specified process. +Return the audit settings for a process. +.Ft *data +must point to a +.Ft auditpinfo_t +structure which will be set to contain +the audit ID, preselection mask, terminal ID, and audit session +ID of the given process. .It Dv A_GETPINFO_ADDR Return .Er ENOSYS . .It Dv A_GETKMASK -Return the current kernel preselection mask for non-attributable mask. +Return the current kernel preselection masks. +.Ft *data +must point to a +.Ft au_mask_t +structure which will be set to +the current kernel preselection masks for non-attributable events. .It Dv A_GETPOLICY -Get the current audit policy flags. +Return the current audit policy setting. +.Ft *data +must point to an long value which will be set to +one of the current audit policy flags. +Currently, only +.Dv AUDIT_CNT +and +.Dv AUDIT_AHLT +are implemented. .It Dv A_GETQCTRL -Return the kernel audit queue control parameters. -.It Dv A_SETQCTRL -Set the kernel audit queue control parameters. +Return the current kernel audit queue control parameters. +.Ft *data +must point to a +.Ft au_qctrl_t +structure which will be set to the current +kernel audit queue control parameters. +.It Dv A_GETFSIZE +Returns the maximum size of the audit log file. +.Ft *data +must point to a +.Ft au_fstat_t +structure. The +.Ft af_filesz +field will set to the maximum audit log file size. A value of 0 +indicates no limit to the size. +The +.Ft af_filesz +will be set to the current audit log file size. .It Dv A_GETCWD .\" [COMMENTED OUT]: Valid description, not yet implemented. .\" Return the current working directory as stored in the audit subsystem. @@ -137,8 +210,13 @@ Return .Er ENOSYS . .It Dv A_GETCOND -Return -.Er ENOSYS . +Return the current auditing condition. +.Ft *data +must point to an long value which will be set to +the current audit condition, either +.Dv AUC_AUDITING +or +.Dv AUC_NOAUDIT . .El .Sh RETURN VALUES .Rv -std @@ -177,14 +255,17 @@ stream format were defined by Sun Microsystems. .Pp This manual page was written by -.An Tom Rhodes Aq trhodes@FreeBSD.org . +.An Tom Rhodes Aq trhodes@FreeBSD.org , +.An Robert Watson Aq rwatson@FreeBSD.org , +and +.An Wayne Salamon Aq wsalamon@FreeBSD.org . .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security -division of McAfee Inc., under contract to Apple Computer Inc. in 1994. +division of McAfee Inc., under contract to Apple Computer Inc. in 2003. It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Pp The -.Fn audit +.Fn auditon function first appeared in .Fx 6.0 . From owner-p4-projects@FreeBSD.ORG Tue Apr 26 11:22:42 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79C3716A4D0; Tue, 26 Apr 2005 11:22:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B6FC16A4CE for ; Tue, 26 Apr 2005 11:22:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 243CF43D1D for ; Tue, 26 Apr 2005 11:22:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3QBMgoQ095652 for ; Tue, 26 Apr 2005 11:22:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3QBMcOj095648 for perforce@freebsd.org; Tue, 26 Apr 2005 11:22:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 26 Apr 2005 11:22:38 GMT Message-Id: <200504261122.j3QBMcOj095648@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 Subject: PERFORCE change 75997 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 11:22:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=75997 Change 75997 by rwatson@rwatson_paprika on 2005/04/26 11:22:22 Make sure to properly initialize 'retval' for the success case when writing an audit record to a buffer. Remove unused 'dptr', frobbing the internals of records occurs only in au_assemble() now. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#8 (text+ko) ==== @@ -259,7 +259,6 @@ int au_close(int d, int keep, short event) { au_record_t *rec; - u_char *dptr; size_t tot_rec_size; int retval = 0; @@ -322,6 +321,7 @@ return (-1); } + retval = 0; tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; if ((tot_rec_size > MAX_AUDIT_RECORD_SIZE) || (tot_rec_size > *buflen)) { From owner-p4-projects@FreeBSD.ORG Tue Apr 26 11:23:44 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56EBB16A4D0; Tue, 26 Apr 2005 11:23:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CECB16A4CE for ; Tue, 26 Apr 2005 11:23:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8CF243D55 for ; Tue, 26 Apr 2005 11:23:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3QBNhmQ095690 for ; Tue, 26 Apr 2005 11:23:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3QBNh0l095687 for perforce@freebsd.org; Tue, 26 Apr 2005 11:23:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 26 Apr 2005 11:23:43 GMT Message-Id: <200504261123.j3QBNh0l095687@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 Subject: PERFORCE change 75998 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 11:23:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=75998 Change 75998 by rwatson@rwatson_paprika on 2005/04/26 11:22:53 Include to get the definition of strerror(). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#5 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Tue Apr 26 11:45:18 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B84E816A4D0; Tue, 26 Apr 2005 11:45:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 833CD16A4CE for ; Tue, 26 Apr 2005 11:45:17 +0000 (GMT) Received: from mail23.sea5.speakeasy.net (mail23.sea5.speakeasy.net [69.17.117.25]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3389043D5E for ; Tue, 26 Apr 2005 11:45:17 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 12320 invoked from network); 26 Apr 2005 11:45:17 -0000 Received: from server.baldwin.cx ([216.27.160.63]) (envelope-sender )AES256-SHA encrypted SMTP for ; 26 Apr 2005 11:45:15 -0000 Received: from [192.168.0.15] (osx.baldwin.cx [192.168.0.15]) (authenticated bits=0) by server.baldwin.cx (8.13.1/8.13.1) with ESMTP id j3QBj1Tn031778; Tue, 26 Apr 2005 07:45:01 -0400 (EDT) (envelope-from jhb@FreeBSD.org) In-Reply-To: <200504171042.j3HAgeTQ054345@repoman.freebsd.org> References: <200504171042.j3HAgeTQ054345@repoman.freebsd.org> Mime-Version: 1.0 (Apple Message framework v622) Content-Type: text/plain; charset=US-ASCII; format=flowed Message-Id: <87f1dd37c46f5e61c68035b9989ae5b7@FreeBSD.org> Content-Transfer-Encoding: 7bit From: John Baldwin Date: Tue, 26 Apr 2005 07:45:01 -0400 To: David Xu X-Mailer: Apple Mail (2.622) X-Spam-Status: No, score=-2.8 required=4.2 tests=ALL_TRUSTED autolearn=failed version=3.0.2 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 75366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 11:45:18 -0000 On Apr 17, 2005, at 6:42 AM, David Xu wrote: > http://perforce.freebsd.org/chv.cgi?CH=75366 > > Change 75366 by davidxu@davidxu_alona on 2005/04/17 10:42:05 > > Implement cpu_set_user_tls for sparc64. > > Affected files ... > > .. > //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#6 > edit > > Differences ... > > ==== > //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#6 > (text+ko) ==== > > @@ -194,6 +194,15 @@ > td->td_retval[1] = tf->tf_out[1]; > } > > +void > +cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, > + int tls_seg __unused) > +{ > + if (td == curthread) > + flushw(); > + td->td_frame->tf_global[7] = tls_base; > +} > + I think for at least this one and Alpha you might want a critical section in the curthread case like you do on i386 and amd64 since calling the Alpha PAL and setting tls_base + flushw() are more than one instruction long. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Tue Apr 26 11:54:53 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 823A716A4D0; Tue, 26 Apr 2005 11:54:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4DEB016A4CE for ; Tue, 26 Apr 2005 11:54:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6DC943D5E for ; Tue, 26 Apr 2005 11:54:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3QBsqbn096962 for ; Tue, 26 Apr 2005 11:54:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3QBsqGQ096959 for perforce@freebsd.org; Tue, 26 Apr 2005 11:54:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 26 Apr 2005 11:54:52 GMT Message-Id: <200504261154.j3QBsqGQ096959@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 Subject: PERFORCE change 76000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 11:54:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=76000 Change 76000 by rwatson@rwatson_paprika on 2005/04/26 11:53:52 Convert libbsm to using big endian (network byte order) file format, in order to improve audit trail format portability. In general, rely on the sys/endian.h macros, which may have to be bundled with OpenBSM for some platforms. - Modify ADD_*() macros to use be{16,32,64}enc(). - Replace most use of READ_TOKEN_BYTES() with more specific access macros so that we know what conversion to perform as we read. This change needs close review to make sure I didn't botch the largely mechanical conversion. - When parsing record fields in au_read_rec(), return EINVAL via errno when returning (-1) in currently under-handled cases. Call be32enc() manually when re-pushing the record size back into the buffer for a token. - Comment that we might need to investigate how to handle IP headers more properly when encoding them. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#5 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#3 (text+ko) ==== @@ -1,7 +1,9 @@ /* * @APPLE_LICENSE_HEADER_START@ * - * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. + * Copyright (c) 1999-2004 Apple Computer, Inc. + * Copyright (c) 2005 Robert N. M. Watson + * All Rights Reserved. * * This file contains Original Code and/or Modifications of Original Code * as defined in and that are subject to the Apple Public Source License @@ -42,6 +44,11 @@ #define BSM_HEADER_SIZE 18 #define BSM_TRAILER_SIZE 7 +/* + * BSM token streams store fields in big endian byte order, so as to be + * portable; when encoding and decoding, we must convert byte orders for + * typed values. + */ #define ADD_U_CHAR(loc, val) \ do { \ *loc = val; \ @@ -51,19 +58,19 @@ #define ADD_U_INT16(loc, val) \ do { \ - memcpy(loc, (u_char *)&val, sizeof(u_int16_t)); \ + be16enc(loc, val); \ loc += sizeof(u_int16_t); \ } while(0) #define ADD_U_INT32(loc, val) \ do { \ - memcpy(loc, (u_char *)&val, sizeof(u_int32_t)); \ + be32enc(loc, val); \ loc += sizeof(u_int32_t); \ } while(0) #define ADD_U_INT64(loc, val) \ do { \ - memcpy(loc, (u_char *)&val, sizeof(u_int64_t)); \ + be64enc(loc, val); \ loc += sizeof(u_int64_t); \ } while(0) ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#5 (text+ko) ==== @@ -1,5 +1,7 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2005 Robert N. M. Watson + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,17 +28,20 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include +#include +#include +#include + #include #include #include +#include #include #include #include #include #include -#include -#include -#include #include #include @@ -55,7 +60,38 @@ }\ } while(0) +#define READ_TOKEN_U_CHAR(buf, len, dest, bytesread, err) do { \ + if (bytesread + sizeof(u_char) <= len) { \ + dest = buf[bytesread]; \ + bytesread += sizeof(u_char); \ + } else \ + err = 1; \ +} while (0) + +#define READ_TOKEN_U_INT16(buf, len, dest, bytesread, err) do { \ + if (bytesread + sizeof(u_int16_t) <= len) { \ + dest = be16dec(buf + bytesread); \ + bytesread += sizeof(u_int16_t); \ + } else \ + err = 1; \ +} while (0) +#define READ_TOKEN_U_INT32(buf, len, dest, bytesread, err) do { \ + if (bytesread + sizeof(u_int32_t) <= len) { \ + dest = be32dec(buf + bytesread); \ + bytesread += sizeof(u_int32_t); \ + } else \ + err = 1; \ +} while (0) + +#define READ_TOKEN_U_INT64(buf, len, dest, bytesread, err) do { \ + if (bytesread + sizeof(u_int64_t) <= len) { \ + dest = be64dec(buf + bytesread); \ + bytesread += sizeof(u_int64_t); \ + } else \ + err = 1; \ +} while (0) + #define SET_PTR(buf, len, ptr, size, bytesread, err) \ do {\ if(bytesread + size > len) {\ @@ -362,38 +398,32 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &(tok->tt.hdr32.size), - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.hdr32.size, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.hdr32.version, - sizeof(u_char), tok->len, err); + READ_TOKEN_U_CHAR(buf, len, tok->tt.hdr32.version, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.hdr32.e_type, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.hdr32.e_type, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.hdr32.e_mod, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.hdr32.e_mod, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.hdr32.s, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.hdr32.s, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.hdr32.ms, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.hdr32.ms, tok->len, err); if(err) { return -1; } @@ -427,14 +457,12 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.trail.magic, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.trail.magic, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.trail.count, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.trail.count, tok->len, err); if(err) { return -1; } @@ -460,20 +488,17 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.arg32.no, - sizeof(u_char), tok->len, err); + READ_TOKEN_U_CHAR(buf, len, tok->tt.arg32.no, tok->len, err); if(err) { return -1; } - - READ_TOKEN_BYTES(buf, len, &tok->tt.arg32.val, - sizeof(u_int32_t), tok->len, err); + + READ_TOKEN_U_INT32(buf, len, tok->tt.arg32.val, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.arg32.len, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.arg32.len, tok->len, err); if(err) { return -1; } @@ -503,20 +528,17 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.arg64.no, - sizeof(u_char), tok->len, err); + READ_TOKEN_U_CHAR(buf, len, tok->tt.arg64.no, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.arg64.val, - sizeof(u_int64_t), tok->len, err); + READ_TOKEN_U_INT64(buf, len, tok->tt.arg64.val, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.arg64.len, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.arg64.len, tok->len, err); if(err) { return -1; } @@ -553,18 +575,15 @@ int err = 0; int datasize; - READ_TOKEN_BYTES(buf, len, &tok->tt.arb.howtopr, - sizeof(u_char), tok->len, err); + READ_TOKEN_U_CHAR(buf, len, tok->tt.arb.howtopr, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.arb.bu, - sizeof(u_char), tok->len, err); + READ_TOKEN_U_CHAR(buf, len, tok->tt.arb.bu, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.arb.uc, - sizeof(u_char), tok->len, err); + READ_TOKEN_U_CHAR(buf, len, tok->tt.arb.uc, tok->len, err); if(err) { return -1; } @@ -688,38 +707,32 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.attr32.mode, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.attr32.mode, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.attr32.uid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.attr32.uid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.attr32.gid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.attr32.gid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.attr32.fsid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.attr32.fsid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.attr32.nid, - sizeof(u_int64_t), tok->len, err); + READ_TOKEN_U_INT64(buf, len, tok->tt.attr32.nid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.attr32.dev, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.attr32.dev, tok->len, err); if(err) { return -1; } @@ -753,14 +766,12 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.exit.status, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.exit.status, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.exit.ret, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.exit.ret, tok->len, err); if(err) { return -1; } @@ -788,8 +799,7 @@ int i; char *bptr; - READ_TOKEN_BYTES(buf, len, &tok->tt.execarg.count, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.execarg.count, tok->len, err); if(err) { return -1; } @@ -834,8 +844,7 @@ int i; char *bptr; - READ_TOKEN_BYTES(buf, len, &tok->tt.execenv.count, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.execenv.count, tok->len, err); if(err) { return -1; } @@ -878,20 +887,17 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.file.s, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.file.s, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.file.ms, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.file.ms, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.file.len, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.file.len, tok->len, err); if(err) { return -1; } @@ -925,19 +931,17 @@ int i; int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.grps.no, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.grps.no, tok->len, err); if(err) { return -1; } for(i = 0; itt.grps.no; i++) { - - READ_TOKEN_BYTES(buf, len, &tok->tt.grps.list[i], - sizeof(u_int32_t), tok->len, err); - if(err) { - return -1; - } + READ_TOKEN_U_INT32(buf, len, tok->tt.grps.list[i], tok->len, + err); + if(err) { + return -1; + } } return 0; @@ -962,8 +966,7 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.inaddr.addr, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.inaddr.addr, tok->len, err); if(err) { return -1; } @@ -989,23 +992,22 @@ int err = 0; int i; - READ_TOKEN_BYTES(buf, len, &tok->tt.inaddr_ex.type, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.inaddr_ex.type, tok->len, err); if(err) { return -1; } if(tok->tt.inaddr_ex.type == AF_INET) { - READ_TOKEN_BYTES(buf, len, &tok->tt.inaddr_ex.addr[0], - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.inaddr_ex.addr[0], + tok->len, err); if(err) { return -1; } } else if (tok->tt.inaddr_ex.type == AF_INET6) { for(i = 0; i < 4; i++) { - READ_TOKEN_BYTES(buf, len, &tok->tt.inaddr_ex.addr[i], - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.inaddr_ex.addr[i], + tok->len, err); if(err) { return -1; } @@ -1033,62 +1035,52 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.ip.version, - sizeof(u_char), tok->len, err); + READ_TOKEN_U_CHAR(buf, len, tok->tt.ip.version, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ip.tos, - sizeof(u_char), tok->len, err); + READ_TOKEN_U_CHAR(buf, len, tok->tt.ip.tos, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ip.len, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.ip.len, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ip.id, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.ip.id, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ip.offset, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.ip.offset, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ip.ttl, - sizeof(u_char), tok->len, err); + READ_TOKEN_U_CHAR(buf, len, tok->tt.ip.ttl, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ip.prot, - sizeof(u_char), tok->len, err); + READ_TOKEN_U_CHAR(buf, len, tok->tt.ip.prot, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ip.chksm, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.ip.chksm, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ip.src, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.ip.src, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ip.dest, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.ip.dest, tok->len, err); if(err) { return -1; } @@ -1130,14 +1122,12 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.ipc.type, - sizeof(u_char), tok->len, err); + READ_TOKEN_U_CHAR(buf, len, tok->tt.ipc.type, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ipc.id, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.ipc.id, tok->len, err); if(err) { return -1; } @@ -1168,44 +1158,37 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.ipcperm.uid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.ipcperm.uid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ipcperm.gid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.ipcperm.gid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ipcperm.puid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.ipcperm.puid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ipcperm.pgid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.ipcperm.pgid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ipcperm.mode, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.ipcperm.mode, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ipcperm.seq, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.ipcperm.seq, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ipcperm.key, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.ipcperm.key, tok->len, err); if(err) { return -1; } @@ -1240,8 +1223,7 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.iport.port, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.iport.port, tok->len, err); if(err) { return -1; } @@ -1265,8 +1247,7 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.opaque.size, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.opaque.size, tok->len, err); if(err) { return -1; } @@ -1297,8 +1278,7 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.path.len, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.path.len, tok->len, err); if(err) { return -1; } @@ -1336,56 +1316,47 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32.auid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32.auid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32.euid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32.euid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32.egid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32.egid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32.ruid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32.ruid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32.rgid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32.rgid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32.pid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32.pid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32.sid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32.sid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32.tid.port, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32.tid.port, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32.tid.addr, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32.tid.addr, tok->len, err); if(err) { return -1; } @@ -1422,71 +1393,64 @@ int err = 0; int i; - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32_ex.auid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32_ex.auid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32_ex.euid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32_ex.euid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32_ex.egid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32_ex.egid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32_ex.ruid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32_ex.ruid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32_ex.rgid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32_ex.rgid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32_ex.pid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32_ex.pid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32_ex.sid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32_ex.sid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32_ex.tid.port, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32_ex.tid.port, tok->len, + err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32_ex.tid.type, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32_ex.tid.type, tok->len, + err); if(err) { return -1; } if(tok->tt.proc32_ex.tid.type == AF_INET) { - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32_ex.tid.addr[0], - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.proc32_ex.tid.addr[0], + tok->len, err); if(err) { return -1; } } else if (tok->tt.proc32_ex.tid.type == AF_INET6) { for(i = 0; i < 4; i++) { - READ_TOKEN_BYTES(buf, len, &tok->tt.proc32_ex.tid.addr[i], - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, + tok->tt.proc32_ex.tid.addr[i], tok->len, err); if(err) { return -1; } @@ -1531,14 +1495,12 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.ret32.status, - sizeof(u_char), tok->len, err); + READ_TOKEN_U_CHAR(buf, len, tok->tt.ret32.status, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ret32.ret, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.ret32.ret, tok->len, err); if(err) { return -1; } @@ -1560,14 +1522,12 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.ret64.err, - sizeof(u_char), tok->len, err); + READ_TOKEN_U_CHAR(buf, len, tok->tt.ret64.err, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.ret64.val, - sizeof(u_int64_t), tok->len, err); + READ_TOKEN_U_INT64(buf, len, tok->tt.ret64.val, tok->len, err); if(err) { return -1; } @@ -1592,8 +1552,7 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.seq.seqno, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.seq.seqno, tok->len, err); if(err) { return -1; } @@ -1620,20 +1579,18 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet32.family, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet32.family, tok->len, + err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet32.port, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet32.port, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet32.addr, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.sockinet32.addr, tok->len, err); if(err) { return -1; } @@ -1661,8 +1618,7 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.sockunix.family, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.sockunix.family, tok->len, err); if(err) { return -1; } @@ -1696,28 +1652,23 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.socket.type, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.socket.type, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.socket.l_port, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.socket.l_port, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.socket.l_addr, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.socket.l_addr, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.socket.r_port, - sizeof(u_int16_t), tok->len, err); + READ_TOKEN_U_INT16(buf, len, tok->tt.socket.r_port, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.socket.r_addr, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.socket.r_addr, tok->len, err); if(err) { return -1; } @@ -1756,56 +1707,47 @@ { int err = 0; - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32.auid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32.auid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32.euid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32.euid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32.egid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32.egid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32.ruid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32.ruid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32.rgid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32.rgid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32.pid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32.pid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32.sid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32.sid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32.tid.port, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32.tid.port, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32.tid.addr, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32.tid.addr, tok->len, err); if(err) { return -1; } @@ -1855,71 +1797,64 @@ int err = 0; int i; - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32_ex.auid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32_ex.auid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32_ex.euid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32_ex.euid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32_ex.egid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32_ex.egid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32_ex.ruid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32_ex.ruid, tok->len, err); if(err) { return -1; } - READ_TOKEN_BYTES(buf, len, &tok->tt.subj32_ex.rgid, - sizeof(u_int32_t), tok->len, err); + READ_TOKEN_U_INT32(buf, len, tok->tt.subj32_ex.rgid, tok->len, err); if(err) { return -1; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 26 13:36:11 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6251B16A4D0; Tue, 26 Apr 2005 13:36:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB7B316A4CE; Tue, 26 Apr 2005 13:36:10 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1A5643D4C; Tue, 26 Apr 2005 13:36:10 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from [127.0.0.1] (davidxu@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3QDa7LT087379; Tue, 26 Apr 2005 13:36:09 GMT (envelope-from davidxu@freebsd.org) Message-ID: <426E43C5.20401@freebsd.org> Date: Tue, 26 Apr 2005 21:36:05 +0800 From: David Xu User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.5) Gecko/20050306 X-Accept-Language: en-us, en MIME-Version: 1.0 To: John Baldwin References: <200504171042.j3HAgeTQ054345@repoman.freebsd.org> <87f1dd37c46f5e61c68035b9989ae5b7@FreeBSD.org> In-Reply-To: <87f1dd37c46f5e61c68035b9989ae5b7@FreeBSD.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit cc: Perforce Change Reviews Subject: Re: PERFORCE change 75366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 13:36:11 -0000 John Baldwin wrote: > > On Apr 17, 2005, at 6:42 AM, David Xu wrote: > >> http://perforce.freebsd.org/chv.cgi?CH=75366 >> >> Change 75366 by davidxu@davidxu_alona on 2005/04/17 10:42:05 >> >> Implement cpu_set_user_tls for sparc64. >> >> Affected files ... >> >> .. >> //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#6 >> edit >> >> Differences ... >> >> ==== >> //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#6 >> (text+ko) ==== >> >> @@ -194,6 +194,15 @@ >> td->td_retval[1] = tf->tf_out[1]; >> } >> >> +void >> +cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, >> + int tls_seg __unused) >> +{ >> + if (td == curthread) >> + flushw(); >> + td->td_frame->tf_global[7] = tls_base; >> +} >> + > > > I think for at least this one and Alpha you might want a critical > section in the curthread case like you do on i386 and amd64 since > calling the Alpha PAL and setting tls_base + flushw() are more than > one instruction long. > If this is true, why don't set_mcontext on sparc64 and alpha enter critical region ? I enter critical region on i386 and amd64, because I have to write global register (amd64 MSR) or gdt on i386, if thread is preempted, then it may be in intermediate state, for example on amd64: td->td_pcb->pcb_fsbase = (register_t)tls_base; ---> wrmsr(MSR_FSBASE, td->td_pcb->pcb_fsbase); if thread is preempted at ---->, a rdmsr in cpu_switch() will overwrite the value I set before I can write it into MSR_FSBASE register. David Xu From owner-p4-projects@FreeBSD.ORG Tue Apr 26 14:07:34 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF6E916A4D0; Tue, 26 Apr 2005 14:07:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A991716A4CE for ; Tue, 26 Apr 2005 14:07:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9215A43D54 for ; Tue, 26 Apr 2005 14:07:33 +0000 (GMT) (envelope-from davidxu@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 j3QE7XSI009558 for ; Tue, 26 Apr 2005 14:07:33 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3QE7XdW009555 for perforce@freebsd.org; Tue, 26 Apr 2005 14:07:33 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 26 Apr 2005 14:07:33 GMT Message-Id: <200504261407.j3QE7XdW009555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 76006 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 14:07:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=76006 Change 76006 by davidxu@davidxu_tiger on 2005/04/26 14:07:21 Add a temp stack for sysenter syscall since debug trap and nmi can occur before sysenter entry setup its stack. Affected files ... .. //depot/projects/davidxu_thread/src/sys/i386/include/pcpu.h#6 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/i386/include/pcpu.h#6 (text+ko) ==== @@ -38,6 +38,8 @@ #include #include +#define SYSENTER_STACK_SIZE 63 + /* * The SMP parts are setup in pmap.c and locore.s for the BSP, and * mp_machdep.c sets up the data for the AP's to "see" when they awake. @@ -55,7 +57,9 @@ int pc_currentldt; \ u_int pc_acpi_id; \ u_int pc_apic_id; \ - u_int pc_sysenter_tss_esp0 + int pc_sysenter_stack[SYSENTER_STACK_SIZE + 1]; + +#define pc_sysenter_tss_esp0 pc_sysenter_stack[SYSENTER_STACK_SIZE] #if defined(lint) From owner-p4-projects@FreeBSD.ORG Tue Apr 26 14:09:37 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D45F616A4D0; Tue, 26 Apr 2005 14:09:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B038D16A4CE for ; Tue, 26 Apr 2005 14:09:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88A6043D58 for ; Tue, 26 Apr 2005 14:09:36 +0000 (GMT) (envelope-from davidxu@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 j3QE9ahW009621 for ; Tue, 26 Apr 2005 14:09:36 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3QE9aES009618 for perforce@freebsd.org; Tue, 26 Apr 2005 14:09:36 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 26 Apr 2005 14:09:36 GMT Message-Id: <200504261409.j3QE9aES009618@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 76007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 14:09:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=76007 Change 76007 by davidxu@davidxu_tiger on 2005/04/26 14:08:41 Add sysenter syscall stub. Affected files ... .. //depot/projects/davidxu_thread/src/sys/i386/i386/sysenter.s#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 26 14:29:00 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C50B16A4D0; Tue, 26 Apr 2005 14:29:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6116416A4CE for ; Tue, 26 Apr 2005 14:29:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B55743D5E for ; Tue, 26 Apr 2005 14:29:00 +0000 (GMT) (envelope-from davidxu@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 j3QET0qV010471 for ; Tue, 26 Apr 2005 14:29:00 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3QESx6d010465 for perforce@freebsd.org; Tue, 26 Apr 2005 14:28:59 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 26 Apr 2005 14:28:59 GMT Message-Id: <200504261428.j3QESx6d010465@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 76008 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 14:29:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=76008 Change 76008 by davidxu@davidxu_tiger on 2005/04/26 14:28:17 Eliminate a branch. Affected files ... .. //depot/projects/davidxu_thread/src/sys/i386/i386/sysenter.s#2 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/i386/i386/sysenter.s#2 (text+ko) ==== @@ -28,7 +28,7 @@ MEXITCOUNT movl PCPU(CURPCB),%eax testl $PCB_FULLCTX,PCB_FLAGS(%eax) - jnz 2f + jnz 1f /* * Check for ASTs atomically with returning. Disabling CPU * interrupts provides sufficient locking even in the SMP case, @@ -37,10 +37,7 @@ cli movl PCPU(CURTHREAD),%eax testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%eax) - jz 1f - sti - jmp 2f -1: + jnz 1f .globl sysenter_popl_fs sysenter_popl_fs: popl %fs @@ -68,6 +65,8 @@ #endif sysexit -2: /* Requested full context restore, use doreti for that */ +1: + /* Requested full context restore, use doreti for that */ + sti andq $~PCB_FULLCTX,PCB_FLAGS(%rax) jmp doreti From owner-p4-projects@FreeBSD.ORG Tue Apr 26 14:31:03 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8ECB316A4D0; Tue, 26 Apr 2005 14:31:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B1B316A4CE for ; Tue, 26 Apr 2005 14:31:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4101E43D5C for ; Tue, 26 Apr 2005 14:31:03 +0000 (GMT) (envelope-from davidxu@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 j3QEV34X010619 for ; Tue, 26 Apr 2005 14:31:03 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3QEV27j010616 for perforce@freebsd.org; Tue, 26 Apr 2005 14:31:02 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 26 Apr 2005 14:31:02 GMT Message-Id: <200504261431.j3QEV27j010616@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 76009 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 14:31:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=76009 Change 76009 by davidxu@davidxu_tiger on 2005/04/26 14:31:00 Fix copy-paste error. Affected files ... .. //depot/projects/davidxu_thread/src/sys/i386/i386/sysenter.s#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/i386/i386/sysenter.s#3 (text+ko) ==== @@ -68,5 +68,5 @@ 1: /* Requested full context restore, use doreti for that */ sti - andq $~PCB_FULLCTX,PCB_FLAGS(%rax) + andl $~PCB_FULLCTX,PCB_FLAGS(%rax) jmp doreti From owner-p4-projects@FreeBSD.ORG Tue Apr 26 15:29:15 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54B2516A4D1; Tue, 26 Apr 2005 15:29:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 236B716A4CE for ; Tue, 26 Apr 2005 15:29:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5E6A43D1D for ; Tue, 26 Apr 2005 15:29:14 +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 j3QFTEAU014135 for ; Tue, 26 Apr 2005 15:29:14 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3QFTE6n014132 for perforce@freebsd.org; Tue, 26 Apr 2005 15:29:14 GMT (envelope-from areisse@nailabs.com) Date: Tue, 26 Apr 2005 15:29:14 GMT Message-Id: <200504261529.j3QFTE6n014132@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 Subject: PERFORCE change 76011 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 15:29:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=76011 Change 76011 by areisse@areisse_ibook on 2005/04/26 15:29:12 Add a makefile to simplify building mig stubs with the (changed) mig from the source tree. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/build/Mig.mk#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 26 17:24:41 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FEE016A4D0; Tue, 26 Apr 2005 17:24:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1865B16A4CE; Tue, 26 Apr 2005 17:24:41 +0000 (GMT) Received: from pooker.samsco.org (pooker.samsco.org [168.103.85.57]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C00143D55; Tue, 26 Apr 2005 17:24:38 +0000 (GMT) (envelope-from scottl@samsco.org) Received: from [192.168.254.11] (junior-wifi.samsco.home [192.168.254.11]) (authenticated bits=0) by pooker.samsco.org (8.13.3/8.13.3) with ESMTP id j3QHTAfq011623; Tue, 26 Apr 2005 11:29:10 -0600 (MDT) (envelope-from scottl@samsco.org) Message-ID: <426E7886.4060303@samsco.org> Date: Tue, 26 Apr 2005 11:21:10 -0600 From: Scott Long User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.5) Gecko/20050218 X-Accept-Language: en-us, en MIME-Version: 1.0 To: David Xu References: <200504261407.j3QE7XdW009555@repoman.freebsd.org> In-Reply-To: <200504261407.j3QE7XdW009555@repoman.freebsd.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.8 required=3.8 tests=ALL_TRUSTED autolearn=failed version=3.0.2 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on pooker.samsco.org cc: Perforce Change Reviews Subject: Re: PERFORCE change 76006 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 17:24:41 -0000 David Xu wrote: > http://perforce.freebsd.org/chv.cgi?CH=76006 > > Change 76006 by davidxu@davidxu_tiger on 2005/04/26 14:07:21 > > Add a temp stack for sysenter syscall since debug trap and nmi > can occur before sysenter entry setup its stack. Are you aware that there is already a sysenter implementation in perforce? Please take a look at //depot/user/jeffr/sysenter Scott From owner-p4-projects@FreeBSD.ORG Tue Apr 26 18:30:05 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B620616A550; Tue, 26 Apr 2005 18:30:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83C1816A640 for ; Tue, 26 Apr 2005 18:30:04 +0000 (GMT) Received: from mail24.sea5.speakeasy.net (mail24.sea5.speakeasy.net [69.17.117.26]) by mx1.FreeBSD.org (Postfix) with ESMTP id 159D343D2F for ; Tue, 26 Apr 2005 18:30:04 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 6725 invoked from network); 26 Apr 2005 18:30:03 -0000 Received: from server.baldwin.cx ([216.27.160.63]) (envelope-sender )AES256-SHA encrypted SMTP for ; 26 Apr 2005 18:30:03 -0000 Received: from roboboy.corp.weather.com (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.13.1/8.13.1) with ESMTP id j3QITfvT034307; Tue, 26 Apr 2005 14:29:57 -0400 (EDT) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: David Xu Date: Tue, 26 Apr 2005 13:20:30 -0400 User-Agent: KMail/1.8 References: <200504171042.j3HAgeTQ054345@repoman.freebsd.org> <87f1dd37c46f5e61c68035b9989ae5b7@FreeBSD.org> <426E43C5.20401@freebsd.org> In-Reply-To: <426E43C5.20401@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200504261320.31661.jhb@FreeBSD.org> X-Spam-Status: No, score=-102.8 required=4.2 tests=ALL_TRUSTED, USER_IN_WHITELIST autolearn=failed version=3.0.2 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 75366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 18:30:05 -0000 On Tuesday 26 April 2005 09:36 am, David Xu wrote: > John Baldwin wrote: > > On Apr 17, 2005, at 6:42 AM, David Xu wrote: > >> http://perforce.freebsd.org/chv.cgi?CH=75366 > >> > >> Change 75366 by davidxu@davidxu_alona on 2005/04/17 10:42:05 > >> > >> Implement cpu_set_user_tls for sparc64. > >> > >> Affected files ... > >> > >> .. > >> //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#6 > >> edit > >> > >> Differences ... > >> > >> ==== > >> //depot/projects/davidxu_thread/src/sys/sparc64/sparc64/vm_machdep.c#6 > >> (text+ko) ==== > >> > >> @@ -194,6 +194,15 @@ > >> td->td_retval[1] = tf->tf_out[1]; > >> } > >> > >> +void > >> +cpu_set_user_tls(struct thread *td, void *tls_base, size_t tls_size, > >> + int tls_seg __unused) > >> +{ > >> + if (td == curthread) > >> + flushw(); > >> + td->td_frame->tf_global[7] = tls_base; > >> +} > >> + > > > > I think for at least this one and Alpha you might want a critical > > section in the curthread case like you do on i386 and amd64 since > > calling the Alpha PAL and setting tls_base + flushw() are more than > > one instruction long. > > If this is true, why don't set_mcontext on sparc64 and alpha enter > critical region ? Bugs. :) Actually, sparc64 is probably ok, but alpha_pal_wrunique() on Alpha is basically the same as wrmsr() on x86. You might be ok without a critical section on Alpha but I'm not sure. Actually, I think you are fine. The thread can't get out into userland without resuming and finishing this function first. > I enter critical region on i386 and amd64, because I have to write > global register (amd64 MSR) or gdt on i386, if thread is preempted, > then it may be in intermediate state, for example on amd64: > td->td_pcb->pcb_fsbase = (register_t)tls_base; > ---> > wrmsr(MSR_FSBASE, td->td_pcb->pcb_fsbase); > > if thread is preempted at ---->, a rdmsr in cpu_switch() will overwrite > the value I set before I can write it into MSR_FSBASE register. > > David Xu -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Tue Apr 26 23:06:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0405516A4D1; Tue, 26 Apr 2005 23:06:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE77116A4CE for ; Tue, 26 Apr 2005 23:06:55 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5E9D43D45; Tue, 26 Apr 2005 23:06:55 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from [127.0.0.1] (davidxu@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3QN6sjr068106; Tue, 26 Apr 2005 23:06:55 GMT (envelope-from davidxu@freebsd.org) Message-ID: <426EC98C.1080100@freebsd.org> Date: Wed, 27 Apr 2005 07:06:52 +0800 From: David Xu User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.5) Gecko/20050306 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Scott Long References: <200504261407.j3QE7XdW009555@repoman.freebsd.org> <426E7886.4060303@samsco.org> In-Reply-To: <426E7886.4060303@samsco.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit cc: Perforce Change Reviews Subject: Re: PERFORCE change 76006 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 23:06:56 -0000 Scott Long wrote: > David Xu wrote: > >> http://perforce.freebsd.org/chv.cgi?CH=76006 >> >> Change 76006 by davidxu@davidxu_tiger on 2005/04/26 14:07:21 >> >> Add a temp stack for sysenter syscall since debug trap and nmi >> can occur before sysenter entry setup its stack. > > > > Are you aware that there is already a sysenter implementation in > perforce? Please take a look at //depot/user/jeffr/sysenter > > Scott > > I didn't know, are you working on it ? I know peter was trying to work on it. Just read some code in exception.s: sysenter_exit: | popl %fs | popl %es | popl %ds 295: | popal | addl $8,%esp | movl %edx,%ebx /* Save the old edx value. */ | popl %edx /* Pop user's EIP */ | addl $4,%esp 300: | popfl | popl %ecx /* Pop user's esp */ | sysexit This code is buggy, popfl enable interrupts, if thread is preempted, kernel code will use userland %ds, %es, and %fs, this is not good. From owner-p4-projects@FreeBSD.ORG Tue Apr 26 23:15:49 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E71C16A4D0; Tue, 26 Apr 2005 23:15:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C1E1F16A4CE for ; Tue, 26 Apr 2005 23:15:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F0E343D55 for ; Tue, 26 Apr 2005 23:15:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3QNFmUo059081 for ; Tue, 26 Apr 2005 23:15:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3QNFmKB059078 for perforce@freebsd.org; Tue, 26 Apr 2005 23:15:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 26 Apr 2005 23:15:48 GMT Message-Id: <200504262315.j3QNFmKB059078@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 Subject: PERFORCE change 76038 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 23:15:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=76038 Change 76038 by rwatson@rwatson_paprika on 2005/04/26 23:14:47 Return errno values in various error cases associated with audit record construction. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#9 (text+ko) ==== @@ -111,6 +111,7 @@ rec->data = (u_char *) malloc (MAX_AUDIT_RECORD_SIZE * sizeof(u_char)); if(rec->data == NULL) { free(rec); + errno = ENOMEM; return -1; } @@ -122,6 +123,7 @@ free(rec); /* XXX We need to increase size of MAX_AUDIT_RECORDS */ + errno = ENOMEM; return -1; } rec->desc = bsm_rec_count; @@ -264,6 +266,7 @@ rec = open_desc_table[d]; if((rec == NULL) || (rec->used == 0)) { + errno = EINVAL; return -1; /* Invalid descriptor */ } From owner-p4-projects@FreeBSD.ORG Wed Apr 27 02:13:35 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59CB116A4D0; Wed, 27 Apr 2005 02:13:30 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F184616A4CE for ; Wed, 27 Apr 2005 02:13:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3EFC43D54 for ; Wed, 27 Apr 2005 02:13:29 +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 j3R2DT8x074072 for ; Wed, 27 Apr 2005 02:13:29 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3R2DTFn074069 for perforce@freebsd.org; Wed, 27 Apr 2005 02:13:29 GMT (envelope-from marcel@freebsd.org) Date: Wed, 27 Apr 2005 02:13:29 GMT Message-Id: <200504270213.j3R2DTFn074069@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 Subject: PERFORCE change 76043 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2005 02:13:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=76043 Change 76043 by marcel@marcel_nfs on 2005/04/27 02:13:04 Allow VGA resources across the APB PCI-PCI bridge as well. Affected files ... .. //depot/projects/tty/sys/sparc64/pci/apb.c#5 edit Differences ... ==== //depot/projects/tty/sys/sparc64/pci/apb.c#5 (text+ko) ==== @@ -161,6 +161,13 @@ { int i, ei; + /* Allow the legacy VGA ranges. */ + if ((start >= 0x3b0 && end < 0x3bc) || + (start >= 0x3c0 && end < 0x3dc) || + (start >= 0xa0000 && end < 0xc0000)) + return (1); + + /* Check the map. */ i = start / scale; ei = end / scale; if (i > 7 || ei > 7) From owner-p4-projects@FreeBSD.ORG Wed Apr 27 05:27:24 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD7F716A4D0; Wed, 27 Apr 2005 05:27:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 93B6E16A4CE for ; Wed, 27 Apr 2005 05:27:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C5A143D54 for ; Wed, 27 Apr 2005 05:27:23 +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 j3R5RN0T089652 for ; Wed, 27 Apr 2005 05:27:23 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3R5RNUb089649 for perforce@freebsd.org; Wed, 27 Apr 2005 05:27:23 GMT (envelope-from marcel@freebsd.org) Date: Wed, 27 Apr 2005 05:27:23 GMT Message-Id: <200504270527.j3R5RNUb089649@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 Subject: PERFORCE change 76049 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2005 05:27:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=76049 Change 76049 by marcel@marcel_nfs on 2005/04/27 05:26:51 Add a define for the VGA Enable bit of the bridge control register. Needed to allow access to VGA addresses only when the bridge forwards them. Affected files ... .. //depot/projects/tty/sys/dev/pci/pcib_private.h#4 edit Differences ... ==== //depot/projects/tty/sys/dev/pci/pcib_private.h#4 (text+ko) ==== @@ -57,6 +57,7 @@ uint32_t iolimit; /* topmost address of port window */ uint16_t secstat; /* secondary bus status register */ uint16_t bridgectl; /* bridge control register */ +#define PCIB_BCR_VGA_ENABLE (1 << 3) uint8_t seclat; /* secondary bus latency timer */ }; From owner-p4-projects@FreeBSD.ORG Wed Apr 27 05:31:29 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27E0D16A4D0; Wed, 27 Apr 2005 05:31:29 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 017C616A4CE for ; Wed, 27 Apr 2005 05:31:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA23843D54 for ; Wed, 27 Apr 2005 05:31:28 +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 j3R5VSPs089866 for ; Wed, 27 Apr 2005 05:31:28 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3R5VSDb089863 for perforce@freebsd.org; Wed, 27 Apr 2005 05:31:28 GMT (envelope-from marcel@freebsd.org) Date: Wed, 27 Apr 2005 05:31:28 GMT Message-Id: <200504270531.j3R5VSDb089863@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 Subject: PERFORCE change 76050 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2005 05:31:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=76050 Change 76050 by marcel@marcel_nfs on 2005/04/27 05:30:27 Check if the bridge forwards VGA addresses before allowing a device to allocate VGA specific addresses. Affected files ... .. //depot/projects/tty/sys/dev/pci/pci_pci.c#9 edit Differences ... ==== //depot/projects/tty/sys/dev/pci/pci_pci.c#9 (text+ko) ==== @@ -331,9 +331,12 @@ break; ok = (start >= sc->iobase && end <= sc->iolimit); - /* Make sure we allow access to VGA ports. */ - if (!ok) - ok = is_vga_resource(type, start, end); + /* + * Make sure we allow access to VGA I/O addresses when the + * bridge has the "VGA Enable" bit set. + */ + if (!ok && is_vga_resource(type, start, end)) + ok = (sc->bridgectl & PCIB_BCR_VGA_ENABLE) ? 1 : 0; if ((sc->flags & PCIB_SUBTRACTIVE) == 0) { if (!ok) { @@ -380,9 +383,12 @@ if (pcib_is_prefetch_open(sc)) ok = ok || (start >= sc->pmembase && end <= sc->pmemlimit); - /* Make sure we allow access to VGA memory. */ - if (!ok) - ok = is_vga_resource(type, start, end); + /* + * Make sure we allow access to VGA memory addresses when the + * bridge has the "VGA Enable" bit set. + */ + if (!ok && is_vga_resource(type, start, end)) + ok = (sc->bridgectl & PCIB_BCR_VGA_ENABLE) ? 1 : 0; if ((sc->flags & PCIB_SUBTRACTIVE) == 0) { if (!ok) { From owner-p4-projects@FreeBSD.ORG Wed Apr 27 06:16:24 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9673916A4D0; Wed, 27 Apr 2005 06:16:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 71F9D16A4CE for ; Wed, 27 Apr 2005 06:16:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46F4643D5C for ; Wed, 27 Apr 2005 06:16:24 +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 j3R6GObL091757 for ; Wed, 27 Apr 2005 06:16:24 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3R6GN6m091754 for perforce@freebsd.org; Wed, 27 Apr 2005 06:16:23 GMT (envelope-from marcel@freebsd.org) Date: Wed, 27 Apr 2005 06:16:23 GMT Message-Id: <200504270616.j3R6GN6m091754@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 Subject: PERFORCE change 76054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2005 06:16:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=76054 Change 76054 by marcel@marcel_nfs on 2005/04/27 06:15:26 Add the beginnings of a terminal emulator (TE) KOBJ interface. This allows multiple different TEs to be used. Affected files ... .. //depot/projects/tty/sys/dev/vtc/vtc_te.h#1 add .. //depot/projects/tty/sys/dev/vtc/vtc_te_if.m#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 27 06:24:35 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F146A16A4D0; Wed, 27 Apr 2005 06:24:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B666E16A4CE for ; Wed, 27 Apr 2005 06:24:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 889E443D76 for ; Wed, 27 Apr 2005 06:24: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 j3R6OYXP091982 for ; Wed, 27 Apr 2005 06:24:34 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3R6OY2W091979 for perforce@freebsd.org; Wed, 27 Apr 2005 06:24:34 GMT (envelope-from marcel@freebsd.org) Date: Wed, 27 Apr 2005 06:24:34 GMT Message-Id: <200504270624.j3R6OY2W091979@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 Subject: PERFORCE change 76055 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2005 06:24:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=76055 Change 76055 by marcel@marcel_nfs on 2005/04/27 06:24:15 Add the beginnings of a VT102 Unicode terminal emulator. All the state handling is there. It's now a matter of working out the KOBJ interfaces to translate the control functions into elementary display operations and handling of audible bells. Then there's of course the input side of the TE... Affected files ... .. //depot/projects/tty/sys/dev/vtc/vtc_te_vt102.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 27 10:21:17 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EE9216A4D0; Wed, 27 Apr 2005 10:21:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6EF816A4CE for ; Wed, 27 Apr 2005 10:21:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FBF743D5C for ; Wed, 27 Apr 2005 10:21:16 +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 j3RALGOR008821 for ; Wed, 27 Apr 2005 10:21:16 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 j3RALGDf008818 for perforce@freebsd.org; Wed, 27 Apr 2005 10:21:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 27 Apr 2005 10:21:16 GMT Message-Id: <200504271021.j3RALGDf008818@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 Subject: PERFORCE change 76065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2005 10:21:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=76065 Change 76065 by rwatson@rwatson_paprika on 2005/04/27 10:21:11 Use %zd for size_t to be more portable across OS/architectures. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#10 (text+ko) ==== @@ -331,7 +331,7 @@ /* * XXXRW: See au_close() comment. */ - fprintf(stderr, "au_close_buffer failed %d", tot_rec_size); + fprintf(stderr, "au_close_buffer failed %zd", tot_rec_size); errno = ENOMEM; retval = -1; goto cleanup; From owner-p4-projects@FreeBSD.ORG Wed Apr 27 10:22:19 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF49016A4D0; Wed, 27 Apr 2005 10:22:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8372116A4CE for ; Wed, 27 Apr 2005 10:22:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5789043D2F for ; Wed, 27 Apr 2005 10:22:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3RAMIi2008848 for ; Wed, 27 Apr 2005 10:22:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3RAMIeb008845 for perforce@freebsd.org; Wed, 27 Apr 2005 10:22:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 27 Apr 2005 10:22:18 GMT Message-Id: <200504271022.j3RAMIeb008845@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 Subject: PERFORCE change 76066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2005 10:22:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=76066 Change 76066 by rwatson@rwatson_paprika on 2005/04/27 10:22:09 For portability purposes, include an OpenBSM-local endian.h, since not all platforms of interest have it. This is the FreeBSD endian.h:1.6. Affected files ... .. //depot/projects/trustedbsd/openbsm/sys/endian.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 27 18:29:18 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A60ED16A4D0; Wed, 27 Apr 2005 18:29:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2FC1C16A4CE for ; Wed, 27 Apr 2005 18:29:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B27543D54 for ; Wed, 27 Apr 2005 18:29:16 +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 j3RITGF2042909 for ; Wed, 27 Apr 2005 18:29:16 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 j3RIT9P9042904 for perforce@freebsd.org; Wed, 27 Apr 2005 18:29:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 27 Apr 2005 18:29:09 GMT Message-Id: <200504271829.j3RIT9P9042904@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 Subject: PERFORCE change 76083 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2005 18:29:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=76083 Change 76083 by rwatson@rwatson_tislabs on 2005/04/27 18:28:53 Integrate TrustedBSD base branch, merging the following from FreeBSD CVS HEAD: pmc no NO_MIXED_MODE bsnmp update ipfilter upgrade tcsh update thread-safe and ipv6 routines for yp, etc. i386_{get,set}_gsbase/cpu_set_user_tls()/etc. libz update ipfw gets IPv6 pmc(4) NDINIT() ISOPEN flag NDIS madness p_canwait() looped back sysctl_kern_proc_pathname thr_new() root_mount_hold/root_mount_rel/root_mount_wait if_linktask for asynchronous links state change notification and more universaly use of if_link_state_change() TCP SACK fixes nfsrv_samecred() mac_bsdextended locking looped back LOP_DUPOK Affected files ... .. //depot/projects/trustedbsd/base/UPDATING#53 integrate .. //depot/projects/trustedbsd/base/bin/csh/Makefile#10 integrate .. //depot/projects/trustedbsd/base/bin/csh/config.h#4 integrate .. //depot/projects/trustedbsd/base/bin/csh/config_p.h#1 branch .. //depot/projects/trustedbsd/base/bin/hostname/hostname.1#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/VERSION#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/oid-list#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_ntp/NTP-MIB.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_ntp/NTP-PROXY-MIB.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_ntp/ntp_tree.def#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_ntp/snmp_ntp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/login.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/patch.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/rcs.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/BNF#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile#7 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile.ipsend#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/kupgrade#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/make-devices#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FWTK/fwtk-2.1-transparency.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/FWTK/fwtk_transparent.diff#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FWTK/fwtkp#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FWTK/tproxy.diff#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-2.2/files.diffs#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-2.2/kinstall#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-3/kinstall#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4#3 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-4.0/kinstall#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-4.0/unkinstall#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD/files.diffs#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD/files.newconf.diffs#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD/files.oldconf.diffs#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD/filez.diffs#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD/kinstall#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/HISTORY#8 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/INST.FreeBSD-2.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/INSTALL.FreeBSD#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/IPFILTER.LICENCE#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/Makefile#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/STYLE.TXT#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/UPGRADE_NOTICE#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/WhatsNew40.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/bpf-ipf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/bpf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/bpf_filter.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/bsdinstall#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/common.c#5 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/etc/protocols#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/etc/services#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/facpri.c#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/facpri.h#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/fils.c#7 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/inet_addr.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_fil.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_fil_freebsd.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_htable.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_htable.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_irc_pxy.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_lfil.c#4 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_lookup.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_lookup.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_msnrpc_pxy.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_pool.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_pool.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_pptp_pxy.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_rpcb_pxy.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_scan.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_scan.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_sfil.c#8 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_sync.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_sync.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipf.c#8 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipf.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipfs.c#7 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_ef.c#6 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_hx.c#4 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_pc.c#4 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_sn.c#4 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_td.c#6 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_tx.c#5 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/iplang/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/iplang/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/iplang/iplang.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/iplang/iplang_l.l#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/iplang/iplang_y.y#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipmon.c#8 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipmon.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipnat.c#6 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/Celler/ip_compat.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/ipsd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/ipsd.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/ipsdr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/linux.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/sbpf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/sdlpi.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/slinux.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/snit.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/.OLD/ip_compat.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/44arp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/arp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/dlcommon.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/dltest.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/hpux.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/in_var.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ip.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ip_var.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipresend.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipresend.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsend.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsend.5#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsend.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsend.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsopt.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/iptest.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/iptest.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/iptests.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/larp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/linux.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/lsock.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/resend.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sbpf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sdlpi.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sirix.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/slinux.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/snit.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sock.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sockraw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/tcpip.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ultrix.c#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipt.c#8 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipt.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/kmem.c#8 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/kmem.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/l4check/http.ok#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/l4check/l4check.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/addicmp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/addipopt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/addkeep.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/bcopywrap.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/binprint.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/buildopts.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/checkrev.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/count4bits.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/count6bits.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/debug.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/extras.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/facpri.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/facpri.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/fill6bits.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/flags.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/genmask.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/gethost.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/getifname.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/getline.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/getnattype.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/getport.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/getportproto.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/getproto.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/getsumd.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/hexdump.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/hostmask.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/hostname.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/hostnum.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/icmpcode.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/inet_addr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/initparse.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ionames.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipf_dotuning.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_ef.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_hx.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_pc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_sn.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_td.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_tx.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipoptsec.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/kmem.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/kmem.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/kmemcpywrap.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/kvatoname.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/load_hash.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/load_hashnode.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/load_pool.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/load_poolnode.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/loglevel.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/make_range.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/mutex_emul.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/nametokva.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/nat_setgroupmap.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/natparse.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ntomask.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/optname.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/optprint.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/optprintv6.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/optvalue.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/parse.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/portname.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/portnum.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ports.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/print_toif.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printactivenat.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printaps.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printbuf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printfr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printfraginfo.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printhash.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printhashnode.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printhostmap.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printhostmask.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printifname.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printip.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printlog.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printmask.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printnat.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printpacket.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printpacket6.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printpool.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printpoolnode.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printportcmp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printsbuf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printstate.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printtunable.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ratoi.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ratoui.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/remove_hash.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/remove_hashnode.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/remove_pool.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/remove_poolnode.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/resetlexer.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/rwlock_emul.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/tcp_flags.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/tcpflags.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/tcpoptnames.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/to_interface.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/v6ionames.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/v6optvalue.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/var.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/verbose.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipf.4#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipf.5#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipf.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipfilter.4#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipfilter.4.mandoc#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipfs.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipfstat.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipftest.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipl.4#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipmon.5#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipmon.8#8 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipnat.5#8 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipnat.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ippool.5#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ippool.8#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipscan.5#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipscan.8#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/mkfilters.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/md5.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/md5.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/misc.c#5 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ml_ipl.c#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/mlf_ipl.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/mlf_rule.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/mlfk_rule.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/mlh_rule.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/mli_ipl.c#4 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/mln_ipl.c#5 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/mls_ipl.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/natparse.c#6 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/net/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/opt.c#4 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/opts.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/parse.c#7 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/pcap-ipf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/pcap.h#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/perl/ipf-mrtg.pl#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/perl/ipfmeta.pl#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/perl/logfilter.pl#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/printnat.c#8 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/printstate.c#5 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/radix.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/radix_ipf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/relay.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.10#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.11#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.12#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.13#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.4#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.6#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.7#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.9#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.sr#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/ip_rules#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/ipmon.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/pool.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/samples/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/samples/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/samples/ipfilter-pb.gif#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/samples/proxy.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/samples/relay.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/samples/userauth.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/snoop.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/solaris.c#4 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/Makefile#8 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/bpftest#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/dotest#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/dotest6#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/bpf-f1#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/bpf1#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f17#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i11#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i12#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i13#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i14#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i15#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i2#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i3#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i4#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i5#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i6#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i7#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i9#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in1#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in2#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in5#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in6#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ip1#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/l1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/l1.b#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n10#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n11#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n12#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n4#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n5#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n7#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n8#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n9#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni1#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni10#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni11#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni12#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni13#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni14#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni15#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni16#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni2#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni3#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni4#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni5#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni6#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni7#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni8#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni9#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/p1#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/p2#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/p3#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/hextest#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f11#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f12#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f13#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f17#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ipv6.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/l1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/n1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/n10#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/n11#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/n12#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/n4#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/n8#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/n9#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni10#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni12#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni13#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni14#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni15#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni16#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni6#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni7#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni9#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/p1#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/p2#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/p3#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/intest#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/iptest#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/itest#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/logtest#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/mhtest#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/mtest#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/natipftest#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/nattest#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/ptest#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/bpf-f1#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/bpf1#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i11#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i12#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i13#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i14#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i15#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i2#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i3#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i4#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i6#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i9#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in2#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in5#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in6#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ip1#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/n10#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/n11#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/n12#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/n4#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/n7#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/n8#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/n9#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni10.nat#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni11.nat#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni12.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni12.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni13.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni13.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni14.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni14.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni15.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni15.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni16.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni16.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni6.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni6.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni7.nat#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni8.nat#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni9.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni9.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/p1.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/p1.pool#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/p2.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/p3.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/p3.pool#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/test.format#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/vfycksum.pl#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/todo#3 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/BNF.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/BNF.ipnat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipf_y.y#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipfcomp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipfs.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipfstat.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipftest.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipmon.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipmon_y.y#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipnat.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipnat_y.y#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ippool.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ippool_y.y#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipscan_y.y#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipsyncm.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipsyncs.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/lex_var.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/lexer.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/lexer.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/Fixes#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Imakefile#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Makefile.std#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Makefile.vms#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/README#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/complete.tcsh#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/config.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/config/bsd4.4#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/config_f.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.chared.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.decls.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.defns.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.init.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.inputl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.refresh.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.screen.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.term.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.term.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.xmap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/gethost.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/glob.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/glob.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/host.defs#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/install-sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ma.setp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/C/set11#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set1#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set3#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set4#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ja/set7#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/patchlevel.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.char.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.decls.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.dir.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.dol.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.err.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.exec.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.exp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.file.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.func.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.glob.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.hist.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.init.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.lex.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.misc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.parse.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.print.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.proc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.proc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.sem.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.set.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.time.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.types.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.alloc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.bind.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.const.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.decls.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.disc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.func.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.nls.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.nls.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.os.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.os.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.printf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.prompt.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.sched.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.sig.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.sig.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.str.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.vers.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.wait.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.who.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tcsh.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tcsh.man2html#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.color.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.comp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.decls.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.help.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.init.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.parse.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.spell.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/vms.termcap.c#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/named#10 integrate .. //depot/projects/trustedbsd/base/games/factor/Makefile#7 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/startrek#7 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libstdc++/Makefile#20 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#24 integrate .. //depot/projects/trustedbsd/base/include/Makefile#44 integrate .. //depot/projects/trustedbsd/base/kerberos5/Makefile.inc#15 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#36 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/configure.ac.in#3 integrate .. //depot/projects/trustedbsd/base/lib/libatm/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/string/strcpy.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysctl.3#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/_set_tp.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/string/bcmp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/_amd64_get_fsbase.c#3 delete .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/_amd64_get_gsbase.c#3 delete .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/_amd64_set_fsbase.c#2 delete .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/_amd64_set_gsbase.c#2 delete .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbydns.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbyname.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbynis.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostnamadr.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetbyht.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getproto.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getprotoent.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getprotoent.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getprotoname.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getservbyname.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getservbyport.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getservent.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getservent.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/name6.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/netdb_private.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/regex/cclass.h#3 delete .. //depot/projects/trustedbsd/base/lib/libdevstat/devstat.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libnetgraph/debug.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libnetgraph/msg.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libnetgraph/sock.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libopie/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libpmc/libpmc.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpmc/pmc.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpmc/pmc.h#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/pthread_md.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/pthread_md.h#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/pthread_md.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_cap.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libz/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/FAQ#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/README#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/gzio.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/zconf.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libz/zlib.h#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/Makefile#14 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_ceill.c#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_floorl.c#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_truncl.c#2 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/i386/reloc.c#8 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/errata/article.sgml#20 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/readme/article.sgml#18 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#89 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#5 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl#2 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/scripts/package-split.py#2 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#29 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.cc#11 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/devfs.8#11 integrate .. //depot/projects/trustedbsd/base/sbin/dump/main.c#23 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/gmirror.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/stripe/gstripe.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/add.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.h#7 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/remove.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/sbin/ipf/ipf/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/ipf/ipfs/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/ipf/ipfstat/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/ipf/ipftest/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/ipf/ipmon/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/ipf/ipnat/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/ipf/ippool/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/ipf/ipresend/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/ipf/ipsend/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/ipf/iptest/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/ipf/libipf/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/ipf/rules/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/ipfs/Makefile#6 delete .. //depot/projects/trustedbsd/base/sbin/ipfstat/Makefile#6 delete .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#36 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#30 integrate .. //depot/projects/trustedbsd/base/sbin/ipmon/Makefile#8 delete .. //depot/projects/trustedbsd/base/sbin/ipnat/Makefile#6 delete .. //depot/projects/trustedbsd/base/share/doc/papers/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/hwpmc/Makefile#1 branch .. //depot/projects/trustedbsd/base/share/doc/papers/hwpmc/hwpmc.ms#1 branch .. //depot/projects/trustedbsd/base/share/examples/hwpmc/README#1 branch .. //depot/projects/trustedbsd/base/share/examples/ppi/ppilcd.c#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#55 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#21 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ataraid.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cpufreq.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/faith.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/hwpmc.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ipw.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/iwi.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ohci.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ral.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/sk.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/twe.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ucom.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uhci.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ural.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/usb.4#13 integrate .. //depot/projects/trustedbsd/base/share/man/man5/nsswitch.conf.5#6 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#46 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#42 integrate .. //depot/projects/trustedbsd/base/share/man/man9/alloc_unr.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/sleepqueue.9#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/taskqueue.9#11 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#25 integrate .. //depot/projects/trustedbsd/base/share/mklocale/be_BY.CP1131.src#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/vm_machdep.c#30 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/_bus.h#1 branch .. //depot/projects/trustedbsd/base/sys/alpha/include/bus.h#17 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#15 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/vm_machdep.c#20 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/_bus.h#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/include/bus.h#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/arm/fusu.S#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/_bus.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/include/bus.h#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/i386/boot0/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/pxe.c#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#34 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/kern_ndis.c#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/ntoskrnl_var.h#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_hal.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ndis.c#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#58 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#83 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#19 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#50 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.ia64#30 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#44 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#40 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#35 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#58 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.c#12 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.h#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_compat.h#11 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil.c#16 delete .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil.h#9 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_frag.c#9 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_frag.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#8 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_htable.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_htable.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_log.c#11 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_lookup.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_lookup.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.c#13 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.h#8 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_pool.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_pool.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_proxy.c#10 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_proxy.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_rules.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_rules.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_scan.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_scan.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.c#12 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.h#7 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_sync.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_sync.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ipl.h#9 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/mlfk_ipl.c#7 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/trustedbsd/base/sys/ddb/ddb.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdSchedule.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpivar.h#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-card.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-cbus.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-isa.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-lowlevel.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-queue.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.h#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/cissreg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/cissvar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/esp/esp_sbus.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/esp/ncr53c9x.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/esp/ncr53c9xreg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/esp/ncr53c9xvar.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxpreg.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/rcvbundl.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_amd.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_intel.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_pentium.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_piv.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_ppro.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis_pccard.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis_pci.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndisvar.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ips/ips.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipwreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipwvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwireg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwivar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/musycc/musycc.c#12 delete .. //depot/projects/trustedbsd/base/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral_pccard.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral_pci.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ralrate.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ralrate.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ralreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ralvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio_pcm.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/if_uralreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/if_uralvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_subr.c#22 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vfsops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_kern.c#20 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/trustedbsd/base/sys/hwpmc/hwpmc_amd.c#1 branch .. //depot/projects/trustedbsd/base/sys/hwpmc/hwpmc_intel.c#1 branch .. //depot/projects/trustedbsd/base/sys/hwpmc/hwpmc_mod.c#1 branch .. //depot/projects/trustedbsd/base/sys/hwpmc/hwpmc_pentium.c#1 branch .. //depot/projects/trustedbsd/base/sys/hwpmc/hwpmc_piv.c#1 branch .. //depot/projects/trustedbsd/base/sys/hwpmc/hwpmc_ppro.c#1 branch .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakecode.S#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#54 integrate .. //depot/projects/trustedbsd/base/sys/i386/cpufreq/smist.c#1 branch .. //depot/projects/trustedbsd/base/sys/i386/i386/local_apic.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/support.s#16 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#23 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#37 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#39 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/imgact_coff.c#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/_bus.h#1 branch .. //depot/projects/trustedbsd/base/sys/i386/include/bus.h#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/base/sys/ia64/ia64/clock.c#14 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/clock_if.m#3 delete .. //depot/projects/trustedbsd/base/sys/ia64/ia64/eficlock.c#4 delete .. //depot/projects/trustedbsd/base/sys/ia64/ia64/vm_machdep.c#39 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/_bus.h#1 branch .. //depot/projects/trustedbsd/base/sys/ia64/include/bus.h#15 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/clockvar.h#3 delete .. //depot/projects/trustedbsd/base/sys/ia64/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#46 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#50 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#47 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_kse.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#60 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_pmc.c#1 branch .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#47 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#34 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thr.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_4bsd.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_taskqueue.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#51 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#47 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#46 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_sem.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#61 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#52 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#63 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/acpi/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/modules/apm/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/modules/cpufreq/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/hwpmc/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/if_ndis/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/ipfilter/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sys/modules/ipw/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/iwi/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/puc/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/ral/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/ural/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/if.c#35 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#29 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_eiface.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ksocket.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_message.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_vlan.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#29 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.h#12 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw.h#19 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#37 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_icmp.c#27 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_icmp.h#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet/libalias/HISTORY#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias_cuseeme.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias_db.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias_ftp.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias_irc.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias_local.h#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias_nbt.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias_old.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias_pptp.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias_proxy.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias_skinny.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias_smedia.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/alias_util.c#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/libalias/libalias.3#1 branch .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#27 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_sack.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#41 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#32 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#26 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_output.c#24 integrate .. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vnops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/bootp_subr.c#21 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_diskless.c#11 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_socket.c#28 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs.h#11 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#34 integrate .. //depot/projects/trustedbsd/base/sys/pc98/apm/apm_bioscall.S#1 branch .. //depot/projects/trustedbsd/base/sys/pc98/apm/apm_bioscall.s#4 delete .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#22 integrate .. //depot/projects/trustedbsd/base/sys/pc98/include/_bus.h#1 branch .. //depot/projects/trustedbsd/base/sys/pc98/include/bus.h#2 integrate .. //depot/projects/trustedbsd/base/sys/pc98/include/pmc_mdep.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 27 18:58:53 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51DC516A4D0; Wed, 27 Apr 2005 18:58:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 24F3716A4CE for ; Wed, 27 Apr 2005 18:58:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AC8C43D58 for ; Wed, 27 Apr 2005 18:58:53 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3RIwqdU051680 for ; Wed, 27 Apr 2005 18:58:52 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3RIwqgC051677 for perforce@freebsd.org; Wed, 27 Apr 2005 18:58:52 GMT (envelope-from jhb@freebsd.org) Date: Wed, 27 Apr 2005 18:58:52 GMT Message-Id: <200504271858.j3RIwqgC051677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 76085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2005 18:58:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=76085 Change 76085 by jhb@jhb_twclab on 2005/04/27 18:58:02 IFC to get compile fix. Affected files ... .. //depot/projects/smpng/sys/vm/vm_pageq.c#13 integrate Differences ... ==== //depot/projects/smpng/sys/vm/vm_pageq.c#13 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.15 2005/04/15 21:45:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.16 2005/04/16 12:37:16 des Exp $"); #include #include @@ -130,7 +130,8 @@ break; } if (pa == trunc_page(bad)) { - printf("Skipping page with pa 0x%x\n", pa); + printf("Skipping page with pa 0x%jx\n", + (uintmax_t)pa); freeenv(list); return (NULL); } From owner-p4-projects@FreeBSD.ORG Thu Apr 28 04:29:32 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E14B16A4D0; Thu, 28 Apr 2005 04:29:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36E4616A4CF for ; Thu, 28 Apr 2005 04:29:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B5F243D5C for ; Thu, 28 Apr 2005 04:29:30 +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 j3S4TUHQ095587 for ; Thu, 28 Apr 2005 04:29:30 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3S4TR1c095584 for perforce@freebsd.org; Thu, 28 Apr 2005 04:29:27 GMT (envelope-from marcel@freebsd.org) Date: Thu, 28 Apr 2005 04:29:27 GMT Message-Id: <200504280429.j3S4TR1c095584@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 Subject: PERFORCE change 76116 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2005 04:29:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=76116 Change 76116 by marcel@marcel_nfs on 2005/04/28 04:28:59 IFC @76114 Affected files ... .. //depot/projects/tty/bin/csh/Makefile#5 integrate .. //depot/projects/tty/bin/csh/config.h#4 integrate .. //depot/projects/tty/bin/csh/config_p.h#1 branch .. //depot/projects/tty/contrib/bsnmp/NEWS#5 integrate .. //depot/projects/tty/contrib/bsnmp/VERSION#5 integrate .. //depot/projects/tty/contrib/bsnmp/gensnmptree/gensnmptree.c#5 integrate .. //depot/projects/tty/contrib/bsnmp/oid-list#2 integrate .. //depot/projects/tty/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#1 branch .. //depot/projects/tty/contrib/bsnmp/snmp_ntp/NTP-MIB.txt#1 branch .. //depot/projects/tty/contrib/bsnmp/snmp_ntp/NTP-PROXY-MIB.txt#1 branch .. //depot/projects/tty/contrib/bsnmp/snmp_ntp/ntp_tree.def#1 branch .. //depot/projects/tty/contrib/bsnmp/snmp_ntp/snmp_ntp.c#1 branch .. //depot/projects/tty/contrib/bsnmp/snmpd/main.c#5 integrate .. //depot/projects/tty/contrib/ipfilter/.cvsignore#1 branch .. //depot/projects/tty/contrib/ipfilter/BNF#2 integrate .. //depot/projects/tty/contrib/ipfilter/BSD/.cvsignore#1 branch .. //depot/projects/tty/contrib/ipfilter/BSD/Makefile#3 integrate .. //depot/projects/tty/contrib/ipfilter/BSD/Makefile.ipsend#2 integrate .. //depot/projects/tty/contrib/ipfilter/BSD/kupgrade#4 integrate .. //depot/projects/tty/contrib/ipfilter/BSD/make-devices#2 integrate .. //depot/projects/tty/contrib/ipfilter/FWTK/fwtk-2.1-transparency.txt#2 delete .. //depot/projects/tty/contrib/ipfilter/FWTK/fwtk_transparent.diff#2 integrate .. //depot/projects/tty/contrib/ipfilter/FWTK/fwtkp#2 integrate .. //depot/projects/tty/contrib/ipfilter/FWTK/tproxy.diff#2 delete .. //depot/projects/tty/contrib/ipfilter/FreeBSD-2.2/files.diffs#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD-2.2/kinstall#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD-3/kinstall#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4#3 delete .. //depot/projects/tty/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2#1 branch .. //depot/projects/tty/contrib/ipfilter/FreeBSD-4.0/kinstall#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD-4.0/unkinstall#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD/files.diffs#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD/files.newconf.diffs#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD/files.oldconf.diffs#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD/filez.diffs#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD/kinstall#2 integrate .. //depot/projects/tty/contrib/ipfilter/HISTORY#4 integrate .. //depot/projects/tty/contrib/ipfilter/INST.FreeBSD-2.2#2 integrate .. //depot/projects/tty/contrib/ipfilter/INSTALL.FreeBSD#2 integrate .. //depot/projects/tty/contrib/ipfilter/IPFILTER.LICENCE#2 integrate .. //depot/projects/tty/contrib/ipfilter/Makefile#5 integrate .. //depot/projects/tty/contrib/ipfilter/README#2 integrate .. //depot/projects/tty/contrib/ipfilter/STYLE.TXT#1 branch .. //depot/projects/tty/contrib/ipfilter/UPGRADE_NOTICE#2 delete .. //depot/projects/tty/contrib/ipfilter/WhatsNew40.txt#1 branch .. //depot/projects/tty/contrib/ipfilter/bpf-ipf.h#1 branch .. //depot/projects/tty/contrib/ipfilter/bpf.h#2 delete .. //depot/projects/tty/contrib/ipfilter/bpf_filter.c#1 branch .. //depot/projects/tty/contrib/ipfilter/bsdinstall#2 integrate .. //depot/projects/tty/contrib/ipfilter/common.c#4 delete .. //depot/projects/tty/contrib/ipfilter/etc/protocols#2 integrate .. //depot/projects/tty/contrib/ipfilter/etc/services#2 integrate .. //depot/projects/tty/contrib/ipfilter/facpri.c#2 delete .. //depot/projects/tty/contrib/ipfilter/facpri.h#2 delete .. //depot/projects/tty/contrib/ipfilter/fils.c#4 delete .. //depot/projects/tty/contrib/ipfilter/inet_addr.c#2 delete .. //depot/projects/tty/contrib/ipfilter/ip_fil.c#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_fil_freebsd.c#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_htable.c#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_htable.h#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_irc_pxy.c#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_lfil.c#3 delete .. //depot/projects/tty/contrib/ipfilter/ip_lookup.c#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_lookup.h#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_msnrpc_pxy.c#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_pool.c#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_pool.h#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_pptp_pxy.c#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_rpcb_pxy.c#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_scan.c#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_scan.h#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_sfil.c#4 delete .. //depot/projects/tty/contrib/ipfilter/ip_sync.c#1 branch .. //depot/projects/tty/contrib/ipfilter/ip_sync.h#1 branch .. //depot/projects/tty/contrib/ipfilter/ipf.c#4 delete .. //depot/projects/tty/contrib/ipfilter/ipf.h#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipfs.c#4 delete .. //depot/projects/tty/contrib/ipfilter/ipft_ef.c#4 delete .. //depot/projects/tty/contrib/ipfilter/ipft_hx.c#3 delete .. //depot/projects/tty/contrib/ipfilter/ipft_pc.c#3 delete .. //depot/projects/tty/contrib/ipfilter/ipft_sn.c#3 delete .. //depot/projects/tty/contrib/ipfilter/ipft_td.c#4 delete .. //depot/projects/tty/contrib/ipfilter/ipft_tx.c#3 delete .. //depot/projects/tty/contrib/ipfilter/iplang/.cvsignore#1 branch .. //depot/projects/tty/contrib/ipfilter/iplang/Makefile#2 integrate .. //depot/projects/tty/contrib/ipfilter/iplang/iplang.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/iplang/iplang_l.l#3 integrate .. //depot/projects/tty/contrib/ipfilter/iplang/iplang_y.y#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipmon.c#5 delete .. //depot/projects/tty/contrib/ipfilter/ipmon.h#1 branch .. //depot/projects/tty/contrib/ipfilter/ipnat.c#4 delete .. //depot/projects/tty/contrib/ipfilter/ipsd/Celler/ip_compat.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsd/Makefile#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsd/ipsd.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsd/ipsd.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsd/ipsdr.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsd/linux.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsd/sbpf.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsd/sdlpi.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsd/slinux.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsd/snit.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/.OLD/ip_compat.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/.cvsignore#1 branch .. //depot/projects/tty/contrib/ipfilter/ipsend/44arp.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/Makefile#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/arp.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/dlcommon.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/dltest.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/hpux.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/in_var.h#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ip.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ip_var.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipresend.1#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipresend.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipsend.1#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipsend.5#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipsend.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipsend.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipsopt.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/iptest.1#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/iptest.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/iptests.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/larp.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/linux.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/lsock.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/resend.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/sbpf.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/sdlpi.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/sirix.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/slinux.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/snit.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/sock.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/sockraw.c#1 branch .. //depot/projects/tty/contrib/ipfilter/ipsend/tcpip.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ultrix.c#2 delete .. //depot/projects/tty/contrib/ipfilter/ipt.c#5 delete .. //depot/projects/tty/contrib/ipfilter/ipt.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/kmem.c#5 delete .. //depot/projects/tty/contrib/ipfilter/kmem.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/l4check/http.ok#2 integrate .. //depot/projects/tty/contrib/ipfilter/l4check/l4check.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/Makefile#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/addicmp.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/addipopt.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/addkeep.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/bcopywrap.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/binprint.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/buildopts.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/checkrev.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/count4bits.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/count6bits.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/debug.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/extras.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/facpri.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/facpri.h#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/fill6bits.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/flags.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/genmask.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/gethost.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/getifname.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/getline.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/getnattype.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/getport.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/getportproto.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/getproto.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/getsumd.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/hexdump.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/hostmask.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/hostname.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/hostnum.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/icmpcode.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/inet_addr.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/initparse.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/ionames.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/ipf_dotuning.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/ipft_ef.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/ipft_hx.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/ipft_pc.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/ipft_sn.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/ipft_td.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/ipft_tx.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/ipoptsec.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/kmem.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/kmem.h#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/kmemcpywrap.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/kvatoname.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/load_hash.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/load_hashnode.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/load_pool.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/load_poolnode.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/loglevel.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/make_range.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/mutex_emul.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/nametokva.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/nat_setgroupmap.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/natparse.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/ntomask.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/optname.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/optprint.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/optprintv6.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/optvalue.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/parse.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/portname.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/portnum.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/ports.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/print_toif.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printactivenat.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printaps.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printbuf.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printfr.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printfraginfo.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printhash.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printhashnode.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printhostmap.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printhostmask.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printifname.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printip.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printlog.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printmask.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printnat.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printpacket.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printpacket6.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printpool.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printpoolnode.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printportcmp.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printsbuf.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printstate.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/printtunable.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/ratoi.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/ratoui.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/remove_hash.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/remove_hashnode.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/remove_pool.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/remove_poolnode.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/resetlexer.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/rwlock_emul.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/tcp_flags.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/tcpflags.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/tcpoptnames.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/to_interface.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/v6ionames.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/v6optvalue.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/var.c#1 branch .. //depot/projects/tty/contrib/ipfilter/lib/verbose.c#1 branch .. //depot/projects/tty/contrib/ipfilter/man/Makefile#2 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipf.4#2 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipf.5#4 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipf.8#4 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipfilter.4#1 branch .. //depot/projects/tty/contrib/ipfilter/man/ipfilter.4.mandoc#1 branch .. //depot/projects/tty/contrib/ipfilter/man/ipfs.8#3 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipfstat.8#4 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipftest.1#3 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipl.4#3 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipmon.5#1 branch .. //depot/projects/tty/contrib/ipfilter/man/ipmon.8#5 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipnat.5#4 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipnat.8#3 integrate .. //depot/projects/tty/contrib/ipfilter/man/ippool.5#1 branch .. //depot/projects/tty/contrib/ipfilter/man/ippool.8#1 branch .. //depot/projects/tty/contrib/ipfilter/man/ipscan.5#1 branch .. //depot/projects/tty/contrib/ipfilter/man/ipscan.8#1 branch .. //depot/projects/tty/contrib/ipfilter/man/mkfilters.1#2 integrate .. //depot/projects/tty/contrib/ipfilter/md5.c#1 branch .. //depot/projects/tty/contrib/ipfilter/md5.h#1 branch .. //depot/projects/tty/contrib/ipfilter/misc.c#3 delete .. //depot/projects/tty/contrib/ipfilter/ml_ipl.c#2 delete .. //depot/projects/tty/contrib/ipfilter/mlf_ipl.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/mlf_rule.c#1 branch .. //depot/projects/tty/contrib/ipfilter/mlfk_rule.c#1 branch .. //depot/projects/tty/contrib/ipfilter/mlh_rule.c#1 branch .. //depot/projects/tty/contrib/ipfilter/mli_ipl.c#3 delete .. //depot/projects/tty/contrib/ipfilter/mln_ipl.c#4 delete .. //depot/projects/tty/contrib/ipfilter/mls_ipl.c#2 delete .. //depot/projects/tty/contrib/ipfilter/natparse.c#4 delete .. //depot/projects/tty/contrib/ipfilter/net/.cvsignore#1 branch .. //depot/projects/tty/contrib/ipfilter/opt.c#3 delete .. //depot/projects/tty/contrib/ipfilter/opts.h#1 branch .. //depot/projects/tty/contrib/ipfilter/parse.c#4 delete .. //depot/projects/tty/contrib/ipfilter/pcap-ipf.h#1 branch .. //depot/projects/tty/contrib/ipfilter/pcap.h#2 delete .. //depot/projects/tty/contrib/ipfilter/perl/ipf-mrtg.pl#2 integrate .. //depot/projects/tty/contrib/ipfilter/perl/ipfmeta.pl#1 branch .. //depot/projects/tty/contrib/ipfilter/perl/logfilter.pl#2 integrate .. //depot/projects/tty/contrib/ipfilter/printnat.c#4 delete .. //depot/projects/tty/contrib/ipfilter/printstate.c#4 delete .. //depot/projects/tty/contrib/ipfilter/radix.c#1 branch .. //depot/projects/tty/contrib/ipfilter/radix_ipf.h#1 branch .. //depot/projects/tty/contrib/ipfilter/relay.c#3 delete .. //depot/projects/tty/contrib/ipfilter/rules/.cvsignore#1 branch .. //depot/projects/tty/contrib/ipfilter/rules/example.1#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.10#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.11#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.12#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.13#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.2#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.3#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.4#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.5#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.6#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.7#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.8#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.9#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/example.sr#2 integrate .. //depot/projects/tty/contrib/ipfilter/rules/ip_rules#1 branch .. //depot/projects/tty/contrib/ipfilter/rules/ipmon.conf#1 branch .. //depot/projects/tty/contrib/ipfilter/rules/pool.conf#1 branch .. //depot/projects/tty/contrib/ipfilter/samples/.cvsignore#1 branch .. //depot/projects/tty/contrib/ipfilter/samples/Makefile#2 integrate .. //depot/projects/tty/contrib/ipfilter/samples/ipfilter-pb.gif#2 integrate .. //depot/projects/tty/contrib/ipfilter/samples/proxy.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/samples/relay.c#1 branch .. //depot/projects/tty/contrib/ipfilter/samples/userauth.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/snoop.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/solaris.c#2 delete .. //depot/projects/tty/contrib/ipfilter/test/.cvsignore#1 branch .. //depot/projects/tty/contrib/ipfilter/test/Makefile#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/bpftest#1 branch .. //depot/projects/tty/contrib/ipfilter/test/dotest#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/dotest6#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/bpf-f1#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/bpf1#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/f17#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i1#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i11#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i12#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i13#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/i14#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/i15#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/i2#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i3#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i4#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i5#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i6#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i7#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/i9#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/in1#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/in2#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/in5#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/in6#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/ip1#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/l1#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/l1.b#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/n1#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/n10#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/n11#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/n12#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/n4#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/n5#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/n7#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/n8#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/n9#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/ni1#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/ni10#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/ni11#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/ni12#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/ni13#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/ni14#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/ni15#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/ni16#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/ni2#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/ni3#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/ni4#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/ni5#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/ni6#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/ni7#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/ni8#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/ni9#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/p1#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/p2#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/p3#1 branch .. //depot/projects/tty/contrib/ipfilter/test/hextest#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/f11#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/f12#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/f13#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/f17#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/ipv6.1#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/l1#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/n1#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/n10#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/n11#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/n12#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/n4#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/n8#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/n9#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/ni1#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/ni10#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/ni12#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/ni13#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/ni14#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/ni15#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/ni16#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/ni6#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/ni7#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/ni9#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/p1#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/p2#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/p3#1 branch .. //depot/projects/tty/contrib/ipfilter/test/intest#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/iptest#1 branch .. //depot/projects/tty/contrib/ipfilter/test/itest#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/logtest#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/mhtest#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/mtest#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/natipftest#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/nattest#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/ptest#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/bpf-f1#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/bpf1#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/i1#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i11#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i12#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i13#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/i14#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/i15#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/i2#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i3#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i4#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i6#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i9#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/in1#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/in2#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/in5#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/in6#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ip1#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/n10#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/n11#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/n12#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/n4#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/n7#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/n8#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/n9#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni10.nat#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/ni11.nat#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/ni12.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni12.nat#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni13.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni13.nat#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni14.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni14.nat#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni15.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni15.nat#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni16.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni16.nat#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni6.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni6.nat#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni7.nat#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/ni8.nat#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/ni9.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/ni9.nat#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/p1.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/p1.pool#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/p2.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/p3.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/p3.pool#1 branch .. //depot/projects/tty/contrib/ipfilter/test/test.format#1 branch .. //depot/projects/tty/contrib/ipfilter/test/vfycksum.pl#2 integrate .. //depot/projects/tty/contrib/ipfilter/todo#2 delete .. //depot/projects/tty/contrib/ipfilter/tools/BNF.ipf#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/BNF.ipnat#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/Makefile#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipf.c#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipf_y.y#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipfcomp.c#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipfs.c#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipfstat.c#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipftest.c#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipmon.c#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipmon_y.y#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipnat.c#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipnat_y.y#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ippool.c#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ippool_y.y#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipscan_y.y#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipsyncm.c#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/ipsyncs.c#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/lex_var.h#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/lexer.c#1 branch .. //depot/projects/tty/contrib/ipfilter/tools/lexer.h#1 branch .. //depot/projects/tty/contrib/tcsh/Fixes#3 integrate .. //depot/projects/tty/contrib/tcsh/Imakefile#3 integrate .. //depot/projects/tty/contrib/tcsh/Makefile.in#3 integrate .. //depot/projects/tty/contrib/tcsh/Makefile.std#2 integrate .. //depot/projects/tty/contrib/tcsh/Makefile.vms#2 integrate .. //depot/projects/tty/contrib/tcsh/README#3 integrate .. //depot/projects/tty/contrib/tcsh/complete.tcsh#3 integrate .. //depot/projects/tty/contrib/tcsh/config.h.in#2 integrate .. //depot/projects/tty/contrib/tcsh/config/bsd4.4#3 integrate .. //depot/projects/tty/contrib/tcsh/config_f.h#3 integrate .. //depot/projects/tty/contrib/tcsh/configure#3 integrate .. //depot/projects/tty/contrib/tcsh/configure.in#3 integrate .. //depot/projects/tty/contrib/tcsh/ed.chared.c#2 integrate .. //depot/projects/tty/contrib/tcsh/ed.decls.h#2 integrate .. //depot/projects/tty/contrib/tcsh/ed.defns.c#2 integrate .. //depot/projects/tty/contrib/tcsh/ed.h#2 integrate .. //depot/projects/tty/contrib/tcsh/ed.init.c#2 integrate .. //depot/projects/tty/contrib/tcsh/ed.inputl.c#2 integrate .. //depot/projects/tty/contrib/tcsh/ed.refresh.c#3 integrate .. //depot/projects/tty/contrib/tcsh/ed.screen.c#3 integrate .. //depot/projects/tty/contrib/tcsh/ed.term.c#3 integrate .. //depot/projects/tty/contrib/tcsh/ed.term.h#2 integrate .. //depot/projects/tty/contrib/tcsh/ed.xmap.c#2 integrate .. //depot/projects/tty/contrib/tcsh/gethost.c#3 integrate .. //depot/projects/tty/contrib/tcsh/glob.c#3 integrate .. //depot/projects/tty/contrib/tcsh/glob.h#3 integrate .. //depot/projects/tty/contrib/tcsh/host.defs#3 integrate .. //depot/projects/tty/contrib/tcsh/install-sh#2 integrate .. //depot/projects/tty/contrib/tcsh/ma.setp.c#3 integrate .. //depot/projects/tty/contrib/tcsh/nls/C/set11#2 integrate .. //depot/projects/tty/contrib/tcsh/nls/ja/set1#2 integrate .. //depot/projects/tty/contrib/tcsh/nls/ja/set3#1 branch .. //depot/projects/tty/contrib/tcsh/nls/ja/set4#1 branch .. //depot/projects/tty/contrib/tcsh/nls/ja/set7#1 branch .. //depot/projects/tty/contrib/tcsh/patchlevel.h#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.c#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.char.h#2 integrate .. //depot/projects/tty/contrib/tcsh/sh.decls.h#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.dir.c#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.dol.c#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.err.c#2 integrate .. //depot/projects/tty/contrib/tcsh/sh.exec.c#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.exp.c#2 integrate .. //depot/projects/tty/contrib/tcsh/sh.file.c#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.func.c#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.glob.c#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.h#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.hist.c#2 integrate .. //depot/projects/tty/contrib/tcsh/sh.init.c#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.lex.c#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.misc.c#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.parse.c#2 integrate .. //depot/projects/tty/contrib/tcsh/sh.print.c#2 integrate .. //depot/projects/tty/contrib/tcsh/sh.proc.c#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.proc.h#2 integrate .. //depot/projects/tty/contrib/tcsh/sh.sem.c#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.set.c#3 integrate .. //depot/projects/tty/contrib/tcsh/sh.time.c#2 integrate .. //depot/projects/tty/contrib/tcsh/sh.types.h#3 integrate .. //depot/projects/tty/contrib/tcsh/tc.alloc.c#2 integrate .. //depot/projects/tty/contrib/tcsh/tc.bind.c#2 integrate .. //depot/projects/tty/contrib/tcsh/tc.const.c#3 integrate .. //depot/projects/tty/contrib/tcsh/tc.decls.h#3 integrate .. //depot/projects/tty/contrib/tcsh/tc.disc.c#2 integrate .. //depot/projects/tty/contrib/tcsh/tc.func.c#3 integrate .. //depot/projects/tty/contrib/tcsh/tc.h#2 integrate .. //depot/projects/tty/contrib/tcsh/tc.nls.c#1 branch .. //depot/projects/tty/contrib/tcsh/tc.nls.h#1 branch .. //depot/projects/tty/contrib/tcsh/tc.os.c#3 integrate .. //depot/projects/tty/contrib/tcsh/tc.os.h#3 integrate .. //depot/projects/tty/contrib/tcsh/tc.printf.c#3 integrate .. //depot/projects/tty/contrib/tcsh/tc.prompt.c#3 integrate .. //depot/projects/tty/contrib/tcsh/tc.sched.c#2 integrate .. //depot/projects/tty/contrib/tcsh/tc.sig.c#2 integrate .. //depot/projects/tty/contrib/tcsh/tc.sig.h#2 integrate .. //depot/projects/tty/contrib/tcsh/tc.str.c#3 integrate .. //depot/projects/tty/contrib/tcsh/tc.vers.c#2 integrate .. //depot/projects/tty/contrib/tcsh/tc.wait.h#2 integrate .. //depot/projects/tty/contrib/tcsh/tc.who.c#3 integrate .. //depot/projects/tty/contrib/tcsh/tcsh.man#3 integrate .. //depot/projects/tty/contrib/tcsh/tcsh.man2html#2 integrate .. //depot/projects/tty/contrib/tcsh/tw.color.c#3 integrate .. //depot/projects/tty/contrib/tcsh/tw.comp.c#3 integrate .. //depot/projects/tty/contrib/tcsh/tw.decls.h#2 integrate .. //depot/projects/tty/contrib/tcsh/tw.h#2 integrate .. //depot/projects/tty/contrib/tcsh/tw.help.c#3 integrate .. //depot/projects/tty/contrib/tcsh/tw.init.c#2 integrate .. //depot/projects/tty/contrib/tcsh/tw.parse.c#3 integrate .. //depot/projects/tty/contrib/tcsh/tw.spell.c#2 integrate .. //depot/projects/tty/contrib/tcsh/vms.termcap.c#2 integrate .. //depot/projects/tty/etc/rc.d/named#4 integrate .. //depot/projects/tty/games/fortune/datfiles/startrek#4 integrate .. //depot/projects/tty/include/Makefile#13 integrate .. //depot/projects/tty/include/netdb.h#6 integrate .. //depot/projects/tty/lib/libc/i386/gen/_set_tp.c#4 integrate .. //depot/projects/tty/lib/libc/i386/sys/Makefile.inc#5 integrate .. //depot/projects/tty/lib/libc/i386/sys/_amd64_get_fsbase.c#3 delete .. //depot/projects/tty/lib/libc/i386/sys/_amd64_get_gsbase.c#3 delete .. //depot/projects/tty/lib/libc/i386/sys/_amd64_set_fsbase.c#2 delete .. //depot/projects/tty/lib/libc/i386/sys/_amd64_set_gsbase.c#2 delete .. //depot/projects/tty/lib/libc/net/gethostbydns.c#6 integrate .. //depot/projects/tty/lib/libc/net/gethostbyht.c#3 integrate .. //depot/projects/tty/lib/libc/net/gethostbyname.3#6 integrate .. //depot/projects/tty/lib/libc/net/gethostbynis.c#3 integrate .. //depot/projects/tty/lib/libc/net/gethostnamadr.c#4 integrate .. //depot/projects/tty/lib/libc/net/getnetbyht.c#3 integrate .. //depot/projects/tty/lib/libc/net/getnetnamadr.c#3 integrate .. //depot/projects/tty/lib/libc/net/getprotoent.3#4 integrate .. //depot/projects/tty/lib/libc/net/getservent.3#3 integrate .. //depot/projects/tty/lib/libc/net/name6.c#9 integrate .. //depot/projects/tty/lib/libc/net/netdb_private.h#2 integrate .. //depot/projects/tty/lib/libc/regex/cclass.h#2 delete .. //depot/projects/tty/lib/libdevstat/devstat.c#7 integrate .. //depot/projects/tty/lib/libnetgraph/debug.c#2 integrate .. //depot/projects/tty/lib/libnetgraph/msg.c#5 integrate .. //depot/projects/tty/lib/libnetgraph/sock.c#5 integrate .. //depot/projects/tty/lib/libpthread/arch/i386/i386/pthread_md.c#5 integrate .. //depot/projects/tty/lib/libpthread/arch/i386/include/pthread_md.h#7 integrate .. //depot/projects/tty/lib/libz/ChangeLog#3 integrate .. //depot/projects/tty/lib/libz/FAQ#3 integrate .. //depot/projects/tty/lib/libz/README#3 integrate .. //depot/projects/tty/lib/libz/gzio.c#4 integrate .. //depot/projects/tty/lib/libz/zconf.h#3 integrate .. //depot/projects/tty/lib/libz/zlib.h#3 integrate .. //depot/projects/tty/libexec/rtld-elf/i386/reloc.c#6 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 integrate .. //depot/projects/tty/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml#2 integrate .. //depot/projects/tty/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#6 integrate .. //depot/projects/tty/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl#2 integrate .. //depot/projects/tty/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#2 integrate .. //depot/projects/tty/sbin/Makefile#12 integrate .. //depot/projects/tty/sbin/geom/class/stripe/gstripe.8#5 integrate .. //depot/projects/tty/sbin/gpt/add.c#5 integrate .. //depot/projects/tty/sbin/gpt/gpt.8#5 integrate .. //depot/projects/tty/sbin/gpt/gpt.c#4 integrate .. //depot/projects/tty/sbin/gpt/gpt.h#4 integrate .. //depot/projects/tty/sbin/gpt/remove.c#3 integrate .. //depot/projects/tty/sbin/ipf/Makefile#5 integrate .. //depot/projects/tty/sbin/ipf/Makefile.inc#1 branch .. //depot/projects/tty/sbin/ipf/ipf/Makefile#1 branch .. //depot/projects/tty/sbin/ipf/ipfs/Makefile#1 branch .. //depot/projects/tty/sbin/ipf/ipfstat/Makefile#1 branch .. //depot/projects/tty/sbin/ipf/ipftest/Makefile#1 branch .. //depot/projects/tty/sbin/ipf/ipmon/Makefile#1 branch .. //depot/projects/tty/sbin/ipf/ipnat/Makefile#1 branch .. //depot/projects/tty/sbin/ipf/ippool/Makefile#1 branch .. //depot/projects/tty/sbin/ipf/ipresend/Makefile#1 branch .. //depot/projects/tty/sbin/ipf/ipsend/Makefile#1 branch .. //depot/projects/tty/sbin/ipf/iptest/Makefile#1 branch .. //depot/projects/tty/sbin/ipf/libipf/Makefile#1 branch .. //depot/projects/tty/sbin/ipf/rules/Makefile#1 branch .. //depot/projects/tty/sbin/ipfs/Makefile#4 delete .. //depot/projects/tty/sbin/ipfstat/Makefile#4 delete .. //depot/projects/tty/sbin/ipfw/ipfw2.c#12 integrate .. //depot/projects/tty/sbin/ipmon/Makefile#6 delete .. //depot/projects/tty/sbin/ipnat/Makefile#4 delete .. //depot/projects/tty/share/man/man4/sk.4#7 integrate .. //depot/projects/tty/share/man/man5/nsswitch.conf.5#4 integrate .. //depot/projects/tty/share/man/man5/rc.conf.5#16 integrate .. //depot/projects/tty/share/mk/sys.mk#9 integrate .. //depot/projects/tty/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/tty/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/tty/sys/boot/i386/boot0/Makefile#5 integrate .. //depot/projects/tty/sys/compat/linux/linux_misc.c#13 integrate .. //depot/projects/tty/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/tty/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/tty/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/tty/sys/compat/ndis/subr_hal.c#5 integrate .. //depot/projects/tty/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/tty/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/tty/sys/conf/NOTES#18 integrate .. //depot/projects/tty/sys/conf/files#21 integrate .. //depot/projects/tty/sys/conf/files.amd64#14 integrate .. //depot/projects/tty/sys/conf/files.i386#18 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/fil.c#6 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_auth.h#3 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_compat.h#6 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_fil.c#8 delete .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_frag.c#5 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_frag.h#3 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#4 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_htable.c#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_htable.h#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_log.c#7 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_lookup.c#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_lookup.h#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_nat.c#5 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_nat.h#5 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_pool.c#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_pool.h#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_proxy.c#5 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_proxy.h#3 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#3 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#4 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_rules.c#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_rules.h#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_scan.c#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_scan.h#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_state.c#6 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_state.h#4 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_sync.c#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_sync.h#1 branch .. //depot/projects/tty/sys/contrib/ipfilter/netinet/ipl.h#4 integrate .. //depot/projects/tty/sys/contrib/ipfilter/netinet/mlfk_ipl.c#7 integrate .. //depot/projects/tty/sys/dev/ata/ata-card.c#12 integrate .. //depot/projects/tty/sys/dev/ata/ata-cbus.c#8 integrate .. //depot/projects/tty/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/tty/sys/dev/ata/ata-isa.c#10 integrate .. //depot/projects/tty/sys/dev/ata/ata-pci.c#12 integrate .. //depot/projects/tty/sys/dev/ata/ata-raid.c#14 integrate .. //depot/projects/tty/sys/dev/bge/if_bge.c#16 integrate .. //depot/projects/tty/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/tty/sys/dev/esp/ncr53c9x.c#4 integrate .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_amd.c#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_intel.c#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_mod.c#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_pentium.c#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_piv.c#1 branch .. //depot/projects/tty/sys/dev/hwpmc/hwpmc_ppro.c#1 branch .. //depot/projects/tty/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/tty/sys/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/tty/sys/dev/if_ndis/if_ndis_pci.c#5 integrate .. //depot/projects/tty/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/tty/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/tty/sys/dev/ips/ips.c#7 integrate .. //depot/projects/tty/sys/dev/musycc/musycc.c#9 delete .. //depot/projects/tty/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/tty/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/tty/sys/dev/sound/usb/uaudio.h#3 integrate .. //depot/projects/tty/sys/dev/sound/usb/uaudio_pcm.c#7 integrate .. //depot/projects/tty/sys/dev/uart/uart_dev_z8530.c#6 integrate .. //depot/projects/tty/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/tty/sys/fs/unionfs/union_subr.c#9 integrate .. //depot/projects/tty/sys/fs/unionfs/union_vfsops.c#10 integrate .. //depot/projects/tty/sys/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/tty/sys/hwpmc/hwpmc_amd.c#2 delete .. //depot/projects/tty/sys/hwpmc/hwpmc_intel.c#2 delete .. //depot/projects/tty/sys/hwpmc/hwpmc_mod.c#2 delete .. //depot/projects/tty/sys/hwpmc/hwpmc_pentium.c#2 delete .. //depot/projects/tty/sys/hwpmc/hwpmc_piv.c#2 delete .. //depot/projects/tty/sys/hwpmc/hwpmc_ppro.c#2 delete .. //depot/projects/tty/sys/i386/conf/NOTES#18 integrate .. //depot/projects/tty/sys/i386/ibcs2/imgact_coff.c#8 integrate .. //depot/projects/tty/sys/kern/kern_exec.c#15 integrate .. //depot/projects/tty/sys/kern/subr_taskqueue.c#8 integrate .. //depot/projects/tty/sys/kern/uipc_usrreq.c#11 integrate .. //depot/projects/tty/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/tty/sys/kern/vfs_vnops.c#11 integrate .. //depot/projects/tty/sys/libkern/crc32.c#4 integrate .. //depot/projects/tty/sys/modules/Makefile#18 integrate .. //depot/projects/tty/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/tty/sys/modules/if_ndis/Makefile#2 integrate .. //depot/projects/tty/sys/modules/ipfilter/Makefile#6 integrate .. //depot/projects/tty/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/tty/sys/netinet/ip_icmp.h#6 integrate .. //depot/projects/tty/sys/netinet/libalias/HISTORY#1 branch .. //depot/projects/tty/sys/netinet/libalias/Makefile#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias.c#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias.h#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias_cuseeme.c#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias_db.c#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias_ftp.c#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias_irc.c#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias_local.h#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias_nbt.c#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias_old.c#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias_pptp.c#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias_proxy.c#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias_skinny.c#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias_smedia.c#1 branch .. //depot/projects/tty/sys/netinet/libalias/alias_util.c#1 branch .. //depot/projects/tty/sys/netinet/libalias/libalias.3#1 branch .. //depot/projects/tty/sys/nfs4client/nfs4_vnops.c#6 integrate .. //depot/projects/tty/sys/nfsclient/bootp_subr.c#11 integrate .. //depot/projects/tty/sys/nfsclient/nfs_diskless.c#8 integrate .. //depot/projects/tty/sys/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/tty/sys/pci/if_sk.c#13 integrate .. //depot/projects/tty/sys/sparc64/pci/apb.c#6 integrate .. //depot/projects/tty/sys/sys/_task.h#4 integrate .. //depot/projects/tty/sys/sys/libkern.h#7 integrate .. //depot/projects/tty/sys/sys/namei.h#6 integrate .. //depot/projects/tty/sys/sys/param.h#15 integrate .. //depot/projects/tty/sys/sys/pcpu.h#5 integrate .. //depot/projects/tty/sys/sys/systm.h#10 integrate .. //depot/projects/tty/sys/sys/taskqueue.h#7 integrate .. //depot/projects/tty/sys/sys/vnode.h#13 integrate .. //depot/projects/tty/sys/vm/swap_pager.c#12 integrate .. //depot/projects/tty/sys/vm/vm_init.c#6 integrate .. //depot/projects/tty/tools/regression/tls/Makefile#2 integrate .. //depot/projects/tty/tools/regression/tls/ttls4/Makefile#1 branch .. //depot/projects/tty/tools/regression/tls/ttls4/ttls4.c#1 branch .. //depot/projects/tty/usr.bin/tar/Makefile#5 integrate .. //depot/projects/tty/usr.bin/tar/Makefile.am#3 integrate .. //depot/projects/tty/usr.bin/tar/fts.c#5 delete .. //depot/projects/tty/usr.bin/tar/fts.h#2 delete .. //depot/projects/tty/usr.bin/tar/tree.c#1 branch .. //depot/projects/tty/usr.bin/tar/tree.h#1 branch .. //depot/projects/tty/usr.bin/tar/write.c#5 integrate .. //depot/projects/tty/usr.sbin/Makefile#18 integrate .. //depot/projects/tty/usr.sbin/bsnmpd/bsnmpd/Makefile#4 integrate .. //depot/projects/tty/usr.sbin/ipftest/Makefile#3 delete .. //depot/projects/tty/usr.sbin/ipresend/Makefile#3 delete .. //depot/projects/tty/usr.sbin/ipsend/Makefile#3 delete .. //depot/projects/tty/usr.sbin/iptest/Makefile#3 delete .. //depot/projects/tty/usr.sbin/ndiscvt/Makefile#3 integrate .. //depot/projects/tty/usr.sbin/ndiscvt/ndisgen.8#1 branch .. //depot/projects/tty/usr.sbin/ndiscvt/ndisgen.sh#1 branch .. //depot/projects/tty/usr.sbin/ndiscvt/windrv_stub.c#1 branch Differences ... ==== //depot/projects/tty/bin/csh/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.35 2004/02/23 20:05:14 johan Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.36 2005/04/24 19:44:43 mp Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -27,7 +27,7 @@ SRCS+= ed.chared.c ed.decls.h ed.defns.c ed.h ed.init.c ed.inputl.c \ ed.refresh.c ed.screen.c ed.xmap.c ed.term.c ed.term.h SRCS+= tc.alloc.c tc.bind.c tc.const.c tc.decls.h tc.disc.c \ - tc.func.c tc.os.c tc.os.h tc.printf.c tc.prompt.c \ + tc.func.c tc.nls.c tc.os.c tc.os.h tc.printf.c tc.prompt.c \ tc.sched.c tc.sig.c tc.sig.h tc.str.c sh.types.h tc.vers.c tc.wait.h \ tc.who.c tc.h GENHDRS= ed.defns.h sh.err.h tc.const.h tc.defs.c ==== //depot/projects/tty/bin/csh/config.h#4 (text+ko) ==== @@ -1,168 +1,207 @@ +/* $FreeBSD: src/bin/csh/config.h,v 1.11 2005/04/24 19:50:22 mp Exp $ */ /* config.h. Generated by configure. */ -/* - * config.h -- configure various defines for tcsh - * - * All source files should #include this FIRST. - * - * Edit this to match your system type. - */ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define to the type of elements in the array set by `getgroups'. Usually + this is either `int' or `gid_t'. */ +#define GETGROUPS_T gid_t + +/* Define to 1 if the `getpgrp' function requires zero arguments. */ +#define GETPGRP_VOID 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_AUTH_H */ + +/* Define to 1 if you have the declaration of `gethostname', and to 0 if you + don't. */ +#define HAVE_DECL_GETHOSTNAME 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the `dup2' function. */ +#define HAVE_DUP2 1 + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `gethostname' function. */ +#define HAVE_GETHOSTNAME 1 + +/* Define to 1 if you have the `getpwent' function. */ +#define HAVE_GETPWENT 1 + +/* Define to 1 if you have the `getutent' function. */ +/* #undef HAVE_GETUTENT */ + +/* Define to 1 if you have the iconv () interface */ +/* #undef HAVE_ICONV */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if the system has the type `long long'. */ +#define HAVE_LONG_LONG 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the `nice' function. */ +#define HAVE_NICE 1 + +/* Define to 1 if you have the `nl_langinfo' function. */ +#define HAVE_NL_LANGINFO 1 + +/* Define to 1 if you have the `sbrk' function. */ +#define HAVE_SBRK 1 + +/* Define to 1 if you have the `setpgid' function. */ +#define HAVE_SETPGID 1 + +/* Define to 1 if you have the `setpriority' function. */ +#define HAVE_SETPRIORITY 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SHADOW_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strstr' function. */ +#define HAVE_STRSTR 1 + +/* Define to 1 if `d_ino' is member of `struct dirent'. */ +#define HAVE_STRUCT_DIRENT_D_INO 1 + +/* Define to 1 if `ss_family' is member of `struct sockaddr_storage'. */ +#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1 + +/* Define to 1 if `ut_host' is member of `struct utmp'. */ +/* #undef HAVE_STRUCT_UTMP_UT_HOST */ + +/* Define to 1 if `ut_tv' is member of `struct utmp'. */ +/* #undef HAVE_STRUCT_UTMP_UT_TV */ + +/* Define to 1 if `ut_user' is member of `struct utmp'. */ +/* #undef HAVE_STRUCT_UTMP_UT_USER */ + +/* Define to 1 if `ut_xtime' is member of `struct utmp'. */ +/* #undef HAVE_STRUCT_UTMP_UT_XTIME */ + +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 -/* $FreeBSD: src/bin/csh/config.h,v 1.10 2005/02/27 18:18:32 phantom Exp $ */ +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 -#ifndef _h_config -#define _h_config -/****************** System dependant compilation flags ****************/ -/* - * POSIX This system supports IEEE Std 1003.1-1988 (POSIX). - */ -#define POSIX +/* Define to 1 if you have the header file. */ +/* #undef HAVE_UTMPX_H */ -/* - * POSIXJOBS This system supports the optional IEEE Std 1003.1-1988 (POSIX) - * job control facilities. - */ -#define POSIXJOBS +/* Define to 1 if you have the header file. */ +#define HAVE_UTMP_H 1 -/* - * POSIXSIGS Use the POSIX signal facilities to emulate BSD signals. - */ -/* #undef POSIXSIGS */ +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 -/* - * VFORK This machine has a vfork(). - * It used to be that for job control to work, this define - * was mandatory. This is not the case any more. - * If you think you still need it, but you don't have vfork, - * define this anyway and then do #define vfork fork. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 28 06:02:23 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB81F16A4D0; Thu, 28 Apr 2005 06:02:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B448716A4CE for ; Thu, 28 Apr 2005 06:02:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E55A43D39 for ; Thu, 28 Apr 2005 06:02:22 +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 j3S62MoJ006115 for ; Thu, 28 Apr 2005 06:02:22 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3S62MQN006112 for perforce@freebsd.org; Thu, 28 Apr 2005 06:02:22 GMT (envelope-from marcel@freebsd.org) Date: Thu, 28 Apr 2005 06:02:22 GMT Message-Id: <200504280602.j3S62MQN006112@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 Subject: PERFORCE change 76120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2005 06:02:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=76120 Change 76120 by marcel@marcel_nfs on 2005/04/28 06:01:39 Next round of changes to allow VGA addresses across PCI-PCI bridges: o Add defines for all bits in the bridge control register to pcireg.h. Remove the one I added to pcib_private.h o Create inline versions to check for VGA address ranges in pcireg.h and remove the one I added to pci_pci.h o Have the APB driver use the new functions instead of duplicating the code. o Fix the VGA address range check to be conformant to the PCI-to-PCI Bridge architecture specification. Use <= to check the upper bound so that we use the exact same values as documented (without having the reader convert the inclusive addresses in the docs to the exclusive upper-bound addresses used in the code). Discussed with: imp, jhb BCR defines contributed by: jhb Affected files ... .. //depot/projects/tty/sys/dev/pci/pci_pci.c#10 edit .. //depot/projects/tty/sys/dev/pci/pcib_private.h#5 edit .. //depot/projects/tty/sys/dev/pci/pcireg.h#6 edit .. //depot/projects/tty/sys/dev/pci/pcivar.h#6 edit .. //depot/projects/tty/sys/sparc64/pci/apb.c#7 edit Differences ... ==== //depot/projects/tty/sys/dev/pci/pci_pci.c#10 (text+ko) ==== @@ -293,23 +293,6 @@ return (sc->iobase > 0 && sc->iobase < sc->iolimit); } -static __inline int -is_vga_resource(int type, u_long start, u_long end) -{ - switch (type) { - case SYS_RES_IOPORT: - if ((start >= 0x3b0 && end < 0x3bc) || - (start >= 0x3c0 && end < 0x3dc)) - return (1); - break; - case SYS_RES_MEMORY: - if (start >= 0xa0000 && end < 0xc0000) - return (1); - break; - } - return (0); -} - /* * We have to trap resource allocation requests and ensure that the bridge * is set up to, or capable of handling them. @@ -335,7 +318,7 @@ * Make sure we allow access to VGA I/O addresses when the * bridge has the "VGA Enable" bit set. */ - if (!ok && is_vga_resource(type, start, end)) + if (!ok && pci_is_vga_ioport_range(start, end)) ok = (sc->bridgectl & PCIB_BCR_VGA_ENABLE) ? 1 : 0; if ((sc->flags & PCIB_SUBTRACTIVE) == 0) { @@ -387,7 +370,7 @@ * Make sure we allow access to VGA memory addresses when the * bridge has the "VGA Enable" bit set. */ - if (!ok && is_vga_resource(type, start, end)) + if (!ok && pci_is_vga_memory_range(start, end)) ok = (sc->bridgectl & PCIB_BCR_VGA_ENABLE) ? 1 : 0; if ((sc->flags & PCIB_SUBTRACTIVE) == 0) { ==== //depot/projects/tty/sys/dev/pci/pcib_private.h#5 (text+ko) ==== @@ -57,7 +57,6 @@ uint32_t iolimit; /* topmost address of port window */ uint16_t secstat; /* secondary bus status register */ uint16_t bridgectl; /* bridge control register */ -#define PCIB_BCR_VGA_ENABLE (1 << 3) uint8_t seclat; /* secondary bus latency timer */ }; ==== //depot/projects/tty/sys/dev/pci/pcireg.h#6 (text+ko) ==== @@ -313,6 +313,19 @@ #define PCIC_OTHER 0xff +/* Bridge Control Values. */ +#define PCIB_BCR_PERR_ENABLE 0x0001 +#define PCIB_BCR_SERR_ENABLE 0x0002 +#define PCIB_BCR_ISA_ENABLE 0x0004 +#define PCIB_BCR_VGA_ENABLE 0x0008 +#define PCIB_BCR_MASTER_ABORT_MODE 0x0020 +#define PCIB_BCR_SECBUS_RESET 0x0040 +#define PCIB_BCR_SECBUS_BACKTOBACK 0x0080 +#define PCIB_BCR_PRI_DISCARD_TIMEOUT 0x0100 +#define PCIB_BCR_SEC_DISCARD_TIMEOUT 0x0200 +#define PCIB_BCR_DISCARD_TIMER_STATUS 0x0400 +#define PCIB_BCR_DISCARD_TIMER_SERREN 0x0800 + /* PCI power manangement */ #define PCIR_POWER_CAP 0x2 ==== //depot/projects/tty/sys/dev/pci/pcivar.h#6 (text+ko) ==== @@ -288,6 +288,24 @@ } /* + * Check if the address range falls within the VGA defined address range(s) + */ +static __inline int +pci_is_vga_ioport_range(u_long start, u_long end) +{ + + return (((start >= 0x3b0 && end <= 0x3bb) || + (start >= 0x3c0 && end <= 0x3df)) ? 1 : 0); +} + +static __inline int +pci_is_vga_memory_range(u_long start, u_long end) +{ + + return ((start >= 0xa0000 && end <= 0xbffff) ? 1 : 0); +} + +/* * PCI power states are as defined by ACPI: * * D0 State in which device is on and running. It is receiving full ==== //depot/projects/tty/sys/sparc64/pci/apb.c#7 (text+ko) ==== @@ -161,13 +161,6 @@ { int i, ei; - /* Allow the legacy VGA ranges. */ - if ((start >= 0x3b0 && end < 0x3bc) || - (start >= 0x3c0 && end < 0x3dc) || - (start >= 0xa0000 && end < 0xc0000)) - return (1); - - /* Check the map. */ i = start / scale; ei = end / scale; if (i > 7 || ei > 7) @@ -218,6 +211,7 @@ u_long start, u_long end, u_long count, u_int flags) { struct apb_softc *sc; + int ok; sc = device_get_softc(dev); @@ -240,7 +234,10 @@ */ switch (type) { case SYS_RES_IOPORT: - if (!apb_checkrange(sc->sc_iomap, APB_IO_SCALE, start, end)) { + ok = apb_checkrange(sc->sc_iomap, APB_IO_SCALE, start, end); + if (!ok && pci_is_vga_ioport_range(start, end)) + ok = 1; + if (!ok) { device_printf(dev, "device %s%d requested unsupported " "I/O range 0x%lx-0x%lx\n", device_get_name(child), device_get_unit(child), start, end); @@ -254,7 +251,10 @@ break; case SYS_RES_MEMORY: - if (!apb_checkrange(sc->sc_memmap, APB_MEM_SCALE, start, end)) { + ok = apb_checkrange(sc->sc_memmap, APB_MEM_SCALE, start, end); + if (!ok && pci_is_vga_memory_range(start, end)) + ok = 1; + if (!ok) { device_printf(dev, "device %s%d requested unsupported " "memory range 0x%lx-0x%lx\n", device_get_name(child), device_get_unit(child), From owner-p4-projects@FreeBSD.ORG Thu Apr 28 10:41:08 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8B1116A4D0; Thu, 28 Apr 2005 10:41:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5685A16A4CE for ; Thu, 28 Apr 2005 10:41:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C12D43D45 for ; Thu, 28 Apr 2005 10:41:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3SAf6pW023596 for ; Thu, 28 Apr 2005 10:41:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3SAf3pp023593 for perforce@freebsd.org; Thu, 28 Apr 2005 10:41:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 28 Apr 2005 10:41:03 GMT Message-Id: <200504281041.j3SAf3pp023593@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 Subject: PERFORCE change 76131 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2005 10:41:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=76131 Change 76131 by rwatson@rwatson_tislabs on 2005/04/28 10:40:38 Integrate TrustedBSD MAC branch from TrustedBSD base branch: pmc no NO_MIXED_MODE bsnmp update ipfilter upgrade tcsh update thread-safe and ipv6 routines for yp, etc. i386_{get,set}_gsbase/cpu_set_user_tls()/etc. libz update ipfw gets IPv6 pmc(4) NDINIT() ISOPEN flag NDIS madness p_canwait() looped back sysctl_kern_proc_pathname thr_new() root_mount_hold/root_mount_rel/root_mount_wait if_linktask for asynchronous links state change notification and more universaly use of if_link_state_change() TCP SACK fixes nfsrv_samecred() mac_bsdextended locking looped back LOP_DUPOK Affected files ... .. //depot/projects/trustedbsd/mac/UPDATING#45 integrate .. //depot/projects/trustedbsd/mac/bin/csh/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/bin/csh/config.h#5 integrate .. //depot/projects/trustedbsd/mac/bin/csh/config_p.h#1 branch .. //depot/projects/trustedbsd/mac/bin/hostname/hostname.1#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/NEWS#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/VERSION#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/oid-list#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_ntp/NTP-MIB.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_ntp/NTP-PROXY-MIB.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_ntp/ntp_tree.def#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_ntp/snmp_ntp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/main.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/login.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/patch.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/rcs.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BNF#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/Makefile.ipsend#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/kupgrade#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/make-devices#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FWTK/fwtk-2.1-transparency.txt#3 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FWTK/fwtk_transparent.diff#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FWTK/fwtkp#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FWTK/tproxy.diff#3 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-2.2/files.diffs#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-2.2/kinstall#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-3/kinstall#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4#4 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-4.0/kinstall#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-4.0/unkinstall#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD/files.diffs#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD/files.newconf.diffs#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD/files.oldconf.diffs#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD/filez.diffs#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD/kinstall#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/HISTORY#9 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/INST.FreeBSD-2.2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/INSTALL.FreeBSD#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/IPFILTER.LICENCE#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/STYLE.TXT#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/UPGRADE_NOTICE#3 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/WhatsNew40.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/bpf-ipf.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/bpf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/bpf_filter.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/bsdinstall#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/common.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/etc/protocols#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/etc/services#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/facpri.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/facpri.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/fils.c#8 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/inet_addr.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_fil.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_fil_freebsd.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_htable.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_htable.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_irc_pxy.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_lfil.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_lookup.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_lookup.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_msnrpc_pxy.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_pool.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_pool.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_pptp_pxy.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_rpcb_pxy.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_scan.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_scan.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_sfil.c#9 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_sync.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_sync.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipf.c#9 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipf.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipfs.c#8 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_ef.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_hx.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_pc.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_sn.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_td.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_tx.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/iplang/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/iplang/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/iplang/iplang.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/iplang/iplang_l.l#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/iplang/iplang_y.y#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipmon.c#9 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipmon.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipnat.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsd/Celler/ip_compat.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsd/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsd/ipsd.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsd/ipsd.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsd/ipsdr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsd/linux.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsd/sbpf.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsd/sdlpi.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsd/slinux.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsd/snit.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/.OLD/ip_compat.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/44arp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/arp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/dlcommon.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/dltest.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/hpux.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/in_var.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ip.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ip_var.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipresend.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipresend.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipsend.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipsend.5#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipsend.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipsend.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipsopt.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/iptest.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/iptest.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/iptests.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/larp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/linux.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/lsock.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/resend.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sbpf.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sdlpi.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sirix.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/slinux.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/snit.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sock.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sockraw.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/tcpip.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ultrix.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipt.c#9 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipt.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/kmem.c#9 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/kmem.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/l4check/http.ok#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/l4check/l4check.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/addicmp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/addipopt.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/addkeep.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/bcopywrap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/binprint.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/buildopts.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/checkrev.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/count4bits.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/count6bits.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/debug.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/extras.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/facpri.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/facpri.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/fill6bits.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/flags.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/genmask.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/gethost.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/getifname.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/getline.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/getnattype.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/getport.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/getportproto.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/getproto.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/getsumd.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/hexdump.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/hostmask.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/hostname.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/hostnum.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/icmpcode.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/inet_addr.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/initparse.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ionames.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipf_dotuning.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipft_ef.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipft_hx.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipft_pc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipft_sn.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipft_td.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipft_tx.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipoptsec.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/kmem.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/kmem.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/kmemcpywrap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/kvatoname.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/load_hash.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/load_hashnode.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/load_pool.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/load_poolnode.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/loglevel.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/make_range.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/mutex_emul.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/nametokva.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/nat_setgroupmap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/natparse.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ntomask.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/optname.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/optprint.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/optprintv6.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/optvalue.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/parse.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/portname.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/portnum.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ports.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/print_toif.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printactivenat.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printaps.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printbuf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printfr.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printfraginfo.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printhash.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printhashnode.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printhostmap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printhostmask.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printifname.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printip.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printlog.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printmask.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printnat.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printpacket.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printpacket6.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printpool.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printpoolnode.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printportcmp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printsbuf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printstate.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/printtunable.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ratoi.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ratoui.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/remove_hash.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/remove_hashnode.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/remove_pool.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/remove_poolnode.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/resetlexer.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/rwlock_emul.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/tcp_flags.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/tcpflags.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/tcpoptnames.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/to_interface.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/v6ionames.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/v6optvalue.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/var.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/verbose.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipf.4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipf.5#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipf.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipfilter.4#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipfilter.4.mandoc#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipfs.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipfstat.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipftest.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipl.4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipmon.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipmon.8#9 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipnat.5#9 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipnat.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ippool.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ippool.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipscan.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipscan.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/mkfilters.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/md5.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/md5.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/misc.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ml_ipl.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/mlf_ipl.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/mlf_rule.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/mlfk_rule.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/mlh_rule.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/mli_ipl.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/mln_ipl.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/mls_ipl.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/natparse.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/net/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/opt.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/opts.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/parse.c#8 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/pcap-ipf.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/pcap.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/perl/ipf-mrtg.pl#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/perl/ipfmeta.pl#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/perl/logfilter.pl#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/printnat.c#9 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/printstate.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/radix.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/radix_ipf.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/relay.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.10#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.11#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.12#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.13#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.6#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.7#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.9#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.sr#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/ip_rules#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/ipmon.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/pool.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/samples/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/samples/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/samples/ipfilter-pb.gif#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/samples/proxy.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/samples/relay.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/samples/userauth.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/snoop.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/solaris.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/bpftest#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/dotest#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/dotest6#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/bpf-f1#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/bpf1#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f17#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i11#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i12#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i13#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i14#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i15#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i6#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i7#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/i9#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in5#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in6#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ip1#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/l1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/l1.b#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n10#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n11#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n12#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n7#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n8#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/n9#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni10#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni11#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni12#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni13#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni14#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni15#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni16#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni2#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni5#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni6#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni7#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni9#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/p1#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/p2#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/p3#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/hextest#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f11#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f12#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f13#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f17#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ipv6.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/l1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/n1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/n10#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/n11#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/n12#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/n4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/n8#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/n9#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni10#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni12#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni13#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni14#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni15#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni16#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni6#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni7#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni9#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/p1#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/p2#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/p3#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/intest#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/iptest#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/itest#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/logtest#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/mhtest#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/mtest#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/natipftest#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/nattest#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/ptest#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/bpf-f1#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/bpf1#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i11#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i12#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i13#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i14#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i15#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i6#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/i9#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in5#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in6#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ip1#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/n10#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/n11#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/n12#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/n4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/n7#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/n8#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/n9#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni10.nat#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni11.nat#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni12.ipf#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni12.nat#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni13.ipf#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni13.nat#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni14.ipf#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni14.nat#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni15.ipf#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni15.nat#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni16.ipf#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni16.nat#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni6.ipf#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni6.nat#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni7.nat#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni8.nat#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni9.ipf#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni9.nat#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/p1.ipf#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/p1.pool#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/p2.ipf#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/p3.ipf#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/p3.pool#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/test.format#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/vfycksum.pl#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/todo#4 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/BNF.ipf#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/BNF.ipnat#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipf_y.y#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipfcomp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipfs.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipfstat.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipftest.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipmon.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipmon_y.y#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipnat.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipnat_y.y#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ippool.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ippool_y.y#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipscan_y.y#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipsyncm.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/ipsyncs.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/lex_var.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/lexer.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/tools/lexer.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/Fixes#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Imakefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Makefile.std#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Makefile.vms#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/complete.tcsh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/config.h.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/config/bsd4.4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/config_f.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/configure#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/configure.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.chared.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.decls.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.defns.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.init.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.inputl.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.refresh.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.screen.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.term.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.term.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.xmap.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/gethost.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/glob.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/glob.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/host.defs#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/install-sh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ma.setp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/C/set11#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ja/set1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ja/set3#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ja/set4#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ja/set7#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/patchlevel.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.char.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.decls.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.dir.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.dol.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.err.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.exec.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.exp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.file.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.func.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.glob.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.hist.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.init.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.lex.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.misc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.parse.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.print.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.proc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.proc.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.sem.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.set.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.time.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.types.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.alloc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.bind.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.const.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.decls.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.disc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.func.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.nls.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.nls.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.os.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.os.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.printf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.prompt.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.sched.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.sig.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.sig.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.str.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.vers.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.wait.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.who.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tcsh.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tcsh.man2html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.color.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.comp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.decls.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.help.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.init.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.parse.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.spell.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/vms.termcap.c#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/named#10 integrate .. //depot/projects/trustedbsd/mac/games/factor/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/startrek#7 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libdialog/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libstdc++/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#22 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#47 integrate .. //depot/projects/trustedbsd/mac/kerberos5/Makefile.inc#14 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#35 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_platform.h#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_extract.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_pax.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/configure.ac.in#3 integrate .. //depot/projects/trustedbsd/mac/lib/libatm/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/string/strcpy.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/sysctl.3#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/gen/_set_tp.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/string/bcmp.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_get_fsbase.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_get_gsbase.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_set_fsbase.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/_amd64_set_gsbase.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbydns.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbyname.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbynis.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostnamadr.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnetbyht.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getproto.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getprotoent.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getprotoent.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getprotoname.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getservbyname.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getservbyport.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getservent.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getservent.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/name6.c#15 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/netdb_private.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/regex/cclass.h#3 delete .. //depot/projects/trustedbsd/mac/lib/libdevstat/devstat.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libnetgraph/debug.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libnetgraph/msg.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libnetgraph/sock.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libopie/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/libpmc/libpmc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libpmc/pmc.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libpmc/pmc.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/i386/pthread_md.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/arch/i386/include/pthread_md.h#9 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/i386/pthread_md.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#15 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_cap.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libz/ChangeLog#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/FAQ#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/README#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/gzio.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/zconf.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libz/zlib.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/msun/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_ceill.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_floorl.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_truncl.c#2 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/i386/reloc.c#8 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/errata/article.sgml#17 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/readme/article.sgml#15 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#76 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/scripts/package-split.py#2 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile#30 integrate .. //depot/projects/trustedbsd/mac/sbin/devd/devd.cc#8 integrate .. //depot/projects/trustedbsd/mac/sbin/devfs/devfs.8#10 integrate .. //depot/projects/trustedbsd/mac/sbin/dump/main.c#22 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/mirror/gmirror.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/stripe/gstripe.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/add.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.c#9 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.h#7 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/remove.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/ipf/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sbin/ipf/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/sbin/ipf/ipf/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/ipf/ipfs/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/ipf/ipfstat/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/ipf/ipftest/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/ipf/ipmon/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/ipf/ipnat/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/ipf/ippool/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/ipf/ipresend/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/ipf/ipsend/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/ipf/iptest/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/ipf/libipf/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/ipf/rules/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/ipfs/Makefile#6 delete .. //depot/projects/trustedbsd/mac/sbin/ipfstat/Makefile#6 delete .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#31 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#25 integrate .. //depot/projects/trustedbsd/mac/sbin/ipmon/Makefile#8 delete .. //depot/projects/trustedbsd/mac/sbin/ipnat/Makefile#6 delete .. //depot/projects/trustedbsd/mac/share/doc/papers/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/hwpmc/Makefile#1 branch .. //depot/projects/trustedbsd/mac/share/doc/papers/hwpmc/hwpmc.ms#1 branch .. //depot/projects/trustedbsd/mac/share/examples/hwpmc/README#1 branch .. //depot/projects/trustedbsd/mac/share/examples/ppi/ppilcd.c#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#49 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi.4#18 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ataraid.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/cpufreq.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/faith.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/hwpmc.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ipw.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/iwi.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ohci.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ral.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/sk.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/twe.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ucom.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uhci.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ural.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/usb.4#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/nsswitch.conf.5#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#38 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/Makefile#40 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/alloc_unr.9#1 branch .. //depot/projects/trustedbsd/mac/share/man/man9/sleepqueue.9#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/taskqueue.9#10 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.libnames.mk#23 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/be_BY.CP1131.src#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/_bus.h#1 branch .. //depot/projects/trustedbsd/mac/sys/alpha/include/bus.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/vm_machdep.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/_bus.h#1 branch .. //depot/projects/trustedbsd/mac/sys/amd64/include/bus.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/arm/fusu.S#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/_bus.h#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/include/bus.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/mac/sys/boot/i386/boot0/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/pxe.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/kern_ndis.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/ntoskrnl_var.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_hal.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_ndis.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/ndis/subr_ntoskrnl.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#60 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#113 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.amd64#15 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#44 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.ia64#28 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#37 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#35 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#31 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#71 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/fil.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_auth.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_auth.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_compat.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_fil.c#17 delete .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_fil.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_frag.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_frag.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_htable.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_htable.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_log.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_lookup.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_lookup.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_nat.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_nat.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_pool.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_pool.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_proxy.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_proxy.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_rules.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_rules.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_scan.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_scan.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_state.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_state.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_sync.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_sync.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ipl.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/mlfk_ipl.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/ddb.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdSchedule.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpivar.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-card.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-cbus.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-chipset.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-disk.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-isa.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-lowlevel.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-queue.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ciss/ciss.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ciss/cissreg.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ciss/cissvar.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/esp/ncr53c9xreg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxpreg.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/rcvbundl.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_amd.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_intel.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_mod.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_pentium.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_piv.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_ppro.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/if_ndis/if_ndis_pccard.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/if_ndis/if_ndis_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/if_ndis/if_ndisvar.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ips/ips.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ipw/if_ipw.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ipw/if_ipwreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ipw/if_ipwvar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwi.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwireg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwivar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/musycc/musycc.c#12 delete .. //depot/projects/trustedbsd/mac/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccarddevs#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/puc/pucdata.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ral.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ral_pccard.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ral_pci.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ralrate.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ralrate.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ralreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ralvar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudio_pcm.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_ural.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_uralreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_uralvar.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#38 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_subr.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vfsops.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_kern.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/hwpmc/hwpmc_amd.c#1 branch .. //depot/projects/trustedbsd/mac/sys/hwpmc/hwpmc_intel.c#1 branch .. //depot/projects/trustedbsd/mac/sys/hwpmc/hwpmc_mod.c#1 branch .. //depot/projects/trustedbsd/mac/sys/hwpmc/hwpmc_pentium.c#1 branch .. //depot/projects/trustedbsd/mac/sys/hwpmc/hwpmc_piv.c#1 branch .. //depot/projects/trustedbsd/mac/sys/hwpmc/hwpmc_ppro.c#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_wakecode.S#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#52 integrate .. //depot/projects/trustedbsd/mac/sys/i386/cpufreq/smist.c#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/i386/local_apic.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/support.s#14 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/sys_machdep.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/imgact_coff.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/_bus.h#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/include/bus.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/clock.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/clock_if.m#3 delete .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/eficlock.c#3 delete .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/vm_machdep.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/_bus.h#1 branch .. //depot/projects/trustedbsd/mac/sys/ia64/include/bus.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/clockvar.h#3 delete .. //depot/projects/trustedbsd/mac/sys/ia64/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#65 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#76 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#45 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_kse.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#444 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_pmc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thr.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sched_4bsd.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sched_ule.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_taskqueue.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#65 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#62 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#72 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#76 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#77 integrate .. //depot/projects/trustedbsd/mac/sys/modules/acpi/acpi/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/modules/apm/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/cpufreq/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/hwpmc/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/if_ndis/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ipfilter/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ipw/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/iwi/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/puc/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/ral/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/ural/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/net/if.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_var.h#30 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_eiface.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ksocket.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_message.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_vlan.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/HISTORY#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias.c#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias.h#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias_cuseeme.c#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias_db.c#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias_ftp.c#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias_irc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias_local.h#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias_nbt.c#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias_old.c#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias_pptp.c#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias_proxy.c#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias_skinny.c#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias_smedia.c#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/alias_util.c#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/libalias/libalias.3#1 branch .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_sack.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#25 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ip6_output.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/bootp_subr.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_diskless.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/apm/apm_bioscall.S#1 branch .. //depot/projects/trustedbsd/mac/sys/pc98/apm/apm_bioscall.s#4 delete .. //depot/projects/trustedbsd/mac/sys/pc98/conf/NOTES#19 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/include/_bus.h#1 branch .. //depot/projects/trustedbsd/mac/sys/pc98/include/bus.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/include/pmc_mdep.h#1 branch .. //depot/projects/trustedbsd/mac/sys/pci/if_dc.c#40 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 28 10:53:23 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F55D16A4D0; Thu, 28 Apr 2005 10:53:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0575A16A4CE for ; Thu, 28 Apr 2005 10:53:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D89C43D58 for ; Thu, 28 Apr 2005 10:53:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3SArMT4031484 for ; Thu, 28 Apr 2005 10:53:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3SArLSm031475 for perforce@freebsd.org; Thu, 28 Apr 2005 10:53:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 28 Apr 2005 10:53:21 GMT Message-Id: <200504281053.j3SArLSm031475@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 Subject: PERFORCE change 76132 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2005 10:53:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=76132 Change 76132 by rwatson@rwatson_tislabs on 2005/04/28 10:52:21 Top up integration of TrustedBSD base branch from FreeBSD CVS: primarily to pick up IPFITLER build cleanups. Affected files ... .. //depot/projects/trustedbsd/base/etc/pam.d/xdm#8 integrate .. //depot/projects/trustedbsd/base/include/netdb.h#8 integrate .. //depot/projects/trustedbsd/base/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbydns.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbyht.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostnamadr.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetnamadr.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/name6.c#18 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/netdb_private.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_find_thread.c#5 delete .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_getschedparam.c#3 branch .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mattr_kind_np.c#4 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/i386/reloc.c#9 integrate .. //depot/projects/trustedbsd/base/share/mk/sys.mk#20 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio_pcm.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_z8530.c#4 integrate .. //depot/projects/trustedbsd/base/sys/hwpmc/hwpmc_amd.c#2 delete .. //depot/projects/trustedbsd/base/sys/hwpmc/hwpmc_intel.c#2 delete .. //depot/projects/trustedbsd/base/sys/hwpmc/hwpmc_mod.c#2 delete .. //depot/projects/trustedbsd/base/sys/hwpmc/hwpmc_pentium.c#2 delete .. //depot/projects/trustedbsd/base/sys/hwpmc/hwpmc_piv.c#2 delete .. //depot/projects/trustedbsd/base/sys/hwpmc/hwpmc_ppro.c#2 delete .. //depot/projects/trustedbsd/base/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/trustedbsd/base/sys/libkern/crc32.c#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#38 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/pci/apb.c#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/libkern.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/pmc.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#33 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/Makefile#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/directive_hash.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/make/directive_hash.h#1 branch .. //depot/projects/trustedbsd/base/usr.bin/make/parse.c#20 integrate Differences ... ==== //depot/projects/trustedbsd/base/etc/pam.d/xdm#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/xdm,v 1.9 2004/02/20 21:59:51 des Exp $ +# $FreeBSD: src/etc/pam.d/xdm,v 1.10 2005/04/28 07:59:09 des Exp $ # # PAM configuration for the "xdm" service # @@ -16,7 +16,7 @@ # session #session required pam_ssh.so want_agent -session required pam_permit.so +session required pam_lastlog.so no_fail # password password required pam_deny.so ==== //depot/projects/trustedbsd/base/include/netdb.h#8 (text+ko) ==== @@ -55,7 +55,7 @@ /* * @(#)netdb.h 8.1 (Berkeley) 6/2/93 * From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $ - * $FreeBSD: src/include/netdb.h,v 1.34 2005/02/14 11:33:11 phantom Exp $ + * $FreeBSD: src/include/netdb.h,v 1.35 2005/04/27 19:12:56 ume Exp $ */ #ifndef _NETDB_H_ @@ -257,18 +257,6 @@ /* DO NOT USE THESE, THEY ARE SUBJECT TO CHANGE AND ARE NOT PORTABLE!!! */ int * __h_error(void); -void _sethosthtent(int); -void _endhosthtent(void); -void _sethostdnsent(int); -void _endhostdnsent(void); -void _setnethtent(int); -void _endnethtent(void); -void _setnetdnsent(int); -void _endnetdnsent(void); -struct hostent * _gethostbynisname(const char *, int); -struct hostent * _gethostbynisaddr(const char *, int, int); -void _map_v4v6_address(const char *, char *); -void _map_v4v6_hostent(struct hostent *, char **, char **); __END_DECLS #endif /* !_NETDB_H_ */ ==== //depot/projects/trustedbsd/base/lib/libc/net/gethostbydns.c#13 (text+ko) ==== @@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.49 2005/04/25 17:36:28 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.50 2005/04/27 19:12:57 ume Exp $"); #include #include @@ -79,6 +79,7 @@ #include #include +#include "netdb_private.h" #include "res_config.h" #define SPRINTF(x) ((size_t)sprintf x) ==== //depot/projects/trustedbsd/base/lib/libc/net/gethostbyht.c#5 (text+ko) ==== @@ -55,7 +55,7 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbyht.c,v 1.17 2005/01/03 11:07:45 sobomax Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbyht.c,v 1.18 2005/04/27 19:12:57 ume Exp $"); #include #include @@ -69,6 +69,7 @@ #include #include /* XXX */ #include /* XXX */ +#include "netdb_private.h" #define MAXALIASES 35 ==== //depot/projects/trustedbsd/base/lib/libc/net/gethostnamadr.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.23 2005/04/25 17:36:28 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.24 2005/04/27 19:12:57 ume Exp $"); #include "namespace.h" #include @@ -41,6 +41,7 @@ #include /* XXX hack for _res */ #include /* XXX hack for _res */ #include "un-namespace.h" +#include "netdb_private.h" extern int _ht_gethostbyname(void *, void *, va_list); extern int _dns_gethostbyname(void *, void *, va_list); ==== //depot/projects/trustedbsd/base/lib/libc/net/getnetnamadr.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getnetnamadr.c,v 1.17 2003/04/24 18:05:48 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getnetnamadr.c,v 1.18 2005/04/27 19:12:57 ume Exp $"); #include "namespace.h" #include @@ -38,6 +38,7 @@ #include #include #include "un-namespace.h" +#include "netdb_private.h" extern int _ht_getnetbyname(void *, void *, va_list); extern int _dns_getnetbyname(void *, void *, va_list); ==== //depot/projects/trustedbsd/base/lib/libc/net/name6.c#18 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.45 2005/04/19 12:28:17 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.46 2005/04/27 19:12:57 ume Exp $"); #include "namespace.h" #if defined(YP) || defined(ICMPNL) @@ -120,6 +120,7 @@ #include #include #include "un-namespace.h" +#include "netdb_private.h" #ifndef _PATH_HOSTS #define _PATH_HOSTS "/etc/hosts" ==== //depot/projects/trustedbsd/base/lib/libc/net/netdb_private.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.4 2005/04/19 14:41:13 ume Exp $ + * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.5 2005/04/27 19:12:57 ume Exp $ */ #ifndef _NETDB_PRIVATE_H_ @@ -79,6 +79,18 @@ struct protodata *__protodata_init(void); struct servdata *__servdata_init(void); +void _endhostdnsent(void); +void _endhosthtent(void); +void _endnetdnsent(void); +void _endnethtent(void); +struct hostent *_gethostbynisaddr(const char *, int, int); +struct hostent *_gethostbynisname(const char *, int); +void _map_v4v6_address(const char *, char *); +void _map_v4v6_hostent(struct hostent *, char **, char **); +void _sethostdnsent(int); +void _sethosthtent(int); +void _setnetdnsent(int); +void _setnethtent(int); void endprotoent_r(struct protoent_data *); void endservent_r(struct servent_data *); int getprotobyname_r(const char *, struct protoent *, struct protoent_data *); ==== //depot/projects/trustedbsd/base/libexec/rtld-elf/i386/reloc.c#9 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.16 2005/04/26 20:38:44 peter Exp $ + * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.17 2005/04/27 13:17:23 davidxu Exp $ */ /* @@ -336,7 +336,7 @@ * use. */ tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; - tls = alloca_tls(objs, NULL, 2*sizeof(Elf_Addr), sizeof(Elf_Addr)); + tls = allocate_tls(objs, NULL, 2*sizeof(Elf_Addr), sizeof(Elf_Addr)); error = i386_set_gsbase(tls); if (error < 0) { memset(&ldt, 0, sizeof(ldt)); ==== //depot/projects/trustedbsd/base/share/mk/sys.mk#20 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/share/mk/sys.mk,v 1.83 2004/12/23 08:51:50 ru Exp $ +# $FreeBSD: src/share/mk/sys.mk,v 1.84 2005/04/27 14:13:55 scottl Exp $ unix ?= We run FreeBSD, not UNIX. .FreeBSD ?= true @@ -265,6 +265,11 @@ .include "${__MAKE_CONF}" .endif +# XXX Hack until IPFILTER is buildable again. +.if !defined(WANT_IPFILTER) +NO_IPFILTER= +.endif + # Default executable format # XXX hint for bsd.port.mk OBJFORMAT?= elf ==== //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq31244_machdep.c#5 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.10 2005/04/07 22:04:18 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.11 2005/04/27 13:29:54 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -356,13 +356,6 @@ pmap_map_chunk(l1pagetable, undstack.pv_va, undstack.pv_pa, UND_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - if (freemem_after + KSTACK_PAGES * PAGE_SIZE < afterkern) { - alloc_afterkern(kernelstack.pv_va, kernelstack.pv_pa, - KSTACK_PAGES * PAGE_SIZE); - } else - pmap_map_chunk(l1pagetable, kernelstack.pv_va, - kernelstack.pv_pa, KSTACK_PAGES * PAGE_SIZE, - VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); if (freemem_after + MSGBUF_SIZE < afterkern) { alloc_afterkern(msgbufpv.pv_va, msgbufpv.pv_pa, IRQ_STACK_SIZE * PAGE_SIZE); ==== //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_amd.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_amd.c,v 1.3 2005/04/27 05:51:13 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_amd.c,v 1.4 2005/04/28 08:13:18 jkoshy Exp $"); /* Support for the AMD K7 and later processors */ @@ -443,6 +443,8 @@ { struct pmc_hw *phw; + PMCDBG(MDP,CFG,1, "cpu=%d ri=%d pm=%p", cpu, ri, pm); + KASSERT(cpu >= 0 && cpu < mp_ncpus, ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); KASSERT(ri >= 0 && ri < AMD_NPMCS, @@ -451,7 +453,8 @@ phw = pmc_pcpu[cpu]->pc_hwpmcs[ri]; KASSERT(pm == NULL || phw->phw_pmc == NULL, - ("[amd,%d] hwpmc not unconfigured before re-config", __LINE__)); + ("[amd,%d] pm=%p phw->pm=%p hwpmc not unconfigured", + __LINE__, pm, phw->phw_pmc)); phw->phw_pmc = pm; return 0; @@ -463,12 +466,17 @@ */ static int -amd_switch_in(struct pmc_cpu *pc) +amd_switch_in(struct pmc_cpu *pc, struct pmc_process *pp) { (void) pc; - /* enable the RDPMC instruction */ - load_cr4(rcr4() | CR4_PCE); + PMCDBG(MDP,SWI,1, "pc=%p pp=%p enable-msr=%d", pc, pp, + (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) != 0); + + /* enable the RDPMC instruction if needed */ + if (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) + load_cr4(rcr4() | CR4_PCE); + return 0; } @@ -478,12 +486,17 @@ */ static int -amd_switch_out(struct pmc_cpu *pc) +amd_switch_out(struct pmc_cpu *pc, struct pmc_process *pp) { (void) pc; + (void) pp; /* can be NULL */ + + PMCDBG(MDP,SWO,1, "pc=%p pp=%p enable-msr=%d", pc, pp, pp ? + (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) == 1 : 0); - /* disallow RDPMC instruction */ + /* always turn off the RDPMC instruction */ load_cr4(rcr4() & ~CR4_PCE); + return 0; } @@ -818,7 +831,7 @@ KASSERT(ri >= 0 && ri < AMD_NPMCS, ("[amd,%d] ri %d out of range", __LINE__, ri)); - *msr = amd_pmcdesc[ri].pm_perfctr; + *msr = amd_pmcdesc[ri].pm_perfctr - AMD_PMC_PERFCTR_0; return 0; } ==== //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.5 2005/04/27 05:51:13 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.6 2005/04/28 08:13:18 jkoshy Exp $"); #include #include @@ -739,8 +739,13 @@ atomic_store_rel_ptr(&pp->pp_pmcs[ri].pp_pmc, pm); + if (pm->pm_owner->po_owner == pp->pp_proc) + pp->pp_flags |= PMC_FLAG_ENABLE_MSR_ACCESS; + pp->pp_refcnt++; + PMCDBG(PRC,TLK,2, "enable-msr %d", + (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) != 0); } /* @@ -774,6 +779,9 @@ pp->pp_pmcs[ri].pp_pmc = NULL; pp->pp_pmcs[ri].pp_pmcval = (pmc_value_t) 0; + if (pm->pm_owner->po_owner == pp->pp_proc) + pp->pp_flags &= ~PMC_FLAG_ENABLE_MSR_ACCESS; + pp->pp_refcnt--; /* Remove the target process from the PMC structure */ @@ -784,7 +792,8 @@ KASSERT(ptgt != NULL, ("[pmc,%d] process %p (pp: %p) not found " "in pmc %p", __LINE__, pp->pp_proc, pp, pm)); - PMCDBG(PRC,TUL,4, "unlink ptgt=%p", ptgt); + PMCDBG(PRC,TUL,4, "unlink ptgt=%p, enable-msr=%d", ptgt, + (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) != 0); LIST_REMOVE(ptgt, pt_next); FREE(ptgt, M_PMC); @@ -1159,10 +1168,10 @@ "process-exit proc=%p pmc-process=%p", p, pp); /* - * This process could the target of some PMCs. - * Such PMCs will thus be running on currently - * executing CPU at this point in the code - * since we've disallowed context switches. + * The exiting process could the target of + * some PMCs which will be running on + * currently executing CPU. + * * We need to turn these PMCs off like we * would do at context switch OUT time. */ @@ -1219,6 +1228,14 @@ atomic_subtract_rel_32(&pm->pm_runcount,1); (void) md->pmd_config_pmc(cpu, ri, NULL); } + + /* + * Inform the MD layer of this pseudo "context switch + * out" + */ + + (void) md->pmd_switch_out(pmc_pcpu[cpu], pp); + critical_exit(); /* ok to be pre-empted now */ /* @@ -1475,7 +1492,7 @@ * switch-in actions. */ - (void) (*md->pmd_switch_in)(pc); + (void) (*md->pmd_switch_in)(pc, pp); critical_exit(); @@ -1614,7 +1631,7 @@ * switch out functions. */ - (void) (*md->pmd_switch_out)(pc); + (void) (*md->pmd_switch_out)(pc, pp); critical_exit(); ==== //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_piv.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_piv.c,v 1.4 2005/04/27 05:51:13 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_piv.c,v 1.5 2005/04/28 08:13:18 jkoshy Exp $"); #include #include @@ -578,11 +578,19 @@ */ static int -p4_switch_in(struct pmc_cpu *pc) +p4_switch_in(struct pmc_cpu *pc, struct pmc_process *pp) { (void) pc; + + PMCDBG(MDP,SWI,1, "pc=%p pp=%p enable-msr=%d", pc, pp, + (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) != 0); + /* enable the RDPMC instruction */ - load_cr4(rcr4() | CR4_PCE); + if (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) + load_cr4(rcr4() | CR4_PCE); + + PMCDBG(MDP,SWI,2, "cr4=0x%x", rcr4()); + return 0; } @@ -591,11 +599,18 @@ */ static int -p4_switch_out(struct pmc_cpu *pc) +p4_switch_out(struct pmc_cpu *pc, struct pmc_process *pp) { (void) pc; - /* disallow RDPMC instruction */ + (void) pp; /* can be null */ + + PMCDBG(MDP,SWO,1, "pc=%p pp=%p", pc, pp); + + /* always disallow the RDPMC instruction */ load_cr4(rcr4() & ~CR4_PCE); + + PMCDBG(MDP,SWO,2, "cr4=0x%x", rcr4()); + return 0; } @@ -1419,7 +1434,10 @@ KASSERT(ri >= 0 && ri < P4_NPMCS, ("[p4,%d] ri %d out of range", __LINE__, ri)); - *msr = p4_pmcdesc[ri].pm_pmc_msr; + *msr = p4_pmcdesc[ri].pm_pmc_msr - P4_PERFCTR_MSR_FIRST; + + PMCDBG(MDP,OPS, 1, "ri=%d getmsr=0x%x", ri, *msr); + return 0; } ==== //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_ppro.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_ppro.c,v 1.3 2005/04/27 05:51:13 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_ppro.c,v 1.4 2005/04/28 08:13:18 jkoshy Exp $"); #include #include @@ -332,16 +332,25 @@ } static int -p6_switch_in(struct pmc_cpu *pc) +p6_switch_in(struct pmc_cpu *pc, struct pmc_process *pp) { (void) pc; + + /* allow the RDPMC instruction if needed */ + if (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) + load_cr4(rcr4() | CR4_PCE); return 0; } static int -p6_switch_out(struct pmc_cpu *pc) +p6_switch_out(struct pmc_cpu *pc, struct pmc_process *pp) { (void) pc; + (void) pp; /* can be NULL */ + + /* always turn off the RDPMC instruction */ + load_cr4(rcr4() & ~CR4_PCE); + return 0; } ==== //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.13 2005/01/06 01:43:22 imp Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.14 2005/04/27 17:16:27 julian Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -72,6 +72,7 @@ #include #if defined(__FreeBSD__) #include +#include #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -83,6 +84,7 @@ #elif defined(__FreeBSD__) #include /* XXXXX */ #include +#include "feeder_if.h" #endif #include @@ -234,6 +236,10 @@ int sc_nctls; /* # of mixer controls */ device_ptr_t sc_audiodev; char sc_dying; +#if defined(__FreeBSD__) + struct sbuf uaudio_sndstat; + int uaudio_sndstat_flag; +#endif }; struct terminal_list { @@ -444,6 +450,7 @@ #elif defined(__FreeBSD__) Static int audio_attach_mi(device_t); Static int uaudio_init_params(struct uaudio_softc * sc, struct chan *ch, int mode); +static int uaudio_sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose); /* for NetBSD compatibirity */ #define AUMODE_PLAY 0x01 @@ -642,6 +649,9 @@ { USB_DETACH_START(uaudio, sc); + sbuf_delete(&(sc->uaudio_sndstat)); + sc->uaudio_sndstat_flag = 0; + sc->sc_dying = 1; #if 0 /* XXX */ @@ -1894,6 +1904,7 @@ const char *format_str; asid = (const void *)(buf + offs); + if (asid->bDescriptorType != UDESC_CS_INTERFACE || asid->bDescriptorSubtype != AS_GENERAL) return (USBD_INVAL); @@ -2068,6 +2079,28 @@ printf("Hz\n"); } #endif +#if defined(__FreeBSD__) + if (sc->uaudio_sndstat_flag != 0) { + sbuf_printf(&(sc->uaudio_sndstat), "\n\t"); + sbuf_printf(&(sc->uaudio_sndstat), + "mode %d:(%s) %dch, %d/%dbit, %s,", + id->bAlternateSetting, + dir == UE_DIR_IN ? "input" : "output", + chan, prec, asf1d->bSubFrameSize * 8, format_str); + if (asf1d->bSamFreqType == UA_SAMP_CONTNUOUS) { + sbuf_printf(&(sc->uaudio_sndstat), " %d-%dHz", + UA_SAMP_LO(asf1d), UA_SAMP_HI(asf1d)); + } else { + int r; + sbuf_printf(&(sc->uaudio_sndstat), + " %d", UA_GETSAMP(asf1d, 0)); + for (r = 1; r < asf1d->bSamFreqType; r++) + sbuf_printf(&(sc->uaudio_sndstat), + ",%d", UA_GETSAMP(asf1d, r)); + sbuf_printf(&(sc->uaudio_sndstat), "Hz"); + } + } +#endif ai.alt = id->bAlternateSetting; ai.encoding = enc; ai.attributes = sed->bmAttributes; @@ -2106,6 +2139,11 @@ if (id == NULL) return (USBD_INVAL); +#if defined(__FreeBSD__) + sc->uaudio_sndstat_flag = 0; + if (sbuf_new(&(sc->uaudio_sndstat), NULL, 4096, SBUF_AUTOEXTEND) != NULL) + sc->uaudio_sndstat_flag = 1; +#endif /* Loop through all the alternate settings. */ while (offs <= size) { DPRINTFN(2, ("uaudio_identify: interface=%d offset=%d\n", @@ -2132,6 +2170,9 @@ if (id == NULL) break; } +#if defined(__FreeBSD__) + sbuf_finish(&(sc->uaudio_sndstat)); +#endif if (offs > size) return (USBD_INVAL); DPRINTF(("uaudio_identify_as: %d alts available\n", sc->sc_nalts)); @@ -4171,6 +4212,118 @@ return (1 << mc->slctrtype[mc->minval - 1]); } +static int +uaudio_sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) +{ + struct snddev_info *d; + struct snddev_channel *sce; + struct pcm_channel *c; + struct pcm_feeder *f; + int pc, rc, vc; + device_t pa_dev = device_get_parent(dev); + struct uaudio_softc *sc = device_get_softc(pa_dev); + + if (verbose < 1) + return 0; + + d = device_get_softc(dev); + if (!d) + return ENXIO; + + snd_mtxlock(d->lock); + if (SLIST_EMPTY(&d->channels)) { + sbuf_printf(s, " (mixer only)"); + snd_mtxunlock(d->lock); + return 0; + } + pc = rc = vc = 0; + SLIST_FOREACH(sce, &d->channels, link) { + c = sce->channel; + if (c->direction == PCMDIR_PLAY) { + if (c->flags & CHN_F_VIRTUAL) + vc++; + else + pc++; + } else + rc++; + } + sbuf_printf(s, " (%dp/%dr/%dv channels%s%s)", + d->playcount, d->reccount, d->vchancount, + (d->flags & SD_F_SIMPLEX)? "" : " duplex", +#ifdef USING_DEVFS + (device_get_unit(dev) == snd_unit)? " default" : "" +#else + "" +#endif + ); + + if (sc->uaudio_sndstat_flag != 0) { + sbuf_cat(s, sbuf_data(&(sc->uaudio_sndstat))); + } + + if (verbose <= 1) { + snd_mtxunlock(d->lock); + return 0; + } + + SLIST_FOREACH(sce, &d->channels, link) { + c = sce->channel; + sbuf_printf(s, "\n\t"); + + /* it would be better to indent child channels */ + sbuf_printf(s, "%s[%s]: ", c->parentchannel? c->parentchannel->name : "", c->name); + sbuf_printf(s, "spd %d", c->speed); + if (c->speed != sndbuf_getspd(c->bufhard)) + sbuf_printf(s, "/%d", sndbuf_getspd(c->bufhard)); + sbuf_printf(s, ", fmt 0x%08x", c->format); + if (c->format != sndbuf_getfmt(c->bufhard)) + sbuf_printf(s, "/0x%08x", sndbuf_getfmt(c->bufhard)); + sbuf_printf(s, ", flags 0x%08x, 0x%08x", c->flags, c->feederflags); + if (c->pid != -1) + sbuf_printf(s, ", pid %d", c->pid); + sbuf_printf(s, "\n\t"); + + if (c->bufhard != NULL && c->bufsoft != NULL) { + sbuf_printf(s, "interrupts %d, ", c->interrupts); + if (c->direction == PCMDIR_REC) + sbuf_printf(s, "overruns %d, hfree %d, sfree %d", + c->xruns, sndbuf_getfree(c->bufhard), sndbuf_getfree(c->bufsoft)); + else + sbuf_printf(s, "underruns %d, ready %d", + c->xruns, sndbuf_getready(c->bufsoft)); + sbuf_printf(s, "\n\t"); + } + + sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC)? "hardware" : "userland"); + sbuf_printf(s, " -> "); + f = c->feeder; + while (f->source != NULL) + f = f->source; + while (f != NULL) { + sbuf_printf(s, "%s", f->class->name); + if (f->desc->type == FEEDER_FMT) + sbuf_printf(s, "(0x%08x -> 0x%08x)", f->desc->in, f->desc->out); + if (f->desc->type == FEEDER_RATE) + sbuf_printf(s, "(%d -> %d)", FEEDER_GET(f, FEEDRATE_SRC), FEEDER_GET(f, FEEDRATE_DST)); + if (f->desc->type == FEEDER_ROOT || f->desc->type == FEEDER_MIXER) + sbuf_printf(s, "(0x%08x)", f->desc->out); + sbuf_printf(s, " -> "); + f = f->parent; + } + sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC)? "userland" : "hardware"); + } + snd_mtxunlock(d->lock); + + return 0; +} + +void +uaudio_sndstat_register(device_t dev) +{ + struct snddev_info *d = device_get_softc(dev); + sndstat_register(dev, d->status, uaudio_sndstat_prepare_pcm); +} + Static int audio_attach_mi(device_t dev) { ==== //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.h,v 1.5 2005/01/06 01:43:22 imp Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.h,v 1.6 2005/04/27 17:16:27 julian Exp $ */ /*- * Copyright (c) 2000-2002 Hiroyuki Aizu @@ -50,3 +50,4 @@ u_int32_t uaudio_query_mix_info(device_t dev); u_int32_t uaudio_query_recsrc_info(device_t dev); void uaudio_query_formats(device_t dev, u_int32_t *pfmt, u_int32_t *rfmt); +void uaudio_sndstat_register(device_t dev); ==== //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio_pcm.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.14 2005/04/17 16:26:08 matk Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.15 2005/04/27 17:16:27 julian Exp $ */ /*- * Copyright (c) 2000-2002 Hiroyuki Aizu @@ -344,6 +344,9 @@ return(ENXIO); } + sndstat_unregister(dev); + uaudio_sndstat_register(dev); + pcm_addchan(dev, PCMDIR_PLAY, &ua_chan_class, ua); #ifndef NO_RECORDING pcm_addchan(dev, PCMDIR_REC, &ua_chan_class, ua); ==== //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_z8530.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.11 2005/01/30 09:00:50 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.12 2005/04/27 21:57:51 marcel Exp $"); #include #include @@ -213,7 +213,7 @@ z8530_putc(struct uart_bas *bas, int c) { - while (!(uart_getmreg(bas, RR_BES) & BES_TXE)) + while (!(uart_getreg(bas, REG_CTRL) & BES_TXE)) ; uart_setreg(bas, REG_DATA, c); uart_barrier(bas); @@ -223,7 +223,7 @@ z8530_poll(struct uart_bas *bas) { - if (!(uart_getmreg(bas, RR_BES) & BES_RXA)) + if (!(uart_getreg(bas, REG_CTRL) & BES_RXA)) return (-1); return (uart_getreg(bas, REG_DATA)); } @@ -232,7 +232,7 @@ z8530_getc(struct uart_bas *bas) { - while (!(uart_getmreg(bas, RR_BES) & BES_RXA)) + while (!(uart_getreg(bas, REG_CTRL) & BES_RXA)) ; return (uart_getreg(bas, REG_DATA)); } ==== //depot/projects/trustedbsd/base/sys/i386/include/pmc_mdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/pmc_mdep.h,v 1.2 2005/04/20 20:22:33 marcel Exp $ + * $FreeBSD: src/sys/i386/include/pmc_mdep.h,v 1.3 2005/04/28 08:13:19 jkoshy Exp $ */ /* Machine dependent interfaces */ @@ -123,6 +123,9 @@ #define P4_PERFCTR_MASK 0xFFFFFFFFFFLL /* 40 bits */ +#define P4_CCCR_MSR_FIRST 0x360 /* MSR_BPU_CCCR0 */ +#define P4_PERFCTR_MSR_FIRST 0x300 /* MSR_BPU_COUNTER0 */ + /* Intel PPro, Celeron, P-II, P-III, Pentium-M PMCS */ #define P6_NPMCS 3 /* 1 TSC + 2 PMCs */ ==== //depot/projects/trustedbsd/base/sys/libkern/crc32.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/libkern/crc32.c,v 1.3 2005/01/07 00:24:32 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/libkern/crc32.c,v 1.5 2005/04/28 05:50:18 marcel Exp $"); #include #include @@ -94,18 +94,21 @@ 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; -uint32_t -crc32(const void *buf, size_t size) -{ - const uint8_t *p; - uint32_t crc; - - p = buf; - crc = ~0U; - - while (size--) - crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8); - - return crc ^ ~0U; -} - +/* + * A function that calculates the CRC-32 based on the table above is + * given below for documentation purposes. An equivalent implementation + * of this function that's actually used in the kernel can be found + * in sys/libkern.h, where it can be inlined. + * + * uint32_t + * crc32(const void *buf, size_t size) + * { + * const uint8_t *p = buf; + * uint32_t crc; + * + * crc = ~0U; + * while (size--) + * crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8); + * return crc ^ ~0U; + * } + */ ==== //depot/projects/trustedbsd/base/sys/modules/hwpmc/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $FreeBSD: src/sys/modules/hwpmc/Makefile,v 1.1 2005/04/19 04:01:24 jkoshy Exp $ +# $FreeBSD: src/sys/modules/hwpmc/Makefile,v 1.2 2005/04/28 00:53:45 jkoshy Exp $ # -.PATH: ${.CURDIR}/../../hwpmc +.PATH: ${.CURDIR}/../../dev/hwpmc KMOD= hwpmc ==== //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#38 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.172 2005/03/24 07:37:22 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.173 2005/04/27 14:46:02 des Exp $"); #include "opt_bootp.h" #include "opt_nfsroot.h" @@ -513,9 +513,7 @@ int maxio; s = splnet(); - if (vfs_getopt(mp->mnt_optnew, "ro", NULL, NULL)) - mp->mnt_flag &= ~MNT_RDONLY; - else + if (vfs_getopt(mp->mnt_optnew, "ro", NULL, NULL) == 0) mp->mnt_flag |= MNT_RDONLY; /* * Silently clear NFSMNT_NOCONN if it's a TCP mount, it makes ==== //depot/projects/trustedbsd/base/sys/sparc64/pci/apb.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 28 10:58:30 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05CD216A4D0; Thu, 28 Apr 2005 10:58:30 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B1ADC16A4CE for ; Thu, 28 Apr 2005 10:58:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 032AC43D5D for ; Thu, 28 Apr 2005 10:58:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3SAwST6032063 for ; Thu, 28 Apr 2005 10:58:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3SAwSmK032060 for perforce@freebsd.org; Thu, 28 Apr 2005 10:58:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 28 Apr 2005 10:58:28 GMT Message-Id: <200504281058.j3SAwSmK032060@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 Subject: PERFORCE change 76133 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2005 10:58:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=76133 Change 76133 by rwatson@rwatson_tislabs on 2005/04/28 10:57:52 top up integration of TrustedBSD MAC branch from TrustedBSD base: primarily to pick up IPFILTER build cleanups. Affected files ... .. //depot/projects/trustedbsd/mac/etc/pam.d/xdm#8 integrate .. //depot/projects/trustedbsd/mac/include/netdb.h#8 integrate .. //depot/projects/trustedbsd/mac/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbydns.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostbyht.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/gethostnamadr.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getnetnamadr.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/name6.c#16 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/netdb_private.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_find_thread.c#4 delete .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_getschedparam.c#3 branch .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mattr_kind_np.c#3 delete .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/i386/reloc.c#9 integrate .. //depot/projects/trustedbsd/mac/share/mk/sys.mk#18 integrate .. //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudio.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudio.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudio_pcm.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_dev_z8530.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/hwpmc/hwpmc_amd.c#2 delete .. //depot/projects/trustedbsd/mac/sys/hwpmc/hwpmc_intel.c#2 delete .. //depot/projects/trustedbsd/mac/sys/hwpmc/hwpmc_mod.c#2 delete .. //depot/projects/trustedbsd/mac/sys/hwpmc/hwpmc_pentium.c#2 delete .. //depot/projects/trustedbsd/mac/sys/hwpmc/hwpmc_piv.c#2 delete .. //depot/projects/trustedbsd/mac/sys/hwpmc/hwpmc_ppro.c#2 delete .. //depot/projects/trustedbsd/mac/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/libkern/crc32.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/pci/apb.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/sys/libkern.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/sys/pmc.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sys/systm.h#30 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/directive_hash.c#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/make/directive_hash.h#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/make/parse.c#18 integrate Differences ... ==== //depot/projects/trustedbsd/mac/etc/pam.d/xdm#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/xdm,v 1.9 2004/02/20 21:59:51 des Exp $ +# $FreeBSD: src/etc/pam.d/xdm,v 1.10 2005/04/28 07:59:09 des Exp $ # # PAM configuration for the "xdm" service # @@ -16,7 +16,7 @@ # session #session required pam_ssh.so want_agent -session required pam_permit.so +session required pam_lastlog.so no_fail # password password required pam_deny.so ==== //depot/projects/trustedbsd/mac/include/netdb.h#8 (text+ko) ==== @@ -55,7 +55,7 @@ /* * @(#)netdb.h 8.1 (Berkeley) 6/2/93 * From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $ - * $FreeBSD: src/include/netdb.h,v 1.34 2005/02/14 11:33:11 phantom Exp $ + * $FreeBSD: src/include/netdb.h,v 1.35 2005/04/27 19:12:56 ume Exp $ */ #ifndef _NETDB_H_ @@ -257,18 +257,6 @@ /* DO NOT USE THESE, THEY ARE SUBJECT TO CHANGE AND ARE NOT PORTABLE!!! */ int * __h_error(void); -void _sethosthtent(int); -void _endhosthtent(void); -void _sethostdnsent(int); -void _endhostdnsent(void); -void _setnethtent(int); -void _endnethtent(void); -void _setnetdnsent(int); -void _endnetdnsent(void); -struct hostent * _gethostbynisname(const char *, int); -struct hostent * _gethostbynisaddr(const char *, int, int); -void _map_v4v6_address(const char *, char *); -void _map_v4v6_hostent(struct hostent *, char **, char **); __END_DECLS #endif /* !_NETDB_H_ */ ==== //depot/projects/trustedbsd/mac/lib/libc/net/gethostbydns.c#13 (text+ko) ==== @@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.49 2005/04/25 17:36:28 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.50 2005/04/27 19:12:57 ume Exp $"); #include #include @@ -79,6 +79,7 @@ #include #include +#include "netdb_private.h" #include "res_config.h" #define SPRINTF(x) ((size_t)sprintf x) ==== //depot/projects/trustedbsd/mac/lib/libc/net/gethostbyht.c#5 (text+ko) ==== @@ -55,7 +55,7 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbyht.c,v 1.17 2005/01/03 11:07:45 sobomax Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbyht.c,v 1.18 2005/04/27 19:12:57 ume Exp $"); #include #include @@ -69,6 +69,7 @@ #include #include /* XXX */ #include /* XXX */ +#include "netdb_private.h" #define MAXALIASES 35 ==== //depot/projects/trustedbsd/mac/lib/libc/net/gethostnamadr.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.23 2005/04/25 17:36:28 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostnamadr.c,v 1.24 2005/04/27 19:12:57 ume Exp $"); #include "namespace.h" #include @@ -41,6 +41,7 @@ #include /* XXX hack for _res */ #include /* XXX hack for _res */ #include "un-namespace.h" +#include "netdb_private.h" extern int _ht_gethostbyname(void *, void *, va_list); extern int _dns_gethostbyname(void *, void *, va_list); ==== //depot/projects/trustedbsd/mac/lib/libc/net/getnetnamadr.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getnetnamadr.c,v 1.17 2003/04/24 18:05:48 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getnetnamadr.c,v 1.18 2005/04/27 19:12:57 ume Exp $"); #include "namespace.h" #include @@ -38,6 +38,7 @@ #include #include #include "un-namespace.h" +#include "netdb_private.h" extern int _ht_getnetbyname(void *, void *, va_list); extern int _dns_getnetbyname(void *, void *, va_list); ==== //depot/projects/trustedbsd/mac/lib/libc/net/name6.c#16 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.45 2005/04/19 12:28:17 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.46 2005/04/27 19:12:57 ume Exp $"); #include "namespace.h" #if defined(YP) || defined(ICMPNL) @@ -120,6 +120,7 @@ #include #include #include "un-namespace.h" +#include "netdb_private.h" #ifndef _PATH_HOSTS #define _PATH_HOSTS "/etc/hosts" ==== //depot/projects/trustedbsd/mac/lib/libc/net/netdb_private.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.4 2005/04/19 14:41:13 ume Exp $ + * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.5 2005/04/27 19:12:57 ume Exp $ */ #ifndef _NETDB_PRIVATE_H_ @@ -79,6 +79,18 @@ struct protodata *__protodata_init(void); struct servdata *__servdata_init(void); +void _endhostdnsent(void); +void _endhosthtent(void); +void _endnetdnsent(void); +void _endnethtent(void); +struct hostent *_gethostbynisaddr(const char *, int, int); +struct hostent *_gethostbynisname(const char *, int); +void _map_v4v6_address(const char *, char *); +void _map_v4v6_hostent(struct hostent *, char **, char **); +void _sethostdnsent(int); +void _sethosthtent(int); +void _setnetdnsent(int); +void _setnethtent(int); void endprotoent_r(struct protoent_data *); void endservent_r(struct servent_data *); int getprotobyname_r(const char *, struct protoent *, struct protoent_data *); ==== //depot/projects/trustedbsd/mac/libexec/rtld-elf/i386/reloc.c#9 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.16 2005/04/26 20:38:44 peter Exp $ + * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.17 2005/04/27 13:17:23 davidxu Exp $ */ /* @@ -336,7 +336,7 @@ * use. */ tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; - tls = alloca_tls(objs, NULL, 2*sizeof(Elf_Addr), sizeof(Elf_Addr)); + tls = allocate_tls(objs, NULL, 2*sizeof(Elf_Addr), sizeof(Elf_Addr)); error = i386_set_gsbase(tls); if (error < 0) { memset(&ldt, 0, sizeof(ldt)); ==== //depot/projects/trustedbsd/mac/share/mk/sys.mk#18 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/share/mk/sys.mk,v 1.83 2004/12/23 08:51:50 ru Exp $ +# $FreeBSD: src/share/mk/sys.mk,v 1.84 2005/04/27 14:13:55 scottl Exp $ unix ?= We run FreeBSD, not UNIX. .FreeBSD ?= true @@ -265,6 +265,11 @@ .include "${__MAKE_CONF}" .endif +# XXX Hack until IPFILTER is buildable again. +.if !defined(WANT_IPFILTER) +NO_IPFILTER= +.endif + # Default executable format # XXX hint for bsd.port.mk OBJFORMAT?= elf ==== //depot/projects/trustedbsd/mac/sys/arm/xscale/i80321/iq31244_machdep.c#5 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.10 2005/04/07 22:04:18 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.11 2005/04/27 13:29:54 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -356,13 +356,6 @@ pmap_map_chunk(l1pagetable, undstack.pv_va, undstack.pv_pa, UND_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - if (freemem_after + KSTACK_PAGES * PAGE_SIZE < afterkern) { - alloc_afterkern(kernelstack.pv_va, kernelstack.pv_pa, - KSTACK_PAGES * PAGE_SIZE); - } else - pmap_map_chunk(l1pagetable, kernelstack.pv_va, - kernelstack.pv_pa, KSTACK_PAGES * PAGE_SIZE, - VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); if (freemem_after + MSGBUF_SIZE < afterkern) { alloc_afterkern(msgbufpv.pv_va, msgbufpv.pv_pa, IRQ_STACK_SIZE * PAGE_SIZE); ==== //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_amd.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_amd.c,v 1.3 2005/04/27 05:51:13 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_amd.c,v 1.4 2005/04/28 08:13:18 jkoshy Exp $"); /* Support for the AMD K7 and later processors */ @@ -443,6 +443,8 @@ { struct pmc_hw *phw; + PMCDBG(MDP,CFG,1, "cpu=%d ri=%d pm=%p", cpu, ri, pm); + KASSERT(cpu >= 0 && cpu < mp_ncpus, ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); KASSERT(ri >= 0 && ri < AMD_NPMCS, @@ -451,7 +453,8 @@ phw = pmc_pcpu[cpu]->pc_hwpmcs[ri]; KASSERT(pm == NULL || phw->phw_pmc == NULL, - ("[amd,%d] hwpmc not unconfigured before re-config", __LINE__)); + ("[amd,%d] pm=%p phw->pm=%p hwpmc not unconfigured", + __LINE__, pm, phw->phw_pmc)); phw->phw_pmc = pm; return 0; @@ -463,12 +466,17 @@ */ static int -amd_switch_in(struct pmc_cpu *pc) +amd_switch_in(struct pmc_cpu *pc, struct pmc_process *pp) { (void) pc; - /* enable the RDPMC instruction */ - load_cr4(rcr4() | CR4_PCE); + PMCDBG(MDP,SWI,1, "pc=%p pp=%p enable-msr=%d", pc, pp, + (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) != 0); + + /* enable the RDPMC instruction if needed */ + if (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) + load_cr4(rcr4() | CR4_PCE); + return 0; } @@ -478,12 +486,17 @@ */ static int -amd_switch_out(struct pmc_cpu *pc) +amd_switch_out(struct pmc_cpu *pc, struct pmc_process *pp) { (void) pc; + (void) pp; /* can be NULL */ + + PMCDBG(MDP,SWO,1, "pc=%p pp=%p enable-msr=%d", pc, pp, pp ? + (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) == 1 : 0); - /* disallow RDPMC instruction */ + /* always turn off the RDPMC instruction */ load_cr4(rcr4() & ~CR4_PCE); + return 0; } @@ -818,7 +831,7 @@ KASSERT(ri >= 0 && ri < AMD_NPMCS, ("[amd,%d] ri %d out of range", __LINE__, ri)); - *msr = amd_pmcdesc[ri].pm_perfctr; + *msr = amd_pmcdesc[ri].pm_perfctr - AMD_PMC_PERFCTR_0; return 0; } ==== //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_mod.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.5 2005/04/27 05:51:13 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.6 2005/04/28 08:13:18 jkoshy Exp $"); #include #include @@ -739,8 +739,13 @@ atomic_store_rel_ptr(&pp->pp_pmcs[ri].pp_pmc, pm); + if (pm->pm_owner->po_owner == pp->pp_proc) + pp->pp_flags |= PMC_FLAG_ENABLE_MSR_ACCESS; + pp->pp_refcnt++; + PMCDBG(PRC,TLK,2, "enable-msr %d", + (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) != 0); } /* @@ -774,6 +779,9 @@ pp->pp_pmcs[ri].pp_pmc = NULL; pp->pp_pmcs[ri].pp_pmcval = (pmc_value_t) 0; + if (pm->pm_owner->po_owner == pp->pp_proc) + pp->pp_flags &= ~PMC_FLAG_ENABLE_MSR_ACCESS; + pp->pp_refcnt--; /* Remove the target process from the PMC structure */ @@ -784,7 +792,8 @@ KASSERT(ptgt != NULL, ("[pmc,%d] process %p (pp: %p) not found " "in pmc %p", __LINE__, pp->pp_proc, pp, pm)); - PMCDBG(PRC,TUL,4, "unlink ptgt=%p", ptgt); + PMCDBG(PRC,TUL,4, "unlink ptgt=%p, enable-msr=%d", ptgt, + (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) != 0); LIST_REMOVE(ptgt, pt_next); FREE(ptgt, M_PMC); @@ -1159,10 +1168,10 @@ "process-exit proc=%p pmc-process=%p", p, pp); /* - * This process could the target of some PMCs. - * Such PMCs will thus be running on currently - * executing CPU at this point in the code - * since we've disallowed context switches. + * The exiting process could the target of + * some PMCs which will be running on + * currently executing CPU. + * * We need to turn these PMCs off like we * would do at context switch OUT time. */ @@ -1219,6 +1228,14 @@ atomic_subtract_rel_32(&pm->pm_runcount,1); (void) md->pmd_config_pmc(cpu, ri, NULL); } + + /* + * Inform the MD layer of this pseudo "context switch + * out" + */ + + (void) md->pmd_switch_out(pmc_pcpu[cpu], pp); + critical_exit(); /* ok to be pre-empted now */ /* @@ -1475,7 +1492,7 @@ * switch-in actions. */ - (void) (*md->pmd_switch_in)(pc); + (void) (*md->pmd_switch_in)(pc, pp); critical_exit(); @@ -1614,7 +1631,7 @@ * switch out functions. */ - (void) (*md->pmd_switch_out)(pc); + (void) (*md->pmd_switch_out)(pc, pp); critical_exit(); ==== //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_piv.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_piv.c,v 1.4 2005/04/27 05:51:13 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_piv.c,v 1.5 2005/04/28 08:13:18 jkoshy Exp $"); #include #include @@ -578,11 +578,19 @@ */ static int -p4_switch_in(struct pmc_cpu *pc) +p4_switch_in(struct pmc_cpu *pc, struct pmc_process *pp) { (void) pc; + + PMCDBG(MDP,SWI,1, "pc=%p pp=%p enable-msr=%d", pc, pp, + (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) != 0); + /* enable the RDPMC instruction */ - load_cr4(rcr4() | CR4_PCE); + if (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) + load_cr4(rcr4() | CR4_PCE); + + PMCDBG(MDP,SWI,2, "cr4=0x%x", rcr4()); + return 0; } @@ -591,11 +599,18 @@ */ static int -p4_switch_out(struct pmc_cpu *pc) +p4_switch_out(struct pmc_cpu *pc, struct pmc_process *pp) { (void) pc; - /* disallow RDPMC instruction */ + (void) pp; /* can be null */ + + PMCDBG(MDP,SWO,1, "pc=%p pp=%p", pc, pp); + + /* always disallow the RDPMC instruction */ load_cr4(rcr4() & ~CR4_PCE); + + PMCDBG(MDP,SWO,2, "cr4=0x%x", rcr4()); + return 0; } @@ -1419,7 +1434,10 @@ KASSERT(ri >= 0 && ri < P4_NPMCS, ("[p4,%d] ri %d out of range", __LINE__, ri)); - *msr = p4_pmcdesc[ri].pm_pmc_msr; + *msr = p4_pmcdesc[ri].pm_pmc_msr - P4_PERFCTR_MSR_FIRST; + + PMCDBG(MDP,OPS, 1, "ri=%d getmsr=0x%x", ri, *msr); + return 0; } ==== //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_ppro.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_ppro.c,v 1.3 2005/04/27 05:51:13 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_ppro.c,v 1.4 2005/04/28 08:13:18 jkoshy Exp $"); #include #include @@ -332,16 +332,25 @@ } static int -p6_switch_in(struct pmc_cpu *pc) +p6_switch_in(struct pmc_cpu *pc, struct pmc_process *pp) { (void) pc; + + /* allow the RDPMC instruction if needed */ + if (pp->pp_flags & PMC_FLAG_ENABLE_MSR_ACCESS) + load_cr4(rcr4() | CR4_PCE); return 0; } static int -p6_switch_out(struct pmc_cpu *pc) +p6_switch_out(struct pmc_cpu *pc, struct pmc_process *pp) { (void) pc; + (void) pp; /* can be NULL */ + + /* always turn off the RDPMC instruction */ + load_cr4(rcr4() & ~CR4_PCE); + return 0; } ==== //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudio.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.13 2005/01/06 01:43:22 imp Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.14 2005/04/27 17:16:27 julian Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -72,6 +72,7 @@ #include #if defined(__FreeBSD__) #include +#include #endif #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -83,6 +84,7 @@ #elif defined(__FreeBSD__) #include /* XXXXX */ #include +#include "feeder_if.h" #endif #include @@ -234,6 +236,10 @@ int sc_nctls; /* # of mixer controls */ device_ptr_t sc_audiodev; char sc_dying; +#if defined(__FreeBSD__) + struct sbuf uaudio_sndstat; + int uaudio_sndstat_flag; +#endif }; struct terminal_list { @@ -444,6 +450,7 @@ #elif defined(__FreeBSD__) Static int audio_attach_mi(device_t); Static int uaudio_init_params(struct uaudio_softc * sc, struct chan *ch, int mode); +static int uaudio_sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose); /* for NetBSD compatibirity */ #define AUMODE_PLAY 0x01 @@ -642,6 +649,9 @@ { USB_DETACH_START(uaudio, sc); + sbuf_delete(&(sc->uaudio_sndstat)); + sc->uaudio_sndstat_flag = 0; + sc->sc_dying = 1; #if 0 /* XXX */ @@ -1894,6 +1904,7 @@ const char *format_str; asid = (const void *)(buf + offs); + if (asid->bDescriptorType != UDESC_CS_INTERFACE || asid->bDescriptorSubtype != AS_GENERAL) return (USBD_INVAL); @@ -2068,6 +2079,28 @@ printf("Hz\n"); } #endif +#if defined(__FreeBSD__) + if (sc->uaudio_sndstat_flag != 0) { + sbuf_printf(&(sc->uaudio_sndstat), "\n\t"); + sbuf_printf(&(sc->uaudio_sndstat), + "mode %d:(%s) %dch, %d/%dbit, %s,", + id->bAlternateSetting, + dir == UE_DIR_IN ? "input" : "output", + chan, prec, asf1d->bSubFrameSize * 8, format_str); + if (asf1d->bSamFreqType == UA_SAMP_CONTNUOUS) { + sbuf_printf(&(sc->uaudio_sndstat), " %d-%dHz", + UA_SAMP_LO(asf1d), UA_SAMP_HI(asf1d)); + } else { + int r; + sbuf_printf(&(sc->uaudio_sndstat), + " %d", UA_GETSAMP(asf1d, 0)); + for (r = 1; r < asf1d->bSamFreqType; r++) + sbuf_printf(&(sc->uaudio_sndstat), + ",%d", UA_GETSAMP(asf1d, r)); + sbuf_printf(&(sc->uaudio_sndstat), "Hz"); + } + } +#endif ai.alt = id->bAlternateSetting; ai.encoding = enc; ai.attributes = sed->bmAttributes; @@ -2106,6 +2139,11 @@ if (id == NULL) return (USBD_INVAL); +#if defined(__FreeBSD__) + sc->uaudio_sndstat_flag = 0; + if (sbuf_new(&(sc->uaudio_sndstat), NULL, 4096, SBUF_AUTOEXTEND) != NULL) + sc->uaudio_sndstat_flag = 1; +#endif /* Loop through all the alternate settings. */ while (offs <= size) { DPRINTFN(2, ("uaudio_identify: interface=%d offset=%d\n", @@ -2132,6 +2170,9 @@ if (id == NULL) break; } +#if defined(__FreeBSD__) + sbuf_finish(&(sc->uaudio_sndstat)); +#endif if (offs > size) return (USBD_INVAL); DPRINTF(("uaudio_identify_as: %d alts available\n", sc->sc_nalts)); @@ -4171,6 +4212,118 @@ return (1 << mc->slctrtype[mc->minval - 1]); } +static int +uaudio_sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) +{ + struct snddev_info *d; + struct snddev_channel *sce; + struct pcm_channel *c; + struct pcm_feeder *f; + int pc, rc, vc; + device_t pa_dev = device_get_parent(dev); + struct uaudio_softc *sc = device_get_softc(pa_dev); + + if (verbose < 1) + return 0; + + d = device_get_softc(dev); + if (!d) + return ENXIO; + + snd_mtxlock(d->lock); + if (SLIST_EMPTY(&d->channels)) { + sbuf_printf(s, " (mixer only)"); + snd_mtxunlock(d->lock); + return 0; + } + pc = rc = vc = 0; + SLIST_FOREACH(sce, &d->channels, link) { + c = sce->channel; + if (c->direction == PCMDIR_PLAY) { + if (c->flags & CHN_F_VIRTUAL) + vc++; + else + pc++; + } else + rc++; + } + sbuf_printf(s, " (%dp/%dr/%dv channels%s%s)", + d->playcount, d->reccount, d->vchancount, + (d->flags & SD_F_SIMPLEX)? "" : " duplex", +#ifdef USING_DEVFS + (device_get_unit(dev) == snd_unit)? " default" : "" +#else + "" +#endif + ); + + if (sc->uaudio_sndstat_flag != 0) { + sbuf_cat(s, sbuf_data(&(sc->uaudio_sndstat))); + } + + if (verbose <= 1) { + snd_mtxunlock(d->lock); + return 0; + } + + SLIST_FOREACH(sce, &d->channels, link) { + c = sce->channel; + sbuf_printf(s, "\n\t"); + + /* it would be better to indent child channels */ + sbuf_printf(s, "%s[%s]: ", c->parentchannel? c->parentchannel->name : "", c->name); + sbuf_printf(s, "spd %d", c->speed); + if (c->speed != sndbuf_getspd(c->bufhard)) + sbuf_printf(s, "/%d", sndbuf_getspd(c->bufhard)); + sbuf_printf(s, ", fmt 0x%08x", c->format); + if (c->format != sndbuf_getfmt(c->bufhard)) + sbuf_printf(s, "/0x%08x", sndbuf_getfmt(c->bufhard)); + sbuf_printf(s, ", flags 0x%08x, 0x%08x", c->flags, c->feederflags); + if (c->pid != -1) + sbuf_printf(s, ", pid %d", c->pid); + sbuf_printf(s, "\n\t"); + + if (c->bufhard != NULL && c->bufsoft != NULL) { + sbuf_printf(s, "interrupts %d, ", c->interrupts); + if (c->direction == PCMDIR_REC) + sbuf_printf(s, "overruns %d, hfree %d, sfree %d", + c->xruns, sndbuf_getfree(c->bufhard), sndbuf_getfree(c->bufsoft)); + else + sbuf_printf(s, "underruns %d, ready %d", + c->xruns, sndbuf_getready(c->bufsoft)); + sbuf_printf(s, "\n\t"); + } + + sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC)? "hardware" : "userland"); + sbuf_printf(s, " -> "); + f = c->feeder; + while (f->source != NULL) + f = f->source; + while (f != NULL) { + sbuf_printf(s, "%s", f->class->name); + if (f->desc->type == FEEDER_FMT) + sbuf_printf(s, "(0x%08x -> 0x%08x)", f->desc->in, f->desc->out); + if (f->desc->type == FEEDER_RATE) + sbuf_printf(s, "(%d -> %d)", FEEDER_GET(f, FEEDRATE_SRC), FEEDER_GET(f, FEEDRATE_DST)); + if (f->desc->type == FEEDER_ROOT || f->desc->type == FEEDER_MIXER) + sbuf_printf(s, "(0x%08x)", f->desc->out); + sbuf_printf(s, " -> "); + f = f->parent; + } + sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC)? "userland" : "hardware"); + } + snd_mtxunlock(d->lock); + + return 0; +} + +void +uaudio_sndstat_register(device_t dev) +{ + struct snddev_info *d = device_get_softc(dev); + sndstat_register(dev, d->status, uaudio_sndstat_prepare_pcm); +} + Static int audio_attach_mi(device_t dev) { ==== //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudio.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.h,v 1.5 2005/01/06 01:43:22 imp Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.h,v 1.6 2005/04/27 17:16:27 julian Exp $ */ /*- * Copyright (c) 2000-2002 Hiroyuki Aizu @@ -50,3 +50,4 @@ u_int32_t uaudio_query_mix_info(device_t dev); u_int32_t uaudio_query_recsrc_info(device_t dev); void uaudio_query_formats(device_t dev, u_int32_t *pfmt, u_int32_t *rfmt); +void uaudio_sndstat_register(device_t dev); ==== //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudio_pcm.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.14 2005/04/17 16:26:08 matk Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.15 2005/04/27 17:16:27 julian Exp $ */ /*- * Copyright (c) 2000-2002 Hiroyuki Aizu @@ -344,6 +344,9 @@ return(ENXIO); } + sndstat_unregister(dev); + uaudio_sndstat_register(dev); + pcm_addchan(dev, PCMDIR_PLAY, &ua_chan_class, ua); #ifndef NO_RECORDING pcm_addchan(dev, PCMDIR_REC, &ua_chan_class, ua); ==== //depot/projects/trustedbsd/mac/sys/dev/uart/uart_dev_z8530.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.11 2005/01/30 09:00:50 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.12 2005/04/27 21:57:51 marcel Exp $"); #include #include @@ -213,7 +213,7 @@ z8530_putc(struct uart_bas *bas, int c) { - while (!(uart_getmreg(bas, RR_BES) & BES_TXE)) + while (!(uart_getreg(bas, REG_CTRL) & BES_TXE)) ; uart_setreg(bas, REG_DATA, c); uart_barrier(bas); @@ -223,7 +223,7 @@ z8530_poll(struct uart_bas *bas) { - if (!(uart_getmreg(bas, RR_BES) & BES_RXA)) + if (!(uart_getreg(bas, REG_CTRL) & BES_RXA)) return (-1); return (uart_getreg(bas, REG_DATA)); } @@ -232,7 +232,7 @@ z8530_getc(struct uart_bas *bas) { - while (!(uart_getmreg(bas, RR_BES) & BES_RXA)) + while (!(uart_getreg(bas, REG_CTRL) & BES_RXA)) ; return (uart_getreg(bas, REG_DATA)); } ==== //depot/projects/trustedbsd/mac/sys/i386/include/pmc_mdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/pmc_mdep.h,v 1.2 2005/04/20 20:22:33 marcel Exp $ + * $FreeBSD: src/sys/i386/include/pmc_mdep.h,v 1.3 2005/04/28 08:13:19 jkoshy Exp $ */ /* Machine dependent interfaces */ @@ -123,6 +123,9 @@ #define P4_PERFCTR_MASK 0xFFFFFFFFFFLL /* 40 bits */ +#define P4_CCCR_MSR_FIRST 0x360 /* MSR_BPU_CCCR0 */ +#define P4_PERFCTR_MSR_FIRST 0x300 /* MSR_BPU_COUNTER0 */ + /* Intel PPro, Celeron, P-II, P-III, Pentium-M PMCS */ #define P6_NPMCS 3 /* 1 TSC + 2 PMCs */ ==== //depot/projects/trustedbsd/mac/sys/libkern/crc32.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/libkern/crc32.c,v 1.3 2005/01/07 00:24:32 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/libkern/crc32.c,v 1.5 2005/04/28 05:50:18 marcel Exp $"); #include #include @@ -94,18 +94,21 @@ 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; -uint32_t -crc32(const void *buf, size_t size) -{ - const uint8_t *p; - uint32_t crc; - - p = buf; - crc = ~0U; - - while (size--) - crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8); - - return crc ^ ~0U; -} - +/* + * A function that calculates the CRC-32 based on the table above is + * given below for documentation purposes. An equivalent implementation + * of this function that's actually used in the kernel can be found + * in sys/libkern.h, where it can be inlined. + * + * uint32_t + * crc32(const void *buf, size_t size) + * { + * const uint8_t *p = buf; + * uint32_t crc; + * + * crc = ~0U; + * while (size--) + * crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8); + * return crc ^ ~0U; + * } + */ ==== //depot/projects/trustedbsd/mac/sys/modules/hwpmc/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $FreeBSD: src/sys/modules/hwpmc/Makefile,v 1.1 2005/04/19 04:01:24 jkoshy Exp $ +# $FreeBSD: src/sys/modules/hwpmc/Makefile,v 1.2 2005/04/28 00:53:45 jkoshy Exp $ # -.PATH: ${.CURDIR}/../../hwpmc +.PATH: ${.CURDIR}/../../dev/hwpmc KMOD= hwpmc ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#37 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.172 2005/03/24 07:37:22 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.173 2005/04/27 14:46:02 des Exp $"); #include "opt_bootp.h" #include "opt_nfsroot.h" @@ -513,9 +513,7 @@ int maxio; s = splnet(); - if (vfs_getopt(mp->mnt_optnew, "ro", NULL, NULL)) - mp->mnt_flag &= ~MNT_RDONLY; - else + if (vfs_getopt(mp->mnt_optnew, "ro", NULL, NULL) == 0) mp->mnt_flag |= MNT_RDONLY; /* * Silently clear NFSMNT_NOCONN if it's a TCP mount, it makes ==== //depot/projects/trustedbsd/mac/sys/sparc64/pci/apb.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Apr 28 20:14:46 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEF9716A4EB; Thu, 28 Apr 2005 20:14:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7856F16A4D6 for ; Thu, 28 Apr 2005 20:14:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36E3F43D41 for ; Thu, 28 Apr 2005 20:14:45 +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 j3SKEjmI072154 for ; Thu, 28 Apr 2005 20:14:45 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3SKEi9Y072151 for perforce@freebsd.org; Thu, 28 Apr 2005 20:14:44 GMT (envelope-from areisse@nailabs.com) Date: Thu, 28 Apr 2005 20:14:44 GMT Message-Id: <200504282014.j3SKEi9Y072151@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 Subject: PERFORCE change 76154 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2005 20:14:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=76154 Change 76154 by areisse@areisse_ibook on 2005/04/28 20:13:47 More progress on exposing and automating mach ipc security checks: -Pass the actual message id in the entry point (although it still produces a vector) -The sebsd policy reads a file mapping message id ranges to flask security classes, permitting automated generation of security class and permission specifications with Mig. Any number of mach interfaces may use the same TE types, as long as the message ids involved are all different. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_msg.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/mac.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_port.c#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/sys/mac_policy.h#4 (text+ko) ==== @@ -481,7 +481,7 @@ int retval); void (*mpo_check_ipc_methods)(struct label *task, - struct label *port, struct msg_access_vector *av); + struct label *port, int msgid, struct msg_access_vector *av); }; struct mac_policy_conf { ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_msg.c#3 (text+ko) ==== @@ -280,7 +280,9 @@ IP_VALID(kmsg->ikm_header.msgh_remote_port)) { mac_check_ipc_methods (&kmsg->ikm_sender->lh_label, - &((ipc_port_t)kmsg->ikm_header.msgh_remote_port)->ip_label, &trailer->msgh_av); + &((ipc_port_t)kmsg->ikm_header.msgh_remote_port)->ip_label, + kmsg->ikm_header.msgh_id, + &trailer->msgh_av); } else memset(trailer->msgh_av.av, 0, sizeof(msg_access_vector_t)); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/mach/mac.h#4 (text+ko) ==== @@ -60,4 +60,4 @@ int mac_check_task_service_access (task_t self, task_t obj, const char *perm); -void mac_check_ipc_methods (struct label *task, struct label *port, msg_access_vector_t *av); +void mac_check_ipc_methods (struct label *task, struct label *port, int msgid, msg_access_vector_t *av); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/security/mac_port.c#4 (text+ko) ==== @@ -174,7 +174,7 @@ } void -mac_check_ipc_methods(struct label *task, struct label *port, +mac_check_ipc_methods(struct label *task, struct label *port, int msgid, msg_access_vector_t *av) { struct mac_policy_conf *mpc; @@ -185,13 +185,13 @@ LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { if (mpc->mpc_ops->mpo_check_ipc_methods != NULL) mpc->mpc_ops->mpo_check_ipc_methods( - task, port, av); + task, port, msgid, av); } if ((entrycount = mac_policy_list_conditional_busy()) != 0) { LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { if (mpc->mpc_ops->mpo_check_ipc_methods != NULL) mpc->mpc_ops->mpo_check_ipc_methods( - task, port, av); + task, port, msgid, av); } mac_policy_list_unbusy(); } ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/Makefile#2 (text+ko) ==== @@ -5,7 +5,7 @@ OBJS = sebsd.o sebsd_syscall.o sebsd_sysctl.o ss/avtab.o ss/ebitmap.o \ ss/hashtab.o ss/init.o ss/policydb.o ss/queue.o ss/services.o \ - ss/sidtab.o ss/symtab.o avc/avc.o + ss/sidtab.o ss/symtab.o avc/avc.o ss/mach_av.o sedarwin.kext.tar: sedarwin.o ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#3 (text+ko) ==== @@ -148,6 +148,8 @@ if (security_init()) { panic("SEBSD: couldn't read policy file"); } + + sebsd_mach_av_init(); } static void @@ -1252,7 +1254,7 @@ extern int selinux_enforcing; static void -sebsd_check_ipc_methods(struct label *subj, struct label *obj, +sebsd_check_ipc_methods(struct label *subj, struct label *obj, int msgid, msg_access_vector_t *av) { struct task_security_struct *tsec, *psec; @@ -1264,15 +1266,7 @@ if (!selinux_enforcing) return; - for (i = 0; i < 4; i++) - { - struct av_decision avd; - security_class_t tclass = SECCLASS_PORT_METHODS1 + i; - - avc_has_perm_noaudit (tsec->sid, psec->sid, tclass, 0xffffffff, NULL, &avd); - - av->av[i] &= avd.allowed; - } + sebsd_check_ipc_methods1 (tsec->sid,psec->sid, msgid, av); } static int From owner-p4-projects@FreeBSD.ORG Thu Apr 28 21:48:40 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3576C16A4D0; Thu, 28 Apr 2005 21:48:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D220716A4CE for ; Thu, 28 Apr 2005 21:48:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B92A943D3F for ; Thu, 28 Apr 2005 21:48: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 j3SLmdua082613 for ; Thu, 28 Apr 2005 21:48: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 j3SLmdP6082610 for perforce@freebsd.org; Thu, 28 Apr 2005 21:48:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 28 Apr 2005 21:48:39 GMT Message-Id: <200504282148.j3SLmdP6082610@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 Subject: PERFORCE change 76157 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2005 21:48:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=76157 Change 76157 by rwatson@rwatson_paprika on 2005/04/28 21:48:16 In the MAC branch, NFS descriptors and servers use credential pointers, not embedded credentials. Affected files ... .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#35 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#35 (text+ko) ==== @@ -1473,7 +1473,7 @@ */ for(; nfsd && NFSW_CONTIG(owp, nfsd); nfsd = wp) { wp = LIST_NEXT(nfsd, nd_hash); - if (nfsrv_samecred(&owp->nd_cr, &nfsd->nd_cr)) + if (nfsrv_samecred(owp->nd_cr, nfsd->nd_cr)) nfsrvw_coalesce(owp, nfsd); } } else { From owner-p4-projects@FreeBSD.ORG Thu Apr 28 22:46:53 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1356216A4D0; Thu, 28 Apr 2005 22:46:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C46DA16A4CE for ; Thu, 28 Apr 2005 22:46:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84F1F43D55 for ; Thu, 28 Apr 2005 22:46:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3SMkq16085172 for ; Thu, 28 Apr 2005 22:46:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3SMkq36085169 for perforce@freebsd.org; Thu, 28 Apr 2005 22:46:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 28 Apr 2005 22:46:52 GMT Message-Id: <200504282246.j3SMkq36085169@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 Subject: PERFORCE change 76163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2005 22:46:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=76163 Change 76163 by rwatson@rwatson_paprika on 2005/04/28 22:46:32 Slight POSIX semaphore cleanups before larger cleanup. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#23 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#23 (text+ko) ==== @@ -54,13 +54,11 @@ #include #include #include +#include #include #include -#ifdef MAC -#include + #include -#endif - #include #include #include @@ -68,7 +66,7 @@ static int sem_count_proc(struct proc *p); static struct ksem *sem_lookup_byname(const char *name); static int sem_create(struct thread *td, const char *name, -struct ksem **ksret, mode_t mode, unsigned int value); + struct ksem **ksret, mode_t mode, unsigned int value); static void sem_free(struct ksem *ksnew, int checkrefs); static int sem_perm(struct thread *td, struct ksem *ks); static void sem_enter(struct proc *p, struct ksem *ks); @@ -109,32 +107,6 @@ SEM_FREE((ksem)); \ } while (0) -#ifndef MAC -struct kuser { - pid_t ku_pid; - LIST_ENTRY(kuser) ku_next; -}; - -struct ksem { - LIST_ENTRY(ksem) ks_entry; /* global list entry */ - int ks_onlist; /* boolean if on a list (ks_entry) */ - char *ks_name; /* if named, this is the name */ - int ks_ref; /* number of references */ - mode_t ks_mode; /* protection bits */ - uid_t ks_uid; /* creator uid */ - gid_t ks_gid; /* creator gid */ - unsigned int ks_value; /* current value */ - struct cv ks_cv; /* waiters sleep here */ - int ks_waiters; /* number of waiters */ - LIST_HEAD(, kuser) ks_users; /* pids using this sem */ - struct mtx ks_mtx; /* mutex protecting this semaphore */ - int ks_unlinked; /* Whether the named sem is unlinked */ -}; -#else -struct kuser; -struct ksem; -#endif - /* * available semaphores go here, this includes sem_init and any semaphores * created via sem_open that have not yet been unlinked. @@ -150,9 +122,6 @@ static eventhandler_tag sem_exit_tag, sem_exec_tag, sem_fork_tag; -#ifndef SEM_DEBUG -#define SEM_DEBUG -#endif #ifdef SEM_DEBUG #define DP(x) printf x #else @@ -163,6 +132,7 @@ void sem_ref(struct ksem *ks) { + mtx_assert(&sem_lock, MA_OWNED); ks->ks_ref++; DP(("sem_ref: ks = %p, ref = %d\n", ks, ks->ks_ref)); @@ -924,7 +894,9 @@ val = ks->ks_value; mtx_unlock(&ks->ks_mtx); error = copyout(&val, uap->val, sizeof(val)); +#ifdef MAC err_getvalue: +#endif mtx_lock(&sem_lock); REF_DOWN(ks); mtx_unlock(&sem_lock); From owner-p4-projects@FreeBSD.ORG Fri Apr 29 09:36:58 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD8C416A4D0; Fri, 29 Apr 2005 09:36:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4213E16A4CF for ; Fri, 29 Apr 2005 09:36:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10F9643D45 for ; Fri, 29 Apr 2005 09:36: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 j3T9au91034641 for ; Fri, 29 Apr 2005 09:36:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3T9au7k034638 for perforce@freebsd.org; Fri, 29 Apr 2005 09:36:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 29 Apr 2005 09:36:56 GMT Message-Id: <200504290936.j3T9au7k034638@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 Subject: PERFORCE change 76191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2005 09:36:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=76191 Change 76191 by rwatson@rwatson_paprika on 2005/04/29 09:36:15 Don't __FBSDID() in an include file. Affected files ... .. //depot/projects/trustedbsd/mac/sys/posix4/ksem.h#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/posix4/ksem.h#5 (text+ko) ==== @@ -40,10 +40,6 @@ #ifndef _KSEM_H_ #define _KSEM_H_ -#include -__FBSDID("$FreeBSD: src/sys/posix4/ksem.h,v 1.0 2003/08/27 17:24:00 hdandeka Exp $"); - - #include #include #include From owner-p4-projects@FreeBSD.ORG Fri Apr 29 14:48:14 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FC5216A4D0; Fri, 29 Apr 2005 14:48:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CF2F16A4CE for ; Fri, 29 Apr 2005 14:48:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D72A143D48 for ; Fri, 29 Apr 2005 14:48: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 j3TEmDmr057692 for ; Fri, 29 Apr 2005 14:48:13 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3TEmDsh057689 for perforce@freebsd.org; Fri, 29 Apr 2005 14:48:13 GMT (envelope-from areisse@nailabs.com) Date: Fri, 29 Apr 2005 14:48:13 GMT Message-Id: <200504291448.j3TEmDsh057689@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 Subject: PERFORCE change 76200 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2005 14:48:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=76200 Change 76200 by areisse@areisse_ibook on 2005/04/29 14:48:09 Enable access checks on all bootstrap namespace methods. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.c#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.defs#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/Makefile#3 (text+ko) ==== @@ -33,7 +33,6 @@ DEBUG_LIBS = $(LIBS) PROF_LIBS = $(LIBS) - NEXTSTEP_PB_CFLAGS = -DMACH_USER_API WINDOWS_PB_CFLAGS = -DMACH_USER_API PDO_UNIX_PB_CFLAGS = -DMACH_USER_API @@ -57,3 +56,5 @@ -include Makefile.postamble -include Makefile.dependencies + +include ../../build/Mig.mk ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.c#3 (text+ko) ==== @@ -975,6 +975,7 @@ service_t *servicep; server_t *serverp; kern_return_t result; + mach_msg_mac_trailer_t *trailer = (mach_msg_mac_trailer_t *) (((char*)Request)+Request->msgh_size); mig_reply_error_t *reply; debug("received message on port %x\n", Request->msgh_local_port); @@ -1156,8 +1157,11 @@ else { /* must be a service request */ debug("Handled request."); - return bootstrap_server(Request, Reply); + boolean_t result = bootstrap_server(Request, Reply); + //mach_port_destroy(mach_task_self(), trailer->msgh_labels.sender); + return result; } + //mach_port_destroy(mach_task_self(), trailer->msgh_labels.sender); return TRUE; } @@ -1179,6 +1183,7 @@ bootstrapMaxRequestSize, bootstrap_port_set, MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_SENDER)| + MACH_RCV_TRAILER_ELEMENTS(MACH_RCV_TRAILER_AV)| MACH_RCV_TRAILER_TYPE(MACH_MSG_TRAILER_FORMAT_0)); if (mresult != MACH_MSG_SUCCESS) kern_error(mresult, "mach_msg_server"); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/system_cmds/mach_init.tproj/bootstrap.defs#2 (text+ko) ==== @@ -135,7 +135,7 @@ * Errors: Returns appropriate kernel errors on rpc failure. * Returns BOOTSTRAP_NOT_PRIVILEGED, bootstrap or uid invalid. */ -routine bootstrap_create_server( +routine bootstrap_create_server checkaccess( bootstrap_port : mach_port_t; server_cmd : cmd_t; server_uid : integer_t; @@ -158,7 +158,7 @@ * children (or any offspring that it does not want to count as part * of the "server" for mach_init registration and re-launch purposes). */ -routine bootstrap_unprivileged( +routine bootstrap_unprivileged checkaccess ( bootstrap_port : mach_port_t; out unpriv_port : mach_port_t); @@ -183,7 +183,7 @@ * Returns BOOTSTRAP_SERVICE_ACTIVE, if service has already been * registered or checked-in. */ -routine bootstrap_check_in( +routine bootstrap_check_in checkaccess( bootstrap_port : mach_port_t; service_name : name_t; out service_port : mach_port_move_receive_t); @@ -210,7 +210,7 @@ * Returns BOOTSTRAP_NAME_IN_USE, if service has already been * register or checked-in. */ -routine bootstrap_register( +routine bootstrap_register checkaccess( bootstrap_port : mach_port_t; service_name : name_t; service_port : mach_port_t); @@ -228,7 +228,7 @@ * Errors: Returns appropriate kernel errors on rpc failure. * Returns BOOTSTRAP_UNKNOWN_SERVICE, if service does not exist. */ -routine bootstrap_look_up( +routine bootstrap_look_up checkaccess( bootstrap_port : mach_port_t; service_name : name_t; out service_port : mach_port_t); @@ -255,7 +255,7 @@ * If all services are known, all_services_known is true on * return, if any service is unknown, it's false. */ -routine bootstrap_look_up_array( +routine bootstrap_look_up_array checkaccess( bootstrap_port : mach_port_t; service_names : name_array_t; out service_ports : mach_port_array_t; @@ -275,7 +275,7 @@ * with an effective user id of root (as determined by the security * token in the message trailer). */ -routine bootstrap_parent( +routine bootstrap_parent checkaccess( bootstrap_port : mach_port_t; ServerSecToken token : security_token_t; out parent_port : mach_port_make_send_t); @@ -292,7 +292,7 @@ * Errors: Returns appropriate kernel errors on rpc failure. * Returns BOOTSTRAP_UNKNOWN_SERVICE, if service does not exist. */ -routine bootstrap_status( +routine bootstrap_status checkaccess( bootstrap_port : mach_port_t; service_name : name_t; out service_active : bootstrap_status_t); @@ -309,7 +309,7 @@ * * Errors: Returns appropriate kernel errors on rpc failure. */ -routine bootstrap_info( +routine bootstrap_info checkaccess( bootstrap_port : mach_port_t; out service_names : name_array_t, dealloc; out server_names : name_array_t, dealloc; @@ -335,7 +335,7 @@ * * Errors: Returns appropriate kernel errors on rpc failure. */ -routine bootstrap_subset( +routine bootstrap_subset checkaccess( bootstrap_port : mach_port_t; requestor_port : mach_port_t; out subset_port : mach_port_t); @@ -353,7 +353,7 @@ * Errors: Returns appropriate kernel errors on rpc failure. * Returns BOOTSTRAP_SERVICE_ACTIVE, if service already exists. */ -routine bootstrap_create_service( +routine bootstrap_create_service checkaccess( bootstrap_port : mach_port_t; service_name : name_t; out service_port : mach_port_t); From owner-p4-projects@FreeBSD.ORG Fri Apr 29 14:51:19 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0CC316A4D0; Fri, 29 Apr 2005 14:51:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D07816A4CE for ; Fri, 29 Apr 2005 14:51:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3890A43D31 for ; Fri, 29 Apr 2005 14:51:18 +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 j3TEpIrv057949 for ; Fri, 29 Apr 2005 14:51:18 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3TEpH8g057946 for perforce@freebsd.org; Fri, 29 Apr 2005 14:51:17 GMT (envelope-from areisse@nailabs.com) Date: Fri, 29 Apr 2005 14:51:17 GMT Message-Id: <200504291451.j3TEpH8g057946@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 Subject: PERFORCE change 76201 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2005 14:51:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=76201 Change 76201 by areisse@areisse_ibook on 2005/04/29 14:50:35 Support for building the msgid->security class mappings. Autogenerate security classes and permissions for mach services (just bootstrap namespace now). Convert the TE rules to use the new names. To use this policy, you must install the sebsd_migscs file in the root directory and add a OF variable load_sebsd_migscs with value sebsd_migscs. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/flask/access_vectors#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/flask/security_classes#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/macros/global_macros.te#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/migscs.pl#1 add .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/Makefile#3 (text+ko) ==== @@ -1,13 +1,14 @@ include ../../Makeconfig +include $(DARWIN_ROOT)/build/Mig.mk POLICY= policy.16 SCRIPTS= create-extattr.sh sebsd-relabel.sh INSTALL?= install -all: $(POLICY) +all: $(POLICY) sebsd_migscs -INPUTS = flask/security_classes initial_sids \ - flask/access_vectors rules.m4 users initial_sid_contexts fs_use \ +INPUTS = flask/security_classes mig_classes initial_sids \ + flask/access_vectors mig_access_vectors rules.m4 users initial_sid_contexts fs_use \ devfs policy.conf: $(INPUTS) @@ -27,7 +28,7 @@ clean: rm -f bininclude $(POLICY) policy.conf policy.h rules.m4 fc.out \ - genfs + genfs mig_access_vectors mig_classes sebsd_migscs mig_msgids relabel: fc @echo This is broken @@ -38,3 +39,20 @@ (cd $(CURDIR)/..; tar -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/; tar -xf -) cp -f Makefile.install $(DESTDIR)/private/etc/sedarwin/policy/Makefile + +# Mig security classes and access vectors + +DEFS = $(DARWIN_ROOT)/system_cmds/mach_init.tproj/bootstrap.defs + +mig_msgids: $(DEFS) + for i in $(DEFS); do $(MIG) -user /dev/null -server /dev/null -header /dev/null -sheader /dev/null -flasksc `basename $$i .defs`.flask $$i; cat `basename $$i .defs`.flask >> $@; done + +mig_access_vectors: mig_msgids + cat $< | awk '{print $$1, $$2}' > $@ + echo ';' >> $@ + +mig_classes: mig_access_vectors + grep '^class' $< > $@ + +sebsd_migscs: flask/security_classes mig_msgids + cat flask/security_classes mig_msgids | perl migscs.pl ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/flask/access_vectors#2 (text+ko) ==== @@ -378,11 +378,3 @@ set_special_port } -class mach_names -{ - register - look_up - getparent - makesubset - create_server -}; ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/flask/security_classes#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/macros/global_macros.te#2 (text+ko) ==== @@ -1168,13 +1168,16 @@ define(`mach_bootstrap', ` allow $1 $2:mach_port { send copy_send make_send }; -allow $1 $3:mach_names look_up; +allow $1 $2:mi_bootstrap { bootstrap_look_up bootstrap_look_up_array }; allow init_d $1:mach_port { send copy_send }; ') define(`mach_bootstrap_register', ` -allow $1 $2:mach_names register; +allow $1 $2:mi_bootstrap *; allow $1 $2:mach_port { send copy_send }; allow init_d $1:mach_port { send copy_send }; ') +define(`boot_names_t', `init_d') +define(`user_names_t', `user_d') +define(`user_secret_names_t', `user_secret_d') ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/rules#2 (text+ko) ==== @@ -36,9 +36,9 @@ type user_port_t; type time_port_t; -type boot_names_t, names; -type user_names_t, names; -type user_secret_names_t, names; +#type boot_names_t, names; +#type user_names_t, names; +#type user_secret_names_t, names; type root_t, file; type appl_t, file; @@ -119,7 +119,7 @@ allow domain2 self:mach_port { send make_send copy_send move_recv }; allow domain2 kernel_d:mach_port { send make_send copy_send }; allow domain2 self:mach_task set_special_port; -allow domain2 self:mach_names { look_up }; +allow domain2 self:mi_bootstrap { bootstrap_look_up }; allow domain2 root_t:dir { search getattr read }; allow kernel_d domain2:mach_port { send make_send copy_send }; @@ -165,16 +165,16 @@ allow_mach_ipc(loginwindow_d,windowserver_d); allow_mach_ipc(loginwindow_d,unlabeled_t); -allow init_d self:mach_names { register look_up }; +allow init_d self:mi_bootstrap { bootstrap_register bootstrap_look_up }; allow kernel_d names:mach_port send; allow_mach_ipc(init_d,coreservices_d); #??? mach_bootstrap(init_d,boot_names_t,boot_names_t); #??? -type_change loginwindow_d loginwindow_d:mach_names user_names_t; #XXX +mach_bootstrap_register(init_d,boot_names_t); +#type_change loginwindow_d loginwindow_d:mach_names user_names_t; #XXX allow init_d init_d:mach_port relabelfrom; allow init_d boot_names_t:mach_port relabelto; -allow init_d boot_names_t:mach_names { register create_server }; #??? allow init_d user_names_t:mach_port { copy_send relabelto }; allow_mach_ipc(systemstarter_d,unlabeled_t); @@ -186,8 +186,8 @@ mach_bootstrap(systemstarter_d,boot_names_t,securityserver_d); mach_bootstrap(systemstarter_d,boot_names_t,windowserver_d); mach_bootstrap(systemstarter_d,boot_names_t,boot_names_t); -allow systemstarter_d init_d:mach_names look_up; -allow systemstarter_d boot_names_t:mach_names { register create_server }; +allow systemstarter_d init_d:mi_bootstrap { bootstrap_look_up bootstrap_look_up_array }; +allow systemstarter_d boot_names_t:mi_bootstrap { bootstrap_register bootstrap_create_server }; mach_bootstrap(coreservices_d,boot_names_t,boot_names_t); mach_bootstrap(coreservices_d,boot_names_t,init_d); @@ -203,7 +203,7 @@ allow_mach_ipc(windowserver_d,init_d); # for wsloginui allow_mach_ipc(windowserver_d,coreservices_d); # for wsloginui mach_bootstrap_register(windowserver_d,boot_names_t); -allow windowserver_d init_d:mach_names register; +allow windowserver_d init_d:mi_bootstrap bootstrap_register; allow_mach_ipc(loginwindow_d,coreservices_d); allow_mach_ipc(loginwindow_d,init_d); @@ -214,7 +214,7 @@ mach_bootstrap(loginwindow_d,boot_names_t,windowserver_d); mach_bootstrap(loginwindow_d,boot_names_t,securityserver_d); mach_bootstrap_register(loginwindow_d,boot_names_t); -allow loginwindow_d boot_names_t:mach_names makesubset; +allow loginwindow_d boot_names_t:mi_bootstrap bootstrap_subset; mach_bootstrap(securityserver_d,boot_names_t,init_d); mach_bootstrap(securityserver_d,boot_names_t,boot_names_t); @@ -229,7 +229,7 @@ allow_mach_ipc(lookupd_d,init_d); #DirectoryService? allow_mach_ipc(lookupd_d,cron_d); mach_bootstrap(lookupd_d,boot_names_t,boot_names_t); -allow lookupd_d boot_names_t:mach_names create_server; +allow lookupd_d boot_names_t:mi_bootstrap bootstrap_create_server; mach_bootstrap(cron_d,boot_names_t,init_d); allow_mach_ipc(cron_d,init_d); @@ -259,7 +259,7 @@ # define(`user_sys_access',` -allow $1 { $1 init_d }:mach_names { register look_up }; +allow $1 { $1 init_d }:mi_bootstrap { bootstrap_register bootstrap_look_up bootstrap_look_up_array }; mach_bootstrap(init_d,$2,securityserver_d); #??? @@ -277,7 +277,7 @@ mach_bootstrap(loginwindow_d,$2,systemstarter_d); #??? mach_bootstrap(loginwindow_d,$2,$1); #??? mach_bootstrap_register(loginwindow_d,$2); -allow loginwindow_d $2:mach_names create_server; +allow loginwindow_d $2:mi_bootstrap bootstrap_create_server; mach_bootstrap(securityserver_d,$2,$2); mach_bootstrap(securityserver_d,$2,$1); From owner-p4-projects@FreeBSD.ORG Fri Apr 29 14:53:22 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 076CB16A4D0; Fri, 29 Apr 2005 14:53:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 90DD616A4CE for ; Fri, 29 Apr 2005 14:53:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46E4943D39 for ; Fri, 29 Apr 2005 14:53:21 +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 j3TErLu0058056 for ; Fri, 29 Apr 2005 14:53:21 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3TErK3u058053 for perforce@freebsd.org; Fri, 29 Apr 2005 14:53:20 GMT (envelope-from areisse@nailabs.com) Date: Fri, 29 Apr 2005 14:53:20 GMT Message-Id: <200504291453.j3TErK3u058053@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 Subject: PERFORCE change 76202 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2005 14:53:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=76202 Change 76202 by areisse@areisse_ibook on 2005/04/29 14:52:26 Support for generating flask security classes from mig specifications. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/flask.c#1 add .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/global.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/global.h#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/mig.c#2 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/mig.sh#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/Makefile#2 (text+ko) ==== @@ -22,7 +22,7 @@ OTHERLINKED = lexxer.l parser.y CFILES = error.c global.c header.c mig.c routine.c server.c\ - statement.c string.c type.c user.c utils.c + statement.c string.c type.c user.c utils.c flask.c OTHERSRCS = i386 Makefile Makefile.postamble Makefile.preamble mig.sh\ ppc ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/global.c#2 (text+ko) ==== @@ -103,6 +103,7 @@ string_t DefinesHeaderFileName = strNULL; string_t UserFileName = strNULL; string_t ServerFileName = strNULL; +string_t FlaskSCFileName = strNULL; string_t GenerationDate = strNULL; void ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/global.h#2 (text+ko) ==== @@ -98,6 +98,7 @@ extern string_t DefinesHeaderFileName; extern string_t UserFileName; extern string_t ServerFileName; +extern string_t FlaskSCFileName; extern void more_global(); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/mig.c#2 (text+ko) ==== @@ -233,6 +233,15 @@ else fatal("unknown flag: '%s'", argv[0]); break; + case 'f': + if (streql(argv[0], "-flasksc")) + { + --argc; ++argv; + if (argc == 0) + fatal("missing name for -flasksc option"); + FlaskSCFileName = strmake(argv[0]); + } + break; case 'm': if (streql(argv[0], "-maxonstack")) { @@ -364,6 +373,13 @@ } WriteServer(server, stats); fclose(server); + + if (FlaskSCFileName) + { + FILE *flasksc = myfopen(FlaskSCFileName, "w"); + WriteFlaskSecClass(flasksc, stats); + fclose(flasksc); + } if (BeVerbose) printf("done.\n"); ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/bootstrap_cmds/migcom.tproj/mig.sh#2 (text+ko) ==== @@ -73,6 +73,7 @@ -sheader ) sheader="$2"; migflags="$migflags $1 $2"; shift; shift;; -iheader ) iheader="$2"; migflags="$migflags $1 $2"; shift; shift;; -dheader ) dheader="$2"; migflags="$migflags $1 $2"; shift; shift;; + -flasksc ) flasksc="$2"; migflags="$migflags $1 $2"; shift; shift;; -arch ) arch="$2"; shift ; shift;; -maxonstack ) migflags="$migflags $1 $2"; shift; shift;; -split ) migflags="$migflags $1"; shift;; From owner-p4-projects@FreeBSD.ORG Fri Apr 29 15:55:38 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECF4416A4D0; Fri, 29 Apr 2005 15:55:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BEE5B16A4CE for ; Fri, 29 Apr 2005 15:55:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A50CC43D41 for ; Fri, 29 Apr 2005 15:55:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3TFtbCg062250 for ; Fri, 29 Apr 2005 15:55:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3TFtbi2062247 for perforce@freebsd.org; Fri, 29 Apr 2005 15:55:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 29 Apr 2005 15:55:37 GMT Message-Id: <200504291555.j3TFtbi2062247@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 Subject: PERFORCE change 76205 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2005 15:55:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=76205 Change 76205 by rwatson@rwatson_paprika on 2005/04/29 15:55:28 audit_kernel.h doesn't need to be in OpenBSM, as it's purely for the local OS kernel. Submitted by: trhodes Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/Makefile#4 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_kernel.h#5 delete Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/Makefile#4 (text+ko) ==== @@ -4,7 +4,6 @@ INCS= audit.h \ audit_internal.h \ - audit_kernel.h \ audit_kevents.h \ audit_record.h \ audit_uevents.h From owner-p4-projects@FreeBSD.ORG Fri Apr 29 20:25:25 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0EC316A4D0; Fri, 29 Apr 2005 20:25:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7502516A4CE for ; Fri, 29 Apr 2005 20:25:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1965143D2D for ; Fri, 29 Apr 2005 20:25: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 j3TKPOdN081385 for ; Fri, 29 Apr 2005 20:25:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3TKPNcP081382 for perforce@freebsd.org; Fri, 29 Apr 2005 20:25:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 29 Apr 2005 20:25:23 GMT Message-Id: <200504292025.j3TKPNcP081382@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 Subject: PERFORCE change 76214 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2005 20:25:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=76214 Change 76214 by rwatson@rwatson_paprika on 2005/04/29 20:24:24 Simplify -- re-fine-grain-lock posix_sem until such time as we can demonstrate that the locking changes are necessary. Requires more testing. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#24 (text+ko) ==== @@ -34,8 +34,8 @@ #include __FBSDID("$FreeBSD: src/sys/kern/uipc_sem.c,v 1.17 2005/02/25 21:00:14 rwatson Exp $"); +#include "opt_mac.h" #include "opt_posix.h" -#include "opt_mac.h" #include #include @@ -67,7 +67,7 @@ static struct ksem *sem_lookup_byname(const char *name); static int sem_create(struct thread *td, const char *name, struct ksem **ksret, mode_t mode, unsigned int value); -static void sem_free(struct ksem *ksnew, int checkrefs); +static void sem_free(struct ksem *ksnew); static int sem_perm(struct thread *td, struct ksem *ks); static void sem_enter(struct proc *p, struct ksem *ks); static int sem_leave(struct proc *p, struct ksem *ks); @@ -84,8 +84,6 @@ semid_t *idp); static int kern_sem_open(struct thread *td, int dir, const char *name, int oflag, mode_t mode, unsigned int value, semid_t *idp); -static int ksem_open_existing(struct thread *td, struct ksem *ks, int dir, - semid_t *idpu, semid_t *idpk); static int kern_sem_unlink(struct thread *td, const char *name); #ifndef SEM_MAX @@ -96,22 +94,16 @@ #define SEM_TO_ID(x) ((intptr_t)(x)) #define ID_TO_SEM(x) id_to_sem(x) -#define SEM_FREE(ks) sem_free(ks, 1) -#define SEM_DROP(ks) sem_free(ks, 0) -#define REF_UP(ks) sem_ref(ks) -#define REF_DOWN(ksem) \ - do { \ - sem_rel((ksem)); /* Pump down */ \ - if((ksem)->ks_unlinked && \ - LIST_EMPTY(&(ksem)->ks_users)) \ - SEM_FREE((ksem)); \ - } while (0) /* * available semaphores go here, this includes sem_init and any semaphores * created via sem_open that have not yet been unlinked. */ LIST_HEAD(, ksem) ksem_head = LIST_HEAD_INITIALIZER(&ksem_head); +/* + * semaphores still in use but have been sem_unlink()'d go here. + */ +LIST_HEAD(, ksem) ksem_deadhead = LIST_HEAD_INITIALIZER(&ksem_deadhead); static struct mtx sem_lock; static MALLOC_DEFINE(M_SEM, "sems", "semaphore data"); @@ -144,8 +136,9 @@ { mtx_assert(&sem_lock, MA_OWNED); - ks->ks_ref--; DP(("sem_rel: ks = %p, ref = %d\n", ks, ks->ks_ref - 1)); + if (--ks->ks_ref == 0) + sem_free(ks); } static __inline struct ksem *id_to_sem(semid_t id); @@ -180,8 +173,6 @@ return (NULL); } -/* Used by both sem_init and sem_open to create a new semaphore. */ - static int sem_create(td, name, ksret, mode, value) struct thread *td; @@ -194,11 +185,11 @@ struct proc *p; struct ucred *uc; size_t len; + int error; DP(("sem_create\n")); p = td->td_proc; uc = td->td_ucred; - /* XXX Use p31b_getcfg(CTL_P1003_1B_SEM_VALUE_MAX) instead? */ if (value > SEM_VALUE_MAX) return (EINVAL); ret = malloc(sizeof(*ret), M_SEM, M_WAITOK | M_ZERO); @@ -220,34 +211,31 @@ } ret->ks_mode = mode; ret->ks_value = value; - ret->ks_ref = 0; + ret->ks_ref = 1; ret->ks_waiters = 0; ret->ks_uid = uc->cr_uid; ret->ks_gid = uc->cr_gid; ret->ks_onlist = 0; cv_init(&ret->ks_cv, "sem"); LIST_INIT(&ret->ks_users); - mtx_init(&ret->ks_mtx, "ks_mtx", "ks_mtx", MTX_DEF); - if (name != NULL) - sem_enter(td->td_proc, ret); /* This invokes sem_ref */ - else - ret->ks_ref = 1; #ifdef MAC mac_init_posix_sem(ret); mac_create_posix_sem(uc, ret); #endif + if (name != NULL) + sem_enter(td->td_proc, ret); + *ksret = ret; mtx_lock(&sem_lock); - nsems++; if (nsems >= p31b_getcfg(CTL_P1003_1B_SEM_NSEMS_MAX)) { - if (name != NULL) - sem_leave(td->td_proc, ret); /* This invokes sem_rel */ - SEM_DROP(ret); /* sem_free does a nsem-- */ - mtx_unlock(&sem_lock); - return (ENFILE); - } + sem_leave(td->td_proc, ret); + sem_free(ret); + error = ENFILE; + } else { + nsems++; + error = 0; + } mtx_unlock(&sem_lock); - *ksret = ret; - return (0); + return (error); } #ifndef _SYS_SYSPROTO_H_ @@ -279,14 +267,15 @@ semid_t id; int error; - if((error = sem_create(td, NULL, &ks, S_IRWXU | S_IRWXG, value))) + error = sem_create(td, NULL, &ks, S_IRWXU | S_IRWXG, value); + if (error) return (error); id = SEM_TO_ID(ks); if (dir == UIO_USERSPACE) { error = copyout(&id, idp, sizeof(id)); if (error) { mtx_lock(&sem_lock); - SEM_DROP(ks); + sem_rel(ks); mtx_unlock(&sem_lock); return (error); } @@ -317,9 +306,10 @@ { char name[SEM_MAX_NAMELEN + 1]; size_t done; - int error = 0; + int error; - if ((error = copyinstr(uap->name, name, SEM_MAX_NAMELEN + 1, &done))) + error = copyinstr(uap->name, name, SEM_MAX_NAMELEN + 1, &done); + if (error) return (error); DP((">>> sem_open start\n")); error = kern_sem_open(td, UIO_USERSPACE, @@ -329,52 +319,6 @@ } static int -ksem_open_existing(struct thread *td, struct ksem *ks, int dir, semid_t *idpu, - semid_t *idpk) -{ - int error = 0; - mtx_assert(&sem_lock,MA_OWNED); - mtx_assert(&ks->ks_mtx,MA_NOTOWNED); - if((error = sem_perm(td, ks))) { - mtx_unlock(&sem_lock); - return (error); - } - /* - * If already queued up for unlinking. - * Then according to spec cant let reconnect to this semaphore. - */ - if(ks->ks_unlinked) { - mtx_unlock(&sem_lock); - return (EPERM); - } - *idpk = SEM_TO_ID(ks); - REF_UP(ks); /* Pump up the refs to avoid the race with SEM_FREE */ - mtx_unlock(&sem_lock); -#ifdef MAC - mtx_lock(&ks->ks_mtx); - if((error = mac_check_posix_sem_open(td->td_ucred, ks))) { - DP(("MAC Framework: mac_check_posix_sem_open access denied\n")); - mtx_unlock(&ks->ks_mtx); - goto err_open_existing; - } - mtx_unlock(&ks->ks_mtx); -#endif - if (dir == UIO_USERSPACE) { - if ((error = copyout(idpk, idpu, sizeof(*idpk)))) { - goto err_open_existing; - } - } else { - *idpu = *idpk; - } - sem_enter(td->td_proc, ks); -err_open_existing: - mtx_lock(&sem_lock); - REF_DOWN(ks); - mtx_unlock(&sem_lock); - return(error); -} - -static int kern_sem_open(td, dir, name, oflag, mode, value, idp) struct thread *td; int dir; @@ -385,7 +329,7 @@ semid_t *idp; { struct ksem *ksnew, *ks; - int error = 0; + int error; semid_t id; ksnew = NULL; @@ -413,7 +357,8 @@ * We may block during creation, so drop the lock. */ mtx_unlock(&sem_lock); - if((error = sem_create(td, name, &ksnew, mode, value))) + error = sem_create(td, name, &ksnew, mode, value); + if (error != 0) return (error); id = SEM_TO_ID(ksnew); if (dir == UIO_USERSPACE) { @@ -422,7 +367,7 @@ if (error) { mtx_lock(&sem_lock); sem_leave(td->td_proc, ksnew); - SEM_DROP(ksnew); + sem_rel(ksnew); mtx_unlock(&sem_lock); return (error); } @@ -439,29 +384,51 @@ if (ks != NULL) { /* we lost... */ sem_leave(td->td_proc, ksnew); - SEM_DROP(ksnew); + sem_rel(ksnew); /* we lost and we can't loose... */ if ((oflag & O_EXCL) != 0) { mtx_unlock(&sem_lock); return (EEXIST); } - /* Use the sem created by the winner */ - else { - /* ksem_open_existing unlocks sem_lock */ - error = ksem_open_existing(td, ks, dir, idp, &id); - } } else { DP(("sem_create: about to add to list...\n")); LIST_INSERT_HEAD(&ksem_head, ksnew, ks_entry); DP(("sem_create: setting list bit...\n")); ksnew->ks_onlist = 1; DP(("sem_create: done, about to unlock...\n")); - mtx_unlock(&sem_lock); } } else { - /* ksem_open_existing unlocks sem_lock */ - error = ksem_open_existing(td, ks, dir, idp, &id); +#ifdef MAC + error = mac_check_posix_sem_open(td->td_ucred, ks); + if (error) + goto err_open; +#endif + /* + * if we aren't the creator, then enforce permissions. + */ + error = sem_perm(td, ks); + if (error) + goto err_open; + sem_ref(ks); + mtx_unlock(&sem_lock); + id = SEM_TO_ID(ks); + if (dir == UIO_USERSPACE) { + error = copyout(&id, idp, sizeof(id)); + if (error) { + mtx_lock(&sem_lock); + sem_rel(ks); + mtx_unlock(&sem_lock); + return (error); + } + } else { + *idp = id; + } + sem_enter(td->td_proc, ks); + mtx_lock(&sem_lock); + sem_rel(ks); } +err_open: + mtx_unlock(&sem_lock); return (error); } @@ -484,27 +451,18 @@ } static void -sem_free(struct ksem *ks, int checkrefs) +sem_free(struct ksem *ks) { - mtx_assert(&sem_lock, MA_OWNED); - mtx_assert(&ks->ks_mtx, MA_NOTOWNED); - if(checkrefs && (ks->ks_ref > 0)) - return; + nsems--; if (ks->ks_onlist) LIST_REMOVE(ks, ks_entry); - if (ks->ks_name != NULL) free(ks->ks_name, M_SEM); cv_destroy(&ks->ks_cv); -#ifdef MAC - mac_destroy_posix_sem(ks); -#endif - mtx_destroy(&ks->ks_mtx); free(ks, M_SEM); } - static __inline struct kuser *sem_getuser(struct proc *p, struct ksem *ks); static __inline struct kuser * @@ -513,8 +471,7 @@ struct ksem *ks; { struct kuser *k; - - mtx_assert(&sem_lock, MA_OWNED); + LIST_FOREACH(k, &ks->ks_users, ku_next) if (k->ku_pid == p->p_pid) return (k); @@ -526,15 +483,9 @@ struct thread *td; struct ksem *ks; { - struct kuser *k; - int ret = 0; - - mtx_assert(&sem_lock, MA_OWNED); - k = sem_getuser(td->td_proc, ks); - if ((ks->ks_name == NULL && sem_perm(td, ks) == 0) || k != NULL) - ret = 1; - return ret; + return ((ks->ks_name == NULL && sem_perm(td, ks) == 0) + || sem_getuser(td->td_proc, ks) != NULL); } static int @@ -542,21 +493,20 @@ struct proc *p; struct ksem *ks; { - struct kuser *k=NULL; + struct kuser *k; DP(("sem_leave: ks = %p\n", ks)); - mtx_assert(&sem_lock, MA_OWNED); + k = sem_getuser(p, ks); DP(("sem_leave: ks = %p, k = %p\n", ks, k)); - k = sem_getuser(p, ks); - if (k == NULL) { - return (EINVAL); + if (k != NULL) { + LIST_REMOVE(k, ku_next); + sem_rel(ks); + DP(("sem_leave: about to free k\n")); + free(k, M_SEM); + DP(("sem_leave: returning\n")); + return (0); } - LIST_REMOVE(k, ku_next); - sem_rel(ks); - DP(("sem_leave: about to free k\n")); - free(k, M_SEM); - DP(("sem_leave: returning\n")); - return (0); + return (EINVAL); } static void @@ -566,9 +516,7 @@ { struct kuser *ku, *k; - mtx_assert(&sem_lock, MA_NOTOWNED); - mtx_assert(&ks->ks_mtx, MA_NOTOWNED); - ku = malloc(sizeof(*ku), M_SEM, M_WAITOK | M_ZERO); + ku = malloc(sizeof(*ku), M_SEM, M_WAITOK); ku->ku_pid = p->p_pid; mtx_lock(&sem_lock); k = sem_getuser(p, ks); @@ -609,28 +557,27 @@ const char *name; { struct ksem *ks; - int error = 0; + int error; mtx_lock(&sem_lock); ks = sem_lookup_byname(name); - if (ks == NULL) { - error = ENOENT; - goto err_unlink; - } - if ((error = sem_perm(td, ks))) - goto err_unlink; + if (ks != NULL) { #ifdef MAC - if((error = mac_check_posix_sem_unlink(td->td_ucred, ks))) { - DP(("MAC Framework: mac_check_posix_sem_unlink access \ - denied\n")); - goto err_unlink; - } + error = mac_check_posix_sem_unlink(td->td_ucred, ks); + if (error) { + mtx_unlock(&sem_lock); + return (error); + } #endif + error = sem_perm(td, ks); + } else + error = ENOENT; DP(("sem_unlink: '%s' ks = %p, error = %d\n", name, ks, error)); - ks->ks_unlinked = 1; - if(LIST_EMPTY(&ks->ks_users)) - SEM_FREE(ks); -err_unlink: + if (error == 0) { + LIST_REMOVE(ks, ks_entry); + LIST_INSERT_HEAD(&ksem_deadhead, ks, ks_entry); + sem_rel(ks); + } mtx_unlock(&sem_lock); return (error); } @@ -657,17 +604,12 @@ struct ksem *ks; int error; + error = EINVAL; mtx_lock(&sem_lock); ks = ID_TO_SEM(id); /* this is not a valid operation for unnamed sems */ - error = EINVAL; - if (ks != NULL && ks->ks_name != NULL) { - if ((error = sem_leave(td->td_proc, ks))) - goto err_close; - if (ks->ks_unlinked && LIST_EMPTY(&ks->ks_users)) - SEM_FREE(ks); - } -err_close: + if (ks != NULL && ks->ks_name != NULL) + error = sem_leave(td->td_proc, ks); mtx_unlock(&sem_lock); return (error); } @@ -693,35 +635,28 @@ semid_t id; { struct ksem *ks; - int error = 0; + int error; mtx_lock(&sem_lock); ks = ID_TO_SEM(id); if (ks == NULL || !sem_hasopen(td, ks)) { - mtx_unlock(&sem_lock); - return (EINVAL); + error = EINVAL; + goto err; } - REF_UP(ks);/* Pump up the refs to avoid the race with SEM_FREE */ - mtx_unlock(&sem_lock); - - mtx_lock(&ks->ks_mtx); +#ifdef MAC + error = mac_check_posix_sem_post(td->td_ucred, ks); + if (error) + goto err; +#endif if (ks->ks_value == SEM_VALUE_MAX) { error = EOVERFLOW; - goto err_post; + goto err; } -#ifdef MAC - if ((error = mac_check_posix_sem_post(td->td_ucred, ks))) { - DP(("MAC Framework: mac_check_posix_sem_post access denied\n")); - goto err_post; - } -#endif ++ks->ks_value; if (ks->ks_waiters > 0) cv_signal(&ks->ks_cv); -err_post: - mtx_unlock(&ks->ks_mtx); - mtx_lock(&sem_lock); - REF_DOWN(ks); + error = 0; +err: mtx_unlock(&sem_lock); return (error); } @@ -797,29 +732,27 @@ struct timespec ts1, ts2; struct timeval tv; struct ksem *ks; - int error = 0; + int error; DP((">>> kern_sem_wait entered!\n")); mtx_lock(&sem_lock); ks = ID_TO_SEM(id); if (ks == NULL) { DP(("kern_sem_wait ks == NULL\n")); - mtx_unlock(&sem_lock); - return (EINVAL); + error = EINVAL; + goto err; } + sem_ref(ks); if (!sem_hasopen(td, ks)) { DP(("kern_sem_wait hasopen failed\n")); - mtx_unlock(&sem_lock); - return (EINVAL); + error = EINVAL; + goto err; } - REF_UP(ks);/* Pump up the refs to avoid the race with SEM_FREE */ - mtx_unlock(&sem_lock); - - mtx_lock(&ks->ks_mtx); #ifdef MAC - if ((error = mac_check_posix_sem_wait(td->td_ucred, ks))) { - DP(("MAC Framework: mac_check_posix_sem_wait access denied\n")); - goto err_wait; + error = mac_check_posix_sem_wait(td->td_ucred, ks); + if (error) { + DP(("kern_sem_wait mac failed\n")); + goto err; } #endif DP(("kern_sem_wait value = %d, tryflag %d\n", ks->ks_value, tryflag)); @@ -828,7 +761,7 @@ if (tryflag != 0) error = EAGAIN; else if (abstime == NULL) - error = cv_wait_sig(&ks->ks_cv, &ks->ks_mtx); + error = cv_wait_sig(&ks->ks_cv, &sem_lock); else { for (;;) { ts1 = *abstime; @@ -840,22 +773,22 @@ break; } error = cv_timedwait_sig(&ks->ks_cv, - &ks->ks_mtx, tvtohz(&tv)); + &sem_lock, tvtohz(&tv)); if (error != EWOULDBLOCK) break; } } ks->ks_waiters--; if (error) - goto err_wait; + goto err; } ks->ks_value--; -err_wait: - mtx_unlock(&ks->ks_mtx); + error = 0; +err: + if (ks != NULL) + sem_rel(ks); + mtx_unlock(&sem_lock); DP(("<<< kern_sem_wait leaving, error = %d\n", error)); - mtx_lock(&sem_lock); - REF_DOWN(ks); - mtx_unlock(&sem_lock); return (error); } @@ -880,26 +813,16 @@ mtx_unlock(&sem_lock); return (EINVAL); } - REF_UP(ks);/* Pump up the refs to avoid the race with SEM_FREE */ - mtx_unlock(&sem_lock); - - mtx_lock(&ks->ks_mtx); #ifdef MAC - if((error = mac_check_posix_sem_getvalue(td->td_ucred, ks))) { - DP(("MAC Framework: mac_check_posix_sem_getvalue access denied\n")); - mtx_unlock(&ks->ks_mtx); - goto err_getvalue; - } + error = mac_check_posix_sem_getvalue(td->td_ucred, ks); + if (error) { + mtx_unlock(&sem_lock); + return (error); + } #endif val = ks->ks_value; - mtx_unlock(&ks->ks_mtx); + mtx_unlock(&sem_lock); error = copyout(&val, uap->val, sizeof(val)); -#ifdef MAC -err_getvalue: -#endif - mtx_lock(&sem_lock); - REF_DOWN(ks); - mtx_unlock(&sem_lock); return (error); } @@ -915,24 +838,27 @@ struct ksem_destroy_args *uap; { struct ksem *ks; - int error = 0; + int error; mtx_lock(&sem_lock); ks = ID_TO_SEM(uap->id); if (ks == NULL || !sem_hasopen(td, ks) || ks->ks_name != NULL) { error = EINVAL; - goto err_destroy; + goto err; } #ifdef MAC - if((error = mac_check_posix_sem_destroy(td->td_ucred, ks))) { - DP(("MAC Framework: mac_check_posix_sem_destroy access denied\n")); - goto err_destroy; + error = mac_check_posix_sem_destroy(td->td_ucred, ks); + if (error) + goto err; +#endif + if (ks->ks_waiters != 0) { + error = EBUSY; + goto err; } -#endif - ks->ks_unlinked = 1; /* Indicate that the sem needs to be destroyed */ - SEM_FREE(ks); -err_destroy: + sem_rel(ks); + error = 0; +err: mtx_unlock(&sem_lock); return (error); } @@ -1055,9 +981,13 @@ ks = LIST_FIRST(&ksem_head); while (ks != NULL) { ksnext = LIST_NEXT(ks, ks_entry); - if((ks->ks_name != NULL) && (!sem_leave(p, ks))) - if (ks->ks_unlinked && LIST_EMPTY(&ks->ks_users)) - SEM_FREE(ks); + sem_leave(p, ks); + ks = ksnext; + } + ks = LIST_FIRST(&ksem_deadhead); + while (ks != NULL) { + ksnext = LIST_NEXT(ks, ks_entry); + sem_leave(p, ks); ks = ksnext; } mtx_unlock(&sem_lock); From owner-p4-projects@FreeBSD.ORG Sat Apr 30 13:03:40 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE30F16A4D0; Sat, 30 Apr 2005 13:03:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4ADBE16A4CE for ; Sat, 30 Apr 2005 13:03:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1853D43D5C for ; Sat, 30 Apr 2005 13:03: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 j3UD3c1K060852 for ; Sat, 30 Apr 2005 13:03:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3UD3bPR060841 for perforce@freebsd.org; Sat, 30 Apr 2005 13:03:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Apr 2005 13:03:37 GMT Message-Id: <200504301303.j3UD3bPR060841@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 Subject: PERFORCE change 76269 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2005 13:03:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=76269 Change 76269 by rwatson@rwatson_paprika on 2005/04/30 13:03:04 Return errno values when failing au_to_*() library calls due to invalid arguments or unimplemented calls. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#8 (text+ko) ==== @@ -1,5 +1,7 @@ /* - * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. + * Copyright (c) 2004, Apple Computer, Inc. + * Copyright (c) 2005 Robert N. M. Watson + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,6 +39,7 @@ #include #include +#include #include #include #include @@ -81,6 +84,7 @@ u_int16_t textlen; if(text == NULL) { + errno = EINVAL; return NULL; } @@ -109,6 +113,7 @@ u_int16_t textlen; if(text == NULL) { + errno = EINVAL; return NULL; } @@ -153,6 +158,7 @@ u_int16_t pad0_32 = 0; if(attr == NULL) { + errno = EINVAL; return NULL; } @@ -189,6 +195,7 @@ token_t *au_to_attr64(struct vattr *attr) { + errno = ENOTSUP; return NULL; } @@ -214,6 +221,7 @@ size_t datasize, totdata; if(p == NULL) { + errno = EINVAL; return NULL; } @@ -228,7 +236,9 @@ case AUR_LONG: datasize = AUR_LONG_SIZE; break; - default: return NULL; + default: + errno = EINVAL; + return NULL; } totdata = datasize * unit_count; @@ -289,6 +299,7 @@ int i; if(groups == NULL) { + errno = EINVAL; return NULL; } @@ -319,6 +330,7 @@ u_char *dptr = NULL; if(internet_addr == NULL) { + errno = EINVAL; return NULL; } @@ -345,6 +357,7 @@ u_int32_t type = AF_INET6; if(internet_addr == NULL) { + errno = EINVAL; return NULL; } @@ -373,6 +386,7 @@ u_char *dptr = NULL; if(ip == NULL) { + errno = EINVAL; return NULL; } @@ -431,6 +445,7 @@ if(perm == NULL) { + errno = EINVAL; return NULL; } @@ -503,6 +518,7 @@ u_char *dptr = NULL; if((data == NULL) || (bytes <= 0)) { + errno = EINVAL; return NULL; } @@ -539,6 +555,7 @@ } if(file == NULL) { + errno = EINVAL; return NULL; } filelen = strlen(file); @@ -573,6 +590,7 @@ u_int16_t textlen; if(text == NULL) { + errno = EINVAL; return NULL; } textlen = strlen(text); @@ -602,6 +620,7 @@ u_int16_t textlen; if(text == NULL) { + errno = EINVAL; return NULL; } textlen = strlen(text); @@ -640,6 +659,7 @@ u_char *dptr = NULL; if(tid == NULL) { + errno = EINVAL; return NULL; } @@ -666,6 +686,8 @@ uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid) { + + errno = ENOTSUP; return NULL; } @@ -699,6 +721,7 @@ u_char *dptr = NULL; if(tid == NULL) { + errno = EINVAL; return NULL; } @@ -729,6 +752,8 @@ uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid) { + + errno = ENOTSUP; return NULL; } @@ -816,6 +841,8 @@ * remote Internet address 4 bytes */ token_t *au_to_socket(struct socket *so) { + + errno = ENOTSUP; return NULL; } @@ -832,12 +859,16 @@ token_t *au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, struct sockaddr *la, struct sockaddr *ra) { + + errno = ENOTSUP; return NULL; } token_t *au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, struct sockaddr *la, struct sockaddr *ra) { + + errno = ENOTSUP; return NULL; } @@ -854,6 +885,7 @@ u_char *dptr = NULL; if(so == NULL) { + errno = EINVAL; return NULL; } @@ -882,6 +914,7 @@ u_char *dptr = NULL; if(so == NULL) { + errno = EINVAL; return NULL; } @@ -934,6 +967,7 @@ u_char *dptr = NULL; if(tid == NULL) { + errno = EINVAL; return NULL; } @@ -960,6 +994,8 @@ uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid) { + + errno = ENOTSUP; return NULL; } @@ -993,6 +1029,7 @@ u_char *dptr = NULL; if(tid == NULL) { + errno = EINVAL; return NULL; } @@ -1023,6 +1060,8 @@ 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; } @@ -1067,6 +1106,7 @@ size_t totlen = 0; if(args == NULL) { + errno = EINVAL; return NULL; } @@ -1113,6 +1153,7 @@ const char *nextenv; if(env == NULL) { + errno = EINVAL; return NULL; } @@ -1187,6 +1228,8 @@ token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod) { + + errno = ENOTSUP; return NULL; } From owner-p4-projects@FreeBSD.ORG Sat Apr 30 13:12:28 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EDF916A4D0; Sat, 30 Apr 2005 13:12:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6007916A4CE for ; Sat, 30 Apr 2005 13:12:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 429F343D4C for ; Sat, 30 Apr 2005 13:12:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3UDCSiB061200 for ; Sat, 30 Apr 2005 13:12:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3UDCRxB061197 for perforce@freebsd.org; Sat, 30 Apr 2005 13:12:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Apr 2005 13:12:28 GMT Message-Id: <200504301312.j3UDCRxB061197@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 Subject: PERFORCE change 76270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2005 13:12:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=76270 Change 76270 by rwatson@rwatson_paprika on 2005/04/30 13:11:27 Darwin 8.0 has 64-bit file ID's, so improve support for that. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#9 (text+ko) ==== @@ -181,12 +181,20 @@ ADD_U_INT32(dptr, attr->va_gid); ADD_U_INT32(dptr, attr->va_fsid); - /* - * Darwin defines the size for fileid - * as 4 bytes; BSM defines 8 so pad with 0 - */ - ADD_U_INT32(dptr, pad0_32); - ADD_U_INT32(dptr, attr->va_fileid); + /* + * Some systems use 32-bit file ID's, other's use 64-bit file IDs. + * Attempt to handle both, and let the compiler sort it out. If we + * could pick this out at compile-time, it would be better, so as to + * avoid the else case below. + */ + if (sizeof(attr->va_fileid) == sizeof(uint32_t)) { + ADD_U_INT32(dptr, pad0_32); + ADD_U_INT32(dptr, attr->va_fileid); + } else if (sizeof(attr->va_fileid) == sizeof(uint64_t)) { + ADD_U_INT64(dptr, attr->va_fileid); + } else { + ADD_U_INT64(dptr, 0LL); + } ADD_U_INT32(dptr, attr->va_rdev); From owner-p4-projects@FreeBSD.ORG Sat Apr 30 13:19:38 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF38016A4D0; Sat, 30 Apr 2005 13:19:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ABE2B16A4CE for ; Sat, 30 Apr 2005 13:19:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C9B543D41 for ; Sat, 30 Apr 2005 13:19:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3UDJbRT061433 for ; Sat, 30 Apr 2005 13:19:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3UDJb1w061430 for perforce@freebsd.org; Sat, 30 Apr 2005 13:19:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Apr 2005 13:19:37 GMT Message-Id: <200504301319.j3UDJb1w061430@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 Subject: PERFORCE change 76271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2005 13:19:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=76271 Change 76271 by rwatson@rwatson_paprika on 2005/04/30 13:18:52 From Darwin 8.0: identify Apple private APIs as such to avoid leaking them into the conumser of libbsm.h. In one case, Apple has marked an API as Apple-private that we don't yet consider private (au_get_state()), which we will want to take a further look at. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#7 (text+ko) ==== @@ -844,28 +844,36 @@ __END_DECLS #ifdef __APPLE__ -/* - * Apple-internal "wrapping" and utility definitions and prototypes. - */ +#include -#include +/************************************************************************** + ************************************************************************** + ** The following definitions, functions, etc., are NOT officially + ** supported: they may be changed or removed in the future. Do not use + ** them unless you are prepared to cope with that eventuality. + ************************************************************************** + **************************************************************************/ #ifdef __APPLE_API_PRIVATE #define __BSM_INTERNAL_NOTIFY_KEY "com.apple.audit.change" -#endif -#endif /* !__APPLE__ */ +#endif /* __APPLE_API_PRIVATE */ /* * au_get_state() return values * XXX use AUC_* values directly instead (); AUDIT_OFF and * AUDIT_ON are deprecated and WILL be removed. */ +#ifdef __APPLE_API_PRIVATE #define AUDIT_OFF AUC_NOAUDIT #define AUDIT_ON AUC_AUDITING +#endif /* __APPLE_API_PRIVATE */ +#endif /* !__APPLE__ */ /* * Error return codes for audit_set_terminal_id(), audit_write() and its * brethren. We have 255 (not including kAUNoErr) to play with. + * + * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ enum { @@ -885,6 +893,7 @@ kAULastErr }; +#ifdef __APPLE__ /* * Error return codes for au_get_state() and/or its private support * functions. These codes are designed to be compatible with the @@ -894,7 +903,10 @@ * AU_UNIMPL should never happen unless you've changed your system software * without rebooting. Shame on you. */ +#ifdef __APPLE_API_PRIVATE #define AU_UNIMPL NOTIFY_STATUS_FAILED + 1 /* audit unimplemented */ +#endif /* __APPLE_API_PRIVATE */ +#endif /* !__APPLE__ */ __BEGIN_DECLS From owner-p4-projects@FreeBSD.ORG Sat Apr 30 13:28:50 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B23F316A4D0; Sat, 30 Apr 2005 13:28:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 620CB16A4CE for ; Sat, 30 Apr 2005 13:28:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A95843D49 for ; Sat, 30 Apr 2005 13:28:49 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3UDSmLr061840 for ; Sat, 30 Apr 2005 13:28:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3UDSmjf061837 for perforce@freebsd.org; Sat, 30 Apr 2005 13:28:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Apr 2005 13:28:48 GMT Message-Id: <200504301328.j3UDSmjf061837@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 Subject: PERFORCE change 76272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2005 13:28:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=76272 Change 76272 by rwatson@rwatson_paprika on 2005/04/30 13:28:09 Merge additional changes from Darwin 8.0's bsm-8 distribution: - Resort comments relating to Apple internal APIs; where we don't consider an API internal yet, add a comment if Apple considers them internal - Semantic change to cannot_audit(): don't audit if we're not auditing, rather than do not audit if in the no-audit state. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#8 (text+ko) ==== @@ -773,27 +773,6 @@ typedef struct tokenstr tokenstr_t; -/* - * XXX This prototype should be in audit_record.h - * - * au_free_token() - * - * @summary - au_free_token() deallocates a token_t created by any of - * the au_to_*() BSM API functions. - * - * The BSM API generally manages deallocation of token_t objects. However, - * if au_write() is passed a bad audit descriptor, the token_t * parameter - * will be left untouched. In that case, the caller can deallocate the - * token_t using au_free_token() if desired. This is, in fact, what - * audit_write() does, in keeping with the existing memory management model - * of the BSM API. - * - * @param tok - A token_t * generated by one of the au_to_*() BSM API - * calls. For convenience, tok may be NULL, in which case - * au_free_token() returns immediately. - */ -void au_free_token(token_t *tok); - void setauevent(); void endauevent(); struct au_event_ent *getauevent(); @@ -911,6 +890,29 @@ __BEGIN_DECLS /* + * XXX This prototype should be in audit_record.h + * + * au_free_token() + * + * @summary - au_free_token() deallocates a token_t created by any of + * the au_to_*() BSM API functions. + * + * The BSM API generally manages deallocation of token_t objects. However, + * if au_write() is passed a bad audit descriptor, the token_t * parameter + * will be left untouched. In that case, the caller can deallocate the + * token_t using au_free_token() if desired. This is, in fact, what + * audit_write() does, in keeping with the existing memory management model + * of the BSM API. + * + * @param tok - A token_t * generated by one of the au_to_*() BSM API + * calls. For convenience, tok may be NULL, in which case + * au_free_token() returns immediately. + * + * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. + */ +void au_free_token(token_t *tok); + +/* * Lightweight check to determine if auditing is enabled. If a client * wants to use this to govern whether an entire series of audit calls * should be made--as in the common case of a caller building a set of @@ -921,32 +923,17 @@ * Otherwise the function can return any of the errno values defined for * setaudit(2), or AU_UNIMPL if audit does not appear to be supported by * the system. + * + * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ int au_get_state(void); __END_DECLS /* OpenSSH compatibility */ -#define cannot_audit(x) (au_get_state() == AUC_NOAUDIT) +#define cannot_audit(x) (!(au_get_state() == AUC_AUDITING)) __BEGIN_DECLS /* - * The following calls all wrap the existing BSM API. They use the - * provided subject information, if any, to construct the subject token - * required for every log message. They use the provided return/error - * value(s), if any, to construct the success/failure indication required - * for every log message. They only permit one "miscellaneous" token, - * which should contain the event-specific logging information mandated by - * CAPP. - * - * All these calls assume the caller has previously determined that - * auditing is enabled by calling au_get_state(). - * - * NB: these calls are NOT part of the BSM API. They are NOT guaranteed to - * remain unchanged or even available in future. Use them at your own - * risk. - */ - -/* * audit_set_terminal_id() * * @summary - audit_set_terminal_id() fills in an au_tid_t struct, which is @@ -957,10 +944,27 @@ * @return - kAUNoErr on success; kAUBadParamErr if tid is NULL, kAUStatErr * or kAUSysctlErr if one of the underlying system calls fails (a message * is sent to the system log in those cases). + * + * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ int audit_set_terminal_id(au_tid_t *tid); /* + * BEGIN au_write() WRAPPERS + * + * The following calls all wrap the existing BSM API. They use the + * provided subject information, if any, to construct the subject token + * required for every log message. They use the provided return/error + * value(s), if any, to construct the success/failure indication required + * for every log message. They only permit one "miscellaneous" token, + * which should contain the event-specific logging information mandated by + * CAPP. + * + * All these calls assume the caller has previously determined that + * auditing is enabled by calling au_get_state(). + */ + +/* * audit_write() * * @summary - audit_write() is the basis for the other audit_write_*() @@ -995,6 +999,8 @@ * * @return - The status of the call: 0 (zero) on success, else one of the * kAU*Err values defined above. + * + * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ int audit_write(short event_code, token_t *subject, token_t *misctok, char retval, int errcode); @@ -1037,6 +1043,8 @@ * * @return - The status of the call: 0 (zero) on success, else one of the * kAU*Err values defined above. + * + * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ int audit_write_success(short event_code, token_t *misctok, au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, @@ -1058,6 +1066,8 @@ * * @return - The status of the call: 0 (zero) on success, else one of the * kAU*Err values defined above. + * + * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ int audit_write_success_self(short event_code, token_t *misctok); @@ -1102,6 +1112,8 @@ * * @return - The status of the call: 0 (zero) on success, else one of the * kAU*Err values defined above. + * + * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ int audit_write_failure(short event_code, char *errmsg, int errret, au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, @@ -1127,6 +1139,8 @@ * * @return - The status of the call: 0 (zero) on success, else one of the * kAU*Err values defined above. + * + * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ int audit_write_failure_self(short event_code, char *errmsg, int errret); @@ -1157,6 +1171,8 @@ * * @return - The status of the call: 0 (zero) on success, else one of the * kAU*Err values defined above. + * + * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ int audit_write_failure_na(short event_code, char *errmsg, int errret, uid_t euid, gid_t egid, pid_t pid, au_tid_t *tid); @@ -1200,6 +1216,8 @@ * * @param tidp - Pointer to an au_tid_t; on return will be set to the task * or sender's terminal ID + * + * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ void audit_token_to_au32( audit_token_t atoken, From owner-p4-projects@FreeBSD.ORG Sat Apr 30 13:35:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4CE516A4D0; Sat, 30 Apr 2005 13:35:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 841CE16A4CE for ; Sat, 30 Apr 2005 13:35:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21FAC43D1D for ; Sat, 30 Apr 2005 13:35:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3UDZwkb062643 for ; Sat, 30 Apr 2005 13:35:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3UDZvxg062640 for perforce@freebsd.org; Sat, 30 Apr 2005 13:35:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Apr 2005 13:35:57 GMT Message-Id: <200504301335.j3UDZvxg062640@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 Subject: PERFORCE change 76273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2005 13:35:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=76273 Change 76273 by rwatson@rwatson_paprika on 2005/04/30 13:34:57 Remove trailing white space. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#11 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#2 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#2 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#4 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#10 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#3 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#11 (text+ko) ==== @@ -2,19 +2,19 @@ * Copyright (c) 2004, Apple Computer, Inc. * Copyright (c) 2005 Robert N. M. Watson * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -40,23 +40,23 @@ #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; -/* +/* The current number of active record descriptors */ +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 - */ + * freed + */ static LIST_HEAD(, au_record) bsm_free_q; static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -/* - * This call frees a token_t and its internal data. +/* + * This call frees a token_t and its internal data. */ void au_free_token(token_t *tok) @@ -70,39 +70,39 @@ } /* - * This call reserves memory for the audit record. + * This call reserves memory for the audit record. * Memory must be guaranteed before any auditable event can be - * generated. + * generated. * The au_record_t structure maintains a reference to the - * memory allocated above and also the list of tokens associated + * 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(). - */ + * Descriptors are recyled once the records are added to the audit + * trail following au_close(). + */ int au_open(void) -{ +{ au_record_t *rec = NULL; - + pthread_mutex_lock(&mutex); if(bsm_rec_count == 0) { LIST_INIT(&bsm_free_q); } - /* + /* * 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); rec->used = 1; LIST_REMOVE(rec, au_rec_q); - } + } pthread_mutex_unlock(&mutex); 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) { @@ -148,18 +148,18 @@ * * Don't permit writing more to the buffer than would let the trailer be * appended later. - */ + */ int au_write(int d, token_t *tok) { au_record_t *rec; - + if(tok == NULL) { errno = EINVAL; return -1; /* Invalid Token */ - } + } /* Write the token to the record descriptor */ - rec = open_desc_table[d]; + rec = open_desc_table[d]; if((rec == NULL) || (rec->used == 0)) { errno = EINVAL; return -1; /* Invalid descriptor */ @@ -171,15 +171,15 @@ } /* Add the token to the tail */ - /* + /* * XXX Not locking here -- we should not be writing to * XXX the same descriptor from different threads - */ + */ TAILQ_INSERT_TAIL(&rec->token_q, tok, tokens); rec->len += tok->len; /* grow record length by token size bytes */ - - /* Token should not be available after this call */ + + /* Token should not be available after this call */ tok = NULL; return 0; /* Success */ } @@ -240,10 +240,10 @@ TAILQ_REMOVE(&rec->token_q, tok, tokens); free(tok->t_data); free(tok); - } + } rec->used = 0; - rec->len = 0; + rec->len = 0; pthread_mutex_lock(&mutex); @@ -255,7 +255,7 @@ /* * Add the header token, identify any missing tokens - * Write out the tokens to the record memory and finally, + * Write out the tokens to the record memory and finally, * call audit */ int au_close(int d, int keep, short event) @@ -263,7 +263,7 @@ au_record_t *rec; size_t tot_rec_size; int retval = 0; - + rec = open_desc_table[d]; if((rec == NULL) || (rec->used == 0)) { errno = EINVAL; @@ -275,7 +275,7 @@ goto cleanup; } - + tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; if (tot_rec_size > MAX_AUDIT_RECORD_SIZE) { @@ -304,7 +304,7 @@ cleanup: /* CLEANUP */ au_teardown(rec); - return retval; + return retval; } /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#2 (text+ko) ==== @@ -1,18 +1,18 @@ /* * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -34,9 +34,9 @@ #include /* - * Parse the contents of the audit_class file to return + * 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 = ":"; @@ -46,19 +46,19 @@ /* * 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); + * 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 - */ + */ static struct au_class_ent *get_class_area() { struct au_class_ent *c; - + c = (struct au_class_ent *) malloc (sizeof(struct au_class_ent)); if(c == NULL) { return NULL; @@ -81,7 +81,7 @@ /* * Free the au_class_ent structure - */ + */ void free_au_class_ent(struct au_class_ent *c) { if (c) @@ -97,27 +97,27 @@ /* * 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) + if((classflag == NULL) || (classname == NULL) || (classdesc == NULL)) { return NULL; - } + } /* * Check for very large classnames - */ + */ if(strlen(classname) >= AU_CLASS_NAME_MAX) { return NULL; } @@ -126,7 +126,7 @@ /* * Check for very large class description - */ + */ if(strlen(classdesc) >= AU_CLASS_DESC_MAX) { return NULL; } @@ -140,18 +140,18 @@ /* * Return the next au_class_ent structure from the file * setauclass should be called before invoking this function - * for the first time - */ + * for the first time + */ struct au_class_ent *getauclassent() { struct au_class_ent *c; - char *tokptr, *nl; - + char *tokptr, *nl; + pthread_mutex_lock(&mutex); - if((fp == NULL) + if((fp == NULL) && ((fp = fopen(AUDIT_CLASS_FILE, "r")) == NULL)) { - + pthread_mutex_unlock(&mutex); return NULL; } @@ -165,9 +165,9 @@ if((nl = strrchr(linestr, '\n')) != NULL) { *nl = '\0'; } - + tokptr = linestr; - + c = get_class_area(); /* allocate */ if(c == NULL) { @@ -175,7 +175,7 @@ return NULL; } - /* parse tokptr to au_class_ent components */ + /* parse tokptr to au_class_ent components */ if(classfromstr(tokptr, delim, c) == NULL) { free_au_class_ent(c); @@ -190,7 +190,7 @@ /* * Return the next au_class_entry having the given class name - */ + */ struct au_class_ent *getauclassnam(const char *name) { struct au_class_ent *c; @@ -202,17 +202,17 @@ /* Rewind to beginning of file */ setauclass(); - + pthread_mutex_lock(&mutex); - if((fp == NULL) + if((fp == NULL) && ((fp = fopen(AUDIT_CLASS_FILE, "r")) == NULL)) { - + pthread_mutex_unlock(&mutex); return NULL; } - - c = get_class_area(); /* allocate */ + + c = get_class_area(); /* allocate */ if(c == NULL) { pthread_mutex_unlock(&mutex); @@ -224,14 +224,14 @@ *nl = '\0'; } - /* parse tokptr to au_class_ent components */ + /* parse tokptr to au_class_ent components */ if(classfromstr(linestr, delim, c) != NULL) { if(!strcmp(name, c->ac_name)) { - + pthread_mutex_unlock(&mutex); return c; } - } + } } free_au_class_ent(c); @@ -243,7 +243,7 @@ /* * Rewind to the beginning of the enumeration - */ + */ void setauclass() { pthread_mutex_lock(&mutex); @@ -256,12 +256,12 @@ } /* - * audit_class processing is complete; close any open files - */ + * audit_class processing is complete; close any open files + */ void endauclass() { pthread_mutex_lock(&mutex); - + if(fp != NULL) { fclose(fp); fp = NULL; ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#3 (text+ko) ==== @@ -1,18 +1,18 @@ /* * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -34,10 +34,10 @@ #include -/* - * Parse the contents of the audit_control file to return +/* + * 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 = ":"; @@ -47,21 +47,21 @@ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; -/* - * Returns the string value corresponding to the given label +/* + * Returns the string value corresponding to the given label * from the configuration file - */ + */ static int getstrfromtype(char *name, char **str) { char *type, *nl; char *tokptr; char *last; - + *str = NULL; pthread_mutex_lock(&mutex); - if((fp == NULL) + if((fp == NULL) && ((fp = fopen(AUDIT_CONTROL_FILE, "r")) == NULL)) { pthread_mutex_unlock(&mutex); @@ -90,16 +90,16 @@ } return 0; /* Success */ } - } + } } pthread_mutex_unlock(&mutex); return 0; /* EOF */ } -/* - * Rewind the file pointer to beginning - */ +/* + * Rewind the file pointer to beginning + */ void setac() { pthread_mutex_lock(&mutex); @@ -114,11 +114,11 @@ /* * Close the audit_control file - */ + */ void endac() { pthread_mutex_lock(&mutex); - + ptrmoved = 1; if(fp != NULL) { fclose(fp); @@ -130,12 +130,12 @@ /* * Return audit directory information from the audit control file - */ + */ int getacdir(char *name, int len) { char *dir; int ret = 0; - + if(name == NULL) { errno = EINVAL; return -2; @@ -143,25 +143,25 @@ pthread_mutex_lock(&mutex); - /* - * Check if another function was called between - * successive calls to getacdir + /* + * Check if another function was called between + * successive calls to getacdir */ if(inacdir && ptrmoved) { ptrmoved = 0; if(fp != NULL) { - fseek(fp, 0, SEEK_SET); + fseek(fp, 0, SEEK_SET); } - - ret = 2; + + ret = 2; } - + pthread_mutex_unlock(&mutex); - + if(getstrfromtype(DIR_CONTROL_ENTRY, &dir) == 1) { return -3; } - + if(dir == NULL){ return -1; @@ -171,20 +171,20 @@ return -3; } - strcpy(name, dir); + strcpy(name, dir); return ret; } /* * Return the minimum free diskspace value from the audit control file - */ + */ int getacmin(int *min_val) { char *min; setac(); - + if(min_val == NULL) { errno = EINVAL; return -2; @@ -193,7 +193,7 @@ if(getstrfromtype(MINFREE_CONTROL_ENTRY, &min) == 1) { return -3; } - + if(min == NULL) { return 1; } @@ -205,13 +205,13 @@ /* * Return the system audit value from the audit contol file - */ + */ int getacflg(char *auditstr, int len) { char *str; setac(); - + if(auditstr == NULL) { errno = EINVAL; return -2; @@ -220,7 +220,7 @@ if(getstrfromtype(FLAGS_CONTROL_ENTRY, &str) == 1) { return -3; } - + if(str == NULL) { return 1; } @@ -229,21 +229,20 @@ return -3; } - strcpy(auditstr, str); + strcpy(auditstr, str); return 0; } - /* * Return the non attributable flags from the audit contol file - */ + */ int getacna(char *auditstr, int len) { char *str; setac(); - + if(auditstr == NULL) { errno = EINVAL; return -2; @@ -261,8 +260,7 @@ return -3; } - strcpy(auditstr, str); + strcpy(auditstr, str); return 0; } - ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#2 (text+ko) ==== @@ -1,18 +1,18 @@ /* * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -36,7 +36,7 @@ /* * 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 = ":"; @@ -51,13 +51,13 @@ */ -/* +/* * Allocate an au_event_ent structure - */ + */ static struct au_event_ent *get_event_area() { struct au_event_ent *e; - + e = (struct au_event_ent *) malloc (sizeof(struct au_event_ent)); if(e == NULL) { return NULL; @@ -79,41 +79,41 @@ /* * Free the au_event_ent structure - */ + */ void free_au_event_ent(struct au_event_ent *e) { if (e) { - if (e->ae_name) + if (e->ae_name) free(e->ae_name); - if (e->ae_desc) + if (e->ae_desc) free(e->ae_desc); free(e); } } -/* - * Parse one line from the audit_event file into +/* + * 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; char *last; - + evno = strtok_r(str, delim, &last); evname = strtok_r(NULL, delim, &last); evdesc = strtok_r(NULL, delim, &last); evclass = strtok_r(NULL, delim, &last); - if((evno == NULL) + if((evno == NULL) || (evname == NULL) || (evdesc == NULL) || (evclass == NULL)) { return NULL; - } + } if(strlen(evname) >= AU_EVENT_NAME_MAX) { return NULL; @@ -124,24 +124,24 @@ 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) e->ae_class = AU_NULL; - else - e->ae_class = evmask.am_success; + else + e->ae_class = evmask.am_success; return e; } /* * Rewind the audit_event file - */ + */ void setauevent() { pthread_mutex_lock(&mutex); @@ -155,11 +155,11 @@ /* * Close the open file pointers - */ + */ void endauevent() { pthread_mutex_lock(&mutex); - + if(fp != NULL) { fclose(fp); fp = NULL; @@ -170,7 +170,7 @@ /* * Enumerate the au_event_ent entries - */ + */ struct au_event_ent *getauevent() { struct au_event_ent *e; @@ -178,9 +178,9 @@ pthread_mutex_lock(&mutex); - if((fp == NULL) + if((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) { - + pthread_mutex_unlock(&mutex); return NULL; } @@ -202,7 +202,7 @@ return NULL; } - /* Get the next event structure */ + /* Get the next event structure */ if(eventfromstr(linestr, delim, e) == NULL) { free_au_event_ent(e); @@ -217,7 +217,7 @@ /* * Search for an audit event structure having the given event name - */ + */ struct au_event_ent *getauevnam(char *name) { struct au_event_ent *e; @@ -226,20 +226,20 @@ if(name == NULL) { return NULL; } - + /* Rewind to beginning of the file */ setauevent(); - + pthread_mutex_lock(&mutex); - if((fp == NULL) + if((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) { - + pthread_mutex_unlock(&mutex); return NULL; } - e = get_event_area(); + e = get_event_area(); if(e == NULL) { pthread_mutex_unlock(&mutex); @@ -251,14 +251,14 @@ if((nl = strrchr(linestr, '\n')) != NULL) { *nl = '\0'; } - + if(eventfromstr(linestr, delim, e) != NULL) { if(!strcmp(name, e->ae_name)) { - + pthread_mutex_unlock(&mutex); return e; } - } + } } free_au_event_ent(e); @@ -271,7 +271,7 @@ /* * 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; @@ -282,14 +282,14 @@ pthread_mutex_lock(&mutex); - if((fp == NULL) + if((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) { - + pthread_mutex_unlock(&mutex); return NULL; } - e = get_event_area(); + e = get_event_area(); if(e == NULL) { pthread_mutex_unlock(&mutex); @@ -301,14 +301,14 @@ if((nl = strrchr(linestr, '\n')) != NULL) { *nl = '\0'; } - + if(eventfromstr(linestr, delim, e) != NULL) { if(event_number == e->ae_number) { - + pthread_mutex_unlock(&mutex); return e; } - } + } } free_au_event_ent(e); @@ -319,9 +319,9 @@ } /* - * Search for an audit_event entry with a given event_name + * Search for an audit_event entry with a given event_name * and returns the corresponding event number - */ + */ au_event_t *getauevnonam(char *event_name) { struct au_event_ent *e; @@ -331,16 +331,16 @@ if(e != NULL) { n = (au_event_t *) malloc (sizeof(au_event_t)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Apr 30 13:37:00 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76C6A16A4CE; Sat, 30 Apr 2005 13:37:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 33BDF16A4CE for ; Sat, 30 Apr 2005 13:37:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6B4443D48 for ; Sat, 30 Apr 2005 13:36:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3UDaxuP063167 for ; Sat, 30 Apr 2005 13:36:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3UDaxI5063164 for perforce@freebsd.org; Sat, 30 Apr 2005 13:36:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Apr 2005 13:36:59 GMT Message-Id: <200504301336.j3UDaxI5063164@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 Subject: PERFORCE change 76274 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2005 13:37:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=76274 Change 76274 by rwatson@rwatson_paprika on 2005/04/30 13:36:17 Remove trailing white space. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#5 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#2 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#8 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#5 (text+ko) ==== @@ -1,15 +1,15 @@ /* * @APPLE_LICENSE_HEADER_START@ - * + * * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. - * + * * This file contains Original Code and/or Modifications of Original Code * as defined in and that are subject to the Apple Public Source License * Version 2.0 (the 'License'). You may not use this file except in * compliance with the License. Please obtain a copy of the License at * http://www.opensource.apple.com/apsl/ and read it before using this * file. - * + * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, @@ -17,7 +17,7 @@ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. * Please see the License for the specific language governing rights and * limitations under the License. - * + * * @APPLE_LICENSE_HEADER_END@ */ @@ -26,10 +26,10 @@ #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 -#define MAX_AUDIT_RECORD_SIZE 4096 +#define MAX_AUDIT_RECORD_SIZE 4096 #define MIN_AUDIT_FILE_SIZE 512 * 1024 -/* +/* * Triggers for the audit daemon */ #define AUDIT_TRIGGER_LOW_SPACE 1 @@ -151,7 +151,7 @@ typedef uid_t au_id_t; typedef pid_t au_asid_t; typedef u_int16_t au_event_t; -typedef u_int16_t au_emod_t; +typedef u_int16_t au_emod_t; typedef u_int32_t au_class_t; struct au_tid { @@ -223,7 +223,7 @@ u_char *data; size_t len; LIST_ENTRY(au_record) au_rec_q; -}; +}; typedef struct au_record au_record_t; /* ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#2 (text+ko) ==== @@ -1,15 +1,15 @@ /* * @APPLE_LICENSE_HEADER_START@ - * + * * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. - * + * * This file contains Original Code and/or Modifications of Original Code * as defined in and that are subject to the Apple Public Source License * Version 2.0 (the 'License'). You may not use this file except in * compliance with the License. Please obtain a copy of the License at * http://www.opensource.apple.com/apsl/ and read it before using this * file. - * + * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, @@ -17,28 +17,28 @@ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. * Please see the License for the specific language governing rights and * limitations under the License. - * + * * @APPLE_LICENSE_HEADER_END@ */ #ifndef _BSM_AUDIT_KEVENTS_H_ #define _BSM_AUDIT_KEVENTS_H_ -/* - * Values marked as AUE_NULL are not required to be audited as per CAPP - * +/* + * Values marked as AUE_NULL are not required to be audited as per CAPP + * * The second value within comments is the syscall number in Darwin * - * Values in the third column are the values assigned by BSM for obsolete - * or old system calls + * Values in the third column are the values assigned by BSM for obsolete + * or old system calls * - * Values marked as XXX in the third column do not have an - * event number assigned as yet, and have (temporarily) been assigned - * value of AUE_NULL + * Values marked as XXX in the third column do not have an + * event number assigned as yet, and have (temporarily) been assigned + * value of AUE_NULL */ #define AUE_NULL 0 -#define AUE_EXIT 1 /*1*/ +#define AUE_EXIT 1 /*1*/ #define AUE_FORK 2 /*2*/ #define AUE_OPEN 3 /*3*/ #define AUE_READ AUE_NULL /*4*/ @@ -56,14 +56,14 @@ #define AUE_OPEN_WTC 79 /*5*/ #define AUE_OPEN_WT 78 /*5*/ #define AUE_CLOSE 112 /*6*/ -#define AU_WAIT4 AUE_NULL /*7*/ +#define AU_WAIT4 AUE_NULL /*7*/ #define AUE_O_CREAT AUE_OPEN_RWTC /*8*/ /*4*/ -#define AUE_LINK 5 /*9*/ -#define AUE_UNLINK 6 /*10*/ +#define AUE_LINK 5 /*9*/ +#define AUE_UNLINK 6 /*10*/ #define AUE_O_EXECV AUE_NULL /*11*/ #define AUE_CHDIR 8 /*12*/ #define AUE_FCHDIR 68 /*13*/ -#define AUE_MKNOD 9 /*14*/ +#define AUE_MKNOD 9 /*14*/ #define AUE_CHMOD 10 /*15*/ #define AUE_CHOWN 11 /*16*/ #define AUE_O_SBREAK AUE_NULL /*17*/ @@ -72,11 +72,11 @@ #define AUE_GETPID AUE_NULL /*20*/ #define AUE_O_MOUNT AUE_NULL /*21*/ #define AUE_O_UMOUNT AUE_NULL /*22*/ -#define AUE_SETUID 200 /*23*/ +#define AUE_SETUID 200 /*23*/ #define AUE_GETUID AUE_NULL /*24*/ #define AUE_GETEUID AUE_NULL /*25*/ #define AUE_PTRACE 302 /*26*/ -#define AUE_RECVMSG 190 /*27*/ +#define AUE_RECVMSG 190 /*27*/ #define AUE_SENDMSG 188 /*28*/ #define AUE_RECVFROM 191 /*29*/ #define AUE_ACCEPT 33 /*30*/ @@ -85,8 +85,8 @@ #define AUE_ACCESS 14 /*33*/ #define AUE_CHFLAGS 303 /*34*/ #define AUE_FCHFLAGS 304 /*35*/ -#define AUE_SYNC AUE_NULL /*36*/ -#define AUE_KILL 15 /*37*/ +#define AUE_SYNC AUE_NULL /*36*/ +#define AUE_KILL 15 /*37*/ #define AUE_O_STAT AUE_STAT /*38*/ #define AUE_GETPPID AUE_NULL /*39*/ #define AUE_O_LSTAT AUE_LSTAT /*40*/ @@ -101,7 +101,7 @@ #define AUE_SIGPROCMASK AUE_NULL /*48*/ /*XXX*/ #define AUE_GETLOGIN AUE_NULL /*49*/ #define AUE_SETLOGIN 307 /*50*/ -#define AUE_ACCT 18 /*51*/ +#define AUE_ACCT 18 /*51*/ #define AUE_SIGPENDING AUE_NULL /*52*/ /*XXX*/ #define AUE_SIGALTSTACK AUE_NULL /*53*/ /*XXX*/ #define AUE_IOCTL 158 /*54*/ @@ -111,7 +111,7 @@ #define AUE_READLINK 22 /*58*/ #define AUE_EXECVE 23 /*59*/ #define AUE_UMASK 310 /*60*/ -#define AUE_CHROOT 24 /*61*/ +#define AUE_CHROOT 24 /*61*/ #define AUE_O_FSTAT AUE_FSTAT /*62*/ #define AUE_O_GETPAGESIZE AUE_NULL /*64*/ @@ -128,7 +128,7 @@ #define AUE_MADVISE AUE_NULL /*75*/ #define AUE_O_VHANGUP AUE_NULL /*76*/ #define AUE_O_VLIMIT AUE_NULL /*77*/ -#define AUE_MINCORE AUE_NULL /*78*/ +#define AUE_MINCORE AUE_NULL /*78*/ #define AUE_GETGROUPS AUE_NULL /*79*/ #define AUE_SETGROUPS 26 /*80*/ #define AUE_GETPGRP AUE_NULL /*81*/ @@ -170,7 +170,7 @@ #define AUE_GETRUSAGE AUE_NULL /*117*/ #define AUE_GTSOCKOPT AUE_NULL /*118*/ #define AUE_O_RESUBA AUE_NULL /*119*/ -#define AUE_READV AUE_NULL /*120*/ +#define AUE_READV AUE_NULL /*120*/ #define AUE_WRITEV AUE_NULL /*121*/ #define AUE_SETTIMEOFDAY 313 /*122*/ #define AUE_FCHOWN 38 /*123*/ @@ -195,7 +195,7 @@ #define AUE_O_GETHOSTID AUE_NULL /*142*/ #define AUE_O_SETHOSTID AUE_NULL /*143*/ #define AUE_O_GETRLIMIT AUE_NULL /*144*/ -#define AUE_O_SETRLIMIT AUE_SETRLIMIT /*145*/ +#define AUE_O_SETRLIMIT AUE_SETRLIMIT /*145*/ #define AUE_O_KILLPG AUE_KILL /*146*/ #define AUE_SETSID 319 /*147*/ #define AUE_O_SETQUOTA AUE_NULL /*148*/ @@ -254,7 +254,7 @@ #define AUE_LSTATV AUE_NULL /*218*/ /*EOPNOTSUPP*/ #define AUE_FSTATV AUE_NULL /*219*/ /*EOPNOTSUPP*/ #define AUE_GETATTRLIST 335 /*220*/ -#define AUE_SETATTRLIST 336 /*221*/ +#define AUE_SETATTRLIST 336 /*221*/ #define AUE_GETDIRENTRIESATTR 337 /*222*/ #define AUE_EXCHANGEDATA 338 /*223*/ #define AUE_CHECKUSERACCESS AUE_ACCESS /*224*/ /* To Be Removed */ @@ -364,7 +364,7 @@ #define AUE_FCHROOT 69 #define AUE_FORK1 241 #define AUE_GETAUDIT 132 -#define AUE_GETAUDIT_ADDR 267 +#define AUE_GETAUDIT_ADDR 267 #define AUE_GETAUID 130 #define AUE_GETMSG 217 #define AUE_SOCKACCEPT 247 ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#8 (text+ko) ==== @@ -1,15 +1,15 @@ /* * @APPLE_LICENSE_HEADER_START@ - * + * * Copyright (c) 1999-2004 Apple Computer, Inc. All Rights Reserved. - * + * * This file contains Original Code and/or Modifications of Original Code * as defined in and that are subject to the Apple Public Source License * Version 2.0 (the 'License'). You may not use this file except in * compliance with the License. Please obtain a copy of the License at * http://www.opensource.apple.com/apsl/ and read it before using this * file. - * + * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, @@ -17,7 +17,7 @@ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. * Please see the License for the specific language governing rights and * limitations under the License. - * + * * @APPLE_LICENSE_HEADER_END@ */ @@ -26,14 +26,14 @@ /* Various token id types */ -/* +/* * Values inside the comments are not documented in the BSM pages and - * have been picked up from the header files - */ + * have been picked up from the header files + */ /* - * Values marked as XXX do not have a value defined in the BSM header files - */ + * Values marked as XXX do not have a value defined in the BSM header files + */ /* * Control token types @@ -46,8 +46,8 @@ #define AUT_INVALID 0x00 #define AU_FILE_TOKEN 0x11 -#define AU_TRAILER_TOKEN 0x13 -#define AU_HEADER_32_TOKEN 0x14 +#define AU_TRAILER_TOKEN 0x13 +#define AU_HEADER_32_TOKEN 0x14 #define AU_HEADER_EX_32_TOKEN 0x15 /* @@ -57,7 +57,7 @@ */ #define AU_DATA_TOKEN 0x21 -#define AU_ARB_TOKEN AU_DATA_TOKEN +#define AU_ARB_TOKEN AU_DATA_TOKEN #define AU_IPC_TOKEN 0x22 #define AU_PATH_TOKEN 0x23 #define AU_SUBJECT_32_TOKEN 0x24 @@ -68,7 +68,7 @@ #define AU_IN_ADDR_TOKEN 0x2A #define AU_IP_TOKEN 0x2B #define AU_IPORT_TOKEN 0x2C -#define AU_ARG32_TOKEN 0x2D +#define AU_ARG32_TOKEN 0x2D #define AU_SOCK_TOKEN 0x2E #define AU_SEQ_TOKEN 0x2F @@ -84,7 +84,7 @@ #define AUT_PRIV ((char)0x38) #define AUT_UPRIV ((char)0x39) #define AUT_LIAISON ((char)0x3A) - + */ #define AU_ATTR_TOKEN 0x31 @@ -97,7 +97,7 @@ /* * Command token types */ - + #define AU_CMD_TOKEN 0x51 #define AU_EXIT_TOKEN 0x52 @@ -126,9 +126,9 @@ /* * Extended network address token types */ - + #define AU_HEADER_EX_64_TOKEN 0x79 -#define AU_SUBJECT_32_EX_TOKEN 0x7a +#define AU_SUBJECT_32_EX_TOKEN 0x7a #define AU_PROCESS_32_EX_TOKEN 0x7b #define AU_SUBJECT_64_EX_TOKEN 0x7c #define AU_PROCESS_64_EX_TOKEN 0x7d @@ -141,7 +141,7 @@ * The values for the following token ids are not * defined by BSM */ -#define AU_SOCK_INET_32_TOKEN 0x80 /*XXX*/ +#define AU_SOCK_INET_32_TOKEN 0x80 /*XXX*/ #define AU_SOCK_INET_128_TOKEN 0x81 /*XXX*/ #define AU_SOCK_UNIX_TOKEN 0x82 /*XXX*/ @@ -158,7 +158,7 @@ #define AUR_LONG 2 /* ... and their sizes */ -#define AUR_BYTE_SIZE sizeof(u_char) +#define AUR_BYTE_SIZE sizeof(u_char) #define AUR_SHORT_SIZE sizeof(u_int16_t) #define AUR_LONG_SIZE sizeof(u_int32_t) @@ -193,14 +193,14 @@ int au_close_buffer(int d, short event, u_char *buffer, size_t *buflen); token_t *au_to_file(char *file); -token_t *au_to_header(int rec_size, au_event_t e_type, +token_t *au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod); -token_t *au_to_header32(int rec_size, au_event_t e_type, +token_t *au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod); -token_t *au_to_header64(int rec_size, au_event_t e_type, +token_t *au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod); token_t *au_to_me(void); - + token_t *au_to_arg(char n, char *text, 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); @@ -246,9 +246,9 @@ 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(u_int16_t lp, u_int16_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(u_int16_t lp, u_int16_t rp, struct sockaddr *la, struct sockaddr *ta); #endif token_t *au_to_sock_inet(struct sockaddr_in *so); ==== //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#2 (text+ko) ==== @@ -1,18 +1,18 @@ /* * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE From owner-p4-projects@FreeBSD.ORG Sat Apr 30 13:38:03 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92B4A16A4D0; Sat, 30 Apr 2005 13:38:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 31CE316A4CE for ; Sat, 30 Apr 2005 13:38:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CD2243D1F for ; Sat, 30 Apr 2005 13:38:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3UDc1so063331 for ; Sat, 30 Apr 2005 13:38:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3UDc1oT063328 for perforce@freebsd.org; Sat, 30 Apr 2005 13:38:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Apr 2005 13:38:01 GMT Message-Id: <200504301338.j3UDc1oT063328@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 Subject: PERFORCE change 76276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2005 13:38:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=76276 Change 76276 by rwatson@rwatson_paprika on 2005/04/30 13:37:12 Remove trailing white space. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#9 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#9 (text+ko) ==== @@ -1,18 +1,18 @@ /* * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -32,7 +32,7 @@ /* * NB: definitions, etc., marked with "OpenSSH compatibility" were * introduced solely to allow OpenSSH to compile; Darwin/Apple code should - * not use them. + * not use them. */ #define MAX_ARGS 10 @@ -72,14 +72,14 @@ #define AU_CLASS_DESC_MAX 72 #define AU_EVENT_NAME_MAX 30 #define AU_EVENT_DESC_MAX 50 -#define AU_USER_NAME_MAX 50 +#define AU_USER_NAME_MAX 50 #define AU_LINE_MAX 256 #define MAX_AUDITSTRING_LEN 256 #define BSM_TEXTBUFSZ MAX_AUDITSTRING_LEN /* OpenSSH compatibility */ -/* +/* * These are referenced in Solaris 9 au_open(3BSM); values are guesses. - * Provided for OpenSSH compatibility. + * Provided for OpenSSH compatibility. */ #define AU_TO_NO_WRITE 0 #define AU_TO_WRITE 1 @@ -117,7 +117,7 @@ if(sel & AU_PRS_FAILURE) {\ (m)->am_failure |= c;\ }\ - }while(0) + }while(0) #define SUB_FROM_MASK(m, c, sel) \ do {\ @@ -188,18 +188,18 @@ u_char no; u_int32_t val; - u_int16_t len; + u_int16_t len; char *text; - + } au_arg32_t; typedef struct { u_char no; u_int64_t val; - u_int16_t len; + u_int16_t len; char *text; - + } au_arg64_t; @@ -214,7 +214,7 @@ u_char howtopr; u_char bu; u_char uc; - u_char *data; + u_char *data; } au_arb_t; @@ -254,9 +254,9 @@ /* * count 4 bytes * text count null-terminated string(s) - */ + */ typedef struct { - + u_int32_t count; char *text[MAX_ARGS]; @@ -268,20 +268,20 @@ * text count null-terminated string(s) */ typedef struct { - + u_int32_t count; char *text[MAX_ENV]; - -} au_execenv_t; + +} au_execenv_t; /* * status 4 bytes * return value 4 bytes - */ + */ typedef struct { u_int32_t status; - u_int32_t ret; + u_int32_t ret; } au_exit_t; @@ -290,13 +290,13 @@ * milliseconds of time 4 bytes * file name length 2 bytes * file pathname N bytes + 1 terminating NULL byte - */ + */ typedef struct { u_int32_t s; u_int32_t ms; u_int16_t len; - char *name; + char *name; } au_file_t; @@ -304,11 +304,11 @@ /* * number groups 2 bytes * group list N * 4 bytes - */ + */ typedef struct { u_int16_t no; - u_int32_t list[BSM_MAX_GROUPS]; + u_int32_t list[BSM_MAX_GROUPS]; } au_groups_t; @@ -320,7 +320,7 @@ * event modifier 2 bytes * seconds of time 4 bytes/8 bytes (32-bit/64-bit value) * milliseconds of time 4 bytes/8 bytes (32-bit/64-bit value) - */ + */ typedef struct { u_int32_t size; @@ -328,8 +328,8 @@ u_int16_t e_type; u_int16_t e_mod; u_int32_t s; - u_int32_t ms; - + u_int32_t ms; + } au_header32_t; typedef struct { @@ -339,18 +339,18 @@ u_int16_t e_type; u_int16_t e_mod; u_int64_t s; - u_int64_t ms; - + u_int64_t ms; + } au_header64_t; /* * internet address 4 bytes - */ + */ typedef struct { - + u_int32_t addr; - + } au_inaddr_t; /* @@ -375,9 +375,9 @@ * checksum 2 bytes * source address 4 bytes * destination address 4 bytes - */ + */ typedef struct { - + u_char version; u_char tos; u_int16_t len; @@ -388,17 +388,17 @@ u_int16_t chksm; u_int32_t src; u_int32_t dest; - + } au_ip_t; /* * object ID type 1 byte * object ID 4 bytes - */ + */ typedef struct { u_char type; - u_int32_t id; + u_int32_t id; } au_ipc_t; @@ -410,7 +410,7 @@ * access mode 4 bytes * slot sequence # 4 bytes * key 4 bytes - */ + */ typedef struct { u_int32_t uid; @@ -431,20 +431,20 @@ u_int16_t port; -} au_iport_t; +} au_iport_t; /* * length 2 bytes * data length bytes - */ + */ typedef struct { u_int16_t size; char *data; - + } au_opaque_t; - + /* * path length 2 bytes @@ -467,10 +467,10 @@ * real group ID 4 bytes * process ID 4 bytes * session ID 4 bytes - * terminal ID + * terminal ID * port ID 4 bytes/8 bytes (32-bit/64-bit value) * machine address 4 bytes - */ + */ typedef struct { u_int32_t auid; @@ -481,7 +481,7 @@ u_int32_t pid; u_int32_t sid; au_tid32_t tid; - + } au_proc32_t; typedef struct { @@ -494,7 +494,7 @@ u_int32_t pid; u_int32_t sid; au_tid64_t tid; - + } au_proc64_t; /* @@ -531,22 +531,22 @@ u_char status; u_int32_t ret; - + } au_ret32_t; typedef struct { u_char err; u_int64_t val; - + } au_ret64_t; /* * sequence number 4 bytes - */ + */ typedef struct { - + u_int32_t seqno; } au_seq_t; @@ -568,7 +568,7 @@ } au_socket_t; -/* +/* * socket type 2 bytes * local port 2 bytes * address type/length 4 bytes @@ -622,7 +622,7 @@ * real group ID 4 bytes * process ID 4 bytes * session ID 4 bytes - * terminal ID + * terminal ID * port ID 4 bytes/8 bytes (32-bit/64-bit value) * machine address 4 bytes */ @@ -652,7 +652,7 @@ } au_subject64_t; -/* +/* * audit ID 4 bytes * effective user ID 4 bytes * effective group ID 4 bytes @@ -660,22 +660,22 @@ * real group ID 4 bytes * process ID 4 bytes * session ID 4 bytes - * terminal ID + * terminal ID * port ID 4 bytes/8 bytes (32-bit/64-bit value) * type 4 bytes * machine address 16 bytes - */ -typedef struct { - - u_int32_t auid; - u_int32_t euid; + */ +typedef struct { + + u_int32_t auid; + u_int32_t euid; u_int32_t egid; u_int32_t ruid; u_int32_t rgid; u_int32_t pid; u_int32_t sid; au_tidaddr32_t tid; - + } au_subject32ex_t; @@ -715,7 +715,7 @@ u_int16_t magic; u_int32_t count; - + } au_trailer_t; @@ -726,16 +726,16 @@ u_char *data; size_t len; - + union { au_arg32_t arg32; au_arg64_t arg64; - au_arb_t arb; + au_arb_t arb; au_attr32_t attr32; au_attr64_t attr64; au_execarg_t execarg; - au_execenv_t execenv; + au_execenv_t execenv; au_exit_t exit; au_file_t file; au_groups_t grps; @@ -766,9 +766,9 @@ au_kevent_t kevent; au_invalid_t invalid; au_trailer_t trail; - + } tt; /* The token is one of the above types */ - + } ; typedef struct tokenstr tokenstr_t; @@ -780,7 +780,7 @@ struct au_event_ent *getauevnum(au_event_t event_number); /* * Free the au_event_ent structure - */ + */ void free_au_event_ent(struct au_event_ent *e); au_event_t *getauevnonam(char *event_name); void free_au_event(au_event_t *e); @@ -791,7 +791,7 @@ struct au_class_ent *getauclassnam(const char *name); /* * Free the au_class_ent structure - */ + */ void free_au_class_ent(struct au_class_ent *c); void setac(); @@ -811,14 +811,14 @@ struct au_user_ent *getauuserent(); struct au_user_ent *getauusernam(const char *name); int au_user_mask(char *username, au_mask_t *mask_p); -int getfauditflags(au_mask_t *usremask, au_mask_t *usrdmask, +int getfauditflags(au_mask_t *usremask, au_mask_t *usrdmask, au_mask_t *lastmask); void free_au_user_ent(struct au_user_ent *u); int au_read_rec(FILE *fp, u_char **buf); int au_fetch_tok(tokenstr_t *tok, u_char *buf, int len); -//XXX The following interface has different prototype from BSM +//XXX The following interface has different prototype from BSM void au_print_tok(FILE *outfp, tokenstr_t *tok, char *del, char raw, char sfrm); __END_DECLS @@ -837,10 +837,10 @@ #define __BSM_INTERNAL_NOTIFY_KEY "com.apple.audit.change" #endif /* __APPLE_API_PRIVATE */ -/* - * au_get_state() return values - * XXX use AUC_* values directly instead (); AUDIT_OFF and - * AUDIT_ON are deprecated and WILL be removed. +/* + * au_get_state() return values + * XXX use AUC_* values directly instead (); AUDIT_OFF and + * AUDIT_ON are deprecated and WILL be removed. */ #ifdef __APPLE_API_PRIVATE #define AUDIT_OFF AUC_NOAUDIT @@ -849,8 +849,8 @@ #endif /* !__APPLE__ */ /* - * Error return codes for audit_set_terminal_id(), audit_write() and its - * brethren. We have 255 (not including kAUNoErr) to play with. + * Error return codes for audit_set_terminal_id(), audit_write() and its + * brethren. We have 255 (not including kAUNoErr) to play with. * * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ @@ -877,10 +877,10 @@ * Error return codes for au_get_state() and/or its private support * functions. These codes are designed to be compatible with the * NOTIFY_STATUS_* codes defined in but non-overlapping. - * Any changes to notify(3) may cause these values to change in future. + * Any changes to notify(3) may cause these values to change in future. * - * AU_UNIMPL should never happen unless you've changed your system software - * without rebooting. Shame on you. + * AU_UNIMPL should never happen unless you've changed your system software + * without rebooting. Shame on you. */ #ifdef __APPLE_API_PRIVATE #define AU_UNIMPL NOTIFY_STATUS_FAILED + 1 /* audit unimplemented */ @@ -895,18 +895,18 @@ * au_free_token() * * @summary - au_free_token() deallocates a token_t created by any of - * the au_to_*() BSM API functions. + * the au_to_*() BSM API functions. * - * The BSM API generally manages deallocation of token_t objects. However, + * The BSM API generally manages deallocation of token_t objects. However, * if au_write() is passed a bad audit descriptor, the token_t * parameter - * will be left untouched. In that case, the caller can deallocate the + * will be left untouched. In that case, the caller can deallocate the * token_t using au_free_token() if desired. This is, in fact, what * audit_write() does, in keeping with the existing memory management model - * of the BSM API. + * of the BSM API. * * @param tok - A token_t * generated by one of the au_to_*() BSM API * calls. For convenience, tok may be NULL, in which case - * au_free_token() returns immediately. + * au_free_token() returns immediately. * * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ @@ -916,13 +916,13 @@ * Lightweight check to determine if auditing is enabled. If a client * wants to use this to govern whether an entire series of audit calls * should be made--as in the common case of a caller building a set of - * tokens, then writing them--it should cache the audit status in a local - * variable. This call always returns the current state of auditing. - * + * tokens, then writing them--it should cache the audit status in a local + * variable. This call always returns the current state of auditing. + * * @return - AUC_AUDITING or AUC_NOAUDIT if no error occurred. - * Otherwise the function can return any of the errno values defined for - * setaudit(2), or AU_UNIMPL if audit does not appear to be supported by - * the system. + * Otherwise the function can return any of the errno values defined for + * setaudit(2), or AU_UNIMPL if audit does not appear to be supported by + * the system. * * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ @@ -939,11 +939,11 @@ * @summary - audit_set_terminal_id() fills in an au_tid_t struct, which is * used in audit session initialization by processes like /usr/bin/login. * - * @param tid - A pointer to an au_tid_t struct. + * @param tid - A pointer to an au_tid_t struct. * - * @return - kAUNoErr on success; kAUBadParamErr if tid is NULL, kAUStatErr + * @return - kAUNoErr on success; kAUBadParamErr if tid is NULL, kAUStatErr * or kAUSysctlErr if one of the underlying system calls fails (a message - * is sent to the system log in those cases). + * is sent to the system log in those cases). * * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ @@ -956,49 +956,49 @@ * provided subject information, if any, to construct the subject token * required for every log message. They use the provided return/error * value(s), if any, to construct the success/failure indication required - * for every log message. They only permit one "miscellaneous" token, + * for every log message. They only permit one "miscellaneous" token, * which should contain the event-specific logging information mandated by - * CAPP. + * CAPP. * * All these calls assume the caller has previously determined that - * auditing is enabled by calling au_get_state(). + * auditing is enabled by calling au_get_state(). */ /* * audit_write() * - * @summary - audit_write() is the basis for the other audit_write_*() - * calls. Performs a basic write of an audit record (subject, additional - * info, success/failure). Note that this call only permits logging one - * caller-specified token; clients needing to log more flexibly must use - * the existing BSM API (au_open(), et al.) directly. + * @summary - audit_write() is the basis for the other audit_write_*() + * calls. Performs a basic write of an audit record (subject, additional + * info, success/failure). Note that this call only permits logging one + * caller-specified token; clients needing to log more flexibly must use + * the existing BSM API (au_open(), et al.) directly. * - * Note on memory management: audit_write() guarantees that the token_t *s - * passed to it will be deallocated whether or not the underlying write to + * Note on memory management: audit_write() guarantees that the token_t *s + * passed to it will be deallocated whether or not the underlying write to * the audit log succeeded. This addresses an inconsistency in the * underlying BSM API in which token_t *s are usually but not always - * deallocated. + * deallocated. * - * @param event_code - The code for the event being logged. This should - * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h. + * @param event_code - The code for the event being logged. This should + * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h. * * @param subject - A token_t * generated by au_to_subject(), * au_to_subject32(), au_to_subject64(), or au_to_me(). If no subject is - * required, subject should be NULL. - * + * required, subject should be NULL. + * * @param misctok - A token_t * generated by one of the au_to_*() BSM API * calls. This should correspond to the additional information required by * CAPP for the event being audited. If no additional information is - * required, misctok should be NULL. + * required, misctok should be NULL. * * @param retval - The return value to be logged for this event. This - * should be 0 (zero) for success, otherwise the value is event-specific. + * should be 0 (zero) for success, otherwise the value is event-specific. * * @param errcode - Any error code associated with the return value (e.g., - * errno or h_errno). If there was no error, errcode should be 0 (zero). + * errno or h_errno). If there was no error, errcode should be 0 (zero). * * @return - The status of the call: 0 (zero) on success, else one of the - * kAU*Err values defined above. + * kAU*Err values defined above. * * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ @@ -1007,65 +1007,65 @@ /* * audit_write_success() - * + * * @summary - audit_write_success() records an auditable event that did not * encounter an error. The interface is designed to require as little * direct use of the au_to_*() API as possible. It builds a subject token - * from the information passed in and uses that to invoke audit_write(). - * A subject, as defined by CAPP, is a process acting on the user's behalf. + * from the information passed in and uses that to invoke audit_write(). + * A subject, as defined by CAPP, is a process acting on the user's behalf. * * If the subject information is the same as the current process, use - * au_write_success_self(). + * au_write_success_self(). * - * @param event_code - The code for the event being logged. This should - * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h. + * @param event_code - The code for the event being logged. This should + * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h. * * @param misctok - A token_t * generated by one of the au_to_*() BSM API * calls. This should correspond to the additional information required by * CAPP for the event being audited. If no additional information is - * required, misctok should be NULL. + * required, misctok should be NULL. + * + * @param auid - The subject's audit ID. * - * @param auid - The subject's audit ID. + * @param euid - The subject's effective user ID. * - * @param euid - The subject's effective user ID. + * @param egid - The subject's effective group ID. * - * @param egid - The subject's effective group ID. + * @param ruid - The subject's real user ID. * - * @param ruid - The subject's real user ID. + * @param rgid - The subject's real group ID. * - * @param rgid - The subject's real group ID. + * @param pid - The subject's process ID. * - * @param pid - The subject's process ID. - * - * @param sid - The subject's session ID. + * @param sid - The subject's session ID. * - * @param tid - The subject's terminal ID. + * @param tid - The subject's terminal ID. * * @return - The status of the call: 0 (zero) on success, else one of the - * kAU*Err values defined above. + * kAU*Err values defined above. * * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ -int audit_write_success(short event_code, token_t *misctok, au_id_t auid, - uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, +int audit_write_success(short event_code, token_t *misctok, 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_self() - * - * @summary - Similar to audit_write_success(), but used when the subject - * (process) is owned and operated by the auditable user him/herself. + * + * @summary - Similar to audit_write_success(), but used when the subject + * (process) is owned and operated by the auditable user him/herself. * - * @param event_code - The code for the event being logged. This should - * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h. + * @param event_code - The code for the event being logged. This should + * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h. * * @param misctok - A token_t * generated by one of the au_to_*() BSM API * calls. This should correspond to the additional information required by * CAPP for the event being audited. If no additional information is - * required, misctok should be NULL. + * required, misctok should be NULL. * * @return - The status of the call: 0 (zero) on success, else one of the - * kAU*Err values defined above. + * kAU*Err values defined above. * * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ @@ -1073,72 +1073,72 @@ /* * audit_write_failure() - * - * @summary - audit_write_failure() records an auditable event that + * + * @summary - audit_write_failure() records an auditable event that * encountered an error. The interface is designed to require as little * direct use of the au_to_*() API as possible. It builds a subject token - * from the information passed in and uses that to invoke audit_write(). - * A subject, as defined by CAPP, is a process acting on the user's behalf. + * from the information passed in and uses that to invoke audit_write(). + * A subject, as defined by CAPP, is a process acting on the user's behalf. * * If the subject information is the same as the current process, use - * au_write_failure_self(). + * au_write_failure_self(). * - * @param event_code - The code for the event being logged. This should - * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h. + * @param event_code - The code for the event being logged. This should + * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h. * - * @param errmsg - A text message providing additional information about - * the event being audited. + * @param errmsg - A text message providing additional information about + * the event being audited. * * @param errret - A numerical value providing additional information about - * the error. This is intended to store the value of errno or h_errno if - * it's relevant. This can be 0 (zero) if no additional information is - * available. + * the error. This is intended to store the value of errno or h_errno if + * it's relevant. This can be 0 (zero) if no additional information is + * available. + * + * @param auid - The subject's audit ID. * - * @param auid - The subject's audit ID. + * @param euid - The subject's effective user ID. * - * @param euid - The subject's effective user ID. + * @param egid - The subject's effective group ID. * - * @param egid - The subject's effective group ID. + * @param ruid - The subject's real user ID. * - * @param ruid - The subject's real user ID. + * @param rgid - The subject's real group ID. * - * @param rgid - The subject's real group ID. + * @param pid - The subject's process ID. * - * @param pid - The subject's process ID. - * - * @param sid - The subject's session ID. + * @param sid - The subject's session ID. * - * @param tid - The subject's terminal ID. + * @param tid - The subject's terminal ID. * * @return - The status of the call: 0 (zero) on success, else one of the - * kAU*Err values defined above. + * kAU*Err values defined above. * * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ -int audit_write_failure(short event_code, char *errmsg, int errret, +int audit_write_failure(short event_code, char *errmsg, int errret, au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, - gid_t rgid, pid_t pid, au_asid_t sid, + gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); -/* +/* * audit_write_failure_self() - * - * @summary - Similar to audit_write_failure(), but used when the subject - * (process) is owned and operated by the auditable user him/herself. + * + * @summary - Similar to audit_write_failure(), but used when the subject + * (process) is owned and operated by the auditable user him/herself. * - * @param event_code - The code for the event being logged. This should - * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h. + * @param event_code - The code for the event being logged. This should + * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h. * - * @param errmsg - A text message providing additional information about - * the event being audited. + * @param errmsg - A text message providing additional information about + * the event being audited. * * @param errret - A numerical value providing additional information about - * the error. This is intended to store the value of errno or h_errno if - * it's relevant. This can be 0 (zero) if no additional information is - * available. + * the error. This is intended to store the value of errno or h_errno if + * it's relevant. This can be 0 (zero) if no additional information is + * available. * * @return - The status of the call: 0 (zero) on success, else one of the - * kAU*Err values defined above. + * kAU*Err values defined above. * * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ @@ -1147,30 +1147,30 @@ /* * audit_write_failure_na() * - * @summary - audit_write_failure_na() records errors during login. Such - * errors are implicitly non-attributable (i.e., not ascribable to any user). + * @summary - audit_write_failure_na() records errors during login. Such + * errors are implicitly non-attributable (i.e., not ascribable to any user). * - * @param event_code - The code for the event being logged. This should - * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h. + * @param event_code - The code for the event being logged. This should + * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h. * - * @param errmsg - A text message providing additional information about - * the event being audited. + * @param errmsg - A text message providing additional information about + * the event being audited. * * @param errret - A numerical value providing additional information about - * the error. This is intended to store the value of errno or h_errno if - * it's relevant. This can be 0 (zero) if no additional information is - * available. + * the error. This is intended to store the value of errno or h_errno if + * it's relevant. This can be 0 (zero) if no additional information is + * available. + * + * @param euid - The subject's effective user ID. * - * @param euid - The subject's effective user ID. + * @param egid - The subject's effective group ID. * - * @param egid - The subject's effective group ID. + * @param pid - The subject's process ID. * - * @param pid - The subject's process ID. - * - * @param tid - The subject's terminal ID. + * @param tid - The subject's terminal ID. * * @return - The status of the call: 0 (zero) on success, else one of the - * kAU*Err values defined above. + * kAU*Err values defined above. * * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. */ @@ -1184,37 +1184,37 @@ /* * audit_token_to_au32() * - * @summary - Extract information from an audit_token_t, used to identify + * @summary - Extract information from an audit_token_t, used to identify * Mach tasks and senders of Mach messages as subjects to the audit system. * audit_tokent_to_au32() is the only method that should be used to parse * an audit_token_t, since its internal representation may change over * time. A pointer parameter may be NULL if that information is not - * needed. + * needed. * * @param atoken - the audit token containing the desired information * - * @param auidp - Pointer to a uid_t; on return will be set to the task or + * @param auidp - Pointer to a uid_t; on return will be set to the task or * sender's audit user ID * - * @param euidp - Pointer to a uid_t; on return will be set to the task or + * @param euidp - Pointer to a uid_t; on return will be set to the task or * sender's effective user ID * - * @param egidp - Pointer to a gid_t; on return will be set to the task or + * @param egidp - Pointer to a gid_t; on return will be set to the task or * sender's effective group ID * - * @param ruidp - Pointer to a uid_t; on return will be set to the task or + * @param ruidp - Pointer to a uid_t; on return will be set to the task or * sender's real user ID * - * @param rgidp - Pointer to a gid_t; on return will be set to the task or + * @param rgidp - Pointer to a gid_t; on return will be set to the task or * sender's real group ID * - * @param pidp - Pointer to a pid_t; on return will be set to the task or + * @param pidp - Pointer to a pid_t; on return will be set to the task or * sender's process ID * - * @param asidp - Pointer to an au_asid_t; on return will be set to the + * @param asidp - Pointer to an au_asid_t; on return will be set to the * task or sender's audit session ID * - * @param tidp - Pointer to an au_tid_t; on return will be set to the task + * @param tidp - Pointer to an au_tid_t; on return will be set to the task * or sender's terminal ID * * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE. From owner-p4-projects@FreeBSD.ORG Sat Apr 30 13:39:04 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B59B216A4D0; Sat, 30 Apr 2005 13:39:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7416816A4CE for ; Sat, 30 Apr 2005 13:39:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D42843D2D for ; Sat, 30 Apr 2005 13:39:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3UDd3wX063377 for ; Sat, 30 Apr 2005 13:39:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3UDd3pa063374 for perforce@freebsd.org; Sat, 30 Apr 2005 13:39:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Apr 2005 13:39:03 GMT Message-Id: <200504301339.j3UDd3pa063374@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 Subject: PERFORCE change 76277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2005 13:39:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=76277 Change 76277 by rwatson@rwatson_paprika on 2005/04/30 13:38:32 Remove trailing white space. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#11 (text+ko) ==== @@ -305,7 +305,7 @@ token_t *t; u_char *dptr = NULL; int i; - + if(groups == NULL) { errno = EINVAL; return NULL; @@ -547,7 +547,7 @@ * seconds of time 4 bytes * milliseconds of time 4 bytes * file name len 2 bytes - * file pathname N bytes + 1 terminating NULL byte + * file pathname N bytes + 1 terminating NULL byte */ token_t *au_to_file(char *file) { From owner-p4-projects@FreeBSD.ORG Sat Apr 30 15:29:18 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A49C816A4D0; Sat, 30 Apr 2005 15:29:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from green.homeunix.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 22D1C16A4CE; Sat, 30 Apr 2005 15:29:17 +0000 (GMT) Received: from green.homeunix.org (green@localhost [127.0.0.1]) by green.homeunix.org (8.13.3/8.13.1) with ESMTP id j3UFTGLT062841; Sat, 30 Apr 2005 11:29:16 -0400 (EDT) (envelope-from green@green.homeunix.org) Received: (from green@localhost) by green.homeunix.org (8.13.3/8.13.1/Submit) id j3UFTGZD062840; Sat, 30 Apr 2005 11:29:16 -0400 (EDT) (envelope-from green) Date: Sat, 30 Apr 2005 11:29:16 -0400 From: Brian Fundakowski Feldman To: Robert Watson Message-ID: <20050430152916.GG39270@green.homeunix.org> References: <200504301312.j3UDCRxB061197@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200504301312.j3UDCRxB061197@repoman.freebsd.org> User-Agent: Mutt/1.5.6i cc: Perforce Change Reviews Subject: Re: PERFORCE change 76270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2005 15:29:18 -0000 On Sat, Apr 30, 2005 at 01:12:28PM +0000, Robert Watson wrote: > http://perforce.freebsd.org/chv.cgi?CH=76270 > > Change 76270 by rwatson@rwatson_paprika on 2005/04/30 13:11:27 > > Darwin 8.0 has 64-bit file ID's, so improve support for that. > > Affected files ... > > .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#9 edit > > Differences ... > > ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#9 (text+ko) ==== > > @@ -181,12 +181,20 @@ > ADD_U_INT32(dptr, attr->va_gid); > ADD_U_INT32(dptr, attr->va_fsid); > > - /* > - * Darwin defines the size for fileid > - * as 4 bytes; BSM defines 8 so pad with 0 > - */ > - ADD_U_INT32(dptr, pad0_32); > - ADD_U_INT32(dptr, attr->va_fileid); > + /* > + * Some systems use 32-bit file ID's, other's use 64-bit file IDs. > + * Attempt to handle both, and let the compiler sort it out. If we > + * could pick this out at compile-time, it would be better, so as to > + * avoid the else case below. > + */ > + if (sizeof(attr->va_fileid) == sizeof(uint32_t)) { > + ADD_U_INT32(dptr, pad0_32); > + ADD_U_INT32(dptr, attr->va_fileid); > + } else if (sizeof(attr->va_fileid) == sizeof(uint64_t)) { > + ADD_U_INT64(dptr, attr->va_fileid); > + } else { > + ADD_U_INT64(dptr, 0LL); > + } > > ADD_U_INT32(dptr, attr->va_rdev); > > How about (after adding CTASSERT() if it hasn't already been merged to Darwin): + CTASSERT(sizeof(((struct vattr *)NULL)->va_fileid) == sizeof(uint32_t) || + sizeof(((struct vattr *)NULL)->va_fileid) == sizeof(uint64_t)); ... > + /* > + * Some systems use 32-bit file ID's, other's use 64-bit file IDs. > + */ > + if (sizeof(attr->va_fileid) == sizeof(uint32_t)) { > + ADD_U_INT32(dptr, pad0_32); > + ADD_U_INT32(dptr, attr->va_fileid); > + } else { > + ADD_U_INT64(dptr, attr->va_fileid); > + } -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ From owner-p4-projects@FreeBSD.ORG Sat Apr 30 21:21:33 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E04F16A4D0; Sat, 30 Apr 2005 21:21:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D403816A4CE for ; Sat, 30 Apr 2005 21:21:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F34743D39 for ; Sat, 30 Apr 2005 21:21:32 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3ULLWtx096302 for ; Sat, 30 Apr 2005 21:21:32 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3ULLWGb096299 for perforce@freebsd.org; Sat, 30 Apr 2005 21:21:32 GMT (envelope-from wsalamon@computer.org) Date: Sat, 30 Apr 2005 21:21:32 GMT Message-Id: <200504302121.j3ULLWGb096299@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 76307 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2005 21:21:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=76307 Change 76307 by wsalamon@rickenbacker on 2005/04/30 21:21:22 Print the value of the arg64 token as hex, not decimal. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#7 (text+ko) ==== @@ -559,7 +559,7 @@ print_delim(fp, del); print_1_byte(fp, tok->tt.arg64.no, "%u"); print_delim(fp, del); - print_8_bytes(fp, tok->tt.arg64.val, "%lld"); + print_8_bytes(fp, tok->tt.arg64.val, "%#llx"); print_delim(fp, del); print_string(fp, tok->tt.arg64.text, tok->tt.arg64.len); } From owner-p4-projects@FreeBSD.ORG Sat Apr 30 21:41:06 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DE7D16A4D0; Sat, 30 Apr 2005 21:41:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D53216A4CE for ; Sat, 30 Apr 2005 21:41:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3715F43D1D for ; Sat, 30 Apr 2005 21:41:04 +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 j3ULf4IG097009 for ; Sat, 30 Apr 2005 21:41:04 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3ULexiD096998 for perforce@freebsd.org; Sat, 30 Apr 2005 21:40:59 GMT (envelope-from peter@freebsd.org) Date: Sat, 30 Apr 2005 21:40:59 GMT Message-Id: <200504302140.j3ULexiD096998@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 Subject: PERFORCE change 76309 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Apr 2005 21:41:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=76309 Change 76309 by peter@peter_daintree on 2005/04/30 21:40:47 IFC @76304 Affected files ... .. //depot/projects/hammer/Makefile.inc1#90 integrate .. //depot/projects/hammer/bin/csh/Makefile#7 integrate .. //depot/projects/hammer/bin/csh/config.h#5 integrate .. //depot/projects/hammer/bin/csh/config_p.h#1 branch .. //depot/projects/hammer/bin/ps/ps.1#23 integrate .. //depot/projects/hammer/contrib/bsnmp/NEWS#6 integrate .. //depot/projects/hammer/contrib/bsnmp/VERSION#6 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate .. //depot/projects/hammer/contrib/bsnmp/oid-list#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmp_ntp/NTP-MIB.txt#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmp_ntp/NTP-PROXY-MIB.txt#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmp_ntp/ntp_tree.def#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmp_ntp/snmp_ntp.c#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmpd/main.c#6 integrate .. //depot/projects/hammer/contrib/cvs/src/login.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/patch.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/rcs.c#6 integrate .. //depot/projects/hammer/contrib/ipfilter/.cvsignore#1 branch .. //depot/projects/hammer/contrib/ipfilter/BNF#2 integrate .. //depot/projects/hammer/contrib/ipfilter/BSD/.cvsignore#1 branch .. //depot/projects/hammer/contrib/ipfilter/BSD/Makefile#4 integrate .. //depot/projects/hammer/contrib/ipfilter/BSD/Makefile.ipsend#2 integrate .. //depot/projects/hammer/contrib/ipfilter/BSD/kupgrade#4 integrate .. //depot/projects/hammer/contrib/ipfilter/BSD/make-devices#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FWTK/fwtk-2.1-transparency.txt#2 delete .. //depot/projects/hammer/contrib/ipfilter/FWTK/fwtk_transparent.diff#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FWTK/fwtkp#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FWTK/tproxy.diff#2 delete .. //depot/projects/hammer/contrib/ipfilter/FreeBSD-2.2/files.diffs#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FreeBSD-2.2/kinstall#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FreeBSD-3/kinstall#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4#3 delete .. //depot/projects/hammer/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2#1 branch .. //depot/projects/hammer/contrib/ipfilter/FreeBSD-4.0/kinstall#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FreeBSD-4.0/unkinstall#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FreeBSD/files.diffs#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FreeBSD/files.newconf.diffs#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FreeBSD/files.oldconf.diffs#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FreeBSD/filez.diffs#2 integrate .. //depot/projects/hammer/contrib/ipfilter/FreeBSD/kinstall#2 integrate .. //depot/projects/hammer/contrib/ipfilter/HISTORY#5 integrate .. //depot/projects/hammer/contrib/ipfilter/INST.FreeBSD-2.2#2 integrate .. //depot/projects/hammer/contrib/ipfilter/INSTALL.FreeBSD#2 integrate .. //depot/projects/hammer/contrib/ipfilter/IPFILTER.LICENCE#2 integrate .. //depot/projects/hammer/contrib/ipfilter/Makefile#5 integrate .. //depot/projects/hammer/contrib/ipfilter/README#2 integrate .. //depot/projects/hammer/contrib/ipfilter/STYLE.TXT#1 branch .. //depot/projects/hammer/contrib/ipfilter/UPGRADE_NOTICE#2 delete .. //depot/projects/hammer/contrib/ipfilter/WhatsNew40.txt#1 branch .. //depot/projects/hammer/contrib/ipfilter/bpf-ipf.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/bpf.h#2 delete .. //depot/projects/hammer/contrib/ipfilter/bpf_filter.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/bsdinstall#2 integrate .. //depot/projects/hammer/contrib/ipfilter/common.c#4 delete .. //depot/projects/hammer/contrib/ipfilter/etc/protocols#2 integrate .. //depot/projects/hammer/contrib/ipfilter/etc/services#2 integrate .. //depot/projects/hammer/contrib/ipfilter/facpri.c#2 delete .. //depot/projects/hammer/contrib/ipfilter/facpri.h#2 delete .. //depot/projects/hammer/contrib/ipfilter/fils.c#5 delete .. //depot/projects/hammer/contrib/ipfilter/inet_addr.c#2 delete .. //depot/projects/hammer/contrib/ipfilter/ip_fil.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_fil_freebsd.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_htable.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_htable.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_irc_pxy.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_lfil.c#3 delete .. //depot/projects/hammer/contrib/ipfilter/ip_lookup.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_lookup.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_msnrpc_pxy.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_pool.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_pool.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_pptp_pxy.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_rpcb_pxy.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_scan.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_scan.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_sfil.c#5 delete .. //depot/projects/hammer/contrib/ipfilter/ip_sync.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/ip_sync.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/ipf.c#5 delete .. //depot/projects/hammer/contrib/ipfilter/ipf.h#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipfs.c#4 delete .. //depot/projects/hammer/contrib/ipfilter/ipft_ef.c#5 delete .. //depot/projects/hammer/contrib/ipfilter/ipft_hx.c#3 delete .. //depot/projects/hammer/contrib/ipfilter/ipft_pc.c#3 delete .. //depot/projects/hammer/contrib/ipfilter/ipft_sn.c#3 delete .. //depot/projects/hammer/contrib/ipfilter/ipft_td.c#5 delete .. //depot/projects/hammer/contrib/ipfilter/ipft_tx.c#4 delete .. //depot/projects/hammer/contrib/ipfilter/iplang/.cvsignore#1 branch .. //depot/projects/hammer/contrib/ipfilter/iplang/Makefile#2 integrate .. //depot/projects/hammer/contrib/ipfilter/iplang/iplang.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/iplang/iplang_l.l#3 integrate .. //depot/projects/hammer/contrib/ipfilter/iplang/iplang_y.y#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipmon.c#6 delete .. //depot/projects/hammer/contrib/ipfilter/ipmon.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/ipnat.c#4 delete .. //depot/projects/hammer/contrib/ipfilter/ipsd/Celler/ip_compat.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsd/Makefile#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsd/ipsd.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsd/ipsd.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsd/ipsdr.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsd/linux.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsd/sbpf.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsd/sdlpi.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsd/slinux.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsd/snit.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/.OLD/ip_compat.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/.cvsignore#1 branch .. //depot/projects/hammer/contrib/ipfilter/ipsend/44arp.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/Makefile#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/arp.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/dlcommon.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/dltest.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/hpux.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/in_var.h#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/ip.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/ip_var.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/ipresend.1#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/ipresend.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/ipsend.1#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/ipsend.5#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/ipsend.c#4 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/ipsend.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/ipsopt.c#4 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/iptest.1#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/iptest.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/iptests.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/larp.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/linux.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/lsock.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/resend.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/sbpf.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/sdlpi.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/sirix.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/slinux.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/snit.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/sock.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/sockraw.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/ipsend/tcpip.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/ultrix.c#2 delete .. //depot/projects/hammer/contrib/ipfilter/ipt.c#5 delete .. //depot/projects/hammer/contrib/ipfilter/ipt.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/kmem.c#6 delete .. //depot/projects/hammer/contrib/ipfilter/kmem.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/l4check/http.ok#2 integrate .. //depot/projects/hammer/contrib/ipfilter/l4check/l4check.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/Makefile#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/addicmp.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/addipopt.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/addkeep.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/bcopywrap.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/binprint.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/buildopts.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/checkrev.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/count4bits.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/count6bits.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/debug.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/extras.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/facpri.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/facpri.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/fill6bits.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/flags.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/genmask.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/gethost.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/getifname.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/getline.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/getnattype.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/getport.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/getportproto.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/getproto.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/getsumd.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/hexdump.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/hostmask.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/hostname.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/hostnum.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/icmpcode.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/inet_addr.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/initparse.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/ionames.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/ipf_dotuning.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/ipft_ef.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/ipft_hx.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/ipft_pc.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/ipft_sn.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/ipft_td.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/ipft_tx.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/ipoptsec.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/kmem.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/kmem.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/kmemcpywrap.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/kvatoname.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/load_hash.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/load_hashnode.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/load_pool.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/load_poolnode.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/loglevel.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/make_range.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/mutex_emul.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/nametokva.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/nat_setgroupmap.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/natparse.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/ntomask.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/optname.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/optprint.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/optprintv6.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/optvalue.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/parse.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/portname.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/portnum.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/ports.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/print_toif.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printactivenat.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printaps.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printbuf.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printfr.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printfraginfo.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printhash.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printhashnode.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printhostmap.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printhostmask.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printifname.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printip.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printlog.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printmask.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printnat.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printpacket.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printpacket6.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printpool.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printpoolnode.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printportcmp.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printsbuf.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printstate.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/printtunable.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/ratoi.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/ratoui.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/remove_hash.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/remove_hashnode.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/remove_pool.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/remove_poolnode.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/resetlexer.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/rwlock_emul.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/tcp_flags.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/tcpflags.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/tcpoptnames.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/to_interface.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/v6ionames.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/v6optvalue.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/var.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/lib/verbose.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/man/Makefile#2 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipf.4#2 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipf.5#4 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipf.8#4 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipfilter.4#1 branch .. //depot/projects/hammer/contrib/ipfilter/man/ipfilter.4.mandoc#1 branch .. //depot/projects/hammer/contrib/ipfilter/man/ipfs.8#3 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipfstat.8#4 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipftest.1#3 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipl.4#3 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipmon.5#1 branch .. //depot/projects/hammer/contrib/ipfilter/man/ipmon.8#6 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipnat.5#5 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipnat.8#3 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ippool.5#1 branch .. //depot/projects/hammer/contrib/ipfilter/man/ippool.8#1 branch .. //depot/projects/hammer/contrib/ipfilter/man/ipscan.5#1 branch .. //depot/projects/hammer/contrib/ipfilter/man/ipscan.8#1 branch .. //depot/projects/hammer/contrib/ipfilter/man/mkfilters.1#2 integrate .. //depot/projects/hammer/contrib/ipfilter/md5.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/md5.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/misc.c#3 delete .. //depot/projects/hammer/contrib/ipfilter/ml_ipl.c#2 delete .. //depot/projects/hammer/contrib/ipfilter/mlf_ipl.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/mlf_rule.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/mlfk_rule.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/mlh_rule.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/mli_ipl.c#3 delete .. //depot/projects/hammer/contrib/ipfilter/mln_ipl.c#4 delete .. //depot/projects/hammer/contrib/ipfilter/mls_ipl.c#2 delete .. //depot/projects/hammer/contrib/ipfilter/natparse.c#4 delete .. //depot/projects/hammer/contrib/ipfilter/net/.cvsignore#1 branch .. //depot/projects/hammer/contrib/ipfilter/opt.c#3 delete .. //depot/projects/hammer/contrib/ipfilter/opts.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/parse.c#5 delete .. //depot/projects/hammer/contrib/ipfilter/pcap-ipf.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/pcap.h#2 delete .. //depot/projects/hammer/contrib/ipfilter/perl/ipf-mrtg.pl#2 integrate .. //depot/projects/hammer/contrib/ipfilter/perl/ipfmeta.pl#1 branch .. //depot/projects/hammer/contrib/ipfilter/perl/logfilter.pl#2 integrate .. //depot/projects/hammer/contrib/ipfilter/printnat.c#5 delete .. //depot/projects/hammer/contrib/ipfilter/printstate.c#4 delete .. //depot/projects/hammer/contrib/ipfilter/radix.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/radix_ipf.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/relay.c#3 delete .. //depot/projects/hammer/contrib/ipfilter/rules/.cvsignore#1 branch .. //depot/projects/hammer/contrib/ipfilter/rules/example.1#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.10#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.11#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.12#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.13#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.2#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.3#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.4#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.5#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.6#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.7#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.8#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.9#3 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.sr#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/ip_rules#1 branch .. //depot/projects/hammer/contrib/ipfilter/rules/ipmon.conf#1 branch .. //depot/projects/hammer/contrib/ipfilter/rules/pool.conf#1 branch .. //depot/projects/hammer/contrib/ipfilter/samples/.cvsignore#1 branch .. //depot/projects/hammer/contrib/ipfilter/samples/Makefile#2 integrate .. //depot/projects/hammer/contrib/ipfilter/samples/ipfilter-pb.gif#2 integrate .. //depot/projects/hammer/contrib/ipfilter/samples/proxy.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/samples/relay.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/samples/userauth.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/snoop.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/solaris.c#2 delete .. //depot/projects/hammer/contrib/ipfilter/test/.cvsignore#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/Makefile#4 integrate .. //depot/projects/hammer/contrib/ipfilter/test/bpftest#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/dotest#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/dotest6#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/bpf-f1#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/bpf1#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/f17#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i1#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i11#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i12#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i13#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/i14#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/i15#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/i2#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i3#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i4#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i5#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i6#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i7#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/i9#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/in1#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/in2#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/in5#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/in6#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/ip1#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/l1#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/l1.b#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/n1#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/n10#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/n11#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/n12#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/n4#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/n5#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/n7#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/n8#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/n9#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni1#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni10#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni11#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni12#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni13#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni14#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni15#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni16#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni2#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni3#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni4#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni5#4 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni6#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni7#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni8#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/ni9#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/p1#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/p2#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/p3#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/hextest#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/f11#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/f12#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/f13#4 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/f17#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/ipv6.1#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/l1#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/n1#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/n10#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/n11#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/n12#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/n4#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/n8#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/n9#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/ni1#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/ni10#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/ni12#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/ni13#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/ni14#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/ni15#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/ni16#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/ni6#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/ni7#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/ni9#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/p1#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/p2#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/p3#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/intest#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/iptest#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/itest#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/logtest#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/mhtest#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/mtest#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/natipftest#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/nattest#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/ptest#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/bpf-f1#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/bpf1#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/i1#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i11#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i12#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i13#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/i14#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/i15#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/i2#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i3#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i4#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i6#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i9#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/in1#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/in2#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/in5#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/in6#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ip1#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/n10#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/n11#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/n12#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/n4#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/n7#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/n8#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/n9#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni10.nat#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni11.nat#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni12.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni12.nat#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni13.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni13.nat#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni14.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni14.nat#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni15.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni15.nat#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni16.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni16.nat#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni6.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni6.nat#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni7.nat#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni8.nat#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni9.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/ni9.nat#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/p1.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/p1.pool#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/p2.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/p3.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/p3.pool#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/test.format#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/vfycksum.pl#2 integrate .. //depot/projects/hammer/contrib/ipfilter/todo#2 delete .. //depot/projects/hammer/contrib/ipfilter/tools/BNF.ipf#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/BNF.ipnat#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/Makefile#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ipf.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ipf_y.y#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ipfcomp.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ipfs.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ipfstat.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ipftest.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ipmon.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ipmon_y.y#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ipnat.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ipnat_y.y#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ippool.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ippool_y.y#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ipscan_y.y#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ipsyncm.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/ipsyncs.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/lex_var.h#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/lexer.c#1 branch .. //depot/projects/hammer/contrib/ipfilter/tools/lexer.h#1 branch .. //depot/projects/hammer/contrib/tcsh/Fixes#3 integrate .. //depot/projects/hammer/contrib/tcsh/Imakefile#3 integrate .. //depot/projects/hammer/contrib/tcsh/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/tcsh/Makefile.std#2 integrate .. //depot/projects/hammer/contrib/tcsh/Makefile.vms#2 integrate .. //depot/projects/hammer/contrib/tcsh/README#3 integrate .. //depot/projects/hammer/contrib/tcsh/complete.tcsh#3 integrate .. //depot/projects/hammer/contrib/tcsh/config.h.in#2 integrate .. //depot/projects/hammer/contrib/tcsh/config/bsd4.4#3 integrate .. //depot/projects/hammer/contrib/tcsh/config_f.h#3 integrate .. //depot/projects/hammer/contrib/tcsh/configure#3 integrate .. //depot/projects/hammer/contrib/tcsh/configure.in#3 integrate .. //depot/projects/hammer/contrib/tcsh/ed.chared.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/ed.decls.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/ed.defns.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/ed.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/ed.init.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/ed.inputl.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/ed.refresh.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/ed.screen.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/ed.term.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/ed.term.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/ed.xmap.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/gethost.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/glob.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/glob.h#3 integrate .. //depot/projects/hammer/contrib/tcsh/host.defs#3 integrate .. //depot/projects/hammer/contrib/tcsh/install-sh#2 integrate .. //depot/projects/hammer/contrib/tcsh/ma.setp.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/nls/C/set11#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/ja/set1#2 integrate .. //depot/projects/hammer/contrib/tcsh/nls/ja/set3#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/ja/set4#1 branch .. //depot/projects/hammer/contrib/tcsh/nls/ja/set7#1 branch .. //depot/projects/hammer/contrib/tcsh/patchlevel.h#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.char.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.decls.h#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.dir.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.dol.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.err.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.exec.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.exp.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.file.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.func.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.glob.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.h#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.hist.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.init.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.lex.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.misc.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.parse.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.print.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.proc.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.proc.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.sem.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.set.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/sh.time.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/sh.types.h#3 integrate .. //depot/projects/hammer/contrib/tcsh/tc.alloc.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.bind.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.const.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/tc.decls.h#3 integrate .. //depot/projects/hammer/contrib/tcsh/tc.disc.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.func.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/tc.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.nls.c#1 branch .. //depot/projects/hammer/contrib/tcsh/tc.nls.h#1 branch .. //depot/projects/hammer/contrib/tcsh/tc.os.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/tc.os.h#3 integrate .. //depot/projects/hammer/contrib/tcsh/tc.printf.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/tc.prompt.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/tc.sched.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.sig.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.sig.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.str.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/tc.vers.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.wait.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/tc.who.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/tcsh.man#3 integrate .. //depot/projects/hammer/contrib/tcsh/tcsh.man2html#2 integrate .. //depot/projects/hammer/contrib/tcsh/tw.color.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/tw.comp.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/tw.decls.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/tw.h#2 integrate .. //depot/projects/hammer/contrib/tcsh/tw.help.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/tw.init.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/tw.parse.c#3 integrate .. //depot/projects/hammer/contrib/tcsh/tw.spell.c#2 integrate .. //depot/projects/hammer/contrib/tcsh/vms.termcap.c#2 integrate .. //depot/projects/hammer/etc/Makefile#39 integrate .. //depot/projects/hammer/etc/pam.d/xdm#5 integrate .. //depot/projects/hammer/etc/rc#16 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#35 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#16 delete .. //depot/projects/hammer/etc/rc.d/jail#14 integrate .. //depot/projects/hammer/etc/rc.d/named#12 integrate .. //depot/projects/hammer/etc/rc.d/preseedrandom#5 delete .. //depot/projects/hammer/etc/rc.d/rcconf.sh#3 integrate .. //depot/projects/hammer/etc/rc.initdiskless#2 integrate .. //depot/projects/hammer/games/factor/Makefile#7 integrate .. //depot/projects/hammer/games/fortune/datfiles/startrek#7 integrate .. //depot/projects/hammer/gnu/lib/libdialog/Makefile#6 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#23 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#20 integrate .. //depot/projects/hammer/include/Makefile#41 integrate .. //depot/projects/hammer/include/netdb.h#8 integrate .. //depot/projects/hammer/lib/Makefile#49 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#21 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#18 integrate .. //depot/projects/hammer/lib/libarchive/configure.ac.in#3 integrate .. //depot/projects/hammer/lib/libatm/Makefile#7 integrate .. //depot/projects/hammer/lib/libc/amd64/string/strcpy.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/cerror.S#5 integrate .. //depot/projects/hammer/lib/libc/i386/gen/_set_tp.c#6 integrate .. //depot/projects/hammer/lib/libc/i386/string/bcmp.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/sys/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_fsbase.c#6 delete .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_gsbase.c#6 delete .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_fsbase.c#5 delete .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_gsbase.c#5 delete .. //depot/projects/hammer/lib/libc/net/getaddrinfo.3#11 integrate .. //depot/projects/hammer/lib/libc/net/gethostbydns.c#11 integrate .. //depot/projects/hammer/lib/libc/net/gethostbyht.c#3 integrate .. //depot/projects/hammer/lib/libc/net/gethostbyname.3#6 integrate .. //depot/projects/hammer/lib/libc/net/gethostbynis.c#4 integrate .. //depot/projects/hammer/lib/libc/net/gethostnamadr.c#4 integrate .. //depot/projects/hammer/lib/libc/net/getipnodebyname.3#7 integrate .. //depot/projects/hammer/lib/libc/net/getnameinfo.3#10 integrate .. //depot/projects/hammer/lib/libc/net/getnetbydns.c#5 integrate .. //depot/projects/hammer/lib/libc/net/getnetbyht.c#3 integrate .. //depot/projects/hammer/lib/libc/net/getnetbynis.c#2 integrate .. //depot/projects/hammer/lib/libc/net/getnetent.3#4 integrate .. //depot/projects/hammer/lib/libc/net/getnetnamadr.c#3 integrate .. //depot/projects/hammer/lib/libc/net/getproto.c#2 integrate .. //depot/projects/hammer/lib/libc/net/getprotoent.3#4 integrate .. //depot/projects/hammer/lib/libc/net/getprotoent.c#3 integrate .. //depot/projects/hammer/lib/libc/net/getprotoname.c#2 integrate .. //depot/projects/hammer/lib/libc/net/getservent.3#3 integrate .. //depot/projects/hammer/lib/libc/net/getservent.c#6 integrate .. //depot/projects/hammer/lib/libc/net/map_v4v6.c#2 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#16 integrate .. //depot/projects/hammer/lib/libc/net/netdb_private.h#3 integrate .. //depot/projects/hammer/lib/libc/regex/cclass.h#2 delete .. //depot/projects/hammer/lib/libdevstat/devstat.c#8 integrate .. //depot/projects/hammer/lib/libnetgraph/debug.c#2 integrate .. //depot/projects/hammer/lib/libnetgraph/msg.c#5 integrate .. //depot/projects/hammer/lib/libnetgraph/sock.c#6 integrate .. //depot/projects/hammer/lib/libopie/Makefile#6 integrate .. //depot/projects/hammer/lib/libpmc/Makefile#1 branch .. //depot/projects/hammer/lib/libpmc/libpmc.c#1 branch .. //depot/projects/hammer/lib/libpmc/pmc.3#1 branch .. //depot/projects/hammer/lib/libpmc/pmc.h#1 branch .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#6 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#13 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/pthread_md.c#3 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.c#10 integrate .. //depot/projects/hammer/lib/libutil/login_cap.c#6 integrate .. //depot/projects/hammer/lib/libz/ChangeLog#3 integrate .. //depot/projects/hammer/lib/libz/FAQ#3 integrate .. //depot/projects/hammer/lib/libz/README#3 integrate .. //depot/projects/hammer/lib/libz/gzio.c#4 integrate .. //depot/projects/hammer/lib/libz/zconf.h#3 integrate .. //depot/projects/hammer/lib/libz/zlib.h#3 integrate .. //depot/projects/hammer/lib/msun/src/s_ceill.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_floorl.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_truncl.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#8 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#21 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#14 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#93 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml#2 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#11 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl#2 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#3 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#25 integrate .. //depot/projects/hammer/sbin/Makefile#33 integrate .. //depot/projects/hammer/sbin/devfs/devfs.8#11 integrate .. //depot/projects/hammer/sbin/fdisk/fdisk.c#15 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#10 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#14 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#10 integrate .. //depot/projects/hammer/sbin/gpt/add.c#8 integrate .. //depot/projects/hammer/sbin/gpt/gpt.8#8 integrate .. //depot/projects/hammer/sbin/gpt/gpt.c#7 integrate .. //depot/projects/hammer/sbin/gpt/gpt.h#6 integrate .. //depot/projects/hammer/sbin/gpt/remove.c#3 integrate .. //depot/projects/hammer/sbin/ipf/Makefile#5 integrate .. //depot/projects/hammer/sbin/ipf/Makefile.inc#1 branch .. //depot/projects/hammer/sbin/ipf/ipf/Makefile#1 branch .. //depot/projects/hammer/sbin/ipf/ipfs/Makefile#1 branch .. //depot/projects/hammer/sbin/ipf/ipfstat/Makefile#1 branch .. //depot/projects/hammer/sbin/ipf/ipftest/Makefile#1 branch .. //depot/projects/hammer/sbin/ipf/ipmon/Makefile#1 branch .. //depot/projects/hammer/sbin/ipf/ipnat/Makefile#1 branch .. //depot/projects/hammer/sbin/ipf/ippool/Makefile#1 branch .. //depot/projects/hammer/sbin/ipf/ipresend/Makefile#1 branch .. //depot/projects/hammer/sbin/ipf/ipsend/Makefile#1 branch .. //depot/projects/hammer/sbin/ipf/iptest/Makefile#1 branch .. //depot/projects/hammer/sbin/ipf/libipf/Makefile#1 branch .. //depot/projects/hammer/sbin/ipf/rules/Makefile#1 branch .. //depot/projects/hammer/sbin/ipfs/Makefile#4 delete .. //depot/projects/hammer/sbin/ipfstat/Makefile#4 delete .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#41 integrate .. //depot/projects/hammer/sbin/ipmon/Makefile#6 delete .. //depot/projects/hammer/sbin/ipnat/Makefile#4 delete .. //depot/projects/hammer/share/doc/papers/Makefile#4 integrate .. //depot/projects/hammer/share/doc/papers/hwpmc/Makefile#1 branch .. //depot/projects/hammer/share/doc/papers/hwpmc/hwpmc.ms#1 branch .. //depot/projects/hammer/share/examples/hwpmc/README#1 branch .. //depot/projects/hammer/share/man/man4/Makefile#70 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#34 integrate .. //depot/projects/hammer/share/man/man4/ataraid.4#2 integrate .. //depot/projects/hammer/share/man/man4/ath.4#24 integrate .. //depot/projects/hammer/share/man/man4/cpufreq.4#6 integrate .. //depot/projects/hammer/share/man/man4/faith.4#3 integrate .. //depot/projects/hammer/share/man/man4/hwpmc.4#1 branch .. //depot/projects/hammer/share/man/man4/ohci.4#5 integrate .. //depot/projects/hammer/share/man/man4/sk.4#8 integrate .. //depot/projects/hammer/share/man/man4/twe.4#7 integrate .. //depot/projects/hammer/share/man/man4/uhci.4#5 integrate .. //depot/projects/hammer/share/man/man4/usb.4#8 integrate .. //depot/projects/hammer/share/man/man5/nsswitch.conf.5#6 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#54 integrate .. //depot/projects/hammer/share/man/man9/Makefile#52 integrate .. //depot/projects/hammer/share/man/man9/alloc_unr.9#1 branch .. //depot/projects/hammer/share/man/man9/sleepqueue.9#7 integrate .. //depot/projects/hammer/share/man/man9/taskqueue.9#10 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#27 integrate .. //depot/projects/hammer/share/mk/sys.mk#19 integrate .. //depot/projects/hammer/share/mklocale/be_BY.CP1131.src#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#22 integrate .. //depot/projects/hammer/sys/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#90 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#58 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#70 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#65 integrate .. //depot/projects/hammer/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/hammer/sys/amd64/include/smp.h#24 integrate .. //depot/projects/hammer/sys/arm/arm/fusu.S#7 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#11 integrate .. //depot/projects/hammer/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#10 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/Makefile#9 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#28 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#30 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#6 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#18 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#12 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#29 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#29 integrate .. //depot/projects/hammer/sys/conf/NOTES#88 integrate .. //depot/projects/hammer/sys/conf/files#112 integrate .. //depot/projects/hammer/sys/conf/files.amd64#67 integrate .. //depot/projects/hammer/sys/conf/files.i386#57 integrate .. //depot/projects/hammer/sys/conf/files.ia64#26 integrate .. //depot/projects/hammer/sys/conf/files.pc98#43 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#31 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#48 integrate .. //depot/projects/hammer/sys/conf/options#72 integrate .. //depot/projects/hammer/sys/conf/options.amd64#35 integrate .. //depot/projects/hammer/sys/conf/options.i386#33 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/fil.c#9 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_auth.h#3 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_compat.h#8 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil.c#14 delete .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil.h#7 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_frag.c#6 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_frag.h#4 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#5 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_htable.c#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_htable.h#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_log.c#7 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_lookup.c#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_lookup.h#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_nat.c#6 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_nat.h#6 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_pool.c#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_pool.h#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_proxy.c#5 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_proxy.h#4 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#3 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#4 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_rules.c#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_rules.h#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_scan.c#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_scan.h#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_state.c#7 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_state.h#5 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_sync.c#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_sync.h#1 branch .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ipl.h#5 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/mlfk_ipl.c#7 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#21 integrate .. //depot/projects/hammer/sys/ddb/ddb.h#9 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#44 integrate .. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/hammer/sys/dev/asr/asr.c#17 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#49 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#29 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#22 integrate .. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#12 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#55 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#31 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#20 integrate .. //depot/projects/hammer/sys/dev/ata/ata-isa.c#13 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#28 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#30 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#30 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#24 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#23 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#13 integrate .. //depot/projects/hammer/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#20 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#27 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#14 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#17 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#43 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#32 integrate .. //depot/projects/hammer/sys/dev/ciss/cissreg.h#11 integrate .. //depot/projects/hammer/sys/dev/ciss/cissvar.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/hammer/sys/dev/esp/ncr53c9x.c#7 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#45 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpreg.h#11 integrate .. //depot/projects/hammer/sys/dev/fxp/rcvbundl.h#3 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#1 branch .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_intel.c#1 branch .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#1 branch .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_pentium.c#1 branch .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#1 branch .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#1 branch .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#31 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#10 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#14 integrate .. //depot/projects/hammer/sys/dev/ips/ips.c#12 integrate .. //depot/projects/hammer/sys/dev/musycc/musycc.c#11 delete .. //depot/projects/hammer/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#40 integrate .. //depot/projects/hammer/sys/dev/pci/pci_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/pci/pcireg.h#8 integrate .. //depot/projects/hammer/sys/dev/pci/pcivar.h#9 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#20 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.h#4 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#11 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#10 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#16 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#20 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#19 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#18 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#17 integrate .. //depot/projects/hammer/sys/geom/geom_kern.c#19 integrate .. //depot/projects/hammer/sys/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#21 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.h#8 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror_ctl.c#6 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_init.c#9 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakecode.S#7 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#68 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#14 integrate .. //depot/projects/hammer/sys/i386/cpufreq/smist.c#1 branch .. //depot/projects/hammer/sys/i386/i386/local_apic.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#42 integrate .. //depot/projects/hammer/sys/i386/i386/support.s#12 integrate .. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#17 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#31 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#43 integrate .. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#11 integrate .. //depot/projects/hammer/sys/i386/include/pmc_mdep.h#1 branch .. //depot/projects/hammer/sys/i386/include/smp.h#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/clock.c#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/clock_if.m#3 delete .. //depot/projects/hammer/sys/ia64/ia64/eficlock.c#3 delete .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#28 integrate .. //depot/projects/hammer/sys/ia64/include/clockvar.h#3 delete .. //depot/projects/hammer/sys/ia64/include/pmc_mdep.h#1 branch .. //depot/projects/hammer/sys/kern/init_sysent.c#43 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#46 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#44 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_pmc.c#1 branch .. //depot/projects/hammer/sys/kern/kern_sig.c#58 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#77 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#37 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#58 integrate .. //depot/projects/hammer/sys/kern/subr_kdb.c#9 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#25 integrate .. //depot/projects/hammer/sys/kern/subr_taskqueue.c#11 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#41 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#42 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#42 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#32 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#29 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#53 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#26 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#55 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#82 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#35 integrate .. //depot/projects/hammer/sys/libkern/crc32.c#4 integrate .. //depot/projects/hammer/sys/modules/Makefile#75 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/apm/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/cpufreq/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/hwpmc/Makefile#1 branch .. //depot/projects/hammer/sys/modules/if_ndis/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/ipfilter/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/puc/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#45 integrate .. //depot/projects/hammer/sys/net/if_var.h#29 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#24 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#19 integrate .. //depot/projects/hammer/sys/netgraph/ng_message.h#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_vlan.c#3 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#30 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#54 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#22 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.h#7 integrate .. //depot/projects/hammer/sys/netinet/libalias/HISTORY#1 branch .. //depot/projects/hammer/sys/netinet/libalias/Makefile#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias.c#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias.h#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias_cuseeme.c#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias_db.c#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias_ftp.c#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias_irc.c#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias_local.h#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias_nbt.c#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias_old.c#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias_pptp.c#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias_proxy.c#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias_skinny.c#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias_smedia.c#1 branch .. //depot/projects/hammer/sys/netinet/libalias/alias_util.c#1 branch .. //depot/projects/hammer/sys/netinet/libalias/libalias.3#1 branch .. //depot/projects/hammer/sys/netinet/tcp_output.c#29 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#14 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#42 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#26 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#27 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#22 integrate .. //depot/projects/hammer/sys/nfsclient/bootp_subr.c#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#10 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#38 integrate .. //depot/projects/hammer/sys/pc98/apm/apm_bioscall.S#1 branch .. //depot/projects/hammer/sys/pc98/apm/apm_bioscall.s#4 delete .. //depot/projects/hammer/sys/pc98/conf/NOTES#42 integrate .. //depot/projects/hammer/sys/pc98/include/_bus.h#2 integrate .. //depot/projects/hammer/sys/pc98/include/bus.h#3 integrate .. //depot/projects/hammer/sys/pc98/include/pmc_mdep.h#1 branch .. //depot/projects/hammer/sys/pci/if_sk.c#37 integrate .. //depot/projects/hammer/sys/powerpc/include/pmc_mdep.h#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#9 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#13 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/trap.c#16 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#24 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#15 integrate .. //depot/projects/hammer/sys/sparc64/include/pmc_mdep.h#1 branch .. //depot/projects/hammer/sys/sparc64/pci/apb.c#8 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#22 integrate .. //depot/projects/hammer/sys/sys/_task.h#4 integrate .. //depot/projects/hammer/sys/sys/kdb.h#4 integrate .. //depot/projects/hammer/sys/sys/libkern.h#11 integrate .. //depot/projects/hammer/sys/sys/lock.h#8 integrate .. //depot/projects/hammer/sys/sys/mutex.h#18 integrate .. //depot/projects/hammer/sys/sys/namei.h#11 integrate .. //depot/projects/hammer/sys/sys/param.h#58 integrate .. //depot/projects/hammer/sys/sys/pcpu.h#8 integrate .. //depot/projects/hammer/sys/sys/pmc.h#1 branch .. //depot/projects/hammer/sys/sys/pmckern.h#1 branch .. //depot/projects/hammer/sys/sys/proc.h#80 integrate .. //depot/projects/hammer/sys/sys/ptrace.h#7 integrate .. //depot/projects/hammer/sys/sys/sched.h#18 integrate .. //depot/projects/hammer/sys/sys/smp.h#12 integrate .. //depot/projects/hammer/sys/sys/syscall.h#41 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#41 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#41 integrate .. //depot/projects/hammer/sys/sys/systm.h#36 integrate .. //depot/projects/hammer/sys/sys/taskqueue.h#7 integrate .. //depot/projects/hammer/sys/sys/thr.h#6 integrate .. //depot/projects/hammer/sys/sys/vnode.h#53 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#16 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#38 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#39 integrate .. //depot/projects/hammer/sys/vm/uma_int.h#16 integrate .. //depot/projects/hammer/sys/vm/vm_init.c#12 integrate .. //depot/projects/hammer/tools/regression/tls/Makefile#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<<