Date: Tue, 20 Mar 2018 15:04:19 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r331243 - in user/markj/netdump: . bin/ps cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall cddl/contrib/opensolaris/lib/libdtrace/common contrib/blacklist/bin contrib/elftool... Message-ID: <201803201504.w2KF4JpM074200@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Tue Mar 20 15:04:19 2018 New Revision: 331243 URL: https://svnweb.freebsd.org/changeset/base/331243 Log: MFH at r331242. Added: user/markj/netdump/contrib/processor-trace/ - copied from r331242, head/contrib/processor-trace/ user/markj/netdump/lib/libcasper/services/cap_pwd/cap_pwd.3 - copied unchanged from r331242, head/lib/libcasper/services/cap_pwd/cap_pwd.3 user/markj/netdump/lib/libcasper/services/cap_sysctl/cap_sysctl.3 - copied unchanged from r331242, head/lib/libcasper/services/cap_sysctl/cap_sysctl.3 user/markj/netdump/sbin/nvmecontrol/format.c - copied unchanged from r331242, head/sbin/nvmecontrol/format.c user/markj/netdump/stand/efi/libefi/efienv.c - copied unchanged from r331242, head/stand/efi/libefi/efienv.c user/markj/netdump/sys/compat/linux/linux_errno.c - copied unchanged from r331242, head/sys/compat/linux/linux_errno.c user/markj/netdump/sys/contrib/zstd/doc/images/zstd_logo86.png - copied unchanged from r331242, head/sys/contrib/zstd/doc/images/zstd_logo86.png user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_compress_internal.h - copied unchanged from r331242, head/sys/contrib/zstd/lib/compress/zstd_compress_internal.h user/markj/netdump/sys/contrib/zstd/tests/seqgen.c - copied unchanged from r331242, head/sys/contrib/zstd/tests/seqgen.c user/markj/netdump/sys/contrib/zstd/tests/seqgen.h - copied unchanged from r331242, head/sys/contrib/zstd/tests/seqgen.h user/markj/netdump/sys/dev/cxgbe/tom/t4_tls.c - copied unchanged from r331242, head/sys/dev/cxgbe/tom/t4_tls.c user/markj/netdump/sys/dev/cxgbe/tom/t4_tls.h - copied unchanged from r331242, head/sys/dev/cxgbe/tom/t4_tls.h user/markj/netdump/sys/netinet/cc/cc_newreno.h - copied unchanged from r331242, head/sys/netinet/cc/cc_newreno.h user/markj/netdump/usr.sbin/cxgbetool/tcb_common.c - copied unchanged from r331242, head/usr.sbin/cxgbetool/tcb_common.c user/markj/netdump/usr.sbin/cxgbetool/tcb_common.h - copied unchanged from r331242, head/usr.sbin/cxgbetool/tcb_common.h user/markj/netdump/usr.sbin/cxgbetool/tcbinfot4.c - copied unchanged from r331242, head/usr.sbin/cxgbetool/tcbinfot4.c user/markj/netdump/usr.sbin/cxgbetool/tcbinfot5.c - copied unchanged from r331242, head/usr.sbin/cxgbetool/tcbinfot5.c user/markj/netdump/usr.sbin/cxgbetool/tcbinfot6.c - copied unchanged from r331242, head/usr.sbin/cxgbetool/tcbinfot6.c user/markj/netdump/usr.sbin/cxgbetool/tcbshowt4.c - copied unchanged from r331242, head/usr.sbin/cxgbetool/tcbshowt4.c user/markj/netdump/usr.sbin/cxgbetool/tcbshowt5.c - copied unchanged from r331242, head/usr.sbin/cxgbetool/tcbshowt5.c user/markj/netdump/usr.sbin/cxgbetool/tcbshowt6.c - copied unchanged from r331242, head/usr.sbin/cxgbetool/tcbshowt6.c user/markj/netdump/usr.sbin/mpsutil/mps_debug.c - copied unchanged from r331242, head/usr.sbin/mpsutil/mps_debug.c Deleted: user/markj/netdump/sys/arm/conf/BEAGLEBONE-MMCCAM user/markj/netdump/sys/arm/conf/IMX6-MMCCAM user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_compress.h user/markj/netdump/sys/crypto/chacha20/chacha20.c user/markj/netdump/sys/crypto/chacha20/chacha20.h user/markj/netdump/sys/i386/include/pcaudioio.h user/markj/netdump/sys/modules/chacha20/ user/markj/netdump/sys/sys/dataacq.h Modified: user/markj/netdump/Makefile.inc1 user/markj/netdump/ObsoleteFiles.inc user/markj/netdump/bin/ps/extern.h user/markj/netdump/bin/ps/keyword.c user/markj/netdump/bin/ps/print.c user/markj/netdump/bin/ps/ps.1 user/markj/netdump/bin/ps/ps.c user/markj/netdump/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c user/markj/netdump/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c user/markj/netdump/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c user/markj/netdump/cddl/contrib/opensolaris/lib/libdtrace/common/dt_xlator.c user/markj/netdump/contrib/blacklist/bin/conf.c user/markj/netdump/contrib/elftoolchain/nm/nm.c user/markj/netdump/contrib/llvm/lib/Analysis/InstructionSimplify.cpp user/markj/netdump/contrib/llvm/lib/IR/ConstantFold.cpp user/markj/netdump/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp user/markj/netdump/contrib/telnet/telnetd/telnetd.c user/markj/netdump/etc/mtree/BSD.root.dist user/markj/netdump/etc/mtree/BSD.tests.dist user/markj/netdump/etc/rc.d/fsck user/markj/netdump/etc/rc.d/hostname user/markj/netdump/gnu/usr.bin/gdb/kgdb/trgt_amd64.c user/markj/netdump/lib/libc/net/getnameinfo.3 user/markj/netdump/lib/libc/net/getnameinfo.c user/markj/netdump/lib/libc/sys/sendfile.2 user/markj/netdump/lib/libcasper/libcasper/libcasper.3 user/markj/netdump/lib/libcasper/services/cap_dns/cap_dns.3 user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.3 user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.c user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.h user/markj/netdump/lib/libcasper/services/cap_pwd/Makefile user/markj/netdump/lib/libcasper/services/cap_sysctl/Makefile user/markj/netdump/lib/libdpv/dialog_util.c user/markj/netdump/lib/libdpv/dpv.3 user/markj/netdump/lib/libdpv/util.c user/markj/netdump/lib/libfigpar/figpar.3 user/markj/netdump/lib/libipsec/pfkey.c user/markj/netdump/lib/libmd/sha512.3 user/markj/netdump/lib/libsysdecode/errno.c user/markj/netdump/lib/libsysdecode/mktables user/markj/netdump/lib/libzstd/Makefile user/markj/netdump/libexec/tftpd/tests/functional.c user/markj/netdump/libexec/tftpd/tftp-transfer.c user/markj/netdump/libexec/tftpd/tftpd.c user/markj/netdump/release/packages/kernel.ucl user/markj/netdump/sbin/ifconfig/ifieee80211.c user/markj/netdump/sbin/ipfw/ipfw.8 user/markj/netdump/sbin/nvmecontrol/Makefile user/markj/netdump/sbin/nvmecontrol/identify.c user/markj/netdump/sbin/nvmecontrol/logpage.c user/markj/netdump/sbin/nvmecontrol/nvmecontrol.8 user/markj/netdump/sbin/nvmecontrol/nvmecontrol.c user/markj/netdump/sbin/nvmecontrol/nvmecontrol.h user/markj/netdump/sbin/savecore/savecore.8 user/markj/netdump/sbin/sysctl/sysctl.8 user/markj/netdump/sbin/sysctl/sysctl.c user/markj/netdump/share/examples/Makefile user/markj/netdump/share/man/man4/atrtc.4 user/markj/netdump/share/man/man4/cc_newreno.4 user/markj/netdump/share/man/man4/mod_cc.4 user/markj/netdump/share/man/man5/rc.conf.5 user/markj/netdump/share/man/man7/development.7 user/markj/netdump/share/man/man9/cnv.9 user/markj/netdump/share/man/man9/owll.9 user/markj/netdump/share/man/man9/rwlock.9 user/markj/netdump/share/man/man9/zone.9 user/markj/netdump/share/misc/committers-ports.dot user/markj/netdump/share/misc/pci_vendors user/markj/netdump/share/termcap/termcap user/markj/netdump/stand/common/bootstrap.h user/markj/netdump/stand/common/disk.c user/markj/netdump/stand/common/disk.h user/markj/netdump/stand/common/interp_lua.c user/markj/netdump/stand/common/isapnp.c user/markj/netdump/stand/common/load_elf.c user/markj/netdump/stand/common/load_elf_obj.c user/markj/netdump/stand/common/metadata.c user/markj/netdump/stand/common/misc.c user/markj/netdump/stand/common/pnp.c user/markj/netdump/stand/defaults/loader.conf user/markj/netdump/stand/defaults/loader.conf.5 user/markj/netdump/stand/defs.mk user/markj/netdump/stand/efi/boot1/boot1.c user/markj/netdump/stand/efi/boot1/ufs_module.c user/markj/netdump/stand/efi/include/efi.h user/markj/netdump/stand/efi/include/efilib.h user/markj/netdump/stand/efi/libefi/Makefile user/markj/netdump/stand/efi/libefi/devicename.c user/markj/netdump/stand/efi/libefi/efipart.c user/markj/netdump/stand/efi/libefi/efizfs.c user/markj/netdump/stand/efi/libefi/env.c user/markj/netdump/stand/efi/loader/arch/arm/exec.c user/markj/netdump/stand/efi/loader/bootinfo.c user/markj/netdump/stand/efi/loader/main.c user/markj/netdump/stand/ficl/aarch64/sysdep.c user/markj/netdump/stand/ficl/amd64/sysdep.c user/markj/netdump/stand/ficl/arm/sysdep.c user/markj/netdump/stand/ficl/i386/sysdep.c user/markj/netdump/stand/ficl/mips/sysdep.c user/markj/netdump/stand/ficl/mips64/sysdep.c user/markj/netdump/stand/ficl/powerpc/sysdep.c user/markj/netdump/stand/ficl/riscv/sysdep.c user/markj/netdump/stand/ficl/sparc64/sysdep.c user/markj/netdump/stand/i386/btx/lib/btxv86.h user/markj/netdump/stand/i386/libi386/biosacpi.c user/markj/netdump/stand/i386/libi386/bioscd.c user/markj/netdump/stand/i386/libi386/biosdisk.c user/markj/netdump/stand/i386/libi386/biospnp.c user/markj/netdump/stand/i386/libi386/bootinfo32.c user/markj/netdump/stand/i386/libi386/bootinfo64.c user/markj/netdump/stand/i386/libi386/devicename.c user/markj/netdump/stand/i386/libi386/elf64_freebsd.c user/markj/netdump/stand/i386/libi386/libi386.h user/markj/netdump/stand/i386/libi386/multiboot.c user/markj/netdump/stand/i386/libi386/pxe.c user/markj/netdump/stand/i386/loader/chain.c user/markj/netdump/stand/i386/loader/main.c user/markj/netdump/stand/libsa/arp.c user/markj/netdump/stand/libsa/bootp.c user/markj/netdump/stand/libsa/bootparam.c user/markj/netdump/stand/libsa/dosfs.h user/markj/netdump/stand/libsa/ext2fs.c user/markj/netdump/stand/libsa/net.h user/markj/netdump/stand/libsa/rpc.c user/markj/netdump/stand/libsa/stand.h user/markj/netdump/stand/lua/color.lua user/markj/netdump/stand/lua/config.lua user/markj/netdump/stand/lua/loader.lua user/markj/netdump/stand/mips/beri/boot2/boot2.c user/markj/netdump/stand/mips/beri/common/altera_jtag_uart.c user/markj/netdump/stand/mips/beri/common/cons.h user/markj/netdump/stand/mips/beri/loader/beri_console.c user/markj/netdump/stand/mips/beri/loader/beri_disk_cfi.c user/markj/netdump/stand/mips/beri/loader/beri_disk_sdcard.c user/markj/netdump/stand/mips/beri/loader/devicename.c user/markj/netdump/stand/ofw/libofw/devicename.c user/markj/netdump/stand/ofw/libofw/libofw.h user/markj/netdump/stand/ofw/libofw/openfirm.c user/markj/netdump/stand/powerpc/boot1.chrp/boot1.c user/markj/netdump/stand/powerpc/kboot/ppc64_elf_freebsd.c user/markj/netdump/stand/powerpc/ofw/elf_freebsd.c user/markj/netdump/stand/powerpc/ofw/main.c user/markj/netdump/stand/powerpc/ofw/ppc64_elf_freebsd.c user/markj/netdump/stand/sparc64/boot1/boot1.c user/markj/netdump/stand/sparc64/loader/main.c user/markj/netdump/stand/uboot/common/main.c user/markj/netdump/stand/uboot/lib/devicename.c user/markj/netdump/stand/uboot/lib/disk.c user/markj/netdump/stand/uboot/lib/elf_freebsd.c user/markj/netdump/stand/uboot/lib/libuboot.h user/markj/netdump/stand/userboot/userboot/bootinfo32.c user/markj/netdump/stand/userboot/userboot/bootinfo64.c user/markj/netdump/stand/userboot/userboot/devicename.c user/markj/netdump/stand/userboot/userboot/elf64_freebsd.c user/markj/netdump/stand/userboot/userboot/main.c user/markj/netdump/stand/userboot/userboot/userboot_disk.c user/markj/netdump/stand/zfs/libzfs.h user/markj/netdump/stand/zfs/zfs.c user/markj/netdump/sys/amd64/amd64/efirt_machdep.c (contents, props changed) user/markj/netdump/sys/amd64/linux/linux_sysvec.c user/markj/netdump/sys/amd64/linux32/linux.h user/markj/netdump/sys/amd64/linux32/linux32_sysvec.c user/markj/netdump/sys/arm/allwinner/clkng/ccu_sun8i_r.c user/markj/netdump/sys/arm/amlogic/aml8726/aml8726_clkmsr.c user/markj/netdump/sys/arm/amlogic/aml8726/aml8726_mp.c user/markj/netdump/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c user/markj/netdump/sys/arm/annapurna/alpine/alpine_machdep.c user/markj/netdump/sys/arm/arm/pmap-v4.c user/markj/netdump/sys/arm/broadcom/bcm2835/bcm2835_fb.c user/markj/netdump/sys/arm/broadcom/bcm2835/bcm2835_fbd.c user/markj/netdump/sys/arm/broadcom/bcm2835/bcm2835_machdep.c user/markj/netdump/sys/arm/broadcom/bcm2835/bcm2835_rng.c user/markj/netdump/sys/arm/freescale/fsl_ocotp.c user/markj/netdump/sys/arm/freescale/vybrid/vf_machdep.c user/markj/netdump/sys/arm/mv/mv_common.c user/markj/netdump/sys/arm/samsung/exynos/chrome_ec.c user/markj/netdump/sys/arm/samsung/exynos/exynos5_ehci.c user/markj/netdump/sys/arm/ti/am335x/am335x_lcd.c user/markj/netdump/sys/arm/ti/am335x/am335x_lcd_syscons.c user/markj/netdump/sys/arm64/arm64/efirt_machdep.c user/markj/netdump/sys/cam/ata/ata_da.c user/markj/netdump/sys/cam/cam_iosched.c user/markj/netdump/sys/cam/cam_periph.c user/markj/netdump/sys/cam/cam_periph.h user/markj/netdump/sys/cam/ctl/ctl_frontend_iscsi.c user/markj/netdump/sys/cam/ctl/ctl_frontend_iscsi.h user/markj/netdump/sys/cam/nvme/nvme_da.c user/markj/netdump/sys/cam/scsi/scsi_ch.c user/markj/netdump/sys/cam/scsi/scsi_da.c user/markj/netdump/sys/cam/scsi/scsi_enc.c user/markj/netdump/sys/cam/scsi/scsi_pass.c user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/markj/netdump/sys/compat/linux/linux_emul.h user/markj/netdump/sys/compat/linux/linux_ioctl.c user/markj/netdump/sys/compat/linux/linux_signal.c user/markj/netdump/sys/compat/linux/linux_stats.c user/markj/netdump/sys/compat/linux/linux_util.c user/markj/netdump/sys/compat/linuxkpi/common/include/linux/kernel.h user/markj/netdump/sys/conf/NOTES user/markj/netdump/sys/conf/config.mk user/markj/netdump/sys/conf/files user/markj/netdump/sys/conf/files.amd64 user/markj/netdump/sys/conf/files.i386 user/markj/netdump/sys/conf/files.powerpc user/markj/netdump/sys/conf/kern.mk user/markj/netdump/sys/conf/kern.opts.mk user/markj/netdump/sys/conf/kern.post.mk user/markj/netdump/sys/conf/kern.pre.mk user/markj/netdump/sys/conf/options user/markj/netdump/sys/contrib/dev/acpica/changes.txt user/markj/netdump/sys/contrib/dev/acpica/components/debugger/dbdisply.c user/markj/netdump/sys/contrib/dev/acpica/components/dispatcher/dspkginit.c user/markj/netdump/sys/contrib/dev/acpica/components/events/evevent.c user/markj/netdump/sys/contrib/dev/acpica/components/events/evgpe.c user/markj/netdump/sys/contrib/dev/acpica/components/events/evgpeblk.c user/markj/netdump/sys/contrib/dev/acpica/components/events/evrgnini.c user/markj/netdump/sys/contrib/dev/acpica/components/events/evxface.c user/markj/netdump/sys/contrib/dev/acpica/components/events/evxfgpe.c user/markj/netdump/sys/contrib/dev/acpica/components/executer/exdebug.c user/markj/netdump/sys/contrib/dev/acpica/components/hardware/hwgpe.c user/markj/netdump/sys/contrib/dev/acpica/components/hardware/hwsleep.c user/markj/netdump/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c user/markj/netdump/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c user/markj/netdump/sys/contrib/dev/acpica/components/namespace/nseval.c user/markj/netdump/sys/contrib/dev/acpica/components/namespace/nsload.c user/markj/netdump/sys/contrib/dev/acpica/components/namespace/nsparse.c user/markj/netdump/sys/contrib/dev/acpica/components/namespace/nsxfname.c user/markj/netdump/sys/contrib/dev/acpica/components/parser/psargs.c user/markj/netdump/sys/contrib/dev/acpica/components/parser/psloop.c user/markj/netdump/sys/contrib/dev/acpica/components/parser/psobject.c user/markj/netdump/sys/contrib/dev/acpica/components/tables/tbdata.c user/markj/netdump/sys/contrib/dev/acpica/components/tables/tbinstal.c user/markj/netdump/sys/contrib/dev/acpica/components/tables/tbxfload.c user/markj/netdump/sys/contrib/dev/acpica/components/utilities/utosi.c user/markj/netdump/sys/contrib/dev/acpica/components/utilities/utxfinit.c user/markj/netdump/sys/contrib/dev/acpica/include/acevents.h user/markj/netdump/sys/contrib/dev/acpica/include/acmacros.h user/markj/netdump/sys/contrib/dev/acpica/include/acpixf.h user/markj/netdump/sys/contrib/dev/acpica/include/actypes.h user/markj/netdump/sys/contrib/zstd/Makefile user/markj/netdump/sys/contrib/zstd/NEWS user/markj/netdump/sys/contrib/zstd/README.md user/markj/netdump/sys/contrib/zstd/circle.yml user/markj/netdump/sys/contrib/zstd/contrib/meson/meson.build user/markj/netdump/sys/contrib/zstd/doc/zstd_compression_format.md user/markj/netdump/sys/contrib/zstd/doc/zstd_manual.html user/markj/netdump/sys/contrib/zstd/lib/BUCK user/markj/netdump/sys/contrib/zstd/lib/common/bitstream.h user/markj/netdump/sys/contrib/zstd/lib/common/mem.h user/markj/netdump/sys/contrib/zstd/lib/common/pool.c user/markj/netdump/sys/contrib/zstd/lib/common/xxhash.c user/markj/netdump/sys/contrib/zstd/lib/common/zstd_common.c user/markj/netdump/sys/contrib/zstd/lib/common/zstd_internal.h user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_compress.c user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_double_fast.c user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_double_fast.h user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_fast.c user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_fast.h user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_lazy.c user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_lazy.h user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_ldm.h user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_opt.c user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_opt.h user/markj/netdump/sys/contrib/zstd/lib/compress/zstdmt_compress.c user/markj/netdump/sys/contrib/zstd/lib/compress/zstdmt_compress.h user/markj/netdump/sys/contrib/zstd/lib/decompress/zstd_decompress.c user/markj/netdump/sys/contrib/zstd/lib/deprecated/zbuff_compress.c user/markj/netdump/sys/contrib/zstd/lib/dictBuilder/zdict.c user/markj/netdump/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.c user/markj/netdump/sys/contrib/zstd/lib/legacy/zstd_v01.c user/markj/netdump/sys/contrib/zstd/lib/legacy/zstd_v02.c user/markj/netdump/sys/contrib/zstd/lib/legacy/zstd_v03.c user/markj/netdump/sys/contrib/zstd/lib/legacy/zstd_v04.c user/markj/netdump/sys/contrib/zstd/lib/legacy/zstd_v05.c user/markj/netdump/sys/contrib/zstd/lib/legacy/zstd_v06.c user/markj/netdump/sys/contrib/zstd/lib/legacy/zstd_v07.c user/markj/netdump/sys/contrib/zstd/lib/zstd.h user/markj/netdump/sys/contrib/zstd/programs/BUCK user/markj/netdump/sys/contrib/zstd/programs/Makefile user/markj/netdump/sys/contrib/zstd/programs/bench.c user/markj/netdump/sys/contrib/zstd/programs/bench.h user/markj/netdump/sys/contrib/zstd/programs/dibio.c user/markj/netdump/sys/contrib/zstd/programs/fileio.c user/markj/netdump/sys/contrib/zstd/programs/fileio.h user/markj/netdump/sys/contrib/zstd/programs/platform.h user/markj/netdump/sys/contrib/zstd/programs/util.h user/markj/netdump/sys/contrib/zstd/programs/zstd.1 user/markj/netdump/sys/contrib/zstd/programs/zstd.1.md user/markj/netdump/sys/contrib/zstd/programs/zstdcli.c user/markj/netdump/sys/contrib/zstd/tests/Makefile user/markj/netdump/sys/contrib/zstd/tests/decodecorpus.c user/markj/netdump/sys/contrib/zstd/tests/fullbench.c user/markj/netdump/sys/contrib/zstd/tests/fuzzer.c user/markj/netdump/sys/contrib/zstd/tests/paramgrill.c user/markj/netdump/sys/contrib/zstd/tests/playTests.sh user/markj/netdump/sys/contrib/zstd/tests/zbufftest.c user/markj/netdump/sys/contrib/zstd/tests/zstreamtest.c user/markj/netdump/sys/contrib/zstd/zlibWrapper/BUCK user/markj/netdump/sys/contrib/zstd/zlibWrapper/examples/zwrapbench.c user/markj/netdump/sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c user/markj/netdump/sys/crypto/aesni/aesni.c user/markj/netdump/sys/dev/aac/aac.c user/markj/netdump/sys/dev/aacraid/aacraid.c user/markj/netdump/sys/dev/acpica/acpi.c user/markj/netdump/sys/dev/acpica/acpivar.h user/markj/netdump/sys/dev/cxgbe/adapter.h user/markj/netdump/sys/dev/cxgbe/firmware/t6fw_cfg.txt user/markj/netdump/sys/dev/cxgbe/offload.h user/markj/netdump/sys/dev/cxgbe/t4_main.c user/markj/netdump/sys/dev/cxgbe/tom/t4_connect.c user/markj/netdump/sys/dev/cxgbe/tom/t4_cpl_io.c user/markj/netdump/sys/dev/cxgbe/tom/t4_ddp.c user/markj/netdump/sys/dev/cxgbe/tom/t4_listen.c user/markj/netdump/sys/dev/cxgbe/tom/t4_tom.c user/markj/netdump/sys/dev/cxgbe/tom/t4_tom.h user/markj/netdump/sys/dev/e1000/e1000_82575.c user/markj/netdump/sys/dev/e1000/e1000_mbx.c user/markj/netdump/sys/dev/e1000/e1000_phy.c user/markj/netdump/sys/dev/e1000/e1000_vf.c user/markj/netdump/sys/dev/efidev/efirt.c (contents, props changed) user/markj/netdump/sys/dev/efidev/efirtc.c user/markj/netdump/sys/dev/extres/regulator/regulator.c user/markj/netdump/sys/dev/extres/regulator/regulator.h user/markj/netdump/sys/dev/fdt/fdt_common.c user/markj/netdump/sys/dev/flash/mx25l.c user/markj/netdump/sys/dev/iscsi/iscsi.c user/markj/netdump/sys/dev/isp/isp.c user/markj/netdump/sys/dev/isp/isp_freebsd.c user/markj/netdump/sys/dev/ixgbe/if_ix.c user/markj/netdump/sys/dev/ixgbe/if_ixv.c user/markj/netdump/sys/dev/ixgbe/ixgbe_82598.c user/markj/netdump/sys/dev/ixgbe/ixgbe_82599.c user/markj/netdump/sys/dev/ixgbe/ixgbe_api.c user/markj/netdump/sys/dev/ixgbe/ixgbe_common.c user/markj/netdump/sys/dev/ixgbe/ixgbe_common.h user/markj/netdump/sys/dev/ixgbe/ixgbe_dcb.c user/markj/netdump/sys/dev/ixgbe/ixgbe_dcb_82598.c user/markj/netdump/sys/dev/ixgbe/ixgbe_dcb_82599.c user/markj/netdump/sys/dev/ixgbe/ixgbe_phy.c user/markj/netdump/sys/dev/ixgbe/ixgbe_type.h user/markj/netdump/sys/dev/ixgbe/ixgbe_vf.c user/markj/netdump/sys/dev/ixgbe/ixgbe_x540.c user/markj/netdump/sys/dev/ixgbe/ixgbe_x550.c user/markj/netdump/sys/dev/md/md.c user/markj/netdump/sys/dev/mlx5/driver.h user/markj/netdump/sys/dev/mpr/mpi/mpi2.h user/markj/netdump/sys/dev/mpr/mpi/mpi2_cnfg.h user/markj/netdump/sys/dev/mpr/mpi/mpi2_history.txt user/markj/netdump/sys/dev/mpr/mpi/mpi2_ioc.h user/markj/netdump/sys/dev/mpr/mpr.c user/markj/netdump/sys/dev/mpr/mpr_ioctl.h user/markj/netdump/sys/dev/mpr/mpr_sas.c user/markj/netdump/sys/dev/mpr/mpr_sas_lsi.c user/markj/netdump/sys/dev/mpr/mpr_user.c user/markj/netdump/sys/dev/mpr/mprvar.h user/markj/netdump/sys/dev/mps/mps.c user/markj/netdump/sys/dev/mps/mps_sas_lsi.c user/markj/netdump/sys/dev/mps/mpsvar.h user/markj/netdump/sys/dev/nvme/nvme.h user/markj/netdump/sys/dev/nvme/nvme_ctrlr.c user/markj/netdump/sys/dev/nvme/nvme_ns.c user/markj/netdump/sys/dev/nvme/nvme_private.h user/markj/netdump/sys/dev/nvme/nvme_qpair.c user/markj/netdump/sys/dev/ofw/ofw_subr.c user/markj/netdump/sys/dev/ofw/openfirmio.c user/markj/netdump/sys/dev/otus/if_otus.c user/markj/netdump/sys/dev/ow/owc_gpiobus.c user/markj/netdump/sys/dev/random/randomdev.c user/markj/netdump/sys/dev/rtwn/if_rtwn_ridx.h user/markj/netdump/sys/dev/rtwn/rtl8188e/r88e_chan.c user/markj/netdump/sys/dev/rtwn/rtl8188e/r88e_rx.c user/markj/netdump/sys/dev/rtwn/rtl8192c/r92c_chan.c user/markj/netdump/sys/dev/rtwn/rtl8192c/r92c_rx.c user/markj/netdump/sys/dev/rtwn/rtl8812a/r12a_rx.c user/markj/netdump/sys/dev/usb/wlan/if_rum.c user/markj/netdump/sys/dev/usb/wlan/if_run.c user/markj/netdump/sys/dev/usb/wlan/if_uath.c user/markj/netdump/sys/dev/usb/wlan/if_upgt.c user/markj/netdump/sys/dev/usb/wlan/if_ural.c user/markj/netdump/sys/dev/usb/wlan/if_urtw.c user/markj/netdump/sys/dev/usb/wlan/if_zyd.c user/markj/netdump/sys/dev/vnic/thunder_bgx_fdt.c user/markj/netdump/sys/dev/vt/hw/vga/vt_vga.c user/markj/netdump/sys/dts/Makefile user/markj/netdump/sys/dts/arm/rpi.dts user/markj/netdump/sys/dts/arm/rpi2.dts user/markj/netdump/sys/geom/geom.h user/markj/netdump/sys/geom/geom_subr.c user/markj/netdump/sys/geom/label/g_label.c user/markj/netdump/sys/i386/i386/vm86.c user/markj/netdump/sys/i386/linux/imgact_linux.c user/markj/netdump/sys/i386/linux/linux.h user/markj/netdump/sys/i386/linux/linux_machdep.c user/markj/netdump/sys/i386/linux/linux_sysvec.c user/markj/netdump/sys/isa/rtc.h user/markj/netdump/sys/kern/imgact_aout.c user/markj/netdump/sys/kern/imgact_binmisc.c user/markj/netdump/sys/kern/imgact_elf.c user/markj/netdump/sys/kern/imgact_gzip.c user/markj/netdump/sys/kern/imgact_shell.c user/markj/netdump/sys/kern/kern_mutex.c user/markj/netdump/sys/kern/kern_rwlock.c user/markj/netdump/sys/kern/kern_sendfile.c user/markj/netdump/sys/kern/kern_sx.c user/markj/netdump/sys/kern/subr_eventhandler.c user/markj/netdump/sys/kern/subr_gtaskqueue.c user/markj/netdump/sys/kern/subr_uio.c user/markj/netdump/sys/kern/tty_compat.c user/markj/netdump/sys/kern/vfs_bio.c user/markj/netdump/sys/kern/vfs_mountroot.c user/markj/netdump/sys/mips/include/param.h user/markj/netdump/sys/mips/mips/support.S user/markj/netdump/sys/modules/Makefile user/markj/netdump/sys/modules/aac/Makefile user/markj/netdump/sys/modules/aacraid/Makefile user/markj/netdump/sys/modules/cam/Makefile user/markj/netdump/sys/modules/cxgbe/tom/Makefile user/markj/netdump/sys/modules/hyperv/vmbus/Makefile user/markj/netdump/sys/modules/imx/imx_spi/Makefile user/markj/netdump/sys/modules/iser/Makefile user/markj/netdump/sys/modules/isp/Makefile user/markj/netdump/sys/modules/linux/Makefile user/markj/netdump/sys/modules/linux_common/Makefile user/markj/netdump/sys/modules/netgraph/checksum/Makefile user/markj/netdump/sys/modules/netmap/Makefile user/markj/netdump/sys/modules/sgx/Makefile user/markj/netdump/sys/modules/usb/rum/Makefile user/markj/netdump/sys/modules/usb/run/Makefile user/markj/netdump/sys/modules/usb/uath/Makefile user/markj/netdump/sys/modules/usb/upgt/Makefile user/markj/netdump/sys/modules/usb/ural/Makefile user/markj/netdump/sys/modules/usb/urtw/Makefile user/markj/netdump/sys/modules/usb/zyd/Makefile user/markj/netdump/sys/net/if_ethersubr.c user/markj/netdump/sys/net/if_llatbl.h user/markj/netdump/sys/net/if_media.h user/markj/netdump/sys/netinet/cc/cc.c user/markj/netdump/sys/netinet/cc/cc.h user/markj/netdump/sys/netinet/cc/cc_newreno.c user/markj/netdump/sys/netinet/if_ether.c user/markj/netdump/sys/netinet/in.c user/markj/netdump/sys/netinet/tcp_syncache.c user/markj/netdump/sys/netinet6/in6.c user/markj/netdump/sys/netipsec/keysock.c user/markj/netdump/sys/netipsec/keysock.h user/markj/netdump/sys/netpfil/ipfw/ip_fw2.c user/markj/netdump/sys/netpfil/pf/pf_table.c user/markj/netdump/sys/ofed/drivers/infiniband/core/ib_fmr_pool.c user/markj/netdump/sys/powerpc/aim/aim_machdep.c user/markj/netdump/sys/powerpc/aim/locore64.S user/markj/netdump/sys/powerpc/aim/mmu_oea64.c user/markj/netdump/sys/powerpc/booke/pmap.c user/markj/netdump/sys/powerpc/cpufreq/mpc85xx_jog.c user/markj/netdump/sys/powerpc/ofw/ofw_machdep.c user/markj/netdump/sys/powerpc/ofw/ofwcall64.S user/markj/netdump/sys/powerpc/powerpc/machdep.c user/markj/netdump/sys/powerpc/pseries/platform_chrp.c user/markj/netdump/sys/security/audit/audit_bsm_klib.c user/markj/netdump/sys/sys/aac_ioctl.h user/markj/netdump/sys/sys/imgact_elf.h user/markj/netdump/sys/sys/ioccom.h user/markj/netdump/sys/sys/mdioctl.h user/markj/netdump/sys/vm/vm_fault.c user/markj/netdump/sys/vm/vm_page.c user/markj/netdump/sys/vm/vm_pageout.c user/markj/netdump/sys/vm/vm_pageout.h user/markj/netdump/sys/vm/vm_pagequeue.h user/markj/netdump/sys/vm/vm_reserv.c user/markj/netdump/sys/x86/include/ucontext.h user/markj/netdump/sys/x86/isa/atrtc.c user/markj/netdump/sys/x86/isa/clock.c user/markj/netdump/sys/x86/isa/isa_dma.c user/markj/netdump/sys/x86/x86/autoconf.c user/markj/netdump/sys/x86/x86/identcpu.c user/markj/netdump/tests/sys/aio/aio_kqueue_test.c user/markj/netdump/tests/sys/aio/aio_test.c user/markj/netdump/tests/sys/cddl/zfs/include/libtest.kshlib user/markj/netdump/tests/sys/cddl/zfs/tests/cache/cache.kshlib user/markj/netdump/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh user/markj/netdump/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_005_neg.ksh user/markj/netdump/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib user/markj/netdump/tests/sys/cddl/zfs/tests/cli_root/zpool_export/setup.ksh user/markj/netdump/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export.cfg user/markj/netdump/tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh user/markj/netdump/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg user/markj/netdump/tests/sys/cddl/zfs/tests/cli_root/zpool_history/setup.ksh user/markj/netdump/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history.cfg user/markj/netdump/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh user/markj/netdump/tests/sys/cddl/zfs/tests/hotplug/setup.ksh user/markj/netdump/tests/sys/cddl/zfs/tests/slog/slog.kshlib user/markj/netdump/usr.bin/calendar/calendars/calendar.freebsd user/markj/netdump/usr.bin/dpv/dpv.1 user/markj/netdump/usr.bin/iscsictl/iscsictl.c user/markj/netdump/usr.bin/tftp/tftp.c user/markj/netdump/usr.sbin/bhyvectl/bhyvectl.c user/markj/netdump/usr.sbin/bsdconfig/bsdconfig.8 user/markj/netdump/usr.sbin/cxgbetool/Makefile user/markj/netdump/usr.sbin/cxgbetool/cxgbetool.c user/markj/netdump/usr.sbin/efibootmgr/efibootmgr.c user/markj/netdump/usr.sbin/lpr/common_source/ctlinfo.c user/markj/netdump/usr.sbin/mpsutil/Makefile user/markj/netdump/usr.sbin/mpsutil/mps_show.c user/markj/netdump/usr.sbin/mpsutil/mpsutil.c user/markj/netdump/usr.sbin/mpsutil/mpsutil.h user/markj/netdump/usr.sbin/rpcbind/rpcbind.c user/markj/netdump/usr.sbin/usbconfig/usbconfig.8 user/markj/netdump/usr.sbin/usbconfig/usbconfig.c Directory Properties: user/markj/netdump/ (props changed) user/markj/netdump/cddl/ (props changed) user/markj/netdump/cddl/contrib/opensolaris/ (props changed) user/markj/netdump/contrib/blacklist/ (props changed) user/markj/netdump/contrib/elftoolchain/ (props changed) user/markj/netdump/contrib/llvm/ (props changed) user/markj/netdump/contrib/llvm/tools/clang/ (props changed) user/markj/netdump/gnu/usr.bin/gdb/ (props changed) user/markj/netdump/sys/cddl/contrib/opensolaris/ (props changed) user/markj/netdump/sys/contrib/dev/acpica/ (props changed) user/markj/netdump/sys/contrib/zstd/ (props changed) user/markj/netdump/usr.sbin/cxgbetool/reg_defs_t5.c (props changed) user/markj/netdump/usr.sbin/cxgbetool/reg_defs_t6.c (props changed) Modified: user/markj/netdump/Makefile.inc1 ============================================================================== --- user/markj/netdump/Makefile.inc1 Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/Makefile.inc1 Tue Mar 20 15:04:19 2018 (r331243) @@ -1698,6 +1698,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_defaul pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \ sed -e "s/%VERSION%/${PKG_VERSION}/" \ -e "s/%PKGNAME%/kernel-${INSTALLKERNEL:tl}${flavor}/" \ + -e "s/%KERNELDIR%/kernel/" \ -e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \ -e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \ -e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \ @@ -1733,6 +1734,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_ pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \ sed -e "s/%VERSION%/${PKG_VERSION}/" \ -e "s/%PKGNAME%/kernel-${_kernel:tl}${flavor}/" \ + -e "s/%KERNELDIR%/kernel.${_kernel}/" \ -e "s/%COMMENT%/FreeBSD ${_kernel} kernel ${flavor}/" \ -e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \ -e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \ Modified: user/markj/netdump/ObsoleteFiles.inc ============================================================================== --- user/markj/netdump/ObsoleteFiles.inc Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/ObsoleteFiles.inc Tue Mar 20 15:04:19 2018 (r331243) @@ -38,6 +38,14 @@ # xargs -n1 | sort | uniq -d; # done +# 20180319: remove /boot/overlays, replaced by /boot/dtb/overlays +OLD_DIRS+=boot/overlays +# 20180311: remove sys/sys/i386/include/pcaudioio.h +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/machine/pcaudioio.h +.endif +# 20180310: remove sys/sys/dataacq.h +OLD_FILES+=usr/include/sys/dataacq.h # 20180306: remove DTrace scripts made obsolete by dwatch(1) OLD_FILES+=usr/share/dtrace/watch_execve OLD_FILES+=usr/share/dtrace/watch_kill Modified: user/markj/netdump/bin/ps/extern.h ============================================================================== --- user/markj/netdump/bin/ps/extern.h Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/bin/ps/extern.h Tue Mar 20 15:04:19 2018 (r331243) @@ -55,6 +55,7 @@ char *emulname(KINFO *, VARENT *); VARENT *find_varentry(VAR *); const char *fmt_argv(char **, char *, char *, size_t); double getpcpu(const KINFO *); +char *jailname(KINFO *, VARENT *); char *kvar(KINFO *, VARENT *); char *label(KINFO *, VARENT *); char *loginclass(KINFO *, VARENT *); Modified: user/markj/netdump/bin/ps/keyword.c ============================================================================== --- user/markj/netdump/bin/ps/keyword.c Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/bin/ps/keyword.c Tue Mar 20 15:04:19 2018 (r331243) @@ -108,6 +108,7 @@ static VAR var[] = { {"inblk", "INBLK", NULL, "read-blocks", USER, rvar, ROFF(ru_inblock), LONG, "ld", 0}, {"inblock", "", "inblk", NULL, 0, NULL, 0, CHAR, NULL, 0}, + {"jail", "JAIL", NULL, "jail-name", LJUST, jailname, 0, CHAR, NULL, 0}, {"jid", "JID", NULL, "jail-id", 0, kvar, KOFF(ki_jid), INT, "d", 0}, {"jobc", "JOBC", NULL, "job-control-count", 0, kvar, KOFF(ki_jobc), SHORT, "d", 0}, Modified: user/markj/netdump/bin/ps/print.c ============================================================================== --- user/markj/netdump/bin/ps/print.c Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/bin/ps/print.c Tue Mar 20 15:04:19 2018 (r331243) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include <err.h> #include <grp.h> +#include <jail.h> #include <langinfo.h> #include <locale.h> #include <math.h> @@ -839,4 +840,17 @@ loginclass(KINFO *k, VARENT *ve __unused) return (strdup("-")); } return (strdup(k->ki_p->ki_loginclass)); +} + +char * +jailname(KINFO *k, VARENT *ve __unused) +{ + char *name; + + if (k->ki_p->ki_jid == 0) + return (strdup("-")); + name = jail_getname(k->ki_p->ki_jid); + if (name == NULL) + return (strdup("-")); + return (name); } Modified: user/markj/netdump/bin/ps/ps.1 ============================================================================== --- user/markj/netdump/bin/ps/ps.1 Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/bin/ps/ps.1 Tue Mar 20 15:04:19 2018 (r331243) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd January 23, 2018 +.Dd March 13, 2018 .Dt PS 1 .Os .Sh NAME @@ -101,6 +101,14 @@ The default output format includes, for each process, controlling terminal, state, CPU time (including both user and system time) and associated command. .Pp +If the +.Nm +process is associated with a terminal, the default output width is that of the +terminal; otherwise the output width is unlimited. +See also the +.Fl w +option. +.Pp The options are as follows: .Bl -tag -width indent .It Fl -libxo @@ -257,13 +265,15 @@ option implies the .Fl m option. .It Fl w -Use 132 columns to display information, instead of the default which -is your window size. +Use at least 132 columns to display information, instead of the default which +is the window size if +.Nm +is associated with a terminal. If the .Fl w option is specified more than once, .Nm -will use as many columns as necessary without regard for your window size. +will use as many columns as necessary without regard for the window size. Note that this option has no effect if the .Dq command column is not the last column displayed. @@ -566,6 +576,8 @@ group name (from egid) (alias .It Cm inblk total blocks read (alias .Cm inblock ) +.It Cm jail +jail name .It Cm jid jail ID .It Cm jobc Modified: user/markj/netdump/bin/ps/ps.c ============================================================================== --- user/markj/netdump/bin/ps/ps.c Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/bin/ps/ps.c Tue Mar 20 15:04:19 2018 (r331243) @@ -202,6 +202,11 @@ main(int argc, char *argv[]) * any of stdout, stderr, or stdin is a terminal. The intent * is that "ps", "ps | more", and "ps | grep" all use the same * default line length unless -w is specified. + * + * If not interactive, the default length was traditionally 79. + * It has been changed to unlimited. This is mostly for the + * benefit of non-interactive scripts, which arguably should + * use -ww, but is compatible with Linux. */ if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0') termwidth = atoi(cols); @@ -209,7 +214,7 @@ main(int argc, char *argv[]) ioctl(STDERR_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && ioctl(STDIN_FILENO, TIOCGWINSZ, (char *)&ws) == -1) || ws.ws_col == 0) - termwidth = 79; + termwidth = UNLIMITED; else termwidth = ws.ws_col - 1; Modified: user/markj/netdump/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c ============================================================================== --- user/markj/netdump/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c Tue Mar 20 15:04:19 2018 (r331243) @@ -35,7 +35,7 @@ int main(int argc, char **argv) { for (;;) { - (void) syscall(SYS_mmap, NULL, 1, 2, 3, -1, 0x12345678); + (void) __syscall(SYS_mmap, NULL, 1, 2, 3, -1, 0x12345678); } return (0); Modified: user/markj/netdump/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- user/markj/netdump/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Tue Mar 20 15:04:19 2018 (r331243) @@ -22,6 +22,7 @@ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2017-2018 Mark Johnston <markj@FreeBSD.org> */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -265,7 +266,7 @@ prepare_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, sym->st_value = 0; sym->st_size = 0; sym->st_info = ELF32_ST_INFO(STB_GLOBAL, STT_FUNC); - sym->st_other = 0; + sym->st_other = ELF32_ST_VISIBILITY(STV_HIDDEN); sym->st_shndx = SHN_UNDEF; rel++; @@ -449,7 +450,7 @@ prepare_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, sym->st_value = 0; sym->st_size = 0; sym->st_info = GELF_ST_INFO(STB_GLOBAL, STT_FUNC); - sym->st_other = 0; + sym->st_other = ELF64_ST_VISIBILITY(STV_HIDDEN); sym->st_shndx = SHN_UNDEF; rel++; Modified: user/markj/netdump/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c ============================================================================== --- user/markj/netdump/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c Tue Mar 20 15:04:19 2018 (r331243) @@ -3069,9 +3069,10 @@ dt_cook_op1(dt_node_t *dnp, uint_t idflags) "cannot take address of bit-field\n"); } - dtt.dtt_object = NULL; - dtt.dtt_ctfp = cp->dn_ctfp; - dtt.dtt_type = cp->dn_type; + dtt = (dtrace_typeinfo_t){ + .dtt_ctfp = cp->dn_ctfp, + .dtt_type = cp->dn_type, + }; if (dt_type_pointer(&dtt) == -1) { xyerror(D_TYPE_ERR, "cannot find type for \"&\": %s*\n", Modified: user/markj/netdump/cddl/contrib/opensolaris/lib/libdtrace/common/dt_xlator.c ============================================================================== --- user/markj/netdump/cddl/contrib/opensolaris/lib/libdtrace/common/dt_xlator.c Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/cddl/contrib/opensolaris/lib/libdtrace/common/dt_xlator.c Tue Mar 20 15:04:19 2018 (r331243) @@ -343,9 +343,11 @@ out: src_dtt.dtt_ctfp = src_ctfp; src_dtt.dtt_type = src_type; - dst_dtt.dtt_object = dt_module_lookup_by_ctf(dtp, dst_ctfp)->dm_name; - dst_dtt.dtt_ctfp = dst_ctfp; - dst_dtt.dtt_type = dst_type; + dst_dtt = (dtrace_typeinfo_t){ + .dtt_object = dt_module_lookup_by_ctf(dtp, dst_ctfp)->dm_name, + .dtt_ctfp = dst_ctfp, + .dtt_type = dst_type, + }; return (dt_xlator_create(dtp, &src_dtt, &dst_dtt, NULL, NULL, NULL)); } Modified: user/markj/netdump/contrib/blacklist/bin/conf.c ============================================================================== --- user/markj/netdump/contrib/blacklist/bin/conf.c Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/contrib/blacklist/bin/conf.c Tue Mar 20 15:04:19 2018 (r331243) @@ -1119,6 +1119,7 @@ conf_parse(const char *f) confset_free(&lc); confset_free(&rc); fclose(fp); + free(line); return; } } Modified: user/markj/netdump/contrib/elftoolchain/nm/nm.c ============================================================================== --- user/markj/netdump/contrib/elftoolchain/nm/nm.c Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/contrib/elftoolchain/nm/nm.c Tue Mar 20 15:04:19 2018 (r331243) @@ -1310,14 +1310,17 @@ read_elf(Elf *elf, const char *filename, Elf_Kind kind line_info = malloc(sizeof(struct line_info_head)); func_info = malloc(sizeof(struct func_info_head)); var_info = malloc(sizeof(struct var_info_head)); + if (line_info != NULL) + SLIST_INIT(line_info); + if (func_info != NULL) + SLIST_INIT(func_info); + if (var_info != NULL) + SLIST_INIT(var_info); if (line_info == NULL || func_info == NULL || var_info == NULL) { warn("malloc"); (void) dwarf_finish(dbg, &de); goto process_sym; } - SLIST_INIT(line_info); - SLIST_INIT(func_info); - SLIST_INIT(var_info); while ((ret = dwarf_next_cu_header(dbg, NULL, NULL, NULL, NULL, NULL, &de)) == DW_DLV_OK) { Modified: user/markj/netdump/contrib/llvm/lib/Analysis/InstructionSimplify.cpp ============================================================================== --- user/markj/netdump/contrib/llvm/lib/Analysis/InstructionSimplify.cpp Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/contrib/llvm/lib/Analysis/InstructionSimplify.cpp Tue Mar 20 15:04:19 2018 (r331243) @@ -3697,7 +3697,7 @@ static Value *SimplifyGEPInst(Type *SrcTy, ArrayRef<Va if (Ops.size() == 2) { // getelementptr P, 0 -> P. - if (match(Ops[1], m_Zero())) + if (match(Ops[1], m_Zero()) && Ops[0]->getType() == GEPTy) return Ops[0]; Type *Ty = SrcTy; @@ -3706,7 +3706,7 @@ static Value *SimplifyGEPInst(Type *SrcTy, ArrayRef<Va uint64_t C; uint64_t TyAllocSize = Q.DL.getTypeAllocSize(Ty); // getelementptr P, N -> P if P points to a type of zero size. - if (TyAllocSize == 0) + if (TyAllocSize == 0 && Ops[0]->getType() == GEPTy) return Ops[0]; // The following transforms are only safe if the ptrtoint cast Modified: user/markj/netdump/contrib/llvm/lib/IR/ConstantFold.cpp ============================================================================== --- user/markj/netdump/contrib/llvm/lib/IR/ConstantFold.cpp Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/contrib/llvm/lib/IR/ConstantFold.cpp Tue Mar 20 15:04:19 2018 (r331243) @@ -2018,8 +2018,16 @@ static bool isInBoundsIndices(ArrayRef<IndexTy> Idxs) // If the first index is one and all the rest are zero, it's in bounds, // by the one-past-the-end rule. - if (!cast<ConstantInt>(Idxs[0])->isOne()) - return false; + if (auto *CI = dyn_cast<ConstantInt>(Idxs[0])) { + if (!CI->isOne()) + return false; + } else { + auto *CV = cast<ConstantDataVector>(Idxs[0]); + CI = dyn_cast_or_null<ConstantInt>(CV->getSplatValue()); + if (!CI || !CI->isOne()) + return false; + } + for (unsigned i = 1, e = Idxs.size(); i != e; ++i) if (!cast<Constant>(Idxs[i])->isNullValue()) return false; @@ -2049,15 +2057,18 @@ Constant *llvm::ConstantFoldGetElementPtr(Type *Pointe ArrayRef<Value *> Idxs) { if (Idxs.empty()) return C; - if (isa<UndefValue>(C)) { - Type *GEPTy = GetElementPtrInst::getGEPReturnType( - C, makeArrayRef((Value * const *)Idxs.data(), Idxs.size())); + Type *GEPTy = GetElementPtrInst::getGEPReturnType( + C, makeArrayRef((Value *const *)Idxs.data(), Idxs.size())); + + if (isa<UndefValue>(C)) return UndefValue::get(GEPTy); - } Constant *Idx0 = cast<Constant>(Idxs[0]); if (Idxs.size() == 1 && (Idx0->isNullValue() || isa<UndefValue>(Idx0))) - return C; + return GEPTy->isVectorTy() && !C->getType()->isVectorTy() + ? ConstantVector::getSplat( + cast<VectorType>(GEPTy)->getNumElements(), C) + : C; if (C->isNullValue()) { bool isNull = true; Modified: user/markj/netdump/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp ============================================================================== --- user/markj/netdump/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp Tue Mar 20 15:04:19 2018 (r331243) @@ -1034,8 +1034,12 @@ Address CodeGenFunction::EmitPointerWithAlignment(cons // Derived-to-base conversions. case CK_UncheckedDerivedToBase: case CK_DerivedToBase: { - Address Addr = EmitPointerWithAlignment(CE->getSubExpr(), BaseInfo, - TBAAInfo); + // TODO: Support accesses to members of base classes in TBAA. For now, we + // conservatively pretend that the complete object is of the base class + // type. + if (TBAAInfo) + *TBAAInfo = CGM.getTBAAAccessInfo(E->getType()); + Address Addr = EmitPointerWithAlignment(CE->getSubExpr(), BaseInfo); auto Derived = CE->getSubExpr()->getType()->getPointeeCXXRecordDecl(); return GetAddressOfBaseClass(Addr, Derived, CE->path_begin(), CE->path_end(), Modified: user/markj/netdump/contrib/telnet/telnetd/telnetd.c ============================================================================== --- user/markj/netdump/contrib/telnet/telnetd/telnetd.c Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/contrib/telnet/telnetd/telnetd.c Tue Mar 20 15:04:19 2018 (r331243) @@ -925,7 +925,7 @@ telnet(int f, int p, char *host) edithost(HE, host_name); if (hostinfo && *IM) putf(IM, ptyibuf2); - if (IF && if_fd != -1) { + if (if_fd != -1) { if (fstat(if_fd, &statbuf) != -1 && statbuf.st_size > 0) { if_buf = (char *) mmap (0, statbuf.st_size, PROT_READ, 0, if_fd, 0); Modified: user/markj/netdump/etc/mtree/BSD.root.dist ============================================================================== --- user/markj/netdump/etc/mtree/BSD.root.dist Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/etc/mtree/BSD.root.dist Tue Mar 20 15:04:19 2018 (r331243) @@ -11,6 +11,8 @@ defaults .. dtb + overlays tags=package=runtime + .. .. firmware .. @@ -19,8 +21,6 @@ kernel .. modules - .. - overlays tags=package=runtime .. zfs .. Modified: user/markj/netdump/etc/mtree/BSD.tests.dist ============================================================================== --- user/markj/netdump/etc/mtree/BSD.tests.dist Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/etc/mtree/BSD.tests.dist Tue Mar 20 15:04:19 2018 (r331243) @@ -382,6 +382,8 @@ .. rtld-elf .. + tftpd + .. .. sbin dhclient Modified: user/markj/netdump/etc/rc.d/fsck ============================================================================== --- user/markj/netdump/etc/rc.d/fsck Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/etc/rc.d/fsck Tue Mar 20 15:04:19 2018 (r331243) @@ -57,7 +57,7 @@ fsck_start() echo "Reboot failed; help!" stop_boot ;; - 8) + 8|16) if checkyesno fsck_y_enable; then echo "File system preen failed, trying fsck -y ${fsck_y_flags}" fsck -y ${fsck_y_flags} Modified: user/markj/netdump/etc/rc.d/hostname ============================================================================== --- user/markj/netdump/etc/rc.d/hostname Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/etc/rc.d/hostname Tue Mar 20 15:04:19 2018 (r331243) @@ -60,9 +60,11 @@ hostname_start() # Have we got a hostname yet? # if [ -z "${hostname}" ]; then - # Null hostname is probably OK if DHCP is in use. + # Null hostname is probably OK if DHCP is in use, + # or when hostname is already set (common for jails). # - if [ -z "`list_net_interfaces dhcp`" ]; then + if [ -z "`list_net_interfaces dhcp`" -a \ + -z "`/bin/hostname`" ]; then warn "\$hostname is not set -- see rc.conf(5)." fi return Modified: user/markj/netdump/gnu/usr.bin/gdb/kgdb/trgt_amd64.c ============================================================================== --- user/markj/netdump/gnu/usr.bin/gdb/kgdb/trgt_amd64.c Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/gnu/usr.bin/gdb/kgdb/trgt_amd64.c Tue Mar 20 15:04:19 2018 (r331243) @@ -189,6 +189,7 @@ kgdb_trgt_trapframe_sniffer(struct frame_info *next_fr if (pname == NULL) return (NULL); if (strcmp(pname, "calltrap") == 0 || + strcmp(pname, "fast_syscall_common") == 0 || strcmp(pname, "mchk_calltrap") == 0 || strcmp(pname, "nmi_calltrap") == 0 || (pname[0] == 'X' && pname[1] != '_')) Modified: user/markj/netdump/lib/libc/net/getnameinfo.3 ============================================================================== --- user/markj/netdump/lib/libc/net/getnameinfo.3 Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/lib/libc/net/getnameinfo.3 Tue Mar 20 15:04:19 2018 (r331243) @@ -18,7 +18,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 28, 2016 +.Dd March 15, 2018 .Dt GETNAMEINFO 3 .Os .Sh NAME @@ -80,6 +80,20 @@ or UNIX-domain respectively that is .Fa salen bytes long. +If +.Fa salen +is shorter than the length corresponding to the specified +address family or longer than +.Fn sizeof "struct sockaddr_storage" , +it returns +.Er EAI_FAMILY . +Note that +.Va sa->sa_len +should be consistent with +.Fa salen +though the value of +.Va sa->sa_len +is not directly used in this function. .Pp The host and service names associated with .Fa sa Modified: user/markj/netdump/lib/libc/net/getnameinfo.c ============================================================================== --- user/markj/netdump/lib/libc/net/getnameinfo.c Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/lib/libc/net/getnameinfo.c Tue Mar 20 15:04:19 2018 (r331243) @@ -124,26 +124,36 @@ getnameinfo(const struct sockaddr *sa, socklen_t salen afd = find_afd(sa->sa_family); if (afd == NULL) return (EAI_FAMILY); + /* + * getnameinfo() accepts an salen of sizeof(struct sockaddr_storage) + * at maximum as shown in RFC 4038 Sec.6.2.3. + */ + if (salen > sizeof(struct sockaddr_storage)) + return (EAI_FAMILY); + switch (sa->sa_family) { case PF_LOCAL: /* - * PF_LOCAL uses variable sa->sa_len depending on the + * PF_LOCAL uses variable salen depending on the * content length of sun_path. Require 1 byte in * sun_path at least. */ - if (salen > afd->a_socklen || - salen <= afd->a_socklen - + if (salen <= afd->a_socklen - sizeofmember(struct sockaddr_un, sun_path)) - return (EAI_FAIL); + return (EAI_FAMILY); + else if (salen > afd->a_socklen) + salen = afd->a_socklen; break; case PF_LINK: if (salen <= afd->a_socklen - sizeofmember(struct sockaddr_dl, sdl_data)) - return (EAI_FAIL); + return (EAI_FAMILY); break; default: - if (salen != afd->a_socklen) - return (EAI_FAIL); + if (salen < afd->a_socklen) + return (EAI_FAMILY); + else + salen = afd->a_socklen; break; } @@ -517,7 +527,7 @@ getnameinfo_un(const struct afd *afd, if (serv != NULL && servlen > 0) *serv = '\0'; if (host != NULL && hostlen > 0) { - pathlen = sa->sa_len - afd->a_off; + pathlen = salen - afd->a_off; if (pathlen + 1 > hostlen) { *host = '\0'; Modified: user/markj/netdump/lib/libc/sys/sendfile.2 ============================================================================== --- user/markj/netdump/lib/libc/sys/sendfile.2 Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/lib/libc/sys/sendfile.2 Tue Mar 20 15:04:19 2018 (r331243) @@ -129,8 +129,8 @@ Starting with .Nm sending files off the .Xr ffs 7 -filesystem doesn't block on I/O -(see +filesystem does not block on I/O +(see .Sx IMPLEMENTATION NOTES ), so the condition no longer applies. However, it is safe if an application utilizes @@ -140,8 +140,8 @@ and on performs the same action as it did in older .Fx -versions, e.g. -.Xr aio_read 2, +versions, e.g., +.Xr aio_read 2 , .Xr read 2 or .Nm @@ -210,7 +210,7 @@ The .Fx implementation of .Fn sendfile -doesn't block on disk I/O when it sends a file off the +does not block on disk I/O when it sends a file off the .Xr ffs 7 filesystem. The syscall returns success before the actual I/O completes, and data Modified: user/markj/netdump/lib/libcasper/libcasper/libcasper.3 ============================================================================== --- user/markj/netdump/lib/libcasper/libcasper/libcasper.3 Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/lib/libcasper/libcasper/libcasper.3 Tue Mar 20 15:04:19 2018 (r331243) @@ -1,4 +1,5 @@ .\" Copyright (c) 2013 The FreeBSD Foundation +.\" Copyright (c) 2018 Mariusz Zaborski <oshogbo@FreeBSD.org> .\" All rights reserved. .\" .\" This documentation was written by Pawel Jakub Dawidek under sponsorship @@ -27,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 26, 2018 +.Dd March 6, 2018 .Dt LIBCASPER 3 .Os .Sh NAME @@ -181,7 +182,7 @@ over the given capability. The .Fn cap_xfer_nvlist function sends the given -.Xr nvlist 9, +.Xr nvlist 9 , destroys it and receives new .Xr nvlist 9 in response over the given capability. @@ -252,63 +253,18 @@ The and .Fn cap_unwrap functions always succeed. -.Sh EXAMPLES -The following example first opens capability to the casper then using this -capability creates new capability to the -.Nm system.dns -casper service and uses the latter capability to resolve IP address. -.Bd -literal -cap_channel_t *capcas, *capdns; -nvlist_t *limits; -const char *ipstr = "127.0.0.1"; -struct in_addr ip; -struct hostent *hp; - -/* Open capability to the Casper. */ -capcas = cap_init(); -if (capcas == NULL) - err(1, "Unable to contact Casper"); - -/* Enter capability mode sandbox. */ -if (cap_enter() < 0 && errno != ENOSYS) - err(1, "Unable to enter capability mode"); - -/* Use Casper capability to create capability to the system.dns service. */ -capdns = cap_service_open(capcas, "system.dns"); -if (capdns == NULL) - err(1, "Unable to open system.dns service"); - -/* Close Casper capability, we don't need it anymore. */ -cap_close(capcas); - -/* Limit system.dns to reverse DNS lookups and IPv4 addresses. */ -limits = nvlist_create(0); -nvlist_add_string(limits, "type", "ADDR"); -nvlist_add_number(limits, "family", (uint64_t)AF_INET); -if (cap_limit_set(capdns, limits) < 0) - err(1, "Unable to limit access to the system.dns service"); - -/* Convert IP address in C-string to in_addr. */ -if (!inet_aton(ipstr, &ip)) - errx(1, "Unable to parse IP address %s.", ipstr); - -/* Find hostname for the given IP address. */ -hp = cap_gethostbyaddr(capdns, (const void *)&ip, sizeof(ip), AF_INET); -if (hp == NULL) - errx(1, "No name associated with %s.", ipstr); - -printf("Name associated with %s is %s.\\n", ipstr, hp->h_name); -.Ed .Sh SEE ALSO -.Xr cap_enter 2 , +.Xr errno 2 , .Xr execve 2 , .Xr kevent 2 , .Xr poll 2 , .Xr select 2 , -.Xr cap_gethostbyaddr 3 , -.Xr err 3 , -.Xr gethostbyaddr 3 , -.Xr inet_aton 3 , +.Xr cap_dns 3 , +.Xr cap_grp 3 , +.Xr cap_pwd 3 , +.Xr cap_ranodm 3 , +.Xr cap_sysctl 3 , +.Xr cap_syslog 3 , .Xr capsicum 4 , .Xr unix 4 , .Xr nv 9 Modified: user/markj/netdump/lib/libcasper/services/cap_dns/cap_dns.3 ============================================================================== --- user/markj/netdump/lib/libcasper/services/cap_dns/cap_dns.3 Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/lib/libcasper/services/cap_dns/cap_dns.3 Tue Mar 20 15:04:19 2018 (r331243) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 26, 2018 +.Dd March 18, 2018 .Dt CAP_DNS 3 .Os .Sh NAME @@ -193,7 +193,7 @@ printf("Name associated with %s is %s.\\n", ipstr, hp- .Xr gethostbyaddr 3 , .Xr gethostbyname 3 , .Xr gethostbyname2 3 , -.Xr getnameinfo 3, +.Xr getnameinfo 3 , .Xr capsicum 4 , .Xr nv 9 .Sh AUTHORS Modified: user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.3 ============================================================================== --- user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.3 Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.3 Tue Mar 20 15:04:19 2018 (r331243) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 26, 2018 +.Dd March 18, 2018 .Dt CAP_GRP 3 .Os .Sh NAME @@ -70,7 +70,7 @@ .Ft int .Fn cap_grp_limit_fields "cap_channel_t *chan" "const char * const *fields" "size_t nfields" .Ft int -.Fn cap_grp_limit_groups "cap_channel_t *chan" "const char * const *names" "size_t nnames" "gid_t *gids" "size_t ngids" +.Fn cap_grp_limit_groups "cap_channel_t *chan" "const char * const *names" "size_t nnames" "const gid_t *gids" "size_t ngids" .Sh DESCRIPTION The functions .Fn cap_getgrent , @@ -163,7 +163,7 @@ casper service and uses it to get a group name. cap_channel_t *capcas, *capgrp; const char *cmds[] = { "getgrgid" }; const char *fields[] = { "gr_name" }; -gid_t gid[] = { 1 }; +const gid_t gid[] = { 1 }; struct group *group; /* Open capability to Casper. */ Modified: user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.c ============================================================================== --- user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.c Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.c Tue Mar 20 15:04:19 2018 (r331243) @@ -410,7 +410,7 @@ cap_grp_limit_fields(cap_channel_t *chan, const char * int cap_grp_limit_groups(cap_channel_t *chan, const char * const *names, - size_t nnames, gid_t *gids, size_t ngids) + size_t nnames, const gid_t *gids, size_t ngids) { nvlist_t *limits, *groups; unsigned int i; Modified: user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.h ============================================================================== --- user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.h Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/lib/libcasper/services/cap_grp/cap_grp.h Tue Mar 20 15:04:19 2018 (r331243) @@ -57,7 +57,7 @@ int cap_grp_limit_cmds(cap_channel_t *chan, const char int cap_grp_limit_fields(cap_channel_t *chan, const char * const *fields, size_t nfields); int cap_grp_limit_groups(cap_channel_t *chan, const char * const *names, - size_t nnames, gid_t *gids, size_t ngids); + size_t nnames, const gid_t *gids, size_t ngids); #else #define cap_getgrent(chan) getgrent() #define cap_getgrnam(chan, name) getgrnam(name) Modified: user/markj/netdump/lib/libcasper/services/cap_pwd/Makefile ============================================================================== --- user/markj/netdump/lib/libcasper/services/cap_pwd/Makefile Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/lib/libcasper/services/cap_pwd/Makefile Tue Mar 20 15:04:19 2018 (r331243) @@ -24,4 +24,20 @@ CFLAGS+=-I${.CURDIR} HAS_TESTS= SUBDIR.${MK_TESTS}+= tests +MAN+= cap_pwd.3 + +MLINKS+=cap_pwd.3 libcap_pwd.3 +MLINKS+=cap_pwd.3 cap_getpwent.3 +MLINKS+=cap_pwd.3 cap_getpwnam.3 +MLINKS+=cap_pwd.3 cap_getpwuid.3 +MLINKS+=cap_pwd.3 cap_getpwent_r.3 +MLINKS+=cap_pwd.3 cap_getpwnam_r.3 +MLINKS+=cap_pwd.3 cap_getpwuid_r.3 +MLINKS+=cap_pwd.3 cap_setpassent.3 +MLINKS+=cap_pwd.3 cap_setpwent.3 +MLINKS+=cap_pwd.3 cap_endpwent.3 +MLINKS+=cap_pwd.3 cap_pwd_limit_cmds.3 +MLINKS+=cap_pwd.3 cap_pwd_limit_fields.3 +MLINKS+=cap_pwd.3 cap_pwd_limit_users.3 + .include <bsd.lib.mk> Copied: user/markj/netdump/lib/libcasper/services/cap_pwd/cap_pwd.3 (from r331242, head/lib/libcasper/services/cap_pwd/cap_pwd.3) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/markj/netdump/lib/libcasper/services/cap_pwd/cap_pwd.3 Tue Mar 20 15:04:19 2018 (r331243, copy of r331242, head/lib/libcasper/services/cap_pwd/cap_pwd.3) @@ -0,0 +1,234 @@ +.\" Copyright (c) 2018 Mariusz Zaborski <oshogbo@FreeBSD.org> +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd March 18, 2018 +.Dt CAP_PWD 3 +.Os +.Sh NAME +.Nm cap_getpwent , +.Nm cap_getpwnam , +.Nm cap_getpwuid , +.Nm cap_getpwent_r , +.Nm cap_getpwnam_r , +.Nm cap_getpwuid_r , +.Nm cap_setpassent , +.Nm cap_setpwent , +.Nm cap_endpwent , +.Nm cap_pwd_limit_cmds , +.Nm cap_pwd_limit_fields , +.Nm cap_pwd_limit_users +.Nd "library for password database operations in capability mode" +.Sh LIBRARY +.Lb libcap_grp +.Sh SYNOPSIS +.In libcasper.h +.In casper/cap_pwd.h +.Ft struct passwd * +.Fn cap_getpwent "cap_channel_t *chan" +.Ft struct passwd * +.Fn cap_getpwnam "cap_channel_t *chan" "const char *login" +.Ft struct passwd * +.Fn cap_getpwuid "cap_channel_t *chan" "uid_t uid" +.Ft int +.Fn cap_getpwent_r "cap_channel_t *chan" "struct passwd *pwd" "char *buffer" "size_t bufsize" "struct passwd **result" +.Ft int +.Fn cap_getpwnam_r "cap_channel_t *chan" "const char *name" "struct passwd *pwd" "char *buffer" "size_t bufsize" "struct passwd **result" +.Ft int +.Fn cap_getpwuid_r "cap_channel_t *chan" "uid_t uid" "struct passwd *pwd" "char *buffer" "size_t bufsize" "struct passwd **result" +.Ft int +.Fn cap_setpassent "cap_channel_t *chan" "int stayopen" +.Ft void +.Fn cap_setpwent "cap_channel_t *chan" +.Ft void +.Fn cap_endpwent "cap_channel_t *chan" +.Ft int +.Fn cap_pwd_limit_cmds "cap_channel_t *chan" "const char * const *cmds" "size_t ncmds" +.Ft int +.Fn cap_pwd_limit_fields "cap_channel_t *chan" "const char * const *fields" "size_t nfields" +.Ft int +.Fn cap_pwd_limit_users "cap_channel_t *chan" "const char * const *names" "size_t nnames" "uid_t *uids" "size_t nuids" +.Sh DESCRIPTION +The functions +.Fn cap_getpwent , +.Fn cap_getpwnam , +.Fn cap_getpwuid , +.Fn cap_getpwent_r , +.Fn cap_getpwnam_r , +.Fn cap_getpwuid_r , +.Fn cap_setpassent , +.Fn cap_setpwent , +and +.Fn cap_endpwent +are respectively equivalent to +.Xr getpwent 3 , +.Xr getpwnam 3 , +.Xr getpwuid 3 , +.Xr getpwent_r 3 , +.Xr getpwnam_r 3 , +.Xr getpwuid_r 3 , +.Xr setpassent 3 , +.Xr setpwent 3 , +and +.Xr cap_endpwent 3 +except that the connection to the +.Nm system.pwd +service needs to be provided. +.Pp +The +.Fn cap_pwd_limit_cmds +function limits the functions allowed in the service. +The +.Fa cmds +variable can be set to +.Dv getpwent , +.Dv getpwnam , +.Dv getpwuid , +.Dv getpwent_r , +.Dv getpwnam_r , +.Dv getpwuid_r , +.Dv setpassent , +.Dv setpwent , +or +.Dv endpwent +which will allow to use the function associated with the name. +The +.Fa ncmds +variable contains the number of +.Fa cmds +provided. +.Pp +The +.Fn cap_pwd_limit_fields +function allows limit fields returned in the structure +.Vt passwd . +The +.Fa fields +variable can be set to +.Dv pw_name , +.Dv pw_passwd , +.Dv pw_uid , +.Dv pw_gid , +.Dv pw_change , +.Dv pw_class , +.Dv pw_gecos , +.Dv pw_dir , +.Dv pw_shell , +.Dv pw_expire +or +.Dv pw_fields +The field which was set as the limit will be returned, while the rest of the +values not set this way will have default values. +The +.Fa nfields +variable contains the number of +.Fa fields +provided. +.Pp +The +.Fn cap_pwd_limit_users +function allows to limit access to users. +The +.Fa names +variable allows to limit users by name and the +.Fa uids +variable by the user number. +The +.Fa nnames +and +.Fa nuids +variables provide numbers of limited names and uids. +.Sh EXAMPLES +The following example first opens a capability to casper and then uses this +capability to create the +.Nm system.pwd +casper service and uses it to get a user name. +.Bd -literal +cap_channel_t *capcas, *cappwd; +const char *cmds[] = { "getpwuid" }; +const char *fields[] = { "pw_name" }; +uid_t uid[] = { 1 }; +struct passwd *passwd; + +/* Open capability to Casper. */ +capcas = cap_init(); +if (capcas == NULL) + err(1, "Unable to contact Casper"); + +/* Enter capability mode sandbox. */ +if (cap_enter() < 0 && errno != ENOSYS) + err(1, "Unable to enter capability mode"); + +/* Use Casper capability to create capability to the system.pwd service. */ +cappwd = cap_service_open(capcas, "system.pwd"); +if (cappwd == NULL) + err(1, "Unable to open system.pwd service"); + +/* Close Casper capability, we don't need it anymore. */ +cap_close(capcas); + +/* Limit service to one single function. */ +if (cap_pwd_limit_cmds(cappwd, cmds, nitems(cmds))) + err(1, "Unable to limit access to system.pwd service"); + +/* Limit service to one field as we only need name of the user. */ +if (cap_pwd_limit_fields(cappwd, fields, nitems(fields))) + err(1, "Unable to limit access to system.pwd service"); + +/* Limit service to one uid. */ +if (cap_pwd_limit_users(cappwd, NULL, 0, uid, nitems(uid))) + err(1, "Unable to limit access to system.pwd service"); + +passwd = cap_getpwuid(cappwd, uid[0]); +if (passwd == NULL) + err(1, "Unable to get name of user"); + +printf("UID %d is associated with name %s.\\n", uid[0], passwd->pw_name); + +cap_close(cappwd); +.Ed +.Sh SEE ALSO +.Xr cap_enter 2 , +.Xr endpwent 3 , +.Xr err 3 , +.Xr getpwent 3 , +.Xr getpwent_r 3 , +.Xr getpwnam 3 , +.Xr getpwnam_r 3 , +.Xr getpwuid 3 , +.Xr getpwuid_r 3 , +.Xr setpassent 3 , +.Xr setpwent 3 , +.Xr capsicum 4 , +.Xr nv 9 +.Sh AUTHORS +The +.Nm cap_pwd +service was implemented by +.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net +under sponsorship from the FreeBSD Foundation. +.Pp +This manual page was written by +.An Mariusz Zaborski Aq Mt oshogbo@FreeBSD.org . Modified: user/markj/netdump/lib/libcasper/services/cap_sysctl/Makefile ============================================================================== --- user/markj/netdump/lib/libcasper/services/cap_sysctl/Makefile Tue Mar 20 13:39:41 2018 (r331242) +++ user/markj/netdump/lib/libcasper/services/cap_sysctl/Makefile Tue Mar 20 15:04:19 2018 (r331243) @@ -24,4 +24,9 @@ CFLAGS+=-I${.CURDIR} HAS_TESTS= SUBDIR.${MK_TESTS}+= tests +MAN+= cap_sysctl.3 + +MLINKS+=cap_sysctl.3 libcap_sysctl.3 +MLINKS+=cap_sysctl.3 cap_sysctlbyname.3 + .include <bsd.lib.mk> Copied: user/markj/netdump/lib/libcasper/services/cap_sysctl/cap_sysctl.3 (from r331242, head/lib/libcasper/services/cap_sysctl/cap_sysctl.3) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/markj/netdump/lib/libcasper/services/cap_sysctl/cap_sysctl.3 Tue Mar 20 15:04:19 2018 (r331243, copy of r331242, head/lib/libcasper/services/cap_sysctl/cap_sysctl.3) @@ -0,0 +1,143 @@ +.\" Copyright (c) 2018 Mariusz Zaborski <oshogbo@FreeBSD.org> +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803201504.w2KF4JpM074200>