From owner-p4-projects@FreeBSD.ORG Mon Apr 16 10:24:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C6F116A406; Mon, 16 Apr 2007 10:24:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ED63316A403 for ; Mon, 16 Apr 2007 10:24:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DB77C13C483 for ; Mon, 16 Apr 2007 10:24:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GAOLcW037411 for ; Mon, 16 Apr 2007 10:24:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GAO6r7037376 for perforce@freebsd.org; Mon, 16 Apr 2007 10:24:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 16 Apr 2007 10:24:06 GMT Message-Id: <200704161024.l3GAO6r7037376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Apr 2007 10:24:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=118224 Change 118224 by rwatson@rwatson_zoo on 2007/04/16 10:23:56 Integrate TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#13 integrate .. //depot/projects/trustedbsd/audit3/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/KNOWNBUGS#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/PGPKEYS#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/RELEASE_NOTES#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/README#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/knecht.mc#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/submit.cf#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/access_db.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/badmx.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/block_bad_helo.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/dnsbl.m4#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/enhdnsbl.m4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/require_rdns.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/proto.m4#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/version.m4#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/mailer/smtp.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/contrib/cidrexpand#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/contrib/qtool.pl#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/doc/op/op.me#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/editmap/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/libmilter/mfapi.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/libmilter/mfdef.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/libmilter/milter.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/conf.h#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/errstring.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/heap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/ldap.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/misc.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/os/sm_os_qnx.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/sendmail.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/tailq.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/README#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/comm.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/api.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/design.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/index.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/installation.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/other.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/overview.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/sample.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_addheader.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_chgfrom.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_chgheader.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_getpriv.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_getsymval.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_main.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_progress.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_quarantine.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_register.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_replacebody.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setconn.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setdbg.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setmlreply.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setpriv.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setreply.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_setsymlist.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_settimeout.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_stop.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_version.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_abort.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_body.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_close.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_connect.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_data.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_eoh.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_eom.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_header.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_helo.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_negotiate.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_unknown.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/engine.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/example.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/handler.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/libmilter.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/listener.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/monitor.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/smfi.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/worker.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/Makefile.m4#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/config.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/exc.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/exc.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/findfp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/flags.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/ldap.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/local.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/memstat.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/snprintf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-memstat.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-qic.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-sem.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/util.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/vfscanf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsmdb/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsmutil/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/mail.local/Makefile.m4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/mail.local/mail.local.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/mailstats/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/makemap/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/praliases/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/rmail/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/smrsh/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/README#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/TRACEFLAGS#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/TUNING#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/alias.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/arpadate.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/collect.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/conf.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/conf.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/control.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/daemon.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/daemon.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/deliver.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/domain.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/envelope.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/err.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/headers.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/helpfile#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/macro.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mailq.1#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/main.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/map.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/map.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mci.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/milter.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mime.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/parseaddr.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/queue.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/ratectrl.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/readcf.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/recipient.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sasl.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/savemail.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sendmail.h#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sm_resolve.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/srvrsmtp.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/stab.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/stats.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/timers.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/tls.c#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/udb.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/usersmtp.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/util.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/version.c#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/test/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/vacation/Makefile.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/vacation/vacation.c#4 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#21 integrate .. //depot/projects/trustedbsd/audit3/etc/devd.conf#9 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.root.dist#9 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/FILESYSTEMS#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#18 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/NETWORKING#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/hostid#1 branch .. //depot/projects/trustedbsd/audit3/etc/rc.d/ipfilter#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ipsec#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/kldxref#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/mountcritremote#7 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/netoptions#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pf#10 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pflog#9 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pfsync#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/sysctl.3#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/strtol.3#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/ptrace.2#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libmilter/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libsm/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/Versions.def#2 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/i386/Symbol.map#2 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#17 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/iftrunk.c#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#17 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/trunk.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#17 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/hash.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/misc/committers-ports.dot#2 integrate .. //depot/projects/trustedbsd/audit3/share/misc/committers-src.dot#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_sg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_ioctl.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_string.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/kobj.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/string.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#20 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#29 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.ia64#10 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utmisc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#21 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-dma.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/miidevs#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/GENERIC#14 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_jail.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mib.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#23 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/libkern/index.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/libkern/rindex.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#18 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/if_trunk/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/libalias/libalias/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/net/ieee8023ad_lacp.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/ieee8023ad_lacp.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/if.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_ethersubr.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_trunk.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/if_trunk.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/if_var.h#12 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/in_pcb.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_sack.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_usrreq.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_var.h#12 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec_osdep.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/audit3/sys/rpc/types.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/sparc64/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/include/nexusvar.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/hash.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/kernel.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/libkern.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mutex.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/param.h#15 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/priv.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysctl.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/systm.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_snapshot.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_softdep.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/phys_pager.c#5 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/netinet/ipsockopt/ipsockopt.c#5 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/aircrack-ptw-lib.h#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/wesside.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/gcore/elfcore.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/kdump/kdump.c#8 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/kdump/kdump_subr.h#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/kdump/mksubr#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/mcast.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/sed/TEST/math.sed#2 delete .. //depot/projects/trustedbsd/audit3/usr.bin/tar/write.c#10 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/touch/touch.1#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/touch/touch.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/amd64-fbsd.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/extern.h#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/i386-fbsd.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/i386-linux.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/ia64-fbsd.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/main.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/powerpc-fbsd.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/setup.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/sparc64-fbsd.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/syscall.h#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/syscalls.c#8 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/truss.1#7 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/truss.h#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/uuidgen/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ifmcstat/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ifmcstat/ifmcstat.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ifmcstat/ifmcstat.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sendmail/Makefile#7 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.77 2007/03/28 07:49:57 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.78 2007/04/09 19:16:48 pjd Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070409: uuidgen moved to /bin/ +OLD_FILES+=usr/bin/uuidgen # 20070328: bzip2 1.0.4 OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 ==== //depot/projects/trustedbsd/audit3/cddl/lib/libzpool/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.2 2007/04/07 23:54:53 pjd Exp $ .include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files" @@ -11,7 +11,7 @@ # LIST_SRCS .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os # ATOMIC_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/arch/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} LIB= zpool SHLIB_MAJOR?=1 ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/zpool/zpool_main.c#2 (text+ko) ==== @@ -1082,6 +1082,10 @@ "incompatible version.\n")); break; + case ZPOOL_STATUS_HOSTID_MISMATCH: + (void) printf(gettext("status: The pool was last accessed by " + "another system.\n")); + break; default: /* * No other status can be seen when importing pools. @@ -1098,6 +1102,10 @@ "imported using its name or numeric identifier, " "though\n\tsome features will not be available " "without an explicit 'zpool upgrade'.\n")); + else if (reason == ZPOOL_STATUS_HOSTID_MISMATCH) + (void) printf(gettext("action: The pool can be " + "imported using its name or numeric " + "identifier and\n\tthe '-f' flag.\n")); else (void) printf(gettext("action: The pool can be " "imported using its name or numeric " @@ -1187,10 +1195,37 @@ "is formatted using a newer ZFS version\n"), name); return (1); } else if (state != POOL_STATE_EXPORTED && !force) { - (void) fprintf(stderr, gettext("cannot import '%s': pool " - "may be in use from other system\n"), name); - (void) fprintf(stderr, gettext("use '-f' to import anyway\n")); - return (1); + uint64_t hostid; + + if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, + &hostid) == 0) { + if ((unsigned long)hostid != gethostid()) { + char *hostname; + uint64_t timestamp; + time_t t; + + verify(nvlist_lookup_string(config, + ZPOOL_CONFIG_HOSTNAME, &hostname) == 0); + verify(nvlist_lookup_uint64(config, + ZPOOL_CONFIG_TIMESTAMP, ×tamp) == 0); + t = timestamp; + (void) fprintf(stderr, gettext("cannot import " + "'%s': pool may be in use from other " + "system, it was last accessed by %s " + "(hostid: 0x%lx) on %s"), name, hostname, + (unsigned long)hostid, + asctime(localtime(&t))); + (void) fprintf(stderr, gettext("use '-f' to " + "import anyway\n")); + return (1); + } + } else { + (void) fprintf(stderr, gettext("cannot import '%s': " + "pool may be in use from other system\n"), name); + (void) fprintf(stderr, gettext("use '-f' to import " + "anyway\n")); + return (1); + } } if (zpool_import(g_zfs, config, newname, altroot) != 0) ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/cmd/ztest/ztest.c#2 (text+ko) ==== @@ -246,6 +246,8 @@ #define ZTEST_DIROBJ_BLOCKSIZE (1 << 10) #define ZTEST_DIRSIZE 256 +static void usage(boolean_t); + /* * These libumem hooks provide a reasonable set of defaults for the allocator's * debugging facilities. @@ -303,13 +305,17 @@ if (toupper(buf[0]) == ends[i]) break; } - if (i == strlen(ends)) - fatal(0, "invalid bytes suffix: %s", buf); + if (i == strlen(ends)) { + (void) fprintf(stderr, "ztest: invalid bytes suffix: %s\n", + buf); + usage(B_FALSE); + } if (buf[1] == '\0' || (toupper(buf[1]) == 'B' && buf[2] == '\0')) { return (10*i); } - fatal(0, "invalid bytes suffix: %s", buf); - return (-1); + (void) fprintf(stderr, "ztest: invalid bytes suffix: %s\n", buf); + usage(B_FALSE); + /* NOTREACHED */ } static uint64_t @@ -320,32 +326,40 @@ val = strtoull(buf, &end, 0); if (end == buf) { - fatal(0, "bad numeric value: %s", buf); + (void) fprintf(stderr, "ztest: bad numeric value: %s\n", buf); + usage(B_FALSE); } else if (end[0] == '.') { double fval = strtod(buf, &end); fval *= pow(2, str2shift(end)); - if (fval > UINT64_MAX) - fatal(0, "value too large: %s", buf); + if (fval > UINT64_MAX) { + (void) fprintf(stderr, "ztest: value too large: %s\n", + buf); + usage(B_FALSE); + } val = (uint64_t)fval; } else { int shift = str2shift(end); - if (shift >= 64 || (val << shift) >> shift != val) - fatal(0, "value too large: %s", buf); + if (shift >= 64 || (val << shift) >> shift != val) { + (void) fprintf(stderr, "ztest: value too large: %s\n", + buf); + usage(B_FALSE); + } val <<= shift; } return (val); } static void -usage(void) +usage(boolean_t requested) { char nice_vdev_size[10]; char nice_gang_bang[10]; + FILE *fp = requested ? stdout : stderr; nicenum(zopt_vdev_size, nice_vdev_size); nicenum(zio_gang_bang, nice_gang_bang); - (void) printf("Usage: %s\n" + (void) fprintf(fp, "Usage: %s\n" "\t[-v vdevs (default: %llu)]\n" "\t[-s size_of_each_vdev (default: %s)]\n" "\t[-a alignment_shift (default: %d) (use 0 for random)]\n" @@ -364,6 +378,7 @@ "\t[-T time] total run time (default: %llu sec)\n" "\t[-P passtime] time per pass (default: %llu sec)\n" "\t[-z zil failure rate (default: fail every 2^%llu allocs)]\n" + "\t[-h] (print help)\n" "", cmdname, (u_longlong_t)zopt_vdevs, /* -v */ @@ -382,7 +397,7 @@ (u_longlong_t)zopt_time, /* -T */ (u_longlong_t)zopt_passtime, /* -P */ (u_longlong_t)zio_zil_fail_shift); /* -z */ - exit(1); + exit(requested ? 0 : 1); } static uint64_t @@ -422,7 +437,7 @@ zio_zil_fail_shift = 5; while ((opt = getopt(argc, argv, - "v:s:a:m:r:R:d:t:g:i:k:p:f:VET:P:z:")) != EOF) { + "v:s:a:m:r:R:d:t:g:i:k:p:f:VET:P:z:h")) != EOF) { value = 0; switch (opt) { case 'v': @@ -496,9 +511,12 @@ case 'z': zio_zil_fail_shift = MIN(value, 16); break; + case 'h': + usage(B_TRUE); + break; case '?': default: - usage(); + usage(B_FALSE); break; } } ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 (text+ko) ==== @@ -98,6 +98,7 @@ EZFS_POOLPROPS, /* couldn't retrieve pool props */ EZFS_POOL_NOTSUP, /* ops not supported for this type of pool */ EZFS_POOL_INVALARG, /* invalid argument for this pool operation */ + EZFS_NAMETOOLONG, /* dataset name is too long */ EZFS_UNKNOWN }; @@ -192,6 +193,7 @@ ZPOOL_STATUS_CORRUPT_DATA, /* data errors in user (meta)data */ ZPOOL_STATUS_FAILING_DEV, /* device experiencing errors */ ZPOOL_STATUS_VERSION_NEWER, /* newer on-disk version */ + ZPOOL_STATUS_HOSTID_MISMATCH, /* last accessed by another system */ /* * The following are not faults per se, but still an error possibly ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 (text+ko) ==== @@ -379,7 +379,7 @@ uint_t i, nspares; boolean_t config_seen; uint64_t best_txg; - char *name; + char *name, *hostname; zfs_cmd_t zc = { 0 }; uint64_t version, guid; size_t len; @@ -388,6 +388,7 @@ nvlist_t **child = NULL; uint_t c; boolean_t isactive; + uint64_t hostid; if (nvlist_alloc(&ret, 0, 0) != 0) goto nomem; @@ -430,6 +431,8 @@ * pool guid * name * pool state + * hostid (if available) + * hostname (if available) */ uint64_t state; @@ -453,6 +456,20 @@ if (nvlist_add_uint64(config, ZPOOL_CONFIG_POOL_STATE, state) != 0) goto nomem; + hostid = 0; + if (nvlist_lookup_uint64(tmp, + ZPOOL_CONFIG_HOSTID, &hostid) == 0) { + if (nvlist_add_uint64(config, + ZPOOL_CONFIG_HOSTID, hostid) != 0) + goto nomem; + verify(nvlist_lookup_string(tmp, + ZPOOL_CONFIG_HOSTNAME, + &hostname) == 0); + if (nvlist_add_string(config, + ZPOOL_CONFIG_HOSTNAME, + hostname) != 0) + goto nomem; + } config_seen = B_TRUE; } @@ -622,6 +639,20 @@ } /* + * Restore the original information read from the actual label. + */ + (void) nvlist_remove(config, ZPOOL_CONFIG_HOSTID, + DATA_TYPE_UINT64); + (void) nvlist_remove(config, ZPOOL_CONFIG_HOSTNAME, + DATA_TYPE_STRING); + if (hostid != 0) { + verify(nvlist_add_uint64(config, ZPOOL_CONFIG_HOSTID, + hostid) == 0); + verify(nvlist_add_string(config, ZPOOL_CONFIG_HOSTNAME, + hostname) == 0); + } + + /* * Add this pool to the list of configs. */ verify(nvlist_lookup_string(config, ZPOOL_CONFIG_POOL_NAME, ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -43,6 +43,7 @@ #include #include +#include #include "libzfs_impl.h" /* @@ -50,7 +51,7 @@ * in libzfs.h. Note that there are some status results which go past the end * of this table, and hence have no associated message ID. */ -static char *msgid_table[] = { +static char *zfs_msgid_table[] = { "ZFS-8000-14", "ZFS-8000-2Q", "ZFS-8000-3C", @@ -60,7 +61,8 @@ "ZFS-8000-72", "ZFS-8000-8A", "ZFS-8000-9P", - "ZFS-8000-A5" + "ZFS-8000-A5", + "ZFS-8000-EY" }; /* @@ -69,7 +71,7 @@ * and the article referred to by 'zpool status' must match that indicated by * the syslog error message. We override missing data as well as corrupt pool. */ -static char *msgid_table_active[] = { +static char *zfs_msgid_table_active[] = { "ZFS-8000-14", "ZFS-8000-D3", /* overridden */ "ZFS-8000-D3", /* overridden */ @@ -82,7 +84,7 @@ "ZFS-8000-CS", /* overridden */ }; -#define NMSGID (sizeof (msgid_table) / sizeof (msgid_table[0])) +#define NMSGID (sizeof (zfs_msgid_table) / sizeof (zfs_msgid_table[0])) /* ARGSUSED */ static int @@ -178,6 +180,8 @@ uint_t vsc; uint64_t nerr; uint64_t version; + uint64_t stateval; + uint64_t hostid = 0; verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION, &version) == 0); @@ -185,6 +189,16 @@ &nvroot) == 0); verify(nvlist_lookup_uint64_array(nvroot, ZPOOL_CONFIG_STATS, (uint64_t **)&vs, &vsc) == 0); + verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_STATE, + &stateval) == 0); + (void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_HOSTID, &hostid); + + /* + * Pool last accessed by another system. + */ + if (hostid != 0 && (unsigned long)hostid != gethostid() && + stateval == POOL_STATE_ACTIVE) + return (ZPOOL_STATUS_HOSTID_MISMATCH); /* * Newer on-disk version. @@ -270,7 +284,7 @@ if (ret >= NMSGID) *msgid = NULL; else - *msgid = msgid_table_active[ret]; + *msgid = zfs_msgid_table_active[ret]; return (ret); } @@ -283,7 +297,7 @@ if (ret >= NMSGID) *msgid = NULL; else - *msgid = msgid_table[ret]; + *msgid = zfs_msgid_table[ret]; return (ret); } ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 (text+ko) ==== @@ -167,6 +167,8 @@ case EZFS_POOL_INVALARG: return (dgettext(TEXT_DOMAIN, "invalid argument for " "this pool operation")); + case EZFS_NAMETOOLONG: + return (dgettext(TEXT_DOMAIN, "dataset name is too long")); case EZFS_UNKNOWN: return (dgettext(TEXT_DOMAIN, "unknown error")); default: @@ -306,6 +308,11 @@ "dataset is busy")); zfs_verror(hdl, EZFS_BUSY, fmt, ap); break; + + case ENAMETOOLONG: + zfs_verror(hdl, EZFS_NAMETOOLONG, fmt, ap); + break; + default: zfs_error_aux(hdl, strerror(errno)); zfs_verror(hdl, EZFS_UNKNOWN, fmt, ap); @@ -490,6 +497,21 @@ hdl->libzfs_printerr = printerr; } +static int +libzfs_load(void) +{ + int error; + + if (modfind("zfs") < 0) { + /* Not present in kernel, try loading it. */ + if (kldload("zfs") < 0 || modfind("zfs") < 0) { + if (errno != EEXIST) + return (error); + } + } + return (0); +} + libzfs_handle_t * libzfs_init(void) { @@ -500,8 +522,12 @@ } if ((hdl->libzfs_fd = open(ZFS_DEV, O_RDWR)) < 0) { - free(hdl); - return (NULL); + if (libzfs_load() == 0) + hdl->libzfs_fd = open(ZFS_DEV, O_RDWR); + if (hdl->libzfs_fd < 0) { + free(hdl); + return (NULL); + } } if ((hdl->libzfs_mnttab = fopen(MNTTAB, "r")) == NULL) { ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/kernel.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include /* * Emulation of kernel services in userland. @@ -45,6 +46,11 @@ int hz = 119; /* frequency when using gethrtime() >> 23 for lbolt */ uint64_t physmem; vnode_t *rootdir = (vnode_t *)0xabcd1234; +char hw_serial[11]; + +struct utsname utsname = { + "userland", "libzpool", "1", "1", "na" +}; /* * ========================================================================= @@ -770,6 +776,17 @@ return (random_get_bytes_common(ptr, len, "/dev/urandom")); } +int +ddi_strtoul(const char *hw_serial, char **nptr, int base, unsigned long *result) +{ + char *end; + + *result = strtoul(hw_serial, &end, base); + if (*result == 0) + return (errno); + return (0); +} + /* * ========================================================================= * kernel emulation setup & teardown @@ -795,6 +812,8 @@ dprintf("physmem = %llu pages (%.2f GB)\n", physmem, (double)physmem * sysconf(_SC_PAGE_SIZE) / (1ULL << 30)); + snprintf(hw_serial, sizeof (hw_serial), "%ld", gethostid()); + spa_init(mode); } ==== //depot/projects/trustedbsd/audit3/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 (text+ko) ==== @@ -290,6 +290,7 @@ #define kmem_alloc(_s, _f) umem_alloc(_s, _f) #define kmem_zalloc(_s, _f) umem_zalloc(_s, _f) #define kmem_free(_b, _s) umem_free(_b, _s) +#define kmem_size() (physmem * PAGESIZE) #define kmem_cache_create(_a, _b, _c, _d, _e, _f, _g, _h, _i) \ umem_cache_create(_a, _b, _c, _d, _e, _f, _g, _h, _i) #define kmem_cache_destroy(_c) umem_cache_destroy(_c) @@ -436,6 +437,14 @@ #define zone_dataset_visible(x, y) (1) #define INGLOBALZONE(z) (1) +/* + * Hostname information + */ +extern struct utsname utsname; +extern char hw_serial[]; +extern int ddi_strtoul(const char *str, char **nptr, int base, + unsigned long *result); + #ifdef __cplusplus } #endif @@ -481,12 +490,15 @@ #define SX_SYSINIT(name, lock, desc) #define SYSCTL_DECL(...) +#define SYSCTL_NODE(...) #define SYSCTL_INT(...) -#define SYSCTL_NODE(...) +#define SYSCTL_ULONG(...) #ifdef TUNABLE_INT #undef TUNABLE_INT +#undef TUNABLE_ULONG #endif #define TUNABLE_INT(...) +#define TUNABLE_ULONG(...) /* Errors */ ==== //depot/projects/trustedbsd/audit3/contrib/sendmail/FREEBSD-upgrade#8 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.32 2006/08/17 05:14:33 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.33 2007/04/09 01:46:43 gshapiro Exp $ -sendmail 8.13.8 +sendmail 8.14.1 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following files were removed: @@ -21,8 +21,8 @@ Imported using: - cvs import -m 'Import sendmail 8.13.8' \ - src/contrib/sendmail SENDMAIL v8_13_8 + cvs import -m 'Import sendmail 8.14.1' \ + src/contrib/sendmail SENDMAIL v8_14_1 After importing, bump the version of src/etc/sendmail/freebsd*mc so mergemaster will merge /etc/mail/freebsd*cf: @@ -97,4 +97,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -16-August-2006 +08-April-2007 ==== //depot/projects/trustedbsd/audit3/contrib/sendmail/KNOWNBUGS#4 (text+ko) ==== @@ -29,10 +29,10 @@ * Null bytes are not handled properly in headers. Sendmail should handle full binary data. As it stands, it handles - all values in the body, but only 0x01-0x80 and 0xA0-0xFF in - the header. Notably missing is 0x00, which would require a major - restructuring of the code -- for example, almost no C library support - could be used to handle strings. + all values in the body, but not 0x00 in the header. Changing + this would require a major restructuring of the code -- for + example, almost no C library support could be used to handle + strings. * Header checks are not called if header value is too long or empty. @@ -170,7 +170,7 @@ When sendmail is doing 8->7 bit MIME conversions, and the message contains certain MIME body types that cannot be converted to 7-bit, - sendmail will strip the message to 7-bit. + sendmail will pass the message as 8-bit. * 7->8 bit MIME conversion @@ -235,9 +235,9 @@ Sendmail will deliver to a fail if the file is owned by the DefaultUser or has the set-user-ID bit set. Unfortunately, some systems clear that bit - when a file is modified. Sendmail compensates by resetting the file mode + when a file is modified. Sendmail compensates by resetting the file mode back to it's original settings. Unfortunately, there's still a - permission failure race as sendmail checks the permissions before locking + permission failure race as sendmail checks the permissions before locking the file. This is unavoidable as sendmail must verify the file is safe to open before opening it. A file can not be locked until it is open. @@ -247,4 +247,4 @@ be used if set instead of LOCAL_RELAY ($R). This will be fixed in a future version. -$Revision: 8.57 $, Last updated $Date: 2004/12/02 23:39:01 $ +$Revision: 8.59 $, Last updated $Date: 2007/02/21 23:13:58 $ ==== //depot/projects/trustedbsd/audit3/contrib/sendmail/PGPKEYS#6 (text+ko) ==== @@ -142,6 +142,82 @@ -----END PGP PUBLIC KEY BLOCK----- Type Bits KeyID Created Expires Algorithm Use +pub 1024 0x7093B841 2006-12-16 ---------- RSA Sign & Encrypt >>> TRUNCATED FOR MAIL (1000 lines) <<<