Date: Tue, 27 Nov 2012 05:48:37 +0000 (UTC) From: Lawrence Stewart <lstewart@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243596 - in projects/diffused_head: . bin/cat bin/cp bin/getfacl bin/setfacl bin/sh cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd/zte... Message-ID: <201211270548.qAR5mbwg090312@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lstewart Date: Tue Nov 27 05:48:36 2012 New Revision: 243596 URL: http://svnweb.freebsd.org/changeset/base/243596 Log: Merge revs 240000:240493 from head. Added: - copied from r240493, head/contrib/atf/ projects/diffused_head/lib/libpmc/pmc.ivybridge.3 - copied unchanged from r240493, head/lib/libpmc/pmc.ivybridge.3 projects/diffused_head/share/mk/bsd.compiler.mk - copied unchanged from r240493, head/share/mk/bsd.compiler.mk projects/diffused_head/sys/arm/broadcom/bcm2835/dwc_otg_brcm.c - copied unchanged from r240493, head/sys/arm/broadcom/bcm2835/dwc_otg_brcm.c projects/diffused_head/sys/boot/fdt/dts/db78460.dts - copied unchanged from r240493, head/sys/boot/fdt/dts/db78460.dts projects/diffused_head/sys/cddl/compat/opensolaris/sys/assfail.h - copied unchanged from r240493, head/sys/cddl/compat/opensolaris/sys/assfail.h projects/diffused_head/sys/dev/cxgbe/firmware/t4fw-1.6.2.0.bin.uu - copied unchanged from r240493, head/sys/dev/cxgbe/firmware/t4fw-1.6.2.0.bin.uu projects/diffused_head/sys/dev/random/ivy.c - copied unchanged from r240493, head/sys/dev/random/ivy.c projects/diffused_head/sys/libkern/jenkins_hash.c - copied unchanged from r240493, head/sys/libkern/jenkins_hash.c projects/diffused_head/sys/modules/ct/ - copied from r240493, head/sys/modules/ct/ Directory Properties: projects/diffused_head/contrib/atf/ (props changed) Deleted: projects/diffused_head/contrib/bzip2/Makefile projects/diffused_head/contrib/bzip2/Makefile-libbz2_so projects/diffused_head/contrib/bzip2/dlltest.c projects/diffused_head/contrib/bzip2/makefile.msc projects/diffused_head/crypto/openssh/version.c projects/diffused_head/share/examples/cvsup/doc-supfile projects/diffused_head/share/examples/cvsup/www-supfile projects/diffused_head/sys/boot/fdt/dts/db88f78160.dts projects/diffused_head/sys/cam/scsi/scsi_low_pisa.c projects/diffused_head/sys/cam/scsi/scsi_low_pisa.h projects/diffused_head/sys/compat/netbsd/physio_proc.h projects/diffused_head/sys/contrib/pf/net/if_pflow.h projects/diffused_head/sys/dev/random/nehemiah.h projects/diffused_head/sys/libkern/jenkins.h projects/diffused_head/sys/sys/device_port.h projects/diffused_head/tools/diag/ac/ projects/diffused_head/tools/tools/backout_commit/ projects/diffused_head/tools/tools/mfc/ Modified: projects/diffused_head/MAINTAINERS (contents, props changed) projects/diffused_head/Makefile projects/diffused_head/Makefile.inc1 projects/diffused_head/ObsoleteFiles.inc projects/diffused_head/UPDATING projects/diffused_head/bin/cat/cat.1 projects/diffused_head/bin/cp/cp.1 projects/diffused_head/bin/getfacl/getfacl.1 projects/diffused_head/bin/setfacl/merge.c projects/diffused_head/bin/setfacl/setfacl.1 projects/diffused_head/bin/setfacl/setfacl.c projects/diffused_head/bin/sh/options.c projects/diffused_head/bin/sh/sh.1 projects/diffused_head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/diffused_head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/diffused_head/cddl/contrib/opensolaris/cmd/zpool/zpool.8 projects/diffused_head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/diffused_head/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/diffused_head/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c projects/diffused_head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/diffused_head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h projects/diffused_head/cddl/lib/libzpool/Makefile projects/diffused_head/cddl/usr.bin/ztest/Makefile projects/diffused_head/cddl/usr.sbin/plockstat/plockstat.1 projects/diffused_head/cddl/usr.sbin/zdb/Makefile projects/diffused_head/cddl/usr.sbin/zhack/Makefile projects/diffused_head/contrib/bsnmp/snmpd/main.c projects/diffused_head/contrib/bsnmp/snmpd/trans_lsock.c projects/diffused_head/contrib/bsnmp/snmpd/trans_udp.c projects/diffused_head/contrib/bsnmp/snmpd/trap.c projects/diffused_head/contrib/bzip2/FREEBSD-Xlist projects/diffused_head/contrib/gdb/gdb/dwarf2loc.h projects/diffused_head/contrib/pf/man/pf.4 projects/diffused_head/contrib/pf/man/pf.conf.5 projects/diffused_head/contrib/pf/pfctl/parse.y projects/diffused_head/contrib/pf/pfctl/pf_print_state.c projects/diffused_head/contrib/pf/pfctl/pfctl.c projects/diffused_head/contrib/pf/pfctl/pfctl_parser.c projects/diffused_head/contrib/pf/pfctl/pfctl_table.c projects/diffused_head/contrib/sendmail/include/libmilter/mfapi.h projects/diffused_head/contrib/tzdata/africa projects/diffused_head/contrib/tzdata/antarctica projects/diffused_head/contrib/tzdata/asia projects/diffused_head/contrib/tzdata/australasia projects/diffused_head/contrib/tzdata/backward projects/diffused_head/contrib/tzdata/etcetera projects/diffused_head/contrib/tzdata/europe projects/diffused_head/contrib/tzdata/factory projects/diffused_head/contrib/tzdata/leapseconds projects/diffused_head/contrib/tzdata/northamerica projects/diffused_head/contrib/tzdata/pacificnew projects/diffused_head/contrib/tzdata/southamerica projects/diffused_head/contrib/tzdata/systemv projects/diffused_head/contrib/tzdata/yearistype.sh projects/diffused_head/contrib/tzdata/zone.tab projects/diffused_head/crypto/openssh/ChangeLog projects/diffused_head/crypto/openssh/INSTALL projects/diffused_head/crypto/openssh/LICENCE projects/diffused_head/crypto/openssh/PROTOCOL.certkeys projects/diffused_head/crypto/openssh/PROTOCOL.mux projects/diffused_head/crypto/openssh/README projects/diffused_head/crypto/openssh/addrmatch.c projects/diffused_head/crypto/openssh/audit-bsm.c projects/diffused_head/crypto/openssh/auth-krb5.c projects/diffused_head/crypto/openssh/auth-options.c projects/diffused_head/crypto/openssh/auth-passwd.c projects/diffused_head/crypto/openssh/auth.c projects/diffused_head/crypto/openssh/auth2-pubkey.c projects/diffused_head/crypto/openssh/auth2.c projects/diffused_head/crypto/openssh/authfile.c projects/diffused_head/crypto/openssh/channels.c projects/diffused_head/crypto/openssh/channels.h projects/diffused_head/crypto/openssh/clientloop.c projects/diffused_head/crypto/openssh/clientloop.h projects/diffused_head/crypto/openssh/compat.c projects/diffused_head/crypto/openssh/compat.h projects/diffused_head/crypto/openssh/config.h.in projects/diffused_head/crypto/openssh/defines.h projects/diffused_head/crypto/openssh/dh.c projects/diffused_head/crypto/openssh/dns.c projects/diffused_head/crypto/openssh/dns.h projects/diffused_head/crypto/openssh/entropy.c projects/diffused_head/crypto/openssh/entropy.h projects/diffused_head/crypto/openssh/jpake.c projects/diffused_head/crypto/openssh/kex.c projects/diffused_head/crypto/openssh/key.c projects/diffused_head/crypto/openssh/key.h projects/diffused_head/crypto/openssh/mac.c projects/diffused_head/crypto/openssh/misc.c projects/diffused_head/crypto/openssh/moduli projects/diffused_head/crypto/openssh/moduli.c projects/diffused_head/crypto/openssh/monitor.c projects/diffused_head/crypto/openssh/mux.c projects/diffused_head/crypto/openssh/myproposal.h projects/diffused_head/crypto/openssh/openbsd-compat/bsd-cygwin_util.c projects/diffused_head/crypto/openssh/openbsd-compat/bsd-cygwin_util.h projects/diffused_head/crypto/openssh/openbsd-compat/bsd-misc.h projects/diffused_head/crypto/openssh/openbsd-compat/getcwd.c projects/diffused_head/crypto/openssh/openbsd-compat/getgrouplist.c projects/diffused_head/crypto/openssh/openbsd-compat/getrrsetbyname.c projects/diffused_head/crypto/openssh/openbsd-compat/glob.c projects/diffused_head/crypto/openssh/openbsd-compat/inet_ntop.c projects/diffused_head/crypto/openssh/openbsd-compat/mktemp.c projects/diffused_head/crypto/openssh/openbsd-compat/openbsd-compat.h projects/diffused_head/crypto/openssh/openbsd-compat/openssl-compat.h projects/diffused_head/crypto/openssh/openbsd-compat/port-linux.c projects/diffused_head/crypto/openssh/openbsd-compat/setenv.c projects/diffused_head/crypto/openssh/openbsd-compat/sha2.c projects/diffused_head/crypto/openssh/openbsd-compat/sha2.h projects/diffused_head/crypto/openssh/openbsd-compat/strlcpy.c projects/diffused_head/crypto/openssh/packet.c projects/diffused_head/crypto/openssh/packet.h projects/diffused_head/crypto/openssh/readconf.c projects/diffused_head/crypto/openssh/readconf.h projects/diffused_head/crypto/openssh/roaming.h projects/diffused_head/crypto/openssh/roaming_client.c projects/diffused_head/crypto/openssh/roaming_common.c projects/diffused_head/crypto/openssh/sandbox-rlimit.c projects/diffused_head/crypto/openssh/sandbox-systrace.c projects/diffused_head/crypto/openssh/scp.1 projects/diffused_head/crypto/openssh/scp.c projects/diffused_head/crypto/openssh/servconf.c projects/diffused_head/crypto/openssh/servconf.h projects/diffused_head/crypto/openssh/serverloop.c projects/diffused_head/crypto/openssh/session.c projects/diffused_head/crypto/openssh/sftp-client.c projects/diffused_head/crypto/openssh/sftp-glob.c projects/diffused_head/crypto/openssh/sftp.1 projects/diffused_head/crypto/openssh/sftp.c projects/diffused_head/crypto/openssh/ssh-add.1 projects/diffused_head/crypto/openssh/ssh-add.c projects/diffused_head/crypto/openssh/ssh-ecdsa.c projects/diffused_head/crypto/openssh/ssh-keygen.1 projects/diffused_head/crypto/openssh/ssh-keygen.c projects/diffused_head/crypto/openssh/ssh-pkcs11-client.c projects/diffused_head/crypto/openssh/ssh-pkcs11-helper.c projects/diffused_head/crypto/openssh/ssh.1 projects/diffused_head/crypto/openssh/ssh.c projects/diffused_head/crypto/openssh/ssh_config projects/diffused_head/crypto/openssh/ssh_config.5 projects/diffused_head/crypto/openssh/ssh_namespace.h projects/diffused_head/crypto/openssh/sshconnect.c projects/diffused_head/crypto/openssh/sshconnect2.c projects/diffused_head/crypto/openssh/sshd.8 projects/diffused_head/crypto/openssh/sshd.c projects/diffused_head/crypto/openssh/sshd_config projects/diffused_head/crypto/openssh/sshd_config.5 projects/diffused_head/crypto/openssh/umac.c projects/diffused_head/crypto/openssh/version.h projects/diffused_head/crypto/openssl/crypto/opensslv.h projects/diffused_head/etc/rc.d/FILESYSTEMS projects/diffused_head/etc/rc.d/Makefile projects/diffused_head/etc/rc.d/addswap projects/diffused_head/etc/rc.d/amd projects/diffused_head/etc/rc.d/cleanvar projects/diffused_head/etc/rc.d/cron projects/diffused_head/etc/rc.d/dmesg projects/diffused_head/etc/rc.d/ftpd projects/diffused_head/etc/rc.d/inetd projects/diffused_head/etc/rc.d/initrandom projects/diffused_head/etc/rc.d/ipmon projects/diffused_head/etc/rc.d/jail projects/diffused_head/etc/rc.d/ldconfig projects/diffused_head/etc/rc.d/mixer projects/diffused_head/etc/rc.d/mountcritremote projects/diffused_head/etc/rc.d/moused projects/diffused_head/etc/rc.d/mrouted projects/diffused_head/etc/rc.d/named projects/diffused_head/etc/rc.d/netif projects/diffused_head/etc/rc.d/newsyslog projects/diffused_head/etc/rc.d/ntpd projects/diffused_head/etc/rc.d/pflog projects/diffused_head/etc/rc.d/postrandom projects/diffused_head/etc/rc.d/power_profile projects/diffused_head/etc/rc.d/random projects/diffused_head/etc/rc.d/rarpd projects/diffused_head/etc/rc.d/resolv projects/diffused_head/etc/rc.d/sendmail projects/diffused_head/etc/rc.d/sshd projects/diffused_head/etc/rc.d/syslogd projects/diffused_head/etc/rc.d/utx projects/diffused_head/etc/rc.d/var projects/diffused_head/etc/rc.d/watchdogd projects/diffused_head/include/mqueue.h projects/diffused_head/include/rpc/xdr.h projects/diffused_head/include/time.h projects/diffused_head/include/unistd.h projects/diffused_head/lib/libc/amd64/SYS.h projects/diffused_head/lib/libc/amd64/Symbol.map projects/diffused_head/lib/libc/amd64/gen/rfork_thread.S projects/diffused_head/lib/libc/amd64/sys/brk.S projects/diffused_head/lib/libc/amd64/sys/exect.S projects/diffused_head/lib/libc/amd64/sys/getcontext.S projects/diffused_head/lib/libc/amd64/sys/pipe.S projects/diffused_head/lib/libc/amd64/sys/ptrace.S projects/diffused_head/lib/libc/amd64/sys/reboot.S projects/diffused_head/lib/libc/amd64/sys/sbrk.S projects/diffused_head/lib/libc/amd64/sys/setlogin.S projects/diffused_head/lib/libc/amd64/sys/vfork.S projects/diffused_head/lib/libc/gen/rand48.3 projects/diffused_head/lib/libc/gen/sysctl.c projects/diffused_head/lib/libc/i386/SYS.h projects/diffused_head/lib/libc/i386/Symbol.map projects/diffused_head/lib/libc/i386/gen/rfork_thread.S projects/diffused_head/lib/libc/i386/sys/Ovfork.S projects/diffused_head/lib/libc/i386/sys/brk.S projects/diffused_head/lib/libc/i386/sys/cerror.S projects/diffused_head/lib/libc/i386/sys/exect.S projects/diffused_head/lib/libc/i386/sys/getcontext.S projects/diffused_head/lib/libc/i386/sys/ptrace.S projects/diffused_head/lib/libc/i386/sys/sbrk.S projects/diffused_head/lib/libc/i386/sys/syscall.S projects/diffused_head/lib/libc/stdlib/ptsname.3 projects/diffused_head/lib/libc/stdlib/ptsname.c projects/diffused_head/lib/libc/stdlib/rand.3 projects/diffused_head/lib/libc/stdlib/random.3 projects/diffused_head/lib/libc/stdlib/realpath.c projects/diffused_head/lib/libc/sys/recv.2 projects/diffused_head/lib/libc/sys/wait.2 projects/diffused_head/lib/libkvm/kvm_i386.c projects/diffused_head/lib/libmagic/Makefile projects/diffused_head/lib/libmagic/config.h projects/diffused_head/lib/libpmc/Makefile projects/diffused_head/lib/libpmc/libpmc.c projects/diffused_head/lib/libpmc/pmc.sandybridge.3 projects/diffused_head/lib/libproc/Makefile projects/diffused_head/lib/libproc/proc_sym.c projects/diffused_head/lib/libproc/test/t1-bkpt/t1-bkpt.c projects/diffused_head/lib/libproc/test/t3-name2sym/t3-name2sym.c projects/diffused_head/lib/libprocstat/libprocstat.h projects/diffused_head/lib/libutil/humanize_number.c projects/diffused_head/lib/msun/man/cexp.3 projects/diffused_head/libexec/save-entropy/save-entropy.sh projects/diffused_head/sbin/fsck_ffs/fsck.h projects/diffused_head/sbin/fsck_ffs/fsutil.c projects/diffused_head/sbin/fsck_ffs/main.c projects/diffused_head/sbin/fsck_ffs/suj.c projects/diffused_head/sbin/geom/class/raid/graid.8 projects/diffused_head/sbin/ipfw/nat.c projects/diffused_head/secure/lib/libssh/Makefile projects/diffused_head/share/examples/Makefile projects/diffused_head/share/examples/cvsup/cvs-supfile projects/diffused_head/share/examples/cvsup/refuse projects/diffused_head/share/examples/cvsup/refuse.README projects/diffused_head/share/examples/cvsup/stable-supfile projects/diffused_head/share/examples/etc/make.conf projects/diffused_head/share/man/man3/Makefile projects/diffused_head/share/man/man3/queue.3 projects/diffused_head/share/man/man4/acpi.4 projects/diffused_head/share/man/man4/arcmsr.4 projects/diffused_head/share/man/man4/ip.4 projects/diffused_head/share/man/man4/random.4 projects/diffused_head/share/man/man5/make.conf.5 projects/diffused_head/share/man/man5/rc.conf.5 projects/diffused_head/share/man/man5/src.conf.5 projects/diffused_head/share/man/man9/VFS.9 projects/diffused_head/share/man/man9/hash.9 projects/diffused_head/share/misc/committers-doc.dot projects/diffused_head/share/misc/committers-ports.dot projects/diffused_head/share/misc/committers-src.dot projects/diffused_head/share/misc/organization.dot projects/diffused_head/share/mk/Makefile projects/diffused_head/share/mk/bsd.own.mk projects/diffused_head/share/mk/bsd.sys.mk projects/diffused_head/sys/amd64/amd64/pmap.c projects/diffused_head/sys/amd64/amd64/trap.c projects/diffused_head/sys/amd64/conf/GENERIC projects/diffused_head/sys/amd64/conf/NOTES projects/diffused_head/sys/arm/arm/busdma_machdep.c projects/diffused_head/sys/arm/arm/cpufunc.c projects/diffused_head/sys/arm/arm/identcpu.c projects/diffused_head/sys/arm/arm/pmap-v6.c projects/diffused_head/sys/arm/arm/pmap.c projects/diffused_head/sys/arm/broadcom/bcm2835/files.bcm2835 projects/diffused_head/sys/arm/conf/ARMADAXP projects/diffused_head/sys/arm/conf/RPI-B projects/diffused_head/sys/arm/include/armreg.h projects/diffused_head/sys/arm/include/intr.h projects/diffused_head/sys/arm/include/pmap.h projects/diffused_head/sys/arm/mv/armadaxp/armadaxp.c projects/diffused_head/sys/arm/mv/common.c projects/diffused_head/sys/arm/mv/mpic.c projects/diffused_head/sys/arm/mv/mv_pci.c projects/diffused_head/sys/arm/mv/mvreg.h projects/diffused_head/sys/arm/mv/mvvar.h projects/diffused_head/sys/arm/mv/mvwin.h projects/diffused_head/sys/arm/mv/timer.c projects/diffused_head/sys/boot/arm/uboot/Makefile projects/diffused_head/sys/boot/common/load_elf.c projects/diffused_head/sys/boot/common/module.c projects/diffused_head/sys/boot/common/part.c projects/diffused_head/sys/boot/i386/libi386/pxe.c projects/diffused_head/sys/boot/i386/libi386/pxe.h projects/diffused_head/sys/boot/i386/loader/conf.c projects/diffused_head/sys/boot/i386/loader/main.c projects/diffused_head/sys/boot/powerpc/uboot/Makefile projects/diffused_head/sys/boot/sparc64/loader/main.c projects/diffused_head/sys/boot/uboot/common/main.c projects/diffused_head/sys/boot/uboot/lib/Makefile projects/diffused_head/sys/boot/uboot/lib/devicename.c projects/diffused_head/sys/boot/uboot/lib/disk.c projects/diffused_head/sys/boot/uboot/lib/libuboot.h projects/diffused_head/sys/boot/zfs/zfs.c projects/diffused_head/sys/boot/zfs/zfsimpl.c projects/diffused_head/sys/cam/scsi/scsi_low.c projects/diffused_head/sys/cam/scsi/scsi_low.h projects/diffused_head/sys/cddl/boot/zfs/zfsimpl.h projects/diffused_head/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c projects/diffused_head/sys/cddl/compat/opensolaris/sys/debug.h projects/diffused_head/sys/cddl/compat/opensolaris/sys/sid.h projects/diffused_head/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/diffused_head/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h projects/diffused_head/sys/compat/linux/linux_file.c projects/diffused_head/sys/conf/Makefile.amd64 projects/diffused_head/sys/conf/Makefile.arm projects/diffused_head/sys/conf/Makefile.powerpc projects/diffused_head/sys/conf/NOTES projects/diffused_head/sys/conf/files projects/diffused_head/sys/conf/files.amd64 projects/diffused_head/sys/conf/files.i386 projects/diffused_head/sys/conf/kern.mk projects/diffused_head/sys/conf/kern.pre.mk projects/diffused_head/sys/conf/kmod.mk projects/diffused_head/sys/conf/options.amd64 projects/diffused_head/sys/conf/options.i386 projects/diffused_head/sys/contrib/altq/altq/altq_cbq.c projects/diffused_head/sys/contrib/altq/altq/altq_hfsc.c projects/diffused_head/sys/contrib/altq/altq/altq_priq.c projects/diffused_head/sys/contrib/altq/altq/altq_subr.c projects/diffused_head/sys/contrib/pf/net/if_pflog.c projects/diffused_head/sys/contrib/pf/net/if_pflog.h projects/diffused_head/sys/contrib/pf/net/if_pfsync.c projects/diffused_head/sys/contrib/pf/net/if_pfsync.h projects/diffused_head/sys/contrib/pf/net/pf.c projects/diffused_head/sys/contrib/pf/net/pf_if.c projects/diffused_head/sys/contrib/pf/net/pf_ioctl.c projects/diffused_head/sys/contrib/pf/net/pf_lb.c projects/diffused_head/sys/contrib/pf/net/pf_mtag.h projects/diffused_head/sys/contrib/pf/net/pf_norm.c projects/diffused_head/sys/contrib/pf/net/pf_osfp.c projects/diffused_head/sys/contrib/pf/net/pf_ruleset.c projects/diffused_head/sys/contrib/pf/net/pf_table.c projects/diffused_head/sys/contrib/pf/net/pfvar.h projects/diffused_head/sys/dev/acpica/acpi_hpet.c projects/diffused_head/sys/dev/ahci/ahci.c projects/diffused_head/sys/dev/arcmsr/arcmsr.c projects/diffused_head/sys/dev/arcmsr/arcmsr.h projects/diffused_head/sys/dev/ath/ath_dfs/null/dfs_null.c projects/diffused_head/sys/dev/ath/ath_hal/ah.c projects/diffused_head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/diffused_head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/diffused_head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c projects/diffused_head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c projects/diffused_head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h projects/diffused_head/sys/dev/ath/ath_hal/ar9002/ar9280.c projects/diffused_head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c projects/diffused_head/sys/dev/ath/if_ath.c projects/diffused_head/sys/dev/ath/if_ath_tx.c projects/diffused_head/sys/dev/ath/if_ath_tx_ht.c projects/diffused_head/sys/dev/atkbdc/psm.c projects/diffused_head/sys/dev/bxe/if_bxe.c projects/diffused_head/sys/dev/ct/bshw_machdep.c projects/diffused_head/sys/dev/ct/ct.c projects/diffused_head/sys/dev/ct/ct_isa.c projects/diffused_head/sys/dev/ct/ct_machdep.h projects/diffused_head/sys/dev/ct/ctvar.h projects/diffused_head/sys/dev/cxgbe/common/common.h projects/diffused_head/sys/dev/cxgbe/firmware/t4fw_interface.h projects/diffused_head/sys/dev/cxgbe/osdep.h projects/diffused_head/sys/dev/cxgbe/t4_l2t.h projects/diffused_head/sys/dev/cxgbe/t4_main.c projects/diffused_head/sys/dev/cxgbe/tom/t4_ddp.c projects/diffused_head/sys/dev/fdt/fdt_common.c projects/diffused_head/sys/dev/fdt/fdt_common.h projects/diffused_head/sys/dev/fdt/fdt_pci.c projects/diffused_head/sys/dev/gxemul/disk/gxemul_disk.c projects/diffused_head/sys/dev/hptmv/entry.c projects/diffused_head/sys/dev/hwpmc/hwpmc_arm.c projects/diffused_head/sys/dev/hwpmc/hwpmc_core.c projects/diffused_head/sys/dev/hwpmc/hwpmc_core.h projects/diffused_head/sys/dev/hwpmc/hwpmc_intel.c projects/diffused_head/sys/dev/hwpmc/hwpmc_x86.c projects/diffused_head/sys/dev/hwpmc/pmc_events.h projects/diffused_head/sys/dev/isp/isp_pci.c projects/diffused_head/sys/dev/ixgbe/ixgbe.c projects/diffused_head/sys/dev/ixgbe/ixgbe_82599.c projects/diffused_head/sys/dev/ixgbe/ixgbe_osdep.h projects/diffused_head/sys/dev/ncv/ncr53c500.c projects/diffused_head/sys/dev/ncv/ncr53c500_pccard.c projects/diffused_head/sys/dev/ncv/ncr53c500hw.h projects/diffused_head/sys/dev/ncv/ncr53c500var.h projects/diffused_head/sys/dev/nsp/nsp.c projects/diffused_head/sys/dev/nsp/nsp_pccard.c projects/diffused_head/sys/dev/nsp/nspvar.h projects/diffused_head/sys/dev/pci/pcireg.h projects/diffused_head/sys/dev/random/nehemiah.c projects/diffused_head/sys/dev/random/probe.c projects/diffused_head/sys/dev/sound/usb/uaudioreg.h projects/diffused_head/sys/dev/stg/tmc18c30.c projects/diffused_head/sys/dev/stg/tmc18c30_isa.c projects/diffused_head/sys/dev/stg/tmc18c30_pccard.c projects/diffused_head/sys/dev/stg/tmc18c30_pci.c projects/diffused_head/sys/dev/stg/tmc18c30_subr.c projects/diffused_head/sys/dev/stg/tmc18c30var.h projects/diffused_head/sys/dev/twe/twe.c projects/diffused_head/sys/dev/twe/twe_compat.h projects/diffused_head/sys/dev/twe/twe_freebsd.c projects/diffused_head/sys/dev/twe/twevar.h projects/diffused_head/sys/dev/usb/controller/at91dci.c projects/diffused_head/sys/dev/usb/controller/at91dci_atmelarm.c projects/diffused_head/sys/dev/usb/controller/dwc_otg.c projects/diffused_head/sys/dev/usb/controller/dwc_otg.h projects/diffused_head/sys/dev/usb/controller/dwc_otgreg.h projects/diffused_head/sys/dev/usb/controller/usb_controller.c projects/diffused_head/sys/dev/usb/serial/uchcom.c projects/diffused_head/sys/dev/usb/serial/ufoma.c projects/diffused_head/sys/dev/usb/usbdevs projects/diffused_head/sys/dev/virtio/virtio.h projects/diffused_head/sys/dev/virtio/virtqueue.c projects/diffused_head/sys/fs/deadfs/dead_vnops.c projects/diffused_head/sys/fs/ext2fs/ext2_inode.c projects/diffused_head/sys/fs/nandfs/bmap.c projects/diffused_head/sys/fs/nfs/nfs_commonport.c projects/diffused_head/sys/fs/nfs/nfscl.h projects/diffused_head/sys/fs/nfsclient/nfs_clrpcops.c projects/diffused_head/sys/fs/ntfs/ntfs_vfsops.c projects/diffused_head/sys/fs/nullfs/null.h projects/diffused_head/sys/fs/nullfs/null_subr.c projects/diffused_head/sys/fs/nullfs/null_vfsops.c projects/diffused_head/sys/fs/nullfs/null_vnops.c projects/diffused_head/sys/geom/mirror/g_mirror.c projects/diffused_head/sys/geom/raid/g_raid.c projects/diffused_head/sys/geom/raid/g_raid.h projects/diffused_head/sys/geom/raid/md_ddf.c projects/diffused_head/sys/geom/raid/md_intel.c projects/diffused_head/sys/geom/raid/md_jmicron.c projects/diffused_head/sys/geom/raid/md_nvidia.c projects/diffused_head/sys/geom/raid/md_promise.c projects/diffused_head/sys/geom/raid/md_sii.c projects/diffused_head/sys/geom/raid/tr_concat.c projects/diffused_head/sys/geom/raid/tr_raid0.c projects/diffused_head/sys/geom/raid/tr_raid1.c projects/diffused_head/sys/geom/raid/tr_raid1e.c projects/diffused_head/sys/geom/raid/tr_raid5.c projects/diffused_head/sys/geom/raid3/g_raid3.c projects/diffused_head/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c projects/diffused_head/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c projects/diffused_head/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c projects/diffused_head/sys/gnu/fs/xfs/FreeBSD/xfs_super.c projects/diffused_head/sys/gnu/fs/xfs/xfs_alloc.c projects/diffused_head/sys/gnu/fs/xfs/xfs_vfsops.c projects/diffused_head/sys/i386/conf/GENERIC projects/diffused_head/sys/i386/conf/NOTES projects/diffused_head/sys/i386/i386/pmap.c projects/diffused_head/sys/i386/i386/trap.c projects/diffused_head/sys/i386/xen/pmap.c projects/diffused_head/sys/ia64/ia32/ia32_trap.c projects/diffused_head/sys/ia64/ia64/trap.c projects/diffused_head/sys/kern/kern_condvar.c projects/diffused_head/sys/kern/kern_exit.c projects/diffused_head/sys/kern/kern_fork.c projects/diffused_head/sys/kern/kern_lock.c projects/diffused_head/sys/kern/kern_mutex.c projects/diffused_head/sys/kern/kern_rmlock.c projects/diffused_head/sys/kern/kern_rwlock.c projects/diffused_head/sys/kern/kern_sig.c projects/diffused_head/sys/kern/kern_sx.c projects/diffused_head/sys/kern/kern_thread.c projects/diffused_head/sys/kern/subr_hints.c projects/diffused_head/sys/kern/subr_param.c projects/diffused_head/sys/kern/subr_sleepqueue.c projects/diffused_head/sys/kern/subr_syscall.c projects/diffused_head/sys/kern/subr_trap.c projects/diffused_head/sys/kern/subr_turnstile.c projects/diffused_head/sys/kern/uipc_socket.c projects/diffused_head/sys/kern/uipc_usrreq.c projects/diffused_head/sys/kern/vfs_lookup.c projects/diffused_head/sys/kern/vfs_mount.c projects/diffused_head/sys/kern/vfs_subr.c projects/diffused_head/sys/mips/conf/BERI_DE4_MDROOT projects/diffused_head/sys/mips/conf/BERI_SIM_MDROOT projects/diffused_head/sys/mips/mips/busdma_machdep.c projects/diffused_head/sys/mips/mips/pmap.c projects/diffused_head/sys/mips/mips/trap.c projects/diffused_head/sys/modules/Makefile projects/diffused_head/sys/modules/cxgbe/firmware/Makefile projects/diffused_head/sys/modules/pf/Makefile projects/diffused_head/sys/modules/random/Makefile projects/diffused_head/sys/modules/scsi_low/Makefile projects/diffused_head/sys/modules/xfs/Makefile projects/diffused_head/sys/net/flowtable.c projects/diffused_head/sys/net/if.c projects/diffused_head/sys/net/if_bridge.c projects/diffused_head/sys/net/if_ethersubr.c projects/diffused_head/sys/net/if_var.h projects/diffused_head/sys/netinet/if_ether.c projects/diffused_head/sys/netinet/in_gif.c projects/diffused_head/sys/netinet/ip_icmp.c projects/diffused_head/sys/netinet/ip_var.h projects/diffused_head/sys/netinet/ipfw/ip_fw2.c projects/diffused_head/sys/netinet/ipfw/ip_fw_pfil.c projects/diffused_head/sys/netinet/ipfw/ip_fw_private.h projects/diffused_head/sys/netinet/raw_ip.c projects/diffused_head/sys/netinet/sctp_asconf.c projects/diffused_head/sys/netinet/sctp_auth.c projects/diffused_head/sys/netinet/sctp_cc_functions.c projects/diffused_head/sys/netinet/sctp_header.h projects/diffused_head/sys/netinet/sctp_indata.c projects/diffused_head/sys/netinet/sctp_input.c projects/diffused_head/sys/netinet/sctp_input.h projects/diffused_head/sys/netinet/sctp_output.c projects/diffused_head/sys/netinet/sctp_pcb.c projects/diffused_head/sys/netinet/sctp_structs.h projects/diffused_head/sys/netinet/sctp_timer.c projects/diffused_head/sys/netinet/sctputil.c projects/diffused_head/sys/netinet/tcp_subr.c projects/diffused_head/sys/netinet6/icmp6.c projects/diffused_head/sys/netinet6/in6_gif.c projects/diffused_head/sys/netipsec/ipsec_input.c projects/diffused_head/sys/netipsec/ipsec_output.c projects/diffused_head/sys/netipsec/key.c projects/diffused_head/sys/netipsec/xform_ipip.c projects/diffused_head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/diffused_head/sys/powerpc/aim/trap.c projects/diffused_head/sys/powerpc/booke/trap.c projects/diffused_head/sys/powerpc/wii/wii_bus.c projects/diffused_head/sys/rpc/rpc_com.h projects/diffused_head/sys/rpc/xdr.h projects/diffused_head/sys/sparc64/include/vmparam.h projects/diffused_head/sys/sparc64/sparc64/trap.c projects/diffused_head/sys/sys/cdefs.h projects/diffused_head/sys/sys/hash.h projects/diffused_head/sys/sys/mbuf.h projects/diffused_head/sys/sys/mount.h projects/diffused_head/sys/sys/param.h projects/diffused_head/sys/sys/pmc.h projects/diffused_head/sys/sys/queue.h projects/diffused_head/sys/vm/swap_pager.c projects/diffused_head/sys/vm/vm_map.c projects/diffused_head/sys/vm/vm_mmap.c projects/diffused_head/tools/build/Makefile projects/diffused_head/tools/diag/README projects/diffused_head/tools/test/hwpmc/pmctest.py projects/diffused_head/tools/tools/README projects/diffused_head/tools/tools/ath/athratestats/Makefile projects/diffused_head/tools/tools/ath/athratestats/main.c projects/diffused_head/tools/tools/netmap/pkt-gen.c projects/diffused_head/usr.bin/Makefile projects/diffused_head/usr.bin/calendar/calendars/calendar.freebsd projects/diffused_head/usr.bin/chat/chat.8 projects/diffused_head/usr.bin/find/find.1 projects/diffused_head/usr.bin/last/last.c projects/diffused_head/usr.bin/mkcsmapper/lex.l projects/diffused_head/usr.bin/mkesdb/lex.l projects/diffused_head/usr.bin/netstat/if.c projects/diffused_head/usr.bin/procstat/procstat_files.c projects/diffused_head/usr.bin/sort/sort.1.in projects/diffused_head/usr.bin/stdbuf/Makefile projects/diffused_head/usr.bin/truss/amd64-fbsd.c projects/diffused_head/usr.bin/truss/amd64-fbsd32.c projects/diffused_head/usr.bin/truss/amd64-linux32.c projects/diffused_head/usr.bin/truss/i386-fbsd.c projects/diffused_head/usr.bin/truss/i386-linux.c projects/diffused_head/usr.bin/truss/ia64-fbsd.c projects/diffused_head/usr.bin/truss/main.c projects/diffused_head/usr.bin/truss/mips-fbsd.c projects/diffused_head/usr.bin/truss/powerpc-fbsd.c projects/diffused_head/usr.bin/truss/powerpc64-fbsd.c projects/diffused_head/usr.bin/truss/setup.c projects/diffused_head/usr.bin/truss/sparc64-fbsd.c projects/diffused_head/usr.bin/truss/syscall.h projects/diffused_head/usr.bin/truss/syscalls.c projects/diffused_head/usr.bin/truss/truss.h projects/diffused_head/usr.bin/xlint/lint1/makeman projects/diffused_head/usr.sbin/arp/arp.4 projects/diffused_head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c projects/diffused_head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c projects/diffused_head/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt projects/diffused_head/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c projects/diffused_head/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def projects/diffused_head/usr.sbin/lpr/lpd/printjob.c projects/diffused_head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh projects/diffused_head/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh projects/diffused_head/usr.sbin/pc-sysinstall/backend/functions-disk.sh projects/diffused_head/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh projects/diffused_head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh projects/diffused_head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh projects/diffused_head/usr.sbin/pciconf/cap.c projects/diffused_head/usr.sbin/pciconf/err.c projects/diffused_head/usr.sbin/pkg_install/add/add.h projects/diffused_head/usr.sbin/pkg_install/add/extract.c projects/diffused_head/usr.sbin/pkg_install/add/futil.c projects/diffused_head/usr.sbin/pkg_install/add/perform.c projects/diffused_head/usr.sbin/pkg_install/lib/lib.h projects/diffused_head/usr.sbin/ppp/ppp.8.m4 projects/diffused_head/usr.sbin/rpc.lockd/lockd_lock.c projects/diffused_head/usr.sbin/syslogd/syslog.conf.5 projects/diffused_head/usr.sbin/syslogd/syslogd.c projects/diffused_head/usr.sbin/timed/timed/timed.c Directory Properties: projects/diffused_head/ (props changed) projects/diffused_head/cddl/contrib/opensolaris/ (props changed) projects/diffused_head/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/diffused_head/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/diffused_head/contrib/bzip2/ (props changed) projects/diffused_head/contrib/gdb/ (props changed) projects/diffused_head/contrib/pf/ (props changed) projects/diffused_head/contrib/sendmail/ (props changed) projects/diffused_head/contrib/tzdata/ (props changed) projects/diffused_head/crypto/openssh/ (props changed) projects/diffused_head/crypto/openssl/ (props changed) projects/diffused_head/lib/libc/ (props changed) projects/diffused_head/lib/libutil/ (props changed) projects/diffused_head/sbin/ (props changed) projects/diffused_head/sbin/ipfw/ (props changed) projects/diffused_head/share/man/man4/ (props changed) projects/diffused_head/sys/ (props changed) projects/diffused_head/sys/boot/ (props changed) projects/diffused_head/sys/cddl/contrib/opensolaris/ (props changed) projects/diffused_head/sys/conf/ (props changed) projects/diffused_head/sys/contrib/pf/ (props changed) projects/diffused_head/usr.bin/calendar/ (props changed) projects/diffused_head/usr.bin/procstat/ (props changed) Modified: projects/diffused_head/MAINTAINERS ============================================================================== --- projects/diffused_head/MAINTAINERS Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/MAINTAINERS Tue Nov 27 05:48:36 2012 (r243596) @@ -3,7 +3,7 @@ $FreeBSD$ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements are granted by core. These are documented in head/LOCKS and enforced -by CVSROOT/approvers. +by svnadmin/conf/approvers. The source tree is a community effort. However, some folks go to the trouble of looking after particular areas of the tree. In return for Modified: projects/diffused_head/Makefile ============================================================================== --- projects/diffused_head/Makefile Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/Makefile Tue Nov 27 05:48:36 2012 (r243596) @@ -216,7 +216,7 @@ ${TGTS}: .MAIN: all STARTTIME!= LC_ALL=C date -CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s +CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s ; echo .if !empty(CHECK_TIME) .error check your date/time: ${STARTTIME} .endif Modified: projects/diffused_head/Makefile.inc1 ============================================================================== --- projects/diffused_head/Makefile.inc1 Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/Makefile.inc1 Tue Nov 27 05:48:36 2012 (r243596) @@ -46,6 +46,7 @@ TARGET_ARCH=${TARGET} .include <bsd.own.mk> .include <bsd.arch.inc.mk> +.include <bsd.compiler.mk> # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to @@ -235,7 +236,8 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/i PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} \ VERSION="${VERSION}" \ - MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" + MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ + COMPILER_TYPE=${COMPILER_TYPE} BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ @@ -270,6 +272,16 @@ WMAKEENV= ${CROSSENV} \ .if ${MK_CDDL} == "no" WMAKEENV+= NO_CTF=1 .endif +.if ${CC:T:Mgcc} == "gcc" +WMAKE_COMPILER_TYPE= gcc +.elif ${CC:T:Mclang} == "clang" +WMAKE_COMPILER_TYPE= clang +.elif ${MK_CLANG_IS_CC} == "no" +WMAKE_COMPILER_TYPE= gcc +.else +WMAKE_COMPILER_TYPE= clang +.endif +WMAKEENV+= COMPILER_TYPE=${WMAKE_COMPILER_TYPE} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" @@ -313,7 +325,8 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTR CC="${CC} ${LIB32FLAGS}" \ CXX="${CXX} ${LIB32FLAGS}" \ LIBDIR=/usr/lib32 \ - SHLIBDIR=/usr/lib32 + SHLIBDIR=/usr/lib32 \ + COMPILER_TYPE=${WMAKE_COMPILER_TYPE} LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \ @@ -636,7 +649,10 @@ ITOOLS= [ awk cap_mkdb cat chflags chmod # # Non-base distributions produced by the base system -EXTRA_DISTRIBUTIONS= doc games +EXTRA_DISTRIBUTIONS= doc +.if ${MK_GAMES} != "no" +EXTRA_DISTRIBUTIONS+= games +.endif .if defined(LIB32TMP) && ${MK_LIB32} != "no" EXTRA_DISTRIBUTIONS+= lib32 .endif @@ -1555,7 +1571,7 @@ DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF} .if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE) .if exists(${KERNCONFDIR}/${KERNCONF}) FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \ - ${KERNCONFDIR}/${KERNCONF} + ${KERNCONFDIR}/${KERNCONF} ; echo .endif .endif Modified: projects/diffused_head/ObsoleteFiles.inc ============================================================================== --- projects/diffused_head/ObsoleteFiles.inc Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/ObsoleteFiles.inc Tue Nov 27 05:48:36 2012 (r243596) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20120908: pf cleanup +OLD_FILES+=usr/include/net/if_pflow.h # 20120816: new clang import which bumps version from 3.1 to 3.2 OLD_FILES+=usr/bin/llvm-ld OLD_FILES+=usr/bin/llvm-stub Modified: projects/diffused_head/UPDATING ============================================================================== --- projects/diffused_head/UPDATING Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/UPDATING Tue Nov 27 05:48:36 2012 (r243596) @@ -24,6 +24,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20120908: + The pf(4) packet filter ABI has been changed. pfctl(8) and + snmp_pf module need to be recompiled to work with new kernel. + 20120828: A new ZFS feature flag "com.delphix:empty_bpobj" has been merged to -HEAD. Pools that have empty_bpobj in active state can not be Modified: projects/diffused_head/bin/cat/cat.1 ============================================================================== --- projects/diffused_head/bin/cat/cat.1 Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/bin/cat/cat.1 Tue Nov 27 05:48:36 2012 (r243596) @@ -127,7 +127,7 @@ to the file truncating .Pa file3 if it already exists. -See the manual page for your shell (i.e., +See the manual page for your shell (e.g., .Xr sh 1 ) for more information on redirection. .Pp Modified: projects/diffused_head/bin/cp/cp.1 ============================================================================== --- projects/diffused_head/bin/cp/cp.1 Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/bin/cp/cp.1 Tue Nov 27 05:48:36 2012 (r243596) @@ -32,7 +32,7 @@ .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd January 17, 2010 +.Dd September 4, 2012 .Dt CP 1 .Os .Sh NAME @@ -164,7 +164,7 @@ Cause .Nm to preserve the following attributes of each source file in the copy: modification time, access time, -file flags, file mode, user ID, and group ID, as allowed by permissions. +file flags, file mode, ACL, user ID, and group ID, as allowed by permissions. .Pp If the user ID and group ID cannot be preserved, no error message is displayed and the exit value is not altered. Modified: projects/diffused_head/bin/getfacl/getfacl.1 ============================================================================== --- projects/diffused_head/bin/getfacl/getfacl.1 Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/bin/getfacl/getfacl.1 Tue Nov 27 05:48:36 2012 (r243596) @@ -97,6 +97,10 @@ then reads a list of pathnames, each terminated by one newline character, from the standard input. .El +.Pp +For an explanation of the ACL syntax, see the +.Xr setfacl 1 +manual page. .Sh EXIT STATUS .Ex -std .Sh EXAMPLES Modified: projects/diffused_head/bin/setfacl/merge.c ============================================================================== --- projects/diffused_head/bin/setfacl/merge.c Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/bin/setfacl/merge.c Tue Nov 27 05:48:36 2012 (r243596) @@ -94,7 +94,7 @@ merge_acl(acl_t acl, acl_t *prev_acl, co acl_tag_t tag, tag_new; acl_entry_type_t entry_type, entry_type_new; acl_flagset_t flagset; - int entry_id, entry_id_new, have_entry, entry_number = 0; + int entry_id, entry_id_new, have_entry, had_entry, entry_number = 0; int acl_brand, prev_acl_brand; acl_get_brand_np(acl, &acl_brand); @@ -116,6 +116,7 @@ merge_acl(acl_t acl, acl_t *prev_acl, co while (acl_get_entry(acl, entry_id, &entry) == 1) { entry_id = ACL_NEXT_ENTRY; have_entry = 0; + had_entry = 0; /* keep track of existing ACL_MASK entries */ if (acl_get_tag_type(entry, &tag) == -1) @@ -187,7 +188,7 @@ merge_acl(acl_t acl, acl_t *prev_acl, co err(1, "%s: acl_set_flagset_np() failed", filename); } - have_entry = 1; + had_entry = have_entry = 1; break; default: /* should never be here */ @@ -197,7 +198,7 @@ merge_acl(acl_t acl, acl_t *prev_acl, co } /* if this entry has not been found, it must be new */ - if (have_entry == 0) { + if (had_entry == 0) { /* * NFSv4 ACL entries must be prepended to the ACL. Modified: projects/diffused_head/bin/setfacl/setfacl.1 ============================================================================== --- projects/diffused_head/bin/setfacl/setfacl.1 Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/bin/setfacl/setfacl.1 Tue Nov 27 05:48:36 2012 (r243596) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 9, 2011 +.Dd September 2, 2012 .Dt SETFACL 1 .Os .Sh NAME @@ -337,7 +337,7 @@ read_acl write_acl .It o write_owner -.It S +.It s synchronize .El .Pp Modified: projects/diffused_head/bin/setfacl/setfacl.c ============================================================================== --- projects/diffused_head/bin/setfacl/setfacl.c Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/bin/setfacl/setfacl.c Tue Nov 27 05:48:36 2012 (r243596) @@ -73,6 +73,7 @@ main(int argc, char *argv[]) { acl_t acl; acl_type_t acl_type; + acl_entry_t unused_entry; char filename[PATH_MAX]; int local_error, carried_error, ch, i, entry_number, ret; int h_flag; @@ -263,6 +264,17 @@ main(int argc, char *argv[]) need_mask = 1; break; case OP_REMOVE_EXT: + /* + * Don't try to call remove_ext() for empty + * default ACL. + */ + if (acl_type == ACL_TYPE_DEFAULT && + acl_get_entry(acl, ACL_FIRST_ENTRY, + &unused_entry) == 0) { + local_error += remove_default(&acl, + file->filename); + break; + } remove_ext(&acl, file->filename); need_mask = 0; break; @@ -296,6 +308,20 @@ main(int argc, char *argv[]) } } + /* + * Don't try to set an empty default ACL; it will always fail. + * Use acl_delete_def_file(3) instead. + */ + if (acl_type == ACL_TYPE_DEFAULT && + acl_get_entry(acl, ACL_FIRST_ENTRY, &unused_entry) == 0) { + if (acl_delete_def_file(file->filename) == -1) { + warn("%s: acl_delete_def_file() failed", + file->filename); + carried_error++; + } + continue; + } + /* don't bother setting the ACL if something is broken */ if (local_error) { carried_error++; Modified: projects/diffused_head/bin/sh/options.c ============================================================================== --- projects/diffused_head/bin/sh/options.c Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/bin/sh/options.c Tue Nov 27 05:48:36 2012 (r243596) @@ -531,10 +531,6 @@ out: } /* - * XXX - should get rid of. have all builtins use getopt(3). the - * library getopt must have the BSD extension static variable "optreset" - * otherwise it can't be used within the shell safely. - * * Standard option processing (a la getopt) for builtin routines. The * only argument that is passed to nextopt is the option string; the * other arguments are unnecessary. It return the character, or '\0' on Modified: projects/diffused_head/bin/sh/sh.1 ============================================================================== --- projects/diffused_head/bin/sh/sh.1 Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/bin/sh/sh.1 Tue Nov 27 05:48:36 2012 (r243596) @@ -487,8 +487,9 @@ and backslash The backslash inside double quotes is historically weird. It remains literal unless it precedes the following characters, which it serves to quote: +.Pp .Bl -column "XXX" "XXX" "XXX" "XXX" "XXX" -offset center -compact -.It Li $ Ta Li ` Ta Li \&" Ta Li \e\ Ta Li \en +.It Li $ Ta Li ` Ta Li \&" Ta Li \e Ta Li \en .El .It Backslash A backslash preserves the literal meaning of the following Modified: projects/diffused_head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/diffused_head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Nov 27 05:48:36 2012 (r243596) @@ -22,10 +22,12 @@ .\" Copyright (c) 2012 Nexenta Systems, Inc. All Rights Reserved. .\" Copyright (c) 2012, Joyent, Inc. All rights reserved. .\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd@FreeBSD.org> +.\" Copyright (c) 2012, Glen Barber <gjb@FreeBSD.org> +.\" Copyright (c) 2012, Bryan Drewery <bdrewery@FreeBSD.org> .\" .\" $FreeBSD$ .\" -.Dd August 12, 2012 +.Dd September 5, 2012 .Dt ZFS 8 .Os .Sh NAME @@ -135,17 +137,21 @@ .Fl a | Ar filesystem .Nm .Cm userspace -.Op Fl niHp +.Op Fl Hinp .Op Fl o Ar field Ns Op , Ns Ar ... -.Op Fl sS Ar field +.Op Fl s Ar field +.Ar ... +.Op Fl S Ar field .Ar ... .Op Fl t Ar type Ns Op , Ns Ar ... .Ar filesystem Ns | Ns Ar snapshot .Nm .Cm groupspace -.Op Fl niHp +.Op Fl Hinp .Op Fl o Ar field Ns Op , Ns Ar ... -.Op Fl sS Ar field +.Op Fl s Ar field +.Ar ... +.Op Fl S Ar field .Ar ... .Op Fl t Ar type Ns Op , Ns Ar ... .Ar filesystem Ns | Ns Ar snapshot @@ -1082,7 +1088,7 @@ bit is respected for the file system. Th .It Sy sharesmb Ns = Ns Cm on | off | Ar opts The .Sy sharesmb -property has currently no effect o +property currently has no effect on .Fx . .It Sy sharenfs Ns = Ns Cm on | off | Ar opts Controls whether the file system is shared via @@ -1985,9 +1991,11 @@ Upgrade the specified file system. .It Xo .Nm .Cm userspace -.Op Fl niHp +.Op Fl Hinp .Op Fl o Ar field Ns Op , Ns Ar ... -.Op Fl sS Ar field +.Op Fl s Ar field +.Ar ... +.Op Fl S Ar field .Ar ... .Op Fl t Ar type Ns Op , Ns Ar ... .Ar filesystem Ns | Ns Ar snapshot @@ -2005,9 +2013,9 @@ Print numeric ID instead of user/group n .It Fl H Do not print headers, use tab-delimited output. .It Fl p -Use exact (parseable) numeric output. +Use exact (parsable) numeric output. .It Fl o Ar field Ns Op , Ns Ar ... -Display only the specified fields from the following set, +Display only the specified fields from the following set: .Sy type,name,used,quota . The default is to display all fields. .It Fl s Ar field @@ -2022,7 +2030,7 @@ another. The default is Sort by this field in reverse order. See .Fl s . .It Fl t Ar type Ns Op , Ns Ar ... -Print only the specified types from the following set, +Print only the specified types from the following set: .Sy all,posixuser,smbuser,posixgroup,smbgroup . .Pp The default is @@ -2030,15 +2038,17 @@ The default is .Pp The default can be changed to include group types. .It Fl i -Translate SID to POSIX ID. This flag has currently no effect on +Translate SID to POSIX ID. This flag currently has no effect on .Fx . .El .It Xo .Nm .Cm groupspace -.Op Fl niHp +.Op Fl Hinp .Op Fl o Ar field Ns Op , Ns Ar ... -.Op Fl sS Ar field +.Op Fl s Ar field +.Ar ... +.Op Fl S Ar field .Ar ... .Op Fl t Ar type Ns Op , Ns Ar ... .Ar filesystem Ns | Ns Ar snapshot Modified: projects/diffused_head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/diffused_head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Nov 27 03:36:15 2012 (r243595) +++ projects/diffused_head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Nov 27 05:48:36 2012 (r243596) @@ -304,13 +304,13 @@ get_usage(zfs_help_t idx) "\tunallow [-r] -s @setname [<perm|@setname>[,...]] " "<filesystem|volume>\n")); case HELP_USERSPACE: - return (gettext("\tuserspace [-niHp] [-o field[,...]] " - "[-sS field] ... [-t type[,...]]\n" - "\t <filesystem|snapshot>\n")); + return (gettext("\tuserspace [-Hinp] [-o field[,...]] " + "[-s field] ...\n\t[-S field] ... " + "[-t type[,...]] <filesystem|snapshot>\n")); case HELP_GROUPSPACE: - return (gettext("\tgroupspace [-niHp] [-o field[,...]] " - "[-sS field] ... [-t type[,...]]\n" - "\t <filesystem|snapshot>\n")); + return (gettext("\tgroupspace [-Hinp] [-o field[,...]] " + "[-s field] ...\n\t[-S field] ... " + "[-t type[,...]] <filesystem|snapshot>\n")); case HELP_HOLD: return (gettext("\thold [-r] <tag> <snapshot> ...\n")); case HELP_HOLDS: @@ -2068,30 +2068,52 @@ zfs_do_upgrade(int argc, char **argv) return (ret); } -#define USTYPE_USR_BIT (0) -#define USTYPE_GRP_BIT (1) -#define USTYPE_PSX_BIT (2) -#define USTYPE_SMB_BIT (3) - -#define USTYPE_USR (1 << USTYPE_USR_BIT) -#define USTYPE_GRP (1 << USTYPE_GRP_BIT) - -#define USTYPE_PSX (1 << USTYPE_PSX_BIT) -#define USTYPE_SMB (1 << USTYPE_SMB_BIT) - -#define USTYPE_PSX_USR (USTYPE_PSX | USTYPE_USR) -#define USTYPE_SMB_USR (USTYPE_SMB | USTYPE_USR) -#define USTYPE_PSX_GRP (USTYPE_PSX | USTYPE_GRP) -#define USTYPE_SMB_GRP (USTYPE_SMB | USTYPE_GRP) -#define USTYPE_ALL (USTYPE_PSX_USR | USTYPE_SMB_USR \ - | USTYPE_PSX_GRP | USTYPE_SMB_GRP) +/* + * zfs userspace [-Hinp] [-o field[,...]] [-s field [-s field]...] + * [-S field [-S field]...] [-t type[,...]] filesystem | snapshot + * zfs groupspace [-Hinp] [-o field[,...]] [-s field [-s field]...] + * [-S field [-S field]...] [-t type[,...]] filesystem | snapshot + * + * -H Scripted mode; elide headers and separate columns by tabs. + * -i Translate SID to POSIX ID. + * -n Print numeric ID instead of user/group name. + * -o Control which fields to display. + * -p Use exact (parseable) numeric output. + * -s Specify sort columns, descending order. + * -S Specify sort columns, ascending order. + * -t Control which object types to display. + * + * Displays space consumed by, and quotas on, each user in the specified + * filesystem or snapshot. + */ +/* us_field_types, us_field_hdr and us_field_names should be kept in sync */ +enum us_field_types { + USFIELD_TYPE, + USFIELD_NAME, + USFIELD_USED, + USFIELD_QUOTA +}; +static char *us_field_hdr[] = { "TYPE", "NAME", "USED", "QUOTA" }; +static char *us_field_names[] = { "type", "name", "used", "quota" }; +#define USFIELD_LAST (sizeof (us_field_names) / sizeof (char *)) -#define USPROP_USED_BIT (0) -#define USPROP_QUOTA_BIT (1) +#define USTYPE_PSX_GRP (1 << 0) +#define USTYPE_PSX_USR (1 << 1) +#define USTYPE_SMB_GRP (1 << 2) +#define USTYPE_SMB_USR (1 << 3) +#define USTYPE_ALL \ + (USTYPE_PSX_GRP | USTYPE_PSX_USR | USTYPE_SMB_GRP | USTYPE_SMB_USR) -#define USPROP_USED (1 << USPROP_USED_BIT) -#define USPROP_QUOTA (1 << USPROP_QUOTA_BIT) +static int us_type_bits[] = { + USTYPE_PSX_GRP, + USTYPE_PSX_USR, + USTYPE_SMB_GRP, + USTYPE_SMB_USR, + USTYPE_ALL +}; +static char *us_type_names[] = { "posixgroup", "posxiuser", "smbgroup", + "smbuser", "all" }; typedef struct us_node { nvlist_t *usn_nvl; @@ -2100,37 +2122,49 @@ typedef struct us_node { } us_node_t; typedef struct us_cbdata { - nvlist_t **cb_nvlp; - uu_avl_pool_t *cb_avl_pool; - uu_avl_t *cb_avl; - boolean_t cb_numname; - boolean_t cb_nicenum; - boolean_t cb_sid2posix; - zfs_userquota_prop_t cb_prop; - zfs_sort_column_t *cb_sortcol; - size_t cb_max_typelen; - size_t cb_max_namelen; - size_t cb_max_usedlen; - size_t cb_max_quotalen; + nvlist_t **cb_nvlp; + uu_avl_pool_t *cb_avl_pool; + uu_avl_t *cb_avl; + boolean_t cb_numname; + boolean_t cb_nicenum; + boolean_t cb_sid2posix; + zfs_userquota_prop_t cb_prop; + zfs_sort_column_t *cb_sortcol; + size_t cb_width[USFIELD_LAST]; } us_cbdata_t; +static boolean_t us_populated = B_FALSE; + typedef struct { zfs_sort_column_t *si_sortcol; - boolean_t si_num_name; - boolean_t si_parsable; + boolean_t si_numname; } us_sort_info_t; static int +us_field_index(char *field) +{ + int i; + + for (i = 0; i < USFIELD_LAST; i++) { + if (strcmp(field, us_field_names[i]) == 0) + return (i); + } + + return (-1); +} + +static int us_compare(const void *larg, const void *rarg, void *unused) { const us_node_t *l = larg; const us_node_t *r = rarg; - int rc = 0; us_sort_info_t *si = (us_sort_info_t *)unused; zfs_sort_column_t *sortcol = si->si_sortcol; - boolean_t num_name = si->si_num_name; + boolean_t numname = si->si_numname; nvlist_t *lnvl = l->usn_nvl; nvlist_t *rnvl = r->usn_nvl; + int rc = 0; + boolean_t lvb, rvb; for (; sortcol != NULL; sortcol = sortcol->sc_next) { char *lvstr = ""; @@ -2149,17 +2183,17 @@ us_compare(const void *larg, const void (void) nvlist_lookup_uint32(lnvl, propname, &lv32); (void) nvlist_lookup_uint32(rnvl, propname, &rv32); if (rv32 != lv32) - rc = (rv32 > lv32) ? 1 : -1; + rc = (rv32 < lv32) ? 1 : -1; break; case ZFS_PROP_NAME: propname = "name"; - if (num_name) { - (void) nvlist_lookup_uint32(lnvl, propname, - &lv32); - (void) nvlist_lookup_uint32(rnvl, propname, - &rv32); - if (rv32 != lv32) - rc = (rv32 > lv32) ? 1 : -1; + if (numname) { + (void) nvlist_lookup_uint64(lnvl, propname, + &lv64); + (void) nvlist_lookup_uint64(rnvl, propname, + &rv64); + if (rv64 != lv64) + rc = (rv64 < lv64) ? 1 : -1; } else { (void) nvlist_lookup_string(lnvl, propname, &lvstr); @@ -2168,27 +2202,40 @@ us_compare(const void *larg, const void rc = strcmp(lvstr, rvstr); } break; - case ZFS_PROP_USED: case ZFS_PROP_QUOTA: - if (ZFS_PROP_USED == prop) + if (!us_populated) + break; + if (prop == ZFS_PROP_USED) propname = "used"; else propname = "quota"; (void) nvlist_lookup_uint64(lnvl, propname, &lv64); (void) nvlist_lookup_uint64(rnvl, propname, &rv64); if (rv64 != lv64) - rc = (rv64 > lv64) ? 1 : -1; + rc = (rv64 < lv64) ? 1 : -1; + break; } - if (rc) + if (rc != 0) { if (rc < 0) return (reverse ? 1 : -1); else return (reverse ? -1 : 1); + } } - return (rc); + /* + * If entries still seem to be the same, check if they are of the same + * type (smbentity is added only if we are doing SID to POSIX ID + * translation where we can have duplicate type/name combinations). + */ + if (nvlist_lookup_boolean_value(lnvl, "smbentity", &lvb) == 0 && + nvlist_lookup_boolean_value(rnvl, "smbentity", &rvb) == 0 && + lvb != rvb) + return (lvb < rvb ? -1 : 1); + + return (0); } static inline const char * @@ -2208,9 +2255,6 @@ us_type2str(unsigned field_type) } } -/* - * zfs userspace - */ static int userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space) { @@ -2218,7 +2262,6 @@ userspace_cb(void *arg, const char *doma zfs_userquota_prop_t prop = cb->cb_prop; char *name = NULL; char *propname; - char namebuf[32]; char sizebuf[32]; us_node_t *node; uu_avl_pool_t *avl_pool = cb->cb_avl_pool; @@ -2232,32 +2275,30 @@ userspace_cb(void *arg, const char *doma size_t namelen; size_t typelen; size_t sizelen; + int typeidx, nameidx, sizeidx; us_sort_info_t sortinfo = { sortcol, cb->cb_numname }; + boolean_t smbentity = B_FALSE; - if (domain == NULL || domain[0] == '\0') { - /* POSIX */ - if (prop == ZFS_PROP_GROUPUSED || prop == ZFS_PROP_GROUPQUOTA) { - type = USTYPE_PSX_GRP; - struct group *g = getgrgid(rid); - if (g) - name = g->gr_name; - } else { - type = USTYPE_PSX_USR; - struct passwd *p = getpwuid(rid); - if (p) - name = p->pw_name; - } - } else { - char sid[ZFS_MAXNAMELEN+32]; + if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) + nomem(); + node = safe_malloc(sizeof (us_node_t)); + uu_avl_node_init(node, &node->usn_avlnode, avl_pool); + node->usn_nvl = props; + + if (domain != NULL && domain[0] != '\0') { + /* SMB */ + char sid[ZFS_MAXNAMELEN + 32]; uid_t id; uint64_t classes; #ifdef sun - int err = 0; + int err; directory_error_t e; #endif + smbentity = B_TRUE; + (void) snprintf(sid, sizeof (sid), "%s-%u", domain, rid); - /* SMB */ + if (prop == ZFS_PROP_GROUPUSED || prop == ZFS_PROP_GROUPQUOTA) { type = USTYPE_SMB_GRP; #ifdef sun @@ -2273,217 +2314,139 @@ userspace_cb(void *arg, const char *doma #ifdef sun if (err == 0) { rid = id; - - e = directory_name_from_sid(NULL, sid, &name, &classes); - if (e != NULL) { - directory_error_free(e); - return (NULL); + if (!cb->cb_sid2posix) { + e = directory_name_from_sid(NULL, sid, &name, + &classes); + if (e != NULL) + directory_error_free(e); + if (name == NULL) + name = sid; } - - if (name == NULL) - name = sid; } #endif } -/* - * if (prop == ZFS_PROP_GROUPUSED || prop == ZFS_PROP_GROUPQUOTA) - * ug = "group"; - * else - * ug = "user"; - */ - - if (prop == ZFS_PROP_USERUSED || prop == ZFS_PROP_GROUPUSED) - propname = "used"; - else - propname = "quota"; - - (void) snprintf(namebuf, sizeof (namebuf), "%u", rid); - if (name == NULL) - name = namebuf; - - if (cb->cb_nicenum) - zfs_nicenum(space, sizebuf, sizeof (sizebuf)); - else - (void) sprintf(sizebuf, "%llu", space); + if (cb->cb_sid2posix || domain == NULL || domain[0] == '\0') { + /* POSIX or -i */ + if (prop == ZFS_PROP_GROUPUSED || prop == ZFS_PROP_GROUPQUOTA) { + type = USTYPE_PSX_GRP; + if (!cb->cb_numname) { + struct group *g; - node = safe_malloc(sizeof (us_node_t)); - uu_avl_node_init(node, &node->usn_avlnode, avl_pool); + if ((g = getgrgid(rid)) != NULL) + name = g->gr_name; + } + } else { + type = USTYPE_PSX_USR; + if (!cb->cb_numname) { + struct passwd *p; - if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) { - free(node); - return (-1); + if ((p = getpwuid(rid)) != NULL) + name = p->pw_name; + } + } } + /* + * Make sure that the type/name combination is unique when doing + * SID to POSIX ID translation (hence changing the type from SMB to + * POSIX). + */ + if (cb->cb_sid2posix && + nvlist_add_boolean_value(props, "smbentity", smbentity) != 0) + nomem(); + + /* Calculate/update width of TYPE field */ + typestr = us_type2str(type); + typelen = strlen(gettext(typestr)); + typeidx = us_field_index("type"); + if (typelen > cb->cb_width[typeidx]) + cb->cb_width[typeidx] = typelen; if (nvlist_add_uint32(props, "type", type) != 0) nomem(); - if (cb->cb_numname) { - if (nvlist_add_uint32(props, "name", rid) != 0) + /* Calculate/update width of NAME field */ + if ((cb->cb_numname && cb->cb_sid2posix) || name == NULL) { + if (nvlist_add_uint64(props, "name", rid) != 0) nomem(); - namelen = strlen(namebuf); + namelen = snprintf(NULL, 0, "%u", rid); } else { if (nvlist_add_string(props, "name", name) != 0) nomem(); namelen = strlen(name); } + nameidx = us_field_index("name"); + if (namelen > cb->cb_width[nameidx]) + cb->cb_width[nameidx] = namelen; - typestr = us_type2str(type); - typelen = strlen(gettext(typestr)); - if (typelen > cb->cb_max_typelen) - cb->cb_max_typelen = typelen; - - if (namelen > cb->cb_max_namelen) - cb->cb_max_namelen = namelen; - - sizelen = strlen(sizebuf); - if (0 == strcmp(propname, "used")) { - if (sizelen > cb->cb_max_usedlen) - cb->cb_max_usedlen = sizelen; - } else { - if (sizelen > cb->cb_max_quotalen) - cb->cb_max_quotalen = sizelen; - } - - node->usn_nvl = props; - - n = uu_avl_find(avl, node, &sortinfo, &idx); - if (n == NULL) + /* + * Check if this type/name combination is in the list and update it; + * otherwise add new node to the list. + */ + if ((n = uu_avl_find(avl, node, &sortinfo, &idx)) == NULL) { uu_avl_insert(avl, node, idx); - else { + } else { nvlist_free(props); free(node); node = n; props = node->usn_nvl; } + /* Calculate/update width of USED/QUOTA fields */ + if (cb->cb_nicenum) + zfs_nicenum(space, sizebuf, sizeof (sizebuf)); + else + (void) snprintf(sizebuf, sizeof (sizebuf), "%llu", space); + sizelen = strlen(sizebuf); + if (prop == ZFS_PROP_USERUSED || prop == ZFS_PROP_GROUPUSED) { + propname = "used"; + if (!nvlist_exists(props, "quota")) + (void) nvlist_add_uint64(props, "quota", 0); + } else { + propname = "quota"; + if (!nvlist_exists(props, "used")) + (void) nvlist_add_uint64(props, "used", 0); + } + sizeidx = us_field_index(propname); + if (sizelen > cb->cb_width[sizeidx]) + cb->cb_width[sizeidx] = sizelen; + if (nvlist_add_uint64(props, propname, space) != 0) nomem(); return (0); } -static inline boolean_t -usprop_check(zfs_userquota_prop_t p, unsigned types, unsigned props) -{ - unsigned type; - unsigned prop; - - switch (p) { - case ZFS_PROP_USERUSED: - type = USTYPE_USR; - prop = USPROP_USED; - break; - case ZFS_PROP_USERQUOTA: - type = USTYPE_USR; - prop = USPROP_QUOTA; - break; - case ZFS_PROP_GROUPUSED: - type = USTYPE_GRP; - prop = USPROP_USED; - break; - case ZFS_PROP_GROUPQUOTA: - type = USTYPE_GRP; - prop = USPROP_QUOTA; - break; - default: /* ALL */ - return (B_TRUE); - }; - - return (type & types && prop & props); -} - -#define USFIELD_TYPE (1 << 0) -#define USFIELD_NAME (1 << 1) -#define USFIELD_USED (1 << 2) -#define USFIELD_QUOTA (1 << 3) -#define USFIELD_ALL (USFIELD_TYPE | USFIELD_NAME | USFIELD_USED | USFIELD_QUOTA) - -static int -parsefields(unsigned *fieldsp, char **names, unsigned *bits, size_t len) -{ - char *field = optarg; - char *delim; - - do { - int i; - boolean_t found = B_FALSE; - delim = strchr(field, ','); - if (delim != NULL) - *delim = '\0'; - - for (i = 0; i < len; i++) - if (0 == strcmp(field, names[i])) { - found = B_TRUE; - *fieldsp |= bits[i]; - break; - } - - if (!found) { - (void) fprintf(stderr, gettext("invalid type '%s'" - "for -t option\n"), field); - return (-1); - } - - field = delim + 1; - } while (delim); - - return (0); -} - - -static char *type_names[] = { "posixuser", "smbuser", "posixgroup", "smbgroup", - "all" }; -static unsigned type_bits[] = { - USTYPE_PSX_USR, - USTYPE_SMB_USR, - USTYPE_PSX_GRP, - USTYPE_SMB_GRP, - USTYPE_ALL -}; - -static char *us_field_names[] = { "type", "name", "used", "quota" }; -static unsigned us_field_bits[] = { - USFIELD_TYPE, - USFIELD_NAME, - USFIELD_USED, - USFIELD_QUOTA -}; - static void -print_us_node(boolean_t scripted, boolean_t parseable, unsigned fields, - size_t type_width, size_t name_width, size_t used_width, - size_t quota_width, us_node_t *node) +print_us_node(boolean_t scripted, boolean_t parsable, int *fields, int types, + size_t *width, us_node_t *node) { nvlist_t *nvl = node->usn_nvl; - nvpair_t *nvp = NULL; char valstr[ZFS_MAXNAMELEN]; boolean_t first = B_TRUE; - boolean_t quota_found = B_FALSE; - - if (fields & USFIELD_QUOTA && !nvlist_exists(nvl, "quota")) - if (nvlist_add_string(nvl, "quota", "none") != 0) - nomem(); + int cfield = 0; + int field; + uint32_t ustype; + + /* Check type */ + (void) nvlist_lookup_uint32(nvl, "type", &ustype); + if (!(ustype & types)) + return; - while ((nvp = nvlist_next_nvpair(nvl, nvp)) != NULL) { - char *pname = nvpair_name(nvp); - data_type_t type = nvpair_type(nvp); - uint32_t val32 = 0; - uint64_t val64 = 0; + while ((field = fields[cfield]) != USFIELD_LAST) { + nvpair_t *nvp = NULL; + data_type_t type; + uint32_t val32; + uint64_t val64; char *strval = NULL; - unsigned field = 0; - unsigned width = 0; - int i; - for (i = 0; i < 4; i++) { - if (0 == strcmp(pname, us_field_names[i])) { - field = us_field_bits[i]; + + while ((nvp = nvlist_next_nvpair(nvl, nvp)) != NULL) { + if (strcmp(nvpair_name(nvp), + us_field_names[field]) == 0) break; - } } - if (!(field & fields)) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211270548.qAR5mbwg090312>