Date: Tue, 29 Jul 2008 17:12:28 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 146215 for review Message-ID: <200807291712.m6THCS2n056373@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=146215 Change 146215 by sam@sam_ebb on 2008/07/29 17:12:12 IFC @ 146212 Affected files ... .. //depot/projects/vap/ObsoleteFiles.inc#15 integrate .. //depot/projects/vap/UPDATING#16 integrate .. //depot/projects/vap/bin/mv/mv.c#4 integrate .. //depot/projects/vap/bin/ps/ps.c#3 integrate .. //depot/projects/vap/contrib/cvs/doc/HACKING.DOCS#2 integrate .. //depot/projects/vap/contrib/ipfilter/ip_fil.c#3 integrate .. //depot/projects/vap/contrib/ipfilter/ipsend/iptests.c#3 integrate .. //depot/projects/vap/contrib/ipfilter/ipsend/sock.c#3 integrate .. //depot/projects/vap/contrib/ipfilter/lib/printnat.c#3 integrate .. //depot/projects/vap/contrib/ipfilter/test/regress/n12#3 integrate .. //depot/projects/vap/contrib/ipfilter/test/regress/n2#3 integrate .. //depot/projects/vap/contrib/ipfilter/test/regress/n5#3 integrate .. //depot/projects/vap/contrib/ipfilter/test/regress/ni1.nat#3 integrate .. //depot/projects/vap/contrib/ipfilter/test/regress/ni2.nat#3 integrate .. //depot/projects/vap/contrib/ipfilter/test/regress/ni4.nat#3 integrate .. //depot/projects/vap/contrib/ipfilter/tools/ipnat_y.y#3 integrate .. //depot/projects/vap/contrib/tcsh/tc.func.c#3 integrate .. //depot/projects/vap/contrib/telnet/telnetd/state.c#3 integrate .. //depot/projects/vap/contrib/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/vap/crypto/openssh/Makefile.in#3 delete .. //depot/projects/vap/crypto/openssh/Makefile.inc#3 delete .. //depot/projects/vap/crypto/openssh/buildpkg.sh.in#3 delete .. //depot/projects/vap/crypto/openssh/config.sub#3 delete .. //depot/projects/vap/crypto/openssh/configure.ac#3 delete .. //depot/projects/vap/crypto/openssh/install-sh#3 delete .. //depot/projects/vap/crypto/openssh/mdoc2man.awk#3 delete .. //depot/projects/vap/crypto/openssh/nchan.ms#3 delete .. //depot/projects/vap/crypto/openssh/nchan2.ms#3 delete .. //depot/projects/vap/crypto/openssh/openbsd-compat/Makefile.in#3 delete .. //depot/projects/vap/crypto/openssh/openbsd-compat/regress/Makefile.in#3 delete .. //depot/projects/vap/crypto/openssh/openbsd-compat/regress/closefromtest.c#3 delete .. //depot/projects/vap/crypto/openssh/openbsd-compat/regress/snprintftest.c#3 delete .. //depot/projects/vap/crypto/openssh/openbsd-compat/regress/strduptest.c#3 delete .. //depot/projects/vap/crypto/openssh/openbsd-compat/regress/strtonumtest.c#3 delete .. //depot/projects/vap/crypto/openssh/openssh.xml.in#3 delete .. //depot/projects/vap/crypto/openssh/opensshd.init.in#3 delete .. //depot/projects/vap/crypto/openssh/regress/Makefile#3 delete .. //depot/projects/vap/crypto/openssh/regress/README.regress#3 delete .. //depot/projects/vap/crypto/openssh/regress/agent-getpeereid.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/agent-ptrace.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/agent-timeout.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/agent.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/banner.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/broken-pipe.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/brokenkeys.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/bsd.regress.mk#3 delete .. //depot/projects/vap/crypto/openssh/regress/cfgmatch.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/cipher-speed.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/connect-privsep.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/connect.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/copy.1#3 delete .. //depot/projects/vap/crypto/openssh/regress/copy.2#3 delete .. //depot/projects/vap/crypto/openssh/regress/dsa_ssh2.prv#3 delete .. //depot/projects/vap/crypto/openssh/regress/dsa_ssh2.pub#3 delete .. //depot/projects/vap/crypto/openssh/regress/dynamic-forward.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/envpass.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/exit-status.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/forcecommand.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/forwarding.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/keygen-change.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/keyscan.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/login-timeout.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/multiplex.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/proto-mismatch.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/proto-version.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/proxy-connect.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/reconfigure.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/reexec.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/rekey.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/rsa_openssh.prv#3 delete .. //depot/projects/vap/crypto/openssh/regress/rsa_openssh.pub#3 delete .. //depot/projects/vap/crypto/openssh/regress/rsa_ssh2.prv#3 delete .. //depot/projects/vap/crypto/openssh/regress/runtests.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/scp-ssh-wrapper.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/scp.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/sftp-badcmds.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/sftp-batch.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/sftp-cmds.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/sftp-glob.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/sftp.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/ssh-com-client.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/ssh-com-keygen.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/ssh-com-sftp.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/ssh-com.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/sshd-log-wrapper.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/stderr-after-eof.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/stderr-data.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/t4.ok#3 delete .. //depot/projects/vap/crypto/openssh/regress/t5.ok#3 delete .. //depot/projects/vap/crypto/openssh/regress/test-exec.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/transfer.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/try-ciphers.sh#3 delete .. //depot/projects/vap/crypto/openssh/regress/yes-head.sh#3 delete .. //depot/projects/vap/crypto/openssh/scard/Makefile.in#3 delete .. //depot/projects/vap/crypto/openssh/scard/Ssh.bin#3 delete .. //depot/projects/vap/crypto/openssh/scard/Ssh.bin.uu#3 delete .. //depot/projects/vap/crypto/openssh/scard/Ssh.java#3 delete .. //depot/projects/vap/crypto/openssh/ssh_prng_cmds.in#3 delete .. //depot/projects/vap/crypto/openssh/survey.sh.in#3 delete .. //depot/projects/vap/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/vap/etc/ppp/ppp.conf#3 integrate .. //depot/projects/vap/etc/rc.d/bluetooth#3 integrate .. //depot/projects/vap/etc/rc.d/serial#3 integrate .. //depot/projects/vap/etc/rc.resume#3 integrate .. //depot/projects/vap/etc/rc.suspend#3 integrate .. //depot/projects/vap/etc/remote#3 integrate .. //depot/projects/vap/games/fortune/datfiles/fortunes#12 integrate .. //depot/projects/vap/include/Makefile#6 integrate .. //depot/projects/vap/include/sgtty.h#4 delete .. //depot/projects/vap/include/stdlib.h#3 integrate .. //depot/projects/vap/lib/libc/gen/Makefile.inc#10 integrate .. //depot/projects/vap/lib/libc/gen/Symbol.map#7 integrate .. //depot/projects/vap/lib/libc/gen/arc4random.3#3 integrate .. //depot/projects/vap/lib/libc/gen/arc4random.c#3 integrate .. //depot/projects/vap/lib/libc/gen/popen.c#3 integrate .. //depot/projects/vap/lib/libc/gen/posix_spawn.3#1 branch .. //depot/projects/vap/lib/libc/gen/posix_spawn_file_actions_addopen.3#1 branch .. //depot/projects/vap/lib/libc/gen/posix_spawn_file_actions_init.3#1 branch .. //depot/projects/vap/lib/libc/gen/posix_spawnattr_getflags.3#1 branch .. //depot/projects/vap/lib/libc/gen/posix_spawnattr_getpgroup.3#1 branch .. //depot/projects/vap/lib/libc/gen/posix_spawnattr_getschedparam.3#1 branch .. //depot/projects/vap/lib/libc/gen/posix_spawnattr_getschedpolicy.3#1 branch .. //depot/projects/vap/lib/libc/gen/posix_spawnattr_getsigdefault.3#1 branch .. //depot/projects/vap/lib/libc/gen/posix_spawnattr_getsigmask.3#1 branch .. //depot/projects/vap/lib/libc/gen/posix_spawnattr_init.3#1 branch .. //depot/projects/vap/lib/libc/stdio/mktemp.c#3 integrate .. //depot/projects/vap/lib/libc/stdlib/malloc.c#11 integrate .. //depot/projects/vap/lib/libc/sys/setfib.2#2 integrate .. //depot/projects/vap/lib/libkvm/kvm_mips.c#1 branch .. //depot/projects/vap/lib/libutil/login.conf.5#3 integrate .. //depot/projects/vap/lib/libutil/login_cap.h#3 integrate .. //depot/projects/vap/lib/libutil/login_class.3#3 integrate .. //depot/projects/vap/lib/libutil/login_class.c#3 integrate .. //depot/projects/vap/lib/msun/Makefile#9 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/vap/sbin/ipfw/ipfw.8#6 integrate .. //depot/projects/vap/sbin/mksnap_ffs/mksnap_ffs.8#3 integrate .. //depot/projects/vap/secure/lib/libcrypto/opensslconf-mips.h#1 branch .. //depot/projects/vap/share/colldef/Makefile#4 integrate .. //depot/projects/vap/share/colldef/no_NO.ISO8859-1.src#1 branch .. //depot/projects/vap/share/colldef/no_NO.ISO8859-15.src#1 branch .. //depot/projects/vap/share/man/man4/ddb.4#9 integrate .. //depot/projects/vap/share/man/man4/wi.4#6 integrate .. //depot/projects/vap/share/man/man8/rc.subr.8#4 integrate .. //depot/projects/vap/share/man/man9/Makefile#11 integrate .. //depot/projects/vap/share/man/man9/accept_filter.9#3 integrate .. //depot/projects/vap/share/man/man9/accf_data.9#3 integrate .. //depot/projects/vap/share/man/man9/accf_dns.9#1 branch .. //depot/projects/vap/share/man/man9/sysctl.9#3 integrate .. //depot/projects/vap/share/man/man9/sysctl_add_oid.9#3 integrate .. //depot/projects/vap/share/misc/bsd-family-tree#7 integrate .. //depot/projects/vap/share/misc/committers-ports.dot#8 integrate .. //depot/projects/vap/share/misc/committers-src.dot#9 integrate .. //depot/projects/vap/share/mk/bsd.sys.mk#4 integrate .. //depot/projects/vap/share/syscons/keymaps/fr.macbook.acc.kbd#3 integrate .. //depot/projects/vap/share/timedef/Makefile#3 integrate .. //depot/projects/vap/share/timedef/nb_NO.ISO8859-1.src#1 branch .. //depot/projects/vap/share/timedef/nb_NO.UTF-8.src#1 branch .. //depot/projects/vap/share/timedef/no_NO.ISO8859-1.src#4 delete .. //depot/projects/vap/share/timedef/no_NO.UTF-8.src#4 delete .. //depot/projects/vap/sys/Makefile#9 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#22 integrate .. //depot/projects/vap/sys/amd64/include/param.h#7 integrate .. //depot/projects/vap/sys/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/vap/sys/arm/xscale/i80321/iq31244_machdep.c#8 integrate .. //depot/projects/vap/sys/arm/xscale/i8134x/crb_machdep.c#7 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/vap/sys/arm/xscale/pxa/pxa_machdep.c#3 integrate .. //depot/projects/vap/sys/boot/Makefile#6 integrate .. //depot/projects/vap/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate .. //depot/projects/vap/sys/compat/linux/linux_ioctl.c#6 integrate .. //depot/projects/vap/sys/compat/linux/linux_ioctl.h#5 integrate .. //depot/projects/vap/sys/compat/linux/linux_misc.c#13 integrate .. //depot/projects/vap/sys/compat/ndis/kern_ndis.c#8 integrate .. //depot/projects/vap/sys/conf/NOTES#24 integrate .. //depot/projects/vap/sys/conf/files#45 integrate .. //depot/projects/vap/sys/conf/kern.mk#9 integrate .. //depot/projects/vap/sys/conf/options#25 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_compat.h#6 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_fil.h#6 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_nat.c#6 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_nat.h#6 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_state.c#6 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf_ioctl.c#9 integrate .. //depot/projects/vap/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/vap/sys/dev/acpica/acpi.c#11 integrate .. //depot/projects/vap/sys/dev/age/if_age.c#3 integrate .. //depot/projects/vap/sys/dev/amr/amr.c#8 integrate .. //depot/projects/vap/sys/dev/atkbdc/psm.c#6 integrate .. //depot/projects/vap/sys/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/vap/sys/dev/bfe/if_bfereg.h#6 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_ael1002.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_mc5.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_cpl.h#5 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_tn1010.c#1 branch .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_vsc8211.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#10 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_osdep.h#6 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#8 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#2 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#3 integrate .. //depot/projects/vap/sys/dev/esp/esp_sbus.c#6 integrate .. //depot/projects/vap/sys/dev/esp/ncr53c9x.c#6 integrate .. //depot/projects/vap/sys/dev/esp/ncr53c9xvar.h#6 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/vap/sys/dev/iicbus/ds1339.c#1 branch .. //depot/projects/vap/sys/dev/jme/if_jme.c#2 integrate .. //depot/projects/vap/sys/dev/kbd/kbd.c#6 integrate .. //depot/projects/vap/sys/dev/kbdmux/kbdmux.c#4 integrate .. //depot/projects/vap/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/vap/sys/dev/pci/pci.c#7 integrate .. //depot/projects/vap/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/vap/sys/dev/pci/pcivar.h#8 integrate .. //depot/projects/vap/sys/dev/usb/ehci_pci.c#9 integrate .. //depot/projects/vap/sys/dev/usb/ugen.c#5 integrate .. //depot/projects/vap/sys/dev/usb/uhid.c#5 integrate .. //depot/projects/vap/sys/dev/wi/if_wi.c#35 integrate .. //depot/projects/vap/sys/dev/wi/if_wivar.h#18 integrate .. //depot/projects/vap/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/vap/sys/geom/part/g_part_apm.c#6 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_rename.c#3 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#4 integrate .. //depot/projects/vap/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/vap/sys/i386/include/profile.h#6 integrate .. //depot/projects/vap/sys/kern/kern_environment.c#6 integrate .. //depot/projects/vap/sys/kern/kern_exec.c#11 integrate .. //depot/projects/vap/sys/kern/kern_fork.c#10 integrate .. //depot/projects/vap/sys/kern/kern_intr.c#13 integrate .. //depot/projects/vap/sys/kern/kern_lock.c#15 integrate .. //depot/projects/vap/sys/kern/kern_proc.c#10 integrate .. //depot/projects/vap/sys/kern/kern_timeout.c#11 integrate .. //depot/projects/vap/sys/kern/sched_4bsd.c#14 integrate .. //depot/projects/vap/sys/kern/sched_ule.c#17 integrate .. //depot/projects/vap/sys/kern/subr_autoconf.c#7 integrate .. //depot/projects/vap/sys/kern/subr_lock.c#6 integrate .. //depot/projects/vap/sys/kern/subr_sleepqueue.c#13 integrate .. //depot/projects/vap/sys/kern/subr_taskqueue.c#10 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#15 integrate .. //depot/projects/vap/sys/kern/tty.c#10 integrate .. //depot/projects/vap/sys/kern/tty_info.c#1 branch .. //depot/projects/vap/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/vap/sys/kern/uipc_usrreq.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/vap/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/vap/sys/libkern/arc4random.c#3 integrate .. //depot/projects/vap/sys/modules/Makefile#34 integrate .. //depot/projects/vap/sys/modules/accf_dns/Makefile#1 branch .. //depot/projects/vap/sys/modules/cxgb/cxgb/Makefile#5 integrate .. //depot/projects/vap/sys/modules/et/Makefile#2 integrate .. //depot/projects/vap/sys/modules/mem/Makefile#5 integrate .. //depot/projects/vap/sys/net/bpf_buffer.c#3 integrate .. //depot/projects/vap/sys/net/if_gre.c#10 integrate .. //depot/projects/vap/sys/net/route.c#9 integrate .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#21 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_l2tp.c#8 integrate .. //depot/projects/vap/sys/netinet/accf_dns.c#1 branch .. //depot/projects/vap/sys/netinet/in_pcb.c#16 integrate .. //depot/projects/vap/sys/netinet/in_pcb.h#11 integrate .. //depot/projects/vap/sys/netinet/ip_divert.c#7 integrate .. //depot/projects/vap/sys/netinet/raw_ip.c#11 integrate .. //depot/projects/vap/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/vap/sys/netinet/sctp_bsd_addr.c#8 integrate .. //depot/projects/vap/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/vap/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/vap/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/vap/sys/netinet/sctputil.c#9 integrate .. //depot/projects/vap/sys/netinet/tcp_offload.c#2 integrate .. //depot/projects/vap/sys/netinet/tcp_offload.h#3 integrate .. //depot/projects/vap/sys/netinet/tcp_syncache.c#12 integrate .. //depot/projects/vap/sys/netinet/tcp_syncache.h#4 integrate .. //depot/projects/vap/sys/netinet/tcp_timer.c#7 integrate .. //depot/projects/vap/sys/netinet/toedev.h#2 integrate .. //depot/projects/vap/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/vap/sys/netinet6/icmp6.c#10 integrate .. //depot/projects/vap/sys/netinet6/ip6_output.c#11 integrate .. //depot/projects/vap/sys/netinet6/raw_ip6.c#12 integrate .. //depot/projects/vap/sys/netipsec/ipsec.c#9 integrate .. //depot/projects/vap/sys/netipsec/ipsec6.h#6 integrate .. //depot/projects/vap/sys/netipx/ipx_input.c#7 integrate .. //depot/projects/vap/sys/netipx/ipx_usrreq.c#5 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_socket.c#3 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_vfsops.c#11 integrate .. //depot/projects/vap/sys/nfsclient/nfs_socket.c#9 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#14 integrate .. //depot/projects/vap/sys/rpc/auth_unix.c#3 integrate .. //depot/projects/vap/sys/rpc/rpcclnt.c#7 integrate .. //depot/projects/vap/sys/security/audit/audit.c#10 integrate .. //depot/projects/vap/sys/security/audit/audit.h#6 integrate .. //depot/projects/vap/sys/security/audit/audit_arg.c#8 integrate .. //depot/projects/vap/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/vap/sys/security/audit/audit_bsm_klib.c#7 integrate .. //depot/projects/vap/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/vap/sys/security/audit/audit_private.h#5 integrate .. //depot/projects/vap/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/vap/sys/security/audit/audit_trigger.c#5 integrate .. //depot/projects/vap/sys/security/audit/audit_worker.c#10 integrate .. //depot/projects/vap/sys/sparc64/sparc64/autoconf.c#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mem.c#5 integrate .. //depot/projects/vap/sys/sys/_task.h#4 integrate .. //depot/projects/vap/sys/sys/interrupt.h#8 integrate .. //depot/projects/vap/sys/sys/kernel.h#12 integrate .. //depot/projects/vap/sys/sys/param.h#25 integrate .. //depot/projects/vap/sys/sys/proc.h#19 integrate .. //depot/projects/vap/sys/sys/refcount.h#3 integrate .. //depot/projects/vap/sys/sys/sockbuf.h#1 branch .. //depot/projects/vap/sys/sys/socket.h#10 integrate .. //depot/projects/vap/sys/sys/socketvar.h#12 integrate .. //depot/projects/vap/sys/sys/sockopt.h#1 branch .. //depot/projects/vap/sys/sys/sockstate.h#1 branch .. //depot/projects/vap/sys/sys/sysctl.h#9 integrate .. //depot/projects/vap/sys/sys/taskqueue.h#8 integrate .. //depot/projects/vap/sys/sys/vmmeter.h#5 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_balloc.c#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#13 integrate .. //depot/projects/vap/sys/vm/vm_kern.c#10 integrate .. //depot/projects/vap/tools/build/mk/OptionalObsoleteFiles.inc#9 integrate .. //depot/projects/vap/usr.bin/calendar/calendars/calendar.freebsd#12 integrate .. //depot/projects/vap/usr.bin/cpio/cmdline.c#3 integrate .. //depot/projects/vap/usr.bin/cpio/cpio.c#4 integrate .. //depot/projects/vap/usr.bin/cpio/cpio.h#3 integrate .. //depot/projects/vap/usr.bin/gcore/elfcore.c#3 integrate .. //depot/projects/vap/usr.bin/gzip/gzip.1#4 integrate .. //depot/projects/vap/usr.bin/gzip/gzip.c#4 integrate .. //depot/projects/vap/usr.bin/ldd/ldd.c#4 integrate .. //depot/projects/vap/usr.bin/procstat/procstat.1#4 integrate .. //depot/projects/vap/usr.bin/tar/bsdtar.1#9 integrate .. //depot/projects/vap/usr.bin/yacc/skeleton.c#3 integrate .. //depot/projects/vap/usr.sbin/Makefile#10 integrate .. //depot/projects/vap/usr.sbin/config/config.y#4 integrate .. //depot/projects/vap/usr.sbin/config/lang.l#3 integrate .. //depot/projects/vap/usr.sbin/ndiscvt/ndisgen.8#3 integrate .. //depot/projects/vap/usr.sbin/rtadvd/rtadvd.c#3 integrate .. //depot/projects/vap/usr.sbin/rtsold/rtsold.c#3 integrate .. //depot/projects/vap/usr.sbin/setfib/setfib.c#3 integrate Differences ... ==== //depot/projects/vap/ObsoleteFiles.inc#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.152 2008/07/13 17:17:35 antoine 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,14 @@ # 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" +OLD_FILES+=usr/sbin/sade +OLD_FILES+=usr/share/man/man8/sade.8.gz +.endif # 20080706: bsdlabel(8) removed on powerpc .if ${TARGET_ARCH} == "powerpc" OLD_FILES+=sbin/bsdlabel ==== //depot/projects/vap/UPDATING#16 (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/vap/bin/mv/mv.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.50 2007/12/27 11:33:42 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.51 2008/07/19 00:13:26 delphij Exp $"); #include <sys/types.h> #include <sys/acl.h> @@ -70,10 +70,10 @@ int fflg, iflg, nflg, vflg; -int copy(char *, char *); -int do_move(char *, char *); -int fastcopy(char *, char *, struct stat *); -void usage(void); +static int copy(const char *, const char *); +static int do_move(const char *, const char *); +static int fastcopy(const char *, const char *, struct stat *); +static void usage(void); int main(int argc, char *argv[]) @@ -154,8 +154,8 @@ exit(rval); } -int -do_move(char *from, char *to) +static int +do_move(const char *from, const char *to) { struct stat sb; int ask, ch, first; @@ -254,8 +254,8 @@ fastcopy(from, to, &sb) : copy(from, to)); } -int -fastcopy(char *from, char *to, struct stat *sbp) +static int +fastcopy(const char *from, const char *to, struct stat *sbp) { struct timeval tval[2]; static u_int blen; @@ -360,8 +360,8 @@ return (0); } -int -copy(char *from, char *to) +static int +copy(const char *from, const char *to) { struct stat sb; int pid, status; @@ -438,7 +438,7 @@ return (0); } -void +static void usage(void) { ==== //depot/projects/vap/bin/ps/ps.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.113 2007/11/08 22:31:28 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.114 2008/07/18 14:55:22 kevlo Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -213,7 +213,7 @@ init_list(&uidlist, addelem_uid, sizeof(uid_t), "user"); memf = nlistf = _PATH_DEVNULL; while ((ch = getopt(argc, argv, PS_ARGS)) != -1) - switch ((char)ch) { + switch (ch) { case 'A': /* * Exactly the same as `-ax'. This has been ==== //depot/projects/vap/contrib/cvs/doc/HACKING.DOCS#2 (text+ko) ==== @@ -12,11 +12,7 @@ @emph{ ... } emphasis - warnings, stress, etc. This will be bracketed by underline characters in info files (_ ... _) and in italics in PDF & probably in - postscript & HTML. -@strong{ ... } Similar to @emph{}, but the effect is to - bracket with asterisks in info files (* ... *) - and in bold in PDF & probably in postscript & - HTML. + postscript & HTML. @noindent Suppresses indentation of the following paragraph. This can ocassionally be useful after examples and the like. @@ -26,7 +22,7 @@ Preformatted text should be marked as such (use @example... there may be other ways) since many of the final output formats can use relational fonts otherwise -and marking it as formatted should restrict it to a fixed width font. Keep +and marking it as formatted should restrict it to a fixed wiidth font. Keep this sort of text to 80 characters or less per line since larger may not be properly viewable for some info users. @@ -37,10 +33,5 @@ Use lots of index markers. Scan the index for the current style. Try to reuse an existing entry if the meaning is similar. -`makeinfo' 3.11 or greater is required for output generation since earlier -versions do not support the @ifnottex & @ifnothtml commands. There may be -other commands used in `cvs.texinfo' that are unsupported by earlier versions -of `makeinfo' by the time you read this. - For more on using texinfo docs, see the `info texinfo' documentation or http://www.gnu.org/manual/texinfo/texinfo.html . ==== //depot/projects/vap/contrib/ipfilter/ip_fil.c#3 (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/vap/contrib/ipfilter/ipsend/iptests.c#3 (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/vap/contrib/ipfilter/ipsend/sock.c#3 (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/vap/contrib/ipfilter/lib/printnat.c#3 (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/vap/contrib/ipfilter/test/regress/n12#3 (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/vap/contrib/ipfilter/test/regress/n2#3 (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/vap/contrib/ipfilter/test/regress/n5#3 (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/vap/contrib/ipfilter/test/regress/ni1.nat#3 (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/vap/contrib/ipfilter/test/regress/ni2.nat#3 (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/vap/contrib/ipfilter/test/regress/ni4.nat#3 (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/vap/contrib/ipfilter/tools/ipnat_y.y#3 (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/vap/contrib/tcsh/tc.func.c#3 (text+ko) ==== @@ -632,7 +632,7 @@ } strbuf_terminate(&pass); - cleanup_until(&sa); + cleanup_until(&osa); return pass.s; } ==== //depot/projects/vap/contrib/telnet/telnetd/state.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/state.c,v 1.14 2003/05/04 02:54:49 obrien Exp $"); +__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/state.c,v 1.15 2008/07/28 18:58:16 jhb Exp $"); #include <stdarg.h> #include "telnetd.h" @@ -553,8 +553,10 @@ #ifdef AUTHENTICATION case TELOPT_AUTHENTICATION: - func = auth_request; - changeok++; + if (auth_level >= 0) { + func = auth_request; + changeok++; + } break; #endif ==== //depot/projects/vap/contrib/telnet/telnetd/telnetd.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/telnetd.c,v 1.29 2006/09/26 21:46:11 ru Exp $"); +__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/telnetd.c,v 1.30 2008/07/28 18:58:16 jhb Exp $"); #include "telnetd.h" #include "pathnames.h" @@ -481,11 +481,13 @@ /* * Handle the Authentication option before we do anything else. */ - send_do(TELOPT_AUTHENTICATION, 1); - while (his_will_wont_is_changing(TELOPT_AUTHENTICATION)) - ttloop(); - if (his_state_is_will(TELOPT_AUTHENTICATION)) { - retval = auth_wait(name); + if (auth_level >= 0) { + send_do(TELOPT_AUTHENTICATION, 1); + while (his_will_wont_is_changing(TELOPT_AUTHENTICATION)) + ttloop(); + if (his_state_is_will(TELOPT_AUTHENTICATION)) { + retval = auth_wait(name); + } } #endif ==== //depot/projects/vap/etc/mtree/BSD.usr.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.334 2008/05/26 10:39:46 bz Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.335 2008/07/28 17:42:37 antoine Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -297,8 +297,6 @@ .. tcsh .. - wpa_supplicant - .. .. games fortune ==== //depot/projects/vap/etc/ppp/ppp.conf#3 (text+ko) ==== @@ -5,7 +5,7 @@ # # See /usr/share/examples/ppp/ for some examples # -# $FreeBSD: src/etc/ppp/ppp.conf,v 1.10 2004/11/19 17:12:56 obrien Exp $ +# $FreeBSD: src/etc/ppp/ppp.conf,v 1.11 2008/07/19 20:00:18 marcel Exp $ ################################################################# default: @@ -13,9 +13,9 @@ ident user-ppp VERSION (built COMPILATIONDATE) # Ensure that "device" references the correct serial port - # for your modem. (cuad0 = COM1, cuad1 = COM2) + # for your modem. (cuau0 = COM1, cuau1 = COM2) # - set device /dev/cuad1 + set device /dev/cuau1 set speed 115200 set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \ ==== //depot/projects/vap/etc/rc.d/bluetooth#3 (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.d/bluetooth,v 1.3 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/bluetooth,v 1.4 2008/07/19 20:11:33 marcel Exp $ # PROVIDE: bluetooth # REQUIRE: DAEMON @@ -234,19 +234,19 @@ # Try to figure out device type by looking at device name case "${dev}" in - # sioX - serial/UART Bluetooth device - sio*) + # uartX - serial/UART Bluetooth device + uart*) load_kld ng_h4 || return 1 hook="hook" # Obtain unit number from device. - unit=`expr ${dev} : 'sio\([0-9]\{1,\}\)'` + unit=`expr ${dev} : 'uart\([0-9]\{1,\}\)'` if [ -z "${unit}" ]; then - err 1 "Unable to get sio unit number: ${dev}" + err 1 "Unable to get uart unit number: ${dev}" fi - ${hcseriald} -f /dev/cuad${unit} -n ${dev} + ${hcseriald} -f /dev/cuau${unit} -n ${dev} sleep 1 # wait a little bit if [ ! -f "/var/run/hcseriald.${dev}.pid" ]; then @@ -326,8 +326,8 @@ # Try to figure out device type by looking at device name case "${dev}" in - # sioX - serial/UART Bluetooth device - sio*) + # uartX - serial/UART Bluetooth device + uart*) if [ -f "/var/run/hcseriald.${dev}.pid" ]; then kill `cat /var/run/hcseriald.${dev}.pid` sleep 1 # wait a little bit ==== //depot/projects/vap/etc/rc.d/serial#3 (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.d/serial,v 1.25 2006/03/23 08:48:38 ru Exp $ +# $FreeBSD: src/etc/rc.d/serial,v 1.26 2008/07/19 20:12:02 marcel Exp $ # # PROVIDE: serial @@ -151,12 +151,12 @@ # $1 is the device identifier, and the remainder of the line # lists the device numbers. -# Initialize assorted 8250-16550 (sio) ports. -# maybe d 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v -# mouse d 2 -# modem d 1 -# terminal d 0 -# 3wire d 0 +# Initialize assorted 8250-16550 (uart) ports. +# maybe u 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v +# mouse u 2 +# modem u 1 +# terminal u 0 +# 3wire u 0 # Initialize all ports on a Cyclades-8yo. # modem c 00 01 02 03 04 05 06 07 ==== //depot/projects/vap/etc/rc.resume#3 (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 $ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807291712.m6THCS2n056373>