Date: Mon, 28 Jul 2008 13:57:12 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 146121 for review Message-ID: <200807281357.m6SDvCrE014702@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=146121 Change 146121 by trasz@trasz_traszkan on 2008/07/28 13:56:45 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/lib/printnat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/test/regress/n12#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/test/regress/n2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/test/regress/n5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/test/regress/ni1.nat#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/test/regress/ni2.nat#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/test/regress/ni4.nat#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/Makefile.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/Makefile.inc#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/buildpkg.sh.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/config.sub#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/configure.ac#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/install-sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/mdoc2man.awk#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/nchan.ms#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/nchan2.ms#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/Makefile.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/regress/Makefile.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/regress/closefromtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/regress/snprintftest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/regress/strduptest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openbsd-compat/regress/strtonumtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/openssh.xml.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/opensshd.init.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/README.regress#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/agent-getpeereid.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/agent-ptrace.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/agent-timeout.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/agent.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/banner.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/broken-pipe.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/brokenkeys.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/bsd.regress.mk#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/cfgmatch.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/cipher-speed.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/connect-privsep.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/connect.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/copy.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/copy.2#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/dsa_ssh2.prv#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/dsa_ssh2.pub#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/dynamic-forward.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/envpass.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/exit-status.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/forcecommand.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/forwarding.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/keygen-change.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/keyscan.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/login-timeout.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/multiplex.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/proto-mismatch.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/proto-version.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/proxy-connect.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/reconfigure.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/reexec.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/rekey.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/rsa_openssh.prv#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/rsa_openssh.pub#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/rsa_ssh2.prv#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/runtests.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/scp-ssh-wrapper.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/scp.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/sftp-badcmds.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/sftp-batch.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/sftp-cmds.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/sftp-glob.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/sftp.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/ssh-com-client.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/ssh-com-keygen.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/ssh-com-sftp.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/ssh-com.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/sshd-log-wrapper.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/stderr-after-eof.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/stderr-data.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/t4.ok#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/t5.ok#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/test-exec.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/transfer.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/try-ciphers.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/regress/yes-head.sh#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/scard/Makefile.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/scard/Ssh.bin#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/scard/Ssh.bin.uu#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/scard/Ssh.java#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/ssh_prng_cmds.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/survey.sh.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.resume#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/remote#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/sgtty.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/include/stdlib.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/arc4random.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawn.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawn_file_actions_addopen.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawn_file_actions_init.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_getflags.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_getpgroup.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_getschedparam.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_getschedpolicy.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_getsigdefault.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_getsigmask.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_init.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/mktemp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/setfib.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_mips.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/login.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/login_cap.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/login_class.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/login_class.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mksnap_ffs/mksnap_ffs.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/secure/lib/libcrypto/opensslconf-mips.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ddb.4#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/wi.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/sysctl.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/sysctl_add_oid.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/bsd-family-tree#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-ports.dot#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-src.dot#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.sys.mk#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.mk#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/ds1339.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/profile.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_environment.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exec.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fork.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_autoconf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_lock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_info.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/libkern/arc4random.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/mem/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf_buffer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_gre.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_hostap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_offload.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_offload.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipx/ipx_input.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipx/ipx_usrreq.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs4client/nfs4_socket.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/auth_unix.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpcclnt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/autoconf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/kernel.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/proc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/refcount.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/socket.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/calendar/calendars/calendar.freebsd#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gzip/gzip.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ldd/ldd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/procstat/procstat.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/bsdtar.1#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndiscvt/ndisgen.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtadvd/rtadvd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtsold/rtsold.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/setfib/setfib.c#3 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.153 2008/07/19 18:21:52 marcel Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.154 2008/07/25 12:37:46 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080725: sgtty.h removed +OLD_FILES+=usr/include/sgtty.h # 20080719: sade(8) removed on all but amd64, i386 and sparc64 .if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "i386" && \ ${TARGET_ARCH} != "sparc64" ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#5 (text+ko) ==== @@ -26,7 +26,7 @@ The sio(4) driver has been removed from the i386 and amd64 kernel configuration files. This means uart(4) is now the default serial port driver on those platforms as well. - + To prevent collisions with the sio(4) driver, the uart(4) driver uses different names for its device nodes. This means the onboard serial port will now most likely be called "ttyu0" @@ -40,7 +40,7 @@ 20080603: The version that Linuxulator emulates was changed from 2.4.2 to 2.6.16. If you experience any problems with Linux binaries - please try to set sysctl compat.linux.osrelease to 2.4.2 and + please try to set sysctl compat.linux.osrelease to 2.4.2 and if it fixes the problem contact emulation mailing list. 20080525: @@ -49,7 +49,7 @@ 20080509: I have checked in code to support multiple routing tables. - see the man pages setfib(1) and setfib(2). + See the man pages setfib(1) and setfib(2). This is a hopefully backwards compatible version, but to make use of it you need to compile your kernel with options ROUTETABLES=2 (or more up to 16). @@ -343,9 +343,9 @@ replace it as a more portable (and re-entrant) API. 20070224: - To support interrupt filtering a modification to the newbus API + To support interrupt filtering a modification to the newbus API has occurred, ABI was broken and __FreeBSD_version was bumped - to 700031. Please make sure that your kernel and modules are in + to 700031. Please make sure that your kernel and modules are in sync. For more info: http://docs.freebsd.org/cgi/mid.cgi?20070221233124.GA13941 @@ -404,8 +404,8 @@ 'hw.pci.enable_msix' tunables to 0 in the loader. 20061205: - The removal of several facets of the experimental Threading - system from the kernel means that the proc and thread structures + The removal of several facets of the experimental Threading + system from the kernel means that the proc and thread structures have changed quite a bit. I suggest all kernel modules that might reference these structures be recompiled.. Especially the linux module. @@ -457,7 +457,7 @@ The MUTEX_PROFILING option has been renamed to LOCK_PROFILING. The lockmgr object layout has been changed as a result of having a lock_object embedded in it. As a consequence all file system - kernel modules must be re-compiled. The mutex profiling man page + kernel modules must be re-compiled. The mutex profiling man page has not yet been updated to reflect this change. 20061026: @@ -506,7 +506,7 @@ after updating the kernel sources and compiling a new kernel, the i4b user space tools in "/usr/src/usr.sbin/i4b" must also be rebuilt, and vice versa. - + 20060627: The XBOX kernel now defaults to the nfe(4) driver instead of the nve(4) driver. Please update your configuration @@ -588,7 +588,7 @@ 20060201: The kernel ABI to file system modules was changed on i386. Please make sure that your kernel and modules are in sync. - + 20060118: This actually occured some time ago, but installing the kernel now also installs a bunch of symbol files for the kernel modules. @@ -1078,4 +1078,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.535 2008/07/13 07:20:14 ed Exp $ +$FreeBSD: src/UPDATING,v 1.537 2008/07/25 09:30:53 maxim Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/ip_fil.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.6 2007/10/18 21:52:11 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.7 2008/07/24 12:35:05 darrenr Exp $ */ /* * Copyright (C) 1993-2001 by Darren Reed. @@ -801,3 +801,18 @@ { return 0; } + + +u_32_t ipf_random() +{ + static int seeded = 0; + + /* + * Choose a non-random seed so that "randomness" can be "tested." + */ + if (seeded == 0) { + srand(0); + seeded = 1; + } + return rand(); +} ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/ipsend/iptests.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.14 2007/10/18 21:52:12 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.15 2008/07/24 12:35:05 darrenr Exp $ */ /* * Copyright (C) 1993-1998 by Darren Reed. @@ -24,6 +24,7 @@ #if !defined(__osf__) # ifdef __NetBSD__ # include <machine/lock.h> +# include <machine/mutex.h> # endif # define _KERNEL # define KERNEL ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/ipsend/sock.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.19 2007/10/18 21:52:12 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.21 2008/07/24 12:35:05 darrenr Exp $ */ /* * sock.c (C) 1995-1998 Darren Reed * @@ -32,16 +32,25 @@ #if !defined(__osf__) # ifdef __NetBSD__ # include <machine/lock.h> +# include <machine/mutex.h> +# endif +# ifdef __FreeBSD__ +# define _WANT_FILE +# else +# define _KERNEL +# define KERNEL # endif -# define _KERNEL -# define KERNEL # ifdef ultrix # undef LOCORE # include <sys/smp_lock.h> # endif # include <sys/file.h> -# undef _KERNEL -# undef KERNEL +# ifdef __FreeBSD__ +# undef _WANT_FILE +# else +# undef _KERNEL +# undef KERNEL +# endif #endif #include <nlist.h> #include <sys/user.h> ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/lib/printnat.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/lib/printnat.c,v 1.5 2007/10/18 21:52:12 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/lib/printnat.c,v 1.6 2008/07/24 12:35:05 darrenr Exp $ */ /* * Copyright (C) 2002-2005 by Darren Reed. @@ -217,6 +217,8 @@ putchar(' '); printproto(pr, np->in_p, np); } + if (np->in_flags & IPN_SEQUENTIAL) + printf(" sequential"); printf("\n"); if (opts & OPT_DEBUG) { struct in_addr nip; ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/test/regress/n12#2 (text+ko) ==== @@ -1,1 +1,1 @@ -map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000 +map le0 192.168.126.0/24 -> 0/32 portmap tcp/udp 10000:20000 sequential ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/test/regress/n2#2 (text+ko) ==== @@ -1,4 +1,4 @@ -map zx0 10.1.1.1/32 -> 10.2.2.2/32 portmap tcp 10000:20000 -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 -map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 +map zx0 10.1.1.1/32 -> 10.2.2.2/32 portmap tcp 10000:20000 sequential +map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential +map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential +map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/test/regress/n5#2 (text+ko) ==== @@ -1,6 +1,6 @@ map zx0 10.1.1.1/32 -> 10.2.2.2/32 map zx0 from 10.1.1.0/24 to 10.1.0.0/16 -> 10.3.4.5/32 map zx0 from 10.1.1.0/24 ! to 10.1.0.0/16 -> 10.3.4.0/24 -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 -map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 -map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 +map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap udp 10000:20000 sequential +map zx0 10.1.0.0/16 -> 10.3.4.0/24 portmap tcp/udp 10000:20000 sequential +map zx0 10.1.1.0/24 -> 10.3.4.5/32 portmap tcp/udp 40000:40001 sequential ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/test/regress/ni1.nat#2 (text+ko) ==== @@ -1,3 +1,3 @@ -map df0 from 2.2.2.2/32 port 20000 >< 25000 to any -> 6.6.6.8/32 portmap udp 2000:2500 -map df0 from 2.2.2.2/32 port 2000 >< 2500 to any -> 6.6.6.7/32 portmap udp 20000:25000 +map df0 from 2.2.2.2/32 port 20000 >< 25000 to any -> 6.6.6.8/32 portmap udp 2000:2500 sequential +map df0 from 2.2.2.2/32 port 2000 >< 2500 to any -> 6.6.6.7/32 portmap udp 20000:25000 sequential map df0 from 2.2.2.2/32 to any -> 6.6.6.6/32 ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/test/regress/ni2.nat#2 (text+ko) ==== @@ -1,1 +1,1 @@ -map xl0 10.0.0.0/8 -> 1.1.1.1/32 portmap tcp/udp 40000:60000 +map xl0 10.0.0.0/8 -> 1.1.1.1/32 portmap tcp/udp 40000:60000 sequential ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/test/regress/ni4.nat#2 (text+ko) ==== @@ -1,1 +1,1 @@ -map df0 2.2.2.2/32 -> 6.6.6.6/32 portmap tcp/udp 40000:60000 +map df0 2.2.2.2/32 -> 6.6.6.6/32 portmap tcp/udp 40000:60000 sequential ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/tools/ipnat_y.y#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/tools/ipnat_y.y,v 1.6 2007/10/18 21:52:13 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/tools/ipnat_y.y,v 1.7 2008/07/24 12:35:05 darrenr Exp $ */ /* * Copyright (C) 2001-2006 by Darren Reed. @@ -95,7 +95,7 @@ %token IPNY_MAP IPNY_BIMAP IPNY_FROM IPNY_TO IPNY_MASK IPNY_PORTMAP IPNY_ANY %token IPNY_ROUNDROBIN IPNY_FRAG IPNY_AGE IPNY_ICMPIDMAP IPNY_PROXY %token IPNY_TCP IPNY_UDP IPNY_TCPUDP IPNY_STICKY IPNY_MSSCLAMP IPNY_TAG -%token IPNY_TLATE +%token IPNY_TLATE IPNY_SEQUENTIAL %type <port> portspec %type <num> hexnumber compare range proto %type <ipa> hostname ipv4 @@ -422,11 +422,11 @@ ; mapport: - IPNY_PORTMAP tcpudp portspec ':' portspec + IPNY_PORTMAP tcpudp portspec ':' portspec randport { nat->in_pmin = htons($3); nat->in_pmax = htons($5); } - | IPNY_PORTMAP tcpudp IPNY_AUTO + | IPNY_PORTMAP tcpudp IPNY_AUTO randport { nat->in_flags |= IPN_AUTOPORTMAP; nat->in_pmin = htons(1024); nat->in_pmax = htons(65535); @@ -446,6 +446,10 @@ } ; +randport: + | IPNY_SEQUENTIAL { nat->in_flags |= IPN_SEQUENTIAL; } + ; + sobject: saddr | saddr port portstuff { nat->in_sport = $3.p1; @@ -519,6 +523,7 @@ nattag: | IPNY_TAG YY_STR { strncpy(nat->in_tag.ipt_tag, $2, sizeof(nat->in_tag.ipt_tag)); } + rr: | IPNY_ROUNDROBIN { nat->in_flags |= IPN_ROUNDR; } ; @@ -647,6 +652,7 @@ { "range", IPNY_RANGE }, { "rdr", IPNY_RDR }, { "round-robin",IPNY_ROUNDROBIN }, + { "sequential", IPNY_SEQUENTIAL }, { "sticky", IPNY_STICKY }, { "tag", IPNY_TAG }, { "tcp", IPNY_TCP }, ==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.resume#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.resume,v 1.8 2007/06/21 22:50:36 njl Exp $ +# $FreeBSD: src/etc/rc.resume,v 1.9 2008/07/21 22:55:40 thompsa Exp $ # # sample run command file for APM Resume Event @@ -50,7 +50,7 @@ # If a device driver has problems resuming, try unloading it before # suspend and reloading it on resume. Example: -# kldunload usb +# kldload usb # wpa_supplicant(8) doesn't seem to reassociate during resume. Uncomment # the following to signal it to reassociate. ==== //depot/projects/soc2008/trasz_nfs4acl/etc/remote#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/remote,v 1.17 2008/07/19 19:08:22 marcel Exp $ +# $FreeBSD: src/etc/remote,v 1.18 2008/07/21 22:38:00 marcel Exp $ # # @(#)remote 5.2 (Berkeley) 6/30/90 # @@ -58,11 +58,11 @@ cuau0c|cua0c:dv=/dev/cuau0:br#9600:pa=none: # Finger friendly shortcuts -uart0|sio0|com1:dv=/dev/cuau0:br#9600:pa=none: -uart1|sio1|com2:dv=/dev/cuau1:br#9600:pa=none: -uart2|sio2|com3:dv=/dev/cuau2:br#9600:pa=none: -uart3|sio3|com4:dv=/dev/cuau3:br#9600:pa=none: -uart4|sio4|com5:dv=/dev/cuau4:br#9600:pa=none: -uart5|sio5|com6:dv=/dev/cuau5:br#9600:pa=none: -uart6|sio6|com7:dv=/dev/cuau6:br#9600:pa=none: -uart7|sio7|com8:dv=/dev/cuau7:br#9600:pa=none: +uart0|com1:dv=/dev/cuau0:br#9600:pa=none: +uart1|com2:dv=/dev/cuau1:br#9600:pa=none: +uart2|com3:dv=/dev/cuau2:br#9600:pa=none: +uart3|com4:dv=/dev/cuau3:br#9600:pa=none: +uart4|com5:dv=/dev/cuau4:br#9600:pa=none: +uart5|com6:dv=/dev/cuau5:br#9600:pa=none: +uart6|com7:dv=/dev/cuau6:br#9600:pa=none: +uart7|com8:dv=/dev/cuau7:br#9600:pa=none: ==== //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes#6 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.268 2008/07/14 18:45:06 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.269 2008/07/22 14:21:56 maxim Exp $ % ======================================================================= || || @@ -56688,7 +56688,7 @@ -- The Best of Will Rogers % Why don't you fix your little problem... and light this candle? - -- Alan Shepherd, the first man into space, Gemini program + -- Alan Shepard, the first American into space, Gemini program % Why, every one as they like; as the good woman said when she kissed her cow. ==== //depot/projects/soc2008/trasz_nfs4acl/include/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.280 2008/06/17 06:26:29 davidxu Exp $ +# $FreeBSD: src/include/Makefile,v 1.281 2008/07/25 12:37:46 ed Exp $ # # Doing a "make install" builds /usr/include. @@ -18,7 +18,7 @@ netdb.h nl_types.h nlist.h nss.h nsswitch.h paths.h \ printf.h proc_service.h pthread.h \ pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \ - res_update.h resolv.h runetype.h search.h setjmp.h sgtty.h \ + res_update.h resolv.h runetype.h search.h setjmp.h \ signal.h spawn.h stab.h \ stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \ strings.h sysexits.h tar.h tgmath.h \ ==== //depot/projects/soc2008/trasz_nfs4acl/include/stdlib.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.65 2007/07/04 00:00:38 scf Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.67 2008/07/22 11:40:42 ache Exp $ */ #ifndef _STDLIB_H_ @@ -235,8 +235,11 @@ __uint32_t arc4random(void); -void arc4random_addrandom(unsigned char *dat, int datlen); +void arc4random_addrandom(unsigned char *, int); +void arc4random_buf(void *, size_t); void arc4random_stir(void); +__uint32_t + arc4random_uniform(__uint32_t); char *getbsize(int *, long *); /* getcap(3) functions */ char *cgetcap(char *, const char *, int); ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.137 2008/06/23 05:22:06 ed Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.140 2008/07/28 02:22:19 davidxu Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -56,7 +56,13 @@ getttyent.3 getusershell.3 getvfsbyname.3 \ glob.3 initgroups.3 isgreater.3 ldexp.3 lockf.3 makecontext.3 \ modf.3 msgctl.3 msgget.3 msgrcv.3 msgsnd.3 \ - nice.3 nlist.3 pause.3 popen.3 pselect.3 psignal.3 pwcache.3 \ + nice.3 nlist.3 pause.3 popen.3 \ + posix_spawn.3 posix_spawn_file_actions_addopen.3 \ + posix_spawn_file_actions_init.3 posix_spawnattr_getflags.3 \ + posix_spawnattr_getpgroup.3 posix_spawnattr_getschedparam.3 \ + posix_spawnattr_getschedpolicy.3 posix_spawnattr_init.3 \ + posix_spawnattr_getsigdefault.3 posix_spawnattr_getsigmask.3 \ + pselect.3 psignal.3 pwcache.3 \ raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \ scandir.3 sem_destroy.3 sem_getvalue.3 sem_init.3 \ sem_open.3 sem_post.3 sem_timedwait.3 sem_wait.3 \ @@ -68,7 +74,8 @@ ttyname.3 tzset.3 ualarm.3 ucontext.3 ulimit.3 uname.3 \ unvis.3 usleep.3 utime.3 valloc.3 vis.3 wordexp.3 -MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3 +MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3 \ + arc4random.3 arc4random_buf.3 arc4random.3 arc4random_uniform.3 MLINKS+=ctermid.3 ctermid_r.3 MLINKS+=devname.3 devname_r.3 MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \ @@ -123,6 +130,17 @@ MLINKS+=makecontext.3 swapcontext.3 MLINKS+=modf.3 modff.3 modf.3 modfl.3 MLINKS+=popen.3 pclose.3 +MLINKS+=posix_spawn.3 posix_spawnp.3 \ + posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addclose.3 \ + posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_adddup2.3 \ + posix_spawn_file_actions_init.3 posix_spawn_file_actions_destroy.3 \ + posix_spawnattr_getflags.3 posix_spawnattr_setflags.3 \ + posix_spawnattr_getpgroup.3 posix_spawnattr_setpgroup.3 \ + posix_spawnattr_getschedparam.3 posix_spawnattr_setschedparam.3 \ + posix_spawnattr_getschedpolicy.3 posix_spawnattr_setschedpolicy.3 \ + posix_spawnattr_getsigdefault.3 posix_spawnattr_setsigdefault.3 \ + posix_spawnattr_getsigmask.3 posix_spawnattr_setsigmask.3 \ + posix_spawnattr_init.3 posix_spawnattr_destroy.3 MLINKS+=psignal.3 strsignal.3 psignal.3 sys_siglist.3 psignal.3 sys_signame.3 MLINKS+=pwcache.3 group_from_gid.3 pwcache.3 user_from_uid.3 MLINKS+=rand48.3 _rand48.3 rand48.3 drand48.3 rand48.3 erand48.3 \ ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.12 2008/06/23 05:22:06 ed Exp $ + * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.15 2008/07/22 11:33:49 ache Exp $ */ FBSD_1.0 { @@ -329,7 +329,10 @@ }; FBSD_1.1 { + arc4random_buf; + arc4random_uniform; fdopendir; + feature_present; fts_open; fts_close; fts_read; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/arc4random.3#2 (text+ko) ==== @@ -28,13 +28,15 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" Manual page, using -mandoc macros -.\" $FreeBSD: src/lib/libc/gen/arc4random.3,v 1.16 2003/07/31 06:18:24 das Exp $ +.\" $FreeBSD: src/lib/libc/gen/arc4random.3,v 1.18 2008/07/22 11:33:49 ache Exp $ .\" .Dd April 15, 1997 .Dt ARC4RANDOM 3 .Os .Sh NAME .Nm arc4random , +.Nm arc4random_buf , +.Nm arc4random_uniform , .Nm arc4random_stir , .Nm arc4random_addrandom .Nd arc4 random number generator @@ -45,6 +47,10 @@ .Ft u_int32_t .Fn arc4random "void" .Ft void +.Fn arc4random_buf "void *buf" "size_t nbytes" +.Ft u_int32_t +.Fn arc4random_uniform "u_int32_t upper_bound" +.Ft void .Fn arc4random_stir "void" .Ft void .Fn arc4random_addrandom "unsigned char *dat" "int datlen" @@ -68,6 +74,21 @@ and .Xr random 3 . .Pp +.Fn arc4random_buf +function fills the region +.Fa buf +of length +.Fa nbytes +with ARC4-derived random data. +.Pp +.Fn arc4random_uniform +will return a uniformly distributed random number less than +.Fa upper_bound . +.Fn arc4random_uniform +is recommended over constructions like +.Dq Li arc4random() % upper_bound +as it avoids "modulo bias" when the upper bound is not a power of two. +.Pp The .Fn arc4random_stir function reads data from @@ -78,10 +99,9 @@ There is no need to call .Fn arc4random_stir before using -.Fn arc4random , -since .Fn arc4random -automatically initializes itself. +functions family, since +they automatically initialize themselves. .Sh EXAMPLES The following produces a drop-in replacement for the traditional .Fn rand ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/arc4random.c#2 (text+ko) ==== @@ -1,14 +1,23 @@ /* - * Arc4 random number generator for OpenBSD. - * Copyright 1996 David Mazieres <dm@lcs.mit.edu>. + * Copyright (c) 1996, David Mazieres <dm@uun.org> + * Copyright (c) 2008, Damien Miller <djm@openbsd.org> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * Modification and redistribution in source and binary forms is - * permitted provided that due credit is given to the author and the - * OpenBSD project (for instance by leaving this copyright notice - * intact). + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* + * Arc4 random number generator for OpenBSD. + * * This code is derived from section 17.1 of Applied Cryptography, * second edition, which describes a stream cipher allegedly * compatible with RSA Labs "RC4" cipher (the actual description of @@ -24,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.12 2007/05/25 10:40:33 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.23 2008/07/25 15:42:22 ache Exp $"); #include "namespace.h" #include <sys/types.h> @@ -63,38 +72,39 @@ static int rs_stired; static int arc4_count; -static inline u_int8_t arc4_getbyte(struct arc4_stream *); -static void arc4_stir(struct arc4_stream *); +static inline u_int8_t arc4_getbyte(void); +static void arc4_stir(void); static inline void -arc4_init(struct arc4_stream *as) +arc4_init(void) { int n; for (n = 0; n < 256; n++) - as->s[n] = n; - as->i = 0; - as->j = 0; + rs.s[n] = n; + rs.i = 0; + rs.j = 0; } static inline void -arc4_addrandom(struct arc4_stream *as, u_char *dat, int datlen) +arc4_addrandom(u_char *dat, int datlen) { int n; u_int8_t si; - as->i--; + rs.i--; for (n = 0; n < 256; n++) { - as->i = (as->i + 1); - si = as->s[as->i]; - as->j = (as->j + si + dat[n % datlen]); - as->s[as->i] = as->s[as->j]; - as->s[as->j] = si; + rs.i = (rs.i + 1); + si = rs.s[rs.i]; + rs.j = (rs.j + si + dat[n % datlen]); + rs.s[rs.i] = rs.s[rs.j]; + rs.s[rs.j] = si; } + rs.j = rs.i; } static void -arc4_stir(struct arc4_stream *as) +arc4_stir(void) { int fd, n; struct { @@ -113,7 +123,7 @@ /* fd < 0? Ah, what the heck. We'll just take whatever was on the * stack... */ - arc4_addrandom(as, (void *) &rdat, sizeof(rdat)); + arc4_addrandom((void *) &rdat, sizeof(rdat)); /* * Throw away the first N bytes of output, as suggested in the @@ -123,34 +133,34 @@ * by Ilya Mironov. */ for (n = 0; n < 1024; n++) - (void) arc4_getbyte(as); - arc4_count = 400000; + (void) arc4_getbyte(); + arc4_count = 1600000; } static inline u_int8_t -arc4_getbyte(struct arc4_stream *as) +arc4_getbyte(void) { u_int8_t si, sj; - as->i = (as->i + 1); - si = as->s[as->i]; - as->j = (as->j + si); - sj = as->s[as->j]; - as->s[as->i] = sj; - as->s[as->j] = si; + rs.i = (rs.i + 1); + si = rs.s[rs.i]; + rs.j = (rs.j + si); + sj = rs.s[rs.j]; + rs.s[rs.i] = sj; + rs.s[rs.j] = si; - return (as->s[(si + sj) & 0xff]); + return (rs.s[(si + sj) & 0xff]); } static inline u_int32_t -arc4_getword(struct arc4_stream *as) +arc4_getword(void) { u_int32_t val; - val = arc4_getbyte(as) << 24; - val |= arc4_getbyte(as) << 16; - val |= arc4_getbyte(as) << 8; - val |= arc4_getbyte(as); + val = arc4_getbyte() << 24; + val |= arc4_getbyte() << 16; + val |= arc4_getbyte() << 8; + val |= arc4_getbyte(); return (val); } @@ -159,16 +169,16 @@ arc4_check_init(void) { if (!rs_initialized) { - arc4_init(&rs); + arc4_init(); rs_initialized = 1; } } -static void +static inline void arc4_check_stir(void) { - if (!rs_stired || --arc4_count == 0) { - arc4_stir(&rs); + if (!rs_stired || arc4_count <= 0) { + arc4_stir(); rs_stired = 1; } } @@ -178,7 +188,7 @@ { THREAD_LOCK(); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807281357.m6SDvCrE014702>