From owner-svn-src-projects@FreeBSD.ORG Thu May 6 17:37:24 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9856B106566B; Thu, 6 May 2010 17:37:24 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 843DC8FC0A; Thu, 6 May 2010 17:37:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o46HbOsE042727; Thu, 6 May 2010 17:37:24 GMT (envelope-from mckusick@svn.freebsd.org) Received: (from mckusick@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o46HbOKD042691; Thu, 6 May 2010 17:37:24 GMT (envelope-from mckusick@svn.freebsd.org) Message-Id: <201005061737.o46HbOKD042691@svn.freebsd.org> From: Kirk McKusick Date: Thu, 6 May 2010 17:37:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207707 - in projects/quota64: . bin/sh cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd/ztest cddl/contrib/opensolaris/lib/libzfs/common... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2010 17:37:24 -0000 Author: mckusick Date: Thu May 6 17:37:23 2010 New Revision: 207707 URL: http://svn.freebsd.org/changeset/base/207707 Log: Final update to current version of head in preparation for reintegration. Added: projects/quota64/libexec/tftpd/tftp-file.c - copied unchanged from r207679, head/libexec/tftpd/tftp-file.c projects/quota64/libexec/tftpd/tftp-file.h - copied unchanged from r207679, head/libexec/tftpd/tftp-file.h projects/quota64/libexec/tftpd/tftp-io.c - copied unchanged from r207679, head/libexec/tftpd/tftp-io.c projects/quota64/libexec/tftpd/tftp-io.h - copied unchanged from r207679, head/libexec/tftpd/tftp-io.h projects/quota64/libexec/tftpd/tftp-options.c - copied unchanged from r207679, head/libexec/tftpd/tftp-options.c projects/quota64/libexec/tftpd/tftp-options.h - copied unchanged from r207679, head/libexec/tftpd/tftp-options.h projects/quota64/libexec/tftpd/tftp-transfer.c - copied unchanged from r207679, head/libexec/tftpd/tftp-transfer.c projects/quota64/libexec/tftpd/tftp-transfer.h - copied unchanged from r207679, head/libexec/tftpd/tftp-transfer.h projects/quota64/libexec/tftpd/tftp-utils.c - copied unchanged from r207679, head/libexec/tftpd/tftp-utils.c projects/quota64/libexec/tftpd/tftp-utils.h - copied unchanged from r207679, head/libexec/tftpd/tftp-utils.h projects/quota64/share/man/man4/mvs.4 - copied unchanged from r207679, head/share/man/man4/mvs.4 projects/quota64/sys/contrib/dev/acpica/compiler/aslrestype1i.c - copied unchanged from r207679, head/sys/contrib/dev/acpica/compiler/aslrestype1i.c projects/quota64/sys/contrib/dev/acpica/compiler/aslrestype2d.c - copied unchanged from r207679, head/sys/contrib/dev/acpica/compiler/aslrestype2d.c projects/quota64/sys/contrib/dev/acpica/compiler/aslrestype2e.c - copied unchanged from r207679, head/sys/contrib/dev/acpica/compiler/aslrestype2e.c projects/quota64/sys/contrib/dev/acpica/compiler/aslrestype2q.c - copied unchanged from r207679, head/sys/contrib/dev/acpica/compiler/aslrestype2q.c projects/quota64/sys/contrib/dev/acpica/compiler/aslrestype2w.c - copied unchanged from r207679, head/sys/contrib/dev/acpica/compiler/aslrestype2w.c projects/quota64/sys/contrib/dev/acpica/events/evgpeinit.c - copied unchanged from r207679, head/sys/contrib/dev/acpica/events/evgpeinit.c projects/quota64/sys/contrib/dev/acpica/events/evgpeutil.c - copied unchanged from r207679, head/sys/contrib/dev/acpica/events/evgpeutil.c projects/quota64/sys/dev/io/iodev.h - copied unchanged from r207679, head/sys/dev/io/iodev.h projects/quota64/sys/dev/mvs/ - copied from r207679, head/sys/dev/mvs/ projects/quota64/sys/modules/mvs/ - copied from r207679, head/sys/modules/mvs/ projects/quota64/sys/sparc64/include/mcntl.h - copied unchanged from r207679, head/sys/sparc64/include/mcntl.h projects/quota64/sys/sparc64/sparc64/zeus.c - copied unchanged from r207679, head/sys/sparc64/sparc64/zeus.c projects/quota64/tools/regression/bin/sh/builtins/locale1.0 - copied unchanged from r207679, head/tools/regression/bin/sh/builtins/locale1.0 projects/quota64/usr.bin/tftp/tftp.h - copied unchanged from r207679, head/usr.bin/tftp/tftp.h Modified: projects/quota64/UPDATING projects/quota64/bin/sh/eval.c projects/quota64/bin/sh/var.c projects/quota64/bin/sh/var.h projects/quota64/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/quota64/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/quota64/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/quota64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/quota64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/quota64/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c projects/quota64/contrib/telnet/telnet/commands.c projects/quota64/contrib/telnet/telnet/externs.h projects/quota64/contrib/telnet/telnet/network.c projects/quota64/contrib/telnet/telnet/sys_bsd.c projects/quota64/contrib/telnet/telnet/telnet.c projects/quota64/contrib/telnet/telnet/terminal.c projects/quota64/contrib/tzcode/zic/private.h projects/quota64/crypto/openssh/ChangeLog projects/quota64/crypto/openssh/README projects/quota64/crypto/openssh/auth-options.c projects/quota64/crypto/openssh/auth2-pubkey.c projects/quota64/crypto/openssh/channels.c projects/quota64/crypto/openssh/clientloop.c projects/quota64/crypto/openssh/config.h projects/quota64/crypto/openssh/config.h.in projects/quota64/crypto/openssh/defines.h projects/quota64/crypto/openssh/key.c projects/quota64/crypto/openssh/key.h projects/quota64/crypto/openssh/loginrec.c projects/quota64/crypto/openssh/logintest.c projects/quota64/crypto/openssh/openbsd-compat/bsd-arc4random.c projects/quota64/crypto/openssh/servconf.c projects/quota64/crypto/openssh/session.c projects/quota64/crypto/openssh/ssh-keygen.1 projects/quota64/crypto/openssh/ssh-keygen.c projects/quota64/crypto/openssh/ssh-pkcs11-helper.c projects/quota64/crypto/openssh/ssh.1 projects/quota64/crypto/openssh/ssh_config projects/quota64/crypto/openssh/ssh_config.5 projects/quota64/crypto/openssh/sshd_config projects/quota64/crypto/openssh/sshd_config.5 projects/quota64/crypto/openssh/version.h projects/quota64/etc/network.subr projects/quota64/etc/rc.d/named projects/quota64/gnu/usr.bin/groff/tmac/mdoc.local projects/quota64/lib/libc/sys/getrusage.2 projects/quota64/lib/libpam/modules/pam_krb5/pam_krb5.8 projects/quota64/lib/libpam/modules/pam_krb5/pam_krb5.c projects/quota64/lib/libpmc/libpmc.c projects/quota64/lib/libufs/cgroup.c projects/quota64/libexec/tftpd/Makefile projects/quota64/libexec/tftpd/tftpd.8 projects/quota64/libexec/tftpd/tftpd.c projects/quota64/sbin/camcontrol/camcontrol.8 projects/quota64/sbin/camcontrol/camcontrol.c projects/quota64/sbin/hastd/hast.conf.5 projects/quota64/sbin/hastd/hast.h projects/quota64/sbin/hastd/hastd.c projects/quota64/sbin/hastd/metadata.c projects/quota64/sbin/hastd/parse.y projects/quota64/sbin/hastd/primary.c projects/quota64/sbin/hastd/proto.c projects/quota64/sbin/hastd/proto.h projects/quota64/sbin/hastd/proto_common.c projects/quota64/sbin/hastd/proto_tcp4.c projects/quota64/sbin/hastd/secondary.c projects/quota64/sbin/hastd/token.l projects/quota64/sbin/ifconfig/ifconfig.8 projects/quota64/sbin/ifconfig/ifieee80211.c projects/quota64/sbin/tunefs/tunefs.c projects/quota64/share/man/man4/Makefile projects/quota64/share/man/man4/bwn.4 projects/quota64/share/man/man4/cas.4 projects/quota64/share/man/man4/msk.4 projects/quota64/share/man/man4/ng_bridge.4 projects/quota64/share/man/man4/ng_hub.4 projects/quota64/share/man/man4/sge.4 projects/quota64/share/man/man4/vlan.4 projects/quota64/share/man/man9/ieee80211.9 projects/quota64/share/man/man9/ieee80211_node.9 projects/quota64/sys/amd64/amd64/exception.S projects/quota64/sys/amd64/amd64/identcpu.c projects/quota64/sys/amd64/amd64/io.c projects/quota64/sys/amd64/amd64/pmap.c projects/quota64/sys/amd64/amd64/trap.c projects/quota64/sys/amd64/include/iodev.h projects/quota64/sys/amd64/include/pmap.h projects/quota64/sys/amd64/include/proc.h projects/quota64/sys/amd64/include/specialreg.h projects/quota64/sys/amd64/include/vmparam.h projects/quota64/sys/amd64/include/xen/xenfunc.h projects/quota64/sys/amd64/include/xen/xenvar.h projects/quota64/sys/arm/arm/cpufunc.c projects/quota64/sys/arm/arm/cpufunc_asm_fa526.S projects/quota64/sys/arm/arm/elf_trampoline.c projects/quota64/sys/arm/arm/identcpu.c projects/quota64/sys/arm/arm/pmap.c projects/quota64/sys/arm/at91/if_ate.c projects/quota64/sys/arm/include/cpuconf.h projects/quota64/sys/arm/include/cpufunc.h projects/quota64/sys/arm/include/pmap.h projects/quota64/sys/arm/include/proc.h projects/quota64/sys/arm/mv/files.mv projects/quota64/sys/arm/xscale/ixp425/if_npe.c projects/quota64/sys/boot/forth/loader.conf projects/quota64/sys/boot/sparc64/loader/main.c projects/quota64/sys/cam/ata/ata_pmp.c projects/quota64/sys/cam/ata/ata_xpt.c projects/quota64/sys/cam/cam_ccb.h projects/quota64/sys/cam/cam_xpt.c projects/quota64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/quota64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c projects/quota64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/quota64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/quota64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/quota64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h projects/quota64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/quota64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c projects/quota64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c projects/quota64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/quota64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/quota64/sys/compat/linux/linux_ioctl.c projects/quota64/sys/compat/x86bios/x86bios.c projects/quota64/sys/conf/NOTES projects/quota64/sys/conf/files projects/quota64/sys/conf/files.sparc64 projects/quota64/sys/conf/kmod.mk projects/quota64/sys/conf/options projects/quota64/sys/conf/options.arm projects/quota64/sys/contrib/dev/acpica/acpica_prep.sh projects/quota64/sys/contrib/dev/acpica/changes.txt projects/quota64/sys/contrib/dev/acpica/common/adisasm.c projects/quota64/sys/contrib/dev/acpica/compiler/aslcompile.c projects/quota64/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/quota64/sys/contrib/dev/acpica/compiler/asldefine.h projects/quota64/sys/contrib/dev/acpica/compiler/aslfiles.c projects/quota64/sys/contrib/dev/acpica/compiler/aslglobal.h projects/quota64/sys/contrib/dev/acpica/compiler/asllisting.c projects/quota64/sys/contrib/dev/acpica/compiler/aslmain.c projects/quota64/sys/contrib/dev/acpica/compiler/aslpredef.c projects/quota64/sys/contrib/dev/acpica/compiler/aslresource.c projects/quota64/sys/contrib/dev/acpica/compiler/aslrestype1.c projects/quota64/sys/contrib/dev/acpica/compiler/aslrestype2.c projects/quota64/sys/contrib/dev/acpica/compiler/asltypes.h projects/quota64/sys/contrib/dev/acpica/debugger/dbcmds.c projects/quota64/sys/contrib/dev/acpica/debugger/dbdisply.c projects/quota64/sys/contrib/dev/acpica/events/evgpe.c projects/quota64/sys/contrib/dev/acpica/events/evgpeblk.c projects/quota64/sys/contrib/dev/acpica/executer/exconfig.c projects/quota64/sys/contrib/dev/acpica/executer/exoparg1.c projects/quota64/sys/contrib/dev/acpica/executer/exsystem.c projects/quota64/sys/contrib/dev/acpica/include/acevents.h projects/quota64/sys/contrib/dev/acpica/include/acglobal.h projects/quota64/sys/contrib/dev/acpica/include/acinterp.h projects/quota64/sys/contrib/dev/acpica/include/aclocal.h projects/quota64/sys/contrib/dev/acpica/include/acpiosxf.h projects/quota64/sys/contrib/dev/acpica/include/acpixf.h projects/quota64/sys/contrib/dev/acpica/include/actypes.h projects/quota64/sys/contrib/dev/acpica/include/amlresrc.h projects/quota64/sys/contrib/dev/acpica/osunixxf.c projects/quota64/sys/contrib/dev/acpica/tables/tbfind.c projects/quota64/sys/contrib/dev/acpica/tables/tbinstal.c projects/quota64/sys/contrib/dev/acpica/tables/tbutils.c projects/quota64/sys/contrib/dev/acpica/tables/tbxface.c projects/quota64/sys/contrib/dev/acpica/utilities/utcopy.c projects/quota64/sys/contrib/dev/acpica/utilities/utglobal.c projects/quota64/sys/contrib/dev/acpica/utilities/uttrack.c projects/quota64/sys/contrib/ipfilter/netinet/ip_auth.c projects/quota64/sys/dev/acpica/Osd/OsdHardware.c projects/quota64/sys/dev/ae/if_ae.c projects/quota64/sys/dev/agp/agp.c projects/quota64/sys/dev/agp/agp_i810.c projects/quota64/sys/dev/ahci/ahci.c projects/quota64/sys/dev/ahci/ahci.h projects/quota64/sys/dev/ale/if_ale.c projects/quota64/sys/dev/an/if_an.c projects/quota64/sys/dev/ata/ata-all.c projects/quota64/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c projects/quota64/sys/dev/ath/if_ath.c projects/quota64/sys/dev/atkbdc/atkbdc.c projects/quota64/sys/dev/atkbdc/atkbdc_ebus.c projects/quota64/sys/dev/atkbdc/atkbdc_isa.c projects/quota64/sys/dev/atkbdc/atkbdcreg.h projects/quota64/sys/dev/bce/if_bce.c projects/quota64/sys/dev/bce/if_bcereg.h projects/quota64/sys/dev/bwi/if_bwi.c projects/quota64/sys/dev/bwn/if_bwn.c projects/quota64/sys/dev/cas/if_cas.c projects/quota64/sys/dev/cas/if_casreg.h projects/quota64/sys/dev/ce/if_ce.c projects/quota64/sys/dev/ciss/ciss.c projects/quota64/sys/dev/cm/smc90cx6.c projects/quota64/sys/dev/cp/if_cp.c projects/quota64/sys/dev/cs/if_cs.c projects/quota64/sys/dev/ctau/if_ct.c projects/quota64/sys/dev/cx/if_cx.c projects/quota64/sys/dev/cxgb/cxgb_ioctl.h projects/quota64/sys/dev/cxgb/cxgb_main.c projects/quota64/sys/dev/cxgb/sys/mvec.h projects/quota64/sys/dev/cxgb/sys/uipc_mvec.c projects/quota64/sys/dev/drm/via_dmablit.c projects/quota64/sys/dev/drm/via_video.c projects/quota64/sys/dev/e1000/if_em.c projects/quota64/sys/dev/ed/if_ed.c projects/quota64/sys/dev/ep/if_ep.c projects/quota64/sys/dev/esp/esp_sbus.c projects/quota64/sys/dev/ex/if_ex.c projects/quota64/sys/dev/fe/if_fe.c projects/quota64/sys/dev/hwpmc/hwpmc_mod.c projects/quota64/sys/dev/ie/if_ie.c projects/quota64/sys/dev/iicbus/if_ic.c projects/quota64/sys/dev/io/iodev.c projects/quota64/sys/dev/ipw/if_ipw.c projects/quota64/sys/dev/isp/isp_pci.c projects/quota64/sys/dev/isp/isp_sbus.c projects/quota64/sys/dev/iwi/if_iwi.c projects/quota64/sys/dev/iwn/if_iwn.c projects/quota64/sys/dev/le/lance.c projects/quota64/sys/dev/malo/if_malo.c projects/quota64/sys/dev/md/md.c projects/quota64/sys/dev/mii/brgphy.c projects/quota64/sys/dev/mii/e1000phy.c projects/quota64/sys/dev/mii/miidevs projects/quota64/sys/dev/mpt/mpt.c projects/quota64/sys/dev/mpt/mpt.h projects/quota64/sys/dev/mpt/mpt_cam.c projects/quota64/sys/dev/mpt/mpt_pci.c projects/quota64/sys/dev/msk/if_msk.c projects/quota64/sys/dev/msk/if_mskreg.h projects/quota64/sys/dev/mwl/if_mwl.c projects/quota64/sys/dev/my/if_my.c projects/quota64/sys/dev/nxge/if_nxge.c projects/quota64/sys/dev/pdq/pdq_ifsubr.c projects/quota64/sys/dev/ppbus/if_plip.c projects/quota64/sys/dev/quicc/quicc_bfe.h projects/quota64/sys/dev/ral/rt2560.c projects/quota64/sys/dev/ral/rt2661.c projects/quota64/sys/dev/sbni/if_sbni.c projects/quota64/sys/dev/sge/if_sge.c projects/quota64/sys/dev/sge/if_sgereg.h projects/quota64/sys/dev/siis/siis.c projects/quota64/sys/dev/siis/siis.h projects/quota64/sys/dev/smc/if_smc.c projects/quota64/sys/dev/sn/if_sn.c projects/quota64/sys/dev/snc/dp83932.c projects/quota64/sys/dev/sound/pcm/buffer.c projects/quota64/sys/dev/sound/pcm/buffer.h projects/quota64/sys/dev/sym/sym_hipd.c projects/quota64/sys/dev/ti/if_ti.c projects/quota64/sys/dev/uart/uart_dev_ns8250.c projects/quota64/sys/dev/usb/net/uhso.c projects/quota64/sys/dev/usb/net/usb_ethernet.c projects/quota64/sys/dev/usb/wlan/if_rum.c projects/quota64/sys/dev/usb/wlan/if_run.c projects/quota64/sys/dev/usb/wlan/if_uath.c projects/quota64/sys/dev/usb/wlan/if_upgt.c projects/quota64/sys/dev/usb/wlan/if_ural.c projects/quota64/sys/dev/usb/wlan/if_urtw.c projects/quota64/sys/dev/usb/wlan/if_zyd.c projects/quota64/sys/dev/vx/if_vx.c projects/quota64/sys/dev/wi/if_wi.c projects/quota64/sys/dev/wl/if_wl.c projects/quota64/sys/dev/wpi/if_wpi.c projects/quota64/sys/dev/xe/if_xe.c projects/quota64/sys/dev/xen/netfront/netfront.c projects/quota64/sys/fs/ext2fs/ext2_readwrite.c projects/quota64/sys/fs/ext2fs/ext2_vnops.c projects/quota64/sys/fs/msdosfs/msdosfs_vnops.c projects/quota64/sys/fs/nfsclient/nfs_clbio.c projects/quota64/sys/fs/nfsclient/nfs_clnode.c projects/quota64/sys/fs/nfsclient/nfs_clrpcops.c projects/quota64/sys/fs/nwfs/nwfs_io.c projects/quota64/sys/fs/smbfs/smbfs_io.c projects/quota64/sys/fs/tmpfs/tmpfs_vnops.c projects/quota64/sys/geom/geom.h projects/quota64/sys/geom/geom_subr.c projects/quota64/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c projects/quota64/sys/i386/i386/identcpu.c projects/quota64/sys/i386/i386/io.c projects/quota64/sys/i386/i386/pmap.c projects/quota64/sys/i386/include/iodev.h projects/quota64/sys/i386/include/pmap.h projects/quota64/sys/i386/include/proc.h projects/quota64/sys/i386/include/specialreg.h projects/quota64/sys/i386/include/xen/xenfunc.h projects/quota64/sys/i386/include/xen/xenvar.h projects/quota64/sys/i386/xen/pmap.c projects/quota64/sys/ia64/ia64/iodev_machdep.c projects/quota64/sys/ia64/ia64/pmap.c projects/quota64/sys/ia64/include/iodev.h projects/quota64/sys/ia64/include/pmap.h projects/quota64/sys/ia64/include/proc.h projects/quota64/sys/kern/imgact_elf.c projects/quota64/sys/kern/kern_exec.c projects/quota64/sys/kern/kern_gzio.c projects/quota64/sys/kern/kern_ntptime.c projects/quota64/sys/kern/kern_proc.c projects/quota64/sys/kern/kern_resource.c projects/quota64/sys/kern/kern_sig.c projects/quota64/sys/kern/kern_thread.c projects/quota64/sys/kern/subr_bufring.c projects/quota64/sys/kern/subr_taskqueue.c projects/quota64/sys/kern/subr_uio.c projects/quota64/sys/kern/subr_witness.c projects/quota64/sys/kern/sys_pipe.c projects/quota64/sys/kern/sys_process.c projects/quota64/sys/kern/uipc_cow.c projects/quota64/sys/kern/uipc_mbuf.c projects/quota64/sys/kern/uipc_syscalls.c projects/quota64/sys/kern/vfs_bio.c projects/quota64/sys/kern/vfs_vnops.c projects/quota64/sys/mips/adm5120/if_admsw.c projects/quota64/sys/mips/atheros/if_arge.c projects/quota64/sys/mips/cavium/uart_dev_oct16550.c projects/quota64/sys/mips/conf/AR71XX projects/quota64/sys/mips/include/pmap.h projects/quota64/sys/mips/include/proc.h projects/quota64/sys/mips/mips/db_trace.c projects/quota64/sys/mips/mips/pmap.c projects/quota64/sys/modules/Makefile projects/quota64/sys/modules/acpi/acpi/Makefile projects/quota64/sys/modules/usb/usb/Makefile projects/quota64/sys/net/bpf.c projects/quota64/sys/net/bpf_zerocopy.c projects/quota64/sys/net/flowtable.c projects/quota64/sys/net/if.c projects/quota64/sys/net/if_ef.c projects/quota64/sys/net/if_gif.c projects/quota64/sys/net/if_gif.h projects/quota64/sys/net/if_gre.c projects/quota64/sys/net/if_stf.c projects/quota64/sys/net/route.c projects/quota64/sys/net80211/ieee80211.c projects/quota64/sys/net80211/ieee80211_amrr.c projects/quota64/sys/net80211/ieee80211_ht.h projects/quota64/sys/net80211/ieee80211_node.c projects/quota64/sys/net80211/ieee80211_rssadapt.c projects/quota64/sys/net80211/ieee80211_var.h projects/quota64/sys/netgraph/ng_base.c projects/quota64/sys/netgraph/ng_bridge.c projects/quota64/sys/netgraph/ng_bridge.h projects/quota64/sys/netgraph/ng_eiface.c projects/quota64/sys/netgraph/ng_fec.c projects/quota64/sys/netgraph/ng_hub.c projects/quota64/sys/netgraph/ng_hub.h projects/quota64/sys/netgraph/ng_iface.c projects/quota64/sys/netgraph/ng_pipe.c projects/quota64/sys/netgraph/ng_tty.c projects/quota64/sys/netinet/icmp6.h projects/quota64/sys/netinet/if_ether.c projects/quota64/sys/netinet/igmp.c projects/quota64/sys/netinet/in.c projects/quota64/sys/netinet/in_gif.c projects/quota64/sys/netinet/in_proto.c projects/quota64/sys/netinet/in_rmx.c projects/quota64/sys/netinet/ip_icmp.c projects/quota64/sys/netinet/ip_icmp.h projects/quota64/sys/netinet/ip_input.c projects/quota64/sys/netinet/ip_var.h projects/quota64/sys/netinet/raw_ip.c projects/quota64/sys/netinet/tcp_hostcache.c projects/quota64/sys/netinet/tcp_input.c projects/quota64/sys/netinet/tcp_output.c projects/quota64/sys/netinet/tcp_reass.c projects/quota64/sys/netinet/tcp_sack.c projects/quota64/sys/netinet/tcp_subr.c projects/quota64/sys/netinet/tcp_syncache.c projects/quota64/sys/netinet/tcp_timewait.c projects/quota64/sys/netinet/tcp_var.h projects/quota64/sys/netinet/udp_usrreq.c projects/quota64/sys/netinet/udp_var.h projects/quota64/sys/netinet6/frag6.c projects/quota64/sys/netinet6/icmp6.c projects/quota64/sys/netinet6/in6.c projects/quota64/sys/netinet6/in6_gif.c projects/quota64/sys/netinet6/in6_ifattach.c projects/quota64/sys/netinet6/in6_proto.c projects/quota64/sys/netinet6/in6_rmx.c projects/quota64/sys/netinet6/in6_src.c projects/quota64/sys/netinet6/in6_var.h projects/quota64/sys/netinet6/ip6_input.c projects/quota64/sys/netinet6/ip6_mroute.c projects/quota64/sys/netinet6/ip6_var.h projects/quota64/sys/netinet6/nd6.c projects/quota64/sys/netinet6/nd6.h projects/quota64/sys/netinet6/nd6_nbr.c projects/quota64/sys/netinet6/nd6_rtr.c projects/quota64/sys/netinet6/raw_ip6.c projects/quota64/sys/netinet6/scope6.c projects/quota64/sys/netipsec/ah_var.h projects/quota64/sys/netipsec/esp_var.h projects/quota64/sys/netipsec/ipcomp_var.h projects/quota64/sys/netipsec/ipip_var.h projects/quota64/sys/netipsec/ipsec.c projects/quota64/sys/netipsec/ipsec.h projects/quota64/sys/netipsec/ipsec6.h projects/quota64/sys/netipsec/key.c projects/quota64/sys/netipsec/xform_esp.c projects/quota64/sys/nfsclient/nfs_bio.c projects/quota64/sys/pc98/pc98/machdep.c projects/quota64/sys/pci/if_rl.c projects/quota64/sys/powerpc/aim/mmu_oea.c projects/quota64/sys/powerpc/aim/mmu_oea64.c projects/quota64/sys/powerpc/booke/pmap.c projects/quota64/sys/powerpc/include/pmap.h projects/quota64/sys/powerpc/include/proc.h projects/quota64/sys/security/audit/audit_bsm.c projects/quota64/sys/sparc64/include/asi.h projects/quota64/sys/sparc64/include/cache.h projects/quota64/sys/sparc64/include/pmap.h projects/quota64/sys/sparc64/include/proc.h projects/quota64/sys/sparc64/sparc64/cache.c projects/quota64/sys/sparc64/sparc64/cheetah.c projects/quota64/sys/sparc64/sparc64/identcpu.c projects/quota64/sys/sparc64/sparc64/interrupt.S projects/quota64/sys/sparc64/sparc64/machdep.c projects/quota64/sys/sparc64/sparc64/mp_locore.S projects/quota64/sys/sparc64/sparc64/mp_machdep.c projects/quota64/sys/sparc64/sparc64/pmap.c projects/quota64/sys/sparc64/sparc64/tick.c projects/quota64/sys/sun4v/include/pmap.h projects/quota64/sys/sun4v/include/proc.h projects/quota64/sys/sun4v/sun4v/pmap.c projects/quota64/sys/sys/_task.h projects/quota64/sys/sys/buf_ring.h projects/quota64/sys/sys/param.h projects/quota64/sys/sys/proc.h projects/quota64/sys/sys/resource.h projects/quota64/sys/sys/resourcevar.h projects/quota64/sys/sys/taskqueue.h projects/quota64/sys/sys/vnode.h projects/quota64/sys/ufs/ffs/ffs_softdep.c projects/quota64/sys/ufs/ffs/ffs_vfsops.c projects/quota64/sys/ufs/ffs/ffs_vnops.c projects/quota64/sys/vm/device_pager.c projects/quota64/sys/vm/phys_pager.c projects/quota64/sys/vm/sg_pager.c projects/quota64/sys/vm/swap_pager.c projects/quota64/sys/vm/uma_core.c projects/quota64/sys/vm/vm_contig.c projects/quota64/sys/vm/vm_fault.c projects/quota64/sys/vm/vm_glue.c projects/quota64/sys/vm/vm_kern.c projects/quota64/sys/vm/vm_map.c projects/quota64/sys/vm/vm_mmap.c projects/quota64/sys/vm/vm_object.c projects/quota64/sys/vm/vm_page.c projects/quota64/sys/vm/vm_page.h projects/quota64/sys/vm/vm_pageout.c projects/quota64/sys/vm/vm_param.h projects/quota64/sys/vm/vnode_pager.c projects/quota64/tools/tools/nanobsd/nanobsd.sh projects/quota64/usr.bin/chpass/Makefile projects/quota64/usr.bin/find/find.c projects/quota64/usr.bin/find/function.c projects/quota64/usr.bin/find/ls.c projects/quota64/usr.bin/find/main.c projects/quota64/usr.bin/find/misc.c projects/quota64/usr.bin/find/operator.c projects/quota64/usr.bin/find/option.c projects/quota64/usr.bin/gzip/gzip.1 projects/quota64/usr.bin/gzip/gzip.c projects/quota64/usr.bin/pathchk/pathchk.1 projects/quota64/usr.bin/pathchk/pathchk.c projects/quota64/usr.bin/script/script.c projects/quota64/usr.bin/tftp/Makefile projects/quota64/usr.bin/tftp/main.c projects/quota64/usr.bin/tftp/tftp.1 projects/quota64/usr.bin/tftp/tftp.c projects/quota64/usr.sbin/acpi/acpidb/Makefile projects/quota64/usr.sbin/acpi/iasl/Makefile projects/quota64/usr.sbin/config/config.h projects/quota64/usr.sbin/config/configvers.h projects/quota64/usr.sbin/config/main.c projects/quota64/usr.sbin/config/mkmakefile.c projects/quota64/usr.sbin/config/mkoptions.c projects/quota64/usr.sbin/cxgbtool/cxgbtool.c projects/quota64/usr.sbin/jail/jail.8 projects/quota64/usr.sbin/mergemaster/mergemaster.sh Directory Properties: projects/quota64/ (props changed) projects/quota64/cddl/contrib/opensolaris/ (props changed) projects/quota64/contrib/bind9/ (props changed) projects/quota64/contrib/ee/ (props changed) projects/quota64/contrib/expat/ (props changed) projects/quota64/contrib/file/ (props changed) projects/quota64/contrib/gdb/ (props changed) projects/quota64/contrib/gdtoa/ (props changed) projects/quota64/contrib/gnu-sort/ (props changed) projects/quota64/contrib/groff/ (props changed) projects/quota64/contrib/less/ (props changed) projects/quota64/contrib/libpcap/ (props changed) projects/quota64/contrib/ncurses/ (props changed) projects/quota64/contrib/netcat/ (props changed) projects/quota64/contrib/ntp/ (props changed) projects/quota64/contrib/one-true-awk/ (props changed) projects/quota64/contrib/openbsm/ (props changed) projects/quota64/contrib/openpam/ (props changed) projects/quota64/contrib/pf/ (props changed) projects/quota64/contrib/sendmail/ (props changed) projects/quota64/contrib/tcpdump/ (props changed) projects/quota64/contrib/tcsh/ (props changed) projects/quota64/contrib/top/ (props changed) projects/quota64/contrib/tzcode/stdtime/ (props changed) projects/quota64/contrib/tzcode/zic/ (props changed) projects/quota64/contrib/tzdata/ (props changed) projects/quota64/contrib/wpa/ (props changed) projects/quota64/crypto/openssh/ (props changed) projects/quota64/crypto/openssl/ (props changed) projects/quota64/lib/libc/ (props changed) projects/quota64/lib/libc/stdtime/ (props changed) projects/quota64/lib/libutil/ (props changed) projects/quota64/lib/libz/ (props changed) projects/quota64/sbin/ (props changed) projects/quota64/sbin/ipfw/ (props changed) projects/quota64/share/zoneinfo/ (props changed) projects/quota64/sys/ (props changed) projects/quota64/sys/amd64/include/xen/ (props changed) projects/quota64/sys/cddl/contrib/opensolaris/ (props changed) projects/quota64/sys/contrib/dev/acpica/ (props changed) projects/quota64/sys/contrib/pf/ (props changed) projects/quota64/sys/contrib/x86emu/ (props changed) projects/quota64/sys/dev/xen/xenpci/ (props changed) projects/quota64/usr.bin/csup/ (props changed) projects/quota64/usr.bin/procstat/ (props changed) projects/quota64/usr.sbin/zic/ (props changed) Modified: projects/quota64/UPDATING ============================================================================== --- projects/quota64/UPDATING Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/UPDATING Thu May 6 17:37:23 2010 (r207707) @@ -22,6 +22,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) + +20100429: + 'vm_page's are now hashed by physical address to an array of mutexes. + Currently this is only used to serialize access to hold_count. Over + time the page queue mutex will be peeled away. This changes the size + of pmap on every architecture. And requires all callers of vm_page_hold + and vm_page_unhold to be updated. + 20100402: WITH_CTF can now be specified in src.conf (not recommended, there are some problems with static executables), make.conf (would also Modified: projects/quota64/bin/sh/eval.c ============================================================================== --- projects/quota64/bin/sh/eval.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/bin/sh/eval.c Thu May 6 17:37:23 2010 (r207707) @@ -937,6 +937,8 @@ evalcommand(union node *cmd, int flags, cmdentry.special = 1; if (cmdentry.special) listsetvar(cmdenviron); + if (argc > 0) + bltinsetlocale(); commandname = argv[0]; argptr = argv + 1; nextopt_optptr = NULL; /* initialize nextopt */ @@ -944,6 +946,8 @@ evalcommand(union node *cmd, int flags, exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv); flushall(); cmddone: + if (argc > 0) + bltinunsetlocale(); cmdenviron = NULL; out1 = &output; out2 = &errout; Modified: projects/quota64/bin/sh/var.c ============================================================================== --- projects/quota64/bin/sh/var.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/bin/sh/var.c Thu May 6 17:37:23 2010 (r207707) @@ -122,6 +122,14 @@ STATIC const struct varinit varinit[] = STATIC struct var *vartab[VTABSIZE]; +STATIC const char *const locale_names[7] = { + "LC_COLLATE", "LC_CTYPE", "LC_MONETARY", + "LC_NUMERIC", "LC_TIME", "LC_MESSAGES", NULL +}; +STATIC const int locale_categories[7] = { + LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, LC_TIME, LC_MESSAGES, 0 +}; + STATIC struct var **hashvar(const char *); STATIC int varequal(const char *, const char *); STATIC int localevar(const char *); @@ -258,11 +266,7 @@ setvar(const char *name, const char *val STATIC int localevar(const char *s) { - static const char *lnames[7] = { - "ALL", "COLLATE", "CTYPE", "MONETARY", - "NUMERIC", "TIME", NULL - }; - const char **ss; + const char *const *ss; if (*s != 'L') return 0; @@ -270,8 +274,10 @@ localevar(const char *s) return 1; if (strncmp(s + 1, "C_", 2) != 0) return 0; - for (ss = lnames; *ss ; ss++) - if (varequal(s + 3, *ss)) + if (varequal(s + 3, "ALL")) + return 1; + for (ss = locale_names; *ss ; ss++) + if (varequal(s + 3, *ss + 3)) return 1; return 0; } @@ -437,6 +443,61 @@ bltinlookup(const char *name, int doall) } +/* + * Set up locale for a builtin (LANG/LC_* assignments). + */ +void +bltinsetlocale(void) +{ + struct strlist *lp; + int act = 0; + char *loc, *locdef; + int i; + + for (lp = cmdenviron ; lp ; lp = lp->next) { + if (localevar(lp->text)) { + act = 1; + break; + } + } + if (!act) + return; + loc = bltinlookup("LC_ALL", 0); + INTOFF; + if (loc != NULL) { + setlocale(LC_ALL, loc); + INTON; + return; + } + locdef = bltinlookup("LANG", 0); + for (i = 0; locale_names[i] != NULL; i++) { + loc = bltinlookup(locale_names[i], 0); + if (loc == NULL) + loc = locdef; + if (loc != NULL) + setlocale(locale_categories[i], loc); + } + INTON; +} + +/* + * Undo the effect of bltinlocaleset(). + */ +void +bltinunsetlocale(void) +{ + struct strlist *lp; + + INTOFF; + for (lp = cmdenviron ; lp ; lp = lp->next) { + if (localevar(lp->text)) { + setlocale(LC_ALL, ""); + return; + } + } + INTON; +} + /* * Generate a list of exported variables. This routine is used to construct Modified: projects/quota64/bin/sh/var.h ============================================================================== --- projects/quota64/bin/sh/var.h Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/bin/sh/var.h Thu May 6 17:37:23 2010 (r207707) @@ -107,6 +107,8 @@ struct strlist; void listsetvar(struct strlist *); char *lookupvar(const char *); char *bltinlookup(const char *, int); +void bltinsetlocale(void); +void bltinunsetlocale(void); char **environment(void); int showvarscmd(int, char **); int exportcmd(int, char **); Modified: projects/quota64/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/quota64/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Thu May 6 17:37:23 2010 (r207707) @@ -1790,7 +1790,7 @@ zfs_do_list(int argc, char **argv) boolean_t scripted = B_FALSE; static char default_fields[] = "name,used,available,referenced,mountpoint"; - int types = ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME; + int types = ZFS_TYPE_DATASET; boolean_t types_specified = B_FALSE; char *fields = NULL; list_cbdata_t cb = { 0 }; Modified: projects/quota64/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/quota64/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Thu May 6 17:37:23 2010 (r207707) @@ -879,17 +879,21 @@ int zpool_do_export(int argc, char **argv) { boolean_t force = B_FALSE; + boolean_t hardforce = B_FALSE; int c; zpool_handle_t *zhp; int ret; int i; /* check options */ - while ((c = getopt(argc, argv, "f")) != -1) { + while ((c = getopt(argc, argv, "fF")) != -1) { switch (c) { case 'f': force = B_TRUE; break; + case 'F': + hardforce = B_TRUE; + break; case '?': (void) fprintf(stderr, gettext("invalid option '%c'\n"), optopt); @@ -919,8 +923,12 @@ zpool_do_export(int argc, char **argv) continue; } - if (zpool_export(zhp, force) != 0) + if (hardforce) { + if (zpool_export_force(zhp) != 0) + ret = 1; + } else if (zpool_export(zhp, force) != 0) { ret = 1; + } zpool_close(zhp); } Modified: projects/quota64/cddl/contrib/opensolaris/cmd/ztest/ztest.c ============================================================================== --- projects/quota64/cddl/contrib/opensolaris/cmd/ztest/ztest.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/cddl/contrib/opensolaris/cmd/ztest/ztest.c Thu May 6 17:37:23 2010 (r207707) @@ -3039,7 +3039,7 @@ ztest_spa_import_export(char *oldname, c /* * Export it. */ - error = spa_export(oldname, &config, B_FALSE); + error = spa_export(oldname, &config, B_FALSE, B_FALSE); if (error) fatal(0, "spa_export('%s') = %d", oldname, error); Modified: projects/quota64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- projects/quota64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Thu May 6 17:37:23 2010 (r207707) @@ -289,6 +289,7 @@ extern int zpool_get_errlog(zpool_handle * Import and export functions */ extern int zpool_export(zpool_handle_t *, boolean_t); +extern int zpool_export_force(zpool_handle_t *); extern int zpool_import(libzfs_handle_t *, nvlist_t *, const char *, char *altroot); extern int zpool_import_props(libzfs_handle_t *, nvlist_t *, const char *, Modified: projects/quota64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c ============================================================================== --- projects/quota64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Thu May 6 17:37:23 2010 (r207707) @@ -1096,7 +1096,7 @@ zpool_add(zpool_handle_t *zhp, nvlist_t * mounted datasets in the pool. */ int -zpool_export(zpool_handle_t *zhp, boolean_t force) +zpool_export_common(zpool_handle_t *zhp, boolean_t force, boolean_t hardforce) { zfs_cmd_t zc = { 0 }; char msg[1024]; @@ -1109,6 +1109,7 @@ zpool_export(zpool_handle_t *zhp, boolea (void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name)); zc.zc_cookie = force; + zc.zc_guid = hardforce; if (zfs_ioctl(zhp->zpool_hdl, ZFS_IOC_POOL_EXPORT, &zc) != 0) { switch (errno) { @@ -1129,6 +1130,18 @@ zpool_export(zpool_handle_t *zhp, boolea return (0); } +int +zpool_export(zpool_handle_t *zhp, boolean_t force) +{ + return (zpool_export_common(zhp, force, B_FALSE)); +} + +int +zpool_export_force(zpool_handle_t *zhp) +{ + return (zpool_export_common(zhp, B_TRUE, B_TRUE)); +} + /* * zpool_import() is a contracted interface. Should be kept the same * if possible. Modified: projects/quota64/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c ============================================================================== --- projects/quota64/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Thu May 6 17:37:23 2010 (r207707) @@ -355,14 +355,21 @@ write_type(void *arg1, void *arg2) for (i = 0, ep = tp->t_emem; ep != NULL; ep = ep->el_next) i++; /* count up enum members */ + if (i > CTF_MAX_VLEN) { + warning("enum %s has too many values: %d > %d\n", + tdesc_name(tp), i, CTF_MAX_VLEN); + i = CTF_MAX_VLEN; + } + ctt.ctt_info = CTF_TYPE_INFO(CTF_K_ENUM, isroot, i); write_sized_type_rec(b, &ctt, tp->t_size); - for (ep = tp->t_emem; ep != NULL; ep = ep->el_next) { + for (ep = tp->t_emem; ep != NULL && i > 0; ep = ep->el_next) { offset = strtab_insert(&b->ctb_strtab, ep->el_name); cte.cte_name = CTF_TYPE_NAME(CTF_STRTAB_0, offset); cte.cte_value = ep->el_number; ctf_buf_write(b, &cte, sizeof (cte)); + i--; } break; Modified: projects/quota64/contrib/telnet/telnet/commands.c ============================================================================== --- projects/quota64/contrib/telnet/telnet/commands.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/contrib/telnet/telnet/commands.c Thu May 6 17:37:23 2010 (r207707) @@ -2491,8 +2491,7 @@ tn(int argc, char *argv[]) env_export("USER"); } (void) call(status, "status", "notmuch", 0); - if (setjmp(peerdied) == 0) - telnet(user); + telnet(user); (void) NetClose(net); ExitString("Connection closed by foreign host.\n",1); /*NOTREACHED*/ Modified: projects/quota64/contrib/telnet/telnet/externs.h ============================================================================== --- projects/quota64/contrib/telnet/telnet/externs.h Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/contrib/telnet/telnet/externs.h Thu May 6 17:37:23 2010 (r207707) @@ -233,7 +233,6 @@ extern void SetNetTrace(char *); /* Function to change where debugging goes */ extern jmp_buf - peerdied, toplevel; /* For error conditions. */ extern void Modified: projects/quota64/contrib/telnet/telnet/network.c ============================================================================== --- projects/quota64/contrib/telnet/telnet/network.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/contrib/telnet/telnet/network.c Thu May 6 17:37:23 2010 (r207707) @@ -158,7 +158,7 @@ netflush(void) perror(hostname); (void)NetClose(net); ring_clear_mark(&netoring); - longjmp(peerdied, -1); + ExitString("Connection closed by foreign host.\n", 1); /*NOTREACHED*/ } n = 0; Modified: projects/quota64/contrib/telnet/telnet/sys_bsd.c ============================================================================== --- projects/quota64/contrib/telnet/telnet/sys_bsd.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/contrib/telnet/telnet/sys_bsd.c Thu May 6 17:37:23 2010 (r207707) @@ -809,14 +809,6 @@ NetNonblockingIO(int fd, int onoff) */ /* ARGSUSED */ -static SIG_FUNC_RET -deadpeer(int sig __unused) -{ - setcommandmode(); - longjmp(peerdied, -1); -} - -/* ARGSUSED */ SIG_FUNC_RET intr(int sig __unused) { @@ -884,7 +876,7 @@ sys_telnet_init(void) { (void) signal(SIGINT, intr); (void) signal(SIGQUIT, intr2); - (void) signal(SIGPIPE, deadpeer); + (void) signal(SIGPIPE, SIG_IGN); #ifdef SIGWINCH (void) signal(SIGWINCH, sendwin); #endif Modified: projects/quota64/contrib/telnet/telnet/telnet.c ============================================================================== --- projects/quota64/contrib/telnet/telnet/telnet.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/contrib/telnet/telnet/telnet.c Thu May 6 17:37:23 2010 (r207707) @@ -146,7 +146,6 @@ unsigned char telopt_environ = TELOPT_NE #endif jmp_buf toplevel; -jmp_buf peerdied; int flushline; int linemode; Modified: projects/quota64/contrib/telnet/telnet/terminal.c ============================================================================== --- projects/quota64/contrib/telnet/telnet/terminal.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/contrib/telnet/telnet/terminal.c Thu May 6 17:37:23 2010 (r207707) @@ -111,7 +111,8 @@ init_terminal(void) } /* - * Send as much data as possible to the terminal. + * Send as much data as possible to the terminal, else exits if + * it encounters a permanent failure when writing to the tty. * * Return value: * -1: No useful work done, data waiting to go out. @@ -152,8 +153,19 @@ ttyflush(int drop) } ring_consumed(&ttyoring, n); } - if (n < 0) + if (n < 0) { + if (errno == EAGAIN || errno == EINTR) { + return -1; + } else { + ring_consumed(&ttyoring, ring_full_count(&ttyoring)); + setconnmode(0); + setcommandmode(); + NetClose(net); + fprintf(stderr, "Write error on local output.\n"); + exit(1); + } return -1; + } if (n == n0) { if (n0) return -1; Modified: projects/quota64/contrib/tzcode/zic/private.h ============================================================================== --- projects/quota64/contrib/tzcode/zic/private.h Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/contrib/tzcode/zic/private.h Thu May 6 17:37:23 2010 (r207707) @@ -34,7 +34,7 @@ static const char privatehid[] = "@(#)pr #endif /* !defined NOID */ #endif /* !defined lint */ -#define GRANDPARENTED "Local time zone must be set--see zic manual page" +#define GRANDPARENTED "Local time zone must be set--use tzsetup" /* ** Defaults for preprocessor symbols. Modified: projects/quota64/crypto/openssh/ChangeLog ============================================================================== --- projects/quota64/crypto/openssh/ChangeLog Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/ChangeLog Thu May 6 17:37:23 2010 (r207707) @@ -1,4 +1,120 @@ -20100307 +20100410 + - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo + back so we disable the IPv6 tests if we don't have it. + +20100409 + - (dtucker) [contrib/cygwin/Makefile] Don't overwrite files with the wrong + ones. Based on a patch from Roumen Petrov. + - (dtucker) [configure.ac] Bug #1744: use pkg-config for libedit flags if we + have it and the path is not provided to --with-libedit. Based on a patch + from Iain Morgan. + - (dtucker) [configure.ac defines.h loginrec.c logintest.c] Bug #1732: enable + utmpx support on FreeBSD where possible. Patch from Ed Schouten, ok djm@ + +20100326 + - (djm) [openbsd-compat/bsd-arc4random.c] Fix preprocessor detection + for arc4random_buf() and arc4random_uniform(); from Josh Gilkerson + - (dtucker) [configure.ac] Bug #1741: Add section for Haiku, patch originally + by Ingo Weinhold via Scott McCreary, ok djm@ + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2010/03/25 23:38:28 + [servconf.c] + from portable: getcwd(NULL, 0) doesn't work on all platforms, so + use a stack buffer; ok dtucker@ + - djm@cvs.openbsd.org 2010/03/26 00:26:58 + [ssh.1] + mention that -S none disables connection sharing; from Colin Watson + - (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms - + set up SELinux execution context before chroot() call. From Russell + Coker via Colin watson; bz#1726 ok dtucker@ + - (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721 + ok dtucker@ + - (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using + pkg-config, patch from Colin Watson. Needed for newer linkers (ie gold). + - (djm) [contrib/ssh-copy-id] Don't blow up when the agent has no keys; + bz#1723 patch from Adeodato Simóvia Colin Watson; ok dtucker@ + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2010/03/26 01:06:13 + [ssh_config.5] + Reformat default value of PreferredAuthentications entry (current + formatting implies ", " is acceptable as a separator, which it's not. + ok djm@ + +20100324 + - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory + containing the services file explicitely case-insensitive. This allows to + tweak the Windows services file reliably. Patch from vinschen at redhat. + +20100321 + - (djm) OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2010/03/08 09:41:27 + [ssh-keygen.1] + sort the list of constraints (to -O); ok djm + - jmc@cvs.openbsd.org 2010/03/10 07:40:35 + [ssh-keygen.1] + typos; from Ross Richardson + closes prs 6334 and 6335 + - djm@cvs.openbsd.org 2010/03/10 23:27:17 + [auth2-pubkey.c] + correct certificate logging and make it more consistent between + authorized_keys and TrustedCAKeys; ok markus@ + - djm@cvs.openbsd.org 2010/03/12 01:06:25 + [servconf.c] + unbreak AuthorizedKeys option with a $HOME-relative path; reported by + vinschen AT redhat.com, ok dtucker@ + - markus@cvs.openbsd.org 2010/03/12 11:37:40 + [servconf.c] + do not prepend AuthorizedKeysFile with getcwd(), unbreaks relative paths + free() (not xfree()) the buffer returned by getcwd() + - djm@cvs.openbsd.org 2010/03/13 21:10:38 + [clientloop.c] + protocol conformance fix: send language tag when disconnecting normally; + spotted by 1.41421 AT gmail.com, ok markus@ deraadt@ + - djm@cvs.openbsd.org 2010/03/13 21:45:46 + [ssh-keygen.1] + Certificates are named *-cert.pub, not *_cert.pub; committing a diff + from stevesk@ ok me + - jmc@cvs.openbsd.org 2010/03/13 23:38:13 + [ssh-keygen.1] + fix a formatting error (args need quoted); noted by stevesk + - stevesk@cvs.openbsd.org 2010/03/15 19:40:02 + [key.c key.h ssh-keygen.c] + also print certificate type (user or host) for ssh-keygen -L + ok djm kettenis + - stevesk@cvs.openbsd.org 2010/03/16 15:46:52 + [auth-options.c] + spelling in error message. ok djm kettenis + - djm@cvs.openbsd.org 2010/03/16 16:36:49 + [version.h] + crank version to openssh-5.5 since we have a few fixes since 5.4; + requested deraadt@ kettenis@ + - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Crank version numbers + +20100314 + - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix + compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot + AT fefe.de + - (djm) [Makefile.in] Respecify -lssh after -lopenbsd-compat for + ssh-pkcs11-helper to repair static builds (we do the same for + ssh-keyscan). Reported by felix-mindrot AT fefe.de + +20100312 + - (tim) [Makefile.in] Now that scard is gone, no need to make $(datadir) + - (tim) [Makefile.in] Add missing $(EXEEXT) to install targets. + Patch from Corinna Vinschen. + - (tim) [contrib/cygwin/Makefile] Fix list of documentation files to install + on a Cygwin installation. Patch from Corinna Vinschen. + +20100311 + - (tim) [contrib/suse/openssh.spec] crank version number here too. + report by imorgan AT nas.nasa.gov + +20100309 + - (dtucker) [configure.ac] Use a proper AC_CHECK_DECL for BROKEN_GETADDRINFO + so setting it in CFLAGS correctly skips IPv6 tests. + +20100428 - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2010/03/07 22:16:01 [ssh-keygen.c] Modified: projects/quota64/crypto/openssh/README ============================================================================== --- projects/quota64/crypto/openssh/README Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/README Thu May 6 17:37:23 2010 (r207707) @@ -1,4 +1,4 @@ -See http://www.openssh.com/txt/release-5.4 for the release notes. +See http://www.openssh.com/txt/release-5.5 for the release notes. - A Japanese translation of this document and of the OpenSSH FAQ is - available at http://www.unixuser.org/~haruyama/security/openssh/index.html @@ -62,4 +62,4 @@ References - [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 [7] http://www.openssh.com/faq.html -$Id: README,v 1.72 2010/03/07 22:41:02 djm Exp $ +$Id: README,v 1.73 2010/03/21 19:11:55 djm Exp $ Modified: projects/quota64/crypto/openssh/auth-options.c ============================================================================== --- projects/quota64/crypto/openssh/auth-options.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/auth-options.c Thu May 6 17:37:23 2010 (r207707) @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-options.c,v 1.48 2010/03/07 11:57:13 dtucker Exp $ */ +/* $OpenBSD: auth-options.c,v 1.49 2010/03/16 15:46:52 stevesk Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -434,7 +434,7 @@ auth_cert_constraints(Buffer *c_orig, st goto out; } if (strlen(command) != clen) { - error("force-command constrain contains \\0"); + error("force-command constraint contains \\0"); goto out; } if (cert_forced_command != NULL) { @@ -454,7 +454,7 @@ auth_cert_constraints(Buffer *c_orig, st goto out; } if (strlen(allowed) != clen) { - error("source-address constrain contains \\0"); + error("source-address constraint contains \\0"); goto out; } if (cert_source_address_done++) { Modified: projects/quota64/crypto/openssh/auth2-pubkey.c ============================================================================== --- projects/quota64/crypto/openssh/auth2-pubkey.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/auth2-pubkey.c Thu May 6 17:37:23 2010 (r207707) @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.21 2010/03/04 10:36:03 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.22 2010/03/10 23:27:17 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -240,22 +240,26 @@ user_key_allowed2(struct passwd *pw, Key continue; if (!key_equal(found, key->cert->signature_key)) continue; - debug("matching CA found: file %s, line %lu", - file, linenum); fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); - verbose("Found matching %s CA: %s", - key_type(found), fp); - xfree(fp); + debug("matching CA found: file %s, line %lu, %s %s", + file, linenum, key_type(found), fp); if (key_cert_check_authority(key, 0, 0, pw->pw_name, &reason) != 0) { + xfree(fp); error("%s", reason); auth_debug_add("%s", reason); continue; } if (auth_cert_constraints(&key->cert->constraints, - pw) != 0) + pw) != 0) { + xfree(fp); continue; + } + verbose("Accepted certificate ID \"%s\" " + "signed by %s CA %s via %s", key->cert->key_id, + key_type(found), fp, file); + xfree(fp); found_key = 1; break; } else if (!key_is_cert_authority && key_equal(found, key)) { @@ -281,15 +285,15 @@ user_key_allowed2(struct passwd *pw, Key static int user_cert_trusted_ca(struct passwd *pw, Key *key) { - char *key_fp, *ca_fp; + char *ca_fp; const char *reason; int ret = 0; if (!key_is_cert(key) || options.trusted_user_ca_keys == NULL) return 0; - key_fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); - ca_fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); + ca_fp = key_fingerprint(key->cert->signature_key, + SSH_FP_MD5, SSH_FP_HEX); if (key_in_file(key->cert->signature_key, options.trusted_user_ca_keys, 1) != 1) { @@ -306,13 +310,12 @@ user_cert_trusted_ca(struct passwd *pw, if (auth_cert_constraints(&key->cert->constraints, pw) != 0) goto out; - verbose("%s certificate %s allowed by trusted %s key %s", - key_type(key), key_fp, key_type(key->cert->signature_key), ca_fp); + verbose("Accepted certificate ID \"%s\" signed by %s CA %s via %s", + key->cert->key_id, key_type(key->cert->signature_key), ca_fp, + options.trusted_user_ca_keys); ret = 1; out: - if (key_fp != NULL) - xfree(key_fp); if (ca_fp != NULL) xfree(ca_fp); return ret; Modified: projects/quota64/crypto/openssh/channels.c ============================================================================== --- projects/quota64/crypto/openssh/channels.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/channels.c Thu May 6 17:37:23 2010 (r207707) @@ -3252,7 +3252,11 @@ x11_create_display_inet(int x11_display_ sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); if (sock < 0) { - if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) { + if ((errno != EINVAL) && (errno != EAFNOSUPPORT) +#ifdef EPFNOSUPPORT + && (errno != EPFNOSUPPORT) +#endif + ) { error("socket: %.100s", strerror(errno)); freeaddrinfo(aitop); return -1; Modified: projects/quota64/crypto/openssh/clientloop.c ============================================================================== --- projects/quota64/crypto/openssh/clientloop.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/clientloop.c Thu May 6 17:37:23 2010 (r207707) @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.218 2010/01/28 00:21:18 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.219 2010/03/13 21:10:38 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1484,6 +1484,7 @@ client_loop(int have_pty, int escape_cha packet_start(SSH2_MSG_DISCONNECT); packet_put_int(SSH2_DISCONNECT_BY_APPLICATION); packet_put_cstring("disconnected by user"); + packet_put_cstring(""); /* language tag */ packet_send(); packet_write_wait(); } Modified: projects/quota64/crypto/openssh/config.h ============================================================================== --- projects/quota64/crypto/openssh/config.h Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/config.h Thu May 6 17:37:23 2010 (r207707) @@ -124,7 +124,7 @@ #define DISABLE_WTMPX 1 /* Enable for PKCS#11 support */ -#define ENABLE_PKCS11 +#define ENABLE_PKCS11 /**/ /* Builtin PRNG command timeout */ #define ENTROPY_TIMEOUT_MSEC 200 @@ -456,6 +456,9 @@ /* Define to 1 if you have the `getutxline' function. */ #define HAVE_GETUTXLINE 1 +/* Define to 1 if you have the `getutxuser' function. */ +#define HAVE_GETUTXUSER 1 + /* Define to 1 if you have the `get_default_context_with_level' function. */ /* #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL */ @@ -552,6 +555,9 @@ /* Define if system has libiaf that supports set_id */ /* #undef HAVE_LIBIAF */ +/* Define to 1 if you have the `network' library (-lnetwork). */ +/* #undef HAVE_LIBNETWORK */ + /* Define to 1 if you have the `nsl' library (-lnsl). */ /* #undef HAVE_LIBNSL */ @@ -805,6 +811,9 @@ /* Define to 1 if you have the `setutent' function. */ /* #undef HAVE_SETUTENT */ +/* Define to 1 if you have the `setutxdb' function. */ +#define HAVE_SETUTXDB 1 + /* Define to 1 if you have the `setutxent' function. */ #define HAVE_SETUTXENT 1 @@ -1416,8 +1425,8 @@ /* Define if you want SELinux support. */ /* #undef WITH_SELINUX */ -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ #if defined __BIG_ENDIAN__ # define WORDS_BIGENDIAN 1 #elif ! defined __LITTLE_ENDIAN__ Modified: projects/quota64/crypto/openssh/config.h.in ============================================================================== --- projects/quota64/crypto/openssh/config.h.in Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/config.h.in Thu May 6 17:37:23 2010 (r207707) @@ -80,9 +80,6 @@ /* Define if you want to specify the path to your lastlog file */ #undef CONF_LASTLOG_FILE -/* Define if you want to specify the path to your utmpx file */ -#undef CONF_UTMPX_FILE - /* Define if you want to specify the path to your utmp file */ #undef CONF_UTMP_FILE @@ -455,6 +452,9 @@ /* Define to 1 if you have the `getutxline' function. */ #undef HAVE_GETUTXLINE +/* Define to 1 if you have the `getutxuser' function. */ +#undef HAVE_GETUTXUSER + /* Define to 1 if you have the `get_default_context_with_level' function. */ #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL @@ -551,6 +551,9 @@ /* Define if system has libiaf that supports set_id */ #undef HAVE_LIBIAF +/* Define to 1 if you have the `network' library (-lnetwork). */ +#undef HAVE_LIBNETWORK + /* Define to 1 if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL @@ -804,6 +807,9 @@ /* Define to 1 if you have the `setutent' function. */ #undef HAVE_SETUTENT +/* Define to 1 if you have the `setutxdb' function. */ +#undef HAVE_SETUTXDB + /* Define to 1 if you have the `setutxent' function. */ #undef HAVE_SETUTXENT Modified: projects/quota64/crypto/openssh/defines.h ============================================================================== --- projects/quota64/crypto/openssh/defines.h Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/defines.h Thu May 6 17:37:23 2010 (r207707) @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.159 2010/01/13 23:44:34 tim Exp $ */ +/* $Id: defines.h,v 1.160 2010/04/09 08:13:27 dtucker Exp $ */ /* Constants */ Modified: projects/quota64/crypto/openssh/key.c ============================================================================== --- projects/quota64/crypto/openssh/key.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/key.c Thu May 6 17:37:23 2010 (r207707) @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.85 2010/03/04 01:44:57 djm Exp $ */ +/* $OpenBSD: key.c,v 1.86 2010/03/15 19:40:02 stevesk Exp $ */ /* * read_bignum(): * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -802,6 +802,19 @@ key_type(const Key *k) } const char * +key_cert_type(const Key *k) +{ + switch (k->cert->type) { + case SSH2_CERT_TYPE_USER: + return "user"; + case SSH2_CERT_TYPE_HOST: + return "host"; + default: + return "unknown"; + } +} + +const char * key_ssh_name(const Key *k) { switch (k->type) { Modified: projects/quota64/crypto/openssh/key.h ============================================================================== --- projects/quota64/crypto/openssh/key.h Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/key.h Thu May 6 17:37:23 2010 (r207707) @@ -1,4 +1,4 @@ -/* $OpenBSD: key.h,v 1.28 2010/02/26 20:29:54 djm Exp $ */ +/* $OpenBSD: key.h,v 1.29 2010/03/15 19:40:02 stevesk Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -82,6 +82,7 @@ int key_equal(const Key *, const Key * char *key_fingerprint(Key *, enum fp_type, enum fp_rep); u_char *key_fingerprint_raw(Key *, enum fp_type, u_int *); const char *key_type(const Key *); +const char *key_cert_type(const Key *); int key_write(const Key *, FILE *); int key_read(Key *, char **); u_int key_size(const Key *); Modified: projects/quota64/crypto/openssh/loginrec.c ============================================================================== --- projects/quota64/crypto/openssh/loginrec.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/loginrec.c Thu May 6 17:37:23 2010 (r207707) @@ -510,6 +510,10 @@ getlast_entry(struct logininfo *li) #ifdef USE_LASTLOG return(lastlog_get_entry(li)); #else /* !USE_LASTLOG */ +#if defined(USE_UTMPX) && defined(HAVE_SETUTXDB) && \ + defined(UTXDB_LASTLOGIN) && defined(HAVE_GETUTXUSER) + return (utmpx_get_entry(li)); +#endif #if 1 return (utmpx_get_entry(li)); @@ -1614,7 +1618,8 @@ lastlog_get_entry(struct logininfo *li) #endif /* HAVE_GETLASTLOGXBYNAME */ #endif /* USE_LASTLOG */ -#if 1 +#if defined(USE_UTMPX) && defined(HAVE_SETUTXDB) && \ + defined(UTXDB_LASTLOGIN) && defined(HAVE_GETUTXUSER) int utmpx_get_entry(struct logininfo *li) { @@ -1637,7 +1642,7 @@ utmpx_get_entry(struct logininfo *li) endutxent(); return (1); } -#endif +#endif /* USE_UTMPX && HAVE_SETUTXDB && UTXDB_LASTLOGIN && HAVE_GETUTXUSER */ #ifdef USE_BTMP /* Modified: projects/quota64/crypto/openssh/logintest.c ============================================================================== --- projects/quota64/crypto/openssh/logintest.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/logintest.c Thu May 6 17:37:23 2010 (r207707) @@ -264,7 +264,7 @@ showOptions(void) printf("\tUSE_UTMP (UTMP_FILE=%s)\n", UTMP_FILE); #endif #ifdef USE_UTMPX - printf("\tUSE_UTMPX (UTMPX_FILE=%s)\n", UTMPX_FILE); + printf("\tUSE_UTMPX\n"); #endif #ifdef USE_WTMP printf("\tUSE_WTMP (WTMP_FILE=%s)\n", WTMP_FILE); Modified: projects/quota64/crypto/openssh/openbsd-compat/bsd-arc4random.c ============================================================================== --- projects/quota64/crypto/openssh/openbsd-compat/bsd-arc4random.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/openbsd-compat/bsd-arc4random.c Thu May 6 17:37:23 2010 (r207707) @@ -84,7 +84,7 @@ arc4random_stir(void) } #endif /* !HAVE_ARC4RANDOM */ -#ifndef ARC4RANDOM_BUF +#ifndef HAVE_ARC4RANDOM_BUF void arc4random_buf(void *_buf, size_t n) { @@ -102,7 +102,7 @@ arc4random_buf(void *_buf, size_t n) } #endif /* !HAVE_ARC4RANDOM_BUF */ -#ifndef ARC4RANDOM_UNIFORM +#ifndef HAVE_ARC4RANDOM_UNIFORM /* * Calculate a uniformly distributed random number less than upper_bound * avoiding "modulo bias". Modified: projects/quota64/crypto/openssh/servconf.c ============================================================================== --- projects/quota64/crypto/openssh/servconf.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/servconf.c Thu May 6 17:37:23 2010 (r207707) @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.c,v 1.204 2010/03/04 10:36:03 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.207 2010/03/25 23:38:28 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved @@ -474,15 +474,14 @@ parse_token(const char *cp, const char * char * derelativise_path(const char *path) { - char *expanded, *ret, *cwd; + char *expanded, *ret, cwd[MAXPATHLEN]; expanded = tilde_expand_filename(path, getuid()); if (*expanded == '/') return expanded; - if ((cwd = getcwd(NULL, 0)) == NULL) + if (getcwd(cwd, sizeof(cwd)) == NULL) fatal("%s: getcwd: %s", __func__, strerror(errno)); xasprintf(&ret, "%s/%s", cwd, expanded); - xfree(cwd); xfree(expanded); return ret; } @@ -1227,7 +1226,17 @@ process_server_config_line(ServerOptions charptr = (opcode == sAuthorizedKeysFile) ? &options->authorized_keys_file : &options->authorized_keys_file2; - goto parse_filename; + arg = strdelim(&cp); + if (!arg || *arg == '\0') + fatal("%s line %d: missing file name.", + filename, linenum); + if (*activep && *charptr == NULL) { + *charptr = tilde_expand_filename(arg, getuid()); + /* increase optional counter */ + if (intptr != NULL) + *intptr = *intptr + 1; + } + break; case sClientAliveInterval: intptr = &options->client_alive_interval; Modified: projects/quota64/crypto/openssh/session.c ============================================================================== --- projects/quota64/crypto/openssh/session.c Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/session.c Thu May 6 17:37:23 2010 (r207707) @@ -1581,6 +1581,10 @@ do_setusercontext(struct passwd *pw) } #endif /* HAVE_SETPCRED */ +#ifdef WITH_SELINUX + ssh_selinux_setup_exec_context(pw->pw_name); +#endif + if (options.chroot_directory != NULL && strcasecmp(options.chroot_directory, "none") != 0) { tmp = tilde_expand_filename(options.chroot_directory, @@ -1605,10 +1609,6 @@ do_setusercontext(struct passwd *pw) if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) fatal("Failed to set uids to %u.", (u_int) pw->pw_uid); - -#ifdef WITH_SELINUX - ssh_selinux_setup_exec_context(pw->pw_name); -#endif } static void Modified: projects/quota64/crypto/openssh/ssh-keygen.1 ============================================================================== --- projects/quota64/crypto/openssh/ssh-keygen.1 Thu May 6 17:28:59 2010 (r207706) +++ projects/quota64/crypto/openssh/ssh-keygen.1 Thu May 6 17:37:23 2010 (r207707) @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.88 2010/03/08 00:28:55 djm Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.92 2010/03/13 23:38:13 jmc Exp $ .\" $FreeBSD$ .\" .\" -*- nroff -*- @@ -38,7 +38,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd March 8 2010 +.Dd March 13 2010 .Dt SSH-KEYGEN 1 .Os .Sh NAME @@ -308,8 +308,15 @@ Please see the section for details. The constraints that are valid for user certificates are: .Bl -tag -width Ds -.It Ic no-x11-forwarding -Disable X11 forwarding (permitted by default). +.It Ic clear +Clear all enabled permissions. +This is useful for clearing the default set of permissions so permissions may +be added individually. +.It Ic force-command Ns = Ns Ar command +Forces the execution of +.Ar command +instead of any shell or command specified by the user when +the certificate is used for authentication. .It Ic no-agent-forwarding Disable .Xr ssh-agent 1 @@ -324,12 +331,8 @@ Disable execution of by .Xr sshd 8 (permitted by default). -.It Ic clear -Clear all enabled permissions. -This is useful for clearing the default set of permissions so permissions may -be added individually. -.It Ic permit-x11-forwarding -Allows X11 forwarding. +.It Ic no-x11-forwarding +Disable X11 forwarding (permitted by default). *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***